feat(amqp): update to amqp binding 0.4.0

springwolf · Oct 28, 2024 · 9f2292d · 9f2292d
1 parent 42f2a11
commit 9f2292d
Show file tree

Hide file tree

Showing 13 changed files with 319 additions and 103 deletions.
diff --git a/...capi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/amqp/AMQPChannelBinding.java b/...capi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/amqp/AMQPChannelBinding.java
@@ -3,6 +3,7 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.github.springwolf.asyncapi.v3.bindings.ChannelBinding;
+import io.github.springwolf.asyncapi.v3.model.channel.ChannelReference;
 import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -29,6 +30,17 @@ public class AMQPChannelBinding extends ChannelBinding {
     @JsonProperty("exchange")
     private AMQPChannelExchangeProperties exchange;
 
+    /**
+     * When is=routingKey, this defines the actual routing pattern to route the message from the exchange to the queue.
+     */
+    @JsonProperty("name")
+    private String name;
+
+    /**
+     * When is=routingKey, this defines the target queue after routing the message (essentially the binding).
+     */
+    private ChannelReference channel;
+
     /**
      * When is=queue, this object defines the queue properties.
      */
@@ -37,5 +49,5 @@ public class AMQPChannelBinding extends ChannelBinding {
 
     @Builder.Default
     @JsonProperty(value = "bindingVersion")
-    private final String bindingVersion = "0.3.0";
+    private final String bindingVersion = "0.4.0";
 }
diff --git a/...capi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/amqp/AMQPMessageBinding.java b/...capi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/amqp/AMQPMessageBinding.java
@@ -35,5 +35,5 @@ public class AMQPMessageBinding extends MessageBinding {
      */
     @Builder.Default
     @JsonProperty(value = "bindingVersion")
-    private final String bindingVersion = "0.3.0";
+    private final String bindingVersion = "0.4.0";
 }
diff --git a/...pi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/amqp/AMQPOperationBinding.java b/...pi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/amqp/AMQPOperationBinding.java
@@ -109,5 +109,5 @@ public class AMQPOperationBinding extends OperationBinding {
      */
     @Builder.Default
     @JsonProperty("bindingVersion")
-    private String bindingVersion = "0.3.0";
+    private String bindingVersion = "0.4.0";
 }
diff --git a/springwolf-asyncapi/src/test/resources/v3/bindings/amqp/amqp-channel-queue.yaml b/springwolf-asyncapi/src/test/resources/v3/bindings/amqp/amqp-channel-queue.yaml
@@ -10,4 +10,4 @@ channels:
           exclusive: true
           autoDelete: false
           vhost: /
-        bindingVersion: 0.3.0
+        bindingVersion: 0.4.0
diff --git a/springwolf-asyncapi/src/test/resources/v3/bindings/amqp/amqp-channel-routing.yaml b/springwolf-asyncapi/src/test/resources/v3/bindings/amqp/amqp-channel-routing.yaml
@@ -10,4 +10,4 @@ channels:
           durable: true
           autoDelete: false
           vhost: /
-        bindingVersion: 0.3.0
+        bindingVersion: 0.4.0
diff --git a/springwolf-asyncapi/src/test/resources/v3/bindings/amqp/amqp-message.yaml b/springwolf-asyncapi/src/test/resources/v3/bindings/amqp/amqp-message.yaml
@@ -7,4 +7,4 @@ channels:
           amqp:
             contentEncoding: gzip
             messageType: 'user.signup'
-            bindingVersion: 0.3.0
+            bindingVersion: 0.4.0
diff --git a/springwolf-asyncapi/src/test/resources/v3/bindings/amqp/amqp-operation.yaml b/springwolf-asyncapi/src/test/resources/v3/bindings/amqp/amqp-operation.yaml
@@ -13,4 +13,4 @@ operations:
         bcc: ['external.audit']
         timestamp: true
         ack: false
-        bindingVersion: 0.3.0
+        bindingVersion: 0.4.0
diff --git a/springwolf-examples/springwolf-amqp-example/src/test/resources/asyncapi.json b/springwolf-examples/springwolf-amqp-example/src/test/resources/asyncapi.json
@@ -34,6 +34,9 @@
       },
       "bindings": {
         "amqp": {
+          "channel": {
+            "$ref": "#/channels/queue-update"
+          },
           "is": "routingKey",
           "exchange": {
             "name": "CRUD-topic-exchange-1",
@@ -42,7 +45,8 @@
             "autoDelete": false,
             "vhost": "/"
           },
-          "bindingVersion": "0.3.0"
+          "name": "#",
+          "bindingVersion": "0.4.0"
         }
       }
     },
@@ -55,6 +59,9 @@
       },
       "bindings": {
         "amqp": {
+          "channel": {
+            "$ref": "#/channels/queue-read"
+          },
           "is": "routingKey",
           "exchange": {
             "name": "CRUD-topic-exchange-2",
@@ -63,7 +70,8 @@
             "autoDelete": false,
             "vhost": "/"
           },
-          "bindingVersion": "0.3.0"
+          "name": "#",
+          "bindingVersion": "0.4.0"
         }
       }
     },
@@ -84,7 +92,7 @@
             "autoDelete": false,
             "vhost": "/"
           },
-          "bindingVersion": "0.3.0"
+          "bindingVersion": "0.4.0"
         }
       }
     },
@@ -100,7 +108,7 @@
             "autoDelete": true,
             "vhost": "/"
           },
-          "bindingVersion": "0.3.0"
+          "bindingVersion": "0.4.0"
         }
       }
     },
@@ -121,7 +129,7 @@
             "autoDelete": false,
             "vhost": "/"
           },
-          "bindingVersion": "0.3.0"
+          "bindingVersion": "0.4.0"
         }
       }
     },
@@ -142,6 +150,9 @@
       },
       "bindings": {
         "amqp": {
+          "channel": {
+            "$ref": "#/channels/example-bindings-queue"
+          },
           "is": "routingKey",
           "exchange": {
             "name": "example-topic-exchange",
@@ -150,7 +161,8 @@
             "autoDelete": false,
             "vhost": "/"
           },
-          "bindingVersion": "0.3.0"
+          "name": "example-topic-routing-key",
+          "bindingVersion": "0.4.0"
         }
       }
     },
@@ -174,7 +186,7 @@
             "autoDelete": false,
             "vhost": "/"
           },
-          "bindingVersion": "0.3.0"
+          "bindingVersion": "0.4.0"
         }
       }
     },
@@ -195,7 +207,7 @@
             "autoDelete": false,
             "vhost": "/"
           },
-          "bindingVersion": "0.3.0"
+          "bindingVersion": "0.4.0"
         }
       }
     },
@@ -216,7 +228,7 @@
             "autoDelete": false,
             "vhost": "/"
           },
-          "bindingVersion": "0.3.0"
+          "bindingVersion": "0.4.0"
         }
       }
     },
@@ -232,7 +244,7 @@
             "autoDelete": false,
             "vhost": "/"
           },
-          "bindingVersion": "0.3.0"
+          "bindingVersion": "0.4.0"
         }
       }
     },
@@ -248,7 +260,7 @@
             "autoDelete": false,
             "vhost": "/"
           },
-          "bindingVersion": "0.3.0"
+          "bindingVersion": "0.4.0"
         }
       }
     }
@@ -426,7 +438,7 @@
         "title": "AnotherPayloadDto",
         "bindings": {
           "amqp": {
-            "bindingVersion": "0.3.0"
+            "bindingVersion": "0.4.0"
           }
         }
       },
@@ -444,7 +456,7 @@
         "title": "ExamplePayloadDto",
         "bindings": {
           "amqp": {
-            "bindingVersion": "0.3.0"
+            "bindingVersion": "0.4.0"
           }
         }
       },
@@ -462,7 +474,7 @@
         "title": "GenericPayloadDtoExamplePayloadDto",
         "bindings": {
           "amqp": {
-            "bindingVersion": "0.3.0"
+            "bindingVersion": "0.4.0"
           }
         }
       },
@@ -480,7 +492,7 @@
         "title": "GenericPayloadDtoLong",
         "bindings": {
           "amqp": {
-            "bindingVersion": "0.3.0"
+            "bindingVersion": "0.4.0"
           }
         }
       },
@@ -498,7 +510,7 @@
         "title": "GenericPayloadDtoString",
         "bindings": {
           "amqp": {
-            "bindingVersion": "0.3.0"
+            "bindingVersion": "0.4.0"
           }
         }
       }
@@ -513,7 +525,7 @@
       "bindings": {
         "amqp": {
           "expiration": 0,
-          "bindingVersion": "0.3.0"
+          "bindingVersion": "0.4.0"
         }
       },
       "messages": [
@@ -530,7 +542,7 @@
       "bindings": {
         "amqp": {
           "expiration": 0,
-          "bindingVersion": "0.3.0"
+          "bindingVersion": "0.4.0"
         }
       },
       "messages": [
@@ -547,7 +559,7 @@
       "bindings": {
         "amqp": {
           "expiration": 0,
-          "bindingVersion": "0.3.0"
+          "bindingVersion": "0.4.0"
         }
       },
       "messages": [
@@ -564,7 +576,7 @@
       "bindings": {
         "amqp": {
           "expiration": 0,
-          "bindingVersion": "0.3.0"
+          "bindingVersion": "0.4.0"
         }
       },
       "messages": [
@@ -581,7 +593,7 @@
       "bindings": {
         "amqp": {
           "expiration": 0,
-          "bindingVersion": "0.3.0"
+          "bindingVersion": "0.4.0"
         }
       },
       "messages": [
@@ -607,7 +619,7 @@
           "bcc": [ ],
           "timestamp": false,
           "ack": false,
-          "bindingVersion": "0.3.0"
+          "bindingVersion": "0.4.0"
         }
       },
       "messages": [
@@ -624,7 +636,7 @@
       "bindings": {
         "amqp": {
           "expiration": 0,
-          "bindingVersion": "0.3.0"
+          "bindingVersion": "0.4.0"
         }
       },
       "messages": [
@@ -644,7 +656,7 @@
       "bindings": {
         "amqp": {
           "expiration": 0,
-          "bindingVersion": "0.3.0"
+          "bindingVersion": "0.4.0"
         }
       },
       "messages": [
@@ -661,7 +673,7 @@
       "bindings": {
         "amqp": {
           "expiration": 0,
-          "bindingVersion": "0.3.0"
+          "bindingVersion": "0.4.0"
         }
       },
       "messages": [