Fragment validator interface & implementation

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.ConverterConfig;
-import io.aklivity.zilla.runtime.types.core.config.IntegerConverterConfig;
-import io.aklivity.zilla.runtime.types.core.config.StringConverterConfig;
+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;
 
 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, ConverterConfig> converters = Map.of(
-        "string", StringConverterConfig.builder().build(),
-        "integer", IntegerConverterConfig.builder().build()
+    protected final Map<String, ValidatorConfig> validators = Map.of(
+        "string", StringValidatorConfig.builder().build(),
+        "integer", IntegerValidatorConfig.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

@@ -53,13 +53,13 @@
 import io.aklivity.zilla.runtime.engine.config.BindingConfigBuilder;
 import io.aklivity.zilla.runtime.engine.config.CatalogedConfigBuilder;
 import io.aklivity.zilla.runtime.engine.config.ConfigWriter;
-import io.aklivity.zilla.runtime.engine.config.ConverterConfig;
 import io.aklivity.zilla.runtime.engine.config.GuardedConfigBuilder;
 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.JsonConverterConfig;
+import io.aklivity.zilla.runtime.types.json.config.JsonValidatorConfig;
 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(JsonConverterConfig::builder)
+                    content(JsonValidatorConfig::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)
                 {
-                    ConverterConfig converter = converters.get(parameter.schema.type);
-                    if (converter != null)
+                    ValidatorConfig validator = validators.get(parameter.schema.type);
+                    if (validator != null)
                     {
                         request
                             .pathParam()
                                 .name(name)
-                                .converter(converter)
+                                .validator(validator)
                                 .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.JsonConverterConfig;
+import io.aklivity.zilla.runtime.types.json.config.JsonValidatorConfig;
 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(JsonConverterConfig::builder)
+                            .content(JsonValidatorConfig::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

@@ -50,13 +50,13 @@
 import io.aklivity.zilla.runtime.command.generate.internal.openapi.view.ServerView;
 import io.aklivity.zilla.runtime.engine.config.BindingConfigBuilder;
 import io.aklivity.zilla.runtime.engine.config.ConfigWriter;
-import io.aklivity.zilla.runtime.engine.config.ConverterConfig;
 import io.aklivity.zilla.runtime.engine.config.GuardedConfigBuilder;
 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.JsonConverterConfig;
+import io.aklivity.zilla.runtime.types.json.config.JsonValidatorConfig;
 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(JsonConverterConfig::builder)
+                    content(JsonValidatorConfig::builder)
                     .catalog()
                         .name(INLINE_CATALOG_NAME)
                         .schema()
@@ -349,30 +349,30 @@ private <C> HttpRequestConfigBuilder<C> injectParams(
             {
                 if (parameter.schema != null && parameter.schema.type != null)
                 {
-                    ConverterConfig converter = converters.get(parameter.schema.type);
-                    if (converter != null)
+                    ValidatorConfig validator = validators.get(parameter.schema.type);
+                    if (validator != null)
                     {
                         switch (parameter.in)
                         {
                         case "path":
                             request.
                                 pathParam()
                                     .name(parameter.name)
-                                    .converter(converter)
+                                    .validator(validator)
                                     .build();
                             break;
                         case "query":
                             request.
                                 queryParam()
                                     .name(parameter.name)
-                                    .converter(converter)
+                                    .validator(validator)
                                     .build();
                             break;
                         case "header":
                             request.
                                 header()
                                     .name(parameter.name)
-                                    .converter(converter)
+                                    .validator(validator)
                                     .build();
                             break;
                         }

incubator/types-avro/pom.xml

@@ -124,7 +124,7 @@
                   <fileMappers>
                     <org.codehaus.plexus.components.io.filemappers.RegExpFileMapper>
                       <pattern>^\Qio/aklivity/zilla/specs/types/avro/\E</pattern>
-                      <replacement>io/aklivity/zilla/runtime/types/avro/</replacement>
+                      <replacement>io/aklivity/zilla/runtime/types/avro/internal/</replacement>
                     </org.codehaus.plexus.components.io.filemappers.RegExpFileMapper>
                   </fileMappers>
                 </artifactItem>

incubator/types-avro/src/main/java/io/aklivity/zilla/runtime/types/avro/internal/AvroConverter.java

@@ -0,0 +1,45 @@
+/*
+ * Copyright 2021-2023 Aklivity Inc
+ *
+ * Licensed under the Aklivity Community License (the "License"); you may not use
+ * this file except in compliance with the License.  You may obtain a copy of the
+ * License at
+ *
+ *   https://www.aklivity.io/aklivity-community-license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OF ANY KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+package io.aklivity.zilla.runtime.types.avro.internal;
+
+import java.net.URL;
+
+import io.aklivity.zilla.runtime.engine.EngineContext;
+import io.aklivity.zilla.runtime.engine.converter.Converter;
+import io.aklivity.zilla.runtime.engine.converter.ConverterContext;
+
+public class AvroConverter implements Converter
+{
+    public static final String NAME = "avro";
+
+    @Override
+    public String name()
+    {
+        return NAME;
+    }
+
+    @Override
+    public ConverterContext supply(
+        EngineContext context)
+    {
+        return new AvroConverterContext(context);
+    }
+
+    @Override
+    public URL type()
+    {
+        return getClass().getResource("schema/avro.schema.patch.json");
+    }
+}

incubator/types-avro/src/main/java/io/aklivity/zilla/runtime/types/avro/internal/AvroConverterContext.java

@@ -0,0 +1,49 @@
+/*
+ * Copyright 2021-2023 Aklivity Inc
+ *
+ * Licensed under the Aklivity Community License (the "License"); you may not use
+ * this file except in compliance with the License.  You may obtain a copy of the
+ * License at
+ *
+ *   https://www.aklivity.io/aklivity-community-license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OF ANY KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+package io.aklivity.zilla.runtime.types.avro.internal;
+
+import java.util.function.LongFunction;
+
+import io.aklivity.zilla.runtime.engine.EngineContext;
+import io.aklivity.zilla.runtime.engine.catalog.CatalogHandler;
+import io.aklivity.zilla.runtime.engine.config.ConverterConfig;
+import io.aklivity.zilla.runtime.engine.converter.ConverterContext;
+import io.aklivity.zilla.runtime.engine.converter.ConverterHandler;
+import io.aklivity.zilla.runtime.types.avro.config.AvroConverterConfig;
+
+public class AvroConverterContext implements ConverterContext
+{
+    private final LongFunction<CatalogHandler> supplyCatalog;
+
+    public AvroConverterContext(
+        EngineContext context)
+    {
+        this.supplyCatalog = context::supplyCatalog;
+    }
+
+    @Override
+    public ConverterHandler supplyReadHandler(
+        ConverterConfig config)
+    {
+        return new AvroReadConverterHandler(AvroConverterConfig.class.cast(config), supplyCatalog);
+    }
+
+    @Override
+    public ConverterHandler supplyWriteHandler(
+        ConverterConfig config)
+    {
+        return new AvroWriteConverterHandler(AvroConverterConfig.class.cast(config), supplyCatalog);
+    }
+}

incubator/types-avro/src/main/java/io/aklivity/zilla/runtime/types/avro/AvroConverterFactory.java → incubator/types-avro/src/main/java/io/aklivity/zilla/runtime/types/avro/internal/AvroConverterFactorySpi.java

@@ -12,23 +12,20 @@
  * WARRANTIES OF ANY KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package io.aklivity.zilla.runtime.types.avro;
+package io.aklivity.zilla.runtime.types.avro.internal;
 
 import java.net.URL;
-import java.util.function.LongFunction;
 
-import io.aklivity.zilla.runtime.engine.catalog.CatalogHandler;
-import io.aklivity.zilla.runtime.engine.config.ConverterConfig;
+import io.aklivity.zilla.runtime.engine.Configuration;
 import io.aklivity.zilla.runtime.engine.converter.Converter;
 import io.aklivity.zilla.runtime.engine.converter.ConverterFactorySpi;
-import io.aklivity.zilla.runtime.types.avro.config.AvroConverterConfig;
 
-public final class AvroConverterFactory implements ConverterFactorySpi
+public final class AvroConverterFactorySpi implements ConverterFactorySpi
 {
     @Override
     public String type()
     {
-        return "avro";
+        return AvroConverter.NAME;
     }
 
     public URL schema()
@@ -37,18 +34,9 @@ public URL schema()
     }
 
     @Override
-    public Converter createReader(
-        ConverterConfig config,
-        LongFunction<CatalogHandler> supplyCatalog)
+    public Converter create(
+        Configuration config)
     {
-        return new AvroReadConverter(AvroConverterConfig.class.cast(config), supplyCatalog);
-    }
-
-    @Override
-    public Converter createWriter(
-        ConverterConfig config,
-        LongFunction<CatalogHandler> supplyCatalog)
-    {
-        return new AvroWriteConverter(AvroConverterConfig.class.cast(config), supplyCatalog);
+        return new AvroConverter();
     }
 }

incubator/types-avro/src/main/java/io/aklivity/zilla/runtime/types/avro/AvroConverter.java → incubator/types-avro/src/main/java/io/aklivity/zilla/runtime/types/avro/internal/AvroConverterHandler.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.
  */
-package io.aklivity.zilla.runtime.types.avro;
+package io.aklivity.zilla.runtime.types.avro.internal;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -43,7 +43,7 @@
 import io.aklivity.zilla.runtime.engine.config.SchemaConfig;
 import io.aklivity.zilla.runtime.types.avro.config.AvroConverterConfig;
 
-public abstract class AvroConverter
+public abstract class AvroConverterHandler
 {
     protected static final String FORMAT_JSON = "json";
 
@@ -68,7 +68,7 @@ public abstract class AvroConverter
     private final Int2ObjectCache<GenericRecord> records;
     private final Int2IntHashMap paddings;
 
-    protected AvroConverter(
+    protected AvroConverterHandler(
         AvroConverterConfig config,
         LongFunction<CatalogHandler> supplyCatalog)
     {

incubator/types-avro/src/main/java/io/aklivity/zilla/runtime/types/avro/AvroReadConverter.java → incubator/types-avro/src/main/java/io/aklivity/zilla/runtime/types/avro/internal/AvroReadConverterHandler.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.
  */
-package io.aklivity.zilla.runtime.types.avro;
+package io.aklivity.zilla.runtime.types.avro.internal;
 
 import static io.aklivity.zilla.runtime.engine.catalog.CatalogHandler.NO_SCHEMA_ID;
 
@@ -28,13 +28,13 @@
 import org.apache.avro.io.JsonEncoder;
 
 import io.aklivity.zilla.runtime.engine.catalog.CatalogHandler;
-import io.aklivity.zilla.runtime.engine.converter.Converter;
+import io.aklivity.zilla.runtime.engine.converter.ConverterHandler;
 import io.aklivity.zilla.runtime.engine.converter.function.ValueConsumer;
 import io.aklivity.zilla.runtime.types.avro.config.AvroConverterConfig;
 
-public class AvroReadConverter extends AvroConverter implements Converter
+public class AvroReadConverterHandler extends AvroConverterHandler implements ConverterHandler
 {
-    public AvroReadConverter(
+    public AvroReadConverterHandler(
         AvroConverterConfig config,
         LongFunction<CatalogHandler> supplyCatalog)
     {

incubator/types-avro/src/main/java/io/aklivity/zilla/runtime/types/avro/AvroWriteConverter.java → incubator/types-avro/src/main/java/io/aklivity/zilla/runtime/types/avro/internal/AvroWriteConverterHandler.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.
  */
-package io.aklivity.zilla.runtime.types.avro;
+package io.aklivity.zilla.runtime.types.avro.internal;
 
 import java.io.IOException;
 import java.util.function.LongFunction;
@@ -25,13 +25,13 @@
 import org.apache.avro.generic.GenericRecord;
 
 import io.aklivity.zilla.runtime.engine.catalog.CatalogHandler;
-import io.aklivity.zilla.runtime.engine.converter.Converter;
+import io.aklivity.zilla.runtime.engine.converter.ConverterHandler;
 import io.aklivity.zilla.runtime.engine.converter.function.ValueConsumer;
 import io.aklivity.zilla.runtime.types.avro.config.AvroConverterConfig;
 
-public class AvroWriteConverter extends AvroConverter implements Converter
+public class AvroWriteConverterHandler extends AvroConverterHandler implements ConverterHandler
 {
-    public AvroWriteConverter(
+    public AvroWriteConverterHandler(
         AvroConverterConfig config,
         LongFunction<CatalogHandler> supplyCatalog)
     {

incubator/types-avro/src/main/java/io/aklivity/zilla/runtime/types/avro/config/AvroConverterConfigAdapter.java → incubator/types-avro/src/main/java/io/aklivity/zilla/runtime/types/avro/internal/config/AvroConverterConfigAdapter.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.
  */
-package io.aklivity.zilla.runtime.types.avro.config;
+package io.aklivity.zilla.runtime.types.avro.internal.config;
 
 import java.util.LinkedList;
 import java.util.List;
@@ -30,6 +30,7 @@
 import io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi;
 import io.aklivity.zilla.runtime.engine.config.SchemaConfig;
 import io.aklivity.zilla.runtime.engine.config.SchemaConfigAdapter;
+import io.aklivity.zilla.runtime.types.avro.config.AvroConverterConfig;
 
 public final class AvroConverterConfigAdapter implements ConverterConfigAdapterSpi, JsonbAdapter<ConverterConfig, JsonValue>
 {