Schema fixes + avoiding duplicate reply begin on mqtt-kafka subscribe stream

incubator/binding-asyncapi.spec/NOTICE

@@ -21,7 +21,10 @@ This project includes:
   zilla::specs::binding-mqtt-kafka.spec under Aklivity Community License Agreement
   zilla::specs::binding-mqtt.spec under The Apache Software License, Version 2.0
   zilla::specs::binding-proxy.spec under The Apache Software License, Version 2.0
+  zilla::specs::binding-tcp.spec under The Apache Software License, Version 2.0
+  zilla::specs::binding-tls.spec under The Apache Software License, Version 2.0
   zilla::specs::engine.spec under The Apache Software License, Version 2.0
+  zilla::specs::vault-filesystem.spec under The Apache Software License, Version 2.0
 
 
 This project also includes code under copyright of the following entities:

incubator/binding-asyncapi.spec/pom.xml

@@ -60,6 +60,16 @@
       <artifactId>binding-mqtt-kafka.spec</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>binding-tcp.spec</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>binding-tls.spec</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

incubator/binding-asyncapi.spec/src/main/scripts/io/aklivity/zilla/specs/binding/asyncapi/schema/asyncapi.schema.patch.json

@@ -52,15 +52,24 @@
                                     "maxProperties": 1
                                 }
                             },
-                            "tcp": "#/$defs/binding/tcp/options",
-                            "tls": "#/$defs/binding/tls/options",
+                            "tcp":
+                            {
+                                "$ref": "#/$defs/options/binding/tcp"
+                            },
+                            "tls":
+                            {
+                                "$ref": "#/$defs/options/binding/tls"
+                            },
                             "http":
                             {
                                 "title": "Http",
                                 "type": "object",
                                 "properties":
                                 {
-                                    "authorization": "$defs/options/binding/http/authorization"
+                                    "authorization":
+                                    {
+                                        "$ref": "#/$defs/options/binding/http/authorization"
+                                    }
                                 },
                                 "additionalProperties": false
                             },
@@ -70,7 +79,10 @@
                                 "type": "object",
                                 "properties":
                                 {
-                                    "sasl": "$defs/options/binding/kafka/sasl"
+                                    "sasl":
+                                    {
+                                        "$ref": "#/$defs/options/binding/kafka/sasl"
+                                    }
                                 },
                                 "additionalProperties": false
                             },

incubator/binding-asyncapi.spec/src/test/java/io/aklivity/zilla/specs/binding/asyncapi/config/SchemaTest.java

@@ -31,6 +31,11 @@ public class SchemaTest
     @Rule
     public final ConfigSchemaRule schema = new ConfigSchemaRule()
         .schemaPatch("io/aklivity/zilla/specs/binding/asyncapi/schema/asyncapi.schema.patch.json")
+        .schemaPatch("io/aklivity/zilla/specs/binding/tls/schema/tls.schema.patch.json")
+        .schemaPatch("io/aklivity/zilla/specs/binding/tcp/schema/tcp.schema.patch.json")
+        .schemaPatch("io/aklivity/zilla/specs/binding/kafka/schema/kafka.schema.patch.json")
+        .schemaPatch("io/aklivity/zilla/specs/binding/http/schema/http.schema.patch.json")
+        .schemaPatch("io/aklivity/zilla/specs/binding/mqtt/kafka/schema/mqtt.kafka.schema.patch.json")
         .schemaPatch("io/aklivity/zilla/specs/engine/schema/vault/test.schema.patch.json")
         .configurationRoot("io/aklivity/zilla/specs/binding/asyncapi/config");
 

incubator/binding-asyncapi/pom.xml

@@ -209,6 +209,11 @@
                 </artifactItem>
               </artifactItems>
               <includes>io/aklivity/zilla/specs/binding/asyncapi/schema/asyncapi.schema.patch.json,
+                io/aklivity/zilla/specs/binding/mqtt/kafka/schema/mqtt.kafka.schema.patch.json,
+                io/aklivity/zilla/specs/binding/http/schema/http.schema.patch.json,
+                io/aklivity/zilla/specs/binding/kafka/schema/kafka.schema.patch.json,
+                io/aklivity/zilla/specs/binding/tcp/schema/tcp.schema.patch.json,
+                io/aklivity/zilla/specs/binding/tls/schema/tls.schema.patch.json,
                 io/aklivity/zilla/specs/binding/asyncapi/schema/asyncapi.2.6.0.schema.json,
                 io/aklivity/zilla/specs/binding/asyncapi/schema/asyncapi.3.0.1.schema.json
               </includes>

incubator/binding-openapi-asyncapi.spec/NOTICE

@@ -21,7 +21,10 @@ This project includes:
   zilla::specs::binding-mqtt-kafka.spec under Aklivity Community License Agreement
   zilla::specs::binding-mqtt.spec under The Apache Software License, Version 2.0
   zilla::specs::binding-proxy.spec under The Apache Software License, Version 2.0
+  zilla::specs::binding-tcp.spec under The Apache Software License, Version 2.0
+  zilla::specs::binding-tls.spec under The Apache Software License, Version 2.0
   zilla::specs::engine.spec under The Apache Software License, Version 2.0
+  zilla::specs::vault-filesystem.spec under The Apache Software License, Version 2.0
 
 
 This project also includes code under copyright of the following entities:

incubator/binding-openapi-asyncapi/pom.xml

@@ -58,6 +58,11 @@
       <artifactId>binding-http-kafka</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>io.aklivity.zilla</groupId>
+      <artifactId>binding-mqtt-kafka</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>io.aklivity.zilla</groupId>
       <artifactId>binding-http</artifactId>

incubator/binding-openapi.spec/NOTICE

@@ -16,7 +16,10 @@ This project includes:
   org.leadpony.justify under The Apache Software License, Version 2.0
   zilla::specs::binding-http.spec under The Apache Software License, Version 2.0
   zilla::specs::binding-proxy.spec under The Apache Software License, Version 2.0
+  zilla::specs::binding-tcp.spec under The Apache Software License, Version 2.0
+  zilla::specs::binding-tls.spec under The Apache Software License, Version 2.0
   zilla::specs::engine.spec under The Apache Software License, Version 2.0
+  zilla::specs::vault-filesystem.spec under The Apache Software License, Version 2.0
 
 
 This project also includes code under copyright of the following entities:

incubator/binding-openapi.spec/pom.xml

@@ -46,6 +46,16 @@
       <artifactId>binding-http.spec</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>binding-tls.spec</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>binding-tcp.spec</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

incubator/binding-openapi.spec/src/main/scripts/io/aklivity/zilla/specs/binding/openapi/schema/openapi.schema.patch.json

@@ -35,15 +35,24 @@
                     {
                         "properties":
                         {
-                            "tcp": "#/$defs/binding/tcp/options",
-                            "tls": "#/$defs/binding/tls/options",
+                            "tcp":
+                            {
+                                "$ref": "#/$defs/options/binding/tcp"
+                            },
+                            "tls":
+                            {
+                                "$ref": "#/$defs/options/binding/tls"
+                            },
                             "http":
                             {
                                 "title": "Http",
                                 "type": "object",
                                 "properties":
                                 {
-                                    "authorization": "$defs/options/binding/http/authorization"
+                                    "authorization":
+                                    {
+                                        "$ref": "#/$defs/options/binding/http/authorization"
+                                    }
                                 },
                                 "additionalProperties": false
                             },

incubator/binding-openapi.spec/src/test/java/io/aklivity/zilla/specs/binding/openapi/config/SchemaTest.java

@@ -31,6 +31,9 @@ public class SchemaTest
     @Rule
     public final ConfigSchemaRule schema = new ConfigSchemaRule()
         .schemaPatch("io/aklivity/zilla/specs/binding/openapi/schema/openapi.schema.patch.json")
+        .schemaPatch("io/aklivity/zilla/specs/binding/tls/schema/tls.schema.patch.json")
+        .schemaPatch("io/aklivity/zilla/specs/binding/tcp/schema/tcp.schema.patch.json")
+        .schemaPatch("io/aklivity/zilla/specs/binding/http/schema/http.schema.patch.json")
         .schemaPatch("io/aklivity/zilla/specs/engine/schema/vault/test.schema.patch.json")
         .configurationRoot("io/aklivity/zilla/specs/binding/openapi/config");
 
@@ -42,6 +45,14 @@ public void shouldValidateServer()
         assertThat(config, not(nullValue()));
     }
 
+    @Test
+    public void shouldValidateServerSecure()
+    {
+        JsonObject config = schema.validate("server-secure.yaml");
+
+        assertThat(config, not(nullValue()));
+    }
+
     @Test
     public void shouldValidateClient()
     {

incubator/binding-openapi/pom.xml

@@ -174,6 +174,9 @@
                 </artifactItem>
               </artifactItems>
               <includes>io/aklivity/zilla/specs/binding/openapi/schema/openapi.schema.patch.json,
+                io/aklivity/zilla/specs/binding/http/schema/http.schema.patch.json,
+                io/aklivity/zilla/specs/binding/tcp/schema/tcp.schema.patch.json,
+                io/aklivity/zilla/specs/binding/tls/schema/tls.schema.patch.json,
                 io/aklivity/zilla/specs/binding/openapi/schema/openapi.3.0.3.schema.json,
                 io/aklivity/zilla/specs/binding/openapi/schema/openapi.3.1.0.schema.json
               </includes>

runtime/binding-mqtt-kafka/src/main/java/io/aklivity/zilla/runtime/binding/mqtt/kafka/internal/stream/MqttKafkaSubscribeFactory.java

@@ -692,10 +692,13 @@ private void doMqttBegin(
             long authorization,
             long affinity)
         {
-            state = MqttKafkaState.openingReply(state);
+            if (!MqttKafkaState.replyOpening(state))
+            {
+                state = MqttKafkaState.openingReply(state);
 
-            doBegin(mqtt, originId, routedId, replyId, replySeq, replyAck, replyMax,
-                traceId, authorization, affinity);
+                doBegin(mqtt, originId, routedId, replyId, replySeq, replyAck, replyMax,
+                    traceId, authorization, affinity);
+            }
         }
 
         private void doMqttData(

specs/binding-http.spec/src/main/scripts/io/aklivity/zilla/specs/binding/http/schema/http.schema.patch.json

@@ -147,7 +147,10 @@
                                     }
                                 ]
                             },
-                            "authorization": "$defs/options/binding/http/authorization",
+                            "authorization":
+                            {
+                                "$ref": "#/$defs/options/binding/http/authorization"
+                            },
                             "overrides":
                             {
                                 "title": "Overrides",

specs/binding-kafka.spec/src/main/scripts/io/aklivity/zilla/specs/binding/kafka/schema/kafka.schema.patch.json

@@ -101,7 +101,10 @@
                                     "pattern": "([^\\:]+):(\\d+)"
                                 }
                             },
-                            "sasl": "$defs/options/binding/kafka/sasl"
+                            "sasl":
+                            {
+                                "$ref": "#/$defs/options/binding/kafka/sasl"
+                            }
                         },
                         "additionalProperties": false
                     },

specs/binding-mqtt-kafka.spec/src/main/scripts/io/aklivity/zilla/specs/binding/mqtt/kafka/schema/mqtt.kafka.schema.patch.json

@@ -11,7 +11,7 @@
         {
             "if":
             {
-               "properties":
+                "properties":
                 {
                     "type":
                     {

specs/binding-tcp.spec/src/main/scripts/io/aklivity/zilla/specs/binding/tcp/schema/tcp.schema.patch.json

@@ -34,45 +34,7 @@
                     "vault": false,
                     "options":
                     {
-                        "properties":
-                        {
-                            "host":
-                            {
-                                "title": "Host",
-                                "type": "string"
-                            },
-                            "port":
-                            {
-                                "title": "Port",
-                                "oneOf":
-                                [
-                                    {
-                                        "type": "integer"
-                                    },
-                                    {
-                                        "type": "string",
-                                        "pattern": "^\\d+(-\\d+)?$"
-                                    },
-                                    {
-                                        "type": "array",
-                                        "items":
-                                        {
-                                            "oneOf":
-                                            [
-                                                {
-                                                    "type": "integer"
-                                                },
-                                                {
-                                                    "type": "string",
-                                                    "pattern": "^\\d+(-\\d+)?$"
-                                                }
-                                            ]
-                                        }
-                                    }
-                                ]
-                            }
-                        },
-                        "additionalProperties": false
+                        "$ref": "#/$defs/options/binding/tcp"
                     },
                     "routes":
                     {
@@ -195,5 +157,51 @@
                 ]
             }
         }
+    },
+    {
+        "op": "add",
+        "path": "/$defs/options/binding/tcp",
+        "value":
+        {
+            "properties":
+            {
+                "host":
+                {
+                    "title": "Host",
+                    "type": "string"
+                },
+                "port":
+                {
+                    "title": "Port",
+                    "oneOf":
+                    [
+                        {
+                            "type": "integer"
+                        },
+                        {
+                            "type": "string",
+                            "pattern": "^\\d+(-\\d+)?$"
+                        },
+                        {
+                            "type": "array",
+                            "items":
+                            {
+                                "oneOf":
+                                [
+                                    {
+                                        "type": "integer"
+                                    },
+                                    {
+                                        "type": "string",
+                                        "pattern": "^\\d+(-\\d+)?$"
+                                    }
+                                ]
+                            }
+                        }
+                    ]
+                }
+            },
+            "additionalProperties": false
+        }
     }
 ]