model and view changes

cloud/docker-image/pom.xml

@@ -344,25 +344,25 @@
         </dependency>
         <dependency>
           <groupId>${project.groupId}</groupId>
-          <artifactId>types-avro</artifactId>
+          <artifactId>model-avro</artifactId>
           <version>${project.version}</version>
           <scope>runtime</scope>
         </dependency>
         <dependency>
           <groupId>${project.groupId}</groupId>
-          <artifactId>types-core</artifactId>
+          <artifactId>model-core</artifactId>
           <version>${project.version}</version>
           <scope>runtime</scope>
         </dependency>
         <dependency>
           <groupId>${project.groupId}</groupId>
-          <artifactId>types-json</artifactId>
+          <artifactId>model-json</artifactId>
           <version>${project.version}</version>
           <scope>runtime</scope>
         </dependency>
         <dependency>
           <groupId>${project.groupId}</groupId>
-          <artifactId>types-protobuf</artifactId>
+          <artifactId>model-protobuf</artifactId>
           <version>${project.version}</version>
           <scope>runtime</scope>
         </dependency>

cloud/docker-image/src/main/docker/assembly.xml

@@ -31,7 +31,7 @@
         <include>io/aklivity/zilla/exporter-*/**</include>
         <include>io/aklivity/zilla/guard-*/**</include>
         <include>io/aklivity/zilla/metrics-*/**</include>
-        <include>io/aklivity/zilla/types-*/**</include>
+        <include>io/aklivity/zilla/model-*/**</include>
         <include>io/aklivity/zilla/vault-*/**</include>
         <include>io/aklivity/zilla/command/**</include>
         <include>io/aklivity/zilla/command-*/**</include>

cloud/docker-image/src/main/docker/incubator/zpm.json.template

@@ -48,10 +48,10 @@
     "io.aklivity.zilla:metrics-stream",
     "io.aklivity.zilla:metrics-http",
     "io.aklivity.zilla:metrics-grpc",
-    "io.aklivity.zilla:types-avro",
-    "io.aklivity.zilla:types-core",
-    "io.aklivity.zilla:types-json",
-    "io.aklivity.zilla:types-protobuf",
+    "io.aklivity.zilla:model-avro",
+    "io.aklivity.zilla:model-core",
+    "io.aklivity.zilla:model-json",
+    "io.aklivity.zilla:model-protobuf",
     "io.aklivity.zilla:vault-filesystem",
     "org.slf4j:slf4j-simple",
     "org.antlr:antlr4-runtime"

incubator/catalog-inline/src/test/java/io/aklivity/zilla/runtime/catalog/inline/internal/InlineIT.java

@@ -28,7 +28,7 @@
 import io.aklivity.zilla.runtime.catalog.inline.config.InlineOptionsConfig;
 import io.aklivity.zilla.runtime.catalog.inline.config.InlineSchemaConfig;
 import io.aklivity.zilla.runtime.engine.catalog.CatalogHandler;
-import io.aklivity.zilla.runtime.engine.converter.function.ValueConsumer;
+import io.aklivity.zilla.runtime.engine.model.function.ValueConsumer;
 
 public class InlineIT
 {

incubator/catalog-schema-registry/src/main/java/io/aklivity/zilla/runtime/catalog/schema/registry/internal/SchemaRegistryCatalogHandler.java

@@ -31,7 +31,7 @@
 import io.aklivity.zilla.runtime.catalog.schema.registry.internal.serializer.RegisterSchemaRequest;
 import io.aklivity.zilla.runtime.catalog.schema.registry.internal.types.SchemaRegistryPrefixFW;
 import io.aklivity.zilla.runtime.engine.catalog.CatalogHandler;
-import io.aklivity.zilla.runtime.engine.converter.function.ValueConsumer;
+import io.aklivity.zilla.runtime.engine.model.function.ValueConsumer;
 
 public class SchemaRegistryCatalogHandler implements CatalogHandler
 {

incubator/catalog-schema-registry/src/test/java/io/aklivity/zilla/runtime/catalog/schema/registry/internal/SchemaRegistryIT.java

@@ -36,7 +36,7 @@
 
 import io.aklivity.zilla.runtime.catalog.schema.registry.internal.config.SchemaRegistryOptionsConfig;
 import io.aklivity.zilla.runtime.engine.catalog.CatalogHandler;
-import io.aklivity.zilla.runtime.engine.converter.function.ValueConsumer;
+import io.aklivity.zilla.runtime.engine.model.function.ValueConsumer;
 
 public class SchemaRegistryIT
 {

incubator/command-generate/pom.xml

@@ -87,25 +87,25 @@
     </dependency>
     <dependency>
       <groupId>io.aklivity.zilla</groupId>
-      <artifactId>types-avro</artifactId>
+      <artifactId>model-avro</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>io.aklivity.zilla</groupId>
-      <artifactId>types-core</artifactId>
+      <artifactId>model-core</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>io.aklivity.zilla</groupId>
-      <artifactId>types-json</artifactId>
+      <artifactId>model-json</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>io.aklivity.zilla</groupId>
-      <artifactId>types-protobuf</artifactId>
+      <artifactId>model-protobuf</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>

incubator/command-generate/src/main/java/io/aklivity/zilla/runtime/command/generate/internal/airline/ConfigGenerator.java

@@ -28,9 +28,9 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.yaml.YAMLMapper;
 
-import io.aklivity.zilla.runtime.engine.config.ValidatorConfig;
-import io.aklivity.zilla.runtime.types.core.config.IntegerValidatorConfig;
-import io.aklivity.zilla.runtime.types.core.config.StringValidatorConfig;
+import io.aklivity.zilla.runtime.engine.config.ModelConfig;
+import io.aklivity.zilla.runtime.model.core.config.IntegerModelConfig;
+import io.aklivity.zilla.runtime.model.core.config.StringModelConfig;
 
 public abstract class ConfigGenerator
 {
@@ -40,9 +40,9 @@ public abstract class ConfigGenerator
     protected static final String VERSION_LATEST = "latest";
     protected static final Pattern JSON_CONTENT_TYPE = Pattern.compile("^application/(?:.+\\+)?json$");
 
-    protected final Map<String, ValidatorConfig> validators = Map.of(
-        "string", StringValidatorConfig.builder().build(),
-        "integer", IntegerValidatorConfig.builder().build()
+    protected final Map<String, ModelConfig> models = Map.of(
+        "string", StringModelConfig.builder().build(),
+        "integer", IntegerModelConfig.builder().build()
     );
     protected final Matcher jsonContentType = JSON_CONTENT_TYPE.matcher("");
 

incubator/command-generate/src/main/java/io/aklivity/zilla/runtime/command/generate/internal/asyncapi/http/proxy/AsyncApiHttpProxyConfigGenerator.java

@@ -54,12 +54,12 @@
 import io.aklivity.zilla.runtime.engine.config.CatalogedConfigBuilder;
 import io.aklivity.zilla.runtime.engine.config.ConfigWriter;
 import io.aklivity.zilla.runtime.engine.config.GuardedConfigBuilder;
+import io.aklivity.zilla.runtime.engine.config.ModelConfig;
 import io.aklivity.zilla.runtime.engine.config.NamespaceConfig;
 import io.aklivity.zilla.runtime.engine.config.NamespaceConfigBuilder;
 import io.aklivity.zilla.runtime.engine.config.RouteConfigBuilder;
-import io.aklivity.zilla.runtime.engine.config.ValidatorConfig;
 import io.aklivity.zilla.runtime.guard.jwt.config.JwtOptionsConfig;
-import io.aklivity.zilla.runtime.types.json.config.JsonValidatorConfig;
+import io.aklivity.zilla.runtime.model.json.config.JsonModelConfig;
 import io.aklivity.zilla.runtime.vault.filesystem.config.FileSystemOptionsConfig;
 
 public class AsyncApiHttpProxyConfigGenerator extends AsyncApiConfigGenerator
@@ -355,7 +355,7 @@ private <C> HttpRequestConfigBuilder<C> injectContent(
             if (hasJsonContentType())
             {
                 request.
-                    content(JsonValidatorConfig::builder)
+                    content(JsonModelConfig::builder)
                         .catalog()
                             .name(INLINE_CATALOG_NAME)
                             .inject(catalog -> injectSchemas(catalog, messages))
@@ -394,13 +394,13 @@ private <C> HttpRequestConfigBuilder<C> injectPathParams(
                 Parameter parameter = parameters.get(name);
                 if (parameter.schema != null && parameter.schema.type != null)
                 {
-                    ValidatorConfig validator = validators.get(parameter.schema.type);
-                    if (validator != null)
+                    ModelConfig model = models.get(parameter.schema.type);
+                    if (model != null)
                     {
                         request
                             .pathParam()
                                 .name(name)
-                                .validator(validator)
+                                .model(model)
                                 .build();
                     }
                 }

incubator/command-generate/src/main/java/io/aklivity/zilla/runtime/command/generate/internal/asyncapi/mqtt/proxy/AsyncApiMqttProxyConfigGenerator.java

@@ -46,7 +46,7 @@
 import io.aklivity.zilla.runtime.engine.config.ConfigWriter;
 import io.aklivity.zilla.runtime.engine.config.NamespaceConfig;
 import io.aklivity.zilla.runtime.engine.config.NamespaceConfigBuilder;
-import io.aklivity.zilla.runtime.types.json.config.JsonValidatorConfig;
+import io.aklivity.zilla.runtime.model.json.config.JsonModelConfig;
 import io.aklivity.zilla.runtime.vault.filesystem.config.FileSystemOptionsConfig;
 
 public class AsyncApiMqttProxyConfigGenerator extends AsyncApiConfigGenerator
@@ -248,7 +248,7 @@ private BindingConfigBuilder<NamespaceConfigBuilder<NamespaceConfig>> injectMqtt
                     .options(MqttOptionsConfig::builder)
                         .topic()
                             .name(topic)
-                            .content(JsonValidatorConfig::builder)
+                            .content(JsonModelConfig::builder)
                                 .catalog()
                                     .name(INLINE_CATALOG_NAME)
                                     .inject(cataloged -> injectJsonSchemas(cataloged, messages, APPLICATION_JSON))

incubator/command-generate/src/main/java/io/aklivity/zilla/runtime/command/generate/internal/openapi/http/proxy/OpenApiHttpProxyConfigGenerator.java

@@ -51,12 +51,12 @@
 import io.aklivity.zilla.runtime.engine.config.BindingConfigBuilder;
 import io.aklivity.zilla.runtime.engine.config.ConfigWriter;
 import io.aklivity.zilla.runtime.engine.config.GuardedConfigBuilder;
+import io.aklivity.zilla.runtime.engine.config.ModelConfig;
 import io.aklivity.zilla.runtime.engine.config.NamespaceConfig;
 import io.aklivity.zilla.runtime.engine.config.NamespaceConfigBuilder;
 import io.aklivity.zilla.runtime.engine.config.RouteConfigBuilder;
-import io.aklivity.zilla.runtime.engine.config.ValidatorConfig;
 import io.aklivity.zilla.runtime.guard.jwt.config.JwtOptionsConfig;
-import io.aklivity.zilla.runtime.types.json.config.JsonValidatorConfig;
+import io.aklivity.zilla.runtime.model.json.config.JsonModelConfig;
 import io.aklivity.zilla.runtime.vault.filesystem.config.FileSystemOptionsConfig;
 
 public class OpenApiHttpProxyConfigGenerator extends OpenApiConfigGenerator
@@ -326,7 +326,7 @@ private <C> HttpRequestConfigBuilder<C> injectContent(
             if (schema != null)
             {
                 request.
-                    content(JsonValidatorConfig::builder)
+                    content(JsonModelConfig::builder)
                     .catalog()
                         .name(INLINE_CATALOG_NAME)
                         .schema()
@@ -349,30 +349,30 @@ private <C> HttpRequestConfigBuilder<C> injectParams(
             {
                 if (parameter.schema != null && parameter.schema.type != null)
                 {
-                    ValidatorConfig validator = validators.get(parameter.schema.type);
-                    if (validator != null)
+                    ModelConfig model = models.get(parameter.schema.type);
+                    if (model != null)
                     {
                         switch (parameter.in)
                         {
                         case "path":
                             request.
                                 pathParam()
                                     .name(parameter.name)
-                                    .validator(validator)
+                                    .model(model)
                                     .build();
                             break;
                         case "query":
                             request.
                                 queryParam()
                                     .name(parameter.name)
-                                    .validator(validator)
+                                    .model(model)
                                     .build();
                             break;
                         case "header":
                             request.
                                 header()
                                     .name(parameter.name)
-                                    .validator(validator)
+                                    .model(model)
                                     .build();
                             break;
                         }

incubator/command-generate/src/main/moditect/module-info.java

@@ -23,10 +23,10 @@
     requires io.aklivity.zilla.runtime.catalog.inline;
     requires io.aklivity.zilla.runtime.guard.jwt;
     requires io.aklivity.zilla.runtime.vault.filesystem;
-    requires io.aklivity.zilla.runtime.types.avro;
-    requires io.aklivity.zilla.runtime.types.core;
-    requires io.aklivity.zilla.runtime.types.json;
-    requires io.aklivity.zilla.runtime.types.protobuf;
+    requires io.aklivity.zilla.runtime.model.avro;
+    requires io.aklivity.zilla.runtime.model.core;
+    requires io.aklivity.zilla.runtime.model.json;
+    requires io.aklivity.zilla.runtime.model.protobuf;
 
     requires com.fasterxml.jackson.dataformat.yaml;
     requires com.fasterxml.jackson.databind;

incubator/command-generate/src/test/resources/io/aklivity/zilla/runtime/command/generate/internal/asyncapi/http/proxy/complete/zilla.yaml

@@ -45,14 +45,14 @@ bindings:
           path:
             id: string
         content:
-          type: json
+          model: json
           catalog:
             catalog0:
             - subject: item
       - path: /items
         method: POST
         content:
-          type: json
+          model: json
           catalog:
             catalog0:
             - subject: item

incubator/command-generate/src/test/resources/io/aklivity/zilla/runtime/command/generate/internal/asyncapi/http/proxy/validator/zilla.yaml

@@ -23,14 +23,14 @@ bindings:
           path:
             id: string
         content:
-          type: json
+          model: json
           catalog:
             catalog0:
             - subject: item
       - path: /items
         method: POST
         content:
-          type: json
+          model: json
           catalog:
             catalog0:
             - subject: item

incubator/command-generate/src/test/resources/io/aklivity/zilla/runtime/command/generate/internal/asyncapi/mqtt/proxy/complete/zilla.yaml

@@ -34,7 +34,7 @@ bindings:
       topics:
       - name: smartylighting/streetlights/1/0/event/*/lighting/measured
         content:
-          type: json
+          model: json
           catalog:
             catalog0:
             - subject: items

incubator/command-generate/src/test/resources/io/aklivity/zilla/runtime/command/generate/internal/asyncapi/mqtt/proxy/validator/zilla.yaml

@@ -17,7 +17,7 @@ bindings:
       topics:
       - name: smartylighting/streetlights/1/0/event/*/lighting/measured
         content:
-          type: json
+          model: json
           catalog:
             catalog0:
             - subject: items

incubator/command-generate/src/test/resources/io/aklivity/zilla/runtime/command/generate/internal/openapi/http/proxy/complete/zilla.yaml

@@ -47,7 +47,7 @@ bindings:
       - path: /items
         method: POST
         content:
-          type: json
+          model: json
           catalog:
             catalog0:
             - subject: Item

incubator/command-generate/src/test/resources/io/aklivity/zilla/runtime/command/generate/internal/openapi/http/proxy/jwt/zilla.yaml

@@ -25,7 +25,7 @@ bindings:
       - path: /items
         method: POST
         content:
-          type: json
+          model: json
           catalog:
             catalog0:
             - subject: Item

incubator/command-generate/src/test/resources/io/aklivity/zilla/runtime/command/generate/internal/openapi/http/proxy/validator/zilla.yaml

@@ -25,7 +25,7 @@ bindings:
       - path: /items
         method: POST
         content:
-          type: json
+          model: json
           catalog:
             catalog0:
             - subject: Item

incubator/types-avro.spec/pom.xml → incubator/model-avro.spec/pom.xml

@@ -12,8 +12,8 @@
     <relativePath>../pom.xml</relativePath>
   </parent>
 
-  <artifactId>types-avro.spec</artifactId>
-  <name>zilla::incubator::types-avro.spec</name>
+  <artifactId>model-avro.spec</artifactId>
+  <name>zilla::incubator::model-avro.spec</name>
 
   <licenses>
     <license>
@@ -79,7 +79,7 @@
         <version>${project.version}</version>
         <configuration>
           <scopeNames>core</scopeNames>
-          <packageName>io.aklivity.zilla.specs.types.avro.internal.types</packageName>
+          <packageName>io.aklivity.zilla.specs.model.avro.internal.types</packageName>
         </configuration>
         <executions>
           <execution>
@@ -135,7 +135,7 @@
         <artifactId>jacoco-maven-plugin</artifactId>
         <configuration>
           <excludes>
-            <exclude>io/aklivity/zilla/specs/types/avro/internal/types/**/*.class</exclude>
+            <exclude>io/aklivity/zilla/specs/model/avro/internal/types/**/*.class</exclude>
           </excludes>
           <rules>
             <rule>

incubator/types-json.spec/src/main/moditect/module-info.java → incubator/model-avro.spec/src/main/moditect/module-info.java

@@ -12,7 +12,7 @@
  * WARRANTIES OF ANY KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations under the License.
  */
-open module io.aklivity.zilla.specs.types.json
+open module io.aklivity.zilla.specs.model.avro
 {
     requires transitive io.aklivity.zilla.specs.engine;
 }

incubator/types-avro.spec/src/main/scripts/io/aklivity/zilla/specs/types/avro/config/converter.yaml → incubator/model-avro.spec/src/main/scripts/io/aklivity/zilla/specs/model/avro/config/model.yaml

@@ -41,8 +41,8 @@ bindings:
     type: test
     options:
       value:
-        type: avro
-        format: json
+        model: avro
+        view: json
         catalog:
           catalog0:
             - subject: test0