Update to AsyncApi 3.0

springwolf-add-ons/springwolf-common-model-converters/src/main/java/io/github/stavshamir/springwolf/addons/common_model_converters/converters/monetaryamount/MonetaryAmount.java

@@ -10,7 +10,7 @@
 class MonetaryAmount {
 
     @JsonProperty("amount")
-    @Schema(example = "99.99")
+    @Schema(example = "99.99", minimum = "0.1")
     private BigDecimal amount;
 
     @JsonProperty("currency")

springwolf-add-ons/springwolf-generic-binding/build.gradle

@@ -8,15 +8,17 @@ plugins {
 
 dependencies {
     api project(":springwolf-core")
+    api project(":springwolf-asyncapi")
 
-    implementation "com.asyncapi:asyncapi-core:${asyncapiCoreVersion}"
     implementation "org.slf4j:slf4j-api:${slf4jApiVersion}"
 
     implementation "org.springframework:spring-context"
     implementation "org.springframework:spring-core"
 
     annotationProcessor "org.projectlombok:lombok:${lombokVersion}"
 
+    compileOnly "org.projectlombok:lombok:${lombokVersion}"
+
     testImplementation "org.assertj:assertj-core:${assertjCoreVersion}"
     testImplementation "org.junit.jupiter:junit-jupiter-api:${junitJupiterVersion}"
     testRuntimeOnly "org.junit.jupiter:junit-jupiter:${junitJupiterVersion}"

springwolf-add-ons/springwolf-generic-binding/src/main/java/io/github/stavshamir/springwolf/addons/generic_binding/annotation/processor/AsyncGenericOperationBindingProcessor.java

@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: Apache-2.0
 package io.github.stavshamir.springwolf.addons.generic_binding.annotation.processor;
 
-import com.asyncapi.v2.binding.operation.OperationBinding;
 import io.github.stavshamir.springwolf.addons.generic_binding.annotation.AsyncGenericOperationBinding;
 import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.ProcessedOperationBinding;
 import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.processor.AbstractOperationBindingProcessor;
+import io.github.stavshamir.springwolf.asyncapi.v3.bindings.OperationBinding;
 
 import java.util.HashMap;
 import java.util.Map;

springwolf-add-ons/springwolf-json-schema/build.gradle

@@ -22,6 +22,7 @@ dependencies {
     implementation "org.springframework:spring-context"
 
     annotationProcessor "org.projectlombok:lombok:${lombokVersion}"
+    compileOnly "org.projectlombok:lombok:${lombokVersion}"
 
     testImplementation "org.mockito:mockito-core:${mockitoCoreVersion}"
     testImplementation "org.assertj:assertj-core:${assertjCoreVersion}"

springwolf-asyncapi/README.md

@@ -51,6 +51,7 @@ dependencies {
 
 See https://github.com/asyncapi/converter-js#conversion-2xx-to-3xx
 
+
 # Contributions
 
 Any contributions are welcome, including, but not limited to:

springwolf-asyncapi/build.gradle

@@ -47,7 +47,7 @@ publishing {
         mavenJava(MavenPublication) {
             pom {
                 name = 'springwolf-asyncapi'
-                description = 'AsyncAPI schema generator'
+                description = 'Springwolf implementation of the AsyncApi specification'
             }
         }
     }

springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/sqs/SQSChannelBindingQueue.java

@@ -25,7 +25,7 @@ public class SQSChannelBindingQueue {
      * identifier should be the one in this field.
      */
     @NotNull
-    @JsonProperty("queue")
+    @JsonProperty("name")
     private String name;
 
     /**

springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/sqs/SQSOperationBinding.java

@@ -10,6 +10,8 @@
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
+import java.util.List;
+
 /**
  * SQS Point-To-Point
  * </p>
@@ -32,7 +34,7 @@ public class SQSOperationBinding extends OperationBinding {
      */
     @NotNull
     @JsonProperty("queues")
-    private SQSChannelBindingQueue queues;
+    private List<SQSChannelBindingQueue> queues;
 
     /**
      * Optional, defaults to latest. The version of this binding.

springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/channel/ChannelObject.java

@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 package io.github.stavshamir.springwolf.asyncapi.v3.model.channel;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.github.stavshamir.springwolf.asyncapi.v3.bindings.ChannelBinding;
 import io.github.stavshamir.springwolf.asyncapi.v3.model.ExtendableObject;
@@ -29,14 +28,6 @@
 @EqualsAndHashCode(callSuper = true)
 public class ChannelObject extends ExtendableObject implements Channel {
 
-    /**
-     * An identifier for the described channel. The channelId value is case-sensitive. Tools and libraries MAY use the
-     * channelId to uniquely identify a channel, therefore, it is RECOMMENDED to follow common programming naming
-     * conventions.
-     */
-    @JsonIgnore
-    private String channelId;
-
     /**
      * An optional string representation of this channel's address. The address is typically the "topic name",
      * "routing key", "event type", or "path". When null or absent, it MUST be interpreted as unknown. This is useful

springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/channel/ChannelReference.java

@@ -24,17 +24,4 @@ public String getRef() {
     public static ChannelReference fromChannel(String channelName) {
         return new ChannelReference("#/channels/" + channelName);
     }
-
-    /**
-     * Convenient Builder to create a Channel reference to an existing Channel
-     * @param channel Channel to create the reference to. This Channel MUST have a 'channelId' field
-     * @return a Channel with the 'ref' field pointing to "#/channels/{channelId"
-     */
-    public static ChannelReference fromChannel(ChannelObject channel) {
-        var channelId = channel.getChannelId();
-        if (channelId == null) {
-            throw new IllegalArgumentException("The channel must have a 'channelId' defined");
-        }
-        return new ChannelReference("#/channels/" + channelId);
-    }
 }

springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/channel/message/MessageHeaders.java

@@ -5,10 +5,12 @@
 import io.github.stavshamir.springwolf.asyncapi.v3.jackson.model.channel.message.MessageHeadersSerializer;
 import io.github.stavshamir.springwolf.asyncapi.v3.model.schema.MultiFormatSchema;
 import io.github.stavshamir.springwolf.asyncapi.v3.model.schema.SchemaObject;
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 
 @Getter
 @JsonSerialize(using = MessageHeadersSerializer.class)
+@EqualsAndHashCode
 public class MessageHeaders {
     private MultiFormatSchema multiFormatSchema;
     private SchemaObject schema;

springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/channel/message/MessageObject.java

@@ -118,4 +118,14 @@ public class MessageObject extends ExtendableObject implements Message {
      */
     @JsonProperty(value = "traits")
     private List<MessageTrait> traits;
+
+    /*
+     * Override the getMessageId to guarantee that there's always a value. Defaults to 'name'
+     */
+    public String getMessageId() {
+        if (messageId == null) {
+            return this.name;
+        }
+        return messageId;
+    }
 }

springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/channel/message/MessagePayload.java

@@ -5,10 +5,12 @@
 import io.github.stavshamir.springwolf.asyncapi.v3.jackson.model.channel.message.MessagePayloadSerializer;
 import io.github.stavshamir.springwolf.asyncapi.v3.model.schema.MultiFormatSchema;
 import io.github.stavshamir.springwolf.asyncapi.v3.model.schema.SchemaObject;
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 
 @Getter
 @JsonSerialize(using = MessagePayloadSerializer.class)
+@EqualsAndHashCode
 public class MessagePayload {
     private MultiFormatSchema multiFormatSchema;
     private SchemaObject schema;

springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/channel/message/MessageReference.java

@@ -25,22 +25,27 @@ public String getRef() {
 
     /**
      * Convenient Builder to create a Message reference to an existing Message
-     * @param message Message to create the reference to. This Message MUST have a 'messageId' field
-     * @return a Message with the 'ref' field pointing to "#/components/messages/{messageId"
+     *
+     * @param message Message to create the reference to. This Message MUST have a 'messageName' field
+     * @return a Message with the 'ref' field pointing to "#/components/messages/{messageName}"
      */
-    public static MessageReference fromMessage(MessageObject message) {
-        var messageId = message.getMessageId();
-        if (messageId == null) {
-            throw new IllegalArgumentException("The message must have a 'messageId' defined");
-        }
-        return new MessageReference("#/components/messages/" + messageId);
+    public static MessageReference toComponentMessage(MessageObject message) {
+        return toComponentMessage(message.getName());
     }
 
-    public static MessageReference fromMessage(String messageName) {
+    public static MessageReference toComponentMessage(String messageName) {
         return new MessageReference("#/components/messages/" + messageName);
     }
 
-    public static MessageReference fromSchema(String schemaName) {
+    public static MessageReference toChannelMessage(String channelName, MessageObject message) {
+        return new MessageReference("#/channels/" + channelName + "/messages/" + message.getName());
+    }
+
+    public static MessageReference toChannelMessage(String channelName, String messageName) {
+        return new MessageReference("#/channels/" + channelName + "/messages/" + messageName);
+    }
+
+    public static MessageReference toSchema(String schemaName) {
         return new MessageReference("#/components/schemas/" + schemaName);
     }
 }

springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/schema/SchemaObject.java

@@ -58,7 +58,7 @@ public class SchemaObject extends ExtendableObject implements Schema {
     private String type;
 
     @JsonProperty(value = "properties")
-    private Map<String, Schema> properties;
+    private Map<String, Object> properties;
 
     /**
      * <a href="https://spec.commonmark.org/">CommonMark syntax</a> can be used for rich text representation.

springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/schema/SchemaType.java

@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: Apache-2.0
+package io.github.stavshamir.springwolf.asyncapi.v3.model.schema;
+
+public class SchemaType {
+    public static final String NULL = "null";
+    public static final String BOOLEAN = "boolean";
+    public static final String OBJECT = "object";
+    public static final String ARRAY = "array";
+    public static final String NUMBER = "number";
+    public static final String STRING = "string";
+    public static final String INTEGER = "integer";
+
+    private SchemaType() {}
+}

springwolf-asyncapi/src/test/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/amqp/AMQPBindingTest.java

@@ -20,7 +20,7 @@ class AMQPBindingTest {
     private static final DefaultAsyncApiSerializer serializer = new DefaultAsyncApiSerializer();
 
     @Test
-    void shouldSerializeAMQPChannelBinding() throws IOException {
+    void shouldSerializeAMQPChannelBindingQueue() throws IOException {
 
         var asyncapi = AsyncAPI.builder()
                 .channels(Map.of(
@@ -30,13 +30,36 @@ void shouldSerializeAMQPChannelBinding() throws IOException {
                                 .bindings(Map.of(
                                         "amqp",
                                         AMQPChannelBinding.builder()
-                                                .is(AMQPChannelType.ROUTING_KEY)
+                                                .is(AMQPChannelType.QUEUE)
                                                 .queue(AMQPChannelQueueProperties.builder()
                                                         .name("my-queue-name")
                                                         .durable(true)
                                                         .exclusive(true)
                                                         .autoDelete(false)
                                                         .build())
+                                                .build()))
+                                .build()))
+                .build();
+
+        // Uses https://github.com/asyncapi/bindings/blob/master/amqp/README.md#example
+        var example = ClasspathUtil.parseYamlFile("/v3/bindings/amqp/amqp-channel-queue.yaml");
+        assertThatJson(serializer.toJsonString(asyncapi))
+                .whenIgnoringPaths("asyncapi", "operations")
+                .isEqualTo(example);
+    }
+
+    @Test
+    void shouldSerializeAMQPChannelBindingRouting() throws IOException {
+
+        var asyncapi = AsyncAPI.builder()
+                .channels(Map.of(
+                        "userSignup",
+                        ChannelObject.builder()
+                                .address("user/signup")
+                                .bindings(Map.of(
+                                        "amqp",
+                                        AMQPChannelBinding.builder()
+                                                .is(AMQPChannelType.ROUTING_KEY)
                                                 .exchange(AMQPChannelExchangeProperties.builder()
                                                         .name("myExchange")
                                                         .type(AMQPChannelExchangeType.TOPIC)
@@ -48,7 +71,7 @@ void shouldSerializeAMQPChannelBinding() throws IOException {
                 .build();
 
         // Uses https://github.com/asyncapi/bindings/blob/master/amqp/README.md#example
-        var example = ClasspathUtil.parseYamlFile("/v3/bindings/amqp/amqp-channel.yaml");
+        var example = ClasspathUtil.parseYamlFile("/v3/bindings/amqp/amqp-channel-routing.yaml");
         assertThatJson(serializer.toJsonString(asyncapi))
                 .whenIgnoringPaths("asyncapi", "operations")
                 .isEqualTo(example);