Refactor asyncapi binding to simplify SSE asyncapi bindings extension

build/flyweight-maven-plugin/src/main/java/io/aklivity/zilla/build/maven/plugins/flyweight/internal/generate/UnionFlyweightGenerator.java

@@ -39,6 +39,7 @@
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
@@ -957,7 +958,7 @@ private void addParentMember(
             AstByteOrder byteOrder)
         {
             Consumer<CodeBlock.Builder> defaultPriorField = priorFieldIfDefaulted == null ? null : this::defaultPriorField;
-            memberConstant.addParentMember(name);
+            memberConstant.addParentMember(name, typeName, defaultValue);
             memberMutator.addParentMember(name, type, typeName, unsignedType, unsignedTypeName,
                 usedAsSize, byteOrder, priorFieldIfDefaulted, defaultPriorField);
             buildMethod.addParentMember(name);
@@ -1016,12 +1017,22 @@ private MemberConstantGenerator(
             }
 
             public MemberConstantGenerator addParentMember(
-                String name)
+                String name,
+                TypeName typeName,
+                Object defaultValue)
             {
                 builder.addField(
                     FieldSpec.builder(int.class, index(name), PRIVATE, STATIC, FINAL)
                         .initializer(Integer.toString(nextIndex++))
                         .build());
+
+                if (typeName.isPrimitive() && defaultValue != null)
+                {
+                    builder.addField(
+                            FieldSpec.builder(typeName, defaultName(name), PUBLIC, STATIC, FINAL)
+                                .initializer(Objects.toString(defaultValue))
+                                .build());
+                }
                 return this;
             }
 

incubator/command-dump/src/main/resources/io/aklivity/zilla/runtime/command/dump/internal/airline/zilla.lua

@@ -1021,24 +1021,25 @@ function handle_extension(buffer, subtree, pinfo, info, offset, frame_type_id)
         ext_subtree:add(fields.stream_type_id, slice_stream_type_id)
         ext_subtree:add(fields.stream_type, stream_type)
 
+        local extension_offset = offset + 8 + 4;
         if stream_type_id == PROXY_ID then
-            handle_proxy_extension(buffer, offset + 4, ext_subtree)
+            handle_proxy_extension(buffer, extension_offset, ext_subtree)
         elseif stream_type_id == FILESYSTEM_ID then
-            handle_filesystem_extension(buffer, offset + 4, ext_subtree)
+            handle_filesystem_extension(buffer, extension_offset, ext_subtree)
         elseif stream_type_id == HTTP_ID then
-            handle_http_extension(buffer, offset + 4, ext_subtree, frame_type_id)
+            handle_http_extension(buffer, extension_offset, ext_subtree, frame_type_id)
         elseif stream_type_id == GRPC_ID then
-            handle_grpc_extension(buffer, offset + 4, ext_subtree, frame_type_id)
+            handle_grpc_extension(buffer, extension_offset, ext_subtree, frame_type_id)
         elseif stream_type_id == SSE_ID then
-            handle_sse_extension(buffer, offset + 4, ext_subtree, frame_type_id)
+            handle_sse_extension(buffer, extension_offset, ext_subtree, frame_type_id)
         elseif stream_type_id == WS_ID then
-            handle_ws_extension(buffer, offset + 4, ext_subtree, frame_type_id)
+            handle_ws_extension(buffer, extension_offset, ext_subtree, frame_type_id)
         elseif stream_type_id == MQTT_ID then
-            handle_mqtt_extension(buffer, offset + 4, ext_subtree, frame_type_id)
+            handle_mqtt_extension(buffer, extension_offset, ext_subtree, frame_type_id)
         elseif stream_type_id == KAFKA_ID then
-            handle_kafka_extension(buffer, offset + 4, ext_subtree, frame_type_id)
+            handle_kafka_extension(buffer, extension_offset, ext_subtree, frame_type_id)
         elseif stream_type_id == AMQP_ID then
-            handle_amqp_extension(buffer, offset + 4, ext_subtree, frame_type_id)
+            handle_amqp_extension(buffer, extension_offset, ext_subtree, frame_type_id)
         end
 
         if stream_type and stream_type ~= "" then

incubator/command-dump/src/test/java/io/aklivity/zilla/runtime/command/dump/internal/test/DumpRule.java

@@ -21,6 +21,7 @@
 import static org.agrona.LangUtil.rethrowUnchecked;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
+import static org.junit.Assert.assertEquals;
 
 import java.net.URL;
 import java.nio.ByteBuffer;
@@ -86,7 +87,7 @@ public void evaluate() throws Throwable
                 Files.writeString(TXT_PATH, result.getStdout());
                 assertThat(result.getExitCode(), equalTo(0));
                 assert expected0 != null;
-                assertThat(result.getStdout(), equalTo(expected0));
+                assertEquals(expected0, result.getStdout());
             }
         };
     }

incubator/command-dump/src/test/resources/io/aklivity/zilla/runtime/command/dump/internal/AmqpStreamApplicationIT_shouldConnectAsReceiverOnly.txt

@@ -1,7 +1,7 @@
-Frame 1: 217 bytes on wire (1736 bits), 217 bytes captured (1736 bits)
+Frame 1: 225 bytes on wire (1800 bits), 225 bytes captured (1800 bits)
 Ethernet II, Src: Send_00 (20:53:45:4e:44:00), Dst: Receive_00 (20:52:45:43:56:00)
 Internet Protocol Version 6, Src: fe80::3f3f:0:0:2, Dst: fe80::3f3f:0:0:3
-Transmission Control Protocol, Src Port: 0, Dst Port: 7114, Seq: 0, Ack: 1, Len: 143
+Transmission Control Protocol, Src Port: 0, Dst Port: 7114, Seq: 0, Ack: 1, Len: 151
 Zilla Frame
     Frame Type ID: 0x00000001
     Frame Type: BEGIN
@@ -36,17 +36,17 @@ Zilla Frame
         Sender Settle Mode: SETTLED (1)
         Receiver Settle Mode: FIRST (0)
 
-Frame 2: 217 bytes on wire (1736 bits), 217 bytes captured (1736 bits)
+Frame 2: 225 bytes on wire (1800 bits), 225 bytes captured (1800 bits)
 Ethernet II, Src: Send_00 (20:53:45:4e:44:00), Dst: Receive_00 (20:52:45:43:56:00)
 Internet Protocol Version 6, Src: fe80::3f3f:0:0:3, Dst: fe80::3f3f:0:0:2
-Transmission Control Protocol, Src Port: 7114, Dst Port: 0, Seq: 1, Ack: 143, Len: 143
+Transmission Control Protocol, Src Port: 7114, Dst Port: 0, Seq: 1, Ack: 151, Len: 151
 Zilla Frame
     Frame Type ID: 0x00000001
     Frame Type: BEGIN
     Protocol Type ID: 0x00000000
     Protocol Type: 
     Worker: 0
-    Offset: 0x00000068
+    Offset: 0x00000070
     Origin ID: 0x0000000100000002
     Origin Namespace: test
     Origin Binding: app0
@@ -77,14 +77,14 @@ Zilla Frame
 Frame 3: 211 bytes on wire (1688 bits), 211 bytes captured (1688 bits)
 Ethernet II, Src: Send_00 (20:53:45:4e:44:00), Dst: Receive_00 (20:52:45:43:56:00)
 Internet Protocol Version 6, Src: fe80::3f3f:0:0:2, Dst: fe80::3f3f:0:0:3
-Transmission Control Protocol, Src Port: 0, Dst Port: 7114, Seq: 143, Ack: 144, Len: 137
+Transmission Control Protocol, Src Port: 0, Dst Port: 7114, Seq: 151, Ack: 152, Len: 137
 Zilla Frame
     Frame Type ID: 0x40000002
     Frame Type: WINDOW
     Protocol Type ID: 0x00000000
     Protocol Type: 
     Worker: 0
-    Offset: 0x000000d0
+    Offset: 0x000000e0
     Origin ID: 0x0000000100000002
     Origin Namespace: test
     Origin Binding: app0
@@ -111,14 +111,14 @@ Zilla Frame
 Frame 4: 211 bytes on wire (1688 bits), 211 bytes captured (1688 bits)
 Ethernet II, Src: Send_00 (20:53:45:4e:44:00), Dst: Receive_00 (20:52:45:43:56:00)
 Internet Protocol Version 6, Src: fe80::3f3f:0:0:3, Dst: fe80::3f3f:0:0:2
-Transmission Control Protocol, Src Port: 7114, Dst Port: 0, Seq: 144, Ack: 280, Len: 137
+Transmission Control Protocol, Src Port: 7114, Dst Port: 0, Seq: 152, Ack: 288, Len: 137
 Zilla Frame
     Frame Type ID: 0x40000002
     Frame Type: WINDOW
     Protocol Type ID: 0x00000000
     Protocol Type: 
     Worker: 0
-    Offset: 0x00000130
+    Offset: 0x00000140
     Origin ID: 0x0000000100000002
     Origin Namespace: test
     Origin Binding: app0
@@ -145,14 +145,14 @@ Zilla Frame
 Frame 5: 194 bytes on wire (1552 bits), 194 bytes captured (1552 bits)
 Ethernet II, Src: Send_00 (20:53:45:4e:44:00), Dst: Receive_00 (20:52:45:43:56:00)
 Internet Protocol Version 6, Src: fe80::3f3f:0:0:2, Dst: fe80::3f3f:0:0:3
-Transmission Control Protocol, Src Port: 0, Dst Port: 7114, Seq: 280, Ack: 281, Len: 120
+Transmission Control Protocol, Src Port: 0, Dst Port: 7114, Seq: 288, Ack: 289, Len: 120
 Zilla Frame
     Frame Type ID: 0x00000003
     Frame Type: END
     Protocol Type ID: 0x00000000
     Protocol Type: 
     Worker: 0
-    Offset: 0x00000190
+    Offset: 0x000001a0
     Origin ID: 0x0000000100000002
     Origin Namespace: test
     Origin Binding: app0
@@ -173,14 +173,14 @@ Zilla Frame
 Frame 6: 194 bytes on wire (1552 bits), 194 bytes captured (1552 bits)
 Ethernet II, Src: Send_00 (20:53:45:4e:44:00), Dst: Receive_00 (20:52:45:43:56:00)
 Internet Protocol Version 6, Src: fe80::3f3f:0:0:3, Dst: fe80::3f3f:0:0:2
-Transmission Control Protocol, Src Port: 7114, Dst Port: 0, Seq: 281, Ack: 400, Len: 120
+Transmission Control Protocol, Src Port: 7114, Dst Port: 0, Seq: 289, Ack: 408, Len: 120
 Zilla Frame
     Frame Type ID: 0x00000003
     Frame Type: END
     Protocol Type ID: 0x00000000
     Protocol Type: 
     Worker: 0
-    Offset: 0x000001e0
+    Offset: 0x000001f0
     Origin ID: 0x0000000100000002
     Origin Namespace: test
     Origin Binding: app0

incubator/command-dump/src/test/resources/io/aklivity/zilla/runtime/command/dump/internal/FileSystemApplicationIT_shouldReadFileExtensionOnly.txt

@@ -1,7 +1,7 @@
-Frame 1: 242 bytes on wire (1936 bits), 242 bytes captured (1936 bits)
+Frame 1: 250 bytes on wire (2000 bits), 250 bytes captured (2000 bits)
 Ethernet II, Src: Send_00 (20:53:45:4e:44:00), Dst: Receive_00 (20:52:45:43:56:00)
 Internet Protocol Version 6, Src: fe80::3f3f:0:0:2, Dst: fe80::3f3f:0:0:3
-Transmission Control Protocol, Src Port: 0, Dst Port: 7114, Seq: 0, Ack: 1, Len: 168
+Transmission Control Protocol, Src Port: 0, Dst Port: 7114, Seq: 0, Ack: 1, Len: 176
 Zilla Frame
     Frame Type ID: 0x00000001
     Frame Type: BEGIN
@@ -48,14 +48,14 @@ Zilla Frame
 Frame 2: 211 bytes on wire (1688 bits), 211 bytes captured (1688 bits)
 Ethernet II, Src: Send_00 (20:53:45:4e:44:00), Dst: Receive_00 (20:52:45:43:56:00)
 Internet Protocol Version 6, Src: fe80::3f3f:0:0:2, Dst: fe80::3f3f:0:0:3
-Transmission Control Protocol, Src Port: 0, Dst Port: 7114, Seq: 168, Ack: 1, Len: 137
+Transmission Control Protocol, Src Port: 0, Dst Port: 7114, Seq: 176, Ack: 1, Len: 137
 Zilla Frame
     Frame Type ID: 0x40000002
     Frame Type: WINDOW
     Protocol Type ID: 0x00000000
     Protocol Type: 
     Worker: 0
-    Offset: 0x00000080
+    Offset: 0x00000088
     Origin ID: 0x0000000100000002
     Origin Namespace: test
     Origin Binding: app0
@@ -82,14 +82,14 @@ Zilla Frame
 Frame 3: 194 bytes on wire (1552 bits), 194 bytes captured (1552 bits)
 Ethernet II, Src: Send_00 (20:53:45:4e:44:00), Dst: Receive_00 (20:52:45:43:56:00)
 Internet Protocol Version 6, Src: fe80::3f3f:0:0:2, Dst: fe80::3f3f:0:0:3
-Transmission Control Protocol, Src Port: 0, Dst Port: 7114, Seq: 305, Ack: 1, Len: 120
+Transmission Control Protocol, Src Port: 0, Dst Port: 7114, Seq: 313, Ack: 1, Len: 120
 Zilla Frame
     Frame Type ID: 0x00000003
     Frame Type: END
     Protocol Type ID: 0x00000000
     Protocol Type: 
     Worker: 0
-    Offset: 0x000000e0
+    Offset: 0x000000e8
     Origin ID: 0x0000000100000002
     Origin Namespace: test
     Origin Binding: app0
@@ -107,17 +107,17 @@ Zilla Frame
     Trace ID: 0x8000000000000003
     Authorization: 0x0000000000000000
 
-Frame 4: 251 bytes on wire (2008 bits), 251 bytes captured (2008 bits)
+Frame 4: 259 bytes on wire (2072 bits), 259 bytes captured (2072 bits)
 Ethernet II, Src: Send_00 (20:53:45:4e:44:00), Dst: Receive_00 (20:52:45:43:56:00)
 Internet Protocol Version 6, Src: fe80::3f3f:0:0:3, Dst: fe80::3f3f:0:0:2
-Transmission Control Protocol, Src Port: 7114, Dst Port: 0, Seq: 1, Ack: 425, Len: 177
+Transmission Control Protocol, Src Port: 7114, Dst Port: 0, Seq: 1, Ack: 433, Len: 185
 Zilla Frame
     Frame Type ID: 0x00000001
     Frame Type: BEGIN
     Protocol Type ID: 0x00000000
     Protocol Type: 
     Worker: 0
-    Offset: 0x00000130
+    Offset: 0x00000138
     Origin ID: 0x0000000100000002
     Origin Namespace: test
     Origin Binding: app0
@@ -157,14 +157,14 @@ Zilla Frame
 Frame 5: 194 bytes on wire (1552 bits), 194 bytes captured (1552 bits)
 Ethernet II, Src: Send_00 (20:53:45:4e:44:00), Dst: Receive_00 (20:52:45:43:56:00)
 Internet Protocol Version 6, Src: fe80::3f3f:0:0:3, Dst: fe80::3f3f:0:0:2
-Transmission Control Protocol, Src Port: 7114, Dst Port: 0, Seq: 178, Ack: 425, Len: 120
+Transmission Control Protocol, Src Port: 7114, Dst Port: 0, Seq: 186, Ack: 433, Len: 120
 Zilla Frame
     Frame Type ID: 0x00000003
     Frame Type: END
     Protocol Type ID: 0x00000000
     Protocol Type: 
     Worker: 0
-    Offset: 0x000001b8
+    Offset: 0x000001c8
     Origin ID: 0x0000000100000002
     Origin Namespace: test
     Origin Binding: app0
@@ -185,14 +185,14 @@ Zilla Frame
 Frame 6: 211 bytes on wire (1688 bits), 211 bytes captured (1688 bits)
 Ethernet II, Src: Send_00 (20:53:45:4e:44:00), Dst: Receive_00 (20:52:45:43:56:00)
 Internet Protocol Version 6, Src: fe80::3f3f:0:0:3, Dst: fe80::3f3f:0:0:2
-Transmission Control Protocol, Src Port: 7114, Dst Port: 0, Seq: 298, Ack: 425, Len: 137
+Transmission Control Protocol, Src Port: 7114, Dst Port: 0, Seq: 306, Ack: 433, Len: 137
 Zilla Frame
     Frame Type ID: 0x40000002
     Frame Type: WINDOW
     Protocol Type ID: 0x00000000
     Protocol Type: 
     Worker: 0
-    Offset: 0x00000208
+    Offset: 0x00000218
     Origin ID: 0x0000000100000002
     Origin Namespace: test
     Origin Binding: app0