From 7a75a3fc91f3bcec82daf395c8fdbce6b6fca59d Mon Sep 17 00:00:00 2001 From: Ankit Kumar Date: Thu, 25 Jan 2024 11:08:25 +0530 Subject: [PATCH 1/4] refactoring types-* modules to model-* modules --- cloud/docker-image/pom.xml | 8 +++---- .../docker-image/src/main/docker/assembly.xml | 1 + .../main/docker/incubator/zpm.json.template | 8 +++---- incubator/command-generate/pom.xml | 8 +++---- .../COPYRIGHT | 0 .../LICENSE | 0 .../NOTICE | 0 .../NOTICE.template | 0 .../{types-avro.spec => model-avro.spec}/mvnw | 0 .../mvnw.cmd | 0 .../pom.xml | 4 ++-- .../src/main/moditect/module-info.java | 0 .../specs/types/avro/config/converter.yaml | 0 .../types/avro/schema/avro.schema.patch.json | 0 .../specs/types/avro/config/SchemaTest.java | 0 .../{types-avro => model-avro}/COPYRIGHT | 0 incubator/{types-avro => model-avro}/LICENSE | 0 incubator/{types-avro => model-avro}/NOTICE | 0 .../NOTICE.template | 0 incubator/{types-avro => model-avro}/mvnw | 0 incubator/{types-avro => model-avro}/mvnw.cmd | 0 incubator/{types-avro => model-avro}/pom.xml | 8 +++---- .../avro/config/AvroConverterConfig.java | 0 .../config/AvroConverterConfigBuilder.java | 0 .../types/avro/internal/AvroConverter.java | 0 .../avro/internal/AvroConverterContext.java | 0 .../internal/AvroConverterFactorySpi.java | 0 .../avro/internal/AvroConverterHandler.java | 0 .../internal/AvroReadConverterHandler.java | 0 .../internal/AvroWriteConverterHandler.java | 0 .../config/AvroConverterConfigAdapter.java | 0 .../src/main/moditect/module-info.java | 0 ...me.engine.config.ConverterConfigAdapterSpi | 0 ...ntime.engine.converter.ConverterFactorySpi | 0 .../internal/AvroConverterFactorySpiTest.java | 0 .../avro/internal/AvroConverterTest.java | 0 .../AvroConverterConfigAdapterTest.java | 0 .../COPYRIGHT | 0 .../LICENSE | 0 .../NOTICE | 0 .../NOTICE.template | 0 .../{types-core.spec => model-core.spec}/mvnw | 0 .../mvnw.cmd | 0 .../pom.xml | 4 ++-- .../src/main/moditect/module-info.java | 0 .../types/core/config/string.converter.yaml | 0 .../core/schema/integer.schema.patch.json | 0 .../core/schema/string.schema.patch.json | 0 .../specs/types/core/config/SchemaTest.java | 0 .../{types-core => model-core}/COPYRIGHT | 0 incubator/{types-core => model-core}/LICENSE | 0 incubator/{types-core => model-core}/NOTICE | 0 .../NOTICE.template | 0 incubator/{types-core => model-core}/mvnw | 0 incubator/{types-core => model-core}/mvnw.cmd | 0 incubator/{types-core => model-core}/pom.xml | 8 +++---- .../core/config/IntegerConverterConfig.java | 0 .../config/IntegerConverterConfigBuilder.java | 0 .../core/config/IntegerValidatorConfig.java | 0 .../config/IntegerValidatorConfigBuilder.java | 0 .../core/config/StringConverterConfig.java | 0 .../config/StringConverterConfigBuilder.java | 0 .../core/config/StringValidatorConfig.java | 0 .../config/StringValidatorConfigBuilder.java | 0 .../types/core/internal/IntegerConverter.java | 0 .../internal/IntegerConverterContext.java | 0 .../internal/IntegerConverterFactorySpi.java | 0 .../internal/IntegerConverterHandler.java | 0 .../types/core/internal/IntegerValidator.java | 0 .../internal/IntegerValidatorContext.java | 0 .../internal/IntegerValidatorFactorySpi.java | 0 .../internal/IntegerValidatorHandler.java | 0 .../types/core/internal/StringConverter.java | 0 .../core/internal/StringConverterContext.java | 0 .../internal/StringConverterFactorySpi.java | 0 .../core/internal/StringConverterHandler.java | 0 .../types/core/internal/StringEncoding.java | 0 .../types/core/internal/StringValidator.java | 0 .../core/internal/StringValidatorContext.java | 0 .../internal/StringValidatorEncoding.java | 0 .../internal/StringValidatorFactorySpi.java | 0 .../core/internal/StringValidatorHandler.java | 0 .../config/IntegerConverterConfigAdapter.java | 0 .../config/IntegerValidatorConfigAdapter.java | 0 .../config/StringConverterConfigAdapter.java | 0 .../config/StringValidatorConfigAdapter.java | 0 .../src/main/moditect/module-info.java | 0 ...me.engine.config.ConverterConfigAdapterSpi | 0 ...me.engine.config.ValidatorConfigAdapterSpi | 0 ...ntime.engine.converter.ConverterFactorySpi | 0 ...ntime.engine.validator.ValidatorFactorySpi | 0 .../internal/IntegerConverterFactoryTest.java | 0 .../core/internal/IntegerConverterTest.java | 0 .../internal/IntegerValidatorFactoryTest.java | 0 .../core/internal/IntegerValidatorTest.java | 0 .../internal/StringConverterFactoryTest.java | 0 .../core/internal/StringConverterTest.java | 0 .../core/internal/StringEncodingTest.java | 0 .../internal/StringValidatorFactoryTest.java | 0 .../core/internal/StringValidatorTest.java | 0 .../IntegerConverterConfigAdapterTest.java | 0 .../IntegerValidatorConfigAdapterTest.java | 0 .../StringConverterConfigAdapterTest.java | 0 .../StringValidatorConfigAdapterTest.java | 0 .../COPYRIGHT | 0 .../LICENSE | 0 .../NOTICE | 0 .../NOTICE.template | 0 .../{types-json.spec => model-json.spec}/mvnw | 0 .../mvnw.cmd | 0 .../pom.xml | 4 ++-- .../src/main/moditect/module-info.java | 0 .../specs/types/json/config/converter.yaml | 0 .../types/json/schema/json.schema.patch.json | 0 .../specs/types/json/config/SchemaTest.java | 0 .../{types-json => model-json}/COPYRIGHT | 0 incubator/{types-json => model-json}/LICENSE | 0 incubator/{types-json => model-json}/NOTICE | 0 .../NOTICE.template | 0 incubator/{types-json => model-json}/mvnw | 0 incubator/{types-json => model-json}/mvnw.cmd | 0 incubator/{types-json => model-json}/pom.xml | 8 +++---- .../json/config/JsonConverterConfig.java | 0 .../config/JsonConverterConfigBuilder.java | 0 .../json/config/JsonValidatorConfig.java | 0 .../config/JsonValidatorConfigBuilder.java | 0 .../types/json/internal/JsonConverter.java | 0 .../json/internal/JsonConverterContext.java | 0 .../internal/JsonConverterFactorySpi.java | 0 .../json/internal/JsonConverterHandler.java | 0 .../internal/JsonReadConverterHandler.java | 0 .../types/json/internal/JsonValidator.java | 0 .../json/internal/JsonValidatorContext.java | 0 .../internal/JsonValidatorFactorySpi.java | 0 .../json/internal/JsonValidatorHandler.java | 0 .../internal/JsonWriteConverterHandler.java | 0 .../config/JsonConverterConfigAdapter.java | 0 .../config/JsonValidatorConfigAdapter.java | 0 .../src/main/moditect/module-info.java | 0 ...me.engine.config.ConverterConfigAdapterSpi | 0 ...me.engine.config.ValidatorConfigAdapterSpi | 0 ...ntime.engine.converter.ConverterFactorySpi | 0 ...ntime.engine.validator.ValidatorFactorySpi | 0 .../internal/JsonConverterFactorySpiTest.java | 0 .../json/internal/JsonConverterTest.java | 0 .../internal/JsonValidatorFactorySpiTest.java | 0 .../json/internal/JsonValidatorTest.java | 0 .../JsonConverterConfigAdapterTest.java | 0 .../JsonValidatorConfigAdapterTest.java | 0 .../COPYRIGHT | 0 .../LICENSE | 0 .../NOTICE | 0 .../NOTICE.template | 0 .../mvnw | 0 .../mvnw.cmd | 0 .../pom.xml | 4 ++-- .../src/main/moditect/module-info.java | 0 .../types/protobuf/config/converter.yaml | 0 .../schema/protobuf.schema.patch.json | 0 .../types/protobuf/config/SchemaTest.java | 0 .../COPYRIGHT | 0 .../LICENSE | 0 .../{types-protobuf => model-protobuf}/NOTICE | 0 .../NOTICE.template | 0 .../{types-protobuf => model-protobuf}/mvnw | 0 .../mvnw.cmd | 0 .../pom.xml | 10 ++++---- .../protobuf/internal/parser/Protobuf3.g4 | 0 .../config/ProtobufConverterConfig.java | 0 .../ProtobufConverterConfigBuilder.java | 0 .../protobuf/internal/DescriptorTree.java | 0 .../protobuf/internal/ProtoListener.java | 0 .../protobuf/internal/ProtobufConverter.java | 0 .../internal/ProtobufConverterContext.java | 0 .../internal/ProtobufConverterFactorySpi.java | 0 .../internal/ProtobufConverterHandler.java | 0 .../ProtobufReadConverterHandler.java | 0 .../ProtobufWriteConverterHandler.java | 0 .../ProtobufConverterConfigAdapter.java | 0 .../src/main/moditect/module-info.java | 0 ...me.engine.config.ConverterConfigAdapterSpi | 0 ...ntime.engine.converter.ConverterFactorySpi | 0 .../ProtobufConverterFactorySpiTest.java | 0 .../internal/ProtobufConverterTest.java | 0 .../ProtobufConverterConfigAdapterTest.java | 0 incubator/pom.xml | 24 +++++++++---------- 186 files changed, 50 insertions(+), 49 deletions(-) rename incubator/{types-avro.spec => model-avro.spec}/COPYRIGHT (100%) rename incubator/{types-avro.spec => model-avro.spec}/LICENSE (100%) rename incubator/{types-avro.spec => model-avro.spec}/NOTICE (100%) rename incubator/{types-avro.spec => model-avro.spec}/NOTICE.template (100%) rename incubator/{types-avro.spec => model-avro.spec}/mvnw (100%) rename incubator/{types-avro.spec => model-avro.spec}/mvnw.cmd (100%) rename incubator/{types-avro.spec => model-avro.spec}/pom.xml (98%) rename incubator/{types-avro.spec => model-avro.spec}/src/main/moditect/module-info.java (100%) rename incubator/{types-avro.spec => model-avro.spec}/src/main/scripts/io/aklivity/zilla/specs/types/avro/config/converter.yaml (100%) rename incubator/{types-avro.spec => model-avro.spec}/src/main/scripts/io/aklivity/zilla/specs/types/avro/schema/avro.schema.patch.json (100%) rename incubator/{types-avro.spec => model-avro.spec}/src/test/java/io/aklivity/zilla/specs/types/avro/config/SchemaTest.java (100%) rename incubator/{types-avro => model-avro}/COPYRIGHT (100%) rename incubator/{types-avro => model-avro}/LICENSE (100%) rename incubator/{types-avro => model-avro}/NOTICE (100%) rename incubator/{types-avro => model-avro}/NOTICE.template (100%) rename incubator/{types-avro => model-avro}/mvnw (100%) rename incubator/{types-avro => model-avro}/mvnw.cmd (100%) rename incubator/{types-avro => model-avro}/pom.xml (97%) rename incubator/{types-avro => model-avro}/src/main/java/io/aklivity/zilla/runtime/types/avro/config/AvroConverterConfig.java (100%) rename incubator/{types-avro => model-avro}/src/main/java/io/aklivity/zilla/runtime/types/avro/config/AvroConverterConfigBuilder.java (100%) rename incubator/{types-avro => model-avro}/src/main/java/io/aklivity/zilla/runtime/types/avro/internal/AvroConverter.java (100%) rename incubator/{types-avro => model-avro}/src/main/java/io/aklivity/zilla/runtime/types/avro/internal/AvroConverterContext.java (100%) rename incubator/{types-avro => model-avro}/src/main/java/io/aklivity/zilla/runtime/types/avro/internal/AvroConverterFactorySpi.java (100%) rename incubator/{types-avro => model-avro}/src/main/java/io/aklivity/zilla/runtime/types/avro/internal/AvroConverterHandler.java (100%) rename incubator/{types-avro => model-avro}/src/main/java/io/aklivity/zilla/runtime/types/avro/internal/AvroReadConverterHandler.java (100%) rename incubator/{types-avro => model-avro}/src/main/java/io/aklivity/zilla/runtime/types/avro/internal/AvroWriteConverterHandler.java (100%) rename incubator/{types-avro => model-avro}/src/main/java/io/aklivity/zilla/runtime/types/avro/internal/config/AvroConverterConfigAdapter.java (100%) rename incubator/{types-avro => model-avro}/src/main/moditect/module-info.java (100%) rename incubator/{types-avro => model-avro}/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi (100%) rename incubator/{types-avro => model-avro}/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.converter.ConverterFactorySpi (100%) rename incubator/{types-avro => model-avro}/src/test/java/io/aklivity/zilla/runtime/types/avro/internal/AvroConverterFactorySpiTest.java (100%) rename incubator/{types-avro => model-avro}/src/test/java/io/aklivity/zilla/runtime/types/avro/internal/AvroConverterTest.java (100%) rename incubator/{types-avro => model-avro}/src/test/java/io/aklivity/zilla/runtime/types/avro/internal/config/AvroConverterConfigAdapterTest.java (100%) rename incubator/{types-core.spec => model-core.spec}/COPYRIGHT (100%) rename incubator/{types-core.spec => model-core.spec}/LICENSE (100%) rename incubator/{types-core.spec => model-core.spec}/NOTICE (100%) rename incubator/{types-core.spec => model-core.spec}/NOTICE.template (100%) rename incubator/{types-core.spec => model-core.spec}/mvnw (100%) rename incubator/{types-core.spec => model-core.spec}/mvnw.cmd (100%) rename incubator/{types-core.spec => model-core.spec}/pom.xml (98%) rename incubator/{types-core.spec => model-core.spec}/src/main/moditect/module-info.java (100%) rename incubator/{types-core.spec => model-core.spec}/src/main/scripts/io/aklivity/zilla/specs/types/core/config/string.converter.yaml (100%) rename incubator/{types-core.spec => model-core.spec}/src/main/scripts/io/aklivity/zilla/specs/types/core/schema/integer.schema.patch.json (100%) rename incubator/{types-core.spec => model-core.spec}/src/main/scripts/io/aklivity/zilla/specs/types/core/schema/string.schema.patch.json (100%) rename incubator/{types-core.spec => model-core.spec}/src/test/java/io/aklivity/zilla/specs/types/core/config/SchemaTest.java (100%) rename incubator/{types-core => model-core}/COPYRIGHT (100%) rename incubator/{types-core => model-core}/LICENSE (100%) rename incubator/{types-core => model-core}/NOTICE (100%) rename incubator/{types-core => model-core}/NOTICE.template (100%) rename incubator/{types-core => model-core}/mvnw (100%) rename incubator/{types-core => model-core}/mvnw.cmd (100%) rename incubator/{types-core => model-core}/pom.xml (96%) rename incubator/{types-core => model-core}/src/main/java/io/aklivity/zilla/runtime/types/core/config/IntegerConverterConfig.java (100%) rename incubator/{types-core => model-core}/src/main/java/io/aklivity/zilla/runtime/types/core/config/IntegerConverterConfigBuilder.java (100%) rename incubator/{types-core => model-core}/src/main/java/io/aklivity/zilla/runtime/types/core/config/IntegerValidatorConfig.java (100%) rename incubator/{types-core => model-core}/src/main/java/io/aklivity/zilla/runtime/types/core/config/IntegerValidatorConfigBuilder.java (100%) rename incubator/{types-core => model-core}/src/main/java/io/aklivity/zilla/runtime/types/core/config/StringConverterConfig.java (100%) rename incubator/{types-core => model-core}/src/main/java/io/aklivity/zilla/runtime/types/core/config/StringConverterConfigBuilder.java (100%) rename incubator/{types-core => model-core}/src/main/java/io/aklivity/zilla/runtime/types/core/config/StringValidatorConfig.java (100%) rename incubator/{types-core => model-core}/src/main/java/io/aklivity/zilla/runtime/types/core/config/StringValidatorConfigBuilder.java (100%) rename incubator/{types-core => model-core}/src/main/java/io/aklivity/zilla/runtime/types/core/internal/IntegerConverter.java (100%) rename incubator/{types-core => model-core}/src/main/java/io/aklivity/zilla/runtime/types/core/internal/IntegerConverterContext.java (100%) rename incubator/{types-core => model-core}/src/main/java/io/aklivity/zilla/runtime/types/core/internal/IntegerConverterFactorySpi.java (100%) rename incubator/{types-core => model-core}/src/main/java/io/aklivity/zilla/runtime/types/core/internal/IntegerConverterHandler.java (100%) rename incubator/{types-core => model-core}/src/main/java/io/aklivity/zilla/runtime/types/core/internal/IntegerValidator.java (100%) rename incubator/{types-core => model-core}/src/main/java/io/aklivity/zilla/runtime/types/core/internal/IntegerValidatorContext.java (100%) rename incubator/{types-core => model-core}/src/main/java/io/aklivity/zilla/runtime/types/core/internal/IntegerValidatorFactorySpi.java (100%) rename incubator/{types-core => model-core}/src/main/java/io/aklivity/zilla/runtime/types/core/internal/IntegerValidatorHandler.java (100%) rename incubator/{types-core => model-core}/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringConverter.java (100%) rename incubator/{types-core => model-core}/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringConverterContext.java (100%) rename incubator/{types-core => model-core}/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringConverterFactorySpi.java (100%) rename incubator/{types-core => model-core}/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringConverterHandler.java (100%) rename incubator/{types-core => model-core}/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringEncoding.java (100%) rename incubator/{types-core => model-core}/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringValidator.java (100%) rename incubator/{types-core => model-core}/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringValidatorContext.java (100%) rename incubator/{types-core => model-core}/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringValidatorEncoding.java (100%) rename incubator/{types-core => model-core}/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringValidatorFactorySpi.java (100%) rename incubator/{types-core => model-core}/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringValidatorHandler.java (100%) rename incubator/{types-core => model-core}/src/main/java/io/aklivity/zilla/runtime/types/core/internal/config/IntegerConverterConfigAdapter.java (100%) rename incubator/{types-core => model-core}/src/main/java/io/aklivity/zilla/runtime/types/core/internal/config/IntegerValidatorConfigAdapter.java (100%) rename incubator/{types-core => model-core}/src/main/java/io/aklivity/zilla/runtime/types/core/internal/config/StringConverterConfigAdapter.java (100%) rename incubator/{types-core => model-core}/src/main/java/io/aklivity/zilla/runtime/types/core/internal/config/StringValidatorConfigAdapter.java (100%) rename incubator/{types-core => model-core}/src/main/moditect/module-info.java (100%) rename incubator/{types-core => model-core}/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi (100%) rename incubator/{types-core => model-core}/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ValidatorConfigAdapterSpi (100%) rename incubator/{types-core => model-core}/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.converter.ConverterFactorySpi (100%) rename incubator/{types-core => model-core}/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.validator.ValidatorFactorySpi (100%) rename incubator/{types-core => model-core}/src/test/java/io/aklivity/zilla/runtime/types/core/internal/IntegerConverterFactoryTest.java (100%) rename incubator/{types-core => model-core}/src/test/java/io/aklivity/zilla/runtime/types/core/internal/IntegerConverterTest.java (100%) rename incubator/{types-core => model-core}/src/test/java/io/aklivity/zilla/runtime/types/core/internal/IntegerValidatorFactoryTest.java (100%) rename incubator/{types-core => model-core}/src/test/java/io/aklivity/zilla/runtime/types/core/internal/IntegerValidatorTest.java (100%) rename incubator/{types-core => model-core}/src/test/java/io/aklivity/zilla/runtime/types/core/internal/StringConverterFactoryTest.java (100%) rename incubator/{types-core => model-core}/src/test/java/io/aklivity/zilla/runtime/types/core/internal/StringConverterTest.java (100%) rename incubator/{types-core => model-core}/src/test/java/io/aklivity/zilla/runtime/types/core/internal/StringEncodingTest.java (100%) rename incubator/{types-core => model-core}/src/test/java/io/aklivity/zilla/runtime/types/core/internal/StringValidatorFactoryTest.java (100%) rename incubator/{types-core => model-core}/src/test/java/io/aklivity/zilla/runtime/types/core/internal/StringValidatorTest.java (100%) rename incubator/{types-core => model-core}/src/test/java/io/aklivity/zilla/runtime/types/core/internal/config/IntegerConverterConfigAdapterTest.java (100%) rename incubator/{types-core => model-core}/src/test/java/io/aklivity/zilla/runtime/types/core/internal/config/IntegerValidatorConfigAdapterTest.java (100%) rename incubator/{types-core => model-core}/src/test/java/io/aklivity/zilla/runtime/types/core/internal/config/StringConverterConfigAdapterTest.java (100%) rename incubator/{types-core => model-core}/src/test/java/io/aklivity/zilla/runtime/types/core/internal/config/StringValidatorConfigAdapterTest.java (100%) rename incubator/{types-json.spec => model-json.spec}/COPYRIGHT (100%) rename incubator/{types-json.spec => model-json.spec}/LICENSE (100%) rename incubator/{types-json.spec => model-json.spec}/NOTICE (100%) rename incubator/{types-json.spec => model-json.spec}/NOTICE.template (100%) rename incubator/{types-json.spec => model-json.spec}/mvnw (100%) rename incubator/{types-json.spec => model-json.spec}/mvnw.cmd (100%) rename incubator/{types-json.spec => model-json.spec}/pom.xml (97%) rename incubator/{types-json.spec => model-json.spec}/src/main/moditect/module-info.java (100%) rename incubator/{types-json.spec => model-json.spec}/src/main/scripts/io/aklivity/zilla/specs/types/json/config/converter.yaml (100%) rename incubator/{types-json.spec => model-json.spec}/src/main/scripts/io/aklivity/zilla/specs/types/json/schema/json.schema.patch.json (100%) rename incubator/{types-json.spec => model-json.spec}/src/test/java/io/aklivity/zilla/specs/types/json/config/SchemaTest.java (100%) rename incubator/{types-json => model-json}/COPYRIGHT (100%) rename incubator/{types-json => model-json}/LICENSE (100%) rename incubator/{types-json => model-json}/NOTICE (100%) rename incubator/{types-json => model-json}/NOTICE.template (100%) rename incubator/{types-json => model-json}/mvnw (100%) rename incubator/{types-json => model-json}/mvnw.cmd (100%) rename incubator/{types-json => model-json}/pom.xml (97%) rename incubator/{types-json => model-json}/src/main/java/io/aklivity/zilla/runtime/types/json/config/JsonConverterConfig.java (100%) rename incubator/{types-json => model-json}/src/main/java/io/aklivity/zilla/runtime/types/json/config/JsonConverterConfigBuilder.java (100%) rename incubator/{types-json => model-json}/src/main/java/io/aklivity/zilla/runtime/types/json/config/JsonValidatorConfig.java (100%) rename incubator/{types-json => model-json}/src/main/java/io/aklivity/zilla/runtime/types/json/config/JsonValidatorConfigBuilder.java (100%) rename incubator/{types-json => model-json}/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonConverter.java (100%) rename incubator/{types-json => model-json}/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonConverterContext.java (100%) rename incubator/{types-json => model-json}/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonConverterFactorySpi.java (100%) rename incubator/{types-json => model-json}/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonConverterHandler.java (100%) rename incubator/{types-json => model-json}/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonReadConverterHandler.java (100%) rename incubator/{types-json => model-json}/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonValidator.java (100%) rename incubator/{types-json => model-json}/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonValidatorContext.java (100%) rename incubator/{types-json => model-json}/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonValidatorFactorySpi.java (100%) rename incubator/{types-json => model-json}/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonValidatorHandler.java (100%) rename incubator/{types-json => model-json}/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonWriteConverterHandler.java (100%) rename incubator/{types-json => model-json}/src/main/java/io/aklivity/zilla/runtime/types/json/internal/config/JsonConverterConfigAdapter.java (100%) rename incubator/{types-json => model-json}/src/main/java/io/aklivity/zilla/runtime/types/json/internal/config/JsonValidatorConfigAdapter.java (100%) rename incubator/{types-json => model-json}/src/main/moditect/module-info.java (100%) rename incubator/{types-json => model-json}/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi (100%) rename incubator/{types-json => model-json}/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ValidatorConfigAdapterSpi (100%) rename incubator/{types-json => model-json}/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.converter.ConverterFactorySpi (100%) rename incubator/{types-json => model-json}/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.validator.ValidatorFactorySpi (100%) rename incubator/{types-json => model-json}/src/test/java/io/aklivity/zilla/runtime/types/json/internal/JsonConverterFactorySpiTest.java (100%) rename incubator/{types-json => model-json}/src/test/java/io/aklivity/zilla/runtime/types/json/internal/JsonConverterTest.java (100%) rename incubator/{types-json => model-json}/src/test/java/io/aklivity/zilla/runtime/types/json/internal/JsonValidatorFactorySpiTest.java (100%) rename incubator/{types-json => model-json}/src/test/java/io/aklivity/zilla/runtime/types/json/internal/JsonValidatorTest.java (100%) rename incubator/{types-json => model-json}/src/test/java/io/aklivity/zilla/runtime/types/json/internal/config/JsonConverterConfigAdapterTest.java (100%) rename incubator/{types-json => model-json}/src/test/java/io/aklivity/zilla/runtime/types/json/internal/config/JsonValidatorConfigAdapterTest.java (100%) rename incubator/{types-protobuf.spec => model-protobuf.spec}/COPYRIGHT (100%) rename incubator/{types-protobuf.spec => model-protobuf.spec}/LICENSE (100%) rename incubator/{types-protobuf.spec => model-protobuf.spec}/NOTICE (100%) rename incubator/{types-protobuf.spec => model-protobuf.spec}/NOTICE.template (100%) rename incubator/{types-protobuf.spec => model-protobuf.spec}/mvnw (100%) rename incubator/{types-protobuf.spec => model-protobuf.spec}/mvnw.cmd (100%) rename incubator/{types-protobuf.spec => model-protobuf.spec}/pom.xml (97%) rename incubator/{types-protobuf.spec => model-protobuf.spec}/src/main/moditect/module-info.java (100%) rename incubator/{types-protobuf.spec => model-protobuf.spec}/src/main/scripts/io/aklivity/zilla/specs/types/protobuf/config/converter.yaml (100%) rename incubator/{types-protobuf.spec => model-protobuf.spec}/src/main/scripts/io/aklivity/zilla/specs/types/protobuf/schema/protobuf.schema.patch.json (100%) rename incubator/{types-protobuf.spec => model-protobuf.spec}/src/test/java/io/aklivity/zilla/specs/types/protobuf/config/SchemaTest.java (100%) rename incubator/{types-protobuf => model-protobuf}/COPYRIGHT (100%) rename incubator/{types-protobuf => model-protobuf}/LICENSE (100%) rename incubator/{types-protobuf => model-protobuf}/NOTICE (100%) rename incubator/{types-protobuf => model-protobuf}/NOTICE.template (100%) rename incubator/{types-protobuf => model-protobuf}/mvnw (100%) rename incubator/{types-protobuf => model-protobuf}/mvnw.cmd (100%) rename incubator/{types-protobuf => model-protobuf}/pom.xml (96%) rename incubator/{types-protobuf => model-protobuf}/src/main/antlr4/io/aklivity/zilla/runtime/types/protobuf/internal/parser/Protobuf3.g4 (100%) rename incubator/{types-protobuf => model-protobuf}/src/main/java/io/aklivity/zilla/runtime/types/protobuf/config/ProtobufConverterConfig.java (100%) rename incubator/{types-protobuf => model-protobuf}/src/main/java/io/aklivity/zilla/runtime/types/protobuf/config/ProtobufConverterConfigBuilder.java (100%) rename incubator/{types-protobuf => model-protobuf}/src/main/java/io/aklivity/zilla/runtime/types/protobuf/internal/DescriptorTree.java (100%) rename incubator/{types-protobuf => model-protobuf}/src/main/java/io/aklivity/zilla/runtime/types/protobuf/internal/ProtoListener.java (100%) rename incubator/{types-protobuf => model-protobuf}/src/main/java/io/aklivity/zilla/runtime/types/protobuf/internal/ProtobufConverter.java (100%) rename incubator/{types-protobuf => model-protobuf}/src/main/java/io/aklivity/zilla/runtime/types/protobuf/internal/ProtobufConverterContext.java (100%) rename incubator/{types-protobuf => model-protobuf}/src/main/java/io/aklivity/zilla/runtime/types/protobuf/internal/ProtobufConverterFactorySpi.java (100%) rename incubator/{types-protobuf => model-protobuf}/src/main/java/io/aklivity/zilla/runtime/types/protobuf/internal/ProtobufConverterHandler.java (100%) rename incubator/{types-protobuf => model-protobuf}/src/main/java/io/aklivity/zilla/runtime/types/protobuf/internal/ProtobufReadConverterHandler.java (100%) rename incubator/{types-protobuf => model-protobuf}/src/main/java/io/aklivity/zilla/runtime/types/protobuf/internal/ProtobufWriteConverterHandler.java (100%) rename incubator/{types-protobuf => model-protobuf}/src/main/java/io/aklivity/zilla/runtime/types/protobuf/internal/config/ProtobufConverterConfigAdapter.java (100%) rename incubator/{types-protobuf => model-protobuf}/src/main/moditect/module-info.java (100%) rename incubator/{types-protobuf => model-protobuf}/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi (100%) rename incubator/{types-protobuf => model-protobuf}/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.converter.ConverterFactorySpi (100%) rename incubator/{types-protobuf => model-protobuf}/src/test/java/io/aklivity/zilla/runtime/types/protobuf/internal/ProtobufConverterFactorySpiTest.java (100%) rename incubator/{types-protobuf => model-protobuf}/src/test/java/io/aklivity/zilla/runtime/types/protobuf/internal/ProtobufConverterTest.java (100%) rename incubator/{types-protobuf => model-protobuf}/src/test/java/io/aklivity/zilla/runtime/types/protobuf/internal/config/ProtobufConverterConfigAdapterTest.java (100%) diff --git a/cloud/docker-image/pom.xml b/cloud/docker-image/pom.xml index c8d692ae85..31c8009af9 100644 --- a/cloud/docker-image/pom.xml +++ b/cloud/docker-image/pom.xml @@ -344,25 +344,25 @@ ${project.groupId} - types-avro + model-avro ${project.version} runtime ${project.groupId} - types-core + model-core ${project.version} runtime ${project.groupId} - types-json + model-json ${project.version} runtime ${project.groupId} - types-protobuf + model-protobuf ${project.version} runtime diff --git a/cloud/docker-image/src/main/docker/assembly.xml b/cloud/docker-image/src/main/docker/assembly.xml index f27e5855c0..204e62d9e3 100644 --- a/cloud/docker-image/src/main/docker/assembly.xml +++ b/cloud/docker-image/src/main/docker/assembly.xml @@ -32,6 +32,7 @@ io/aklivity/zilla/guard-*/** io/aklivity/zilla/metrics-*/** io/aklivity/zilla/types-*/** + io/aklivity/zilla/model-*/** io/aklivity/zilla/vault-*/** io/aklivity/zilla/command/** io/aklivity/zilla/command-*/** diff --git a/cloud/docker-image/src/main/docker/incubator/zpm.json.template b/cloud/docker-image/src/main/docker/incubator/zpm.json.template index 2b06b1dbdc..84976e4563 100644 --- a/cloud/docker-image/src/main/docker/incubator/zpm.json.template +++ b/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" diff --git a/incubator/command-generate/pom.xml b/incubator/command-generate/pom.xml index 56eaf71660..19122ea36d 100644 --- a/incubator/command-generate/pom.xml +++ b/incubator/command-generate/pom.xml @@ -87,25 +87,25 @@ io.aklivity.zilla - types-avro + model-avro ${project.version} provided io.aklivity.zilla - types-core + model-core ${project.version} provided io.aklivity.zilla - types-json + model-json ${project.version} provided io.aklivity.zilla - types-protobuf + model-protobuf ${project.version} provided diff --git a/incubator/types-avro.spec/COPYRIGHT b/incubator/model-avro.spec/COPYRIGHT similarity index 100% rename from incubator/types-avro.spec/COPYRIGHT rename to incubator/model-avro.spec/COPYRIGHT diff --git a/incubator/types-avro.spec/LICENSE b/incubator/model-avro.spec/LICENSE similarity index 100% rename from incubator/types-avro.spec/LICENSE rename to incubator/model-avro.spec/LICENSE diff --git a/incubator/types-avro.spec/NOTICE b/incubator/model-avro.spec/NOTICE similarity index 100% rename from incubator/types-avro.spec/NOTICE rename to incubator/model-avro.spec/NOTICE diff --git a/incubator/types-avro.spec/NOTICE.template b/incubator/model-avro.spec/NOTICE.template similarity index 100% rename from incubator/types-avro.spec/NOTICE.template rename to incubator/model-avro.spec/NOTICE.template diff --git a/incubator/types-avro.spec/mvnw b/incubator/model-avro.spec/mvnw similarity index 100% rename from incubator/types-avro.spec/mvnw rename to incubator/model-avro.spec/mvnw diff --git a/incubator/types-avro.spec/mvnw.cmd b/incubator/model-avro.spec/mvnw.cmd similarity index 100% rename from incubator/types-avro.spec/mvnw.cmd rename to incubator/model-avro.spec/mvnw.cmd diff --git a/incubator/types-avro.spec/pom.xml b/incubator/model-avro.spec/pom.xml similarity index 98% rename from incubator/types-avro.spec/pom.xml rename to incubator/model-avro.spec/pom.xml index d0e2b068bb..461c3eb92b 100644 --- a/incubator/types-avro.spec/pom.xml +++ b/incubator/model-avro.spec/pom.xml @@ -12,8 +12,8 @@ ../pom.xml - types-avro.spec - zilla::incubator::types-avro.spec + model-avro.spec + zilla::incubator::model-avro.spec diff --git a/incubator/types-avro.spec/src/main/moditect/module-info.java b/incubator/model-avro.spec/src/main/moditect/module-info.java similarity index 100% rename from incubator/types-avro.spec/src/main/moditect/module-info.java rename to incubator/model-avro.spec/src/main/moditect/module-info.java diff --git a/incubator/types-avro.spec/src/main/scripts/io/aklivity/zilla/specs/types/avro/config/converter.yaml b/incubator/model-avro.spec/src/main/scripts/io/aklivity/zilla/specs/types/avro/config/converter.yaml similarity index 100% rename from incubator/types-avro.spec/src/main/scripts/io/aklivity/zilla/specs/types/avro/config/converter.yaml rename to incubator/model-avro.spec/src/main/scripts/io/aklivity/zilla/specs/types/avro/config/converter.yaml diff --git a/incubator/types-avro.spec/src/main/scripts/io/aklivity/zilla/specs/types/avro/schema/avro.schema.patch.json b/incubator/model-avro.spec/src/main/scripts/io/aklivity/zilla/specs/types/avro/schema/avro.schema.patch.json similarity index 100% rename from incubator/types-avro.spec/src/main/scripts/io/aklivity/zilla/specs/types/avro/schema/avro.schema.patch.json rename to incubator/model-avro.spec/src/main/scripts/io/aklivity/zilla/specs/types/avro/schema/avro.schema.patch.json diff --git a/incubator/types-avro.spec/src/test/java/io/aklivity/zilla/specs/types/avro/config/SchemaTest.java b/incubator/model-avro.spec/src/test/java/io/aklivity/zilla/specs/types/avro/config/SchemaTest.java similarity index 100% rename from incubator/types-avro.spec/src/test/java/io/aklivity/zilla/specs/types/avro/config/SchemaTest.java rename to incubator/model-avro.spec/src/test/java/io/aklivity/zilla/specs/types/avro/config/SchemaTest.java diff --git a/incubator/types-avro/COPYRIGHT b/incubator/model-avro/COPYRIGHT similarity index 100% rename from incubator/types-avro/COPYRIGHT rename to incubator/model-avro/COPYRIGHT diff --git a/incubator/types-avro/LICENSE b/incubator/model-avro/LICENSE similarity index 100% rename from incubator/types-avro/LICENSE rename to incubator/model-avro/LICENSE diff --git a/incubator/types-avro/NOTICE b/incubator/model-avro/NOTICE similarity index 100% rename from incubator/types-avro/NOTICE rename to incubator/model-avro/NOTICE diff --git a/incubator/types-avro/NOTICE.template b/incubator/model-avro/NOTICE.template similarity index 100% rename from incubator/types-avro/NOTICE.template rename to incubator/model-avro/NOTICE.template diff --git a/incubator/types-avro/mvnw b/incubator/model-avro/mvnw similarity index 100% rename from incubator/types-avro/mvnw rename to incubator/model-avro/mvnw diff --git a/incubator/types-avro/mvnw.cmd b/incubator/model-avro/mvnw.cmd similarity index 100% rename from incubator/types-avro/mvnw.cmd rename to incubator/model-avro/mvnw.cmd diff --git a/incubator/types-avro/pom.xml b/incubator/model-avro/pom.xml similarity index 97% rename from incubator/types-avro/pom.xml rename to incubator/model-avro/pom.xml index 82464efa84..da40379acd 100644 --- a/incubator/types-avro/pom.xml +++ b/incubator/model-avro/pom.xml @@ -12,8 +12,8 @@ ../pom.xml - types-avro - zilla::incubator::types-avro + model-avro + zilla::incubator::model-avro @@ -33,7 +33,7 @@ ${project.groupId} - types-avro.spec + model-avro.spec ${project.version} provided @@ -120,7 +120,7 @@ ${project.groupId} - types-avro.spec + model-avro.spec ^\Qio/aklivity/zilla/specs/types/avro/\E diff --git a/incubator/types-avro/src/main/java/io/aklivity/zilla/runtime/types/avro/config/AvroConverterConfig.java b/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/types/avro/config/AvroConverterConfig.java similarity index 100% rename from incubator/types-avro/src/main/java/io/aklivity/zilla/runtime/types/avro/config/AvroConverterConfig.java rename to incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/types/avro/config/AvroConverterConfig.java diff --git a/incubator/types-avro/src/main/java/io/aklivity/zilla/runtime/types/avro/config/AvroConverterConfigBuilder.java b/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/types/avro/config/AvroConverterConfigBuilder.java similarity index 100% rename from incubator/types-avro/src/main/java/io/aklivity/zilla/runtime/types/avro/config/AvroConverterConfigBuilder.java rename to incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/types/avro/config/AvroConverterConfigBuilder.java diff --git a/incubator/types-avro/src/main/java/io/aklivity/zilla/runtime/types/avro/internal/AvroConverter.java b/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/types/avro/internal/AvroConverter.java similarity index 100% rename from incubator/types-avro/src/main/java/io/aklivity/zilla/runtime/types/avro/internal/AvroConverter.java rename to incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/types/avro/internal/AvroConverter.java diff --git a/incubator/types-avro/src/main/java/io/aklivity/zilla/runtime/types/avro/internal/AvroConverterContext.java b/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/types/avro/internal/AvroConverterContext.java similarity index 100% rename from incubator/types-avro/src/main/java/io/aklivity/zilla/runtime/types/avro/internal/AvroConverterContext.java rename to incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/types/avro/internal/AvroConverterContext.java diff --git a/incubator/types-avro/src/main/java/io/aklivity/zilla/runtime/types/avro/internal/AvroConverterFactorySpi.java b/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/types/avro/internal/AvroConverterFactorySpi.java similarity index 100% rename from incubator/types-avro/src/main/java/io/aklivity/zilla/runtime/types/avro/internal/AvroConverterFactorySpi.java rename to incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/types/avro/internal/AvroConverterFactorySpi.java diff --git a/incubator/types-avro/src/main/java/io/aklivity/zilla/runtime/types/avro/internal/AvroConverterHandler.java b/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/types/avro/internal/AvroConverterHandler.java similarity index 100% rename from incubator/types-avro/src/main/java/io/aklivity/zilla/runtime/types/avro/internal/AvroConverterHandler.java rename to incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/types/avro/internal/AvroConverterHandler.java diff --git a/incubator/types-avro/src/main/java/io/aklivity/zilla/runtime/types/avro/internal/AvroReadConverterHandler.java b/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/types/avro/internal/AvroReadConverterHandler.java similarity index 100% rename from incubator/types-avro/src/main/java/io/aklivity/zilla/runtime/types/avro/internal/AvroReadConverterHandler.java rename to incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/types/avro/internal/AvroReadConverterHandler.java diff --git a/incubator/types-avro/src/main/java/io/aklivity/zilla/runtime/types/avro/internal/AvroWriteConverterHandler.java b/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/types/avro/internal/AvroWriteConverterHandler.java similarity index 100% rename from incubator/types-avro/src/main/java/io/aklivity/zilla/runtime/types/avro/internal/AvroWriteConverterHandler.java rename to incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/types/avro/internal/AvroWriteConverterHandler.java diff --git a/incubator/types-avro/src/main/java/io/aklivity/zilla/runtime/types/avro/internal/config/AvroConverterConfigAdapter.java b/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/types/avro/internal/config/AvroConverterConfigAdapter.java similarity index 100% rename from incubator/types-avro/src/main/java/io/aklivity/zilla/runtime/types/avro/internal/config/AvroConverterConfigAdapter.java rename to incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/types/avro/internal/config/AvroConverterConfigAdapter.java diff --git a/incubator/types-avro/src/main/moditect/module-info.java b/incubator/model-avro/src/main/moditect/module-info.java similarity index 100% rename from incubator/types-avro/src/main/moditect/module-info.java rename to incubator/model-avro/src/main/moditect/module-info.java diff --git a/incubator/types-avro/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi b/incubator/model-avro/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi similarity index 100% rename from incubator/types-avro/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi rename to incubator/model-avro/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi diff --git a/incubator/types-avro/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.converter.ConverterFactorySpi b/incubator/model-avro/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.converter.ConverterFactorySpi similarity index 100% rename from incubator/types-avro/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.converter.ConverterFactorySpi rename to incubator/model-avro/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.converter.ConverterFactorySpi diff --git a/incubator/types-avro/src/test/java/io/aklivity/zilla/runtime/types/avro/internal/AvroConverterFactorySpiTest.java b/incubator/model-avro/src/test/java/io/aklivity/zilla/runtime/types/avro/internal/AvroConverterFactorySpiTest.java similarity index 100% rename from incubator/types-avro/src/test/java/io/aklivity/zilla/runtime/types/avro/internal/AvroConverterFactorySpiTest.java rename to incubator/model-avro/src/test/java/io/aklivity/zilla/runtime/types/avro/internal/AvroConverterFactorySpiTest.java diff --git a/incubator/types-avro/src/test/java/io/aklivity/zilla/runtime/types/avro/internal/AvroConverterTest.java b/incubator/model-avro/src/test/java/io/aklivity/zilla/runtime/types/avro/internal/AvroConverterTest.java similarity index 100% rename from incubator/types-avro/src/test/java/io/aklivity/zilla/runtime/types/avro/internal/AvroConverterTest.java rename to incubator/model-avro/src/test/java/io/aklivity/zilla/runtime/types/avro/internal/AvroConverterTest.java diff --git a/incubator/types-avro/src/test/java/io/aklivity/zilla/runtime/types/avro/internal/config/AvroConverterConfigAdapterTest.java b/incubator/model-avro/src/test/java/io/aklivity/zilla/runtime/types/avro/internal/config/AvroConverterConfigAdapterTest.java similarity index 100% rename from incubator/types-avro/src/test/java/io/aklivity/zilla/runtime/types/avro/internal/config/AvroConverterConfigAdapterTest.java rename to incubator/model-avro/src/test/java/io/aklivity/zilla/runtime/types/avro/internal/config/AvroConverterConfigAdapterTest.java diff --git a/incubator/types-core.spec/COPYRIGHT b/incubator/model-core.spec/COPYRIGHT similarity index 100% rename from incubator/types-core.spec/COPYRIGHT rename to incubator/model-core.spec/COPYRIGHT diff --git a/incubator/types-core.spec/LICENSE b/incubator/model-core.spec/LICENSE similarity index 100% rename from incubator/types-core.spec/LICENSE rename to incubator/model-core.spec/LICENSE diff --git a/incubator/types-core.spec/NOTICE b/incubator/model-core.spec/NOTICE similarity index 100% rename from incubator/types-core.spec/NOTICE rename to incubator/model-core.spec/NOTICE diff --git a/incubator/types-core.spec/NOTICE.template b/incubator/model-core.spec/NOTICE.template similarity index 100% rename from incubator/types-core.spec/NOTICE.template rename to incubator/model-core.spec/NOTICE.template diff --git a/incubator/types-core.spec/mvnw b/incubator/model-core.spec/mvnw similarity index 100% rename from incubator/types-core.spec/mvnw rename to incubator/model-core.spec/mvnw diff --git a/incubator/types-core.spec/mvnw.cmd b/incubator/model-core.spec/mvnw.cmd similarity index 100% rename from incubator/types-core.spec/mvnw.cmd rename to incubator/model-core.spec/mvnw.cmd diff --git a/incubator/types-core.spec/pom.xml b/incubator/model-core.spec/pom.xml similarity index 98% rename from incubator/types-core.spec/pom.xml rename to incubator/model-core.spec/pom.xml index 3b7b0106cb..75e168e29a 100644 --- a/incubator/types-core.spec/pom.xml +++ b/incubator/model-core.spec/pom.xml @@ -12,8 +12,8 @@ ../pom.xml - types-core.spec - zilla::incubator::types-core.spec + model-core.spec + zilla::incubator::model-core.spec diff --git a/incubator/types-core.spec/src/main/moditect/module-info.java b/incubator/model-core.spec/src/main/moditect/module-info.java similarity index 100% rename from incubator/types-core.spec/src/main/moditect/module-info.java rename to incubator/model-core.spec/src/main/moditect/module-info.java diff --git a/incubator/types-core.spec/src/main/scripts/io/aklivity/zilla/specs/types/core/config/string.converter.yaml b/incubator/model-core.spec/src/main/scripts/io/aklivity/zilla/specs/types/core/config/string.converter.yaml similarity index 100% rename from incubator/types-core.spec/src/main/scripts/io/aklivity/zilla/specs/types/core/config/string.converter.yaml rename to incubator/model-core.spec/src/main/scripts/io/aklivity/zilla/specs/types/core/config/string.converter.yaml diff --git a/incubator/types-core.spec/src/main/scripts/io/aklivity/zilla/specs/types/core/schema/integer.schema.patch.json b/incubator/model-core.spec/src/main/scripts/io/aklivity/zilla/specs/types/core/schema/integer.schema.patch.json similarity index 100% rename from incubator/types-core.spec/src/main/scripts/io/aklivity/zilla/specs/types/core/schema/integer.schema.patch.json rename to incubator/model-core.spec/src/main/scripts/io/aklivity/zilla/specs/types/core/schema/integer.schema.patch.json diff --git a/incubator/types-core.spec/src/main/scripts/io/aklivity/zilla/specs/types/core/schema/string.schema.patch.json b/incubator/model-core.spec/src/main/scripts/io/aklivity/zilla/specs/types/core/schema/string.schema.patch.json similarity index 100% rename from incubator/types-core.spec/src/main/scripts/io/aklivity/zilla/specs/types/core/schema/string.schema.patch.json rename to incubator/model-core.spec/src/main/scripts/io/aklivity/zilla/specs/types/core/schema/string.schema.patch.json diff --git a/incubator/types-core.spec/src/test/java/io/aklivity/zilla/specs/types/core/config/SchemaTest.java b/incubator/model-core.spec/src/test/java/io/aklivity/zilla/specs/types/core/config/SchemaTest.java similarity index 100% rename from incubator/types-core.spec/src/test/java/io/aklivity/zilla/specs/types/core/config/SchemaTest.java rename to incubator/model-core.spec/src/test/java/io/aklivity/zilla/specs/types/core/config/SchemaTest.java diff --git a/incubator/types-core/COPYRIGHT b/incubator/model-core/COPYRIGHT similarity index 100% rename from incubator/types-core/COPYRIGHT rename to incubator/model-core/COPYRIGHT diff --git a/incubator/types-core/LICENSE b/incubator/model-core/LICENSE similarity index 100% rename from incubator/types-core/LICENSE rename to incubator/model-core/LICENSE diff --git a/incubator/types-core/NOTICE b/incubator/model-core/NOTICE similarity index 100% rename from incubator/types-core/NOTICE rename to incubator/model-core/NOTICE diff --git a/incubator/types-core/NOTICE.template b/incubator/model-core/NOTICE.template similarity index 100% rename from incubator/types-core/NOTICE.template rename to incubator/model-core/NOTICE.template diff --git a/incubator/types-core/mvnw b/incubator/model-core/mvnw similarity index 100% rename from incubator/types-core/mvnw rename to incubator/model-core/mvnw diff --git a/incubator/types-core/mvnw.cmd b/incubator/model-core/mvnw.cmd similarity index 100% rename from incubator/types-core/mvnw.cmd rename to incubator/model-core/mvnw.cmd diff --git a/incubator/types-core/pom.xml b/incubator/model-core/pom.xml similarity index 96% rename from incubator/types-core/pom.xml rename to incubator/model-core/pom.xml index 78e294dee3..155990e4ae 100644 --- a/incubator/types-core/pom.xml +++ b/incubator/model-core/pom.xml @@ -12,8 +12,8 @@ ../pom.xml - types-core - zilla::incubator::types-core + model-core + zilla::incubator::model-core @@ -33,7 +33,7 @@ ${project.groupId} - types-core.spec + model-core.spec ${project.version} provided @@ -116,7 +116,7 @@ ${project.groupId} - types-core.spec + model-core.spec ^\Qio/aklivity/zilla/specs/types/core/\E diff --git a/incubator/types-core/src/main/java/io/aklivity/zilla/runtime/types/core/config/IntegerConverterConfig.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/config/IntegerConverterConfig.java similarity index 100% rename from incubator/types-core/src/main/java/io/aklivity/zilla/runtime/types/core/config/IntegerConverterConfig.java rename to incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/config/IntegerConverterConfig.java diff --git a/incubator/types-core/src/main/java/io/aklivity/zilla/runtime/types/core/config/IntegerConverterConfigBuilder.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/config/IntegerConverterConfigBuilder.java similarity index 100% rename from incubator/types-core/src/main/java/io/aklivity/zilla/runtime/types/core/config/IntegerConverterConfigBuilder.java rename to incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/config/IntegerConverterConfigBuilder.java diff --git a/incubator/types-core/src/main/java/io/aklivity/zilla/runtime/types/core/config/IntegerValidatorConfig.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/config/IntegerValidatorConfig.java similarity index 100% rename from incubator/types-core/src/main/java/io/aklivity/zilla/runtime/types/core/config/IntegerValidatorConfig.java rename to incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/config/IntegerValidatorConfig.java diff --git a/incubator/types-core/src/main/java/io/aklivity/zilla/runtime/types/core/config/IntegerValidatorConfigBuilder.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/config/IntegerValidatorConfigBuilder.java similarity index 100% rename from incubator/types-core/src/main/java/io/aklivity/zilla/runtime/types/core/config/IntegerValidatorConfigBuilder.java rename to incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/config/IntegerValidatorConfigBuilder.java diff --git a/incubator/types-core/src/main/java/io/aklivity/zilla/runtime/types/core/config/StringConverterConfig.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/config/StringConverterConfig.java similarity index 100% rename from incubator/types-core/src/main/java/io/aklivity/zilla/runtime/types/core/config/StringConverterConfig.java rename to incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/config/StringConverterConfig.java diff --git a/incubator/types-core/src/main/java/io/aklivity/zilla/runtime/types/core/config/StringConverterConfigBuilder.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/config/StringConverterConfigBuilder.java similarity index 100% rename from incubator/types-core/src/main/java/io/aklivity/zilla/runtime/types/core/config/StringConverterConfigBuilder.java rename to incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/config/StringConverterConfigBuilder.java diff --git a/incubator/types-core/src/main/java/io/aklivity/zilla/runtime/types/core/config/StringValidatorConfig.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/config/StringValidatorConfig.java similarity index 100% rename from incubator/types-core/src/main/java/io/aklivity/zilla/runtime/types/core/config/StringValidatorConfig.java rename to incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/config/StringValidatorConfig.java diff --git a/incubator/types-core/src/main/java/io/aklivity/zilla/runtime/types/core/config/StringValidatorConfigBuilder.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/config/StringValidatorConfigBuilder.java similarity index 100% rename from incubator/types-core/src/main/java/io/aklivity/zilla/runtime/types/core/config/StringValidatorConfigBuilder.java rename to incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/config/StringValidatorConfigBuilder.java diff --git a/incubator/types-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/IntegerConverter.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/IntegerConverter.java similarity index 100% rename from incubator/types-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/IntegerConverter.java rename to incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/IntegerConverter.java diff --git a/incubator/types-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/IntegerConverterContext.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/IntegerConverterContext.java similarity index 100% rename from incubator/types-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/IntegerConverterContext.java rename to incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/IntegerConverterContext.java diff --git a/incubator/types-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/IntegerConverterFactorySpi.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/IntegerConverterFactorySpi.java similarity index 100% rename from incubator/types-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/IntegerConverterFactorySpi.java rename to incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/IntegerConverterFactorySpi.java diff --git a/incubator/types-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/IntegerConverterHandler.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/IntegerConverterHandler.java similarity index 100% rename from incubator/types-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/IntegerConverterHandler.java rename to incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/IntegerConverterHandler.java diff --git a/incubator/types-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/IntegerValidator.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/IntegerValidator.java similarity index 100% rename from incubator/types-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/IntegerValidator.java rename to incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/IntegerValidator.java diff --git a/incubator/types-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/IntegerValidatorContext.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/IntegerValidatorContext.java similarity index 100% rename from incubator/types-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/IntegerValidatorContext.java rename to incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/IntegerValidatorContext.java diff --git a/incubator/types-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/IntegerValidatorFactorySpi.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/IntegerValidatorFactorySpi.java similarity index 100% rename from incubator/types-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/IntegerValidatorFactorySpi.java rename to incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/IntegerValidatorFactorySpi.java diff --git a/incubator/types-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/IntegerValidatorHandler.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/IntegerValidatorHandler.java similarity index 100% rename from incubator/types-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/IntegerValidatorHandler.java rename to incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/IntegerValidatorHandler.java diff --git a/incubator/types-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringConverter.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringConverter.java similarity index 100% rename from incubator/types-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringConverter.java rename to incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringConverter.java diff --git a/incubator/types-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringConverterContext.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringConverterContext.java similarity index 100% rename from incubator/types-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringConverterContext.java rename to incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringConverterContext.java diff --git a/incubator/types-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringConverterFactorySpi.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringConverterFactorySpi.java similarity index 100% rename from incubator/types-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringConverterFactorySpi.java rename to incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringConverterFactorySpi.java diff --git a/incubator/types-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringConverterHandler.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringConverterHandler.java similarity index 100% rename from incubator/types-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringConverterHandler.java rename to incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringConverterHandler.java diff --git a/incubator/types-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringEncoding.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringEncoding.java similarity index 100% rename from incubator/types-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringEncoding.java rename to incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringEncoding.java diff --git a/incubator/types-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringValidator.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringValidator.java similarity index 100% rename from incubator/types-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringValidator.java rename to incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringValidator.java diff --git a/incubator/types-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringValidatorContext.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringValidatorContext.java similarity index 100% rename from incubator/types-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringValidatorContext.java rename to incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringValidatorContext.java diff --git a/incubator/types-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringValidatorEncoding.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringValidatorEncoding.java similarity index 100% rename from incubator/types-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringValidatorEncoding.java rename to incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringValidatorEncoding.java diff --git a/incubator/types-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringValidatorFactorySpi.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringValidatorFactorySpi.java similarity index 100% rename from incubator/types-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringValidatorFactorySpi.java rename to incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringValidatorFactorySpi.java diff --git a/incubator/types-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringValidatorHandler.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringValidatorHandler.java similarity index 100% rename from incubator/types-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringValidatorHandler.java rename to incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringValidatorHandler.java diff --git a/incubator/types-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/config/IntegerConverterConfigAdapter.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/config/IntegerConverterConfigAdapter.java similarity index 100% rename from incubator/types-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/config/IntegerConverterConfigAdapter.java rename to incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/config/IntegerConverterConfigAdapter.java diff --git a/incubator/types-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/config/IntegerValidatorConfigAdapter.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/config/IntegerValidatorConfigAdapter.java similarity index 100% rename from incubator/types-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/config/IntegerValidatorConfigAdapter.java rename to incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/config/IntegerValidatorConfigAdapter.java diff --git a/incubator/types-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/config/StringConverterConfigAdapter.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/config/StringConverterConfigAdapter.java similarity index 100% rename from incubator/types-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/config/StringConverterConfigAdapter.java rename to incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/config/StringConverterConfigAdapter.java diff --git a/incubator/types-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/config/StringValidatorConfigAdapter.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/config/StringValidatorConfigAdapter.java similarity index 100% rename from incubator/types-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/config/StringValidatorConfigAdapter.java rename to incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/config/StringValidatorConfigAdapter.java diff --git a/incubator/types-core/src/main/moditect/module-info.java b/incubator/model-core/src/main/moditect/module-info.java similarity index 100% rename from incubator/types-core/src/main/moditect/module-info.java rename to incubator/model-core/src/main/moditect/module-info.java diff --git a/incubator/types-core/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi b/incubator/model-core/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi similarity index 100% rename from incubator/types-core/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi rename to incubator/model-core/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi diff --git a/incubator/types-core/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ValidatorConfigAdapterSpi b/incubator/model-core/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ValidatorConfigAdapterSpi similarity index 100% rename from incubator/types-core/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ValidatorConfigAdapterSpi rename to incubator/model-core/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ValidatorConfigAdapterSpi diff --git a/incubator/types-core/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.converter.ConverterFactorySpi b/incubator/model-core/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.converter.ConverterFactorySpi similarity index 100% rename from incubator/types-core/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.converter.ConverterFactorySpi rename to incubator/model-core/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.converter.ConverterFactorySpi diff --git a/incubator/types-core/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.validator.ValidatorFactorySpi b/incubator/model-core/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.validator.ValidatorFactorySpi similarity index 100% rename from incubator/types-core/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.validator.ValidatorFactorySpi rename to incubator/model-core/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.validator.ValidatorFactorySpi diff --git a/incubator/types-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/IntegerConverterFactoryTest.java b/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/IntegerConverterFactoryTest.java similarity index 100% rename from incubator/types-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/IntegerConverterFactoryTest.java rename to incubator/model-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/IntegerConverterFactoryTest.java diff --git a/incubator/types-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/IntegerConverterTest.java b/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/IntegerConverterTest.java similarity index 100% rename from incubator/types-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/IntegerConverterTest.java rename to incubator/model-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/IntegerConverterTest.java diff --git a/incubator/types-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/IntegerValidatorFactoryTest.java b/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/IntegerValidatorFactoryTest.java similarity index 100% rename from incubator/types-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/IntegerValidatorFactoryTest.java rename to incubator/model-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/IntegerValidatorFactoryTest.java diff --git a/incubator/types-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/IntegerValidatorTest.java b/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/IntegerValidatorTest.java similarity index 100% rename from incubator/types-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/IntegerValidatorTest.java rename to incubator/model-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/IntegerValidatorTest.java diff --git a/incubator/types-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/StringConverterFactoryTest.java b/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/StringConverterFactoryTest.java similarity index 100% rename from incubator/types-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/StringConverterFactoryTest.java rename to incubator/model-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/StringConverterFactoryTest.java diff --git a/incubator/types-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/StringConverterTest.java b/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/StringConverterTest.java similarity index 100% rename from incubator/types-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/StringConverterTest.java rename to incubator/model-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/StringConverterTest.java diff --git a/incubator/types-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/StringEncodingTest.java b/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/StringEncodingTest.java similarity index 100% rename from incubator/types-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/StringEncodingTest.java rename to incubator/model-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/StringEncodingTest.java diff --git a/incubator/types-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/StringValidatorFactoryTest.java b/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/StringValidatorFactoryTest.java similarity index 100% rename from incubator/types-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/StringValidatorFactoryTest.java rename to incubator/model-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/StringValidatorFactoryTest.java diff --git a/incubator/types-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/StringValidatorTest.java b/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/StringValidatorTest.java similarity index 100% rename from incubator/types-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/StringValidatorTest.java rename to incubator/model-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/StringValidatorTest.java diff --git a/incubator/types-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/config/IntegerConverterConfigAdapterTest.java b/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/config/IntegerConverterConfigAdapterTest.java similarity index 100% rename from incubator/types-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/config/IntegerConverterConfigAdapterTest.java rename to incubator/model-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/config/IntegerConverterConfigAdapterTest.java diff --git a/incubator/types-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/config/IntegerValidatorConfigAdapterTest.java b/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/config/IntegerValidatorConfigAdapterTest.java similarity index 100% rename from incubator/types-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/config/IntegerValidatorConfigAdapterTest.java rename to incubator/model-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/config/IntegerValidatorConfigAdapterTest.java diff --git a/incubator/types-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/config/StringConverterConfigAdapterTest.java b/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/config/StringConverterConfigAdapterTest.java similarity index 100% rename from incubator/types-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/config/StringConverterConfigAdapterTest.java rename to incubator/model-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/config/StringConverterConfigAdapterTest.java diff --git a/incubator/types-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/config/StringValidatorConfigAdapterTest.java b/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/config/StringValidatorConfigAdapterTest.java similarity index 100% rename from incubator/types-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/config/StringValidatorConfigAdapterTest.java rename to incubator/model-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/config/StringValidatorConfigAdapterTest.java diff --git a/incubator/types-json.spec/COPYRIGHT b/incubator/model-json.spec/COPYRIGHT similarity index 100% rename from incubator/types-json.spec/COPYRIGHT rename to incubator/model-json.spec/COPYRIGHT diff --git a/incubator/types-json.spec/LICENSE b/incubator/model-json.spec/LICENSE similarity index 100% rename from incubator/types-json.spec/LICENSE rename to incubator/model-json.spec/LICENSE diff --git a/incubator/types-json.spec/NOTICE b/incubator/model-json.spec/NOTICE similarity index 100% rename from incubator/types-json.spec/NOTICE rename to incubator/model-json.spec/NOTICE diff --git a/incubator/types-json.spec/NOTICE.template b/incubator/model-json.spec/NOTICE.template similarity index 100% rename from incubator/types-json.spec/NOTICE.template rename to incubator/model-json.spec/NOTICE.template diff --git a/incubator/types-json.spec/mvnw b/incubator/model-json.spec/mvnw similarity index 100% rename from incubator/types-json.spec/mvnw rename to incubator/model-json.spec/mvnw diff --git a/incubator/types-json.spec/mvnw.cmd b/incubator/model-json.spec/mvnw.cmd similarity index 100% rename from incubator/types-json.spec/mvnw.cmd rename to incubator/model-json.spec/mvnw.cmd diff --git a/incubator/types-json.spec/pom.xml b/incubator/model-json.spec/pom.xml similarity index 97% rename from incubator/types-json.spec/pom.xml rename to incubator/model-json.spec/pom.xml index 40dbfc7248..c1d9a96e96 100644 --- a/incubator/types-json.spec/pom.xml +++ b/incubator/model-json.spec/pom.xml @@ -12,8 +12,8 @@ ../pom.xml -types-json.spec -zilla::incubator::types-json.spec +model-json.spec +zilla::incubator::model-json.spec diff --git a/incubator/types-json.spec/src/main/moditect/module-info.java b/incubator/model-json.spec/src/main/moditect/module-info.java similarity index 100% rename from incubator/types-json.spec/src/main/moditect/module-info.java rename to incubator/model-json.spec/src/main/moditect/module-info.java diff --git a/incubator/types-json.spec/src/main/scripts/io/aklivity/zilla/specs/types/json/config/converter.yaml b/incubator/model-json.spec/src/main/scripts/io/aklivity/zilla/specs/types/json/config/converter.yaml similarity index 100% rename from incubator/types-json.spec/src/main/scripts/io/aklivity/zilla/specs/types/json/config/converter.yaml rename to incubator/model-json.spec/src/main/scripts/io/aklivity/zilla/specs/types/json/config/converter.yaml diff --git a/incubator/types-json.spec/src/main/scripts/io/aklivity/zilla/specs/types/json/schema/json.schema.patch.json b/incubator/model-json.spec/src/main/scripts/io/aklivity/zilla/specs/types/json/schema/json.schema.patch.json similarity index 100% rename from incubator/types-json.spec/src/main/scripts/io/aklivity/zilla/specs/types/json/schema/json.schema.patch.json rename to incubator/model-json.spec/src/main/scripts/io/aklivity/zilla/specs/types/json/schema/json.schema.patch.json diff --git a/incubator/types-json.spec/src/test/java/io/aklivity/zilla/specs/types/json/config/SchemaTest.java b/incubator/model-json.spec/src/test/java/io/aklivity/zilla/specs/types/json/config/SchemaTest.java similarity index 100% rename from incubator/types-json.spec/src/test/java/io/aklivity/zilla/specs/types/json/config/SchemaTest.java rename to incubator/model-json.spec/src/test/java/io/aklivity/zilla/specs/types/json/config/SchemaTest.java diff --git a/incubator/types-json/COPYRIGHT b/incubator/model-json/COPYRIGHT similarity index 100% rename from incubator/types-json/COPYRIGHT rename to incubator/model-json/COPYRIGHT diff --git a/incubator/types-json/LICENSE b/incubator/model-json/LICENSE similarity index 100% rename from incubator/types-json/LICENSE rename to incubator/model-json/LICENSE diff --git a/incubator/types-json/NOTICE b/incubator/model-json/NOTICE similarity index 100% rename from incubator/types-json/NOTICE rename to incubator/model-json/NOTICE diff --git a/incubator/types-json/NOTICE.template b/incubator/model-json/NOTICE.template similarity index 100% rename from incubator/types-json/NOTICE.template rename to incubator/model-json/NOTICE.template diff --git a/incubator/types-json/mvnw b/incubator/model-json/mvnw similarity index 100% rename from incubator/types-json/mvnw rename to incubator/model-json/mvnw diff --git a/incubator/types-json/mvnw.cmd b/incubator/model-json/mvnw.cmd similarity index 100% rename from incubator/types-json/mvnw.cmd rename to incubator/model-json/mvnw.cmd diff --git a/incubator/types-json/pom.xml b/incubator/model-json/pom.xml similarity index 97% rename from incubator/types-json/pom.xml rename to incubator/model-json/pom.xml index d19465451a..50fd58fbad 100644 --- a/incubator/types-json/pom.xml +++ b/incubator/model-json/pom.xml @@ -10,8 +10,8 @@ ../pom.xml -types-json -zilla::incubator::types-json +model-json +zilla::incubator::model-json @@ -31,7 +31,7 @@ ${project.groupId} - types-json.spec + model-json.spec ${project.version} provided @@ -98,7 +98,7 @@ ${project.groupId} - types-json.spec + model-json.spec ^\Qio/aklivity/zilla/specs/types/json/\E diff --git a/incubator/types-json/src/main/java/io/aklivity/zilla/runtime/types/json/config/JsonConverterConfig.java b/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/config/JsonConverterConfig.java similarity index 100% rename from incubator/types-json/src/main/java/io/aklivity/zilla/runtime/types/json/config/JsonConverterConfig.java rename to incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/config/JsonConverterConfig.java diff --git a/incubator/types-json/src/main/java/io/aklivity/zilla/runtime/types/json/config/JsonConverterConfigBuilder.java b/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/config/JsonConverterConfigBuilder.java similarity index 100% rename from incubator/types-json/src/main/java/io/aklivity/zilla/runtime/types/json/config/JsonConverterConfigBuilder.java rename to incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/config/JsonConverterConfigBuilder.java diff --git a/incubator/types-json/src/main/java/io/aklivity/zilla/runtime/types/json/config/JsonValidatorConfig.java b/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/config/JsonValidatorConfig.java similarity index 100% rename from incubator/types-json/src/main/java/io/aklivity/zilla/runtime/types/json/config/JsonValidatorConfig.java rename to incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/config/JsonValidatorConfig.java diff --git a/incubator/types-json/src/main/java/io/aklivity/zilla/runtime/types/json/config/JsonValidatorConfigBuilder.java b/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/config/JsonValidatorConfigBuilder.java similarity index 100% rename from incubator/types-json/src/main/java/io/aklivity/zilla/runtime/types/json/config/JsonValidatorConfigBuilder.java rename to incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/config/JsonValidatorConfigBuilder.java diff --git a/incubator/types-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonConverter.java b/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonConverter.java similarity index 100% rename from incubator/types-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonConverter.java rename to incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonConverter.java diff --git a/incubator/types-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonConverterContext.java b/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonConverterContext.java similarity index 100% rename from incubator/types-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonConverterContext.java rename to incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonConverterContext.java diff --git a/incubator/types-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonConverterFactorySpi.java b/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonConverterFactorySpi.java similarity index 100% rename from incubator/types-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonConverterFactorySpi.java rename to incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonConverterFactorySpi.java diff --git a/incubator/types-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonConverterHandler.java b/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonConverterHandler.java similarity index 100% rename from incubator/types-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonConverterHandler.java rename to incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonConverterHandler.java diff --git a/incubator/types-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonReadConverterHandler.java b/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonReadConverterHandler.java similarity index 100% rename from incubator/types-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonReadConverterHandler.java rename to incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonReadConverterHandler.java diff --git a/incubator/types-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonValidator.java b/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonValidator.java similarity index 100% rename from incubator/types-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonValidator.java rename to incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonValidator.java diff --git a/incubator/types-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonValidatorContext.java b/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonValidatorContext.java similarity index 100% rename from incubator/types-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonValidatorContext.java rename to incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonValidatorContext.java diff --git a/incubator/types-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonValidatorFactorySpi.java b/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonValidatorFactorySpi.java similarity index 100% rename from incubator/types-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonValidatorFactorySpi.java rename to incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonValidatorFactorySpi.java diff --git a/incubator/types-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonValidatorHandler.java b/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonValidatorHandler.java similarity index 100% rename from incubator/types-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonValidatorHandler.java rename to incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonValidatorHandler.java diff --git a/incubator/types-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonWriteConverterHandler.java b/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonWriteConverterHandler.java similarity index 100% rename from incubator/types-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonWriteConverterHandler.java rename to incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonWriteConverterHandler.java diff --git a/incubator/types-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/config/JsonConverterConfigAdapter.java b/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/config/JsonConverterConfigAdapter.java similarity index 100% rename from incubator/types-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/config/JsonConverterConfigAdapter.java rename to incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/config/JsonConverterConfigAdapter.java diff --git a/incubator/types-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/config/JsonValidatorConfigAdapter.java b/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/config/JsonValidatorConfigAdapter.java similarity index 100% rename from incubator/types-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/config/JsonValidatorConfigAdapter.java rename to incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/config/JsonValidatorConfigAdapter.java diff --git a/incubator/types-json/src/main/moditect/module-info.java b/incubator/model-json/src/main/moditect/module-info.java similarity index 100% rename from incubator/types-json/src/main/moditect/module-info.java rename to incubator/model-json/src/main/moditect/module-info.java diff --git a/incubator/types-json/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi b/incubator/model-json/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi similarity index 100% rename from incubator/types-json/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi rename to incubator/model-json/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi diff --git a/incubator/types-json/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ValidatorConfigAdapterSpi b/incubator/model-json/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ValidatorConfigAdapterSpi similarity index 100% rename from incubator/types-json/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ValidatorConfigAdapterSpi rename to incubator/model-json/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ValidatorConfigAdapterSpi diff --git a/incubator/types-json/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.converter.ConverterFactorySpi b/incubator/model-json/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.converter.ConverterFactorySpi similarity index 100% rename from incubator/types-json/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.converter.ConverterFactorySpi rename to incubator/model-json/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.converter.ConverterFactorySpi diff --git a/incubator/types-json/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.validator.ValidatorFactorySpi b/incubator/model-json/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.validator.ValidatorFactorySpi similarity index 100% rename from incubator/types-json/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.validator.ValidatorFactorySpi rename to incubator/model-json/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.validator.ValidatorFactorySpi diff --git a/incubator/types-json/src/test/java/io/aklivity/zilla/runtime/types/json/internal/JsonConverterFactorySpiTest.java b/incubator/model-json/src/test/java/io/aklivity/zilla/runtime/types/json/internal/JsonConverterFactorySpiTest.java similarity index 100% rename from incubator/types-json/src/test/java/io/aklivity/zilla/runtime/types/json/internal/JsonConverterFactorySpiTest.java rename to incubator/model-json/src/test/java/io/aklivity/zilla/runtime/types/json/internal/JsonConverterFactorySpiTest.java diff --git a/incubator/types-json/src/test/java/io/aklivity/zilla/runtime/types/json/internal/JsonConverterTest.java b/incubator/model-json/src/test/java/io/aklivity/zilla/runtime/types/json/internal/JsonConverterTest.java similarity index 100% rename from incubator/types-json/src/test/java/io/aklivity/zilla/runtime/types/json/internal/JsonConverterTest.java rename to incubator/model-json/src/test/java/io/aklivity/zilla/runtime/types/json/internal/JsonConverterTest.java diff --git a/incubator/types-json/src/test/java/io/aklivity/zilla/runtime/types/json/internal/JsonValidatorFactorySpiTest.java b/incubator/model-json/src/test/java/io/aklivity/zilla/runtime/types/json/internal/JsonValidatorFactorySpiTest.java similarity index 100% rename from incubator/types-json/src/test/java/io/aklivity/zilla/runtime/types/json/internal/JsonValidatorFactorySpiTest.java rename to incubator/model-json/src/test/java/io/aklivity/zilla/runtime/types/json/internal/JsonValidatorFactorySpiTest.java diff --git a/incubator/types-json/src/test/java/io/aklivity/zilla/runtime/types/json/internal/JsonValidatorTest.java b/incubator/model-json/src/test/java/io/aklivity/zilla/runtime/types/json/internal/JsonValidatorTest.java similarity index 100% rename from incubator/types-json/src/test/java/io/aklivity/zilla/runtime/types/json/internal/JsonValidatorTest.java rename to incubator/model-json/src/test/java/io/aklivity/zilla/runtime/types/json/internal/JsonValidatorTest.java diff --git a/incubator/types-json/src/test/java/io/aklivity/zilla/runtime/types/json/internal/config/JsonConverterConfigAdapterTest.java b/incubator/model-json/src/test/java/io/aklivity/zilla/runtime/types/json/internal/config/JsonConverterConfigAdapterTest.java similarity index 100% rename from incubator/types-json/src/test/java/io/aklivity/zilla/runtime/types/json/internal/config/JsonConverterConfigAdapterTest.java rename to incubator/model-json/src/test/java/io/aklivity/zilla/runtime/types/json/internal/config/JsonConverterConfigAdapterTest.java diff --git a/incubator/types-json/src/test/java/io/aklivity/zilla/runtime/types/json/internal/config/JsonValidatorConfigAdapterTest.java b/incubator/model-json/src/test/java/io/aklivity/zilla/runtime/types/json/internal/config/JsonValidatorConfigAdapterTest.java similarity index 100% rename from incubator/types-json/src/test/java/io/aklivity/zilla/runtime/types/json/internal/config/JsonValidatorConfigAdapterTest.java rename to incubator/model-json/src/test/java/io/aklivity/zilla/runtime/types/json/internal/config/JsonValidatorConfigAdapterTest.java diff --git a/incubator/types-protobuf.spec/COPYRIGHT b/incubator/model-protobuf.spec/COPYRIGHT similarity index 100% rename from incubator/types-protobuf.spec/COPYRIGHT rename to incubator/model-protobuf.spec/COPYRIGHT diff --git a/incubator/types-protobuf.spec/LICENSE b/incubator/model-protobuf.spec/LICENSE similarity index 100% rename from incubator/types-protobuf.spec/LICENSE rename to incubator/model-protobuf.spec/LICENSE diff --git a/incubator/types-protobuf.spec/NOTICE b/incubator/model-protobuf.spec/NOTICE similarity index 100% rename from incubator/types-protobuf.spec/NOTICE rename to incubator/model-protobuf.spec/NOTICE diff --git a/incubator/types-protobuf.spec/NOTICE.template b/incubator/model-protobuf.spec/NOTICE.template similarity index 100% rename from incubator/types-protobuf.spec/NOTICE.template rename to incubator/model-protobuf.spec/NOTICE.template diff --git a/incubator/types-protobuf.spec/mvnw b/incubator/model-protobuf.spec/mvnw similarity index 100% rename from incubator/types-protobuf.spec/mvnw rename to incubator/model-protobuf.spec/mvnw diff --git a/incubator/types-protobuf.spec/mvnw.cmd b/incubator/model-protobuf.spec/mvnw.cmd similarity index 100% rename from incubator/types-protobuf.spec/mvnw.cmd rename to incubator/model-protobuf.spec/mvnw.cmd diff --git a/incubator/types-protobuf.spec/pom.xml b/incubator/model-protobuf.spec/pom.xml similarity index 97% rename from incubator/types-protobuf.spec/pom.xml rename to incubator/model-protobuf.spec/pom.xml index b4db02e752..d30c6ab3ba 100644 --- a/incubator/types-protobuf.spec/pom.xml +++ b/incubator/model-protobuf.spec/pom.xml @@ -12,8 +12,8 @@ ../pom.xml -types-protobuf.spec -zilla::incubator::types-protobuf.spec +model-protobuf.spec +zilla::incubator::model-protobuf.spec diff --git a/incubator/types-protobuf.spec/src/main/moditect/module-info.java b/incubator/model-protobuf.spec/src/main/moditect/module-info.java similarity index 100% rename from incubator/types-protobuf.spec/src/main/moditect/module-info.java rename to incubator/model-protobuf.spec/src/main/moditect/module-info.java diff --git a/incubator/types-protobuf.spec/src/main/scripts/io/aklivity/zilla/specs/types/protobuf/config/converter.yaml b/incubator/model-protobuf.spec/src/main/scripts/io/aklivity/zilla/specs/types/protobuf/config/converter.yaml similarity index 100% rename from incubator/types-protobuf.spec/src/main/scripts/io/aklivity/zilla/specs/types/protobuf/config/converter.yaml rename to incubator/model-protobuf.spec/src/main/scripts/io/aklivity/zilla/specs/types/protobuf/config/converter.yaml diff --git a/incubator/types-protobuf.spec/src/main/scripts/io/aklivity/zilla/specs/types/protobuf/schema/protobuf.schema.patch.json b/incubator/model-protobuf.spec/src/main/scripts/io/aklivity/zilla/specs/types/protobuf/schema/protobuf.schema.patch.json similarity index 100% rename from incubator/types-protobuf.spec/src/main/scripts/io/aklivity/zilla/specs/types/protobuf/schema/protobuf.schema.patch.json rename to incubator/model-protobuf.spec/src/main/scripts/io/aklivity/zilla/specs/types/protobuf/schema/protobuf.schema.patch.json diff --git a/incubator/types-protobuf.spec/src/test/java/io/aklivity/zilla/specs/types/protobuf/config/SchemaTest.java b/incubator/model-protobuf.spec/src/test/java/io/aklivity/zilla/specs/types/protobuf/config/SchemaTest.java similarity index 100% rename from incubator/types-protobuf.spec/src/test/java/io/aklivity/zilla/specs/types/protobuf/config/SchemaTest.java rename to incubator/model-protobuf.spec/src/test/java/io/aklivity/zilla/specs/types/protobuf/config/SchemaTest.java diff --git a/incubator/types-protobuf/COPYRIGHT b/incubator/model-protobuf/COPYRIGHT similarity index 100% rename from incubator/types-protobuf/COPYRIGHT rename to incubator/model-protobuf/COPYRIGHT diff --git a/incubator/types-protobuf/LICENSE b/incubator/model-protobuf/LICENSE similarity index 100% rename from incubator/types-protobuf/LICENSE rename to incubator/model-protobuf/LICENSE diff --git a/incubator/types-protobuf/NOTICE b/incubator/model-protobuf/NOTICE similarity index 100% rename from incubator/types-protobuf/NOTICE rename to incubator/model-protobuf/NOTICE diff --git a/incubator/types-protobuf/NOTICE.template b/incubator/model-protobuf/NOTICE.template similarity index 100% rename from incubator/types-protobuf/NOTICE.template rename to incubator/model-protobuf/NOTICE.template diff --git a/incubator/types-protobuf/mvnw b/incubator/model-protobuf/mvnw similarity index 100% rename from incubator/types-protobuf/mvnw rename to incubator/model-protobuf/mvnw diff --git a/incubator/types-protobuf/mvnw.cmd b/incubator/model-protobuf/mvnw.cmd similarity index 100% rename from incubator/types-protobuf/mvnw.cmd rename to incubator/model-protobuf/mvnw.cmd diff --git a/incubator/types-protobuf/pom.xml b/incubator/model-protobuf/pom.xml similarity index 96% rename from incubator/types-protobuf/pom.xml rename to incubator/model-protobuf/pom.xml index 699d82151a..8ff9fe3345 100644 --- a/incubator/types-protobuf/pom.xml +++ b/incubator/model-protobuf/pom.xml @@ -12,8 +12,8 @@ ../pom.xml -types-protobuf -zilla::incubator::types-protobuf +model-protobuf +zilla::incubator::model-protobuf @@ -33,7 +33,7 @@ ${project.groupId} - types-protobuf.spec + model-protobuf.spec ${project.version} provided @@ -111,7 +111,7 @@ ${project.groupId} - types-protobuf.spec + model-protobuf.spec ^\Qio/aklivity/zilla/specs/types/protobuf/\E @@ -134,7 +134,7 @@ ${project.groupId} - types-protobuf.spec + model-protobuf.spec ${project.version} ${basedir}/target/test-classes **\/*.proto diff --git a/incubator/types-protobuf/src/main/antlr4/io/aklivity/zilla/runtime/types/protobuf/internal/parser/Protobuf3.g4 b/incubator/model-protobuf/src/main/antlr4/io/aklivity/zilla/runtime/types/protobuf/internal/parser/Protobuf3.g4 similarity index 100% rename from incubator/types-protobuf/src/main/antlr4/io/aklivity/zilla/runtime/types/protobuf/internal/parser/Protobuf3.g4 rename to incubator/model-protobuf/src/main/antlr4/io/aklivity/zilla/runtime/types/protobuf/internal/parser/Protobuf3.g4 diff --git a/incubator/types-protobuf/src/main/java/io/aklivity/zilla/runtime/types/protobuf/config/ProtobufConverterConfig.java b/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/types/protobuf/config/ProtobufConverterConfig.java similarity index 100% rename from incubator/types-protobuf/src/main/java/io/aklivity/zilla/runtime/types/protobuf/config/ProtobufConverterConfig.java rename to incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/types/protobuf/config/ProtobufConverterConfig.java diff --git a/incubator/types-protobuf/src/main/java/io/aklivity/zilla/runtime/types/protobuf/config/ProtobufConverterConfigBuilder.java b/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/types/protobuf/config/ProtobufConverterConfigBuilder.java similarity index 100% rename from incubator/types-protobuf/src/main/java/io/aklivity/zilla/runtime/types/protobuf/config/ProtobufConverterConfigBuilder.java rename to incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/types/protobuf/config/ProtobufConverterConfigBuilder.java diff --git a/incubator/types-protobuf/src/main/java/io/aklivity/zilla/runtime/types/protobuf/internal/DescriptorTree.java b/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/types/protobuf/internal/DescriptorTree.java similarity index 100% rename from incubator/types-protobuf/src/main/java/io/aklivity/zilla/runtime/types/protobuf/internal/DescriptorTree.java rename to incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/types/protobuf/internal/DescriptorTree.java diff --git a/incubator/types-protobuf/src/main/java/io/aklivity/zilla/runtime/types/protobuf/internal/ProtoListener.java b/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/types/protobuf/internal/ProtoListener.java similarity index 100% rename from incubator/types-protobuf/src/main/java/io/aklivity/zilla/runtime/types/protobuf/internal/ProtoListener.java rename to incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/types/protobuf/internal/ProtoListener.java diff --git a/incubator/types-protobuf/src/main/java/io/aklivity/zilla/runtime/types/protobuf/internal/ProtobufConverter.java b/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/types/protobuf/internal/ProtobufConverter.java similarity index 100% rename from incubator/types-protobuf/src/main/java/io/aklivity/zilla/runtime/types/protobuf/internal/ProtobufConverter.java rename to incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/types/protobuf/internal/ProtobufConverter.java diff --git a/incubator/types-protobuf/src/main/java/io/aklivity/zilla/runtime/types/protobuf/internal/ProtobufConverterContext.java b/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/types/protobuf/internal/ProtobufConverterContext.java similarity index 100% rename from incubator/types-protobuf/src/main/java/io/aklivity/zilla/runtime/types/protobuf/internal/ProtobufConverterContext.java rename to incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/types/protobuf/internal/ProtobufConverterContext.java diff --git a/incubator/types-protobuf/src/main/java/io/aklivity/zilla/runtime/types/protobuf/internal/ProtobufConverterFactorySpi.java b/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/types/protobuf/internal/ProtobufConverterFactorySpi.java similarity index 100% rename from incubator/types-protobuf/src/main/java/io/aklivity/zilla/runtime/types/protobuf/internal/ProtobufConverterFactorySpi.java rename to incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/types/protobuf/internal/ProtobufConverterFactorySpi.java diff --git a/incubator/types-protobuf/src/main/java/io/aklivity/zilla/runtime/types/protobuf/internal/ProtobufConverterHandler.java b/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/types/protobuf/internal/ProtobufConverterHandler.java similarity index 100% rename from incubator/types-protobuf/src/main/java/io/aklivity/zilla/runtime/types/protobuf/internal/ProtobufConverterHandler.java rename to incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/types/protobuf/internal/ProtobufConverterHandler.java diff --git a/incubator/types-protobuf/src/main/java/io/aklivity/zilla/runtime/types/protobuf/internal/ProtobufReadConverterHandler.java b/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/types/protobuf/internal/ProtobufReadConverterHandler.java similarity index 100% rename from incubator/types-protobuf/src/main/java/io/aklivity/zilla/runtime/types/protobuf/internal/ProtobufReadConverterHandler.java rename to incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/types/protobuf/internal/ProtobufReadConverterHandler.java diff --git a/incubator/types-protobuf/src/main/java/io/aklivity/zilla/runtime/types/protobuf/internal/ProtobufWriteConverterHandler.java b/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/types/protobuf/internal/ProtobufWriteConverterHandler.java similarity index 100% rename from incubator/types-protobuf/src/main/java/io/aklivity/zilla/runtime/types/protobuf/internal/ProtobufWriteConverterHandler.java rename to incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/types/protobuf/internal/ProtobufWriteConverterHandler.java diff --git a/incubator/types-protobuf/src/main/java/io/aklivity/zilla/runtime/types/protobuf/internal/config/ProtobufConverterConfigAdapter.java b/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/types/protobuf/internal/config/ProtobufConverterConfigAdapter.java similarity index 100% rename from incubator/types-protobuf/src/main/java/io/aklivity/zilla/runtime/types/protobuf/internal/config/ProtobufConverterConfigAdapter.java rename to incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/types/protobuf/internal/config/ProtobufConverterConfigAdapter.java diff --git a/incubator/types-protobuf/src/main/moditect/module-info.java b/incubator/model-protobuf/src/main/moditect/module-info.java similarity index 100% rename from incubator/types-protobuf/src/main/moditect/module-info.java rename to incubator/model-protobuf/src/main/moditect/module-info.java diff --git a/incubator/types-protobuf/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi b/incubator/model-protobuf/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi similarity index 100% rename from incubator/types-protobuf/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi rename to incubator/model-protobuf/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi diff --git a/incubator/types-protobuf/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.converter.ConverterFactorySpi b/incubator/model-protobuf/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.converter.ConverterFactorySpi similarity index 100% rename from incubator/types-protobuf/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.converter.ConverterFactorySpi rename to incubator/model-protobuf/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.converter.ConverterFactorySpi diff --git a/incubator/types-protobuf/src/test/java/io/aklivity/zilla/runtime/types/protobuf/internal/ProtobufConverterFactorySpiTest.java b/incubator/model-protobuf/src/test/java/io/aklivity/zilla/runtime/types/protobuf/internal/ProtobufConverterFactorySpiTest.java similarity index 100% rename from incubator/types-protobuf/src/test/java/io/aklivity/zilla/runtime/types/protobuf/internal/ProtobufConverterFactorySpiTest.java rename to incubator/model-protobuf/src/test/java/io/aklivity/zilla/runtime/types/protobuf/internal/ProtobufConverterFactorySpiTest.java diff --git a/incubator/types-protobuf/src/test/java/io/aklivity/zilla/runtime/types/protobuf/internal/ProtobufConverterTest.java b/incubator/model-protobuf/src/test/java/io/aklivity/zilla/runtime/types/protobuf/internal/ProtobufConverterTest.java similarity index 100% rename from incubator/types-protobuf/src/test/java/io/aklivity/zilla/runtime/types/protobuf/internal/ProtobufConverterTest.java rename to incubator/model-protobuf/src/test/java/io/aklivity/zilla/runtime/types/protobuf/internal/ProtobufConverterTest.java diff --git a/incubator/types-protobuf/src/test/java/io/aklivity/zilla/runtime/types/protobuf/internal/config/ProtobufConverterConfigAdapterTest.java b/incubator/model-protobuf/src/test/java/io/aklivity/zilla/runtime/types/protobuf/internal/config/ProtobufConverterConfigAdapterTest.java similarity index 100% rename from incubator/types-protobuf/src/test/java/io/aklivity/zilla/runtime/types/protobuf/internal/config/ProtobufConverterConfigAdapterTest.java rename to incubator/model-protobuf/src/test/java/io/aklivity/zilla/runtime/types/protobuf/internal/config/ProtobufConverterConfigAdapterTest.java diff --git a/incubator/pom.xml b/incubator/pom.xml index 1e5132139b..faa3f73b59 100644 --- a/incubator/pom.xml +++ b/incubator/pom.xml @@ -21,10 +21,10 @@ catalog-inline.spec catalog-schema-registry.spec exporter-otlp.spec - types-avro.spec - types-core.spec - types-json.spec - types-protobuf.spec + model-avro.spec + model-core.spec + model-json.spec + model-protobuf.spec binding-amqp @@ -38,10 +38,10 @@ exporter-otlp - types-avro - types-core - types-json - types-protobuf + model-avro + model-core + model-json + model-protobuf @@ -88,22 +88,22 @@ ${project.groupId} - types-avro + model-avro ${project.version} ${project.groupId} - types-core + model-core ${project.version} ${project.groupId} - types-json + model-json ${project.version} ${project.groupId} - types-protobuf + model-protobuf ${project.version} From 93f10a44b7875ffa94116511999728afefc4cae3 Mon Sep 17 00:00:00 2001 From: Ankit Kumar Date: Thu, 25 Jan 2024 13:01:18 +0530 Subject: [PATCH 2/4] updating package structure to match module name --- .../docker-image/src/main/docker/assembly.xml | 1 - .../internal/airline/ConfigGenerator.java | 4 ++-- .../AsyncApiHttpProxyConfigGenerator.java | 2 +- .../AsyncApiMqttProxyConfigGenerator.java | 2 +- .../OpenApiHttpProxyConfigGenerator.java | 2 +- .../src/main/moditect/module-info.java | 8 ++++---- incubator/model-avro.spec/pom.xml | 4 ++-- .../src/main/moditect/module-info.java | 2 +- .../avro/config/converter.yaml | 0 .../avro/schema/avro.schema.patch.json | 0 .../avro/config/SchemaTest.java | 6 +++--- incubator/model-avro/pom.xml | 12 +++++------ .../avro/config/AvroConverterConfig.java | 2 +- .../config/AvroConverterConfigBuilder.java | 2 +- .../avro/internal/AvroConverter.java | 2 +- .../avro/internal/AvroConverterContext.java | 4 ++-- .../internal/AvroConverterFactorySpi.java | 2 +- .../avro/internal/AvroConverterHandler.java | 4 ++-- .../internal/AvroReadConverterHandler.java | 4 ++-- .../internal/AvroWriteConverterHandler.java | 4 ++-- .../config/AvroConverterConfigAdapter.java | 4 ++-- .../src/main/moditect/module-info.java | 12 +++++------ ...me.engine.config.ConverterConfigAdapterSpi | 2 +- ...ntime.engine.converter.ConverterFactorySpi | 2 +- .../internal/AvroConverterFactorySpiTest.java | 4 ++-- .../avro/internal/AvroConverterTest.java | 4 ++-- .../AvroConverterConfigAdapterTest.java | 4 ++-- incubator/model-core.spec/pom.xml | 4 ++-- .../src/main/moditect/module-info.java | 2 +- .../core/config/string.converter.yaml | 0 .../core/schema/integer.schema.patch.json | 0 .../core/schema/string.schema.patch.json | 0 .../core/config/SchemaTest.java | 6 +++--- incubator/model-core/pom.xml | 10 +++++----- .../core/config/IntegerConverterConfig.java | 2 +- .../config/IntegerConverterConfigBuilder.java | 2 +- .../core/config/IntegerValidatorConfig.java | 2 +- .../config/IntegerValidatorConfigBuilder.java | 2 +- .../core/config/StringConverterConfig.java | 2 +- .../config/StringConverterConfigBuilder.java | 2 +- .../core/config/StringValidatorConfig.java | 2 +- .../config/StringValidatorConfigBuilder.java | 2 +- .../core/internal/IntegerConverter.java | 2 +- .../internal/IntegerConverterContext.java | 4 ++-- .../internal/IntegerConverterFactorySpi.java | 2 +- .../internal/IntegerConverterHandler.java | 4 ++-- .../core/internal/IntegerValidator.java | 2 +- .../internal/IntegerValidatorContext.java | 4 ++-- .../internal/IntegerValidatorFactorySpi.java | 2 +- .../internal/IntegerValidatorHandler.java | 4 ++-- .../core/internal/StringConverter.java | 2 +- .../core/internal/StringConverterContext.java | 4 ++-- .../internal/StringConverterFactorySpi.java | 2 +- .../core/internal/StringConverterHandler.java | 4 ++-- .../core/internal/StringEncoding.java | 2 +- .../core/internal/StringValidator.java | 2 +- .../core/internal/StringValidatorContext.java | 4 ++-- .../internal/StringValidatorEncoding.java | 2 +- .../internal/StringValidatorFactorySpi.java | 2 +- .../core/internal/StringValidatorHandler.java | 4 ++-- .../config/IntegerConverterConfigAdapter.java | 4 ++-- .../config/IntegerValidatorConfigAdapter.java | 4 ++-- .../config/StringConverterConfigAdapter.java | 4 ++-- .../config/StringValidatorConfigAdapter.java | 4 ++-- .../src/main/moditect/module-info.java | 20 +++++++++---------- ...me.engine.config.ConverterConfigAdapterSpi | 4 ++-- ...me.engine.config.ValidatorConfigAdapterSpi | 4 ++-- ...ntime.engine.converter.ConverterFactorySpi | 4 ++-- ...ntime.engine.validator.ValidatorFactorySpi | 4 ++-- .../internal/IntegerConverterFactoryTest.java | 4 ++-- .../core/internal/IntegerConverterTest.java | 4 ++-- .../internal/IntegerValidatorFactoryTest.java | 4 ++-- .../core/internal/IntegerValidatorTest.java | 4 ++-- .../internal/StringConverterFactoryTest.java | 4 ++-- .../core/internal/StringConverterTest.java | 4 ++-- .../core/internal/StringEncodingTest.java | 2 +- .../internal/StringValidatorFactoryTest.java | 4 ++-- .../core/internal/StringValidatorTest.java | 4 ++-- .../IntegerConverterConfigAdapterTest.java | 4 ++-- .../IntegerValidatorConfigAdapterTest.java | 4 ++-- .../StringConverterConfigAdapterTest.java | 4 ++-- .../StringValidatorConfigAdapterTest.java | 4 ++-- .../src/main/moditect/module-info.java | 2 +- .../json/config/converter.yaml | 0 .../json/schema/json.schema.patch.json | 0 .../json/config/SchemaTest.java | 6 +++--- incubator/model-json/pom.xml | 6 +++--- .../json/config/JsonConverterConfig.java | 2 +- .../config/JsonConverterConfigBuilder.java | 2 +- .../json/config/JsonValidatorConfig.java | 2 +- .../config/JsonValidatorConfigBuilder.java | 2 +- .../json/internal/JsonConverter.java | 2 +- .../json/internal/JsonConverterContext.java | 4 ++-- .../internal/JsonConverterFactorySpi.java | 2 +- .../json/internal/JsonConverterHandler.java | 4 ++-- .../internal/JsonReadConverterHandler.java | 4 ++-- .../json/internal/JsonValidator.java | 2 +- .../json/internal/JsonValidatorContext.java | 4 ++-- .../internal/JsonValidatorFactorySpi.java | 2 +- .../json/internal/JsonValidatorHandler.java | 4 ++-- .../internal/JsonWriteConverterHandler.java | 4 ++-- .../config/JsonConverterConfigAdapter.java | 4 ++-- .../config/JsonValidatorConfigAdapter.java | 4 ++-- .../src/main/moditect/module-info.java | 12 +++++------ ...me.engine.config.ConverterConfigAdapterSpi | 2 +- ...me.engine.config.ValidatorConfigAdapterSpi | 2 +- ...ntime.engine.converter.ConverterFactorySpi | 2 +- ...ntime.engine.validator.ValidatorFactorySpi | 2 +- .../internal/JsonConverterFactorySpiTest.java | 4 ++-- .../json/internal/JsonConverterTest.java | 4 ++-- .../internal/JsonValidatorFactorySpiTest.java | 4 ++-- .../json/internal/JsonValidatorTest.java | 4 ++-- .../JsonConverterConfigAdapterTest.java | 4 ++-- .../JsonValidatorConfigAdapterTest.java | 4 ++-- .../src/main/moditect/module-info.java | 2 +- .../protobuf/config/converter.yaml | 0 .../schema/protobuf.schema.patch.json | 0 .../protobuf/config/SchemaTest.java | 6 +++--- incubator/model-protobuf/pom.xml | 8 ++++---- .../protobuf/internal/parser/Protobuf3.g4 | 0 .../config/ProtobufConverterConfig.java | 2 +- .../ProtobufConverterConfigBuilder.java | 2 +- .../protobuf/internal/DescriptorTree.java | 2 +- .../protobuf/internal/ProtoListener.java | 6 +++--- .../protobuf/internal/ProtobufConverter.java | 2 +- .../internal/ProtobufConverterContext.java | 4 ++-- .../internal/ProtobufConverterFactorySpi.java | 2 +- .../internal/ProtobufConverterHandler.java | 8 ++++---- .../ProtobufReadConverterHandler.java | 4 ++-- .../ProtobufWriteConverterHandler.java | 4 ++-- .../ProtobufConverterConfigAdapter.java | 4 ++-- .../src/main/moditect/module-info.java | 8 ++++---- ...me.engine.config.ConverterConfigAdapterSpi | 2 +- ...ntime.engine.converter.ConverterFactorySpi | 2 +- .../ProtobufConverterFactorySpiTest.java | 4 ++-- .../internal/ProtobufConverterTest.java | 4 ++-- .../ProtobufConverterConfigAdapterTest.java | 4 ++-- 137 files changed, 238 insertions(+), 239 deletions(-) rename incubator/model-avro.spec/src/main/scripts/io/aklivity/zilla/specs/{types => model}/avro/config/converter.yaml (100%) rename incubator/model-avro.spec/src/main/scripts/io/aklivity/zilla/specs/{types => model}/avro/schema/avro.schema.patch.json (100%) rename incubator/model-avro.spec/src/test/java/io/aklivity/zilla/specs/{types => model}/avro/config/SchemaTest.java (88%) rename incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/{types => model}/avro/config/AvroConverterConfig.java (96%) rename incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/{types => model}/avro/config/AvroConverterConfigBuilder.java (97%) rename incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/{types => model}/avro/internal/AvroConverter.java (95%) rename incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/{types => model}/avro/internal/AvroConverterContext.java (93%) rename incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/{types => model}/avro/internal/AvroConverterFactorySpi.java (95%) rename incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/{types => model}/avro/internal/AvroConverterHandler.java (98%) rename incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/{types => model}/avro/internal/AvroReadConverterHandler.java (97%) rename incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/{types => model}/avro/internal/AvroWriteConverterHandler.java (96%) rename incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/{types => model}/avro/internal/config/AvroConverterConfigAdapter.java (96%) rename incubator/model-avro/src/test/java/io/aklivity/zilla/runtime/{types => model}/avro/internal/AvroConverterFactorySpiTest.java (94%) rename incubator/model-avro/src/test/java/io/aklivity/zilla/runtime/{types => model}/avro/internal/AvroConverterTest.java (98%) rename incubator/model-avro/src/test/java/io/aklivity/zilla/runtime/{types => model}/avro/internal/config/AvroConverterConfigAdapterTest.java (97%) rename incubator/model-core.spec/src/main/scripts/io/aklivity/zilla/specs/{types => model}/core/config/string.converter.yaml (100%) rename incubator/model-core.spec/src/main/scripts/io/aklivity/zilla/specs/{types => model}/core/schema/integer.schema.patch.json (100%) rename incubator/model-core.spec/src/main/scripts/io/aklivity/zilla/specs/{types => model}/core/schema/string.schema.patch.json (100%) rename incubator/model-core.spec/src/test/java/io/aklivity/zilla/specs/{types => model}/core/config/SchemaTest.java (87%) rename incubator/model-core/src/main/java/io/aklivity/zilla/runtime/{types => model}/core/config/IntegerConverterConfig.java (95%) rename incubator/model-core/src/main/java/io/aklivity/zilla/runtime/{types => model}/core/config/IntegerConverterConfigBuilder.java (96%) rename incubator/model-core/src/main/java/io/aklivity/zilla/runtime/{types => model}/core/config/IntegerValidatorConfig.java (95%) rename incubator/model-core/src/main/java/io/aklivity/zilla/runtime/{types => model}/core/config/IntegerValidatorConfigBuilder.java (96%) rename incubator/model-core/src/main/java/io/aklivity/zilla/runtime/{types => model}/core/config/StringConverterConfig.java (96%) rename incubator/model-core/src/main/java/io/aklivity/zilla/runtime/{types => model}/core/config/StringConverterConfigBuilder.java (96%) rename incubator/model-core/src/main/java/io/aklivity/zilla/runtime/{types => model}/core/config/StringValidatorConfig.java (96%) rename incubator/model-core/src/main/java/io/aklivity/zilla/runtime/{types => model}/core/config/StringValidatorConfigBuilder.java (96%) rename incubator/model-core/src/main/java/io/aklivity/zilla/runtime/{types => model}/core/internal/IntegerConverter.java (95%) rename incubator/model-core/src/main/java/io/aklivity/zilla/runtime/{types => model}/core/internal/IntegerConverterContext.java (92%) rename incubator/model-core/src/main/java/io/aklivity/zilla/runtime/{types => model}/core/internal/IntegerConverterFactorySpi.java (95%) rename incubator/model-core/src/main/java/io/aklivity/zilla/runtime/{types => model}/core/internal/IntegerConverterHandler.java (91%) rename incubator/model-core/src/main/java/io/aklivity/zilla/runtime/{types => model}/core/internal/IntegerValidator.java (95%) rename incubator/model-core/src/main/java/io/aklivity/zilla/runtime/{types => model}/core/internal/IntegerValidatorContext.java (90%) rename incubator/model-core/src/main/java/io/aklivity/zilla/runtime/{types => model}/core/internal/IntegerValidatorFactorySpi.java (95%) rename incubator/model-core/src/main/java/io/aklivity/zilla/runtime/{types => model}/core/internal/IntegerValidatorHandler.java (92%) rename incubator/model-core/src/main/java/io/aklivity/zilla/runtime/{types => model}/core/internal/StringConverter.java (95%) rename incubator/model-core/src/main/java/io/aklivity/zilla/runtime/{types => model}/core/internal/StringConverterContext.java (92%) rename incubator/model-core/src/main/java/io/aklivity/zilla/runtime/{types => model}/core/internal/StringConverterFactorySpi.java (95%) rename incubator/model-core/src/main/java/io/aklivity/zilla/runtime/{types => model}/core/internal/StringConverterHandler.java (92%) rename incubator/model-core/src/main/java/io/aklivity/zilla/runtime/{types => model}/core/internal/StringEncoding.java (98%) rename incubator/model-core/src/main/java/io/aklivity/zilla/runtime/{types => model}/core/internal/StringValidator.java (95%) rename incubator/model-core/src/main/java/io/aklivity/zilla/runtime/{types => model}/core/internal/StringValidatorContext.java (90%) rename incubator/model-core/src/main/java/io/aklivity/zilla/runtime/{types => model}/core/internal/StringValidatorEncoding.java (98%) rename incubator/model-core/src/main/java/io/aklivity/zilla/runtime/{types => model}/core/internal/StringValidatorFactorySpi.java (95%) rename incubator/model-core/src/main/java/io/aklivity/zilla/runtime/{types => model}/core/internal/StringValidatorHandler.java (91%) rename incubator/model-core/src/main/java/io/aklivity/zilla/runtime/{types => model}/core/internal/config/IntegerConverterConfigAdapter.java (91%) rename incubator/model-core/src/main/java/io/aklivity/zilla/runtime/{types => model}/core/internal/config/IntegerValidatorConfigAdapter.java (91%) rename incubator/model-core/src/main/java/io/aklivity/zilla/runtime/{types => model}/core/internal/config/StringConverterConfigAdapter.java (95%) rename incubator/model-core/src/main/java/io/aklivity/zilla/runtime/{types => model}/core/internal/config/StringValidatorConfigAdapter.java (95%) rename incubator/model-core/src/test/java/io/aklivity/zilla/runtime/{types => model}/core/internal/IntegerConverterFactoryTest.java (94%) rename incubator/model-core/src/test/java/io/aklivity/zilla/runtime/{types => model}/core/internal/IntegerConverterTest.java (93%) rename incubator/model-core/src/test/java/io/aklivity/zilla/runtime/{types => model}/core/internal/IntegerValidatorFactoryTest.java (94%) rename incubator/model-core/src/test/java/io/aklivity/zilla/runtime/{types => model}/core/internal/IntegerValidatorTest.java (96%) rename incubator/model-core/src/test/java/io/aklivity/zilla/runtime/{types => model}/core/internal/StringConverterFactoryTest.java (94%) rename incubator/model-core/src/test/java/io/aklivity/zilla/runtime/{types => model}/core/internal/StringConverterTest.java (97%) rename incubator/model-core/src/test/java/io/aklivity/zilla/runtime/{types => model}/core/internal/StringEncodingTest.java (97%) rename incubator/model-core/src/test/java/io/aklivity/zilla/runtime/{types => model}/core/internal/StringValidatorFactoryTest.java (94%) rename incubator/model-core/src/test/java/io/aklivity/zilla/runtime/{types => model}/core/internal/StringValidatorTest.java (96%) rename incubator/model-core/src/test/java/io/aklivity/zilla/runtime/{types => model}/core/internal/config/IntegerConverterConfigAdapterTest.java (94%) rename incubator/model-core/src/test/java/io/aklivity/zilla/runtime/{types => model}/core/internal/config/IntegerValidatorConfigAdapterTest.java (94%) rename incubator/model-core/src/test/java/io/aklivity/zilla/runtime/{types => model}/core/internal/config/StringConverterConfigAdapterTest.java (95%) rename incubator/model-core/src/test/java/io/aklivity/zilla/runtime/{types => model}/core/internal/config/StringValidatorConfigAdapterTest.java (95%) rename incubator/model-json.spec/src/main/scripts/io/aklivity/zilla/specs/{types => model}/json/config/converter.yaml (100%) rename incubator/model-json.spec/src/main/scripts/io/aklivity/zilla/specs/{types => model}/json/schema/json.schema.patch.json (100%) rename incubator/model-json.spec/src/test/java/io/aklivity/zilla/specs/{types => model}/json/config/SchemaTest.java (88%) rename incubator/model-json/src/main/java/io/aklivity/zilla/runtime/{types => model}/json/config/JsonConverterConfig.java (96%) rename incubator/model-json/src/main/java/io/aklivity/zilla/runtime/{types => model}/json/config/JsonConverterConfigBuilder.java (97%) rename incubator/model-json/src/main/java/io/aklivity/zilla/runtime/{types => model}/json/config/JsonValidatorConfig.java (96%) rename incubator/model-json/src/main/java/io/aklivity/zilla/runtime/{types => model}/json/config/JsonValidatorConfigBuilder.java (97%) rename incubator/model-json/src/main/java/io/aklivity/zilla/runtime/{types => model}/json/internal/JsonConverter.java (95%) rename incubator/model-json/src/main/java/io/aklivity/zilla/runtime/{types => model}/json/internal/JsonConverterContext.java (93%) rename incubator/model-json/src/main/java/io/aklivity/zilla/runtime/{types => model}/json/internal/JsonConverterFactorySpi.java (95%) rename incubator/model-json/src/main/java/io/aklivity/zilla/runtime/{types => model}/json/internal/JsonConverterHandler.java (97%) rename incubator/model-json/src/main/java/io/aklivity/zilla/runtime/{types => model}/json/internal/JsonReadConverterHandler.java (94%) rename incubator/model-json/src/main/java/io/aklivity/zilla/runtime/{types => model}/json/internal/JsonValidator.java (95%) rename incubator/model-json/src/main/java/io/aklivity/zilla/runtime/{types => model}/json/internal/JsonValidatorContext.java (92%) rename incubator/model-json/src/main/java/io/aklivity/zilla/runtime/{types => model}/json/internal/JsonValidatorFactorySpi.java (95%) rename incubator/model-json/src/main/java/io/aklivity/zilla/runtime/{types => model}/json/internal/JsonValidatorHandler.java (97%) rename incubator/model-json/src/main/java/io/aklivity/zilla/runtime/{types => model}/json/internal/JsonWriteConverterHandler.java (93%) rename incubator/model-json/src/main/java/io/aklivity/zilla/runtime/{types => model}/json/internal/config/JsonConverterConfigAdapter.java (96%) rename incubator/model-json/src/main/java/io/aklivity/zilla/runtime/{types => model}/json/internal/config/JsonValidatorConfigAdapter.java (96%) rename incubator/model-json/src/test/java/io/aklivity/zilla/runtime/{types => model}/json/internal/JsonConverterFactorySpiTest.java (94%) rename incubator/model-json/src/test/java/io/aklivity/zilla/runtime/{types => model}/json/internal/JsonConverterTest.java (98%) rename incubator/model-json/src/test/java/io/aklivity/zilla/runtime/{types => model}/json/internal/JsonValidatorFactorySpiTest.java (94%) rename incubator/model-json/src/test/java/io/aklivity/zilla/runtime/{types => model}/json/internal/JsonValidatorTest.java (98%) rename incubator/model-json/src/test/java/io/aklivity/zilla/runtime/{types => model}/json/internal/config/JsonConverterConfigAdapterTest.java (97%) rename incubator/model-json/src/test/java/io/aklivity/zilla/runtime/{types => model}/json/internal/config/JsonValidatorConfigAdapterTest.java (97%) rename incubator/model-protobuf.spec/src/main/scripts/io/aklivity/zilla/specs/{types => model}/protobuf/config/converter.yaml (100%) rename incubator/model-protobuf.spec/src/main/scripts/io/aklivity/zilla/specs/{types => model}/protobuf/schema/protobuf.schema.patch.json (100%) rename incubator/model-protobuf.spec/src/test/java/io/aklivity/zilla/specs/{types => model}/protobuf/config/SchemaTest.java (88%) rename incubator/model-protobuf/src/main/antlr4/io/aklivity/zilla/runtime/{types => model}/protobuf/internal/parser/Protobuf3.g4 (100%) rename incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/{types => model}/protobuf/config/ProtobufConverterConfig.java (96%) rename incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/{types => model}/protobuf/config/ProtobufConverterConfigBuilder.java (97%) rename incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/{types => model}/protobuf/internal/DescriptorTree.java (98%) rename incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/{types => model}/protobuf/internal/ProtoListener.java (96%) rename incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/{types => model}/protobuf/internal/ProtobufConverter.java (95%) rename incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/{types => model}/protobuf/internal/ProtobufConverterContext.java (93%) rename incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/{types => model}/protobuf/internal/ProtobufConverterFactorySpi.java (95%) rename incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/{types => model}/protobuf/internal/ProtobufConverterHandler.java (97%) rename incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/{types => model}/protobuf/internal/ProtobufReadConverterHandler.java (97%) rename incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/{types => model}/protobuf/internal/ProtobufWriteConverterHandler.java (98%) rename incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/{types => model}/protobuf/internal/config/ProtobufConverterConfigAdapter.java (96%) rename incubator/model-protobuf/src/test/java/io/aklivity/zilla/runtime/{types => model}/protobuf/internal/ProtobufConverterFactorySpiTest.java (94%) rename incubator/model-protobuf/src/test/java/io/aklivity/zilla/runtime/{types => model}/protobuf/internal/ProtobufConverterTest.java (99%) rename incubator/model-protobuf/src/test/java/io/aklivity/zilla/runtime/{types => model}/protobuf/internal/config/ProtobufConverterConfigAdapterTest.java (97%) diff --git a/cloud/docker-image/src/main/docker/assembly.xml b/cloud/docker-image/src/main/docker/assembly.xml index 204e62d9e3..00913c2834 100644 --- a/cloud/docker-image/src/main/docker/assembly.xml +++ b/cloud/docker-image/src/main/docker/assembly.xml @@ -31,7 +31,6 @@ io/aklivity/zilla/exporter-*/** io/aklivity/zilla/guard-*/** io/aklivity/zilla/metrics-*/** - io/aklivity/zilla/types-*/** io/aklivity/zilla/model-*/** io/aklivity/zilla/vault-*/** io/aklivity/zilla/command/** diff --git a/incubator/command-generate/src/main/java/io/aklivity/zilla/runtime/command/generate/internal/airline/ConfigGenerator.java b/incubator/command-generate/src/main/java/io/aklivity/zilla/runtime/command/generate/internal/airline/ConfigGenerator.java index 91b2045367..a04a89caca 100644 --- a/incubator/command-generate/src/main/java/io/aklivity/zilla/runtime/command/generate/internal/airline/ConfigGenerator.java +++ b/incubator/command-generate/src/main/java/io/aklivity/zilla/runtime/command/generate/internal/airline/ConfigGenerator.java @@ -29,8 +29,8 @@ 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.model.core.config.IntegerValidatorConfig; +import io.aklivity.zilla.runtime.model.core.config.StringValidatorConfig; public abstract class ConfigGenerator { diff --git a/incubator/command-generate/src/main/java/io/aklivity/zilla/runtime/command/generate/internal/asyncapi/http/proxy/AsyncApiHttpProxyConfigGenerator.java b/incubator/command-generate/src/main/java/io/aklivity/zilla/runtime/command/generate/internal/asyncapi/http/proxy/AsyncApiHttpProxyConfigGenerator.java index e2141962cc..1235bf21af 100644 --- a/incubator/command-generate/src/main/java/io/aklivity/zilla/runtime/command/generate/internal/asyncapi/http/proxy/AsyncApiHttpProxyConfigGenerator.java +++ b/incubator/command-generate/src/main/java/io/aklivity/zilla/runtime/command/generate/internal/asyncapi/http/proxy/AsyncApiHttpProxyConfigGenerator.java @@ -59,7 +59,7 @@ 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.JsonValidatorConfig; import io.aklivity.zilla.runtime.vault.filesystem.config.FileSystemOptionsConfig; public class AsyncApiHttpProxyConfigGenerator extends AsyncApiConfigGenerator diff --git a/incubator/command-generate/src/main/java/io/aklivity/zilla/runtime/command/generate/internal/asyncapi/mqtt/proxy/AsyncApiMqttProxyConfigGenerator.java b/incubator/command-generate/src/main/java/io/aklivity/zilla/runtime/command/generate/internal/asyncapi/mqtt/proxy/AsyncApiMqttProxyConfigGenerator.java index 625007a0ce..469ed2e2c5 100644 --- a/incubator/command-generate/src/main/java/io/aklivity/zilla/runtime/command/generate/internal/asyncapi/mqtt/proxy/AsyncApiMqttProxyConfigGenerator.java +++ b/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.JsonValidatorConfig; import io.aklivity.zilla.runtime.vault.filesystem.config.FileSystemOptionsConfig; public class AsyncApiMqttProxyConfigGenerator extends AsyncApiConfigGenerator diff --git a/incubator/command-generate/src/main/java/io/aklivity/zilla/runtime/command/generate/internal/openapi/http/proxy/OpenApiHttpProxyConfigGenerator.java b/incubator/command-generate/src/main/java/io/aklivity/zilla/runtime/command/generate/internal/openapi/http/proxy/OpenApiHttpProxyConfigGenerator.java index 71b16472ef..e0ec866c3a 100644 --- a/incubator/command-generate/src/main/java/io/aklivity/zilla/runtime/command/generate/internal/openapi/http/proxy/OpenApiHttpProxyConfigGenerator.java +++ b/incubator/command-generate/src/main/java/io/aklivity/zilla/runtime/command/generate/internal/openapi/http/proxy/OpenApiHttpProxyConfigGenerator.java @@ -56,7 +56,7 @@ 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.JsonValidatorConfig; import io.aklivity.zilla.runtime.vault.filesystem.config.FileSystemOptionsConfig; public class OpenApiHttpProxyConfigGenerator extends OpenApiConfigGenerator diff --git a/incubator/command-generate/src/main/moditect/module-info.java b/incubator/command-generate/src/main/moditect/module-info.java index b10ec9f543..0c03ce63de 100644 --- a/incubator/command-generate/src/main/moditect/module-info.java +++ b/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; diff --git a/incubator/model-avro.spec/pom.xml b/incubator/model-avro.spec/pom.xml index 461c3eb92b..764ad4a5b7 100644 --- a/incubator/model-avro.spec/pom.xml +++ b/incubator/model-avro.spec/pom.xml @@ -79,7 +79,7 @@ ${project.version} core - io.aklivity.zilla.specs.types.avro.internal.types + io.aklivity.zilla.specs.model.avro.internal.types @@ -135,7 +135,7 @@ jacoco-maven-plugin - io/aklivity/zilla/specs/types/avro/internal/types/**/*.class + io/aklivity/zilla/specs/model/avro/internal/types/**/*.class diff --git a/incubator/model-avro.spec/src/main/moditect/module-info.java b/incubator/model-avro.spec/src/main/moditect/module-info.java index f5af323186..99ce1d21bf 100644 --- a/incubator/model-avro.spec/src/main/moditect/module-info.java +++ b/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.avro +open module io.aklivity.zilla.specs.model.avro { requires transitive io.aklivity.zilla.specs.engine; } diff --git a/incubator/model-avro.spec/src/main/scripts/io/aklivity/zilla/specs/types/avro/config/converter.yaml b/incubator/model-avro.spec/src/main/scripts/io/aklivity/zilla/specs/model/avro/config/converter.yaml similarity index 100% rename from incubator/model-avro.spec/src/main/scripts/io/aklivity/zilla/specs/types/avro/config/converter.yaml rename to incubator/model-avro.spec/src/main/scripts/io/aklivity/zilla/specs/model/avro/config/converter.yaml diff --git a/incubator/model-avro.spec/src/main/scripts/io/aklivity/zilla/specs/types/avro/schema/avro.schema.patch.json b/incubator/model-avro.spec/src/main/scripts/io/aklivity/zilla/specs/model/avro/schema/avro.schema.patch.json similarity index 100% rename from incubator/model-avro.spec/src/main/scripts/io/aklivity/zilla/specs/types/avro/schema/avro.schema.patch.json rename to incubator/model-avro.spec/src/main/scripts/io/aklivity/zilla/specs/model/avro/schema/avro.schema.patch.json diff --git a/incubator/model-avro.spec/src/test/java/io/aklivity/zilla/specs/types/avro/config/SchemaTest.java b/incubator/model-avro.spec/src/test/java/io/aklivity/zilla/specs/model/avro/config/SchemaTest.java similarity index 88% rename from incubator/model-avro.spec/src/test/java/io/aklivity/zilla/specs/types/avro/config/SchemaTest.java rename to incubator/model-avro.spec/src/test/java/io/aklivity/zilla/specs/model/avro/config/SchemaTest.java index f58f583cdd..5d8794dcad 100644 --- a/incubator/model-avro.spec/src/test/java/io/aklivity/zilla/specs/types/avro/config/SchemaTest.java +++ b/incubator/model-avro.spec/src/test/java/io/aklivity/zilla/specs/model/avro/config/SchemaTest.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.specs.types.avro.config; +package io.aklivity.zilla.specs.model.avro.config; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.not; @@ -31,8 +31,8 @@ public class SchemaTest public final ConfigSchemaRule schema = new ConfigSchemaRule() .schemaPatch("io/aklivity/zilla/specs/engine/schema/binding/test.schema.patch.json") .schemaPatch("io/aklivity/zilla/specs/engine/schema/catalog/test.schema.patch.json") - .schemaPatch("io/aklivity/zilla/specs/types/avro/schema/avro.schema.patch.json") - .configurationRoot("io/aklivity/zilla/specs/types/avro/config"); + .schemaPatch("io/aklivity/zilla/specs/model/avro/schema/avro.schema.patch.json") + .configurationRoot("io/aklivity/zilla/specs/model/avro/config"); @Test public void shouldValidateCatalog() diff --git a/incubator/model-avro/pom.xml b/incubator/model-avro/pom.xml index da40379acd..3d32bce7ec 100644 --- a/incubator/model-avro/pom.xml +++ b/incubator/model-avro/pom.xml @@ -83,7 +83,7 @@ ${project.version} core - io.aklivity.zilla.runtime.types.avro.internal.types + io.aklivity.zilla.runtime.model.avro.internal.types @@ -123,13 +123,13 @@ model-avro.spec - ^\Qio/aklivity/zilla/specs/types/avro/\E - io/aklivity/zilla/runtime/types/avro/internal/ + ^\Qio/aklivity/zilla/specs/model/avro/\E + io/aklivity/zilla/runtime/model/avro/internal/ - io/aklivity/zilla/specs/types/avro/schema/avro.schema.patch.json + io/aklivity/zilla/specs/model/avro/schema/avro.schema.patch.json ${project.build.directory}/classes @@ -153,7 +153,7 @@ org.apache.avro - io.aklivity.zilla.runtime.types.avro.internal.avro + io.aklivity.zilla.runtime.model.avro.internal.avro true @@ -187,7 +187,7 @@ jacoco-maven-plugin - io/aklivity/zilla/runtime/types/avro/internal/types/**/*.class + io/aklivity/zilla/runtime/model/avro/internal/types/**/*.class diff --git a/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/types/avro/config/AvroConverterConfig.java b/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/config/AvroConverterConfig.java similarity index 96% rename from incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/types/avro/config/AvroConverterConfig.java rename to incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/config/AvroConverterConfig.java index 90987da1a1..43985b55c6 100644 --- a/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/types/avro/config/AvroConverterConfig.java +++ b/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/config/AvroConverterConfig.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.model.avro.config; import java.util.List; import java.util.function.Function; diff --git a/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/types/avro/config/AvroConverterConfigBuilder.java b/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/config/AvroConverterConfigBuilder.java similarity index 97% rename from incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/types/avro/config/AvroConverterConfigBuilder.java rename to incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/config/AvroConverterConfigBuilder.java index 51a5ff92f0..4910d54af7 100644 --- a/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/types/avro/config/AvroConverterConfigBuilder.java +++ b/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/config/AvroConverterConfigBuilder.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.model.avro.config; import java.util.LinkedList; import java.util.List; diff --git a/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/types/avro/internal/AvroConverter.java b/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/internal/AvroConverter.java similarity index 95% rename from incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/types/avro/internal/AvroConverter.java rename to incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/internal/AvroConverter.java index a336a67990..67e4a6822f 100644 --- a/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/types/avro/internal/AvroConverter.java +++ b/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/internal/AvroConverter.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.internal; +package io.aklivity.zilla.runtime.model.avro.internal; import java.net.URL; diff --git a/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/types/avro/internal/AvroConverterContext.java b/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/internal/AvroConverterContext.java similarity index 93% rename from incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/types/avro/internal/AvroConverterContext.java rename to incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/internal/AvroConverterContext.java index c7e7ba3951..82beef7943 100644 --- a/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/types/avro/internal/AvroConverterContext.java +++ b/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/internal/AvroConverterContext.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.internal; +package io.aklivity.zilla.runtime.model.avro.internal; import java.util.function.LongFunction; @@ -21,7 +21,7 @@ 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; +import io.aklivity.zilla.runtime.model.avro.config.AvroConverterConfig; public class AvroConverterContext implements ConverterContext { diff --git a/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/types/avro/internal/AvroConverterFactorySpi.java b/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/internal/AvroConverterFactorySpi.java similarity index 95% rename from incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/types/avro/internal/AvroConverterFactorySpi.java rename to incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/internal/AvroConverterFactorySpi.java index 8c65335a9d..f2a11e3834 100644 --- a/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/types/avro/internal/AvroConverterFactorySpi.java +++ b/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/internal/AvroConverterFactorySpi.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.internal; +package io.aklivity.zilla.runtime.model.avro.internal; import java.net.URL; diff --git a/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/types/avro/internal/AvroConverterHandler.java b/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/internal/AvroConverterHandler.java similarity index 98% rename from incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/types/avro/internal/AvroConverterHandler.java rename to incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/internal/AvroConverterHandler.java index 1211de7beb..f34820e341 100644 --- a/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/types/avro/internal/AvroConverterHandler.java +++ b/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/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.internal; +package io.aklivity.zilla.runtime.model.avro.internal; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -41,7 +41,7 @@ import io.aklivity.zilla.runtime.engine.catalog.CatalogHandler; import io.aklivity.zilla.runtime.engine.config.CatalogedConfig; import io.aklivity.zilla.runtime.engine.config.SchemaConfig; -import io.aklivity.zilla.runtime.types.avro.config.AvroConverterConfig; +import io.aklivity.zilla.runtime.model.avro.config.AvroConverterConfig; public abstract class AvroConverterHandler { diff --git a/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/types/avro/internal/AvroReadConverterHandler.java b/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/internal/AvroReadConverterHandler.java similarity index 97% rename from incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/types/avro/internal/AvroReadConverterHandler.java rename to incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/internal/AvroReadConverterHandler.java index cce3591ced..8fbb762092 100644 --- a/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/types/avro/internal/AvroReadConverterHandler.java +++ b/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/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.internal; +package io.aklivity.zilla.runtime.model.avro.internal; import static io.aklivity.zilla.runtime.engine.catalog.CatalogHandler.NO_SCHEMA_ID; @@ -30,7 +30,7 @@ import io.aklivity.zilla.runtime.engine.catalog.CatalogHandler; 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; +import io.aklivity.zilla.runtime.model.avro.config.AvroConverterConfig; public class AvroReadConverterHandler extends AvroConverterHandler implements ConverterHandler { diff --git a/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/types/avro/internal/AvroWriteConverterHandler.java b/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/internal/AvroWriteConverterHandler.java similarity index 96% rename from incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/types/avro/internal/AvroWriteConverterHandler.java rename to incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/internal/AvroWriteConverterHandler.java index 9089bda8ce..ed1fb8413a 100644 --- a/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/types/avro/internal/AvroWriteConverterHandler.java +++ b/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/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.internal; +package io.aklivity.zilla.runtime.model.avro.internal; import java.io.IOException; import java.util.function.LongFunction; @@ -27,7 +27,7 @@ import io.aklivity.zilla.runtime.engine.catalog.CatalogHandler; 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; +import io.aklivity.zilla.runtime.model.avro.config.AvroConverterConfig; public class AvroWriteConverterHandler extends AvroConverterHandler implements ConverterHandler { diff --git a/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/types/avro/internal/config/AvroConverterConfigAdapter.java b/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/internal/config/AvroConverterConfigAdapter.java similarity index 96% rename from incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/types/avro/internal/config/AvroConverterConfigAdapter.java rename to incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/internal/config/AvroConverterConfigAdapter.java index c2b0377475..f4cd2c89f5 100644 --- a/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/types/avro/internal/config/AvroConverterConfigAdapter.java +++ b/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/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.internal.config; +package io.aklivity.zilla.runtime.model.avro.internal.config; import java.util.LinkedList; import java.util.List; @@ -30,7 +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; +import io.aklivity.zilla.runtime.model.avro.config.AvroConverterConfig; public final class AvroConverterConfigAdapter implements ConverterConfigAdapterSpi, JsonbAdapter { diff --git a/incubator/model-avro/src/main/moditect/module-info.java b/incubator/model-avro/src/main/moditect/module-info.java index 1fdebade29..367b2d557e 100644 --- a/incubator/model-avro/src/main/moditect/module-info.java +++ b/incubator/model-avro/src/main/moditect/module-info.java @@ -12,21 +12,21 @@ * WARRANTIES OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -module io.aklivity.zilla.runtime.types.avro +module io.aklivity.zilla.runtime.model.avro { requires com.fasterxml.jackson.core; requires com.fasterxml.jackson.databind; requires org.slf4j; requires io.aklivity.zilla.runtime.engine; - exports io.aklivity.zilla.runtime.types.avro.config; + exports io.aklivity.zilla.runtime.model.avro.config; - uses io.aklivity.zilla.runtime.types.avro.internal.avro.Conversion; - uses io.aklivity.zilla.runtime.types.avro.internal.avro.LogicalTypes$LogicalTypeFactory; + uses io.aklivity.zilla.runtime.model.avro.internal.avro.Conversion; + uses io.aklivity.zilla.runtime.model.avro.internal.avro.LogicalTypes$LogicalTypeFactory; provides io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi - with io.aklivity.zilla.runtime.types.avro.internal.config.AvroConverterConfigAdapter; + with io.aklivity.zilla.runtime.model.avro.internal.config.AvroConverterConfigAdapter; provides io.aklivity.zilla.runtime.engine.converter.ConverterFactorySpi - with io.aklivity.zilla.runtime.types.avro.internal.AvroConverterFactorySpi; + with io.aklivity.zilla.runtime.model.avro.internal.AvroConverterFactorySpi; } diff --git a/incubator/model-avro/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi b/incubator/model-avro/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi index af2f54c19a..d3e788a455 100644 --- a/incubator/model-avro/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi +++ b/incubator/model-avro/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi @@ -1 +1 @@ -io.aklivity.zilla.runtime.types.avro.internal.config.AvroConverterConfigAdapter +io.aklivity.zilla.runtime.model.avro.internal.config.AvroConverterConfigAdapter diff --git a/incubator/model-avro/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.converter.ConverterFactorySpi b/incubator/model-avro/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.converter.ConverterFactorySpi index 5429fd6815..6994352827 100644 --- a/incubator/model-avro/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.converter.ConverterFactorySpi +++ b/incubator/model-avro/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.converter.ConverterFactorySpi @@ -1 +1 @@ -io.aklivity.zilla.runtime.types.avro.internal.AvroConverterFactorySpi +io.aklivity.zilla.runtime.model.avro.internal.AvroConverterFactorySpi diff --git a/incubator/model-avro/src/test/java/io/aklivity/zilla/runtime/types/avro/internal/AvroConverterFactorySpiTest.java b/incubator/model-avro/src/test/java/io/aklivity/zilla/runtime/model/avro/internal/AvroConverterFactorySpiTest.java similarity index 94% rename from incubator/model-avro/src/test/java/io/aklivity/zilla/runtime/types/avro/internal/AvroConverterFactorySpiTest.java rename to incubator/model-avro/src/test/java/io/aklivity/zilla/runtime/model/avro/internal/AvroConverterFactorySpiTest.java index 0d676e76ac..9083126e2f 100644 --- a/incubator/model-avro/src/test/java/io/aklivity/zilla/runtime/types/avro/internal/AvroConverterFactorySpiTest.java +++ b/incubator/model-avro/src/test/java/io/aklivity/zilla/runtime/model/avro/internal/AvroConverterFactorySpiTest.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.internal; +package io.aklivity.zilla.runtime.model.avro.internal; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.MatcherAssert.assertThat; @@ -26,7 +26,7 @@ import io.aklivity.zilla.runtime.engine.converter.Converter; import io.aklivity.zilla.runtime.engine.converter.ConverterContext; import io.aklivity.zilla.runtime.engine.converter.ConverterFactory; -import io.aklivity.zilla.runtime.types.avro.config.AvroConverterConfig; +import io.aklivity.zilla.runtime.model.avro.config.AvroConverterConfig; public class AvroConverterFactorySpiTest { diff --git a/incubator/model-avro/src/test/java/io/aklivity/zilla/runtime/types/avro/internal/AvroConverterTest.java b/incubator/model-avro/src/test/java/io/aklivity/zilla/runtime/model/avro/internal/AvroConverterTest.java similarity index 98% rename from incubator/model-avro/src/test/java/io/aklivity/zilla/runtime/types/avro/internal/AvroConverterTest.java rename to incubator/model-avro/src/test/java/io/aklivity/zilla/runtime/model/avro/internal/AvroConverterTest.java index 4b02bf512e..72f85444fb 100644 --- a/incubator/model-avro/src/test/java/io/aklivity/zilla/runtime/types/avro/internal/AvroConverterTest.java +++ b/incubator/model-avro/src/test/java/io/aklivity/zilla/runtime/model/avro/internal/AvroConverterTest.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.internal; +package io.aklivity.zilla.runtime.model.avro.internal; import static io.aklivity.zilla.runtime.engine.EngineConfiguration.ENGINE_DIRECTORY; import static org.junit.Assert.assertEquals; @@ -35,7 +35,7 @@ import io.aklivity.zilla.runtime.engine.converter.function.ValueConsumer; import io.aklivity.zilla.runtime.engine.test.internal.catalog.TestCatalog; import io.aklivity.zilla.runtime.engine.test.internal.catalog.config.TestCatalogOptionsConfig; -import io.aklivity.zilla.runtime.types.avro.config.AvroConverterConfig; +import io.aklivity.zilla.runtime.model.avro.config.AvroConverterConfig; public class AvroConverterTest { diff --git a/incubator/model-avro/src/test/java/io/aklivity/zilla/runtime/types/avro/internal/config/AvroConverterConfigAdapterTest.java b/incubator/model-avro/src/test/java/io/aklivity/zilla/runtime/model/avro/internal/config/AvroConverterConfigAdapterTest.java similarity index 97% rename from incubator/model-avro/src/test/java/io/aklivity/zilla/runtime/types/avro/internal/config/AvroConverterConfigAdapterTest.java rename to incubator/model-avro/src/test/java/io/aklivity/zilla/runtime/model/avro/internal/config/AvroConverterConfigAdapterTest.java index ba4d5a6a52..3c500099a8 100644 --- a/incubator/model-avro/src/test/java/io/aklivity/zilla/runtime/types/avro/internal/config/AvroConverterConfigAdapterTest.java +++ b/incubator/model-avro/src/test/java/io/aklivity/zilla/runtime/model/avro/internal/config/AvroConverterConfigAdapterTest.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.internal.config; +package io.aklivity.zilla.runtime.model.avro.internal.config; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; @@ -26,7 +26,7 @@ import org.junit.Before; import org.junit.Test; -import io.aklivity.zilla.runtime.types.avro.config.AvroConverterConfig; +import io.aklivity.zilla.runtime.model.avro.config.AvroConverterConfig; public class AvroConverterConfigAdapterTest { diff --git a/incubator/model-core.spec/pom.xml b/incubator/model-core.spec/pom.xml index 75e168e29a..91932f47c8 100644 --- a/incubator/model-core.spec/pom.xml +++ b/incubator/model-core.spec/pom.xml @@ -79,7 +79,7 @@ ${project.version} core - io.aklivity.zilla.specs.types.core.internal.types + io.aklivity.zilla.specs.model.core.internal.types @@ -135,7 +135,7 @@ jacoco-maven-plugin - io/aklivity/zilla/specs/types/core/internal/types/**/*.class + io/aklivity/zilla/specs/model/core/internal/types/**/*.class diff --git a/incubator/model-core.spec/src/main/moditect/module-info.java b/incubator/model-core.spec/src/main/moditect/module-info.java index 5f04a35bed..71b092d9a6 100644 --- a/incubator/model-core.spec/src/main/moditect/module-info.java +++ b/incubator/model-core.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.core +open module io.aklivity.zilla.specs.model.core { requires transitive io.aklivity.zilla.specs.engine; } diff --git a/incubator/model-core.spec/src/main/scripts/io/aklivity/zilla/specs/types/core/config/string.converter.yaml b/incubator/model-core.spec/src/main/scripts/io/aklivity/zilla/specs/model/core/config/string.converter.yaml similarity index 100% rename from incubator/model-core.spec/src/main/scripts/io/aklivity/zilla/specs/types/core/config/string.converter.yaml rename to incubator/model-core.spec/src/main/scripts/io/aklivity/zilla/specs/model/core/config/string.converter.yaml diff --git a/incubator/model-core.spec/src/main/scripts/io/aklivity/zilla/specs/types/core/schema/integer.schema.patch.json b/incubator/model-core.spec/src/main/scripts/io/aklivity/zilla/specs/model/core/schema/integer.schema.patch.json similarity index 100% rename from incubator/model-core.spec/src/main/scripts/io/aklivity/zilla/specs/types/core/schema/integer.schema.patch.json rename to incubator/model-core.spec/src/main/scripts/io/aklivity/zilla/specs/model/core/schema/integer.schema.patch.json diff --git a/incubator/model-core.spec/src/main/scripts/io/aklivity/zilla/specs/types/core/schema/string.schema.patch.json b/incubator/model-core.spec/src/main/scripts/io/aklivity/zilla/specs/model/core/schema/string.schema.patch.json similarity index 100% rename from incubator/model-core.spec/src/main/scripts/io/aklivity/zilla/specs/types/core/schema/string.schema.patch.json rename to incubator/model-core.spec/src/main/scripts/io/aklivity/zilla/specs/model/core/schema/string.schema.patch.json diff --git a/incubator/model-core.spec/src/test/java/io/aklivity/zilla/specs/types/core/config/SchemaTest.java b/incubator/model-core.spec/src/test/java/io/aklivity/zilla/specs/model/core/config/SchemaTest.java similarity index 87% rename from incubator/model-core.spec/src/test/java/io/aklivity/zilla/specs/types/core/config/SchemaTest.java rename to incubator/model-core.spec/src/test/java/io/aklivity/zilla/specs/model/core/config/SchemaTest.java index 2217f7560a..aaa90054ca 100644 --- a/incubator/model-core.spec/src/test/java/io/aklivity/zilla/specs/types/core/config/SchemaTest.java +++ b/incubator/model-core.spec/src/test/java/io/aklivity/zilla/specs/model/core/config/SchemaTest.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.specs.types.core.config; +package io.aklivity.zilla.specs.model.core.config; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.not; @@ -30,8 +30,8 @@ public class SchemaTest @Rule public final ConfigSchemaRule schema = new ConfigSchemaRule() .schemaPatch("io/aklivity/zilla/specs/engine/schema/binding/test.schema.patch.json") - .schemaPatch("io/aklivity/zilla/specs/types/core/schema/string.schema.patch.json") - .configurationRoot("io/aklivity/zilla/specs/types/core/config"); + .schemaPatch("io/aklivity/zilla/specs/model/core/schema/string.schema.patch.json") + .configurationRoot("io/aklivity/zilla/specs/model/core/config"); @Test public void shouldValidateCatalog() diff --git a/incubator/model-core/pom.xml b/incubator/model-core/pom.xml index 155990e4ae..466f9234e9 100644 --- a/incubator/model-core/pom.xml +++ b/incubator/model-core/pom.xml @@ -79,7 +79,7 @@ ${project.version} core - io.aklivity.zilla.runtime.types.core.internal.types + io.aklivity.zilla.runtime.model.core.internal.types @@ -119,13 +119,13 @@ model-core.spec - ^\Qio/aklivity/zilla/specs/types/core/\E - io/aklivity/zilla/runtime/types/core/internal/ + ^\Qio/aklivity/zilla/specs/model/core/\E + io/aklivity/zilla/runtime/model/core/internal/ - io/aklivity/zilla/specs/types/core/schema/*.schema.patch.json + io/aklivity/zilla/specs/model/core/schema/*.schema.patch.json ${project.build.directory}/classes @@ -155,7 +155,7 @@ jacoco-maven-plugin - io/aklivity/zilla/runtime/types/core/internal/types/**/*.class + io/aklivity/zilla/runtime/model/core/internal/types/**/*.class diff --git a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/config/IntegerConverterConfig.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/config/IntegerConverterConfig.java similarity index 95% rename from incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/config/IntegerConverterConfig.java rename to incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/config/IntegerConverterConfig.java index 5a178cac8c..4651a5ba41 100644 --- a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/config/IntegerConverterConfig.java +++ b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/config/IntegerConverterConfig.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.core.config; +package io.aklivity.zilla.runtime.model.core.config; import java.util.function.Function; diff --git a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/config/IntegerConverterConfigBuilder.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/config/IntegerConverterConfigBuilder.java similarity index 96% rename from incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/config/IntegerConverterConfigBuilder.java rename to incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/config/IntegerConverterConfigBuilder.java index ff6abcb5fb..fb5db05cd2 100644 --- a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/config/IntegerConverterConfigBuilder.java +++ b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/config/IntegerConverterConfigBuilder.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.core.config; +package io.aklivity.zilla.runtime.model.core.config; import java.util.function.Function; diff --git a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/config/IntegerValidatorConfig.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/config/IntegerValidatorConfig.java similarity index 95% rename from incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/config/IntegerValidatorConfig.java rename to incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/config/IntegerValidatorConfig.java index bfdab82879..f72976b894 100644 --- a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/config/IntegerValidatorConfig.java +++ b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/config/IntegerValidatorConfig.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.core.config; +package io.aklivity.zilla.runtime.model.core.config; import java.util.function.Function; diff --git a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/config/IntegerValidatorConfigBuilder.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/config/IntegerValidatorConfigBuilder.java similarity index 96% rename from incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/config/IntegerValidatorConfigBuilder.java rename to incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/config/IntegerValidatorConfigBuilder.java index 6c78342b55..a60a8669d6 100644 --- a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/config/IntegerValidatorConfigBuilder.java +++ b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/config/IntegerValidatorConfigBuilder.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.core.config; +package io.aklivity.zilla.runtime.model.core.config; import java.util.function.Function; diff --git a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/config/StringConverterConfig.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/config/StringConverterConfig.java similarity index 96% rename from incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/config/StringConverterConfig.java rename to incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/config/StringConverterConfig.java index dcb8c3eb3b..3d58633009 100644 --- a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/config/StringConverterConfig.java +++ b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/config/StringConverterConfig.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.core.config; +package io.aklivity.zilla.runtime.model.core.config; import java.util.function.Function; diff --git a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/config/StringConverterConfigBuilder.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/config/StringConverterConfigBuilder.java similarity index 96% rename from incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/config/StringConverterConfigBuilder.java rename to incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/config/StringConverterConfigBuilder.java index b2bde4368e..1f7d09ada9 100644 --- a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/config/StringConverterConfigBuilder.java +++ b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/config/StringConverterConfigBuilder.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.core.config; +package io.aklivity.zilla.runtime.model.core.config; import java.util.function.Function; diff --git a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/config/StringValidatorConfig.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/config/StringValidatorConfig.java similarity index 96% rename from incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/config/StringValidatorConfig.java rename to incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/config/StringValidatorConfig.java index ee5fe032ac..eb2edab5d5 100644 --- a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/config/StringValidatorConfig.java +++ b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/config/StringValidatorConfig.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.core.config; +package io.aklivity.zilla.runtime.model.core.config; import java.util.function.Function; diff --git a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/config/StringValidatorConfigBuilder.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/config/StringValidatorConfigBuilder.java similarity index 96% rename from incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/config/StringValidatorConfigBuilder.java rename to incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/config/StringValidatorConfigBuilder.java index 936c943ce7..24906b2a13 100644 --- a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/config/StringValidatorConfigBuilder.java +++ b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/config/StringValidatorConfigBuilder.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.core.config; +package io.aklivity.zilla.runtime.model.core.config; import java.util.function.Function; diff --git a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/IntegerConverter.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/IntegerConverter.java similarity index 95% rename from incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/IntegerConverter.java rename to incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/IntegerConverter.java index 6bf0c04175..f7dfaff969 100644 --- a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/IntegerConverter.java +++ b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/IntegerConverter.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.core.internal; +package io.aklivity.zilla.runtime.model.core.internal; import java.net.URL; diff --git a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/IntegerConverterContext.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/IntegerConverterContext.java similarity index 92% rename from incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/IntegerConverterContext.java rename to incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/IntegerConverterContext.java index 012bb64465..105978e9e2 100644 --- a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/IntegerConverterContext.java +++ b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/IntegerConverterContext.java @@ -12,13 +12,13 @@ * 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.core.internal; +package io.aklivity.zilla.runtime.model.core.internal; import io.aklivity.zilla.runtime.engine.EngineContext; 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.core.config.IntegerConverterConfig; +import io.aklivity.zilla.runtime.model.core.config.IntegerConverterConfig; public class IntegerConverterContext implements ConverterContext { diff --git a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/IntegerConverterFactorySpi.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/IntegerConverterFactorySpi.java similarity index 95% rename from incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/IntegerConverterFactorySpi.java rename to incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/IntegerConverterFactorySpi.java index fccafe576b..ac9b5084a1 100644 --- a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/IntegerConverterFactorySpi.java +++ b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/IntegerConverterFactorySpi.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.core.internal; +package io.aklivity.zilla.runtime.model.core.internal; import java.net.URL; diff --git a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/IntegerConverterHandler.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/IntegerConverterHandler.java similarity index 91% rename from incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/IntegerConverterHandler.java rename to incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/IntegerConverterHandler.java index 26e05dfc13..dea0d59a6d 100644 --- a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/IntegerConverterHandler.java +++ b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/IntegerConverterHandler.java @@ -12,13 +12,13 @@ * 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.core.internal; +package io.aklivity.zilla.runtime.model.core.internal; import org.agrona.DirectBuffer; import io.aklivity.zilla.runtime.engine.converter.ConverterHandler; import io.aklivity.zilla.runtime.engine.converter.function.ValueConsumer; -import io.aklivity.zilla.runtime.types.core.config.IntegerConverterConfig; +import io.aklivity.zilla.runtime.model.core.config.IntegerConverterConfig; public class IntegerConverterHandler implements ConverterHandler { diff --git a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/IntegerValidator.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/IntegerValidator.java similarity index 95% rename from incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/IntegerValidator.java rename to incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/IntegerValidator.java index 9e39fa2325..a4eab87a3b 100644 --- a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/IntegerValidator.java +++ b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/IntegerValidator.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.core.internal; +package io.aklivity.zilla.runtime.model.core.internal; import java.net.URL; diff --git a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/IntegerValidatorContext.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/IntegerValidatorContext.java similarity index 90% rename from incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/IntegerValidatorContext.java rename to incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/IntegerValidatorContext.java index d061cd2415..2c6e8691dc 100644 --- a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/IntegerValidatorContext.java +++ b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/IntegerValidatorContext.java @@ -12,13 +12,13 @@ * 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.core.internal; +package io.aklivity.zilla.runtime.model.core.internal; import io.aklivity.zilla.runtime.engine.EngineContext; import io.aklivity.zilla.runtime.engine.config.ValidatorConfig; import io.aklivity.zilla.runtime.engine.validator.ValidatorContext; import io.aklivity.zilla.runtime.engine.validator.ValidatorHandler; -import io.aklivity.zilla.runtime.types.core.config.IntegerValidatorConfig; +import io.aklivity.zilla.runtime.model.core.config.IntegerValidatorConfig; public class IntegerValidatorContext implements ValidatorContext { diff --git a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/IntegerValidatorFactorySpi.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/IntegerValidatorFactorySpi.java similarity index 95% rename from incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/IntegerValidatorFactorySpi.java rename to incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/IntegerValidatorFactorySpi.java index df8fa3af7f..5b18a31769 100644 --- a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/IntegerValidatorFactorySpi.java +++ b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/IntegerValidatorFactorySpi.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.core.internal; +package io.aklivity.zilla.runtime.model.core.internal; import io.aklivity.zilla.runtime.engine.Configuration; import io.aklivity.zilla.runtime.engine.validator.Validator; diff --git a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/IntegerValidatorHandler.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/IntegerValidatorHandler.java similarity index 92% rename from incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/IntegerValidatorHandler.java rename to incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/IntegerValidatorHandler.java index 4a6fd7a960..fa96854e23 100644 --- a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/IntegerValidatorHandler.java +++ b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/IntegerValidatorHandler.java @@ -12,13 +12,13 @@ * 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.core.internal; +package io.aklivity.zilla.runtime.model.core.internal; import org.agrona.DirectBuffer; import io.aklivity.zilla.runtime.engine.converter.function.ValueConsumer; import io.aklivity.zilla.runtime.engine.validator.ValidatorHandler; -import io.aklivity.zilla.runtime.types.core.config.IntegerValidatorConfig; +import io.aklivity.zilla.runtime.model.core.config.IntegerValidatorConfig; public class IntegerValidatorHandler implements ValidatorHandler { diff --git a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringConverter.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/StringConverter.java similarity index 95% rename from incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringConverter.java rename to incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/StringConverter.java index 0b02b2a877..450792e0ad 100644 --- a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringConverter.java +++ b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/StringConverter.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.core.internal; +package io.aklivity.zilla.runtime.model.core.internal; import java.net.URL; diff --git a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringConverterContext.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/StringConverterContext.java similarity index 92% rename from incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringConverterContext.java rename to incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/StringConverterContext.java index bc4f88e426..40059a25cd 100644 --- a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringConverterContext.java +++ b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/StringConverterContext.java @@ -12,13 +12,13 @@ * 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.core.internal; +package io.aklivity.zilla.runtime.model.core.internal; import io.aklivity.zilla.runtime.engine.EngineContext; 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.core.config.StringConverterConfig; +import io.aklivity.zilla.runtime.model.core.config.StringConverterConfig; public class StringConverterContext implements ConverterContext { diff --git a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringConverterFactorySpi.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/StringConverterFactorySpi.java similarity index 95% rename from incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringConverterFactorySpi.java rename to incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/StringConverterFactorySpi.java index 3c26b0c74a..0790c8d2d0 100644 --- a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringConverterFactorySpi.java +++ b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/StringConverterFactorySpi.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.core.internal; +package io.aklivity.zilla.runtime.model.core.internal; import java.net.URL; diff --git a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringConverterHandler.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/StringConverterHandler.java similarity index 92% rename from incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringConverterHandler.java rename to incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/StringConverterHandler.java index 69308617f3..30ca7f049a 100644 --- a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringConverterHandler.java +++ b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/StringConverterHandler.java @@ -12,13 +12,13 @@ * 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.core.internal; +package io.aklivity.zilla.runtime.model.core.internal; import org.agrona.DirectBuffer; import io.aklivity.zilla.runtime.engine.converter.ConverterHandler; import io.aklivity.zilla.runtime.engine.converter.function.ValueConsumer; -import io.aklivity.zilla.runtime.types.core.config.StringConverterConfig; +import io.aklivity.zilla.runtime.model.core.config.StringConverterConfig; public class StringConverterHandler implements ConverterHandler { diff --git a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringEncoding.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/StringEncoding.java similarity index 98% rename from incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringEncoding.java rename to incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/StringEncoding.java index bd55fc21a7..d3fbda2281 100644 --- a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringEncoding.java +++ b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/StringEncoding.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.core.internal; +package io.aklivity.zilla.runtime.model.core.internal; import org.agrona.DirectBuffer; diff --git a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringValidator.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/StringValidator.java similarity index 95% rename from incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringValidator.java rename to incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/StringValidator.java index 7de27812f7..159e1f8095 100644 --- a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringValidator.java +++ b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/StringValidator.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.core.internal; +package io.aklivity.zilla.runtime.model.core.internal; import java.net.URL; diff --git a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringValidatorContext.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/StringValidatorContext.java similarity index 90% rename from incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringValidatorContext.java rename to incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/StringValidatorContext.java index e74b9ff70f..a1b30c346d 100644 --- a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringValidatorContext.java +++ b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/StringValidatorContext.java @@ -12,13 +12,13 @@ * 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.core.internal; +package io.aklivity.zilla.runtime.model.core.internal; import io.aklivity.zilla.runtime.engine.EngineContext; import io.aklivity.zilla.runtime.engine.config.ValidatorConfig; import io.aklivity.zilla.runtime.engine.validator.ValidatorContext; import io.aklivity.zilla.runtime.engine.validator.ValidatorHandler; -import io.aklivity.zilla.runtime.types.core.config.StringValidatorConfig; +import io.aklivity.zilla.runtime.model.core.config.StringValidatorConfig; public class StringValidatorContext implements ValidatorContext { diff --git a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringValidatorEncoding.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/StringValidatorEncoding.java similarity index 98% rename from incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringValidatorEncoding.java rename to incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/StringValidatorEncoding.java index 274806cd42..f1a0185e76 100644 --- a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringValidatorEncoding.java +++ b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/StringValidatorEncoding.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.core.internal; +package io.aklivity.zilla.runtime.model.core.internal; import static io.aklivity.zilla.runtime.engine.validator.ValidatorHandler.FLAGS_FIN; import static io.aklivity.zilla.runtime.engine.validator.ValidatorHandler.FLAGS_INIT; diff --git a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringValidatorFactorySpi.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/StringValidatorFactorySpi.java similarity index 95% rename from incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringValidatorFactorySpi.java rename to incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/StringValidatorFactorySpi.java index 1a2bf744f5..8a10f76ddb 100644 --- a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringValidatorFactorySpi.java +++ b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/StringValidatorFactorySpi.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.core.internal; +package io.aklivity.zilla.runtime.model.core.internal; import io.aklivity.zilla.runtime.engine.Configuration; import io.aklivity.zilla.runtime.engine.validator.Validator; diff --git a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringValidatorHandler.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/StringValidatorHandler.java similarity index 91% rename from incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringValidatorHandler.java rename to incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/StringValidatorHandler.java index 56f01d3bd4..a0b1a3e7e8 100644 --- a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/StringValidatorHandler.java +++ b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/StringValidatorHandler.java @@ -12,13 +12,13 @@ * 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.core.internal; +package io.aklivity.zilla.runtime.model.core.internal; import org.agrona.DirectBuffer; import io.aklivity.zilla.runtime.engine.converter.function.ValueConsumer; import io.aklivity.zilla.runtime.engine.validator.ValidatorHandler; -import io.aklivity.zilla.runtime.types.core.config.StringValidatorConfig; +import io.aklivity.zilla.runtime.model.core.config.StringValidatorConfig; public class StringValidatorHandler implements ValidatorHandler { diff --git a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/config/IntegerConverterConfigAdapter.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/config/IntegerConverterConfigAdapter.java similarity index 91% rename from incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/config/IntegerConverterConfigAdapter.java rename to incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/config/IntegerConverterConfigAdapter.java index 2ae90693ae..4dc68dc886 100644 --- a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/config/IntegerConverterConfigAdapter.java +++ b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/config/IntegerConverterConfigAdapter.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.core.internal.config; +package io.aklivity.zilla.runtime.model.core.internal.config; import jakarta.json.Json; import jakarta.json.JsonValue; @@ -20,7 +20,7 @@ import io.aklivity.zilla.runtime.engine.config.ConverterConfig; import io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi; -import io.aklivity.zilla.runtime.types.core.config.IntegerConverterConfig; +import io.aklivity.zilla.runtime.model.core.config.IntegerConverterConfig; public class IntegerConverterConfigAdapter implements ConverterConfigAdapterSpi, JsonbAdapter { diff --git a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/config/IntegerValidatorConfigAdapter.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/config/IntegerValidatorConfigAdapter.java similarity index 91% rename from incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/config/IntegerValidatorConfigAdapter.java rename to incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/config/IntegerValidatorConfigAdapter.java index 5894959214..bd1690ad95 100644 --- a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/config/IntegerValidatorConfigAdapter.java +++ b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/config/IntegerValidatorConfigAdapter.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.core.internal.config; +package io.aklivity.zilla.runtime.model.core.internal.config; import jakarta.json.Json; import jakarta.json.JsonValue; @@ -20,7 +20,7 @@ import io.aklivity.zilla.runtime.engine.config.ValidatorConfig; import io.aklivity.zilla.runtime.engine.config.ValidatorConfigAdapterSpi; -import io.aklivity.zilla.runtime.types.core.config.IntegerValidatorConfig; +import io.aklivity.zilla.runtime.model.core.config.IntegerValidatorConfig; public class IntegerValidatorConfigAdapter implements ValidatorConfigAdapterSpi, JsonbAdapter { diff --git a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/config/StringConverterConfigAdapter.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/config/StringConverterConfigAdapter.java similarity index 95% rename from incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/config/StringConverterConfigAdapter.java rename to incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/config/StringConverterConfigAdapter.java index be9ca69af8..001f946fad 100644 --- a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/config/StringConverterConfigAdapter.java +++ b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/config/StringConverterConfigAdapter.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.core.internal.config; +package io.aklivity.zilla.runtime.model.core.internal.config; import jakarta.json.Json; import jakarta.json.JsonObject; @@ -23,7 +23,7 @@ import io.aklivity.zilla.runtime.engine.config.ConverterConfig; import io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi; -import io.aklivity.zilla.runtime.types.core.config.StringConverterConfig; +import io.aklivity.zilla.runtime.model.core.config.StringConverterConfig; public final class StringConverterConfigAdapter implements ConverterConfigAdapterSpi, JsonbAdapter { diff --git a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/config/StringValidatorConfigAdapter.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/config/StringValidatorConfigAdapter.java similarity index 95% rename from incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/config/StringValidatorConfigAdapter.java rename to incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/config/StringValidatorConfigAdapter.java index 0ceaa79b29..2dfd06d44b 100644 --- a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/types/core/internal/config/StringValidatorConfigAdapter.java +++ b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/config/StringValidatorConfigAdapter.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.core.internal.config; +package io.aklivity.zilla.runtime.model.core.internal.config; import jakarta.json.Json; import jakarta.json.JsonObject; @@ -22,7 +22,7 @@ import io.aklivity.zilla.runtime.engine.config.ValidatorConfig; import io.aklivity.zilla.runtime.engine.config.ValidatorConfigAdapterSpi; -import io.aklivity.zilla.runtime.types.core.config.StringValidatorConfig; +import io.aklivity.zilla.runtime.model.core.config.StringValidatorConfig; public final class StringValidatorConfigAdapter implements ValidatorConfigAdapterSpi, JsonbAdapter { diff --git a/incubator/model-core/src/main/moditect/module-info.java b/incubator/model-core/src/main/moditect/module-info.java index 651d31d1de..2f127850b0 100644 --- a/incubator/model-core/src/main/moditect/module-info.java +++ b/incubator/model-core/src/main/moditect/module-info.java @@ -12,25 +12,25 @@ * WARRANTIES OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -module io.aklivity.zilla.runtime.types.core +module io.aklivity.zilla.runtime.model.core { requires io.aklivity.zilla.runtime.engine; - exports io.aklivity.zilla.runtime.types.core.config; + exports io.aklivity.zilla.runtime.model.core.config; provides io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi - with io.aklivity.zilla.runtime.types.core.internal.config.StringConverterConfigAdapter, - io.aklivity.zilla.runtime.types.core.internal.config.IntegerConverterConfigAdapter; + with io.aklivity.zilla.runtime.model.core.internal.config.StringConverterConfigAdapter, + io.aklivity.zilla.runtime.model.core.internal.config.IntegerConverterConfigAdapter; provides io.aklivity.zilla.runtime.engine.converter.ConverterFactorySpi - with io.aklivity.zilla.runtime.types.core.internal.StringConverterFactorySpi, - io.aklivity.zilla.runtime.types.core.internal.IntegerConverterFactorySpi; + with io.aklivity.zilla.runtime.model.core.internal.StringConverterFactorySpi, + io.aklivity.zilla.runtime.model.core.internal.IntegerConverterFactorySpi; provides io.aklivity.zilla.runtime.engine.config.ValidatorConfigAdapterSpi - with io.aklivity.zilla.runtime.types.core.internal.config.IntegerValidatorConfigAdapter, - io.aklivity.zilla.runtime.types.core.internal.config.StringValidatorConfigAdapter; + with io.aklivity.zilla.runtime.model.core.internal.config.IntegerValidatorConfigAdapter, + io.aklivity.zilla.runtime.model.core.internal.config.StringValidatorConfigAdapter; provides io.aklivity.zilla.runtime.engine.validator.ValidatorFactorySpi - with io.aklivity.zilla.runtime.types.core.internal.IntegerValidatorFactorySpi, - io.aklivity.zilla.runtime.types.core.internal.StringValidatorFactorySpi; + with io.aklivity.zilla.runtime.model.core.internal.IntegerValidatorFactorySpi, + io.aklivity.zilla.runtime.model.core.internal.StringValidatorFactorySpi; } diff --git a/incubator/model-core/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi b/incubator/model-core/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi index bb4b53718b..11be6f24bb 100644 --- a/incubator/model-core/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi +++ b/incubator/model-core/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi @@ -1,2 +1,2 @@ -io.aklivity.zilla.runtime.types.core.internal.config.IntegerConverterConfigAdapter -io.aklivity.zilla.runtime.types.core.internal.config.StringConverterConfigAdapter +io.aklivity.zilla.runtime.model.core.internal.config.IntegerConverterConfigAdapter +io.aklivity.zilla.runtime.model.core.internal.config.StringConverterConfigAdapter diff --git a/incubator/model-core/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ValidatorConfigAdapterSpi b/incubator/model-core/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ValidatorConfigAdapterSpi index 6cbf655ff9..7725e627ba 100644 --- a/incubator/model-core/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ValidatorConfigAdapterSpi +++ b/incubator/model-core/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ValidatorConfigAdapterSpi @@ -1,2 +1,2 @@ -io.aklivity.zilla.runtime.types.core.internal.config.IntegerValidatorConfigAdapter -io.aklivity.zilla.runtime.types.core.internal.config.StringValidatorConfigAdapter +io.aklivity.zilla.runtime.model.core.internal.config.IntegerValidatorConfigAdapter +io.aklivity.zilla.runtime.model.core.internal.config.StringValidatorConfigAdapter diff --git a/incubator/model-core/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.converter.ConverterFactorySpi b/incubator/model-core/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.converter.ConverterFactorySpi index 123e7b1905..df692c845e 100644 --- a/incubator/model-core/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.converter.ConverterFactorySpi +++ b/incubator/model-core/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.converter.ConverterFactorySpi @@ -1,2 +1,2 @@ -io.aklivity.zilla.runtime.types.core.internal.IntegerConverterFactorySpi -io.aklivity.zilla.runtime.types.core.internal.StringConverterFactorySpi +io.aklivity.zilla.runtime.model.core.internal.IntegerConverterFactorySpi +io.aklivity.zilla.runtime.model.core.internal.StringConverterFactorySpi diff --git a/incubator/model-core/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.validator.ValidatorFactorySpi b/incubator/model-core/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.validator.ValidatorFactorySpi index f0ed9f2f7e..be06f7f038 100644 --- a/incubator/model-core/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.validator.ValidatorFactorySpi +++ b/incubator/model-core/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.validator.ValidatorFactorySpi @@ -1,2 +1,2 @@ -io.aklivity.zilla.runtime.types.core.internal.IntegerValidatorFactorySpi -io.aklivity.zilla.runtime.types.core.internal.StringValidatorFactorySpi +io.aklivity.zilla.runtime.model.core.internal.IntegerValidatorFactorySpi +io.aklivity.zilla.runtime.model.core.internal.StringValidatorFactorySpi diff --git a/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/IntegerConverterFactoryTest.java b/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/IntegerConverterFactoryTest.java similarity index 94% rename from incubator/model-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/IntegerConverterFactoryTest.java rename to incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/IntegerConverterFactoryTest.java index 3aca3faafb..325a52375b 100644 --- a/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/IntegerConverterFactoryTest.java +++ b/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/IntegerConverterFactoryTest.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.core.internal; +package io.aklivity.zilla.runtime.model.core.internal; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.MatcherAssert.assertThat; @@ -26,7 +26,7 @@ import io.aklivity.zilla.runtime.engine.converter.Converter; import io.aklivity.zilla.runtime.engine.converter.ConverterContext; import io.aklivity.zilla.runtime.engine.converter.ConverterFactory; -import io.aklivity.zilla.runtime.types.core.config.IntegerConverterConfig; +import io.aklivity.zilla.runtime.model.core.config.IntegerConverterConfig; public class IntegerConverterFactoryTest { diff --git a/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/IntegerConverterTest.java b/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/IntegerConverterTest.java similarity index 93% rename from incubator/model-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/IntegerConverterTest.java rename to incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/IntegerConverterTest.java index 8689467ded..8dbb79bf78 100644 --- a/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/IntegerConverterTest.java +++ b/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/IntegerConverterTest.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.core.internal; +package io.aklivity.zilla.runtime.model.core.internal; import static org.junit.Assert.assertEquals; @@ -21,7 +21,7 @@ import org.junit.Test; import io.aklivity.zilla.runtime.engine.converter.function.ValueConsumer; -import io.aklivity.zilla.runtime.types.core.config.IntegerConverterConfig; +import io.aklivity.zilla.runtime.model.core.config.IntegerConverterConfig; public class IntegerConverterTest { diff --git a/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/IntegerValidatorFactoryTest.java b/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/IntegerValidatorFactoryTest.java similarity index 94% rename from incubator/model-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/IntegerValidatorFactoryTest.java rename to incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/IntegerValidatorFactoryTest.java index 29f5335ec1..ccbae6a67e 100644 --- a/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/IntegerValidatorFactoryTest.java +++ b/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/IntegerValidatorFactoryTest.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.core.internal; +package io.aklivity.zilla.runtime.model.core.internal; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.MatcherAssert.assertThat; @@ -27,7 +27,7 @@ import io.aklivity.zilla.runtime.engine.validator.ValidatorContext; import io.aklivity.zilla.runtime.engine.validator.ValidatorFactorySpi; import io.aklivity.zilla.runtime.engine.validator.ValidatorHandler; -import io.aklivity.zilla.runtime.types.core.config.IntegerValidatorConfig; +import io.aklivity.zilla.runtime.model.core.config.IntegerValidatorConfig; public class IntegerValidatorFactoryTest { diff --git a/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/IntegerValidatorTest.java b/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/IntegerValidatorTest.java similarity index 96% rename from incubator/model-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/IntegerValidatorTest.java rename to incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/IntegerValidatorTest.java index 59b3502603..174334f7c4 100644 --- a/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/IntegerValidatorTest.java +++ b/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/IntegerValidatorTest.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.core.internal; +package io.aklivity.zilla.runtime.model.core.internal; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -23,7 +23,7 @@ import io.aklivity.zilla.runtime.engine.converter.function.ValueConsumer; import io.aklivity.zilla.runtime.engine.validator.ValidatorHandler; -import io.aklivity.zilla.runtime.types.core.config.IntegerValidatorConfig; +import io.aklivity.zilla.runtime.model.core.config.IntegerValidatorConfig; public class IntegerValidatorTest { diff --git a/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/StringConverterFactoryTest.java b/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/StringConverterFactoryTest.java similarity index 94% rename from incubator/model-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/StringConverterFactoryTest.java rename to incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/StringConverterFactoryTest.java index 014d1c0159..983a655a80 100644 --- a/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/StringConverterFactoryTest.java +++ b/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/StringConverterFactoryTest.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.core.internal; +package io.aklivity.zilla.runtime.model.core.internal; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.MatcherAssert.assertThat; @@ -26,7 +26,7 @@ import io.aklivity.zilla.runtime.engine.converter.Converter; import io.aklivity.zilla.runtime.engine.converter.ConverterContext; import io.aklivity.zilla.runtime.engine.converter.ConverterFactory; -import io.aklivity.zilla.runtime.types.core.config.StringConverterConfig; +import io.aklivity.zilla.runtime.model.core.config.StringConverterConfig; public class StringConverterFactoryTest { diff --git a/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/StringConverterTest.java b/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/StringConverterTest.java similarity index 97% rename from incubator/model-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/StringConverterTest.java rename to incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/StringConverterTest.java index 03256f2c57..8a633f0ee1 100644 --- a/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/StringConverterTest.java +++ b/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/StringConverterTest.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.core.internal; +package io.aklivity.zilla.runtime.model.core.internal; import static org.junit.Assert.assertEquals; @@ -23,7 +23,7 @@ import org.junit.Test; import io.aklivity.zilla.runtime.engine.converter.function.ValueConsumer; -import io.aklivity.zilla.runtime.types.core.config.StringConverterConfig; +import io.aklivity.zilla.runtime.model.core.config.StringConverterConfig; public class StringConverterTest { diff --git a/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/StringEncodingTest.java b/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/StringEncodingTest.java similarity index 97% rename from incubator/model-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/StringEncodingTest.java rename to incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/StringEncodingTest.java index b03fda0cb6..54c2eef897 100644 --- a/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/StringEncodingTest.java +++ b/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/StringEncodingTest.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.core.internal; +package io.aklivity.zilla.runtime.model.core.internal; import static io.aklivity.zilla.runtime.engine.validator.ValidatorHandler.FLAGS_COMPLETE; import static org.junit.Assert.assertEquals; diff --git a/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/StringValidatorFactoryTest.java b/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/StringValidatorFactoryTest.java similarity index 94% rename from incubator/model-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/StringValidatorFactoryTest.java rename to incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/StringValidatorFactoryTest.java index 9b0fa4172e..fc6c930824 100644 --- a/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/StringValidatorFactoryTest.java +++ b/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/StringValidatorFactoryTest.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.core.internal; +package io.aklivity.zilla.runtime.model.core.internal; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.MatcherAssert.assertThat; @@ -27,7 +27,7 @@ import io.aklivity.zilla.runtime.engine.validator.ValidatorContext; import io.aklivity.zilla.runtime.engine.validator.ValidatorFactorySpi; import io.aklivity.zilla.runtime.engine.validator.ValidatorHandler; -import io.aklivity.zilla.runtime.types.core.config.StringValidatorConfig; +import io.aklivity.zilla.runtime.model.core.config.StringValidatorConfig; public class StringValidatorFactoryTest { diff --git a/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/StringValidatorTest.java b/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/StringValidatorTest.java similarity index 96% rename from incubator/model-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/StringValidatorTest.java rename to incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/StringValidatorTest.java index 55d7414aa6..e32cf65309 100644 --- a/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/StringValidatorTest.java +++ b/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/StringValidatorTest.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.core.internal; +package io.aklivity.zilla.runtime.model.core.internal; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -23,7 +23,7 @@ import io.aklivity.zilla.runtime.engine.converter.function.ValueConsumer; import io.aklivity.zilla.runtime.engine.validator.ValidatorHandler; -import io.aklivity.zilla.runtime.types.core.config.StringValidatorConfig; +import io.aklivity.zilla.runtime.model.core.config.StringValidatorConfig; public class StringValidatorTest { diff --git a/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/config/IntegerConverterConfigAdapterTest.java b/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/config/IntegerConverterConfigAdapterTest.java similarity index 94% rename from incubator/model-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/config/IntegerConverterConfigAdapterTest.java rename to incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/config/IntegerConverterConfigAdapterTest.java index 2f4cf96dc0..8de5779925 100644 --- a/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/config/IntegerConverterConfigAdapterTest.java +++ b/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/config/IntegerConverterConfigAdapterTest.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.core.internal.config; +package io.aklivity.zilla.runtime.model.core.internal.config; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; @@ -26,7 +26,7 @@ import org.junit.Before; import org.junit.Test; -import io.aklivity.zilla.runtime.types.core.config.IntegerConverterConfig; +import io.aklivity.zilla.runtime.model.core.config.IntegerConverterConfig; public class IntegerConverterConfigAdapterTest { diff --git a/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/config/IntegerValidatorConfigAdapterTest.java b/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/config/IntegerValidatorConfigAdapterTest.java similarity index 94% rename from incubator/model-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/config/IntegerValidatorConfigAdapterTest.java rename to incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/config/IntegerValidatorConfigAdapterTest.java index 323b9aebdb..34ad733d24 100644 --- a/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/config/IntegerValidatorConfigAdapterTest.java +++ b/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/config/IntegerValidatorConfigAdapterTest.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.core.internal.config; +package io.aklivity.zilla.runtime.model.core.internal.config; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; @@ -26,7 +26,7 @@ import org.junit.Before; import org.junit.Test; -import io.aklivity.zilla.runtime.types.core.config.IntegerValidatorConfig; +import io.aklivity.zilla.runtime.model.core.config.IntegerValidatorConfig; public class IntegerValidatorConfigAdapterTest { diff --git a/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/config/StringConverterConfigAdapterTest.java b/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/config/StringConverterConfigAdapterTest.java similarity index 95% rename from incubator/model-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/config/StringConverterConfigAdapterTest.java rename to incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/config/StringConverterConfigAdapterTest.java index b2cf29238a..7f4076abfc 100644 --- a/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/config/StringConverterConfigAdapterTest.java +++ b/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/config/StringConverterConfigAdapterTest.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.core.internal.config; +package io.aklivity.zilla.runtime.model.core.internal.config; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; @@ -26,7 +26,7 @@ import org.junit.Before; import org.junit.Test; -import io.aklivity.zilla.runtime.types.core.config.StringConverterConfig; +import io.aklivity.zilla.runtime.model.core.config.StringConverterConfig; public class StringConverterConfigAdapterTest { diff --git a/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/config/StringValidatorConfigAdapterTest.java b/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/config/StringValidatorConfigAdapterTest.java similarity index 95% rename from incubator/model-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/config/StringValidatorConfigAdapterTest.java rename to incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/config/StringValidatorConfigAdapterTest.java index e1df857ea9..a9276ea11e 100644 --- a/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/types/core/internal/config/StringValidatorConfigAdapterTest.java +++ b/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/config/StringValidatorConfigAdapterTest.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.core.internal.config; +package io.aklivity.zilla.runtime.model.core.internal.config; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; @@ -26,7 +26,7 @@ import org.junit.Before; import org.junit.Test; -import io.aklivity.zilla.runtime.types.core.config.StringValidatorConfig; +import io.aklivity.zilla.runtime.model.core.config.StringValidatorConfig; public class StringValidatorConfigAdapterTest { diff --git a/incubator/model-json.spec/src/main/moditect/module-info.java b/incubator/model-json.spec/src/main/moditect/module-info.java index ffcdbe4fd1..a93c2004e4 100644 --- a/incubator/model-json.spec/src/main/moditect/module-info.java +++ b/incubator/model-json.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.json { requires transitive io.aklivity.zilla.specs.engine; } diff --git a/incubator/model-json.spec/src/main/scripts/io/aklivity/zilla/specs/types/json/config/converter.yaml b/incubator/model-json.spec/src/main/scripts/io/aklivity/zilla/specs/model/json/config/converter.yaml similarity index 100% rename from incubator/model-json.spec/src/main/scripts/io/aklivity/zilla/specs/types/json/config/converter.yaml rename to incubator/model-json.spec/src/main/scripts/io/aklivity/zilla/specs/model/json/config/converter.yaml diff --git a/incubator/model-json.spec/src/main/scripts/io/aklivity/zilla/specs/types/json/schema/json.schema.patch.json b/incubator/model-json.spec/src/main/scripts/io/aklivity/zilla/specs/model/json/schema/json.schema.patch.json similarity index 100% rename from incubator/model-json.spec/src/main/scripts/io/aklivity/zilla/specs/types/json/schema/json.schema.patch.json rename to incubator/model-json.spec/src/main/scripts/io/aklivity/zilla/specs/model/json/schema/json.schema.patch.json diff --git a/incubator/model-json.spec/src/test/java/io/aklivity/zilla/specs/types/json/config/SchemaTest.java b/incubator/model-json.spec/src/test/java/io/aklivity/zilla/specs/model/json/config/SchemaTest.java similarity index 88% rename from incubator/model-json.spec/src/test/java/io/aklivity/zilla/specs/types/json/config/SchemaTest.java rename to incubator/model-json.spec/src/test/java/io/aklivity/zilla/specs/model/json/config/SchemaTest.java index 94764e5d0e..5bee9a1d6a 100644 --- a/incubator/model-json.spec/src/test/java/io/aklivity/zilla/specs/types/json/config/SchemaTest.java +++ b/incubator/model-json.spec/src/test/java/io/aklivity/zilla/specs/model/json/config/SchemaTest.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.specs.types.json.config; +package io.aklivity.zilla.specs.model.json.config; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.not; @@ -31,8 +31,8 @@ public class SchemaTest public final ConfigSchemaRule schema = new ConfigSchemaRule() .schemaPatch("io/aklivity/zilla/specs/engine/schema/binding/test.schema.patch.json") .schemaPatch("io/aklivity/zilla/specs/engine/schema/catalog/test.schema.patch.json") - .schemaPatch("io/aklivity/zilla/specs/types/json/schema/json.schema.patch.json") - .configurationRoot("io/aklivity/zilla/specs/types/json/config"); + .schemaPatch("io/aklivity/zilla/specs/model/json/schema/json.schema.patch.json") + .configurationRoot("io/aklivity/zilla/specs/model/json/config"); @Test public void shouldValidateCatalog() diff --git a/incubator/model-json/pom.xml b/incubator/model-json/pom.xml index 50fd58fbad..7fe90e569b 100644 --- a/incubator/model-json/pom.xml +++ b/incubator/model-json/pom.xml @@ -101,13 +101,13 @@ model-json.spec - ^\Qio/aklivity/zilla/specs/types/json/\E - io/aklivity/zilla/runtime/types/json/internal/ + ^\Qio/aklivity/zilla/specs/model/json/\E + io/aklivity/zilla/runtime/model/json/internal/ - io/aklivity/zilla/specs/types/json/schema/json.schema.patch.json + io/aklivity/zilla/specs/model/json/schema/json.schema.patch.json ${project.build.directory}/classes diff --git a/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/config/JsonConverterConfig.java b/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/config/JsonConverterConfig.java similarity index 96% rename from incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/config/JsonConverterConfig.java rename to incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/config/JsonConverterConfig.java index 3ca5cec3ff..c21f6b7319 100644 --- a/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/config/JsonConverterConfig.java +++ b/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/config/JsonConverterConfig.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.json.config; +package io.aklivity.zilla.runtime.model.json.config; import java.util.List; import java.util.function.Function; diff --git a/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/config/JsonConverterConfigBuilder.java b/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/config/JsonConverterConfigBuilder.java similarity index 97% rename from incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/config/JsonConverterConfigBuilder.java rename to incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/config/JsonConverterConfigBuilder.java index 20c60278f3..909ca8bb45 100644 --- a/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/config/JsonConverterConfigBuilder.java +++ b/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/config/JsonConverterConfigBuilder.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.json.config; +package io.aklivity.zilla.runtime.model.json.config; import java.util.LinkedList; import java.util.List; diff --git a/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/config/JsonValidatorConfig.java b/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/config/JsonValidatorConfig.java similarity index 96% rename from incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/config/JsonValidatorConfig.java rename to incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/config/JsonValidatorConfig.java index 49efd74044..f1fb948eaf 100644 --- a/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/config/JsonValidatorConfig.java +++ b/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/config/JsonValidatorConfig.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.json.config; +package io.aklivity.zilla.runtime.model.json.config; import java.util.List; import java.util.function.Function; diff --git a/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/config/JsonValidatorConfigBuilder.java b/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/config/JsonValidatorConfigBuilder.java similarity index 97% rename from incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/config/JsonValidatorConfigBuilder.java rename to incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/config/JsonValidatorConfigBuilder.java index 7a25163f04..177df4f004 100644 --- a/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/config/JsonValidatorConfigBuilder.java +++ b/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/config/JsonValidatorConfigBuilder.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.json.config; +package io.aklivity.zilla.runtime.model.json.config; import java.util.LinkedList; import java.util.List; diff --git a/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonConverter.java b/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/JsonConverter.java similarity index 95% rename from incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonConverter.java rename to incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/JsonConverter.java index ecc2632fb0..bdea97d6ae 100644 --- a/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonConverter.java +++ b/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/JsonConverter.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.json.internal; +package io.aklivity.zilla.runtime.model.json.internal; import java.net.URL; diff --git a/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonConverterContext.java b/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/JsonConverterContext.java similarity index 93% rename from incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonConverterContext.java rename to incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/JsonConverterContext.java index b1d3d5e561..1b0d86307e 100644 --- a/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonConverterContext.java +++ b/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/JsonConverterContext.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.json.internal; +package io.aklivity.zilla.runtime.model.json.internal; import java.util.function.LongFunction; @@ -21,7 +21,7 @@ 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.json.config.JsonConverterConfig; +import io.aklivity.zilla.runtime.model.json.config.JsonConverterConfig; public class JsonConverterContext implements ConverterContext { diff --git a/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonConverterFactorySpi.java b/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/JsonConverterFactorySpi.java similarity index 95% rename from incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonConverterFactorySpi.java rename to incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/JsonConverterFactorySpi.java index 3f8c34da30..3fa3159972 100644 --- a/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonConverterFactorySpi.java +++ b/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/JsonConverterFactorySpi.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.json.internal; +package io.aklivity.zilla.runtime.model.json.internal; import java.net.URL; diff --git a/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonConverterHandler.java b/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/JsonConverterHandler.java similarity index 97% rename from incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonConverterHandler.java rename to incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/JsonConverterHandler.java index 4fb3c9d216..d98f425173 100644 --- a/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonConverterHandler.java +++ b/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/JsonConverterHandler.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.json.internal; +package io.aklivity.zilla.runtime.model.json.internal; import java.io.StringReader; import java.util.function.LongFunction; @@ -33,7 +33,7 @@ import io.aklivity.zilla.runtime.engine.catalog.CatalogHandler; import io.aklivity.zilla.runtime.engine.config.CatalogedConfig; import io.aklivity.zilla.runtime.engine.config.SchemaConfig; -import io.aklivity.zilla.runtime.types.json.config.JsonConverterConfig; +import io.aklivity.zilla.runtime.model.json.config.JsonConverterConfig; public abstract class JsonConverterHandler { diff --git a/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonReadConverterHandler.java b/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/JsonReadConverterHandler.java similarity index 94% rename from incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonReadConverterHandler.java rename to incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/JsonReadConverterHandler.java index cfc9b9d7a0..1d7244a670 100644 --- a/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonReadConverterHandler.java +++ b/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/JsonReadConverterHandler.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.json.internal; +package io.aklivity.zilla.runtime.model.json.internal; import static io.aklivity.zilla.runtime.engine.catalog.CatalogHandler.NO_SCHEMA_ID; @@ -23,7 +23,7 @@ import io.aklivity.zilla.runtime.engine.catalog.CatalogHandler; import io.aklivity.zilla.runtime.engine.converter.ConverterHandler; import io.aklivity.zilla.runtime.engine.converter.function.ValueConsumer; -import io.aklivity.zilla.runtime.types.json.config.JsonConverterConfig; +import io.aklivity.zilla.runtime.model.json.config.JsonConverterConfig; public class JsonReadConverterHandler extends JsonConverterHandler implements ConverterHandler { diff --git a/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonValidator.java b/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/JsonValidator.java similarity index 95% rename from incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonValidator.java rename to incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/JsonValidator.java index 0fae142c7f..be4af83dbc 100644 --- a/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonValidator.java +++ b/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/JsonValidator.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.json.internal; +package io.aklivity.zilla.runtime.model.json.internal; import java.net.URL; diff --git a/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonValidatorContext.java b/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/JsonValidatorContext.java similarity index 92% rename from incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonValidatorContext.java rename to incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/JsonValidatorContext.java index 6dbf9ed464..6105d42f30 100644 --- a/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonValidatorContext.java +++ b/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/JsonValidatorContext.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.json.internal; +package io.aklivity.zilla.runtime.model.json.internal; import java.util.function.LongFunction; @@ -21,7 +21,7 @@ import io.aklivity.zilla.runtime.engine.config.ValidatorConfig; import io.aklivity.zilla.runtime.engine.validator.ValidatorContext; import io.aklivity.zilla.runtime.engine.validator.ValidatorHandler; -import io.aklivity.zilla.runtime.types.json.config.JsonValidatorConfig; +import io.aklivity.zilla.runtime.model.json.config.JsonValidatorConfig; public class JsonValidatorContext implements ValidatorContext { diff --git a/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonValidatorFactorySpi.java b/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/JsonValidatorFactorySpi.java similarity index 95% rename from incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonValidatorFactorySpi.java rename to incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/JsonValidatorFactorySpi.java index 3aaaa4aa73..a28f7d01b7 100644 --- a/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonValidatorFactorySpi.java +++ b/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/JsonValidatorFactorySpi.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.json.internal; +package io.aklivity.zilla.runtime.model.json.internal; import io.aklivity.zilla.runtime.engine.Configuration; import io.aklivity.zilla.runtime.engine.validator.Validator; diff --git a/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonValidatorHandler.java b/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/JsonValidatorHandler.java similarity index 97% rename from incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonValidatorHandler.java rename to incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/JsonValidatorHandler.java index aa81de3de1..0ea855d02c 100644 --- a/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonValidatorHandler.java +++ b/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/JsonValidatorHandler.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.json.internal; +package io.aklivity.zilla.runtime.model.json.internal; import java.io.StringReader; import java.util.function.LongFunction; @@ -36,7 +36,7 @@ import io.aklivity.zilla.runtime.engine.config.SchemaConfig; import io.aklivity.zilla.runtime.engine.converter.function.ValueConsumer; import io.aklivity.zilla.runtime.engine.validator.ValidatorHandler; -import io.aklivity.zilla.runtime.types.json.config.JsonValidatorConfig; +import io.aklivity.zilla.runtime.model.json.config.JsonValidatorConfig; public class JsonValidatorHandler implements ValidatorHandler { diff --git a/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonWriteConverterHandler.java b/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/JsonWriteConverterHandler.java similarity index 93% rename from incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonWriteConverterHandler.java rename to incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/JsonWriteConverterHandler.java index 2da4b49661..3e907ed809 100644 --- a/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/JsonWriteConverterHandler.java +++ b/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/JsonWriteConverterHandler.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.json.internal; +package io.aklivity.zilla.runtime.model.json.internal; import java.util.function.LongFunction; @@ -21,7 +21,7 @@ import io.aklivity.zilla.runtime.engine.catalog.CatalogHandler; import io.aklivity.zilla.runtime.engine.converter.ConverterHandler; import io.aklivity.zilla.runtime.engine.converter.function.ValueConsumer; -import io.aklivity.zilla.runtime.types.json.config.JsonConverterConfig; +import io.aklivity.zilla.runtime.model.json.config.JsonConverterConfig; public class JsonWriteConverterHandler extends JsonConverterHandler implements ConverterHandler { diff --git a/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/config/JsonConverterConfigAdapter.java b/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/config/JsonConverterConfigAdapter.java similarity index 96% rename from incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/config/JsonConverterConfigAdapter.java rename to incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/config/JsonConverterConfigAdapter.java index 3d2b350e07..fa53646d2f 100644 --- a/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/config/JsonConverterConfigAdapter.java +++ b/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/config/JsonConverterConfigAdapter.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.json.internal.config; +package io.aklivity.zilla.runtime.model.json.internal.config; import java.util.LinkedList; import java.util.List; @@ -30,7 +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.json.config.JsonConverterConfig; +import io.aklivity.zilla.runtime.model.json.config.JsonConverterConfig; public final class JsonConverterConfigAdapter implements ConverterConfigAdapterSpi, JsonbAdapter { diff --git a/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/config/JsonValidatorConfigAdapter.java b/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/config/JsonValidatorConfigAdapter.java similarity index 96% rename from incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/config/JsonValidatorConfigAdapter.java rename to incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/config/JsonValidatorConfigAdapter.java index e643aafa16..97a513f45b 100644 --- a/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/types/json/internal/config/JsonValidatorConfigAdapter.java +++ b/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/config/JsonValidatorConfigAdapter.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.json.internal.config; +package io.aklivity.zilla.runtime.model.json.internal.config; import java.util.LinkedList; import java.util.List; @@ -30,7 +30,7 @@ import io.aklivity.zilla.runtime.engine.config.SchemaConfigAdapter; import io.aklivity.zilla.runtime.engine.config.ValidatorConfig; import io.aklivity.zilla.runtime.engine.config.ValidatorConfigAdapterSpi; -import io.aklivity.zilla.runtime.types.json.config.JsonValidatorConfig; +import io.aklivity.zilla.runtime.model.json.config.JsonValidatorConfig; public final class JsonValidatorConfigAdapter implements ValidatorConfigAdapterSpi, JsonbAdapter { diff --git a/incubator/model-json/src/main/moditect/module-info.java b/incubator/model-json/src/main/moditect/module-info.java index 5e08318520..0f9b6aac95 100644 --- a/incubator/model-json/src/main/moditect/module-info.java +++ b/incubator/model-json/src/main/moditect/module-info.java @@ -12,24 +12,24 @@ * WARRANTIES OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -module io.aklivity.zilla.runtime.types.json +module io.aklivity.zilla.runtime.model.json { requires io.aklivity.zilla.runtime.engine; requires org.leadpony.justify; - exports io.aklivity.zilla.runtime.types.json.config; + exports io.aklivity.zilla.runtime.model.json.config; provides io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi - with io.aklivity.zilla.runtime.types.json.internal.config.JsonConverterConfigAdapter; + with io.aklivity.zilla.runtime.model.json.internal.config.JsonConverterConfigAdapter; provides io.aklivity.zilla.runtime.engine.converter.ConverterFactorySpi - with io.aklivity.zilla.runtime.types.json.internal.JsonConverterFactorySpi; + with io.aklivity.zilla.runtime.model.json.internal.JsonConverterFactorySpi; provides io.aklivity.zilla.runtime.engine.config.ValidatorConfigAdapterSpi - with io.aklivity.zilla.runtime.types.json.internal.config.JsonValidatorConfigAdapter; + with io.aklivity.zilla.runtime.model.json.internal.config.JsonValidatorConfigAdapter; provides io.aklivity.zilla.runtime.engine.validator.ValidatorFactorySpi - with io.aklivity.zilla.runtime.types.json.internal.JsonValidatorFactorySpi; + with io.aklivity.zilla.runtime.model.json.internal.JsonValidatorFactorySpi; } diff --git a/incubator/model-json/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi b/incubator/model-json/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi index b49f34e4e3..c3045020c0 100644 --- a/incubator/model-json/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi +++ b/incubator/model-json/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi @@ -1 +1 @@ -io.aklivity.zilla.runtime.types.json.internal.config.JsonConverterConfigAdapter +io.aklivity.zilla.runtime.model.json.internal.config.JsonConverterConfigAdapter diff --git a/incubator/model-json/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ValidatorConfigAdapterSpi b/incubator/model-json/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ValidatorConfigAdapterSpi index 9251a92533..202ebf6fe8 100644 --- a/incubator/model-json/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ValidatorConfigAdapterSpi +++ b/incubator/model-json/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ValidatorConfigAdapterSpi @@ -1 +1 @@ -io.aklivity.zilla.runtime.types.json.internal.config.JsonValidatorConfigAdapter +io.aklivity.zilla.runtime.model.json.internal.config.JsonValidatorConfigAdapter diff --git a/incubator/model-json/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.converter.ConverterFactorySpi b/incubator/model-json/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.converter.ConverterFactorySpi index d0b5798084..0b555f1357 100644 --- a/incubator/model-json/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.converter.ConverterFactorySpi +++ b/incubator/model-json/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.converter.ConverterFactorySpi @@ -1 +1 @@ -io.aklivity.zilla.runtime.types.json.internal.JsonConverterFactorySpi +io.aklivity.zilla.runtime.model.json.internal.JsonConverterFactorySpi diff --git a/incubator/model-json/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.validator.ValidatorFactorySpi b/incubator/model-json/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.validator.ValidatorFactorySpi index ede79a4511..e24d8333f4 100644 --- a/incubator/model-json/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.validator.ValidatorFactorySpi +++ b/incubator/model-json/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.validator.ValidatorFactorySpi @@ -1 +1 @@ -io.aklivity.zilla.runtime.types.json.internal.JsonValidatorFactorySpi +io.aklivity.zilla.runtime.model.json.internal.JsonValidatorFactorySpi diff --git a/incubator/model-json/src/test/java/io/aklivity/zilla/runtime/types/json/internal/JsonConverterFactorySpiTest.java b/incubator/model-json/src/test/java/io/aklivity/zilla/runtime/model/json/internal/JsonConverterFactorySpiTest.java similarity index 94% rename from incubator/model-json/src/test/java/io/aklivity/zilla/runtime/types/json/internal/JsonConverterFactorySpiTest.java rename to incubator/model-json/src/test/java/io/aklivity/zilla/runtime/model/json/internal/JsonConverterFactorySpiTest.java index 7d5cc17012..ff32c56f5d 100644 --- a/incubator/model-json/src/test/java/io/aklivity/zilla/runtime/types/json/internal/JsonConverterFactorySpiTest.java +++ b/incubator/model-json/src/test/java/io/aklivity/zilla/runtime/model/json/internal/JsonConverterFactorySpiTest.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.json.internal; +package io.aklivity.zilla.runtime.model.json.internal; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.MatcherAssert.assertThat; @@ -26,7 +26,7 @@ import io.aklivity.zilla.runtime.engine.converter.Converter; import io.aklivity.zilla.runtime.engine.converter.ConverterContext; import io.aklivity.zilla.runtime.engine.converter.ConverterFactory; -import io.aklivity.zilla.runtime.types.json.config.JsonConverterConfig; +import io.aklivity.zilla.runtime.model.json.config.JsonConverterConfig; public class JsonConverterFactorySpiTest { diff --git a/incubator/model-json/src/test/java/io/aklivity/zilla/runtime/types/json/internal/JsonConverterTest.java b/incubator/model-json/src/test/java/io/aklivity/zilla/runtime/model/json/internal/JsonConverterTest.java similarity index 98% rename from incubator/model-json/src/test/java/io/aklivity/zilla/runtime/types/json/internal/JsonConverterTest.java rename to incubator/model-json/src/test/java/io/aklivity/zilla/runtime/model/json/internal/JsonConverterTest.java index 80feb2ac78..37be5d0dcc 100644 --- a/incubator/model-json/src/test/java/io/aklivity/zilla/runtime/types/json/internal/JsonConverterTest.java +++ b/incubator/model-json/src/test/java/io/aklivity/zilla/runtime/model/json/internal/JsonConverterTest.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.json.internal; +package io.aklivity.zilla.runtime.model.json.internal; import static io.aklivity.zilla.runtime.engine.EngineConfiguration.ENGINE_DIRECTORY; import static org.junit.Assert.assertEquals; @@ -36,7 +36,7 @@ import io.aklivity.zilla.runtime.engine.converter.function.ValueConsumer; import io.aklivity.zilla.runtime.engine.test.internal.catalog.TestCatalog; import io.aklivity.zilla.runtime.engine.test.internal.catalog.config.TestCatalogOptionsConfig; -import io.aklivity.zilla.runtime.types.json.config.JsonConverterConfig; +import io.aklivity.zilla.runtime.model.json.config.JsonConverterConfig; public class JsonConverterTest { diff --git a/incubator/model-json/src/test/java/io/aklivity/zilla/runtime/types/json/internal/JsonValidatorFactorySpiTest.java b/incubator/model-json/src/test/java/io/aklivity/zilla/runtime/model/json/internal/JsonValidatorFactorySpiTest.java similarity index 94% rename from incubator/model-json/src/test/java/io/aklivity/zilla/runtime/types/json/internal/JsonValidatorFactorySpiTest.java rename to incubator/model-json/src/test/java/io/aklivity/zilla/runtime/model/json/internal/JsonValidatorFactorySpiTest.java index eeaef4dfe9..bac9c86d94 100644 --- a/incubator/model-json/src/test/java/io/aklivity/zilla/runtime/types/json/internal/JsonValidatorFactorySpiTest.java +++ b/incubator/model-json/src/test/java/io/aklivity/zilla/runtime/model/json/internal/JsonValidatorFactorySpiTest.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.json.internal; +package io.aklivity.zilla.runtime.model.json.internal; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.MatcherAssert.assertThat; @@ -26,7 +26,7 @@ import io.aklivity.zilla.runtime.engine.validator.Validator; import io.aklivity.zilla.runtime.engine.validator.ValidatorContext; import io.aklivity.zilla.runtime.engine.validator.ValidatorFactory; -import io.aklivity.zilla.runtime.types.json.config.JsonValidatorConfig; +import io.aklivity.zilla.runtime.model.json.config.JsonValidatorConfig; public class JsonValidatorFactorySpiTest { diff --git a/incubator/model-json/src/test/java/io/aklivity/zilla/runtime/types/json/internal/JsonValidatorTest.java b/incubator/model-json/src/test/java/io/aklivity/zilla/runtime/model/json/internal/JsonValidatorTest.java similarity index 98% rename from incubator/model-json/src/test/java/io/aklivity/zilla/runtime/types/json/internal/JsonValidatorTest.java rename to incubator/model-json/src/test/java/io/aklivity/zilla/runtime/model/json/internal/JsonValidatorTest.java index 8fc9a5be80..7780a27305 100644 --- a/incubator/model-json/src/test/java/io/aklivity/zilla/runtime/types/json/internal/JsonValidatorTest.java +++ b/incubator/model-json/src/test/java/io/aklivity/zilla/runtime/model/json/internal/JsonValidatorTest.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.json.internal; +package io.aklivity.zilla.runtime.model.json.internal; import static io.aklivity.zilla.runtime.engine.EngineConfiguration.ENGINE_DIRECTORY; import static io.aklivity.zilla.runtime.engine.validator.ValidatorHandler.FLAGS_FIN; @@ -38,7 +38,7 @@ import io.aklivity.zilla.runtime.engine.converter.function.ValueConsumer; import io.aklivity.zilla.runtime.engine.test.internal.catalog.TestCatalog; import io.aklivity.zilla.runtime.engine.test.internal.catalog.config.TestCatalogOptionsConfig; -import io.aklivity.zilla.runtime.types.json.config.JsonValidatorConfig; +import io.aklivity.zilla.runtime.model.json.config.JsonValidatorConfig; public class JsonValidatorTest { diff --git a/incubator/model-json/src/test/java/io/aklivity/zilla/runtime/types/json/internal/config/JsonConverterConfigAdapterTest.java b/incubator/model-json/src/test/java/io/aklivity/zilla/runtime/model/json/internal/config/JsonConverterConfigAdapterTest.java similarity index 97% rename from incubator/model-json/src/test/java/io/aklivity/zilla/runtime/types/json/internal/config/JsonConverterConfigAdapterTest.java rename to incubator/model-json/src/test/java/io/aklivity/zilla/runtime/model/json/internal/config/JsonConverterConfigAdapterTest.java index a2928c5abb..55b9c119da 100644 --- a/incubator/model-json/src/test/java/io/aklivity/zilla/runtime/types/json/internal/config/JsonConverterConfigAdapterTest.java +++ b/incubator/model-json/src/test/java/io/aklivity/zilla/runtime/model/json/internal/config/JsonConverterConfigAdapterTest.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.json.internal.config; +package io.aklivity.zilla.runtime.model.json.internal.config; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; @@ -26,7 +26,7 @@ import org.junit.Before; import org.junit.Test; -import io.aklivity.zilla.runtime.types.json.config.JsonConverterConfig; +import io.aklivity.zilla.runtime.model.json.config.JsonConverterConfig; public class JsonConverterConfigAdapterTest { diff --git a/incubator/model-json/src/test/java/io/aklivity/zilla/runtime/types/json/internal/config/JsonValidatorConfigAdapterTest.java b/incubator/model-json/src/test/java/io/aklivity/zilla/runtime/model/json/internal/config/JsonValidatorConfigAdapterTest.java similarity index 97% rename from incubator/model-json/src/test/java/io/aklivity/zilla/runtime/types/json/internal/config/JsonValidatorConfigAdapterTest.java rename to incubator/model-json/src/test/java/io/aklivity/zilla/runtime/model/json/internal/config/JsonValidatorConfigAdapterTest.java index 2d09d27e7a..1b11e9c79b 100644 --- a/incubator/model-json/src/test/java/io/aklivity/zilla/runtime/types/json/internal/config/JsonValidatorConfigAdapterTest.java +++ b/incubator/model-json/src/test/java/io/aklivity/zilla/runtime/model/json/internal/config/JsonValidatorConfigAdapterTest.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.json.internal.config; +package io.aklivity.zilla.runtime.model.json.internal.config; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; @@ -26,7 +26,7 @@ import org.junit.Before; import org.junit.Test; -import io.aklivity.zilla.runtime.types.json.config.JsonValidatorConfig; +import io.aklivity.zilla.runtime.model.json.config.JsonValidatorConfig; public class JsonValidatorConfigAdapterTest { diff --git a/incubator/model-protobuf.spec/src/main/moditect/module-info.java b/incubator/model-protobuf.spec/src/main/moditect/module-info.java index 2dc331fe6a..92a482d255 100644 --- a/incubator/model-protobuf.spec/src/main/moditect/module-info.java +++ b/incubator/model-protobuf.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.protobuf +open module io.aklivity.zilla.specs.model.protobuf { requires transitive io.aklivity.zilla.specs.engine; } diff --git a/incubator/model-protobuf.spec/src/main/scripts/io/aklivity/zilla/specs/types/protobuf/config/converter.yaml b/incubator/model-protobuf.spec/src/main/scripts/io/aklivity/zilla/specs/model/protobuf/config/converter.yaml similarity index 100% rename from incubator/model-protobuf.spec/src/main/scripts/io/aklivity/zilla/specs/types/protobuf/config/converter.yaml rename to incubator/model-protobuf.spec/src/main/scripts/io/aklivity/zilla/specs/model/protobuf/config/converter.yaml diff --git a/incubator/model-protobuf.spec/src/main/scripts/io/aklivity/zilla/specs/types/protobuf/schema/protobuf.schema.patch.json b/incubator/model-protobuf.spec/src/main/scripts/io/aklivity/zilla/specs/model/protobuf/schema/protobuf.schema.patch.json similarity index 100% rename from incubator/model-protobuf.spec/src/main/scripts/io/aklivity/zilla/specs/types/protobuf/schema/protobuf.schema.patch.json rename to incubator/model-protobuf.spec/src/main/scripts/io/aklivity/zilla/specs/model/protobuf/schema/protobuf.schema.patch.json diff --git a/incubator/model-protobuf.spec/src/test/java/io/aklivity/zilla/specs/types/protobuf/config/SchemaTest.java b/incubator/model-protobuf.spec/src/test/java/io/aklivity/zilla/specs/model/protobuf/config/SchemaTest.java similarity index 88% rename from incubator/model-protobuf.spec/src/test/java/io/aklivity/zilla/specs/types/protobuf/config/SchemaTest.java rename to incubator/model-protobuf.spec/src/test/java/io/aklivity/zilla/specs/model/protobuf/config/SchemaTest.java index fd2ad5fcc0..d1de785a9a 100644 --- a/incubator/model-protobuf.spec/src/test/java/io/aklivity/zilla/specs/types/protobuf/config/SchemaTest.java +++ b/incubator/model-protobuf.spec/src/test/java/io/aklivity/zilla/specs/model/protobuf/config/SchemaTest.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.specs.types.protobuf.config; +package io.aklivity.zilla.specs.model.protobuf.config; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.not; @@ -31,8 +31,8 @@ public class SchemaTest public final ConfigSchemaRule schema = new ConfigSchemaRule() .schemaPatch("io/aklivity/zilla/specs/engine/schema/binding/test.schema.patch.json") .schemaPatch("io/aklivity/zilla/specs/engine/schema/catalog/test.schema.patch.json") - .schemaPatch("io/aklivity/zilla/specs/types/protobuf/schema/protobuf.schema.patch.json") - .configurationRoot("io/aklivity/zilla/specs/types/protobuf/config"); + .schemaPatch("io/aklivity/zilla/specs/model/protobuf/schema/protobuf.schema.patch.json") + .configurationRoot("io/aklivity/zilla/specs/model/protobuf/config"); @Test public void shouldValidateCatalog() diff --git a/incubator/model-protobuf/pom.xml b/incubator/model-protobuf/pom.xml index 8ff9fe3345..d0e9b05ecd 100644 --- a/incubator/model-protobuf/pom.xml +++ b/incubator/model-protobuf/pom.xml @@ -114,13 +114,13 @@ model-protobuf.spec - ^\Qio/aklivity/zilla/specs/types/protobuf/\E - io/aklivity/zilla/runtime/types/protobuf/internal/ + ^\Qio/aklivity/zilla/specs/model/protobuf/\E + io/aklivity/zilla/runtime/model/protobuf/internal/ - io/aklivity/zilla/specs/types/protobuf/schema/protobuf.schema.patch.json + io/aklivity/zilla/specs/model/protobuf/schema/protobuf.schema.patch.json ${project.build.directory}/classes @@ -165,7 +165,7 @@ jacoco-maven-plugin - io/aklivity/zilla/runtime/types/protobuf/internal/parser/**/*.class + io/aklivity/zilla/runtime/model/protobuf/internal/parser/**/*.class diff --git a/incubator/model-protobuf/src/main/antlr4/io/aklivity/zilla/runtime/types/protobuf/internal/parser/Protobuf3.g4 b/incubator/model-protobuf/src/main/antlr4/io/aklivity/zilla/runtime/model/protobuf/internal/parser/Protobuf3.g4 similarity index 100% rename from incubator/model-protobuf/src/main/antlr4/io/aklivity/zilla/runtime/types/protobuf/internal/parser/Protobuf3.g4 rename to incubator/model-protobuf/src/main/antlr4/io/aklivity/zilla/runtime/model/protobuf/internal/parser/Protobuf3.g4 diff --git a/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/types/protobuf/config/ProtobufConverterConfig.java b/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/config/ProtobufConverterConfig.java similarity index 96% rename from incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/types/protobuf/config/ProtobufConverterConfig.java rename to incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/config/ProtobufConverterConfig.java index bb6605b668..d0f2ef3aaa 100644 --- a/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/types/protobuf/config/ProtobufConverterConfig.java +++ b/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/config/ProtobufConverterConfig.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.protobuf.config; +package io.aklivity.zilla.runtime.model.protobuf.config; import java.util.List; import java.util.function.Function; diff --git a/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/types/protobuf/config/ProtobufConverterConfigBuilder.java b/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/config/ProtobufConverterConfigBuilder.java similarity index 97% rename from incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/types/protobuf/config/ProtobufConverterConfigBuilder.java rename to incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/config/ProtobufConverterConfigBuilder.java index bf988ced73..51ec2c3ad4 100644 --- a/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/types/protobuf/config/ProtobufConverterConfigBuilder.java +++ b/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/config/ProtobufConverterConfigBuilder.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.protobuf.config; +package io.aklivity.zilla.runtime.model.protobuf.config; import java.util.LinkedList; import java.util.List; diff --git a/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/types/protobuf/internal/DescriptorTree.java b/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/DescriptorTree.java similarity index 98% rename from incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/types/protobuf/internal/DescriptorTree.java rename to incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/DescriptorTree.java index 84dc146740..8b7a3cd3b8 100644 --- a/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/types/protobuf/internal/DescriptorTree.java +++ b/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/DescriptorTree.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.protobuf.internal; +package io.aklivity.zilla.runtime.model.protobuf.internal; import java.util.LinkedHashMap; import java.util.LinkedList; diff --git a/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/types/protobuf/internal/ProtoListener.java b/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtoListener.java similarity index 96% rename from incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/types/protobuf/internal/ProtoListener.java rename to incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtoListener.java index cf52aa6ce4..420278e4fd 100644 --- a/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/types/protobuf/internal/ProtoListener.java +++ b/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtoListener.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.protobuf.internal; +package io.aklivity.zilla.runtime.model.protobuf.internal; import static java.util.Map.entry; @@ -28,8 +28,8 @@ import com.google.protobuf.DescriptorProtos.FieldDescriptorProto.Type; import com.google.protobuf.DescriptorProtos.FileDescriptorProto; -import io.aklivity.zilla.runtime.types.protobuf.internal.parser.Protobuf3BaseListener; -import io.aklivity.zilla.runtime.types.protobuf.internal.parser.Protobuf3Parser; +import io.aklivity.zilla.runtime.model.protobuf.internal.parser.Protobuf3BaseListener; +import io.aklivity.zilla.runtime.model.protobuf.internal.parser.Protobuf3Parser; public class ProtoListener extends Protobuf3BaseListener { diff --git a/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/types/protobuf/internal/ProtobufConverter.java b/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufConverter.java similarity index 95% rename from incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/types/protobuf/internal/ProtobufConverter.java rename to incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufConverter.java index 853b3b567f..0d69300a5d 100644 --- a/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/types/protobuf/internal/ProtobufConverter.java +++ b/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufConverter.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.protobuf.internal; +package io.aklivity.zilla.runtime.model.protobuf.internal; import java.net.URL; diff --git a/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/types/protobuf/internal/ProtobufConverterContext.java b/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufConverterContext.java similarity index 93% rename from incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/types/protobuf/internal/ProtobufConverterContext.java rename to incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufConverterContext.java index 4b22307f80..7bac730634 100644 --- a/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/types/protobuf/internal/ProtobufConverterContext.java +++ b/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufConverterContext.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.protobuf.internal; +package io.aklivity.zilla.runtime.model.protobuf.internal; import java.util.function.LongFunction; @@ -21,7 +21,7 @@ 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.protobuf.config.ProtobufConverterConfig; +import io.aklivity.zilla.runtime.model.protobuf.config.ProtobufConverterConfig; public class ProtobufConverterContext implements ConverterContext { diff --git a/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/types/protobuf/internal/ProtobufConverterFactorySpi.java b/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufConverterFactorySpi.java similarity index 95% rename from incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/types/protobuf/internal/ProtobufConverterFactorySpi.java rename to incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufConverterFactorySpi.java index 3d8c1179aa..5a27816b58 100644 --- a/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/types/protobuf/internal/ProtobufConverterFactorySpi.java +++ b/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufConverterFactorySpi.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.protobuf.internal; +package io.aklivity.zilla.runtime.model.protobuf.internal; import java.net.URL; diff --git a/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/types/protobuf/internal/ProtobufConverterHandler.java b/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufConverterHandler.java similarity index 97% rename from incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/types/protobuf/internal/ProtobufConverterHandler.java rename to incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufConverterHandler.java index 8d91182040..0569dcf15b 100644 --- a/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/types/protobuf/internal/ProtobufConverterHandler.java +++ b/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufConverterHandler.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.protobuf.internal; +package io.aklivity.zilla.runtime.model.protobuf.internal; import java.util.Arrays; import java.util.LinkedList; @@ -41,9 +41,9 @@ import io.aklivity.zilla.runtime.engine.catalog.CatalogHandler; import io.aklivity.zilla.runtime.engine.config.CatalogedConfig; import io.aklivity.zilla.runtime.engine.config.SchemaConfig; -import io.aklivity.zilla.runtime.types.protobuf.config.ProtobufConverterConfig; -import io.aklivity.zilla.runtime.types.protobuf.internal.parser.Protobuf3Lexer; -import io.aklivity.zilla.runtime.types.protobuf.internal.parser.Protobuf3Parser; +import io.aklivity.zilla.runtime.model.protobuf.config.ProtobufConverterConfig; +import io.aklivity.zilla.runtime.model.protobuf.internal.parser.Protobuf3Lexer; +import io.aklivity.zilla.runtime.model.protobuf.internal.parser.Protobuf3Parser; public class ProtobufConverterHandler { diff --git a/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/types/protobuf/internal/ProtobufReadConverterHandler.java b/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufReadConverterHandler.java similarity index 97% rename from incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/types/protobuf/internal/ProtobufReadConverterHandler.java rename to incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufReadConverterHandler.java index 56084d0b8b..58a2e2bd71 100644 --- a/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/types/protobuf/internal/ProtobufReadConverterHandler.java +++ b/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufReadConverterHandler.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.protobuf.internal; +package io.aklivity.zilla.runtime.model.protobuf.internal; import static io.aklivity.zilla.runtime.engine.catalog.CatalogHandler.NO_SCHEMA_ID; @@ -29,7 +29,7 @@ import io.aklivity.zilla.runtime.engine.catalog.CatalogHandler; import io.aklivity.zilla.runtime.engine.converter.ConverterHandler; import io.aklivity.zilla.runtime.engine.converter.function.ValueConsumer; -import io.aklivity.zilla.runtime.types.protobuf.config.ProtobufConverterConfig; +import io.aklivity.zilla.runtime.model.protobuf.config.ProtobufConverterConfig; public class ProtobufReadConverterHandler extends ProtobufConverterHandler implements ConverterHandler { diff --git a/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/types/protobuf/internal/ProtobufWriteConverterHandler.java b/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufWriteConverterHandler.java similarity index 98% rename from incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/types/protobuf/internal/ProtobufWriteConverterHandler.java rename to incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufWriteConverterHandler.java index e98e0d8ad4..7e75784364 100644 --- a/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/types/protobuf/internal/ProtobufWriteConverterHandler.java +++ b/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufWriteConverterHandler.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.protobuf.internal; +package io.aklivity.zilla.runtime.model.protobuf.internal; import java.io.IOException; import java.io.InputStreamReader; @@ -29,7 +29,7 @@ import io.aklivity.zilla.runtime.engine.catalog.CatalogHandler; import io.aklivity.zilla.runtime.engine.converter.ConverterHandler; import io.aklivity.zilla.runtime.engine.converter.function.ValueConsumer; -import io.aklivity.zilla.runtime.types.protobuf.config.ProtobufConverterConfig; +import io.aklivity.zilla.runtime.model.protobuf.config.ProtobufConverterConfig; public class ProtobufWriteConverterHandler extends ProtobufConverterHandler implements ConverterHandler { diff --git a/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/types/protobuf/internal/config/ProtobufConverterConfigAdapter.java b/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/config/ProtobufConverterConfigAdapter.java similarity index 96% rename from incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/types/protobuf/internal/config/ProtobufConverterConfigAdapter.java rename to incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/config/ProtobufConverterConfigAdapter.java index 28e027be67..8b32d9d175 100644 --- a/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/types/protobuf/internal/config/ProtobufConverterConfigAdapter.java +++ b/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/config/ProtobufConverterConfigAdapter.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.protobuf.internal.config; +package io.aklivity.zilla.runtime.model.protobuf.internal.config; import java.util.LinkedList; import java.util.List; @@ -30,7 +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.protobuf.config.ProtobufConverterConfig; +import io.aklivity.zilla.runtime.model.protobuf.config.ProtobufConverterConfig; public final class ProtobufConverterConfigAdapter implements ConverterConfigAdapterSpi, JsonbAdapter { diff --git a/incubator/model-protobuf/src/main/moditect/module-info.java b/incubator/model-protobuf/src/main/moditect/module-info.java index 5361351f8e..f10b7a87f8 100644 --- a/incubator/model-protobuf/src/main/moditect/module-info.java +++ b/incubator/model-protobuf/src/main/moditect/module-info.java @@ -12,17 +12,17 @@ * WARRANTIES OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -module io.aklivity.zilla.runtime.types.protobuf +module io.aklivity.zilla.runtime.model.protobuf { requires org.antlr.antlr4.runtime; requires protobuf.java; requires io.aklivity.zilla.runtime.engine; - exports io.aklivity.zilla.runtime.types.protobuf.config; + exports io.aklivity.zilla.runtime.model.protobuf.config; provides io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi - with io.aklivity.zilla.runtime.types.protobuf.internal.config.ProtobufConverterConfigAdapter; + with io.aklivity.zilla.runtime.model.protobuf.internal.config.ProtobufConverterConfigAdapter; provides io.aklivity.zilla.runtime.engine.converter.ConverterFactorySpi - with io.aklivity.zilla.runtime.types.protobuf.internal.ProtobufConverterFactorySpi; + with io.aklivity.zilla.runtime.model.protobuf.internal.ProtobufConverterFactorySpi; } diff --git a/incubator/model-protobuf/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi b/incubator/model-protobuf/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi index ebdf8ccf78..1367bb45c3 100644 --- a/incubator/model-protobuf/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi +++ b/incubator/model-protobuf/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi @@ -1 +1 @@ -io.aklivity.zilla.runtime.types.protobuf.internal.config.ProtobufConverterConfigAdapter +io.aklivity.zilla.runtime.model.protobuf.internal.config.ProtobufConverterConfigAdapter diff --git a/incubator/model-protobuf/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.converter.ConverterFactorySpi b/incubator/model-protobuf/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.converter.ConverterFactorySpi index 5a9e531202..56f1a2f114 100644 --- a/incubator/model-protobuf/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.converter.ConverterFactorySpi +++ b/incubator/model-protobuf/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.converter.ConverterFactorySpi @@ -1 +1 @@ -io.aklivity.zilla.runtime.types.protobuf.internal.ProtobufConverterFactorySpi +io.aklivity.zilla.runtime.model.protobuf.internal.ProtobufConverterFactorySpi diff --git a/incubator/model-protobuf/src/test/java/io/aklivity/zilla/runtime/types/protobuf/internal/ProtobufConverterFactorySpiTest.java b/incubator/model-protobuf/src/test/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufConverterFactorySpiTest.java similarity index 94% rename from incubator/model-protobuf/src/test/java/io/aklivity/zilla/runtime/types/protobuf/internal/ProtobufConverterFactorySpiTest.java rename to incubator/model-protobuf/src/test/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufConverterFactorySpiTest.java index 43c463515b..90039f3f89 100644 --- a/incubator/model-protobuf/src/test/java/io/aklivity/zilla/runtime/types/protobuf/internal/ProtobufConverterFactorySpiTest.java +++ b/incubator/model-protobuf/src/test/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufConverterFactorySpiTest.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.protobuf.internal; +package io.aklivity.zilla.runtime.model.protobuf.internal; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.MatcherAssert.assertThat; @@ -26,7 +26,7 @@ import io.aklivity.zilla.runtime.engine.converter.Converter; import io.aklivity.zilla.runtime.engine.converter.ConverterContext; import io.aklivity.zilla.runtime.engine.converter.ConverterFactory; -import io.aklivity.zilla.runtime.types.protobuf.config.ProtobufConverterConfig; +import io.aklivity.zilla.runtime.model.protobuf.config.ProtobufConverterConfig; public class ProtobufConverterFactorySpiTest { diff --git a/incubator/model-protobuf/src/test/java/io/aklivity/zilla/runtime/types/protobuf/internal/ProtobufConverterTest.java b/incubator/model-protobuf/src/test/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufConverterTest.java similarity index 99% rename from incubator/model-protobuf/src/test/java/io/aklivity/zilla/runtime/types/protobuf/internal/ProtobufConverterTest.java rename to incubator/model-protobuf/src/test/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufConverterTest.java index 635e2b309f..6c4220a446 100644 --- a/incubator/model-protobuf/src/test/java/io/aklivity/zilla/runtime/types/protobuf/internal/ProtobufConverterTest.java +++ b/incubator/model-protobuf/src/test/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufConverterTest.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.protobuf.internal; +package io.aklivity.zilla.runtime.model.protobuf.internal; import static io.aklivity.zilla.runtime.engine.EngineConfiguration.ENGINE_DIRECTORY; import static org.junit.Assert.assertEquals; @@ -36,7 +36,7 @@ import io.aklivity.zilla.runtime.engine.converter.function.ValueConsumer; import io.aklivity.zilla.runtime.engine.test.internal.catalog.TestCatalog; import io.aklivity.zilla.runtime.engine.test.internal.catalog.config.TestCatalogOptionsConfig; -import io.aklivity.zilla.runtime.types.protobuf.config.ProtobufConverterConfig; +import io.aklivity.zilla.runtime.model.protobuf.config.ProtobufConverterConfig; public class ProtobufConverterTest { diff --git a/incubator/model-protobuf/src/test/java/io/aklivity/zilla/runtime/types/protobuf/internal/config/ProtobufConverterConfigAdapterTest.java b/incubator/model-protobuf/src/test/java/io/aklivity/zilla/runtime/model/protobuf/internal/config/ProtobufConverterConfigAdapterTest.java similarity index 97% rename from incubator/model-protobuf/src/test/java/io/aklivity/zilla/runtime/types/protobuf/internal/config/ProtobufConverterConfigAdapterTest.java rename to incubator/model-protobuf/src/test/java/io/aklivity/zilla/runtime/model/protobuf/internal/config/ProtobufConverterConfigAdapterTest.java index af27b8cb55..7731b16b61 100644 --- a/incubator/model-protobuf/src/test/java/io/aklivity/zilla/runtime/types/protobuf/internal/config/ProtobufConverterConfigAdapterTest.java +++ b/incubator/model-protobuf/src/test/java/io/aklivity/zilla/runtime/model/protobuf/internal/config/ProtobufConverterConfigAdapterTest.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.protobuf.internal.config; +package io.aklivity.zilla.runtime.model.protobuf.internal.config; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; @@ -26,7 +26,7 @@ import org.junit.Before; import org.junit.Test; -import io.aklivity.zilla.runtime.types.protobuf.config.ProtobufConverterConfig; +import io.aklivity.zilla.runtime.model.protobuf.config.ProtobufConverterConfig; public class ProtobufConverterConfigAdapterTest { From cbb84c4a23f5bbc52e6d1dbc2b3d8c39191033f4 Mon Sep 17 00:00:00 2001 From: Ankit Kumar Date: Thu, 25 Jan 2024 20:15:12 +0530 Subject: [PATCH 3/4] unify Validator and Converter to Model --- .../catalog/inline/internal/InlineIT.java | 2 +- .../SchemaRegistryCatalogHandler.java | 2 +- .../registry/internal/SchemaRegistryIT.java | 2 +- .../internal/airline/ConfigGenerator.java | 12 +- .../AsyncApiHttpProxyConfigGenerator.java | 12 +- .../AsyncApiMqttProxyConfigGenerator.java | 4 +- .../OpenApiHttpProxyConfigGenerator.java | 16 +- ...verterConfig.java => AvroModelConfig.java} | 16 +- ...ilder.java => AvroModelConfigBuilder.java} | 22 +-- .../avro/internal/AvroConverterHandler.java | 4 +- .../{AvroConverter.java => AvroModel.java} | 10 +- ...rterContext.java => AvroModelContext.java} | 24 +-- ...ctorySpi.java => AvroModelFactorySpi.java} | 12 +- .../internal/AvroReadConverterHandler.java | 8 +- .../internal/AvroWriteConverterHandler.java | 8 +- ...apter.java => AvroModelConfigAdapter.java} | 16 +- .../src/main/moditect/module-info.java | 8 +- ...me.engine.config.ConverterConfigAdapterSpi | 1 - ...untime.engine.config.ModelConfigAdapterSpi | 1 + ...ntime.engine.converter.ConverterFactorySpi | 1 - ...zilla.runtime.engine.model.ModelFactorySpi | 1 + ...Test.java => AvroModelFactorySpiTest.java} | 26 ++-- ...oConverterTest.java => AvroModelTest.java} | 14 +- ...t.java => AvroModelConfigAdapterTest.java} | 10 +- .../core/config/IntegerConverterConfig.java | 38 ----- ...torConfig.java => IntegerModelConfig.java} | 16 +- ...er.java => IntegerModelConfigBuilder.java} | 14 +- .../config/IntegerValidatorConfigBuilder.java | 43 ------ .../config/StringConverterConfigBuilder.java | 52 ------- ...rterConfig.java => StringModelConfig.java} | 16 +- ...der.java => StringModelConfigBuilder.java} | 16 +- .../core/config/StringValidatorConfig.java | 44 ------ .../internal/IntegerConverterHandler.java | 8 +- ...ntegerConverter.java => IntegerModel.java} | 10 +- ...rContext.java => IntegerModelContext.java} | 32 ++-- ...rySpi.java => IntegerModelFactorySpi.java} | 12 +- .../model/core/internal/IntegerValidator.java | 45 ------ .../internal/IntegerValidatorContext.java | 36 ----- .../internal/IntegerValidatorFactorySpi.java | 35 ----- .../internal/IntegerValidatorHandler.java | 8 +- .../core/internal/StringConverterHandler.java | 8 +- ...{StringConverter.java => StringModel.java} | 10 +- ...erContext.java => StringModelContext.java} | 32 ++-- ...orySpi.java => StringModelFactorySpi.java} | 10 +- .../model/core/internal/StringValidator.java | 49 ------- .../core/internal/StringValidatorContext.java | 36 ----- .../internal/StringValidatorEncoding.java | 4 +- .../internal/StringValidatorFactorySpi.java | 35 ----- .../core/internal/StringValidatorHandler.java | 8 +- .../config/IntegerConverterConfigAdapter.java | 46 ------ ...er.java => IntegerModelConfigAdapter.java} | 14 +- ...ter.java => StringModelConfigAdapter.java} | 22 +-- .../config/StringValidatorConfigAdapter.java | 80 ---------- .../src/main/moditect/module-info.java | 20 +-- ...me.engine.config.ConverterConfigAdapterSpi | 2 - ...untime.engine.config.ModelConfigAdapterSpi | 2 + ...me.engine.config.ValidatorConfigAdapterSpi | 2 - ...ntime.engine.converter.ConverterFactorySpi | 2 - ...zilla.runtime.engine.model.ModelFactorySpi | 2 + ...ntime.engine.validator.ValidatorFactorySpi | 2 - .../core/internal/IntegerConverterTest.java | 6 +- ...Test.java => IntegerModelFactoryTest.java} | 27 ++-- .../internal/IntegerValidatorFactoryTest.java | 52 ------- .../core/internal/IntegerValidatorTest.java | 8 +- .../core/internal/StringConverterTest.java | 20 +-- .../core/internal/StringEncodingTest.java | 2 +- ...yTest.java => StringModelFactoryTest.java} | 27 ++-- .../internal/StringValidatorFactoryTest.java | 52 ------- .../core/internal/StringValidatorTest.java | 17 ++- ...ava => IntegerModelConfigAdapterTest.java} | 10 +- .../IntegerValidatorConfigAdapterTest.java | 74 ---------- ...java => StringModelConfigAdapterTest.java} | 12 +- .../StringValidatorConfigAdapterTest.java | 97 ------------- .../json/config/JsonConverterConfig.java | 45 ------ .../config/JsonConverterConfigBuilder.java | 73 ---------- ...idatorConfig.java => JsonModelConfig.java} | 16 +- ...ilder.java => JsonModelConfigBuilder.java} | 20 +-- .../model/json/internal/JsonConverter.java | 45 ------ .../json/internal/JsonConverterContext.java | 48 ------ .../json/internal/JsonConverterHandler.java | 4 +- .../{JsonValidator.java => JsonModel.java} | 10 +- ...atorContext.java => JsonModelContext.java} | 34 +++-- ...ctorySpi.java => JsonModelFactorySpi.java} | 12 +- .../internal/JsonReadConverterHandler.java | 8 +- .../internal/JsonValidatorFactorySpi.java | 35 ----- .../json/internal/JsonValidatorHandler.java | 8 +- .../internal/JsonWriteConverterHandler.java | 8 +- ...apter.java => JsonModelConfigAdapter.java} | 16 +- .../config/JsonValidatorConfigAdapter.java | 103 ------------- .../src/main/moditect/module-info.java | 15 +- ...me.engine.config.ConverterConfigAdapterSpi | 1 - ...untime.engine.config.ModelConfigAdapterSpi | 1 + ...me.engine.config.ValidatorConfigAdapterSpi | 1 - ...ntime.engine.converter.ConverterFactorySpi | 1 - ...zilla.runtime.engine.model.ModelFactorySpi | 1 + ...ntime.engine.validator.ValidatorFactorySpi | 1 - .../internal/JsonConverterFactorySpiTest.java | 57 -------- .../json/internal/JsonConverterTest.java | 6 +- ...Test.java => JsonModelFactorySpiTest.java} | 25 ++-- .../json/internal/JsonValidatorTest.java | 10 +- ...t.java => JsonModelConfigAdapterTest.java} | 10 +- .../JsonValidatorConfigAdapterTest.java | 137 ------------------ ...erConfig.java => ProtobufModelConfig.java} | 16 +- ...r.java => ProtobufModelConfigBuilder.java} | 22 +-- .../internal/ProtobufConverterHandler.java | 4 +- ...tobufConverter.java => ProtobufModel.java} | 10 +- ...Context.java => ProtobufModelContext.java} | 24 +-- ...ySpi.java => ProtobufModelFactorySpi.java} | 12 +- .../ProtobufReadConverterHandler.java | 8 +- .../ProtobufWriteConverterHandler.java | 8 +- ...r.java => ProtobufModelConfigAdapter.java} | 16 +- .../src/main/moditect/module-info.java | 8 +- ...ntime.engine.config.ModelConfigAdapterSpi} | 2 +- ...ntime.engine.converter.ConverterFactorySpi | 1 - ...zilla.runtime.engine.model.ModelFactorySpi | 1 + ....java => ProtobufModelFactorySpiTest.java} | 26 ++-- ...verterTest.java => ProtobufModelTest.java} | 24 +-- ...va => ProtobufModelConfigAdapterTest.java} | 10 +- .../http/config/HttpOptionsConfig.java | 8 +- .../binding/http/config/HttpParamConfig.java | 8 +- .../http/config/HttpParamConfigBuilder.java | 18 +-- .../http/config/HttpRequestConfig.java | 6 +- .../http/config/HttpRequestConfigBuilder.java | 8 +- .../internal/config/HttpBindingConfig.java | 14 +- .../config/HttpRequestConfigAdapter.java | 32 ++-- .../http/internal/config/HttpRequestType.java | 12 +- .../internal/stream/HttpServerFactory.java | 8 +- .../config/HttpOptionsConfigAdapterTest.java | 24 +-- .../config/HttpRequestConfigAdapterTest.java | 24 +-- .../kafka/config/KafkaOptionsConfig.java | 2 +- .../kafka/config/KafkaTopicConfig.java | 10 +- .../internal/cache/KafkaCachePartition.java | 4 +- .../internal/config/KafkaBindingConfig.java | 10 +- .../config/KafkaTopicConfigAdapter.java | 10 +- .../KafkaCacheClientProduceFactory.java | 2 +- .../stream/KafkaCacheServerFetchFactory.java | 2 +- .../config/KafkaOptionsConfigAdapterTest.java | 6 +- .../mqtt/config/MqttOptionsConfig.java | 2 +- .../binding/mqtt/config/MqttTopicConfig.java | 6 +- .../mqtt/config/MqttTopicConfigBuilder.java | 8 +- .../internal/config/MqttBindingConfig.java | 6 +- .../config/MqttTopicConfigAdapter.java | 10 +- .../internal/stream/MqttServerFactory.java | 12 +- .../config/MqttOptionsConfigAdapterTest.java | 6 +- runtime/engine/pom.xml | 4 +- .../aklivity/zilla/runtime/engine/Engine.java | 11 +- .../zilla/runtime/engine/EngineBuilder.java | 26 +--- .../zilla/runtime/engine/EngineContext.java | 17 +-- .../engine/catalog/CatalogHandler.java | 2 +- .../engine/config/ConverterConfig.java | 38 ----- ...{ValidatorConfig.java => ModelConfig.java} | 6 +- ...igAdapter.java => ModelConfigAdapter.java} | 16 +- ...terSpi.java => ModelConfigAdapterSpi.java} | 6 +- .../runtime/engine/config/OptionsConfig.java | 11 +- .../engine/config/ValidatorConfigAdapter.java | 88 ----------- .../config/ValidatorConfigAdapterSpi.java | 33 ----- .../engine/converter/ConverterContext.java | 27 ---- .../registry/ConfigurationManager.java | 19 +-- .../registry/ConfigurationRegistry.java | 6 +- .../internal/registry/DispatchAgent.java | 61 +++----- .../internal/registry/NamespaceRegistry.java | 2 - .../ConverterHandler.java | 4 +- .../Converter.java => model/Model.java} | 6 +- .../runtime/engine/model/ModelContext.java} | 23 +-- .../ModelFactory.java} | 34 ++--- .../ModelFactorySpi.java} | 6 +- .../ValidatorHandler.java | 4 +- .../function/ValueConsumer.java | 2 +- .../runtime/engine/validator/Validator.java | 30 ---- .../engine/validator/ValidatorContext.java | 24 --- .../engine/validator/ValidatorFactory.java | 73 ---------- .../engine/validator/ValidatorFactorySpi.java | 26 ---- .../engine/src/main/moditect/module-info.java | 11 +- .../config/ValidatorConfigAdapterTest.java | 79 ---------- .../converter/ConverterFactoryTest.java | 50 ------- .../internal/model/ModelFactoryTest.java | 50 +++++++ .../ModelTest.java} | 18 +-- .../config/ModelConfigAdapterTest.java} | 16 +- .../engine/model/ModelFactoryTest.java | 71 +++++++++ .../ModelTest.java} | 28 +++- .../function/ValueConsumerTest.java | 2 +- .../test/internal/catalog/DecoderTest.java | 2 +- .../test/internal/catalog/EncoderTest.java | 2 +- .../converter/TestConverterContext.java | 50 ------- .../TestConverterHandler.java | 10 +- .../TestModel.java} | 12 +- .../test/internal/model/TestModelContext.java | 58 ++++++++ .../TestModelFactorySpi.java} | 12 +- .../TestValidatorHandler.java | 11 +- .../config/TestModelConfig.java} | 18 +-- .../config/TestModelConfigAdapter.java} | 14 +- .../config/TestModelConfigBuilder.java} | 26 ++-- .../internal/validator/TestValidator.java | 50 ------- .../validator/TestValidatorContext.java | 36 ----- .../validator/TestValidatorFactorySpi.java | 37 ----- .../validator/config/TestValidatorConfig.java | 43 ------ .../config/TestValidatorConfigAdapter.java | 56 ------- .../config/TestValidatorConfigBuilder.java | 54 ------- .../validator/ValidatorFactoryTest.java | 46 ------ ...me.engine.config.ConverterConfigAdapterSpi | 1 - ...untime.engine.config.ModelConfigAdapterSpi | 1 + ...me.engine.config.ValidatorConfigAdapterSpi | 1 - ...ntime.engine.converter.ConverterFactorySpi | 1 - ...zilla.runtime.engine.model.ModelFactorySpi | 1 + .../binding/kafka/config/SchemaTest.java | 2 +- .../specs/binding/mqtt/config/SchemaTest.java | 2 +- .../test.schema.patch.json | 0 .../zilla/specs/engine/config/SchemaTest.java | 2 +- 208 files changed, 1044 insertions(+), 3082 deletions(-) rename incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/config/{AvroConverterConfig.java => AvroModelConfig.java} (68%) rename incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/config/{AvroConverterConfigBuilder.java => AvroModelConfigBuilder.java} (70%) rename incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/internal/{AvroConverter.java => AvroModel.java} (79%) rename incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/internal/{AvroConverterContext.java => AvroModelContext.java} (58%) rename incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/internal/{AvroConverterFactorySpi.java => AvroModelFactorySpi.java} (75%) rename incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/internal/config/{AvroConverterConfigAdapter.java => AvroModelConfigAdapter.java} (86%) delete mode 100644 incubator/model-avro/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi create mode 100644 incubator/model-avro/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ModelConfigAdapterSpi delete mode 100644 incubator/model-avro/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.converter.ConverterFactorySpi create mode 100644 incubator/model-avro/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.model.ModelFactorySpi rename incubator/model-avro/src/test/java/io/aklivity/zilla/runtime/model/avro/internal/{AvroConverterFactorySpiTest.java => AvroModelFactorySpiTest.java} (59%) rename incubator/model-avro/src/test/java/io/aklivity/zilla/runtime/model/avro/internal/{AvroConverterTest.java => AvroModelTest.java} (95%) rename incubator/model-avro/src/test/java/io/aklivity/zilla/runtime/model/avro/internal/config/{AvroConverterConfigAdapterTest.java => AvroModelConfigAdapterTest.java} (93%) delete mode 100644 incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/config/IntegerConverterConfig.java rename incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/config/{IntegerValidatorConfig.java => IntegerModelConfig.java} (59%) rename incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/config/{IntegerConverterConfigBuilder.java => IntegerModelConfigBuilder.java} (66%) delete mode 100644 incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/config/IntegerValidatorConfigBuilder.java delete mode 100644 incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/config/StringConverterConfigBuilder.java rename incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/config/{StringConverterConfig.java => StringModelConfig.java} (65%) rename incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/config/{StringValidatorConfigBuilder.java => StringModelConfigBuilder.java} (67%) delete mode 100644 incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/config/StringValidatorConfig.java rename incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/{IntegerConverter.java => IntegerModel.java} (79%) rename incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/{IntegerConverterContext.java => IntegerModelContext.java} (51%) rename incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/{IntegerConverterFactorySpi.java => IntegerModelFactorySpi.java} (75%) delete mode 100644 incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/IntegerValidator.java delete mode 100644 incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/IntegerValidatorContext.java delete mode 100644 incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/IntegerValidatorFactorySpi.java rename incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/{StringConverter.java => StringModel.java} (79%) rename incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/{StringConverterContext.java => StringModelContext.java} (51%) rename incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/{StringConverterFactorySpi.java => StringModelFactorySpi.java} (78%) delete mode 100644 incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/StringValidator.java delete mode 100644 incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/StringValidatorContext.java delete mode 100644 incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/StringValidatorFactorySpi.java delete mode 100644 incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/config/IntegerConverterConfigAdapter.java rename incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/config/{IntegerValidatorConfigAdapter.java => IntegerModelConfigAdapter.java} (68%) rename incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/config/{StringConverterConfigAdapter.java => StringModelConfigAdapter.java} (73%) delete mode 100644 incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/config/StringValidatorConfigAdapter.java delete mode 100644 incubator/model-core/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi create mode 100644 incubator/model-core/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ModelConfigAdapterSpi delete mode 100644 incubator/model-core/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ValidatorConfigAdapterSpi delete mode 100644 incubator/model-core/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.converter.ConverterFactorySpi create mode 100644 incubator/model-core/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.model.ModelFactorySpi delete mode 100644 incubator/model-core/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.validator.ValidatorFactorySpi rename incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/{StringConverterFactoryTest.java => IntegerModelFactoryTest.java} (51%) delete mode 100644 incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/IntegerValidatorFactoryTest.java rename incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/{IntegerConverterFactoryTest.java => StringModelFactoryTest.java} (50%) delete mode 100644 incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/StringValidatorFactoryTest.java rename incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/config/{IntegerConverterConfigAdapterTest.java => IntegerModelConfigAdapterTest.java} (83%) delete mode 100644 incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/config/IntegerValidatorConfigAdapterTest.java rename incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/config/{StringConverterConfigAdapterTest.java => StringModelConfigAdapterTest.java} (84%) delete mode 100644 incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/config/StringValidatorConfigAdapterTest.java delete mode 100644 incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/config/JsonConverterConfig.java delete mode 100644 incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/config/JsonConverterConfigBuilder.java rename incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/config/{JsonValidatorConfig.java => JsonModelConfig.java} (66%) rename incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/config/{JsonValidatorConfigBuilder.java => JsonModelConfigBuilder.java} (71%) delete mode 100644 incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/JsonConverter.java delete mode 100644 incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/JsonConverterContext.java rename incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/{JsonValidator.java => JsonModel.java} (79%) rename incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/{JsonValidatorContext.java => JsonModelContext.java} (50%) rename incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/{JsonConverterFactorySpi.java => JsonModelFactorySpi.java} (75%) delete mode 100644 incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/JsonValidatorFactorySpi.java rename incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/config/{JsonConverterConfigAdapter.java => JsonModelConfigAdapter.java} (85%) delete mode 100644 incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/config/JsonValidatorConfigAdapter.java delete mode 100644 incubator/model-json/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi create mode 100644 incubator/model-json/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ModelConfigAdapterSpi delete mode 100644 incubator/model-json/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ValidatorConfigAdapterSpi delete mode 100644 incubator/model-json/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.converter.ConverterFactorySpi create mode 100644 incubator/model-json/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.model.ModelFactorySpi delete mode 100644 incubator/model-json/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.validator.ValidatorFactorySpi delete mode 100644 incubator/model-json/src/test/java/io/aklivity/zilla/runtime/model/json/internal/JsonConverterFactorySpiTest.java rename incubator/model-json/src/test/java/io/aklivity/zilla/runtime/model/json/internal/{JsonValidatorFactorySpiTest.java => JsonModelFactorySpiTest.java} (60%) rename incubator/model-json/src/test/java/io/aklivity/zilla/runtime/model/json/internal/config/{JsonConverterConfigAdapterTest.java => JsonModelConfigAdapterTest.java} (93%) delete mode 100644 incubator/model-json/src/test/java/io/aklivity/zilla/runtime/model/json/internal/config/JsonValidatorConfigAdapterTest.java rename incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/config/{ProtobufConverterConfig.java => ProtobufModelConfig.java} (67%) rename incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/config/{ProtobufConverterConfigBuilder.java => ProtobufModelConfigBuilder.java} (69%) rename incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/{ProtobufConverter.java => ProtobufModel.java} (79%) rename incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/{ProtobufConverterContext.java => ProtobufModelContext.java} (57%) rename incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/{ProtobufConverterFactorySpi.java => ProtobufModelFactorySpi.java} (75%) rename incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/config/{ProtobufConverterConfigAdapter.java => ProtobufModelConfigAdapter.java} (86%) rename incubator/model-protobuf/src/main/resources/META-INF/services/{io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi => io.aklivity.zilla.runtime.engine.config.ModelConfigAdapterSpi} (72%) delete mode 100644 incubator/model-protobuf/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.converter.ConverterFactorySpi create mode 100644 incubator/model-protobuf/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.model.ModelFactorySpi rename incubator/model-protobuf/src/test/java/io/aklivity/zilla/runtime/model/protobuf/internal/{ProtobufConverterFactorySpiTest.java => ProtobufModelFactorySpiTest.java} (58%) rename incubator/model-protobuf/src/test/java/io/aklivity/zilla/runtime/model/protobuf/internal/{ProtobufConverterTest.java => ProtobufModelTest.java} (94%) rename incubator/model-protobuf/src/test/java/io/aklivity/zilla/runtime/model/protobuf/internal/config/{ProtobufConverterConfigAdapterTest.java => ProtobufModelConfigAdapterTest.java} (92%) delete mode 100644 runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/config/ConverterConfig.java rename runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/config/{ValidatorConfig.java => ModelConfig.java} (91%) rename runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/config/{ConverterConfigAdapter.java => ModelConfigAdapter.java} (82%) rename runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/config/{ConverterConfigAdapterSpi.java => ModelConfigAdapterSpi.java} (84%) delete mode 100644 runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/config/ValidatorConfigAdapter.java delete mode 100644 runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/config/ValidatorConfigAdapterSpi.java delete mode 100644 runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/converter/ConverterContext.java rename runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/{converter => model}/ConverterHandler.java (89%) rename runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/{converter/Converter.java => model/Model.java} (87%) rename runtime/engine/src/{test/java/io/aklivity/zilla/runtime/engine/converter/ConverterTest.java => main/java/io/aklivity/zilla/runtime/engine/model/ModelContext.java} (61%) rename runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/{converter/ConverterFactory.java => model/ModelFactory.java} (57%) rename runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/{converter/ConverterFactorySpi.java => model/ModelFactorySpi.java} (87%) rename runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/{validator => model}/ValidatorHandler.java (89%) rename runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/{converter => model}/function/ValueConsumer.java (93%) delete mode 100644 runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/validator/Validator.java delete mode 100644 runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/validator/ValidatorContext.java delete mode 100644 runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/validator/ValidatorFactory.java delete mode 100644 runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/validator/ValidatorFactorySpi.java delete mode 100644 runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/internal/config/ValidatorConfigAdapterTest.java delete mode 100644 runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/internal/converter/ConverterFactoryTest.java create mode 100644 runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/internal/model/ModelFactoryTest.java rename runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/internal/{converter/ConverterTest.java => model/ModelTest.java} (73%) rename runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/internal/{converter/config/ConverterConfigAdapterTest.java => model/config/ModelConfigAdapterTest.java} (76%) create mode 100644 runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/model/ModelFactoryTest.java rename runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/{validator/ValidatorTest.java => model/ModelTest.java} (52%) rename runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/{converter => model}/function/ValueConsumerTest.java (95%) delete mode 100644 runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/converter/TestConverterContext.java rename runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/{converter => model}/TestConverterHandler.java (86%) rename runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/{converter/TestConverter.java => model/TestModel.java} (75%) create mode 100644 runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/model/TestModelContext.java rename runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/{converter/TestConverterFactorySpi.java => model/TestModelFactorySpi.java} (74%) rename runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/{validator => model}/TestValidatorHandler.java (78%) rename runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/{converter/config/TestConverterConfig.java => model/config/TestModelConfig.java} (65%) rename runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/{converter/config/TestConverterConfigAdapter.java => model/config/TestModelConfigAdapter.java} (85%) rename runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/{converter/config/TestConverterConfigBuilder.java => model/config/TestModelConfigBuilder.java} (66%) delete mode 100644 runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/validator/TestValidator.java delete mode 100644 runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/validator/TestValidatorContext.java delete mode 100644 runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/validator/TestValidatorFactorySpi.java delete mode 100644 runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/validator/config/TestValidatorConfig.java delete mode 100644 runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/validator/config/TestValidatorConfigAdapter.java delete mode 100644 runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/validator/config/TestValidatorConfigBuilder.java delete mode 100644 runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/validator/ValidatorFactoryTest.java delete mode 100644 runtime/engine/src/test/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi create mode 100644 runtime/engine/src/test/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ModelConfigAdapterSpi delete mode 100644 runtime/engine/src/test/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ValidatorConfigAdapterSpi delete mode 100644 runtime/engine/src/test/resources/META-INF/services/io.aklivity.zilla.runtime.engine.converter.ConverterFactorySpi create mode 100644 runtime/engine/src/test/resources/META-INF/services/io.aklivity.zilla.runtime.engine.model.ModelFactorySpi rename specs/engine.spec/src/main/scripts/io/aklivity/zilla/specs/engine/schema/{converter => model}/test.schema.patch.json (100%) diff --git a/incubator/catalog-inline/src/test/java/io/aklivity/zilla/runtime/catalog/inline/internal/InlineIT.java b/incubator/catalog-inline/src/test/java/io/aklivity/zilla/runtime/catalog/inline/internal/InlineIT.java index 0a3e4f29a8..b979d6281b 100644 --- a/incubator/catalog-inline/src/test/java/io/aklivity/zilla/runtime/catalog/inline/internal/InlineIT.java +++ b/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 { diff --git a/incubator/catalog-schema-registry/src/main/java/io/aklivity/zilla/runtime/catalog/schema/registry/internal/SchemaRegistryCatalogHandler.java b/incubator/catalog-schema-registry/src/main/java/io/aklivity/zilla/runtime/catalog/schema/registry/internal/SchemaRegistryCatalogHandler.java index 577fb1565e..55cd2f789a 100644 --- a/incubator/catalog-schema-registry/src/main/java/io/aklivity/zilla/runtime/catalog/schema/registry/internal/SchemaRegistryCatalogHandler.java +++ b/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 { diff --git a/incubator/catalog-schema-registry/src/test/java/io/aklivity/zilla/runtime/catalog/schema/registry/internal/SchemaRegistryIT.java b/incubator/catalog-schema-registry/src/test/java/io/aklivity/zilla/runtime/catalog/schema/registry/internal/SchemaRegistryIT.java index 62d9390439..f65af539c1 100644 --- a/incubator/catalog-schema-registry/src/test/java/io/aklivity/zilla/runtime/catalog/schema/registry/internal/SchemaRegistryIT.java +++ b/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 { diff --git a/incubator/command-generate/src/main/java/io/aklivity/zilla/runtime/command/generate/internal/airline/ConfigGenerator.java b/incubator/command-generate/src/main/java/io/aklivity/zilla/runtime/command/generate/internal/airline/ConfigGenerator.java index a04a89caca..caf0718114 100644 --- a/incubator/command-generate/src/main/java/io/aklivity/zilla/runtime/command/generate/internal/airline/ConfigGenerator.java +++ b/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.model.core.config.IntegerValidatorConfig; -import io.aklivity.zilla.runtime.model.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 validators = Map.of( - "string", StringValidatorConfig.builder().build(), - "integer", IntegerValidatorConfig.builder().build() + protected final Map models = Map.of( + "string", StringModelConfig.builder().build(), + "integer", IntegerModelConfig.builder().build() ); protected final Matcher jsonContentType = JSON_CONTENT_TYPE.matcher(""); diff --git a/incubator/command-generate/src/main/java/io/aklivity/zilla/runtime/command/generate/internal/asyncapi/http/proxy/AsyncApiHttpProxyConfigGenerator.java b/incubator/command-generate/src/main/java/io/aklivity/zilla/runtime/command/generate/internal/asyncapi/http/proxy/AsyncApiHttpProxyConfigGenerator.java index 1235bf21af..5f813ca033 100644 --- a/incubator/command-generate/src/main/java/io/aklivity/zilla/runtime/command/generate/internal/asyncapi/http/proxy/AsyncApiHttpProxyConfigGenerator.java +++ b/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.model.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 HttpRequestConfigBuilder 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 HttpRequestConfigBuilder 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(); } } diff --git a/incubator/command-generate/src/main/java/io/aklivity/zilla/runtime/command/generate/internal/asyncapi/mqtt/proxy/AsyncApiMqttProxyConfigGenerator.java b/incubator/command-generate/src/main/java/io/aklivity/zilla/runtime/command/generate/internal/asyncapi/mqtt/proxy/AsyncApiMqttProxyConfigGenerator.java index 469ed2e2c5..50e9071efd 100644 --- a/incubator/command-generate/src/main/java/io/aklivity/zilla/runtime/command/generate/internal/asyncapi/mqtt/proxy/AsyncApiMqttProxyConfigGenerator.java +++ b/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.model.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> 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)) diff --git a/incubator/command-generate/src/main/java/io/aklivity/zilla/runtime/command/generate/internal/openapi/http/proxy/OpenApiHttpProxyConfigGenerator.java b/incubator/command-generate/src/main/java/io/aklivity/zilla/runtime/command/generate/internal/openapi/http/proxy/OpenApiHttpProxyConfigGenerator.java index e0ec866c3a..6a52f3472b 100644 --- a/incubator/command-generate/src/main/java/io/aklivity/zilla/runtime/command/generate/internal/openapi/http/proxy/OpenApiHttpProxyConfigGenerator.java +++ b/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.model.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 HttpRequestConfigBuilder injectContent( if (schema != null) { request. - content(JsonValidatorConfig::builder) + content(JsonModelConfig::builder) .catalog() .name(INLINE_CATALOG_NAME) .schema() @@ -349,8 +349,8 @@ private HttpRequestConfigBuilder 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) { @@ -358,21 +358,21 @@ private HttpRequestConfigBuilder injectParams( 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; } diff --git a/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/config/AvroConverterConfig.java b/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/config/AvroModelConfig.java similarity index 68% rename from incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/config/AvroConverterConfig.java rename to incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/config/AvroModelConfig.java index 43985b55c6..8ae75b4106 100644 --- a/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/config/AvroConverterConfig.java +++ b/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/config/AvroModelConfig.java @@ -18,14 +18,14 @@ import java.util.function.Function; import io.aklivity.zilla.runtime.engine.config.CatalogedConfig; -import io.aklivity.zilla.runtime.engine.config.ConverterConfig; +import io.aklivity.zilla.runtime.engine.config.ModelConfig; -public final class AvroConverterConfig extends ConverterConfig +public final class AvroModelConfig extends ModelConfig { public final String subject; public final String format; - public AvroConverterConfig( + public AvroModelConfig( List cataloged, String subject, String format) @@ -35,14 +35,14 @@ public AvroConverterConfig( this.format = format; } - public static AvroConverterConfigBuilder builder( - Function mapper) + public static AvroModelConfigBuilder builder( + Function mapper) { - return new AvroConverterConfigBuilder<>(mapper::apply); + return new AvroModelConfigBuilder<>(mapper::apply); } - public static AvroConverterConfigBuilder builder() + public static AvroModelConfigBuilder builder() { - return new AvroConverterConfigBuilder<>(AvroConverterConfig.class::cast); + return new AvroModelConfigBuilder<>(AvroModelConfig.class::cast); } } diff --git a/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/config/AvroConverterConfigBuilder.java b/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/config/AvroModelConfigBuilder.java similarity index 70% rename from incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/config/AvroConverterConfigBuilder.java rename to incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/config/AvroModelConfigBuilder.java index 4910d54af7..c931cb67ac 100644 --- a/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/config/AvroConverterConfigBuilder.java +++ b/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/config/AvroModelConfigBuilder.java @@ -22,47 +22,47 @@ import io.aklivity.zilla.runtime.engine.config.CatalogedConfigBuilder; import io.aklivity.zilla.runtime.engine.config.ConfigBuilder; -public class AvroConverterConfigBuilder extends ConfigBuilder> +public class AvroModelConfigBuilder extends ConfigBuilder> { - private final Function mapper; + private final Function mapper; private List catalogs; private String subject; private String format; - AvroConverterConfigBuilder( - Function mapper) + AvroModelConfigBuilder( + Function mapper) { this.mapper = mapper; } @Override @SuppressWarnings("unchecked") - protected Class> thisType() + protected Class> thisType() { - return (Class>) getClass(); + return (Class>) getClass(); } - public AvroConverterConfigBuilder subject( + public AvroModelConfigBuilder subject( String subject) { this.subject = subject; return this; } - public AvroConverterConfigBuilder format( + public AvroModelConfigBuilder format( String format) { this.format = format; return this; } - public CatalogedConfigBuilder> catalog() + public CatalogedConfigBuilder> catalog() { return CatalogedConfig.builder(this::catalog); } - public AvroConverterConfigBuilder catalog( + public AvroModelConfigBuilder catalog( CatalogedConfig catalog) { if (catalogs == null) @@ -76,6 +76,6 @@ public AvroConverterConfigBuilder catalog( @Override public T build() { - return mapper.apply(new AvroConverterConfig(catalogs, subject, format)); + return mapper.apply(new AvroModelConfig(catalogs, subject, format)); } } diff --git a/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/internal/AvroConverterHandler.java b/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/internal/AvroConverterHandler.java index f34820e341..343e7b081c 100644 --- a/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/internal/AvroConverterHandler.java +++ b/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/internal/AvroConverterHandler.java @@ -41,7 +41,7 @@ import io.aklivity.zilla.runtime.engine.catalog.CatalogHandler; import io.aklivity.zilla.runtime.engine.config.CatalogedConfig; import io.aklivity.zilla.runtime.engine.config.SchemaConfig; -import io.aklivity.zilla.runtime.model.avro.config.AvroConverterConfig; +import io.aklivity.zilla.runtime.model.avro.config.AvroModelConfig; public abstract class AvroConverterHandler { @@ -69,7 +69,7 @@ public abstract class AvroConverterHandler private final Int2IntHashMap paddings; protected AvroConverterHandler( - AvroConverterConfig config, + AvroModelConfig config, LongFunction supplyCatalog) { this.decoderFactory = DecoderFactory.get(); diff --git a/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/internal/AvroConverter.java b/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/internal/AvroModel.java similarity index 79% rename from incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/internal/AvroConverter.java rename to incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/internal/AvroModel.java index 67e4a6822f..4f7fb5f910 100644 --- a/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/internal/AvroConverter.java +++ b/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/internal/AvroModel.java @@ -17,10 +17,10 @@ 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; +import io.aklivity.zilla.runtime.engine.model.Model; +import io.aklivity.zilla.runtime.engine.model.ModelContext; -public class AvroConverter implements Converter +public class AvroModel implements Model { public static final String NAME = "avro"; @@ -31,10 +31,10 @@ public String name() } @Override - public ConverterContext supply( + public ModelContext supply( EngineContext context) { - return new AvroConverterContext(context); + return new AvroModelContext(context); } @Override diff --git a/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/internal/AvroConverterContext.java b/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/internal/AvroModelContext.java similarity index 58% rename from incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/internal/AvroConverterContext.java rename to incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/internal/AvroModelContext.java index 82beef7943..fa4a25232c 100644 --- a/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/internal/AvroConverterContext.java +++ b/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/internal/AvroModelContext.java @@ -18,32 +18,32 @@ 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.model.avro.config.AvroConverterConfig; +import io.aklivity.zilla.runtime.engine.config.ModelConfig; +import io.aklivity.zilla.runtime.engine.model.ConverterHandler; +import io.aklivity.zilla.runtime.engine.model.ModelContext; +import io.aklivity.zilla.runtime.model.avro.config.AvroModelConfig; -public class AvroConverterContext implements ConverterContext +public class AvroModelContext implements ModelContext { private final LongFunction supplyCatalog; - public AvroConverterContext( + public AvroModelContext( EngineContext context) { this.supplyCatalog = context::supplyCatalog; } @Override - public ConverterHandler supplyReadHandler( - ConverterConfig config) + public ConverterHandler supplyReadConverterHandler( + ModelConfig config) { - return new AvroReadConverterHandler(AvroConverterConfig.class.cast(config), supplyCatalog); + return new AvroReadConverterHandler(AvroModelConfig.class.cast(config), supplyCatalog); } @Override - public ConverterHandler supplyWriteHandler( - ConverterConfig config) + public ConverterHandler supplyWriteConverterHandler( + ModelConfig config) { - return new AvroWriteConverterHandler(AvroConverterConfig.class.cast(config), supplyCatalog); + return new AvroWriteConverterHandler(AvroModelConfig.class.cast(config), supplyCatalog); } } diff --git a/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/internal/AvroConverterFactorySpi.java b/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/internal/AvroModelFactorySpi.java similarity index 75% rename from incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/internal/AvroConverterFactorySpi.java rename to incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/internal/AvroModelFactorySpi.java index f2a11e3834..2486e7cec9 100644 --- a/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/internal/AvroConverterFactorySpi.java +++ b/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/internal/AvroModelFactorySpi.java @@ -17,15 +17,15 @@ import java.net.URL; 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.engine.model.Model; +import io.aklivity.zilla.runtime.engine.model.ModelFactorySpi; -public final class AvroConverterFactorySpi implements ConverterFactorySpi +public final class AvroModelFactorySpi implements ModelFactorySpi { @Override public String type() { - return AvroConverter.NAME; + return AvroModel.NAME; } public URL schema() @@ -34,9 +34,9 @@ public URL schema() } @Override - public Converter create( + public Model create( Configuration config) { - return new AvroConverter(); + return new AvroModel(); } } diff --git a/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/internal/AvroReadConverterHandler.java b/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/internal/AvroReadConverterHandler.java index 8fbb762092..2c86a8f891 100644 --- a/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/internal/AvroReadConverterHandler.java +++ b/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/internal/AvroReadConverterHandler.java @@ -28,14 +28,14 @@ import org.apache.avro.io.JsonEncoder; import io.aklivity.zilla.runtime.engine.catalog.CatalogHandler; -import io.aklivity.zilla.runtime.engine.converter.ConverterHandler; -import io.aklivity.zilla.runtime.engine.converter.function.ValueConsumer; -import io.aklivity.zilla.runtime.model.avro.config.AvroConverterConfig; +import io.aklivity.zilla.runtime.engine.model.ConverterHandler; +import io.aklivity.zilla.runtime.engine.model.function.ValueConsumer; +import io.aklivity.zilla.runtime.model.avro.config.AvroModelConfig; public class AvroReadConverterHandler extends AvroConverterHandler implements ConverterHandler { public AvroReadConverterHandler( - AvroConverterConfig config, + AvroModelConfig config, LongFunction supplyCatalog) { super(config, supplyCatalog); diff --git a/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/internal/AvroWriteConverterHandler.java b/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/internal/AvroWriteConverterHandler.java index ed1fb8413a..e49d51608f 100644 --- a/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/internal/AvroWriteConverterHandler.java +++ b/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/internal/AvroWriteConverterHandler.java @@ -25,14 +25,14 @@ import org.apache.avro.generic.GenericRecord; import io.aklivity.zilla.runtime.engine.catalog.CatalogHandler; -import io.aklivity.zilla.runtime.engine.converter.ConverterHandler; -import io.aklivity.zilla.runtime.engine.converter.function.ValueConsumer; -import io.aklivity.zilla.runtime.model.avro.config.AvroConverterConfig; +import io.aklivity.zilla.runtime.engine.model.ConverterHandler; +import io.aklivity.zilla.runtime.engine.model.function.ValueConsumer; +import io.aklivity.zilla.runtime.model.avro.config.AvroModelConfig; public class AvroWriteConverterHandler extends AvroConverterHandler implements ConverterHandler { public AvroWriteConverterHandler( - AvroConverterConfig config, + AvroModelConfig config, LongFunction supplyCatalog) { super(config, supplyCatalog); diff --git a/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/internal/config/AvroConverterConfigAdapter.java b/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/internal/config/AvroModelConfigAdapter.java similarity index 86% rename from incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/internal/config/AvroConverterConfigAdapter.java rename to incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/internal/config/AvroModelConfigAdapter.java index f4cd2c89f5..9ef6bf61ff 100644 --- a/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/internal/config/AvroConverterConfigAdapter.java +++ b/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/internal/config/AvroModelConfigAdapter.java @@ -26,13 +26,13 @@ import jakarta.json.bind.adapter.JsonbAdapter; import io.aklivity.zilla.runtime.engine.config.CatalogedConfig; -import io.aklivity.zilla.runtime.engine.config.ConverterConfig; -import io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi; +import io.aklivity.zilla.runtime.engine.config.ModelConfig; +import io.aklivity.zilla.runtime.engine.config.ModelConfigAdapterSpi; import io.aklivity.zilla.runtime.engine.config.SchemaConfig; import io.aklivity.zilla.runtime.engine.config.SchemaConfigAdapter; -import io.aklivity.zilla.runtime.model.avro.config.AvroConverterConfig; +import io.aklivity.zilla.runtime.model.avro.config.AvroModelConfig; -public final class AvroConverterConfigAdapter implements ConverterConfigAdapterSpi, JsonbAdapter +public final class AvroModelConfigAdapter implements ModelConfigAdapterSpi, JsonbAdapter { private static final String AVRO = "avro"; private static final String TYPE_NAME = "type"; @@ -50,9 +50,9 @@ public String type() @Override public JsonValue adaptToJson( - ConverterConfig config) + ModelConfig config) { - AvroConverterConfig converterConfig = (AvroConverterConfig) config; + AvroModelConfig converterConfig = (AvroModelConfig) config; JsonObjectBuilder converter = Json.createObjectBuilder(); if (converterConfig.format != null) @@ -79,7 +79,7 @@ public JsonValue adaptToJson( } @Override - public ConverterConfig adaptFromJson( + public ModelConfig adaptFromJson( JsonValue value) { JsonObject object = (JsonObject) value; @@ -109,6 +109,6 @@ public ConverterConfig adaptFromJson( ? object.getString(FORMAT) : null; - return new AvroConverterConfig(catalogs, subject, expect); + return new AvroModelConfig(catalogs, subject, expect); } } diff --git a/incubator/model-avro/src/main/moditect/module-info.java b/incubator/model-avro/src/main/moditect/module-info.java index 367b2d557e..1bae61c43e 100644 --- a/incubator/model-avro/src/main/moditect/module-info.java +++ b/incubator/model-avro/src/main/moditect/module-info.java @@ -24,9 +24,9 @@ uses io.aklivity.zilla.runtime.model.avro.internal.avro.Conversion; uses io.aklivity.zilla.runtime.model.avro.internal.avro.LogicalTypes$LogicalTypeFactory; - provides io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi - with io.aklivity.zilla.runtime.model.avro.internal.config.AvroConverterConfigAdapter; + provides io.aklivity.zilla.runtime.engine.config.ModelConfigAdapterSpi + with io.aklivity.zilla.runtime.model.avro.internal.config.AvroModelConfigAdapter; - provides io.aklivity.zilla.runtime.engine.converter.ConverterFactorySpi - with io.aklivity.zilla.runtime.model.avro.internal.AvroConverterFactorySpi; + provides io.aklivity.zilla.runtime.engine.model.ModelFactorySpi + with io.aklivity.zilla.runtime.model.avro.internal.AvroModelFactorySpi; } diff --git a/incubator/model-avro/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi b/incubator/model-avro/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi deleted file mode 100644 index d3e788a455..0000000000 --- a/incubator/model-avro/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi +++ /dev/null @@ -1 +0,0 @@ -io.aklivity.zilla.runtime.model.avro.internal.config.AvroConverterConfigAdapter diff --git a/incubator/model-avro/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ModelConfigAdapterSpi b/incubator/model-avro/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ModelConfigAdapterSpi new file mode 100644 index 0000000000..4bab78031f --- /dev/null +++ b/incubator/model-avro/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ModelConfigAdapterSpi @@ -0,0 +1 @@ +io.aklivity.zilla.runtime.model.avro.internal.config.AvroModelConfigAdapter diff --git a/incubator/model-avro/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.converter.ConverterFactorySpi b/incubator/model-avro/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.converter.ConverterFactorySpi deleted file mode 100644 index 6994352827..0000000000 --- a/incubator/model-avro/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.converter.ConverterFactorySpi +++ /dev/null @@ -1 +0,0 @@ -io.aklivity.zilla.runtime.model.avro.internal.AvroConverterFactorySpi diff --git a/incubator/model-avro/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.model.ModelFactorySpi b/incubator/model-avro/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.model.ModelFactorySpi new file mode 100644 index 0000000000..2e6820134a --- /dev/null +++ b/incubator/model-avro/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.model.ModelFactorySpi @@ -0,0 +1 @@ +io.aklivity.zilla.runtime.model.avro.internal.AvroModelFactorySpi diff --git a/incubator/model-avro/src/test/java/io/aklivity/zilla/runtime/model/avro/internal/AvroConverterFactorySpiTest.java b/incubator/model-avro/src/test/java/io/aklivity/zilla/runtime/model/avro/internal/AvroModelFactorySpiTest.java similarity index 59% rename from incubator/model-avro/src/test/java/io/aklivity/zilla/runtime/model/avro/internal/AvroConverterFactorySpiTest.java rename to incubator/model-avro/src/test/java/io/aklivity/zilla/runtime/model/avro/internal/AvroModelFactorySpiTest.java index 9083126e2f..86ff4bad04 100644 --- a/incubator/model-avro/src/test/java/io/aklivity/zilla/runtime/model/avro/internal/AvroConverterFactorySpiTest.java +++ b/incubator/model-avro/src/test/java/io/aklivity/zilla/runtime/model/avro/internal/AvroModelFactorySpiTest.java @@ -22,24 +22,24 @@ import io.aklivity.zilla.runtime.engine.Configuration; import io.aklivity.zilla.runtime.engine.EngineContext; -import io.aklivity.zilla.runtime.engine.config.ConverterConfig; -import io.aklivity.zilla.runtime.engine.converter.Converter; -import io.aklivity.zilla.runtime.engine.converter.ConverterContext; -import io.aklivity.zilla.runtime.engine.converter.ConverterFactory; -import io.aklivity.zilla.runtime.model.avro.config.AvroConverterConfig; +import io.aklivity.zilla.runtime.engine.config.ModelConfig; +import io.aklivity.zilla.runtime.engine.model.Model; +import io.aklivity.zilla.runtime.engine.model.ModelContext; +import io.aklivity.zilla.runtime.engine.model.ModelFactory; +import io.aklivity.zilla.runtime.model.avro.config.AvroModelConfig; -public class AvroConverterFactorySpiTest +public class AvroModelFactorySpiTest { @Test public void shouldCreateReader() { Configuration config = new Configuration(); - ConverterFactory factory = ConverterFactory.instantiate(); - Converter converter = factory.create("avro", config); + ModelFactory factory = ModelFactory.instantiate(); + Model model = factory.create("avro", config); - ConverterContext context = new AvroConverterContext(mock(EngineContext.class)); + ModelContext context = new AvroModelContext(mock(EngineContext.class)); - ConverterConfig converterConfig = AvroConverterConfig.builder() + ModelConfig modelConfig = AvroModelConfig.builder() .subject("test-value") .catalog() .name("test0") @@ -50,8 +50,8 @@ public void shouldCreateReader() .build() .build(); - assertThat(converter, instanceOf(AvroConverter.class)); - assertThat(context.supplyReadHandler(converterConfig), instanceOf(AvroConverterHandler.class)); - assertThat(context.supplyWriteHandler(converterConfig), instanceOf(AvroConverterHandler.class)); + assertThat(model, instanceOf(AvroModel.class)); + assertThat(context.supplyReadConverterHandler(modelConfig), instanceOf(AvroConverterHandler.class)); + assertThat(context.supplyWriteConverterHandler(modelConfig), instanceOf(AvroConverterHandler.class)); } } diff --git a/incubator/model-avro/src/test/java/io/aklivity/zilla/runtime/model/avro/internal/AvroConverterTest.java b/incubator/model-avro/src/test/java/io/aklivity/zilla/runtime/model/avro/internal/AvroModelTest.java similarity index 95% rename from incubator/model-avro/src/test/java/io/aklivity/zilla/runtime/model/avro/internal/AvroConverterTest.java rename to incubator/model-avro/src/test/java/io/aklivity/zilla/runtime/model/avro/internal/AvroModelTest.java index 72f85444fb..765da64d1a 100644 --- a/incubator/model-avro/src/test/java/io/aklivity/zilla/runtime/model/avro/internal/AvroConverterTest.java +++ b/incubator/model-avro/src/test/java/io/aklivity/zilla/runtime/model/avro/internal/AvroModelTest.java @@ -32,18 +32,18 @@ import io.aklivity.zilla.runtime.engine.catalog.CatalogContext; import io.aklivity.zilla.runtime.engine.catalog.CatalogHandler; import io.aklivity.zilla.runtime.engine.config.CatalogConfig; -import io.aklivity.zilla.runtime.engine.converter.function.ValueConsumer; +import io.aklivity.zilla.runtime.engine.model.function.ValueConsumer; import io.aklivity.zilla.runtime.engine.test.internal.catalog.TestCatalog; import io.aklivity.zilla.runtime.engine.test.internal.catalog.config.TestCatalogOptionsConfig; -import io.aklivity.zilla.runtime.model.avro.config.AvroConverterConfig; +import io.aklivity.zilla.runtime.model.avro.config.AvroModelConfig; -public class AvroConverterTest +public class AvroModelTest { private static final String SCHEMA = "{\"fields\":[{\"name\":\"id\",\"type\":\"string\"}," + "{\"name\":\"status\",\"type\":\"string\"}]," + "\"name\":\"Event\",\"namespace\":\"io.aklivity.example\",\"type\":\"record\"}"; - private final AvroConverterConfig avroConfig = AvroConverterConfig.builder() + private final AvroModelConfig avroConfig = AvroModelConfig.builder() .catalog() .name("test0") .schema() @@ -130,7 +130,7 @@ public void shouldReadAvroEventExpectJson() .schema(SCHEMA) .build()); LongFunction handler = value -> context.attach(catalogConfig); - AvroConverterConfig config = AvroConverterConfig.builder() + AvroModelConfig config = AvroModelConfig.builder() .format("json") .catalog() .name("test0") @@ -173,7 +173,7 @@ public void shouldWriteJsonEventExpectAvro() .schema(SCHEMA) .build()); LongFunction handler = value -> context.attach(catalogConfig); - AvroConverterConfig config = AvroConverterConfig.builder() + AvroModelConfig config = AvroModelConfig.builder() .format("json") .catalog() .name("test0") @@ -215,7 +215,7 @@ public void shouldVerifyPaddingLength() .schema(SCHEMA) .build()); LongFunction handler = value -> context.attach(catalogConfig); - AvroConverterConfig config = AvroConverterConfig.builder() + AvroModelConfig config = AvroModelConfig.builder() .format("json") .catalog() .name("test0") diff --git a/incubator/model-avro/src/test/java/io/aklivity/zilla/runtime/model/avro/internal/config/AvroConverterConfigAdapterTest.java b/incubator/model-avro/src/test/java/io/aklivity/zilla/runtime/model/avro/internal/config/AvroModelConfigAdapterTest.java similarity index 93% rename from incubator/model-avro/src/test/java/io/aklivity/zilla/runtime/model/avro/internal/config/AvroConverterConfigAdapterTest.java rename to incubator/model-avro/src/test/java/io/aklivity/zilla/runtime/model/avro/internal/config/AvroModelConfigAdapterTest.java index 3c500099a8..ba97c65f1e 100644 --- a/incubator/model-avro/src/test/java/io/aklivity/zilla/runtime/model/avro/internal/config/AvroConverterConfigAdapterTest.java +++ b/incubator/model-avro/src/test/java/io/aklivity/zilla/runtime/model/avro/internal/config/AvroModelConfigAdapterTest.java @@ -26,9 +26,9 @@ import org.junit.Before; import org.junit.Test; -import io.aklivity.zilla.runtime.model.avro.config.AvroConverterConfig; +import io.aklivity.zilla.runtime.model.avro.config.AvroModelConfig; -public class AvroConverterConfigAdapterTest +public class AvroModelConfigAdapterTest { private Jsonb jsonb; @@ -36,7 +36,7 @@ public class AvroConverterConfigAdapterTest public void initJson() { JsonbConfig config = new JsonbConfig() - .withAdapters(new AvroConverterConfigAdapter()); + .withAdapters(new AvroModelConfigAdapter()); jsonb = JsonbBuilder.create(config); } @@ -68,7 +68,7 @@ public void shouldReadAvroconverter() "}"; // WHEN - AvroConverterConfig converter = jsonb.fromJson(json, AvroConverterConfig.class); + AvroModelConfig converter = jsonb.fromJson(json, AvroModelConfig.class); // THEN assertThat(converter, not(nullValue())); @@ -114,7 +114,7 @@ public void shouldWriteAvroconverter() "]" + "}" + "}"; - AvroConverterConfig converter = AvroConverterConfig.builder() + AvroModelConfig converter = AvroModelConfig.builder() .format("json") .catalog() .name("test0") diff --git a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/config/IntegerConverterConfig.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/config/IntegerConverterConfig.java deleted file mode 100644 index 4651a5ba41..0000000000 --- a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/config/IntegerConverterConfig.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * 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.model.core.config; - -import java.util.function.Function; - -import io.aklivity.zilla.runtime.engine.config.ConverterConfig; - -public class IntegerConverterConfig extends ConverterConfig -{ - public IntegerConverterConfig() - { - super("integer"); - } - - public static IntegerConverterConfigBuilder builder( - Function mapper) - { - return new IntegerConverterConfigBuilder<>(mapper::apply); - } - - public static IntegerConverterConfigBuilder builder() - { - return new IntegerConverterConfigBuilder<>(IntegerConverterConfig.class::cast); - } -} diff --git a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/config/IntegerValidatorConfig.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/config/IntegerModelConfig.java similarity index 59% rename from incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/config/IntegerValidatorConfig.java rename to incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/config/IntegerModelConfig.java index f72976b894..436a1f59ca 100644 --- a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/config/IntegerValidatorConfig.java +++ b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/config/IntegerModelConfig.java @@ -16,23 +16,23 @@ import java.util.function.Function; -import io.aklivity.zilla.runtime.engine.config.ValidatorConfig; +import io.aklivity.zilla.runtime.engine.config.ModelConfig; -public class IntegerValidatorConfig extends ValidatorConfig +public class IntegerModelConfig extends ModelConfig { - public IntegerValidatorConfig() + public IntegerModelConfig() { super("integer"); } - public static IntegerValidatorConfigBuilder builder( - Function mapper) + public static IntegerModelConfigBuilder builder( + Function mapper) { - return new IntegerValidatorConfigBuilder<>(mapper::apply); + return new IntegerModelConfigBuilder<>(mapper::apply); } - public static IntegerValidatorConfigBuilder builder() + public static IntegerModelConfigBuilder builder() { - return new IntegerValidatorConfigBuilder<>(IntegerValidatorConfig.class::cast); + return new IntegerModelConfigBuilder<>(IntegerModelConfig.class::cast); } } diff --git a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/config/IntegerConverterConfigBuilder.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/config/IntegerModelConfigBuilder.java similarity index 66% rename from incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/config/IntegerConverterConfigBuilder.java rename to incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/config/IntegerModelConfigBuilder.java index fb5db05cd2..35f5061aec 100644 --- a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/config/IntegerConverterConfigBuilder.java +++ b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/config/IntegerModelConfigBuilder.java @@ -18,26 +18,26 @@ import io.aklivity.zilla.runtime.engine.config.ConfigBuilder; -public class IntegerConverterConfigBuilder extends ConfigBuilder> +public class IntegerModelConfigBuilder extends ConfigBuilder> { - private final Function mapper; + private final Function mapper; - IntegerConverterConfigBuilder( - Function mapper) + IntegerModelConfigBuilder( + Function mapper) { this.mapper = mapper; } @Override @SuppressWarnings("unchecked") - protected Class> thisType() + protected Class> thisType() { - return (Class>) getClass(); + return (Class>) getClass(); } @Override public T build() { - return mapper.apply(new IntegerConverterConfig()); + return mapper.apply(new IntegerModelConfig()); } } diff --git a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/config/IntegerValidatorConfigBuilder.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/config/IntegerValidatorConfigBuilder.java deleted file mode 100644 index a60a8669d6..0000000000 --- a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/config/IntegerValidatorConfigBuilder.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * 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.model.core.config; - -import java.util.function.Function; - -import io.aklivity.zilla.runtime.engine.config.ConfigBuilder; - -public class IntegerValidatorConfigBuilder extends ConfigBuilder> -{ - private final Function mapper; - - IntegerValidatorConfigBuilder( - Function mapper) - { - this.mapper = mapper; - } - - @Override - @SuppressWarnings("unchecked") - protected Class> thisType() - { - return (Class>) getClass(); - } - - @Override - public T build() - { - return mapper.apply(new IntegerValidatorConfig()); - } -} diff --git a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/config/StringConverterConfigBuilder.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/config/StringConverterConfigBuilder.java deleted file mode 100644 index 1f7d09ada9..0000000000 --- a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/config/StringConverterConfigBuilder.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * 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.model.core.config; - -import java.util.function.Function; - -import io.aklivity.zilla.runtime.engine.config.ConfigBuilder; - -public class StringConverterConfigBuilder extends ConfigBuilder> -{ - private final Function mapper; - - private String encoding; - - StringConverterConfigBuilder( - Function mapper) - { - this.mapper = mapper; - } - - @Override - @SuppressWarnings("unchecked") - protected Class> thisType() - { - return (Class>) getClass(); - } - - public StringConverterConfigBuilder encoding( - String encoding) - { - this.encoding = encoding; - return this; - } - - @Override - public T build() - { - return mapper.apply(new StringConverterConfig(encoding)); - } -} diff --git a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/config/StringConverterConfig.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/config/StringModelConfig.java similarity index 65% rename from incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/config/StringConverterConfig.java rename to incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/config/StringModelConfig.java index 3d58633009..d18a80bc6d 100644 --- a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/config/StringConverterConfig.java +++ b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/config/StringModelConfig.java @@ -16,29 +16,29 @@ import java.util.function.Function; -import io.aklivity.zilla.runtime.engine.config.ConverterConfig; +import io.aklivity.zilla.runtime.engine.config.ModelConfig; -public final class StringConverterConfig extends ConverterConfig +public final class StringModelConfig extends ModelConfig { public static final String DEFAULT_ENCODING = "utf_8"; public final String encoding; - public StringConverterConfig( + public StringModelConfig( String encoding) { super("string"); this.encoding = encoding != null ? encoding : DEFAULT_ENCODING; } - public static StringConverterConfigBuilder builder( - Function mapper) + public static StringModelConfigBuilder builder( + Function mapper) { - return new StringConverterConfigBuilder<>(mapper::apply); + return new StringModelConfigBuilder<>(mapper::apply); } - public static StringConverterConfigBuilder builder() + public static StringModelConfigBuilder builder() { - return new StringConverterConfigBuilder<>(StringConverterConfig.class::cast); + return new StringModelConfigBuilder<>(StringModelConfig.class::cast); } } diff --git a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/config/StringValidatorConfigBuilder.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/config/StringModelConfigBuilder.java similarity index 67% rename from incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/config/StringValidatorConfigBuilder.java rename to incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/config/StringModelConfigBuilder.java index 24906b2a13..9ef65f5738 100644 --- a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/config/StringValidatorConfigBuilder.java +++ b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/config/StringModelConfigBuilder.java @@ -18,26 +18,26 @@ import io.aklivity.zilla.runtime.engine.config.ConfigBuilder; -public class StringValidatorConfigBuilder extends ConfigBuilder> +public class StringModelConfigBuilder extends ConfigBuilder> { - private final Function mapper; + private final Function mapper; private String encoding; - StringValidatorConfigBuilder( - Function mapper) + StringModelConfigBuilder( + Function mapper) { this.mapper = mapper; } @Override @SuppressWarnings("unchecked") - protected Class> thisType() + protected Class> thisType() { - return (Class>) getClass(); + return (Class>) getClass(); } - public StringValidatorConfigBuilder encoding( + public StringModelConfigBuilder encoding( String encoding) { this.encoding = encoding; @@ -47,6 +47,6 @@ public StringValidatorConfigBuilder encoding( @Override public T build() { - return mapper.apply(new StringValidatorConfig(encoding)); + return mapper.apply(new StringModelConfig(encoding)); } } diff --git a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/config/StringValidatorConfig.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/config/StringValidatorConfig.java deleted file mode 100644 index eb2edab5d5..0000000000 --- a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/config/StringValidatorConfig.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * 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.model.core.config; - -import java.util.function.Function; - -import io.aklivity.zilla.runtime.engine.config.ValidatorConfig; - -public final class StringValidatorConfig extends ValidatorConfig -{ - public static final String DEFAULT_ENCODING = "utf_8"; - - public final String encoding; - - public StringValidatorConfig( - String encoding) - { - super("string"); - this.encoding = encoding != null ? encoding : DEFAULT_ENCODING; - } - - public static StringValidatorConfigBuilder builder( - Function mapper) - { - return new StringValidatorConfigBuilder<>(mapper::apply); - } - - public static StringValidatorConfigBuilder builder() - { - return new StringValidatorConfigBuilder<>(StringValidatorConfig.class::cast); - } -} diff --git a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/IntegerConverterHandler.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/IntegerConverterHandler.java index dea0d59a6d..2fb1f89880 100644 --- a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/IntegerConverterHandler.java +++ b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/IntegerConverterHandler.java @@ -16,14 +16,14 @@ import org.agrona.DirectBuffer; -import io.aklivity.zilla.runtime.engine.converter.ConverterHandler; -import io.aklivity.zilla.runtime.engine.converter.function.ValueConsumer; -import io.aklivity.zilla.runtime.model.core.config.IntegerConverterConfig; +import io.aklivity.zilla.runtime.engine.model.ConverterHandler; +import io.aklivity.zilla.runtime.engine.model.function.ValueConsumer; +import io.aklivity.zilla.runtime.model.core.config.IntegerModelConfig; public class IntegerConverterHandler implements ConverterHandler { public IntegerConverterHandler( - IntegerConverterConfig config) + IntegerModelConfig config) { } diff --git a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/IntegerConverter.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/IntegerModel.java similarity index 79% rename from incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/IntegerConverter.java rename to incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/IntegerModel.java index f7dfaff969..58c214bafd 100644 --- a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/IntegerConverter.java +++ b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/IntegerModel.java @@ -17,10 +17,10 @@ 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; +import io.aklivity.zilla.runtime.engine.model.Model; +import io.aklivity.zilla.runtime.engine.model.ModelContext; -public class IntegerConverter implements Converter +public class IntegerModel implements Model { public static final String NAME = "integer"; @@ -31,10 +31,10 @@ public String name() } @Override - public ConverterContext supply( + public ModelContext supply( EngineContext context) { - return new IntegerConverterContext(context); + return new IntegerModelContext(context); } @Override diff --git a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/IntegerConverterContext.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/IntegerModelContext.java similarity index 51% rename from incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/IntegerConverterContext.java rename to incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/IntegerModelContext.java index 105978e9e2..1320b7c7df 100644 --- a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/IntegerConverterContext.java +++ b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/IntegerModelContext.java @@ -15,35 +15,43 @@ package io.aklivity.zilla.runtime.model.core.internal; import io.aklivity.zilla.runtime.engine.EngineContext; -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.model.core.config.IntegerConverterConfig; +import io.aklivity.zilla.runtime.engine.config.ModelConfig; +import io.aklivity.zilla.runtime.engine.model.ConverterHandler; +import io.aklivity.zilla.runtime.engine.model.ModelContext; +import io.aklivity.zilla.runtime.engine.model.ValidatorHandler; +import io.aklivity.zilla.runtime.model.core.config.IntegerModelConfig; -public class IntegerConverterContext implements ConverterContext +public class IntegerModelContext implements ModelContext { - public IntegerConverterContext( + public IntegerModelContext( EngineContext context) { } @Override - public ConverterHandler supplyReadHandler( - ConverterConfig config) + public ConverterHandler supplyReadConverterHandler( + ModelConfig config) { return supply(config); } @Override - public ConverterHandler supplyWriteHandler( - ConverterConfig config) + public ConverterHandler supplyWriteConverterHandler( + ModelConfig config) { return supply(config); } + @Override + public ValidatorHandler supplyValidatorHandler( + ModelConfig config) + { + return new IntegerValidatorHandler(IntegerModelConfig.class.cast(config)); + } + private IntegerConverterHandler supply( - ConverterConfig config) + ModelConfig config) { - return new IntegerConverterHandler(IntegerConverterConfig.class.cast(config)); + return new IntegerConverterHandler(IntegerModelConfig.class.cast(config)); } } diff --git a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/IntegerConverterFactorySpi.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/IntegerModelFactorySpi.java similarity index 75% rename from incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/IntegerConverterFactorySpi.java rename to incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/IntegerModelFactorySpi.java index ac9b5084a1..ad317866af 100644 --- a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/IntegerConverterFactorySpi.java +++ b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/IntegerModelFactorySpi.java @@ -17,15 +17,15 @@ import java.net.URL; 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.engine.model.Model; +import io.aklivity.zilla.runtime.engine.model.ModelFactorySpi; -public class IntegerConverterFactorySpi implements ConverterFactorySpi +public class IntegerModelFactorySpi implements ModelFactorySpi { @Override public String type() { - return IntegerValidator.NAME; + return IntegerModel.NAME; } @Override @@ -35,9 +35,9 @@ public URL schema() } @Override - public Converter create( + public Model create( Configuration config) { - return new IntegerConverter(); + return new IntegerModel(); } } diff --git a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/IntegerValidator.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/IntegerValidator.java deleted file mode 100644 index a4eab87a3b..0000000000 --- a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/IntegerValidator.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * 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.model.core.internal; - -import java.net.URL; - -import io.aklivity.zilla.runtime.engine.EngineContext; -import io.aklivity.zilla.runtime.engine.validator.Validator; -import io.aklivity.zilla.runtime.engine.validator.ValidatorContext; - -public class IntegerValidator implements Validator -{ - public static final String NAME = "integer"; - - @Override - public String name() - { - return IntegerValidator.NAME; - } - - @Override - public ValidatorContext supply( - EngineContext context) - { - return new IntegerValidatorContext(context); - } - - @Override - public URL type() - { - return getClass().getResource("schema/integer.schema.patch.json"); - } -} diff --git a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/IntegerValidatorContext.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/IntegerValidatorContext.java deleted file mode 100644 index 2c6e8691dc..0000000000 --- a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/IntegerValidatorContext.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * 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.model.core.internal; - -import io.aklivity.zilla.runtime.engine.EngineContext; -import io.aklivity.zilla.runtime.engine.config.ValidatorConfig; -import io.aklivity.zilla.runtime.engine.validator.ValidatorContext; -import io.aklivity.zilla.runtime.engine.validator.ValidatorHandler; -import io.aklivity.zilla.runtime.model.core.config.IntegerValidatorConfig; - -public class IntegerValidatorContext implements ValidatorContext -{ - public IntegerValidatorContext( - EngineContext context) - { - } - - @Override - public ValidatorHandler supplyHandler( - ValidatorConfig config) - { - return new IntegerValidatorHandler(IntegerValidatorConfig.class.cast(config)); - } -} diff --git a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/IntegerValidatorFactorySpi.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/IntegerValidatorFactorySpi.java deleted file mode 100644 index 5b18a31769..0000000000 --- a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/IntegerValidatorFactorySpi.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * 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.model.core.internal; - -import io.aklivity.zilla.runtime.engine.Configuration; -import io.aklivity.zilla.runtime.engine.validator.Validator; -import io.aklivity.zilla.runtime.engine.validator.ValidatorFactorySpi; - -public class IntegerValidatorFactorySpi implements ValidatorFactorySpi -{ - @Override - public String type() - { - return IntegerValidator.NAME; - } - - @Override - public Validator create( - Configuration config) - { - return new IntegerValidator(); - } -} diff --git a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/IntegerValidatorHandler.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/IntegerValidatorHandler.java index fa96854e23..48dd67b542 100644 --- a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/IntegerValidatorHandler.java +++ b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/IntegerValidatorHandler.java @@ -16,16 +16,16 @@ import org.agrona.DirectBuffer; -import io.aklivity.zilla.runtime.engine.converter.function.ValueConsumer; -import io.aklivity.zilla.runtime.engine.validator.ValidatorHandler; -import io.aklivity.zilla.runtime.model.core.config.IntegerValidatorConfig; +import io.aklivity.zilla.runtime.engine.model.ValidatorHandler; +import io.aklivity.zilla.runtime.engine.model.function.ValueConsumer; +import io.aklivity.zilla.runtime.model.core.config.IntegerModelConfig; public class IntegerValidatorHandler implements ValidatorHandler { private int pendingBytes; public IntegerValidatorHandler( - IntegerValidatorConfig config) + IntegerModelConfig config) { } diff --git a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/StringConverterHandler.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/StringConverterHandler.java index 30ca7f049a..4398a134a8 100644 --- a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/StringConverterHandler.java +++ b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/StringConverterHandler.java @@ -16,16 +16,16 @@ import org.agrona.DirectBuffer; -import io.aklivity.zilla.runtime.engine.converter.ConverterHandler; -import io.aklivity.zilla.runtime.engine.converter.function.ValueConsumer; -import io.aklivity.zilla.runtime.model.core.config.StringConverterConfig; +import io.aklivity.zilla.runtime.engine.model.ConverterHandler; +import io.aklivity.zilla.runtime.engine.model.function.ValueConsumer; +import io.aklivity.zilla.runtime.model.core.config.StringModelConfig; public class StringConverterHandler implements ConverterHandler { private StringEncoding encoding; public StringConverterHandler( - StringConverterConfig config) + StringModelConfig config) { this.encoding = StringEncoding.of(config.encoding); } diff --git a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/StringConverter.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/StringModel.java similarity index 79% rename from incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/StringConverter.java rename to incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/StringModel.java index 450792e0ad..ab456f1756 100644 --- a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/StringConverter.java +++ b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/StringModel.java @@ -17,10 +17,10 @@ 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; +import io.aklivity.zilla.runtime.engine.model.Model; +import io.aklivity.zilla.runtime.engine.model.ModelContext; -public class StringConverter implements Converter +public class StringModel implements Model { public static final String NAME = "string"; @@ -31,10 +31,10 @@ public String name() } @Override - public ConverterContext supply( + public ModelContext supply( EngineContext context) { - return new StringConverterContext(context); + return new StringModelContext(context); } @Override diff --git a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/StringConverterContext.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/StringModelContext.java similarity index 51% rename from incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/StringConverterContext.java rename to incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/StringModelContext.java index 40059a25cd..112d15d1e4 100644 --- a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/StringConverterContext.java +++ b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/StringModelContext.java @@ -15,35 +15,43 @@ package io.aklivity.zilla.runtime.model.core.internal; import io.aklivity.zilla.runtime.engine.EngineContext; -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.model.core.config.StringConverterConfig; +import io.aklivity.zilla.runtime.engine.config.ModelConfig; +import io.aklivity.zilla.runtime.engine.model.ConverterHandler; +import io.aklivity.zilla.runtime.engine.model.ModelContext; +import io.aklivity.zilla.runtime.engine.model.ValidatorHandler; +import io.aklivity.zilla.runtime.model.core.config.StringModelConfig; -public class StringConverterContext implements ConverterContext +public class StringModelContext implements ModelContext { - public StringConverterContext( + public StringModelContext( EngineContext context) { } @Override - public ConverterHandler supplyReadHandler( - ConverterConfig config) + public ConverterHandler supplyReadConverterHandler( + ModelConfig config) { return supply(config); } @Override - public ConverterHandler supplyWriteHandler( - ConverterConfig config) + public ConverterHandler supplyWriteConverterHandler( + ModelConfig config) { return supply(config); } + @Override + public ValidatorHandler supplyValidatorHandler( + ModelConfig config) + { + return new StringValidatorHandler(StringModelConfig.class.cast(config)); + } + private StringConverterHandler supply( - ConverterConfig config) + ModelConfig config) { - return new StringConverterHandler(StringConverterConfig.class.cast(config)); + return new StringConverterHandler(StringModelConfig.class.cast(config)); } } diff --git a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/StringConverterFactorySpi.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/StringModelFactorySpi.java similarity index 78% rename from incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/StringConverterFactorySpi.java rename to incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/StringModelFactorySpi.java index 0790c8d2d0..4c6c17e57c 100644 --- a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/StringConverterFactorySpi.java +++ b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/StringModelFactorySpi.java @@ -17,10 +17,10 @@ import java.net.URL; 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.engine.model.Model; +import io.aklivity.zilla.runtime.engine.model.ModelFactorySpi; -public final class StringConverterFactorySpi implements ConverterFactorySpi +public final class StringModelFactorySpi implements ModelFactorySpi { @Override public String type() @@ -35,10 +35,10 @@ public URL schema() } @Override - public Converter create( + public Model create( Configuration config) { - return new StringConverter(); + return new StringModel(); } diff --git a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/StringValidator.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/StringValidator.java deleted file mode 100644 index 159e1f8095..0000000000 --- a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/StringValidator.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * 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.model.core.internal; - -import java.net.URL; - -import io.aklivity.zilla.runtime.engine.EngineContext; -import io.aklivity.zilla.runtime.engine.validator.Validator; -import io.aklivity.zilla.runtime.engine.validator.ValidatorContext; - -public class StringValidator implements Validator -{ - public static final String NAME = "string"; - - public StringValidator() - { - } - - @Override - public String name() - { - return StringValidator.NAME; - } - - @Override - public ValidatorContext supply( - EngineContext context) - { - return new StringValidatorContext(context); - } - - @Override - public URL type() - { - return getClass().getResource("schema/string.schema.patch.json"); - } -} diff --git a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/StringValidatorContext.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/StringValidatorContext.java deleted file mode 100644 index a1b30c346d..0000000000 --- a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/StringValidatorContext.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * 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.model.core.internal; - -import io.aklivity.zilla.runtime.engine.EngineContext; -import io.aklivity.zilla.runtime.engine.config.ValidatorConfig; -import io.aklivity.zilla.runtime.engine.validator.ValidatorContext; -import io.aklivity.zilla.runtime.engine.validator.ValidatorHandler; -import io.aklivity.zilla.runtime.model.core.config.StringValidatorConfig; - -public class StringValidatorContext implements ValidatorContext -{ - public StringValidatorContext( - EngineContext context) - { - } - - @Override - public ValidatorHandler supplyHandler( - ValidatorConfig config) - { - return new StringValidatorHandler(StringValidatorConfig.class.cast(config)); - } -} diff --git a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/StringValidatorEncoding.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/StringValidatorEncoding.java index f1a0185e76..801b67d841 100644 --- a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/StringValidatorEncoding.java +++ b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/StringValidatorEncoding.java @@ -14,8 +14,8 @@ */ package io.aklivity.zilla.runtime.model.core.internal; -import static io.aklivity.zilla.runtime.engine.validator.ValidatorHandler.FLAGS_FIN; -import static io.aklivity.zilla.runtime.engine.validator.ValidatorHandler.FLAGS_INIT; +import static io.aklivity.zilla.runtime.engine.model.ValidatorHandler.FLAGS_FIN; +import static io.aklivity.zilla.runtime.engine.model.ValidatorHandler.FLAGS_INIT; import org.agrona.DirectBuffer; diff --git a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/StringValidatorFactorySpi.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/StringValidatorFactorySpi.java deleted file mode 100644 index 8a10f76ddb..0000000000 --- a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/StringValidatorFactorySpi.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * 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.model.core.internal; - -import io.aklivity.zilla.runtime.engine.Configuration; -import io.aklivity.zilla.runtime.engine.validator.Validator; -import io.aklivity.zilla.runtime.engine.validator.ValidatorFactorySpi; - -public class StringValidatorFactorySpi implements ValidatorFactorySpi -{ - @Override - public String type() - { - return StringValidator.NAME; - } - - @Override - public Validator create( - Configuration config) - { - return new StringValidator(); - } -} diff --git a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/StringValidatorHandler.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/StringValidatorHandler.java index a0b1a3e7e8..642a7aed50 100644 --- a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/StringValidatorHandler.java +++ b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/StringValidatorHandler.java @@ -16,16 +16,16 @@ import org.agrona.DirectBuffer; -import io.aklivity.zilla.runtime.engine.converter.function.ValueConsumer; -import io.aklivity.zilla.runtime.engine.validator.ValidatorHandler; -import io.aklivity.zilla.runtime.model.core.config.StringValidatorConfig; +import io.aklivity.zilla.runtime.engine.model.ValidatorHandler; +import io.aklivity.zilla.runtime.engine.model.function.ValueConsumer; +import io.aklivity.zilla.runtime.model.core.config.StringModelConfig; public class StringValidatorHandler implements ValidatorHandler { private final StringValidatorEncoding encoding; public StringValidatorHandler( - StringValidatorConfig config) + StringModelConfig config) { this.encoding = StringValidatorEncoding.of(config.encoding); } diff --git a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/config/IntegerConverterConfigAdapter.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/config/IntegerConverterConfigAdapter.java deleted file mode 100644 index 4dc68dc886..0000000000 --- a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/config/IntegerConverterConfigAdapter.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * 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.model.core.internal.config; - -import jakarta.json.Json; -import jakarta.json.JsonValue; -import jakarta.json.bind.adapter.JsonbAdapter; - -import io.aklivity.zilla.runtime.engine.config.ConverterConfig; -import io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi; -import io.aklivity.zilla.runtime.model.core.config.IntegerConverterConfig; - -public class IntegerConverterConfigAdapter implements ConverterConfigAdapterSpi, JsonbAdapter -{ - @Override - public String type() - { - return "integer"; - } - - @Override - public JsonValue adaptToJson( - ConverterConfig options) - { - return Json.createValue(type()); - } - - @Override - public ConverterConfig adaptFromJson( - JsonValue object) - { - return new IntegerConverterConfig(); - } -} diff --git a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/config/IntegerValidatorConfigAdapter.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/config/IntegerModelConfigAdapter.java similarity index 68% rename from incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/config/IntegerValidatorConfigAdapter.java rename to incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/config/IntegerModelConfigAdapter.java index bd1690ad95..dc7638660f 100644 --- a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/config/IntegerValidatorConfigAdapter.java +++ b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/config/IntegerModelConfigAdapter.java @@ -18,11 +18,11 @@ import jakarta.json.JsonValue; import jakarta.json.bind.adapter.JsonbAdapter; -import io.aklivity.zilla.runtime.engine.config.ValidatorConfig; -import io.aklivity.zilla.runtime.engine.config.ValidatorConfigAdapterSpi; -import io.aklivity.zilla.runtime.model.core.config.IntegerValidatorConfig; +import io.aklivity.zilla.runtime.engine.config.ModelConfig; +import io.aklivity.zilla.runtime.engine.config.ModelConfigAdapterSpi; +import io.aklivity.zilla.runtime.model.core.config.IntegerModelConfig; -public class IntegerValidatorConfigAdapter implements ValidatorConfigAdapterSpi, JsonbAdapter +public class IntegerModelConfigAdapter implements ModelConfigAdapterSpi, JsonbAdapter { @Override public String type() @@ -32,15 +32,15 @@ public String type() @Override public JsonValue adaptToJson( - ValidatorConfig options) + ModelConfig options) { return Json.createValue(type()); } @Override - public ValidatorConfig adaptFromJson( + public ModelConfig adaptFromJson( JsonValue object) { - return new IntegerValidatorConfig(); + return new IntegerModelConfig(); } } diff --git a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/config/StringConverterConfigAdapter.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/config/StringModelConfigAdapter.java similarity index 73% rename from incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/config/StringConverterConfigAdapter.java rename to incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/config/StringModelConfigAdapter.java index 001f946fad..0b5c1f968a 100644 --- a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/config/StringConverterConfigAdapter.java +++ b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/config/StringModelConfigAdapter.java @@ -21,22 +21,22 @@ import jakarta.json.JsonValue; import jakarta.json.bind.adapter.JsonbAdapter; -import io.aklivity.zilla.runtime.engine.config.ConverterConfig; -import io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi; -import io.aklivity.zilla.runtime.model.core.config.StringConverterConfig; +import io.aklivity.zilla.runtime.engine.config.ModelConfig; +import io.aklivity.zilla.runtime.engine.config.ModelConfigAdapterSpi; +import io.aklivity.zilla.runtime.model.core.config.StringModelConfig; -public final class StringConverterConfigAdapter implements ConverterConfigAdapterSpi, JsonbAdapter +public final class StringModelConfigAdapter implements ModelConfigAdapterSpi, JsonbAdapter { private static final String TYPE_NAME = "type"; private static final String ENCODING_NAME = "encoding"; @Override public JsonValue adaptToJson( - ConverterConfig config) + ModelConfig config) { JsonValue result; - String encoding = ((StringConverterConfig) config).encoding; - if (encoding != null && !encoding.isEmpty() && !encoding.equals(StringConverterConfig.DEFAULT_ENCODING)) + String encoding = ((StringModelConfig) config).encoding; + if (encoding != null && !encoding.isEmpty() && !encoding.equals(StringModelConfig.DEFAULT_ENCODING)) { JsonObjectBuilder converter = Json.createObjectBuilder(); converter.add(TYPE_NAME, type()); @@ -51,13 +51,13 @@ public JsonValue adaptToJson( } @Override - public StringConverterConfig adaptFromJson( + public StringModelConfig adaptFromJson( JsonValue value) { - StringConverterConfig result = null; + StringModelConfig result = null; if (value instanceof JsonString) { - result = StringConverterConfig.builder().build(); + result = StringModelConfig.builder().build(); } else if (value instanceof JsonObject) { @@ -65,7 +65,7 @@ else if (value instanceof JsonObject) String encoding = object.containsKey(ENCODING_NAME) ? object.getString(ENCODING_NAME) : null; - result = new StringConverterConfig(encoding); + result = new StringModelConfig(encoding); } else { diff --git a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/config/StringValidatorConfigAdapter.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/config/StringValidatorConfigAdapter.java deleted file mode 100644 index 2dfd06d44b..0000000000 --- a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/config/StringValidatorConfigAdapter.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * 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.model.core.internal.config; - -import jakarta.json.Json; -import jakarta.json.JsonObject; -import jakarta.json.JsonObjectBuilder; -import jakarta.json.JsonValue; -import jakarta.json.bind.adapter.JsonbAdapter; - -import io.aklivity.zilla.runtime.engine.config.ValidatorConfig; -import io.aklivity.zilla.runtime.engine.config.ValidatorConfigAdapterSpi; -import io.aklivity.zilla.runtime.model.core.config.StringValidatorConfig; - -public final class StringValidatorConfigAdapter implements ValidatorConfigAdapterSpi, JsonbAdapter -{ - private static final String TYPE_NAME = "type"; - private static final String ENCODING_NAME = "encoding"; - - @Override - public String type() - { - return "string"; - } - - @Override - public JsonValue adaptToJson( - ValidatorConfig config) - { - JsonValue result; - String encoding = ((StringValidatorConfig) config).encoding; - if (encoding != null && !encoding.isEmpty() && !encoding.equals(StringValidatorConfig.DEFAULT_ENCODING)) - { - JsonObjectBuilder builder = Json.createObjectBuilder(); - builder.add(TYPE_NAME, type()); - builder.add(ENCODING_NAME, encoding); - result = builder.build(); - } - else - { - result = Json.createValue("string"); - } - return result; - } - - @Override - public StringValidatorConfig adaptFromJson( - JsonValue value) - { - StringValidatorConfig config = null; - switch (value.getValueType()) - { - case STRING: - config = StringValidatorConfig.builder().build(); - break; - case OBJECT: - JsonObject object = (JsonObject) value; - String encoding = object.containsKey(ENCODING_NAME) - ? object.getString(ENCODING_NAME) - : null; - config = StringValidatorConfig.builder() - .encoding(encoding) - .build(); - break; - } - return config; - } -} diff --git a/incubator/model-core/src/main/moditect/module-info.java b/incubator/model-core/src/main/moditect/module-info.java index 2f127850b0..e85c2b65f9 100644 --- a/incubator/model-core/src/main/moditect/module-info.java +++ b/incubator/model-core/src/main/moditect/module-info.java @@ -18,19 +18,11 @@ exports io.aklivity.zilla.runtime.model.core.config; - provides io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi - with io.aklivity.zilla.runtime.model.core.internal.config.StringConverterConfigAdapter, - io.aklivity.zilla.runtime.model.core.internal.config.IntegerConverterConfigAdapter; + provides io.aklivity.zilla.runtime.engine.config.ModelConfigAdapterSpi + with io.aklivity.zilla.runtime.model.core.internal.config.IntegerModelConfigAdapter, + io.aklivity.zilla.runtime.model.core.internal.config.StringModelConfigAdapter; - provides io.aklivity.zilla.runtime.engine.converter.ConverterFactorySpi - with io.aklivity.zilla.runtime.model.core.internal.StringConverterFactorySpi, - io.aklivity.zilla.runtime.model.core.internal.IntegerConverterFactorySpi; - - provides io.aklivity.zilla.runtime.engine.config.ValidatorConfigAdapterSpi - with io.aklivity.zilla.runtime.model.core.internal.config.IntegerValidatorConfigAdapter, - io.aklivity.zilla.runtime.model.core.internal.config.StringValidatorConfigAdapter; - - provides io.aklivity.zilla.runtime.engine.validator.ValidatorFactorySpi - with io.aklivity.zilla.runtime.model.core.internal.IntegerValidatorFactorySpi, - io.aklivity.zilla.runtime.model.core.internal.StringValidatorFactorySpi; + provides io.aklivity.zilla.runtime.engine.model.ModelFactorySpi + with io.aklivity.zilla.runtime.model.core.internal.IntegerModelFactorySpi, + io.aklivity.zilla.runtime.model.core.internal.StringModelFactorySpi; } diff --git a/incubator/model-core/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi b/incubator/model-core/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi deleted file mode 100644 index 11be6f24bb..0000000000 --- a/incubator/model-core/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi +++ /dev/null @@ -1,2 +0,0 @@ -io.aklivity.zilla.runtime.model.core.internal.config.IntegerConverterConfigAdapter -io.aklivity.zilla.runtime.model.core.internal.config.StringConverterConfigAdapter diff --git a/incubator/model-core/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ModelConfigAdapterSpi b/incubator/model-core/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ModelConfigAdapterSpi new file mode 100644 index 0000000000..b81e71d6a3 --- /dev/null +++ b/incubator/model-core/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ModelConfigAdapterSpi @@ -0,0 +1,2 @@ +io.aklivity.zilla.runtime.model.core.internal.config.IntegerModelConfigAdapter +io.aklivity.zilla.runtime.model.core.internal.config.StringModelConfigAdapter diff --git a/incubator/model-core/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ValidatorConfigAdapterSpi b/incubator/model-core/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ValidatorConfigAdapterSpi deleted file mode 100644 index 7725e627ba..0000000000 --- a/incubator/model-core/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ValidatorConfigAdapterSpi +++ /dev/null @@ -1,2 +0,0 @@ -io.aklivity.zilla.runtime.model.core.internal.config.IntegerValidatorConfigAdapter -io.aklivity.zilla.runtime.model.core.internal.config.StringValidatorConfigAdapter diff --git a/incubator/model-core/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.converter.ConverterFactorySpi b/incubator/model-core/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.converter.ConverterFactorySpi deleted file mode 100644 index df692c845e..0000000000 --- a/incubator/model-core/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.converter.ConverterFactorySpi +++ /dev/null @@ -1,2 +0,0 @@ -io.aklivity.zilla.runtime.model.core.internal.IntegerConverterFactorySpi -io.aklivity.zilla.runtime.model.core.internal.StringConverterFactorySpi diff --git a/incubator/model-core/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.model.ModelFactorySpi b/incubator/model-core/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.model.ModelFactorySpi new file mode 100644 index 0000000000..1d8a29a482 --- /dev/null +++ b/incubator/model-core/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.model.ModelFactorySpi @@ -0,0 +1,2 @@ +io.aklivity.zilla.runtime.model.core.internal.IntegerModelFactorySpi +io.aklivity.zilla.runtime.model.core.internal.StringModelFactorySpi diff --git a/incubator/model-core/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.validator.ValidatorFactorySpi b/incubator/model-core/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.validator.ValidatorFactorySpi deleted file mode 100644 index be06f7f038..0000000000 --- a/incubator/model-core/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.validator.ValidatorFactorySpi +++ /dev/null @@ -1,2 +0,0 @@ -io.aklivity.zilla.runtime.model.core.internal.IntegerValidatorFactorySpi -io.aklivity.zilla.runtime.model.core.internal.StringValidatorFactorySpi diff --git a/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/IntegerConverterTest.java b/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/IntegerConverterTest.java index 8dbb79bf78..072a0b1cd5 100644 --- a/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/IntegerConverterTest.java +++ b/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/IntegerConverterTest.java @@ -20,12 +20,12 @@ import org.agrona.concurrent.UnsafeBuffer; import org.junit.Test; -import io.aklivity.zilla.runtime.engine.converter.function.ValueConsumer; -import io.aklivity.zilla.runtime.model.core.config.IntegerConverterConfig; +import io.aklivity.zilla.runtime.engine.model.function.ValueConsumer; +import io.aklivity.zilla.runtime.model.core.config.IntegerModelConfig; public class IntegerConverterTest { - private final IntegerConverterConfig config = new IntegerConverterConfig(); + private final IntegerModelConfig config = new IntegerModelConfig(); private final IntegerConverterHandler converter = new IntegerConverterHandler(config); @Test diff --git a/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/StringConverterFactoryTest.java b/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/IntegerModelFactoryTest.java similarity index 51% rename from incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/StringConverterFactoryTest.java rename to incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/IntegerModelFactoryTest.java index 983a655a80..385add14d1 100644 --- a/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/StringConverterFactoryTest.java +++ b/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/IntegerModelFactoryTest.java @@ -22,27 +22,28 @@ import io.aklivity.zilla.runtime.engine.Configuration; import io.aklivity.zilla.runtime.engine.EngineContext; -import io.aklivity.zilla.runtime.engine.config.ConverterConfig; -import io.aklivity.zilla.runtime.engine.converter.Converter; -import io.aklivity.zilla.runtime.engine.converter.ConverterContext; -import io.aklivity.zilla.runtime.engine.converter.ConverterFactory; -import io.aklivity.zilla.runtime.model.core.config.StringConverterConfig; +import io.aklivity.zilla.runtime.engine.config.ModelConfig; +import io.aklivity.zilla.runtime.engine.model.Model; +import io.aklivity.zilla.runtime.engine.model.ModelContext; +import io.aklivity.zilla.runtime.engine.model.ModelFactory; +import io.aklivity.zilla.runtime.model.core.config.IntegerModelConfig; -public class StringConverterFactoryTest +public class IntegerModelFactoryTest { @Test public void shouldCreateReader() { Configuration config = new Configuration(); - ConverterFactory factory = ConverterFactory.instantiate(); - Converter converter = factory.create("string", config); + ModelFactory factory = ModelFactory.instantiate(); + Model model = factory.create("integer", config); - ConverterContext context = new StringConverterContext(mock(EngineContext.class)); + ModelContext context = new IntegerModelContext(mock(EngineContext.class)); - ConverterConfig converterConfig = StringConverterConfig.builder().encoding("utf_8").build(); + ModelConfig modelConfig = IntegerModelConfig.builder().build(); - assertThat(converter, instanceOf(StringConverter.class)); - assertThat(context.supplyReadHandler(converterConfig), instanceOf(StringConverterHandler.class)); - assertThat(context.supplyWriteHandler(converterConfig), instanceOf(StringConverterHandler.class)); + assertThat(model, instanceOf(IntegerModel.class)); + assertThat(context.supplyReadConverterHandler(modelConfig), instanceOf(IntegerConverterHandler.class)); + assertThat(context.supplyWriteConverterHandler(modelConfig), instanceOf(IntegerConverterHandler.class)); + assertThat(context.supplyValidatorHandler(modelConfig), instanceOf(IntegerValidatorHandler.class)); } } diff --git a/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/IntegerValidatorFactoryTest.java b/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/IntegerValidatorFactoryTest.java deleted file mode 100644 index ccbae6a67e..0000000000 --- a/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/IntegerValidatorFactoryTest.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * 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.model.core.internal; - -import static org.hamcrest.CoreMatchers.instanceOf; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.mockito.Mockito.mock; - -import org.junit.Test; - -import io.aklivity.zilla.runtime.engine.Configuration; -import io.aklivity.zilla.runtime.engine.EngineContext; -import io.aklivity.zilla.runtime.engine.config.ValidatorConfig; -import io.aklivity.zilla.runtime.engine.validator.Validator; -import io.aklivity.zilla.runtime.engine.validator.ValidatorContext; -import io.aklivity.zilla.runtime.engine.validator.ValidatorFactorySpi; -import io.aklivity.zilla.runtime.engine.validator.ValidatorHandler; -import io.aklivity.zilla.runtime.model.core.config.IntegerValidatorConfig; - -public class IntegerValidatorFactoryTest -{ - @Test - @SuppressWarnings("unchecked") - public void shouldCreate() - { - // GIVEN - Configuration config = new Configuration(); - ValidatorConfig validator = new IntegerValidatorConfig(); - ValidatorFactorySpi factory = new IntegerValidatorFactorySpi(); - - // WHEN - Validator reader = factory.create(config); - ValidatorContext context = reader.supply(mock(EngineContext.class)); - ValidatorHandler handler = context.supplyHandler(validator); - - // THEN - assertThat(reader, instanceOf(IntegerValidator.class)); - assertThat(handler, instanceOf(IntegerValidatorHandler.class)); - } -} diff --git a/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/IntegerValidatorTest.java b/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/IntegerValidatorTest.java index 174334f7c4..f3244ebb8f 100644 --- a/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/IntegerValidatorTest.java +++ b/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/IntegerValidatorTest.java @@ -21,13 +21,13 @@ import org.agrona.concurrent.UnsafeBuffer; import org.junit.Test; -import io.aklivity.zilla.runtime.engine.converter.function.ValueConsumer; -import io.aklivity.zilla.runtime.engine.validator.ValidatorHandler; -import io.aklivity.zilla.runtime.model.core.config.IntegerValidatorConfig; +import io.aklivity.zilla.runtime.engine.model.ValidatorHandler; +import io.aklivity.zilla.runtime.engine.model.function.ValueConsumer; +import io.aklivity.zilla.runtime.model.core.config.IntegerModelConfig; public class IntegerValidatorTest { - private final IntegerValidatorConfig config = IntegerValidatorConfig.builder().build(); + private final IntegerModelConfig config = IntegerModelConfig.builder().build(); private final IntegerValidatorHandler handler = new IntegerValidatorHandler(config); @Test diff --git a/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/StringConverterTest.java b/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/StringConverterTest.java index 8a633f0ee1..c9f93d1aea 100644 --- a/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/StringConverterTest.java +++ b/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/StringConverterTest.java @@ -22,15 +22,15 @@ import org.agrona.concurrent.UnsafeBuffer; import org.junit.Test; -import io.aklivity.zilla.runtime.engine.converter.function.ValueConsumer; -import io.aklivity.zilla.runtime.model.core.config.StringConverterConfig; +import io.aklivity.zilla.runtime.engine.model.function.ValueConsumer; +import io.aklivity.zilla.runtime.model.core.config.StringModelConfig; public class StringConverterTest { @Test public void shouldVerifyValidUtf8() { - StringConverterConfig config = StringConverterConfig.builder() + StringModelConfig config = StringModelConfig.builder() .encoding("utf_8") .build(); StringConverterHandler converter = new StringConverterHandler(config); @@ -45,7 +45,7 @@ public void shouldVerifyValidUtf8() @Test public void shouldVerifyInvalidUtf8() { - StringConverterConfig config = StringConverterConfig.builder() + StringModelConfig config = StringModelConfig.builder() .encoding("utf_8") .build(); StringConverterHandler converter = new StringConverterHandler(config); @@ -60,7 +60,7 @@ public void shouldVerifyInvalidUtf8() @Test public void shouldVerifyValidUtf16() { - StringConverterConfig config = StringConverterConfig.builder() + StringModelConfig config = StringModelConfig.builder() .encoding("utf_16") .build(); StringConverterHandler converter = new StringConverterHandler(config); @@ -76,7 +76,7 @@ public void shouldVerifyValidUtf16() @Test public void shouldVerifyIncompleteUtf16() { - StringConverterConfig config = StringConverterConfig.builder() + StringModelConfig config = StringModelConfig.builder() .encoding("utf_16") .build(); StringConverterHandler converter = new StringConverterHandler(config); @@ -91,7 +91,7 @@ public void shouldVerifyIncompleteUtf16() @Test public void shouldVerifyIncompleteSurrogatePairUtf16() { - StringConverterConfig config = StringConverterConfig.builder() + StringModelConfig config = StringModelConfig.builder() .encoding("utf_16") .build(); StringConverterHandler converter = new StringConverterHandler(config); @@ -106,7 +106,7 @@ public void shouldVerifyIncompleteSurrogatePairUtf16() @Test public void shouldVerifyInvalidSecondSurrogateUtf16() { - StringConverterConfig config = StringConverterConfig.builder() + StringModelConfig config = StringModelConfig.builder() .encoding("utf_16") .build(); StringConverterHandler converter = new StringConverterHandler(config); @@ -121,7 +121,7 @@ public void shouldVerifyInvalidSecondSurrogateUtf16() @Test public void shouldVerifyUnexpectedSecondSurrogateUtf16() { - StringConverterConfig config = StringConverterConfig.builder() + StringModelConfig config = StringModelConfig.builder() .encoding("utf_16") .build(); StringConverterHandler converter = new StringConverterHandler(config); @@ -136,7 +136,7 @@ public void shouldVerifyUnexpectedSecondSurrogateUtf16() @Test public void shouldVerifyValidMixedUtf16() { - StringConverterConfig config = StringConverterConfig.builder() + StringModelConfig config = StringModelConfig.builder() .encoding("utf_16") .build(); StringConverterHandler converter = new StringConverterHandler(config); diff --git a/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/StringEncodingTest.java b/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/StringEncodingTest.java index 54c2eef897..5ff69589ab 100644 --- a/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/StringEncodingTest.java +++ b/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/StringEncodingTest.java @@ -14,7 +14,7 @@ */ package io.aklivity.zilla.runtime.model.core.internal; -import static io.aklivity.zilla.runtime.engine.validator.ValidatorHandler.FLAGS_COMPLETE; +import static io.aklivity.zilla.runtime.engine.model.ValidatorHandler.FLAGS_COMPLETE; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/IntegerConverterFactoryTest.java b/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/StringModelFactoryTest.java similarity index 50% rename from incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/IntegerConverterFactoryTest.java rename to incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/StringModelFactoryTest.java index 325a52375b..2913220059 100644 --- a/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/IntegerConverterFactoryTest.java +++ b/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/StringModelFactoryTest.java @@ -22,27 +22,28 @@ import io.aklivity.zilla.runtime.engine.Configuration; import io.aklivity.zilla.runtime.engine.EngineContext; -import io.aklivity.zilla.runtime.engine.config.ConverterConfig; -import io.aklivity.zilla.runtime.engine.converter.Converter; -import io.aklivity.zilla.runtime.engine.converter.ConverterContext; -import io.aklivity.zilla.runtime.engine.converter.ConverterFactory; -import io.aklivity.zilla.runtime.model.core.config.IntegerConverterConfig; +import io.aklivity.zilla.runtime.engine.config.ModelConfig; +import io.aklivity.zilla.runtime.engine.model.Model; +import io.aklivity.zilla.runtime.engine.model.ModelContext; +import io.aklivity.zilla.runtime.engine.model.ModelFactory; +import io.aklivity.zilla.runtime.model.core.config.StringModelConfig; -public class IntegerConverterFactoryTest +public class StringModelFactoryTest { @Test public void shouldCreateReader() { Configuration config = new Configuration(); - ConverterFactory factory = ConverterFactory.instantiate(); - Converter converter = factory.create("integer", config); + ModelFactory factory = ModelFactory.instantiate(); + Model model = factory.create("string", config); - ConverterContext context = new IntegerConverterContext(mock(EngineContext.class)); + ModelContext context = new StringModelContext(mock(EngineContext.class)); - ConverterConfig converterConfig = IntegerConverterConfig.builder().build(); + ModelConfig modelConfig = StringModelConfig.builder().encoding("utf_8").build(); - assertThat(converter, instanceOf(IntegerConverter.class)); - assertThat(context.supplyReadHandler(converterConfig), instanceOf(IntegerConverterHandler.class)); - assertThat(context.supplyWriteHandler(converterConfig), instanceOf(IntegerConverterHandler.class)); + assertThat(model, instanceOf(StringModel.class)); + assertThat(context.supplyReadConverterHandler(modelConfig), instanceOf(StringConverterHandler.class)); + assertThat(context.supplyWriteConverterHandler(modelConfig), instanceOf(StringConverterHandler.class)); + assertThat(context.supplyValidatorHandler(modelConfig), instanceOf(StringValidatorHandler.class)); } } diff --git a/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/StringValidatorFactoryTest.java b/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/StringValidatorFactoryTest.java deleted file mode 100644 index fc6c930824..0000000000 --- a/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/StringValidatorFactoryTest.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * 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.model.core.internal; - -import static org.hamcrest.CoreMatchers.instanceOf; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.mockito.Mockito.mock; - -import org.junit.Test; - -import io.aklivity.zilla.runtime.engine.Configuration; -import io.aklivity.zilla.runtime.engine.EngineContext; -import io.aklivity.zilla.runtime.engine.config.ValidatorConfig; -import io.aklivity.zilla.runtime.engine.validator.Validator; -import io.aklivity.zilla.runtime.engine.validator.ValidatorContext; -import io.aklivity.zilla.runtime.engine.validator.ValidatorFactorySpi; -import io.aklivity.zilla.runtime.engine.validator.ValidatorHandler; -import io.aklivity.zilla.runtime.model.core.config.StringValidatorConfig; - -public class StringValidatorFactoryTest -{ - @Test - @SuppressWarnings("unchecked") - public void shouldCreate() - { - // GIVEN - Configuration config = new Configuration(); - ValidatorConfig validator = new StringValidatorConfig("utf_8"); - ValidatorFactorySpi factory = new StringValidatorFactorySpi(); - - // WHEN - Validator reader = factory.create(config); - ValidatorContext context = reader.supply(mock(EngineContext.class)); - ValidatorHandler handler = context.supplyHandler(validator); - - // THEN - assertThat(reader, instanceOf(StringValidator.class)); - assertThat(handler, instanceOf(StringValidatorHandler.class)); - } -} diff --git a/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/StringValidatorTest.java b/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/StringValidatorTest.java index e32cf65309..34db2cc059 100644 --- a/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/StringValidatorTest.java +++ b/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/StringValidatorTest.java @@ -21,16 +21,16 @@ import org.agrona.concurrent.UnsafeBuffer; import org.junit.Test; -import io.aklivity.zilla.runtime.engine.converter.function.ValueConsumer; -import io.aklivity.zilla.runtime.engine.validator.ValidatorHandler; -import io.aklivity.zilla.runtime.model.core.config.StringValidatorConfig; +import io.aklivity.zilla.runtime.engine.model.ValidatorHandler; +import io.aklivity.zilla.runtime.engine.model.function.ValueConsumer; +import io.aklivity.zilla.runtime.model.core.config.StringModelConfig; public class StringValidatorTest { @Test public void shouldVerifyValidUtf8() { - StringValidatorConfig config = StringValidatorConfig.builder() + StringModelConfig config = StringModelConfig.builder() .encoding("utf_8") .build(); StringValidatorHandler handler = new StringValidatorHandler(config); @@ -44,7 +44,7 @@ public void shouldVerifyValidUtf8() @Test public void shouldVerifyFragmentedValidUtf8() { - StringValidatorConfig config = StringValidatorConfig.builder() + StringModelConfig config = StringModelConfig.builder() .encoding("utf_8") .build(); StringValidatorHandler handler = new StringValidatorHandler(config); @@ -65,7 +65,7 @@ public void shouldVerifyFragmentedValidUtf8() @Test public void shouldVerifyFragmentedInValidUtf8() { - StringValidatorConfig config = StringValidatorConfig.builder() + StringModelConfig config = StringModelConfig.builder() .encoding("utf_8") .build(); StringValidatorHandler handler = new StringValidatorHandler(config); @@ -90,7 +90,10 @@ public void shouldVerifyFragmentedInValidUtf8() @Test public void shouldVerifyWithPendingCharBytes() { - StringValidatorHandler handler = new StringValidatorHandler(new StringValidatorConfig("utf_8")); + StringModelConfig config = StringModelConfig.builder() + .encoding("utf_8") + .build(); + StringValidatorHandler handler = new StringValidatorHandler(config); UnsafeBuffer data = new UnsafeBuffer(); byte[] bytes = {(byte) 0xc3, (byte) 0xa4}; diff --git a/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/config/IntegerConverterConfigAdapterTest.java b/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/config/IntegerModelConfigAdapterTest.java similarity index 83% rename from incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/config/IntegerConverterConfigAdapterTest.java rename to incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/config/IntegerModelConfigAdapterTest.java index 8de5779925..558f705713 100644 --- a/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/config/IntegerConverterConfigAdapterTest.java +++ b/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/config/IntegerModelConfigAdapterTest.java @@ -26,9 +26,9 @@ import org.junit.Before; import org.junit.Test; -import io.aklivity.zilla.runtime.model.core.config.IntegerConverterConfig; +import io.aklivity.zilla.runtime.model.core.config.IntegerModelConfig; -public class IntegerConverterConfigAdapterTest +public class IntegerModelConfigAdapterTest { private Jsonb jsonb; @@ -36,7 +36,7 @@ public class IntegerConverterConfigAdapterTest public void initJson() { JsonbConfig config = new JsonbConfig() - .withAdapters(new IntegerConverterConfigAdapter()); + .withAdapters(new IntegerModelConfigAdapter()); jsonb = JsonbBuilder.create(config); } @@ -50,7 +50,7 @@ public void shouldReadIntegerconverter() "}"; // WHEN - IntegerConverterConfig converter = jsonb.fromJson(json, IntegerConverterConfig.class); + IntegerModelConfig converter = jsonb.fromJson(json, IntegerModelConfig.class); // THEN assertThat(converter, not(nullValue())); @@ -62,7 +62,7 @@ public void shouldWriteIntegerconverter() { // GIVEN String expectedJson = "\"integer\""; - IntegerConverterConfig converter = IntegerConverterConfig.builder().build(); + IntegerModelConfig converter = IntegerModelConfig.builder().build(); // WHEN String json = jsonb.toJson(converter); diff --git a/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/config/IntegerValidatorConfigAdapterTest.java b/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/config/IntegerValidatorConfigAdapterTest.java deleted file mode 100644 index 34ad733d24..0000000000 --- a/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/config/IntegerValidatorConfigAdapterTest.java +++ /dev/null @@ -1,74 +0,0 @@ -/* - * 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.model.core.internal.config; - -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.not; -import static org.hamcrest.Matchers.nullValue; - -import jakarta.json.bind.Jsonb; -import jakarta.json.bind.JsonbBuilder; -import jakarta.json.bind.JsonbConfig; - -import org.junit.Before; -import org.junit.Test; - -import io.aklivity.zilla.runtime.model.core.config.IntegerValidatorConfig; - -public class IntegerValidatorConfigAdapterTest -{ - private Jsonb jsonb; - - @Before - public void initJson() - { - JsonbConfig config = new JsonbConfig() - .withAdapters(new IntegerValidatorConfigAdapter()); - jsonb = JsonbBuilder.create(config); - } - - @Test - public void shouldReadIntegerValidator() - { - // GIVEN - String json = - "{" + - "\"type\": \"integer\"" + - "}"; - - // WHEN - IntegerValidatorConfig config = jsonb.fromJson(json, IntegerValidatorConfig.class); - - // THEN - assertThat(config, not(nullValue())); - assertThat(config.type, equalTo("integer")); - } - - @Test - public void shouldWriteIntegerValidator() - { - // GIVEN - String expectedJson = "\"integer\""; - IntegerValidatorConfig config = IntegerValidatorConfig.builder().build(); - - // WHEN - String json = jsonb.toJson(config); - - // THEN - assertThat(json, not(nullValue())); - assertThat(json, equalTo(expectedJson)); - } -} diff --git a/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/config/StringConverterConfigAdapterTest.java b/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/config/StringModelConfigAdapterTest.java similarity index 84% rename from incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/config/StringConverterConfigAdapterTest.java rename to incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/config/StringModelConfigAdapterTest.java index 7f4076abfc..17df835fbc 100644 --- a/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/config/StringConverterConfigAdapterTest.java +++ b/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/config/StringModelConfigAdapterTest.java @@ -26,9 +26,9 @@ import org.junit.Before; import org.junit.Test; -import io.aklivity.zilla.runtime.model.core.config.StringConverterConfig; +import io.aklivity.zilla.runtime.model.core.config.StringModelConfig; -public class StringConverterConfigAdapterTest +public class StringModelConfigAdapterTest { private Jsonb jsonb; @@ -36,7 +36,7 @@ public class StringConverterConfigAdapterTest public void initJson() { JsonbConfig config = new JsonbConfig() - .withAdapters(new StringConverterConfigAdapter()); + .withAdapters(new StringModelConfigAdapter()); jsonb = JsonbBuilder.create(config); } @@ -51,7 +51,7 @@ public void shouldReadStringconverter() "}"; // WHEN - StringConverterConfig converter = jsonb.fromJson(json, StringConverterConfig.class); + StringModelConfig converter = jsonb.fromJson(json, StringModelConfig.class); // THEN assertThat(converter, not(nullValue())); @@ -64,7 +64,7 @@ public void shouldWriteDefaultEncodingStringconverter() { // GIVEN String expectedJson = "\"string\""; - StringConverterConfig converter = StringConverterConfig.builder().build(); + StringModelConfig converter = StringModelConfig.builder().build(); // WHEN String json = jsonb.toJson(converter); @@ -83,7 +83,7 @@ public void shouldWriteStringconverter() "\"type\":\"string\"," + "\"encoding\":\"utf_16\"" + "}"; - StringConverterConfig converter = StringConverterConfig.builder() + StringModelConfig converter = StringModelConfig.builder() .encoding("utf_16") .build(); diff --git a/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/config/StringValidatorConfigAdapterTest.java b/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/config/StringValidatorConfigAdapterTest.java deleted file mode 100644 index a9276ea11e..0000000000 --- a/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/config/StringValidatorConfigAdapterTest.java +++ /dev/null @@ -1,97 +0,0 @@ -/* - * 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.model.core.internal.config; - -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.not; -import static org.hamcrest.Matchers.nullValue; - -import jakarta.json.bind.Jsonb; -import jakarta.json.bind.JsonbBuilder; -import jakarta.json.bind.JsonbConfig; - -import org.junit.Before; -import org.junit.Test; - -import io.aklivity.zilla.runtime.model.core.config.StringValidatorConfig; - -public class StringValidatorConfigAdapterTest -{ - private Jsonb jsonb; - - @Before - public void initJson() - { - JsonbConfig config = new JsonbConfig() - .withAdapters(new StringValidatorConfigAdapter()); - jsonb = JsonbBuilder.create(config); - } - - @Test - public void shouldReadStringValidator() - { - // GIVEN - String json = - "{" + - "\"type\": \"string\"," + - "\"encoding\": \"utf_8\"" + - "}"; - - // WHEN - StringValidatorConfig config = jsonb.fromJson(json, StringValidatorConfig.class); - - // THEN - assertThat(config, not(nullValue())); - assertThat(config.type, equalTo("string")); - assertThat(config.encoding, equalTo("utf_8")); - } - - @Test - public void shouldWriteDefaultEncodingStringValidator() - { - // GIVEN - String expectedJson = "\"string\""; - StringValidatorConfig config = StringValidatorConfig.builder().build(); - - // WHEN - String json = jsonb.toJson(config); - - // THEN - assertThat(json, not(nullValue())); - assertThat(json, equalTo(expectedJson)); - } - - @Test - public void shouldWriteStringValidator() - { - // GIVEN - String expectedJson = - "{" + - "\"type\":\"string\"," + - "\"encoding\":\"utf_16\"" + - "}"; - StringValidatorConfig config = StringValidatorConfig.builder() - .encoding("utf_16") - .build(); - - // WHEN - String json = jsonb.toJson(config); - - // THEN - assertThat(json, not(nullValue())); - assertThat(json, equalTo(expectedJson)); - } -} diff --git a/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/config/JsonConverterConfig.java b/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/config/JsonConverterConfig.java deleted file mode 100644 index c21f6b7319..0000000000 --- a/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/config/JsonConverterConfig.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * 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.model.json.config; - -import java.util.List; -import java.util.function.Function; - -import io.aklivity.zilla.runtime.engine.config.CatalogedConfig; -import io.aklivity.zilla.runtime.engine.config.ConverterConfig; - -public final class JsonConverterConfig extends ConverterConfig -{ - public final String subject; - - public JsonConverterConfig( - List cataloged, - String subject) - { - super("json", cataloged); - this.subject = subject; - } - - public static JsonConverterConfigBuilder builder( - Function mapper) - { - return new JsonConverterConfigBuilder<>(mapper::apply); - } - - public static JsonConverterConfigBuilder builder() - { - return new JsonConverterConfigBuilder<>(JsonConverterConfig.class::cast); - } -} diff --git a/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/config/JsonConverterConfigBuilder.java b/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/config/JsonConverterConfigBuilder.java deleted file mode 100644 index 909ca8bb45..0000000000 --- a/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/config/JsonConverterConfigBuilder.java +++ /dev/null @@ -1,73 +0,0 @@ -/* - * 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.model.json.config; - -import java.util.LinkedList; -import java.util.List; -import java.util.function.Function; - -import io.aklivity.zilla.runtime.engine.config.CatalogedConfig; -import io.aklivity.zilla.runtime.engine.config.CatalogedConfigBuilder; -import io.aklivity.zilla.runtime.engine.config.ConfigBuilder; - -public class JsonConverterConfigBuilder extends ConfigBuilder> -{ - private final Function mapper; - - private List catalogs; - private String subject; - - JsonConverterConfigBuilder( - Function mapper) - { - this.mapper = mapper; - } - - @Override - @SuppressWarnings("unchecked") - protected Class> thisType() - { - return (Class>) getClass(); - } - - public CatalogedConfigBuilder> catalog() - { - return CatalogedConfig.builder(this::catalog); - } - - public JsonConverterConfigBuilder subject( - String subject) - { - this.subject = subject; - return this; - } - - public JsonConverterConfigBuilder catalog( - CatalogedConfig catalog) - { - if (catalogs == null) - { - catalogs = new LinkedList<>(); - } - catalogs.add(catalog); - return this; - } - - @Override - public T build() - { - return mapper.apply(new JsonConverterConfig(catalogs, subject)); - } -} diff --git a/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/config/JsonValidatorConfig.java b/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/config/JsonModelConfig.java similarity index 66% rename from incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/config/JsonValidatorConfig.java rename to incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/config/JsonModelConfig.java index f1fb948eaf..b2dbbcfb23 100644 --- a/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/config/JsonValidatorConfig.java +++ b/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/config/JsonModelConfig.java @@ -18,13 +18,13 @@ import java.util.function.Function; import io.aklivity.zilla.runtime.engine.config.CatalogedConfig; -import io.aklivity.zilla.runtime.engine.config.ValidatorConfig; +import io.aklivity.zilla.runtime.engine.config.ModelConfig; -public final class JsonValidatorConfig extends ValidatorConfig +public final class JsonModelConfig extends ModelConfig { public final String subject; - public JsonValidatorConfig( + public JsonModelConfig( List cataloged, String subject) { @@ -32,14 +32,14 @@ public JsonValidatorConfig( this.subject = subject; } - public static JsonValidatorConfigBuilder builder( - Function mapper) + public static JsonModelConfigBuilder builder( + Function mapper) { - return new JsonValidatorConfigBuilder<>(mapper::apply); + return new JsonModelConfigBuilder<>(mapper::apply); } - public static JsonValidatorConfigBuilder builder() + public static JsonModelConfigBuilder builder() { - return new JsonValidatorConfigBuilder<>(JsonValidatorConfig.class::cast); + return new JsonModelConfigBuilder<>(JsonModelConfig.class::cast); } } diff --git a/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/config/JsonValidatorConfigBuilder.java b/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/config/JsonModelConfigBuilder.java similarity index 71% rename from incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/config/JsonValidatorConfigBuilder.java rename to incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/config/JsonModelConfigBuilder.java index 177df4f004..ea7e7bc99c 100644 --- a/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/config/JsonValidatorConfigBuilder.java +++ b/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/config/JsonModelConfigBuilder.java @@ -22,39 +22,39 @@ import io.aklivity.zilla.runtime.engine.config.CatalogedConfigBuilder; import io.aklivity.zilla.runtime.engine.config.ConfigBuilder; -public class JsonValidatorConfigBuilder extends ConfigBuilder> +public class JsonModelConfigBuilder extends ConfigBuilder> { - private final Function mapper; + private final Function mapper; private List catalogs; private String subject; - JsonValidatorConfigBuilder( - Function mapper) + JsonModelConfigBuilder( + Function mapper) { this.mapper = mapper; } @Override @SuppressWarnings("unchecked") - protected Class> thisType() + protected Class> thisType() { - return (Class>) getClass(); + return (Class>) getClass(); } - public CatalogedConfigBuilder> catalog() + public CatalogedConfigBuilder> catalog() { return CatalogedConfig.builder(this::catalog); } - public JsonValidatorConfigBuilder subject( + public JsonModelConfigBuilder subject( String subject) { this.subject = subject; return this; } - public JsonValidatorConfigBuilder catalog( + public JsonModelConfigBuilder catalog( CatalogedConfig catalog) { if (catalogs == null) @@ -68,6 +68,6 @@ public JsonValidatorConfigBuilder catalog( @Override public T build() { - return mapper.apply(new JsonValidatorConfig(catalogs, subject)); + return mapper.apply(new JsonModelConfig(catalogs, subject)); } } diff --git a/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/JsonConverter.java b/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/JsonConverter.java deleted file mode 100644 index bdea97d6ae..0000000000 --- a/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/JsonConverter.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * 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.model.json.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 JsonConverter implements Converter -{ - public static final String NAME = "json"; - - @Override - public String name() - { - return NAME; - } - - @Override - public ConverterContext supply( - EngineContext context) - { - return new JsonConverterContext(context); - } - - @Override - public URL type() - { - return getClass().getResource("schema/json.schema.patch.json"); - } -} diff --git a/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/JsonConverterContext.java b/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/JsonConverterContext.java deleted file mode 100644 index 1b0d86307e..0000000000 --- a/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/JsonConverterContext.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * 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.model.json.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.model.json.config.JsonConverterConfig; - -public class JsonConverterContext implements ConverterContext -{ - private final LongFunction supplyCatalog; - - public JsonConverterContext(EngineContext context) - { - this.supplyCatalog = context::supplyCatalog; - } - - @Override - public ConverterHandler supplyReadHandler( - ConverterConfig config) - { - return new JsonReadConverterHandler(JsonConverterConfig.class.cast(config), supplyCatalog); - } - - @Override - public ConverterHandler supplyWriteHandler( - ConverterConfig config) - { - return new JsonWriteConverterHandler(JsonConverterConfig.class.cast(config), supplyCatalog); - } -} diff --git a/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/JsonConverterHandler.java b/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/JsonConverterHandler.java index d98f425173..ef4b254b31 100644 --- a/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/JsonConverterHandler.java +++ b/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/JsonConverterHandler.java @@ -33,7 +33,7 @@ import io.aklivity.zilla.runtime.engine.catalog.CatalogHandler; import io.aklivity.zilla.runtime.engine.config.CatalogedConfig; import io.aklivity.zilla.runtime.engine.config.SchemaConfig; -import io.aklivity.zilla.runtime.model.json.config.JsonConverterConfig; +import io.aklivity.zilla.runtime.model.json.config.JsonModelConfig; public abstract class JsonConverterHandler { @@ -49,7 +49,7 @@ public abstract class JsonConverterHandler private DirectBufferInputStream in; public JsonConverterHandler( - JsonConverterConfig config, + JsonModelConfig config, LongFunction supplyCatalog) { this.schemaProvider = JsonProvider.provider(); diff --git a/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/JsonValidator.java b/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/JsonModel.java similarity index 79% rename from incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/JsonValidator.java rename to incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/JsonModel.java index be4af83dbc..4d0ac6d9a8 100644 --- a/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/JsonValidator.java +++ b/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/JsonModel.java @@ -17,10 +17,10 @@ import java.net.URL; import io.aklivity.zilla.runtime.engine.EngineContext; -import io.aklivity.zilla.runtime.engine.validator.Validator; -import io.aklivity.zilla.runtime.engine.validator.ValidatorContext; +import io.aklivity.zilla.runtime.engine.model.Model; +import io.aklivity.zilla.runtime.engine.model.ModelContext; -public class JsonValidator implements Validator +public class JsonModel implements Model { public static final String NAME = "json"; @@ -31,10 +31,10 @@ public String name() } @Override - public ValidatorContext supply( + public ModelContext supply( EngineContext context) { - return new JsonValidatorContext(context); + return new JsonModelContext(context); } @Override diff --git a/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/JsonValidatorContext.java b/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/JsonModelContext.java similarity index 50% rename from incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/JsonValidatorContext.java rename to incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/JsonModelContext.java index 6105d42f30..ac77d3e9b7 100644 --- a/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/JsonValidatorContext.java +++ b/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/JsonModelContext.java @@ -18,25 +18,39 @@ import io.aklivity.zilla.runtime.engine.EngineContext; import io.aklivity.zilla.runtime.engine.catalog.CatalogHandler; -import io.aklivity.zilla.runtime.engine.config.ValidatorConfig; -import io.aklivity.zilla.runtime.engine.validator.ValidatorContext; -import io.aklivity.zilla.runtime.engine.validator.ValidatorHandler; -import io.aklivity.zilla.runtime.model.json.config.JsonValidatorConfig; +import io.aklivity.zilla.runtime.engine.config.ModelConfig; +import io.aklivity.zilla.runtime.engine.model.ConverterHandler; +import io.aklivity.zilla.runtime.engine.model.ModelContext; +import io.aklivity.zilla.runtime.engine.model.ValidatorHandler; +import io.aklivity.zilla.runtime.model.json.config.JsonModelConfig; -public class JsonValidatorContext implements ValidatorContext +public class JsonModelContext implements ModelContext { private final LongFunction supplyCatalog; - public JsonValidatorContext( - EngineContext context) + public JsonModelContext(EngineContext context) { this.supplyCatalog = context::supplyCatalog; } @Override - public ValidatorHandler supplyHandler( - ValidatorConfig config) + public ConverterHandler supplyReadConverterHandler( + ModelConfig config) { - return new JsonValidatorHandler(JsonValidatorConfig.class.cast(config), supplyCatalog); + return new JsonReadConverterHandler(JsonModelConfig.class.cast(config), supplyCatalog); + } + + @Override + public ConverterHandler supplyWriteConverterHandler( + ModelConfig config) + { + return new JsonWriteConverterHandler(JsonModelConfig.class.cast(config), supplyCatalog); + } + + @Override + public ValidatorHandler supplyValidatorHandler( + ModelConfig config) + { + return new JsonValidatorHandler(JsonModelConfig.class.cast(config), supplyCatalog); } } diff --git a/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/JsonConverterFactorySpi.java b/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/JsonModelFactorySpi.java similarity index 75% rename from incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/JsonConverterFactorySpi.java rename to incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/JsonModelFactorySpi.java index 3fa3159972..7e6bb725d2 100644 --- a/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/JsonConverterFactorySpi.java +++ b/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/JsonModelFactorySpi.java @@ -17,15 +17,15 @@ import java.net.URL; 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.engine.model.Model; +import io.aklivity.zilla.runtime.engine.model.ModelFactorySpi; -public final class JsonConverterFactorySpi implements ConverterFactorySpi +public final class JsonModelFactorySpi implements ModelFactorySpi { @Override public String type() { - return JsonConverter.NAME; + return JsonModel.NAME; } public URL schema() @@ -34,9 +34,9 @@ public URL schema() } @Override - public Converter create( + public Model create( Configuration config) { - return new JsonConverter(); + return new JsonModel(); } } diff --git a/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/JsonReadConverterHandler.java b/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/JsonReadConverterHandler.java index 1d7244a670..2b0137f595 100644 --- a/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/JsonReadConverterHandler.java +++ b/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/JsonReadConverterHandler.java @@ -21,14 +21,14 @@ import org.agrona.DirectBuffer; import io.aklivity.zilla.runtime.engine.catalog.CatalogHandler; -import io.aklivity.zilla.runtime.engine.converter.ConverterHandler; -import io.aklivity.zilla.runtime.engine.converter.function.ValueConsumer; -import io.aklivity.zilla.runtime.model.json.config.JsonConverterConfig; +import io.aklivity.zilla.runtime.engine.model.ConverterHandler; +import io.aklivity.zilla.runtime.engine.model.function.ValueConsumer; +import io.aklivity.zilla.runtime.model.json.config.JsonModelConfig; public class JsonReadConverterHandler extends JsonConverterHandler implements ConverterHandler { public JsonReadConverterHandler( - JsonConverterConfig config, + JsonModelConfig config, LongFunction supplyCatalog) { super(config, supplyCatalog); diff --git a/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/JsonValidatorFactorySpi.java b/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/JsonValidatorFactorySpi.java deleted file mode 100644 index a28f7d01b7..0000000000 --- a/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/JsonValidatorFactorySpi.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * 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.model.json.internal; - -import io.aklivity.zilla.runtime.engine.Configuration; -import io.aklivity.zilla.runtime.engine.validator.Validator; -import io.aklivity.zilla.runtime.engine.validator.ValidatorFactorySpi; - -public class JsonValidatorFactorySpi implements ValidatorFactorySpi -{ - @Override - public String type() - { - return JsonValidator.NAME; - } - - @Override - public Validator create( - Configuration config) - { - return new JsonValidator(); - } -} diff --git a/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/JsonValidatorHandler.java b/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/JsonValidatorHandler.java index 0ea855d02c..abe45e9a53 100644 --- a/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/JsonValidatorHandler.java +++ b/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/JsonValidatorHandler.java @@ -34,9 +34,9 @@ import io.aklivity.zilla.runtime.engine.catalog.CatalogHandler; import io.aklivity.zilla.runtime.engine.config.CatalogedConfig; import io.aklivity.zilla.runtime.engine.config.SchemaConfig; -import io.aklivity.zilla.runtime.engine.converter.function.ValueConsumer; -import io.aklivity.zilla.runtime.engine.validator.ValidatorHandler; -import io.aklivity.zilla.runtime.model.json.config.JsonValidatorConfig; +import io.aklivity.zilla.runtime.engine.model.ValidatorHandler; +import io.aklivity.zilla.runtime.engine.model.function.ValueConsumer; +import io.aklivity.zilla.runtime.model.json.config.JsonModelConfig; public class JsonValidatorHandler implements ValidatorHandler { @@ -55,7 +55,7 @@ public class JsonValidatorHandler implements ValidatorHandler private int progress; public JsonValidatorHandler( - JsonValidatorConfig config, + JsonModelConfig config, LongFunction supplyCatalog) { this.schemaProvider = JsonProvider.provider(); diff --git a/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/JsonWriteConverterHandler.java b/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/JsonWriteConverterHandler.java index 3e907ed809..de9fc5bc53 100644 --- a/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/JsonWriteConverterHandler.java +++ b/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/JsonWriteConverterHandler.java @@ -19,14 +19,14 @@ import org.agrona.DirectBuffer; import io.aklivity.zilla.runtime.engine.catalog.CatalogHandler; -import io.aklivity.zilla.runtime.engine.converter.ConverterHandler; -import io.aklivity.zilla.runtime.engine.converter.function.ValueConsumer; -import io.aklivity.zilla.runtime.model.json.config.JsonConverterConfig; +import io.aklivity.zilla.runtime.engine.model.ConverterHandler; +import io.aklivity.zilla.runtime.engine.model.function.ValueConsumer; +import io.aklivity.zilla.runtime.model.json.config.JsonModelConfig; public class JsonWriteConverterHandler extends JsonConverterHandler implements ConverterHandler { public JsonWriteConverterHandler( - JsonConverterConfig config, + JsonModelConfig config, LongFunction supplyCatalog) { super(config, supplyCatalog); diff --git a/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/config/JsonConverterConfigAdapter.java b/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/config/JsonModelConfigAdapter.java similarity index 85% rename from incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/config/JsonConverterConfigAdapter.java rename to incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/config/JsonModelConfigAdapter.java index fa53646d2f..aac79a1f3b 100644 --- a/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/config/JsonConverterConfigAdapter.java +++ b/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/config/JsonModelConfigAdapter.java @@ -26,13 +26,13 @@ import jakarta.json.bind.adapter.JsonbAdapter; import io.aklivity.zilla.runtime.engine.config.CatalogedConfig; -import io.aklivity.zilla.runtime.engine.config.ConverterConfig; -import io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi; +import io.aklivity.zilla.runtime.engine.config.ModelConfig; +import io.aklivity.zilla.runtime.engine.config.ModelConfigAdapterSpi; import io.aklivity.zilla.runtime.engine.config.SchemaConfig; import io.aklivity.zilla.runtime.engine.config.SchemaConfigAdapter; -import io.aklivity.zilla.runtime.model.json.config.JsonConverterConfig; +import io.aklivity.zilla.runtime.model.json.config.JsonModelConfig; -public final class JsonConverterConfigAdapter implements ConverterConfigAdapterSpi, JsonbAdapter +public final class JsonModelConfigAdapter implements ModelConfigAdapterSpi, JsonbAdapter { private static final String JSON = "json"; private static final String TYPE_NAME = "type"; @@ -49,9 +49,9 @@ public String type() @Override public JsonValue adaptToJson( - ConverterConfig config) + ModelConfig config) { - JsonConverterConfig jsonConfig = (JsonConverterConfig) config; + JsonModelConfig jsonConfig = (JsonModelConfig) config; JsonObjectBuilder converter = Json.createObjectBuilder(); converter.add(TYPE_NAME, JSON); if (jsonConfig.cataloged != null && !jsonConfig.cataloged.isEmpty()) @@ -72,7 +72,7 @@ public JsonValue adaptToJson( } @Override - public ConverterConfig adaptFromJson( + public ModelConfig adaptFromJson( JsonValue value) { JsonObject object = (JsonObject) value; @@ -98,6 +98,6 @@ public ConverterConfig adaptFromJson( ? object.getString(SUBJECT_NAME) : null; - return new JsonConverterConfig(catalogs, subject); + return new JsonModelConfig(catalogs, subject); } } diff --git a/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/config/JsonValidatorConfigAdapter.java b/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/config/JsonValidatorConfigAdapter.java deleted file mode 100644 index 97a513f45b..0000000000 --- a/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/config/JsonValidatorConfigAdapter.java +++ /dev/null @@ -1,103 +0,0 @@ -/* - * 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.model.json.internal.config; - -import java.util.LinkedList; -import java.util.List; - -import jakarta.json.Json; -import jakarta.json.JsonArray; -import jakarta.json.JsonArrayBuilder; -import jakarta.json.JsonObject; -import jakarta.json.JsonObjectBuilder; -import jakarta.json.JsonValue; -import jakarta.json.bind.adapter.JsonbAdapter; - -import io.aklivity.zilla.runtime.engine.config.CatalogedConfig; -import io.aklivity.zilla.runtime.engine.config.SchemaConfig; -import io.aklivity.zilla.runtime.engine.config.SchemaConfigAdapter; -import io.aklivity.zilla.runtime.engine.config.ValidatorConfig; -import io.aklivity.zilla.runtime.engine.config.ValidatorConfigAdapterSpi; -import io.aklivity.zilla.runtime.model.json.config.JsonValidatorConfig; - -public final class JsonValidatorConfigAdapter implements ValidatorConfigAdapterSpi, JsonbAdapter -{ - private static final String JSON = "json"; - private static final String TYPE_NAME = "type"; - private static final String CATALOG_NAME = "catalog"; - private static final String SUBJECT_NAME = "subject"; - - private final SchemaConfigAdapter schema = new SchemaConfigAdapter(); - - @Override - public String type() - { - return JSON; - } - - @Override - public JsonValue adaptToJson( - ValidatorConfig config) - { - JsonValidatorConfig jsonConfig = (JsonValidatorConfig) config; - JsonObjectBuilder validator = Json.createObjectBuilder(); - validator.add(TYPE_NAME, JSON); - if (jsonConfig.cataloged != null && !jsonConfig.cataloged.isEmpty()) - { - JsonObjectBuilder catalogs = Json.createObjectBuilder(); - for (CatalogedConfig catalog : jsonConfig.cataloged) - { - JsonArrayBuilder array = Json.createArrayBuilder(); - for (SchemaConfig schemaItem: catalog.schemas) - { - array.add(schema.adaptToJson(schemaItem)); - } - catalogs.add(catalog.name, array); - } - validator.add(CATALOG_NAME, catalogs); - } - return validator.build(); - } - - @Override - public ValidatorConfig adaptFromJson( - JsonValue value) - { - JsonObject object = (JsonObject) value; - - assert object.containsKey(CATALOG_NAME); - - JsonObject catalogsJson = object.getJsonObject(CATALOG_NAME); - List catalogs = new LinkedList<>(); - for (String catalogName: catalogsJson.keySet()) - { - JsonArray schemasJson = catalogsJson.getJsonArray(catalogName); - List schemas = new LinkedList<>(); - for (JsonValue item : schemasJson) - { - JsonObject schemaJson = (JsonObject) item; - SchemaConfig schemaElement = schema.adaptFromJson(schemaJson); - schemas.add(schemaElement); - } - catalogs.add(new CatalogedConfig(catalogName, schemas)); - } - - String subject = object.containsKey(SUBJECT_NAME) - ? object.getString(SUBJECT_NAME) - : null; - - return new JsonValidatorConfig(catalogs, subject); - } -} diff --git a/incubator/model-json/src/main/moditect/module-info.java b/incubator/model-json/src/main/moditect/module-info.java index 0f9b6aac95..3e7d30ffb7 100644 --- a/incubator/model-json/src/main/moditect/module-info.java +++ b/incubator/model-json/src/main/moditect/module-info.java @@ -20,16 +20,9 @@ exports io.aklivity.zilla.runtime.model.json.config; - provides io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi - with io.aklivity.zilla.runtime.model.json.internal.config.JsonConverterConfigAdapter; - - provides io.aklivity.zilla.runtime.engine.converter.ConverterFactorySpi - with io.aklivity.zilla.runtime.model.json.internal.JsonConverterFactorySpi; - - provides io.aklivity.zilla.runtime.engine.config.ValidatorConfigAdapterSpi - with io.aklivity.zilla.runtime.model.json.internal.config.JsonValidatorConfigAdapter; - - provides io.aklivity.zilla.runtime.engine.validator.ValidatorFactorySpi - with io.aklivity.zilla.runtime.model.json.internal.JsonValidatorFactorySpi; + provides io.aklivity.zilla.runtime.engine.config.ModelConfigAdapterSpi + with io.aklivity.zilla.runtime.model.json.internal.config.JsonModelConfigAdapter; + provides io.aklivity.zilla.runtime.engine.model.ModelFactorySpi + with io.aklivity.zilla.runtime.model.json.internal.JsonModelFactorySpi; } diff --git a/incubator/model-json/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi b/incubator/model-json/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi deleted file mode 100644 index c3045020c0..0000000000 --- a/incubator/model-json/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi +++ /dev/null @@ -1 +0,0 @@ -io.aklivity.zilla.runtime.model.json.internal.config.JsonConverterConfigAdapter diff --git a/incubator/model-json/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ModelConfigAdapterSpi b/incubator/model-json/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ModelConfigAdapterSpi new file mode 100644 index 0000000000..5e6f55c3ba --- /dev/null +++ b/incubator/model-json/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ModelConfigAdapterSpi @@ -0,0 +1 @@ +io.aklivity.zilla.runtime.model.json.internal.config.JsonModelConfigAdapter diff --git a/incubator/model-json/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ValidatorConfigAdapterSpi b/incubator/model-json/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ValidatorConfigAdapterSpi deleted file mode 100644 index 202ebf6fe8..0000000000 --- a/incubator/model-json/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ValidatorConfigAdapterSpi +++ /dev/null @@ -1 +0,0 @@ -io.aklivity.zilla.runtime.model.json.internal.config.JsonValidatorConfigAdapter diff --git a/incubator/model-json/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.converter.ConverterFactorySpi b/incubator/model-json/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.converter.ConverterFactorySpi deleted file mode 100644 index 0b555f1357..0000000000 --- a/incubator/model-json/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.converter.ConverterFactorySpi +++ /dev/null @@ -1 +0,0 @@ -io.aklivity.zilla.runtime.model.json.internal.JsonConverterFactorySpi diff --git a/incubator/model-json/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.model.ModelFactorySpi b/incubator/model-json/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.model.ModelFactorySpi new file mode 100644 index 0000000000..816e864ae6 --- /dev/null +++ b/incubator/model-json/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.model.ModelFactorySpi @@ -0,0 +1 @@ +io.aklivity.zilla.runtime.model.json.internal.JsonModelFactorySpi diff --git a/incubator/model-json/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.validator.ValidatorFactorySpi b/incubator/model-json/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.validator.ValidatorFactorySpi deleted file mode 100644 index e24d8333f4..0000000000 --- a/incubator/model-json/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.validator.ValidatorFactorySpi +++ /dev/null @@ -1 +0,0 @@ -io.aklivity.zilla.runtime.model.json.internal.JsonValidatorFactorySpi diff --git a/incubator/model-json/src/test/java/io/aklivity/zilla/runtime/model/json/internal/JsonConverterFactorySpiTest.java b/incubator/model-json/src/test/java/io/aklivity/zilla/runtime/model/json/internal/JsonConverterFactorySpiTest.java deleted file mode 100644 index ff32c56f5d..0000000000 --- a/incubator/model-json/src/test/java/io/aklivity/zilla/runtime/model/json/internal/JsonConverterFactorySpiTest.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * 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.model.json.internal; - -import static org.hamcrest.CoreMatchers.instanceOf; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.mockito.Mockito.mock; - -import org.junit.Test; - -import io.aklivity.zilla.runtime.engine.Configuration; -import io.aklivity.zilla.runtime.engine.EngineContext; -import io.aklivity.zilla.runtime.engine.config.ConverterConfig; -import io.aklivity.zilla.runtime.engine.converter.Converter; -import io.aklivity.zilla.runtime.engine.converter.ConverterContext; -import io.aklivity.zilla.runtime.engine.converter.ConverterFactory; -import io.aklivity.zilla.runtime.model.json.config.JsonConverterConfig; - -public class JsonConverterFactorySpiTest -{ - @Test - public void shouldCreateReader() - { - Configuration config = new Configuration(); - ConverterFactory factory = ConverterFactory.instantiate(); - Converter converter = factory.create("json", config); - - ConverterContext context = new JsonConverterContext(mock(EngineContext.class)); - - ConverterConfig converterConfig = JsonConverterConfig.builder() - .subject("test-value") - .catalog() - .name("test0") - .schema() - .subject("subject1") - .version("latest") - .build() - .build() - .build(); - - assertThat(converter, instanceOf(JsonConverter.class)); - assertThat(context.supplyReadHandler(converterConfig), instanceOf(JsonConverterHandler.class)); - assertThat(context.supplyWriteHandler(converterConfig), instanceOf(JsonConverterHandler.class)); - } -} diff --git a/incubator/model-json/src/test/java/io/aklivity/zilla/runtime/model/json/internal/JsonConverterTest.java b/incubator/model-json/src/test/java/io/aklivity/zilla/runtime/model/json/internal/JsonConverterTest.java index 37be5d0dcc..7043e8e70c 100644 --- a/incubator/model-json/src/test/java/io/aklivity/zilla/runtime/model/json/internal/JsonConverterTest.java +++ b/incubator/model-json/src/test/java/io/aklivity/zilla/runtime/model/json/internal/JsonConverterTest.java @@ -33,10 +33,10 @@ import io.aklivity.zilla.runtime.engine.catalog.CatalogContext; import io.aklivity.zilla.runtime.engine.catalog.CatalogHandler; import io.aklivity.zilla.runtime.engine.config.CatalogConfig; -import io.aklivity.zilla.runtime.engine.converter.function.ValueConsumer; +import io.aklivity.zilla.runtime.engine.model.function.ValueConsumer; import io.aklivity.zilla.runtime.engine.test.internal.catalog.TestCatalog; import io.aklivity.zilla.runtime.engine.test.internal.catalog.config.TestCatalogOptionsConfig; -import io.aklivity.zilla.runtime.model.json.config.JsonConverterConfig; +import io.aklivity.zilla.runtime.model.json.config.JsonModelConfig; public class JsonConverterTest { @@ -63,7 +63,7 @@ public class JsonConverterTest OBJECT_SCHEMA + "}"; - private final JsonConverterConfig config = JsonConverterConfig.builder() + private final JsonModelConfig config = JsonModelConfig.builder() .catalog() .name("test0") .schema() diff --git a/incubator/model-json/src/test/java/io/aklivity/zilla/runtime/model/json/internal/JsonValidatorFactorySpiTest.java b/incubator/model-json/src/test/java/io/aklivity/zilla/runtime/model/json/internal/JsonModelFactorySpiTest.java similarity index 60% rename from incubator/model-json/src/test/java/io/aklivity/zilla/runtime/model/json/internal/JsonValidatorFactorySpiTest.java rename to incubator/model-json/src/test/java/io/aklivity/zilla/runtime/model/json/internal/JsonModelFactorySpiTest.java index bac9c86d94..6b0d571329 100644 --- a/incubator/model-json/src/test/java/io/aklivity/zilla/runtime/model/json/internal/JsonValidatorFactorySpiTest.java +++ b/incubator/model-json/src/test/java/io/aklivity/zilla/runtime/model/json/internal/JsonModelFactorySpiTest.java @@ -22,24 +22,24 @@ import io.aklivity.zilla.runtime.engine.Configuration; import io.aklivity.zilla.runtime.engine.EngineContext; -import io.aklivity.zilla.runtime.engine.config.ValidatorConfig; -import io.aklivity.zilla.runtime.engine.validator.Validator; -import io.aklivity.zilla.runtime.engine.validator.ValidatorContext; -import io.aklivity.zilla.runtime.engine.validator.ValidatorFactory; -import io.aklivity.zilla.runtime.model.json.config.JsonValidatorConfig; +import io.aklivity.zilla.runtime.engine.config.ModelConfig; +import io.aklivity.zilla.runtime.engine.model.Model; +import io.aklivity.zilla.runtime.engine.model.ModelContext; +import io.aklivity.zilla.runtime.engine.model.ModelFactory; +import io.aklivity.zilla.runtime.model.json.config.JsonModelConfig; -public class JsonValidatorFactorySpiTest +public class JsonModelFactorySpiTest { @Test public void shouldCreateReader() { Configuration config = new Configuration(); - ValidatorFactory factory = ValidatorFactory.instantiate(); - Validator validator = factory.create("json", config); + ModelFactory factory = ModelFactory.instantiate(); + Model model = factory.create("json", config); - ValidatorContext context = new JsonValidatorContext(mock(EngineContext.class)); + ModelContext context = new JsonModelContext(mock(EngineContext.class)); - ValidatorConfig validatorConfig = JsonValidatorConfig.builder() + ModelConfig modelConfig = JsonModelConfig.builder() .subject("test-value") .catalog() .name("test0") @@ -50,7 +50,8 @@ public void shouldCreateReader() .build() .build(); - assertThat(validator, instanceOf(JsonValidator.class)); - assertThat(context.supplyHandler(validatorConfig), instanceOf(JsonValidatorHandler.class)); + assertThat(model, instanceOf(JsonModel.class)); + assertThat(context.supplyReadConverterHandler(modelConfig), instanceOf(JsonConverterHandler.class)); + assertThat(context.supplyWriteConverterHandler(modelConfig), instanceOf(JsonConverterHandler.class)); } } diff --git a/incubator/model-json/src/test/java/io/aklivity/zilla/runtime/model/json/internal/JsonValidatorTest.java b/incubator/model-json/src/test/java/io/aklivity/zilla/runtime/model/json/internal/JsonValidatorTest.java index 7780a27305..9cbb38d52f 100644 --- a/incubator/model-json/src/test/java/io/aklivity/zilla/runtime/model/json/internal/JsonValidatorTest.java +++ b/incubator/model-json/src/test/java/io/aklivity/zilla/runtime/model/json/internal/JsonValidatorTest.java @@ -15,8 +15,8 @@ package io.aklivity.zilla.runtime.model.json.internal; import static io.aklivity.zilla.runtime.engine.EngineConfiguration.ENGINE_DIRECTORY; -import static io.aklivity.zilla.runtime.engine.validator.ValidatorHandler.FLAGS_FIN; -import static io.aklivity.zilla.runtime.engine.validator.ValidatorHandler.FLAGS_INIT; +import static io.aklivity.zilla.runtime.engine.model.ValidatorHandler.FLAGS_FIN; +import static io.aklivity.zilla.runtime.engine.model.ValidatorHandler.FLAGS_INIT; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; @@ -35,10 +35,10 @@ import io.aklivity.zilla.runtime.engine.catalog.CatalogContext; import io.aklivity.zilla.runtime.engine.catalog.CatalogHandler; import io.aklivity.zilla.runtime.engine.config.CatalogConfig; -import io.aklivity.zilla.runtime.engine.converter.function.ValueConsumer; +import io.aklivity.zilla.runtime.engine.model.function.ValueConsumer; import io.aklivity.zilla.runtime.engine.test.internal.catalog.TestCatalog; import io.aklivity.zilla.runtime.engine.test.internal.catalog.config.TestCatalogOptionsConfig; -import io.aklivity.zilla.runtime.model.json.config.JsonValidatorConfig; +import io.aklivity.zilla.runtime.model.json.config.JsonModelConfig; public class JsonValidatorTest { @@ -65,7 +65,7 @@ public class JsonValidatorTest OBJECT_SCHEMA + "}"; - private final JsonValidatorConfig config = JsonValidatorConfig.builder() + private final JsonModelConfig config = JsonModelConfig.builder() .catalog() .name("test0") .schema() diff --git a/incubator/model-json/src/test/java/io/aklivity/zilla/runtime/model/json/internal/config/JsonConverterConfigAdapterTest.java b/incubator/model-json/src/test/java/io/aklivity/zilla/runtime/model/json/internal/config/JsonModelConfigAdapterTest.java similarity index 93% rename from incubator/model-json/src/test/java/io/aklivity/zilla/runtime/model/json/internal/config/JsonConverterConfigAdapterTest.java rename to incubator/model-json/src/test/java/io/aklivity/zilla/runtime/model/json/internal/config/JsonModelConfigAdapterTest.java index 55b9c119da..3851ab5032 100644 --- a/incubator/model-json/src/test/java/io/aklivity/zilla/runtime/model/json/internal/config/JsonConverterConfigAdapterTest.java +++ b/incubator/model-json/src/test/java/io/aklivity/zilla/runtime/model/json/internal/config/JsonModelConfigAdapterTest.java @@ -26,9 +26,9 @@ import org.junit.Before; import org.junit.Test; -import io.aklivity.zilla.runtime.model.json.config.JsonConverterConfig; +import io.aklivity.zilla.runtime.model.json.config.JsonModelConfig; -public class JsonConverterConfigAdapterTest +public class JsonModelConfigAdapterTest { private Jsonb jsonb; @@ -36,7 +36,7 @@ public class JsonConverterConfigAdapterTest public void initJson() { JsonbConfig config = new JsonbConfig() - .withAdapters(new JsonConverterConfigAdapter()); + .withAdapters(new JsonModelConfigAdapter()); jsonb = JsonbBuilder.create(config); } @@ -67,7 +67,7 @@ public void shouldReadJsonConverter() "}"; // WHEN - JsonConverterConfig config = jsonb.fromJson(json, JsonConverterConfig.class); + JsonModelConfig config = jsonb.fromJson(json, JsonModelConfig.class); // THEN assertThat(config, not(nullValue())); @@ -110,7 +110,7 @@ public void shouldWriteJsonConverter() "]" + "}" + "}"; - JsonConverterConfig config = JsonConverterConfig.builder() + JsonModelConfig config = JsonModelConfig.builder() .catalog() .name("test0") .schema() diff --git a/incubator/model-json/src/test/java/io/aklivity/zilla/runtime/model/json/internal/config/JsonValidatorConfigAdapterTest.java b/incubator/model-json/src/test/java/io/aklivity/zilla/runtime/model/json/internal/config/JsonValidatorConfigAdapterTest.java deleted file mode 100644 index 1b11e9c79b..0000000000 --- a/incubator/model-json/src/test/java/io/aklivity/zilla/runtime/model/json/internal/config/JsonValidatorConfigAdapterTest.java +++ /dev/null @@ -1,137 +0,0 @@ -/* - * 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.model.json.internal.config; - -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.not; -import static org.hamcrest.Matchers.nullValue; - -import jakarta.json.bind.Jsonb; -import jakarta.json.bind.JsonbBuilder; -import jakarta.json.bind.JsonbConfig; - -import org.junit.Before; -import org.junit.Test; - -import io.aklivity.zilla.runtime.model.json.config.JsonValidatorConfig; - -public class JsonValidatorConfigAdapterTest -{ - private Jsonb jsonb; - - @Before - public void initJson() - { - JsonbConfig config = new JsonbConfig() - .withAdapters(new JsonValidatorConfigAdapter()); - jsonb = JsonbBuilder.create(config); - } - - @Test - public void shouldReadJsonValidator() - { - // GIVEN - String json = - "{" + - "\"type\": \"json\"," + - "\"catalog\":" + - "{" + - "\"test0\":" + - "[" + - "{" + - "\"subject\": \"subject1\"," + - "\"version\": \"latest\"" + - "}," + - "{" + - "\"strategy\": \"topic\"," + - "\"version\": \"latest\"" + - "}," + - "{" + - "\"id\": 42" + - "}" + - "]" + - "}" + - "}"; - - // WHEN - JsonValidatorConfig config = jsonb.fromJson(json, JsonValidatorConfig.class); - - // THEN - assertThat(config, not(nullValue())); - assertThat(config.type, equalTo("json")); - assertThat(config.cataloged.size(), equalTo(1)); - assertThat(config.cataloged.get(0).name, equalTo("test0")); - assertThat(config.cataloged.get(0).schemas.get(0).subject, equalTo("subject1")); - assertThat(config.cataloged.get(0).schemas.get(0).version, equalTo("latest")); - assertThat(config.cataloged.get(0).schemas.get(0).id, equalTo(0)); - assertThat(config.cataloged.get(0).schemas.get(1).strategy, equalTo("topic")); - assertThat(config.cataloged.get(0).schemas.get(1).version, equalTo("latest")); - assertThat(config.cataloged.get(0).schemas.get(1).id, equalTo(0)); - assertThat(config.cataloged.get(0).schemas.get(2).strategy, nullValue()); - assertThat(config.cataloged.get(0).schemas.get(2).version, nullValue()); - assertThat(config.cataloged.get(0).schemas.get(2).id, equalTo(42)); - } - - @Test - public void shouldWriteJsonValidator() - { - // GIVEN - String expectedJson = - "{" + - "\"type\":\"json\"," + - "\"catalog\":" + - "{" + - "\"test0\":" + - "[" + - "{" + - "\"subject\":\"subject1\"," + - "\"version\":\"latest\"" + - "}," + - "{" + - "\"strategy\":\"topic\"," + - "\"version\":\"latest\"" + - "}," + - "{" + - "\"id\":42" + - "}" + - "]" + - "}" + - "}"; - JsonValidatorConfig config = JsonValidatorConfig.builder() - .catalog() - .name("test0") - .schema() - .subject("subject1") - .version("latest") - .build() - .schema() - .strategy("topic") - .version("latest") - .build() - .schema() - .id(42) - .build() - .build() - .build(); - - // WHEN - String json = jsonb.toJson(config); - - // THEN - assertThat(json, not(nullValue())); - assertThat(json, equalTo(expectedJson)); - } -} diff --git a/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/config/ProtobufConverterConfig.java b/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/config/ProtobufModelConfig.java similarity index 67% rename from incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/config/ProtobufConverterConfig.java rename to incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/config/ProtobufModelConfig.java index d0f2ef3aaa..b294cc3af9 100644 --- a/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/config/ProtobufConverterConfig.java +++ b/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/config/ProtobufModelConfig.java @@ -18,14 +18,14 @@ import java.util.function.Function; import io.aklivity.zilla.runtime.engine.config.CatalogedConfig; -import io.aklivity.zilla.runtime.engine.config.ConverterConfig; +import io.aklivity.zilla.runtime.engine.config.ModelConfig; -public final class ProtobufConverterConfig extends ConverterConfig +public final class ProtobufModelConfig extends ModelConfig { public final String subject; public final String format; - public ProtobufConverterConfig( + public ProtobufModelConfig( List cataloged, String subject, String format) @@ -35,14 +35,14 @@ public ProtobufConverterConfig( this.format = format; } - public static ProtobufConverterConfigBuilder builder( - Function mapper) + public static ProtobufModelConfigBuilder builder( + Function mapper) { - return new ProtobufConverterConfigBuilder<>(mapper::apply); + return new ProtobufModelConfigBuilder<>(mapper::apply); } - public static ProtobufConverterConfigBuilder builder() + public static ProtobufModelConfigBuilder builder() { - return new ProtobufConverterConfigBuilder<>(ProtobufConverterConfig.class::cast); + return new ProtobufModelConfigBuilder<>(ProtobufModelConfig.class::cast); } } diff --git a/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/config/ProtobufConverterConfigBuilder.java b/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/config/ProtobufModelConfigBuilder.java similarity index 69% rename from incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/config/ProtobufConverterConfigBuilder.java rename to incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/config/ProtobufModelConfigBuilder.java index 51ec2c3ad4..b9a7bdb539 100644 --- a/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/config/ProtobufConverterConfigBuilder.java +++ b/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/config/ProtobufModelConfigBuilder.java @@ -22,40 +22,40 @@ import io.aklivity.zilla.runtime.engine.config.CatalogedConfigBuilder; import io.aklivity.zilla.runtime.engine.config.ConfigBuilder; -public class ProtobufConverterConfigBuilder extends ConfigBuilder> +public class ProtobufModelConfigBuilder extends ConfigBuilder> { - private final Function mapper; + private final Function mapper; private List catalogs; private String subject; private String format; - ProtobufConverterConfigBuilder( - Function mapper) + ProtobufModelConfigBuilder( + Function mapper) { this.mapper = mapper; } @Override @SuppressWarnings("unchecked") - protected Class> thisType() + protected Class> thisType() { - return (Class>) getClass(); + return (Class>) getClass(); } - public CatalogedConfigBuilder> catalog() + public CatalogedConfigBuilder> catalog() { return CatalogedConfig.builder(this::catalog); } - public ProtobufConverterConfigBuilder subject( + public ProtobufModelConfigBuilder subject( String subject) { this.subject = subject; return this; } - public ProtobufConverterConfigBuilder catalog( + public ProtobufModelConfigBuilder catalog( CatalogedConfig catalog) { if (catalogs == null) @@ -66,7 +66,7 @@ public ProtobufConverterConfigBuilder catalog( return this; } - public ProtobufConverterConfigBuilder format( + public ProtobufModelConfigBuilder format( String format) { this.format = format; @@ -76,6 +76,6 @@ public ProtobufConverterConfigBuilder format( @Override public T build() { - return mapper.apply(new ProtobufConverterConfig(catalogs, subject, format)); + return mapper.apply(new ProtobufModelConfig(catalogs, subject, format)); } } diff --git a/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufConverterHandler.java b/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufConverterHandler.java index 0569dcf15b..ddbaca27a4 100644 --- a/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufConverterHandler.java +++ b/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufConverterHandler.java @@ -41,7 +41,7 @@ import io.aklivity.zilla.runtime.engine.catalog.CatalogHandler; import io.aklivity.zilla.runtime.engine.config.CatalogedConfig; import io.aklivity.zilla.runtime.engine.config.SchemaConfig; -import io.aklivity.zilla.runtime.model.protobuf.config.ProtobufConverterConfig; +import io.aklivity.zilla.runtime.model.protobuf.config.ProtobufModelConfig; import io.aklivity.zilla.runtime.model.protobuf.internal.parser.Protobuf3Lexer; import io.aklivity.zilla.runtime.model.protobuf.internal.parser.Protobuf3Parser; @@ -68,7 +68,7 @@ public class ProtobufConverterHandler private final Int2IntHashMap paddings; protected ProtobufConverterHandler( - ProtobufConverterConfig config, + ProtobufModelConfig config, LongFunction supplyCatalog) { CatalogedConfig cataloged = config.cataloged.get(0); diff --git a/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufConverter.java b/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufModel.java similarity index 79% rename from incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufConverter.java rename to incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufModel.java index 0d69300a5d..a5648f4288 100644 --- a/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufConverter.java +++ b/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufModel.java @@ -17,10 +17,10 @@ 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; +import io.aklivity.zilla.runtime.engine.model.Model; +import io.aklivity.zilla.runtime.engine.model.ModelContext; -public class ProtobufConverter implements Converter +public class ProtobufModel implements Model { public static final String NAME = "protobuf"; @@ -31,10 +31,10 @@ public String name() } @Override - public ConverterContext supply( + public ModelContext supply( EngineContext context) { - return new ProtobufConverterContext(context); + return new ProtobufModelContext(context); } @Override diff --git a/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufConverterContext.java b/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufModelContext.java similarity index 57% rename from incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufConverterContext.java rename to incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufModelContext.java index 7bac730634..6998afb18c 100644 --- a/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufConverterContext.java +++ b/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufModelContext.java @@ -18,32 +18,32 @@ 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.model.protobuf.config.ProtobufConverterConfig; +import io.aklivity.zilla.runtime.engine.config.ModelConfig; +import io.aklivity.zilla.runtime.engine.model.ConverterHandler; +import io.aklivity.zilla.runtime.engine.model.ModelContext; +import io.aklivity.zilla.runtime.model.protobuf.config.ProtobufModelConfig; -public class ProtobufConverterContext implements ConverterContext +public class ProtobufModelContext implements ModelContext { private final LongFunction supplyCatalog; - public ProtobufConverterContext( + public ProtobufModelContext( EngineContext context) { this.supplyCatalog = context::supplyCatalog; } @Override - public ConverterHandler supplyReadHandler( - ConverterConfig config) + public ConverterHandler supplyReadConverterHandler( + ModelConfig config) { - return new ProtobufReadConverterHandler(ProtobufConverterConfig.class.cast(config), supplyCatalog); + return new ProtobufReadConverterHandler(ProtobufModelConfig.class.cast(config), supplyCatalog); } @Override - public ConverterHandler supplyWriteHandler( - ConverterConfig config) + public ConverterHandler supplyWriteConverterHandler( + ModelConfig config) { - return new ProtobufWriteConverterHandler(ProtobufConverterConfig.class.cast(config), supplyCatalog); + return new ProtobufWriteConverterHandler(ProtobufModelConfig.class.cast(config), supplyCatalog); } } diff --git a/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufConverterFactorySpi.java b/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufModelFactorySpi.java similarity index 75% rename from incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufConverterFactorySpi.java rename to incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufModelFactorySpi.java index 5a27816b58..9a29911af6 100644 --- a/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufConverterFactorySpi.java +++ b/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufModelFactorySpi.java @@ -17,15 +17,15 @@ import java.net.URL; 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.engine.model.Model; +import io.aklivity.zilla.runtime.engine.model.ModelFactorySpi; -public final class ProtobufConverterFactorySpi implements ConverterFactorySpi +public final class ProtobufModelFactorySpi implements ModelFactorySpi { @Override public String type() { - return ProtobufConverter.NAME; + return ProtobufModel.NAME; } public URL schema() @@ -34,9 +34,9 @@ public URL schema() } @Override - public Converter create( + public Model create( Configuration config) { - return new ProtobufConverter(); + return new ProtobufModel(); } } diff --git a/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufReadConverterHandler.java b/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufReadConverterHandler.java index 58a2e2bd71..43344a926a 100644 --- a/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufReadConverterHandler.java +++ b/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufReadConverterHandler.java @@ -27,9 +27,9 @@ import com.google.protobuf.util.JsonFormat; import io.aklivity.zilla.runtime.engine.catalog.CatalogHandler; -import io.aklivity.zilla.runtime.engine.converter.ConverterHandler; -import io.aklivity.zilla.runtime.engine.converter.function.ValueConsumer; -import io.aklivity.zilla.runtime.model.protobuf.config.ProtobufConverterConfig; +import io.aklivity.zilla.runtime.engine.model.ConverterHandler; +import io.aklivity.zilla.runtime.engine.model.function.ValueConsumer; +import io.aklivity.zilla.runtime.model.protobuf.config.ProtobufModelConfig; public class ProtobufReadConverterHandler extends ProtobufConverterHandler implements ConverterHandler { @@ -37,7 +37,7 @@ public class ProtobufReadConverterHandler extends ProtobufConverterHandler imple private final OutputStreamWriter output; public ProtobufReadConverterHandler( - ProtobufConverterConfig config, + ProtobufModelConfig config, LongFunction supplyCatalog) { super(config, supplyCatalog); diff --git a/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufWriteConverterHandler.java b/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufWriteConverterHandler.java index 7e75784364..64c7df1924 100644 --- a/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufWriteConverterHandler.java +++ b/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufWriteConverterHandler.java @@ -27,9 +27,9 @@ import com.google.protobuf.util.JsonFormat; import io.aklivity.zilla.runtime.engine.catalog.CatalogHandler; -import io.aklivity.zilla.runtime.engine.converter.ConverterHandler; -import io.aklivity.zilla.runtime.engine.converter.function.ValueConsumer; -import io.aklivity.zilla.runtime.model.protobuf.config.ProtobufConverterConfig; +import io.aklivity.zilla.runtime.engine.model.ConverterHandler; +import io.aklivity.zilla.runtime.engine.model.function.ValueConsumer; +import io.aklivity.zilla.runtime.model.protobuf.config.ProtobufModelConfig; public class ProtobufWriteConverterHandler extends ProtobufConverterHandler implements ConverterHandler { @@ -39,7 +39,7 @@ public class ProtobufWriteConverterHandler extends ProtobufConverterHandler impl private final JsonFormat.Parser parser; public ProtobufWriteConverterHandler( - ProtobufConverterConfig config, + ProtobufModelConfig config, LongFunction supplyCatalog) { super(config, supplyCatalog); diff --git a/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/config/ProtobufConverterConfigAdapter.java b/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/config/ProtobufModelConfigAdapter.java similarity index 86% rename from incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/config/ProtobufConverterConfigAdapter.java rename to incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/config/ProtobufModelConfigAdapter.java index 8b32d9d175..02b4386174 100644 --- a/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/config/ProtobufConverterConfigAdapter.java +++ b/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/config/ProtobufModelConfigAdapter.java @@ -26,13 +26,13 @@ import jakarta.json.bind.adapter.JsonbAdapter; import io.aklivity.zilla.runtime.engine.config.CatalogedConfig; -import io.aklivity.zilla.runtime.engine.config.ConverterConfig; -import io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi; +import io.aklivity.zilla.runtime.engine.config.ModelConfig; +import io.aklivity.zilla.runtime.engine.config.ModelConfigAdapterSpi; import io.aklivity.zilla.runtime.engine.config.SchemaConfig; import io.aklivity.zilla.runtime.engine.config.SchemaConfigAdapter; -import io.aklivity.zilla.runtime.model.protobuf.config.ProtobufConverterConfig; +import io.aklivity.zilla.runtime.model.protobuf.config.ProtobufModelConfig; -public final class ProtobufConverterConfigAdapter implements ConverterConfigAdapterSpi, JsonbAdapter +public final class ProtobufModelConfigAdapter implements ModelConfigAdapterSpi, JsonbAdapter { private static final String PROTOBUF = "protobuf"; private static final String TYPE_NAME = "type"; @@ -50,9 +50,9 @@ public String type() @Override public JsonValue adaptToJson( - ConverterConfig config) + ModelConfig config) { - ProtobufConverterConfig protobufConfig = (ProtobufConverterConfig) config; + ProtobufModelConfig protobufConfig = (ProtobufModelConfig) config; JsonObjectBuilder converter = Json.createObjectBuilder(); converter.add(TYPE_NAME, PROTOBUF); @@ -79,7 +79,7 @@ public JsonValue adaptToJson( } @Override - public ConverterConfig adaptFromJson( + public ModelConfig adaptFromJson( JsonValue value) { JsonObject object = (JsonObject) value; @@ -109,6 +109,6 @@ public ConverterConfig adaptFromJson( ? object.getString(FORMAT) : null; - return new ProtobufConverterConfig(catalogs, subject, format); + return new ProtobufModelConfig(catalogs, subject, format); } } diff --git a/incubator/model-protobuf/src/main/moditect/module-info.java b/incubator/model-protobuf/src/main/moditect/module-info.java index f10b7a87f8..3fc4b59e58 100644 --- a/incubator/model-protobuf/src/main/moditect/module-info.java +++ b/incubator/model-protobuf/src/main/moditect/module-info.java @@ -20,9 +20,9 @@ exports io.aklivity.zilla.runtime.model.protobuf.config; - provides io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi - with io.aklivity.zilla.runtime.model.protobuf.internal.config.ProtobufConverterConfigAdapter; + provides io.aklivity.zilla.runtime.engine.config.ModelConfigAdapterSpi + with io.aklivity.zilla.runtime.model.protobuf.internal.config.ProtobufModelConfigAdapter; - provides io.aklivity.zilla.runtime.engine.converter.ConverterFactorySpi - with io.aklivity.zilla.runtime.model.protobuf.internal.ProtobufConverterFactorySpi; + provides io.aklivity.zilla.runtime.engine.model.ModelFactorySpi + with io.aklivity.zilla.runtime.model.protobuf.internal.ProtobufModelFactorySpi; } diff --git a/incubator/model-protobuf/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi b/incubator/model-protobuf/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ModelConfigAdapterSpi similarity index 72% rename from incubator/model-protobuf/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi rename to incubator/model-protobuf/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ModelConfigAdapterSpi index 1367bb45c3..187d9d722b 100644 --- a/incubator/model-protobuf/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi +++ b/incubator/model-protobuf/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ModelConfigAdapterSpi @@ -1 +1 @@ -io.aklivity.zilla.runtime.model.protobuf.internal.config.ProtobufConverterConfigAdapter +io.aklivity.zilla.runtime.model.protobuf.internal.config.ProtobufModelConfigAdapter diff --git a/incubator/model-protobuf/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.converter.ConverterFactorySpi b/incubator/model-protobuf/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.converter.ConverterFactorySpi deleted file mode 100644 index 56f1a2f114..0000000000 --- a/incubator/model-protobuf/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.converter.ConverterFactorySpi +++ /dev/null @@ -1 +0,0 @@ -io.aklivity.zilla.runtime.model.protobuf.internal.ProtobufConverterFactorySpi diff --git a/incubator/model-protobuf/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.model.ModelFactorySpi b/incubator/model-protobuf/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.model.ModelFactorySpi new file mode 100644 index 0000000000..98f696ae0b --- /dev/null +++ b/incubator/model-protobuf/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.model.ModelFactorySpi @@ -0,0 +1 @@ +io.aklivity.zilla.runtime.model.protobuf.internal.ProtobufModelFactorySpi diff --git a/incubator/model-protobuf/src/test/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufConverterFactorySpiTest.java b/incubator/model-protobuf/src/test/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufModelFactorySpiTest.java similarity index 58% rename from incubator/model-protobuf/src/test/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufConverterFactorySpiTest.java rename to incubator/model-protobuf/src/test/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufModelFactorySpiTest.java index 90039f3f89..90645dbcc9 100644 --- a/incubator/model-protobuf/src/test/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufConverterFactorySpiTest.java +++ b/incubator/model-protobuf/src/test/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufModelFactorySpiTest.java @@ -22,24 +22,24 @@ import io.aklivity.zilla.runtime.engine.Configuration; import io.aklivity.zilla.runtime.engine.EngineContext; -import io.aklivity.zilla.runtime.engine.config.ConverterConfig; -import io.aklivity.zilla.runtime.engine.converter.Converter; -import io.aklivity.zilla.runtime.engine.converter.ConverterContext; -import io.aklivity.zilla.runtime.engine.converter.ConverterFactory; -import io.aklivity.zilla.runtime.model.protobuf.config.ProtobufConverterConfig; +import io.aklivity.zilla.runtime.engine.config.ModelConfig; +import io.aklivity.zilla.runtime.engine.model.Model; +import io.aklivity.zilla.runtime.engine.model.ModelContext; +import io.aklivity.zilla.runtime.engine.model.ModelFactory; +import io.aklivity.zilla.runtime.model.protobuf.config.ProtobufModelConfig; -public class ProtobufConverterFactorySpiTest +public class ProtobufModelFactorySpiTest { @Test public void shouldCreateReader() { Configuration config = new Configuration(); - ConverterFactory factory = ConverterFactory.instantiate(); - Converter converter = factory.create("protobuf", config); + ModelFactory factory = ModelFactory.instantiate(); + Model model = factory.create("protobuf", config); - ConverterContext context = new ProtobufConverterContext(mock(EngineContext.class)); + ModelContext context = new ProtobufModelContext(mock(EngineContext.class)); - ConverterConfig converterConfig = ProtobufConverterConfig.builder() + ModelConfig modelConfig = ProtobufModelConfig.builder() .subject("test-value") .catalog() .name("test0") @@ -50,8 +50,8 @@ public void shouldCreateReader() .build() .build(); - assertThat(converter, instanceOf(ProtobufConverter.class)); - assertThat(context.supplyReadHandler(converterConfig), instanceOf(ProtobufConverterHandler.class)); - assertThat(context.supplyWriteHandler(converterConfig), instanceOf(ProtobufConverterHandler.class)); + assertThat(model, instanceOf(ProtobufModel.class)); + assertThat(context.supplyReadConverterHandler(modelConfig), instanceOf(ProtobufConverterHandler.class)); + assertThat(context.supplyWriteConverterHandler(modelConfig), instanceOf(ProtobufConverterHandler.class)); } } diff --git a/incubator/model-protobuf/src/test/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufConverterTest.java b/incubator/model-protobuf/src/test/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufModelTest.java similarity index 94% rename from incubator/model-protobuf/src/test/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufConverterTest.java rename to incubator/model-protobuf/src/test/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufModelTest.java index 6c4220a446..71e5f221ad 100644 --- a/incubator/model-protobuf/src/test/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufConverterTest.java +++ b/incubator/model-protobuf/src/test/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufModelTest.java @@ -33,12 +33,12 @@ import io.aklivity.zilla.runtime.engine.catalog.CatalogContext; import io.aklivity.zilla.runtime.engine.catalog.CatalogHandler; import io.aklivity.zilla.runtime.engine.config.CatalogConfig; -import io.aklivity.zilla.runtime.engine.converter.function.ValueConsumer; +import io.aklivity.zilla.runtime.engine.model.function.ValueConsumer; import io.aklivity.zilla.runtime.engine.test.internal.catalog.TestCatalog; import io.aklivity.zilla.runtime.engine.test.internal.catalog.config.TestCatalogOptionsConfig; -import io.aklivity.zilla.runtime.model.protobuf.config.ProtobufConverterConfig; +import io.aklivity.zilla.runtime.model.protobuf.config.ProtobufModelConfig; -public class ProtobufConverterTest +public class ProtobufModelTest { private static final String SCHEMA = "syntax = \"proto3\";" + "package io.aklivity.examples.clients.proto;" + @@ -95,7 +95,7 @@ public void shouldWriteValidProtobufEvent() .schema(SCHEMA) .build()); - ProtobufConverterConfig config = ProtobufConverterConfig.builder() + ProtobufModelConfig config = ProtobufModelConfig.builder() .catalog() .name("test0") .schema() @@ -127,7 +127,7 @@ public void shouldWriteValidProtobufEventNestedMessage() .schema(SCHEMA) .build()); - ProtobufConverterConfig config = ProtobufConverterConfig.builder() + ProtobufModelConfig config = ProtobufModelConfig.builder() .catalog() .name("test0") .schema() @@ -157,7 +157,7 @@ public void shouldWriteValidProtobufEventIncorrectRecordName() .schema(SCHEMA) .build()); - ProtobufConverterConfig config = ProtobufConverterConfig.builder() + ProtobufModelConfig config = ProtobufModelConfig.builder() .catalog() .name("test0") .schema() @@ -187,7 +187,7 @@ public void shouldReadValidProtobufEvent() .schema(SCHEMA) .build()); - ProtobufConverterConfig config = ProtobufConverterConfig.builder() + ProtobufModelConfig config = ProtobufModelConfig.builder() .catalog() .name("test0") .schema() @@ -218,7 +218,7 @@ public void shouldReadValidProtobufEventNestedMessage() .schema(SCHEMA) .build()); - ProtobufConverterConfig config = ProtobufConverterConfig.builder() + ProtobufModelConfig config = ProtobufModelConfig.builder() .catalog() .name("test0") .schema() @@ -247,7 +247,7 @@ public void shouldReadValidProtobufEventFormatJson() .schema(SCHEMA) .build()); - ProtobufConverterConfig config = ProtobufConverterConfig.builder() + ProtobufModelConfig config = ProtobufModelConfig.builder() .format("json") .catalog() .name("test0") @@ -293,7 +293,7 @@ public void shouldWriteValidProtobufEventFormatJson() .schema(SCHEMA) .build()); - ProtobufConverterConfig config = ProtobufConverterConfig.builder() + ProtobufModelConfig config = ProtobufModelConfig.builder() .format("json") .catalog() .name("test0") @@ -336,7 +336,7 @@ public void shouldVerifyJsonFormatPaddingLength() .schema(SCHEMA) .build()); LongFunction handler = value -> context.attach(catalogConfig); - ProtobufConverterConfig config = ProtobufConverterConfig.builder() + ProtobufModelConfig config = ProtobufModelConfig.builder() .format("json") .catalog() .name("test0") @@ -363,7 +363,7 @@ public void shouldVerifyIndexPaddingLength() .schema(SCHEMA) .build()); LongFunction handler = value -> context.attach(catalogConfig); - ProtobufConverterConfig config = ProtobufConverterConfig.builder() + ProtobufModelConfig config = ProtobufModelConfig.builder() .catalog() .name("test0") .schema() diff --git a/incubator/model-protobuf/src/test/java/io/aklivity/zilla/runtime/model/protobuf/internal/config/ProtobufConverterConfigAdapterTest.java b/incubator/model-protobuf/src/test/java/io/aklivity/zilla/runtime/model/protobuf/internal/config/ProtobufModelConfigAdapterTest.java similarity index 92% rename from incubator/model-protobuf/src/test/java/io/aklivity/zilla/runtime/model/protobuf/internal/config/ProtobufConverterConfigAdapterTest.java rename to incubator/model-protobuf/src/test/java/io/aklivity/zilla/runtime/model/protobuf/internal/config/ProtobufModelConfigAdapterTest.java index 7731b16b61..9add92e1de 100644 --- a/incubator/model-protobuf/src/test/java/io/aklivity/zilla/runtime/model/protobuf/internal/config/ProtobufConverterConfigAdapterTest.java +++ b/incubator/model-protobuf/src/test/java/io/aklivity/zilla/runtime/model/protobuf/internal/config/ProtobufModelConfigAdapterTest.java @@ -26,9 +26,9 @@ import org.junit.Before; import org.junit.Test; -import io.aklivity.zilla.runtime.model.protobuf.config.ProtobufConverterConfig; +import io.aklivity.zilla.runtime.model.protobuf.config.ProtobufModelConfig; -public class ProtobufConverterConfigAdapterTest +public class ProtobufModelConfigAdapterTest { private Jsonb jsonb; @@ -36,7 +36,7 @@ public class ProtobufConverterConfigAdapterTest public void initJson() { JsonbConfig config = new JsonbConfig() - .withAdapters(new ProtobufConverterConfigAdapter()); + .withAdapters(new ProtobufModelConfigAdapter()); jsonb = JsonbBuilder.create(config); } @@ -67,7 +67,7 @@ public void shouldReadAvroConverter() "}"; // WHEN - ProtobufConverterConfig converter = jsonb.fromJson(json, ProtobufConverterConfig.class); + ProtobufModelConfig converter = jsonb.fromJson(json, ProtobufModelConfig.class); // THEN assertThat(converter, not(nullValue())); @@ -111,7 +111,7 @@ public void shouldWriteAvroConverter() "]" + "}" + "}"; - ProtobufConverterConfig converter = ProtobufConverterConfig.builder() + ProtobufModelConfig converter = ProtobufModelConfig.builder() .catalog() .name("test0") .schema() diff --git a/runtime/binding-http/src/main/java/io/aklivity/zilla/runtime/binding/http/config/HttpOptionsConfig.java b/runtime/binding-http/src/main/java/io/aklivity/zilla/runtime/binding/http/config/HttpOptionsConfig.java index dc2705f2ec..37fe298ac5 100644 --- a/runtime/binding-http/src/main/java/io/aklivity/zilla/runtime/binding/http/config/HttpOptionsConfig.java +++ b/runtime/binding-http/src/main/java/io/aklivity/zilla/runtime/binding/http/config/HttpOptionsConfig.java @@ -55,20 +55,20 @@ public static HttpOptionsConfigBuilder builder( HttpAuthorizationConfig authorization, List requests) { - super(emptyList(), requests != null && !requests.isEmpty() + super(requests != null && !requests.isEmpty() ? requests.stream() .flatMap(request -> Stream.concat( Stream.of(request.content), Stream.concat( request.headers != null - ? request.headers.stream().flatMap(header -> Stream.of(header != null ? header.validator : null)) + ? request.headers.stream().flatMap(header -> Stream.of(header != null ? header.model : null)) : Stream.empty(), Stream.concat( request.pathParams != null - ? request.pathParams.stream().flatMap(param -> Stream.of(param != null ? param.validator : null)) + ? request.pathParams.stream().flatMap(param -> Stream.of(param != null ? param.model : null)) : Stream.empty(), request.queryParams != null - ? request.queryParams.stream().flatMap(param -> Stream.of(param != null ? param.validator : null)) + ? request.queryParams.stream().flatMap(param -> Stream.of(param != null ? param.model : null)) : Stream.empty()))).filter(Objects::nonNull)) .collect(Collectors.toList()) : emptyList()); diff --git a/runtime/binding-http/src/main/java/io/aklivity/zilla/runtime/binding/http/config/HttpParamConfig.java b/runtime/binding-http/src/main/java/io/aklivity/zilla/runtime/binding/http/config/HttpParamConfig.java index 498e14fe26..0cff9c9370 100644 --- a/runtime/binding-http/src/main/java/io/aklivity/zilla/runtime/binding/http/config/HttpParamConfig.java +++ b/runtime/binding-http/src/main/java/io/aklivity/zilla/runtime/binding/http/config/HttpParamConfig.java @@ -17,19 +17,19 @@ import static java.util.function.Function.identity; -import io.aklivity.zilla.runtime.engine.config.ValidatorConfig; +import io.aklivity.zilla.runtime.engine.config.ModelConfig; public class HttpParamConfig { public String name; - public ValidatorConfig validator; + public ModelConfig model; public HttpParamConfig( String name, - ValidatorConfig validator) + ModelConfig model) { this.name = name; - this.validator = validator; + this.model = model; } public static HttpParamConfigBuilder builder() diff --git a/runtime/binding-http/src/main/java/io/aklivity/zilla/runtime/binding/http/config/HttpParamConfigBuilder.java b/runtime/binding-http/src/main/java/io/aklivity/zilla/runtime/binding/http/config/HttpParamConfigBuilder.java index 675a93f0ee..2f9b479914 100644 --- a/runtime/binding-http/src/main/java/io/aklivity/zilla/runtime/binding/http/config/HttpParamConfigBuilder.java +++ b/runtime/binding-http/src/main/java/io/aklivity/zilla/runtime/binding/http/config/HttpParamConfigBuilder.java @@ -18,14 +18,14 @@ import java.util.function.Function; import io.aklivity.zilla.runtime.engine.config.ConfigBuilder; -import io.aklivity.zilla.runtime.engine.config.ValidatorConfig; +import io.aklivity.zilla.runtime.engine.config.ModelConfig; public class HttpParamConfigBuilder extends ConfigBuilder> { private final Function mapper; private String name; - private ValidatorConfig validator; + private ModelConfig model; HttpParamConfigBuilder( Function mapper) @@ -47,22 +47,22 @@ public HttpParamConfigBuilder name( return this; } - public HttpParamConfigBuilder validator( - ValidatorConfig validator) + public HttpParamConfigBuilder model( + ModelConfig model) { - this.validator = validator; + this.model = model; return this; } - public , C>> C validator( - Function>, C> validator) + public , C>> C model( + Function>, C> model) { - return validator.apply(this::validator); + return model.apply(this::model); } @Override public T build() { - return mapper.apply(new HttpParamConfig(name, validator)); + return mapper.apply(new HttpParamConfig(name, model)); } } diff --git a/runtime/binding-http/src/main/java/io/aklivity/zilla/runtime/binding/http/config/HttpRequestConfig.java b/runtime/binding-http/src/main/java/io/aklivity/zilla/runtime/binding/http/config/HttpRequestConfig.java index f8b97422da..32b8ce5ddd 100644 --- a/runtime/binding-http/src/main/java/io/aklivity/zilla/runtime/binding/http/config/HttpRequestConfig.java +++ b/runtime/binding-http/src/main/java/io/aklivity/zilla/runtime/binding/http/config/HttpRequestConfig.java @@ -19,7 +19,7 @@ import java.util.List; -import io.aklivity.zilla.runtime.engine.config.ValidatorConfig; +import io.aklivity.zilla.runtime.engine.config.ModelConfig; public class HttpRequestConfig { @@ -41,7 +41,7 @@ public enum Method public final List headers; public final List pathParams; public final List queryParams; - public final ValidatorConfig content; + public final ModelConfig content; public HttpRequestConfig( String path, @@ -50,7 +50,7 @@ public HttpRequestConfig( List headers, List pathParams, List queryParams, - ValidatorConfig content) + ModelConfig content) { this.path = path; this.method = method; diff --git a/runtime/binding-http/src/main/java/io/aklivity/zilla/runtime/binding/http/config/HttpRequestConfigBuilder.java b/runtime/binding-http/src/main/java/io/aklivity/zilla/runtime/binding/http/config/HttpRequestConfigBuilder.java index 2219674bd8..225d852fdd 100644 --- a/runtime/binding-http/src/main/java/io/aklivity/zilla/runtime/binding/http/config/HttpRequestConfigBuilder.java +++ b/runtime/binding-http/src/main/java/io/aklivity/zilla/runtime/binding/http/config/HttpRequestConfigBuilder.java @@ -20,7 +20,7 @@ import java.util.function.Function; import io.aklivity.zilla.runtime.engine.config.ConfigBuilder; -import io.aklivity.zilla.runtime.engine.config.ValidatorConfig; +import io.aklivity.zilla.runtime.engine.config.ModelConfig; public class HttpRequestConfigBuilder extends ConfigBuilder> { @@ -32,7 +32,7 @@ public class HttpRequestConfigBuilder extends ConfigBuilder headers; private List pathParams; private List queryParams; - private ValidatorConfig content; + private ModelConfig content; HttpRequestConfigBuilder( Function mapper) @@ -149,14 +149,14 @@ public HttpParamConfigBuilder> pathParam() } public HttpRequestConfigBuilder content( - ValidatorConfig content) + ModelConfig content) { this.content = content; return this; } public , C>> C content( - Function>, C> content) + Function>, C> content) { return content.apply(this::content); } diff --git a/runtime/binding-http/src/main/java/io/aklivity/zilla/runtime/binding/http/internal/config/HttpBindingConfig.java b/runtime/binding-http/src/main/java/io/aklivity/zilla/runtime/binding/http/internal/config/HttpBindingConfig.java index 337fbe9fdb..f4b5eba4c5 100644 --- a/runtime/binding-http/src/main/java/io/aklivity/zilla/runtime/binding/http/internal/config/HttpBindingConfig.java +++ b/runtime/binding-http/src/main/java/io/aklivity/zilla/runtime/binding/http/internal/config/HttpBindingConfig.java @@ -45,8 +45,8 @@ import io.aklivity.zilla.runtime.binding.http.internal.types.stream.HttpBeginExFW; import io.aklivity.zilla.runtime.engine.config.BindingConfig; import io.aklivity.zilla.runtime.engine.config.KindConfig; -import io.aklivity.zilla.runtime.engine.config.ValidatorConfig; -import io.aklivity.zilla.runtime.engine.validator.ValidatorHandler; +import io.aklivity.zilla.runtime.engine.config.ModelConfig; +import io.aklivity.zilla.runtime.engine.model.ValidatorHandler; public final class HttpBindingConfig { @@ -76,7 +76,7 @@ public HttpBindingConfig( public HttpBindingConfig( BindingConfig binding, - Function supplyValidator) + Function supplyValidator) { this.id = binding.id; this.name = binding.name; @@ -191,7 +191,7 @@ private Function, String> asAccessor( } private List createRequestTypes( - Function supplyValidator) + Function supplyValidator) { List requestTypes = new LinkedList<>(); if (this.options != null && this.options.requests != null) @@ -203,7 +203,7 @@ private List createRequestTypes( { for (HttpParamConfig header : request.headers) { - headers.put(new String8FW(header.name), supplyValidator.apply(header.validator)); + headers.put(new String8FW(header.name), supplyValidator.apply(header.model)); } } @@ -212,7 +212,7 @@ private List createRequestTypes( { for (HttpParamConfig pathParam : request.pathParams) { - pathParams.put(pathParam.name, supplyValidator.apply(pathParam.validator)); + pathParams.put(pathParam.name, supplyValidator.apply(pathParam.model)); } } @@ -221,7 +221,7 @@ private List createRequestTypes( { for (HttpParamConfig queryParam : request.queryParams) { - queryParams.put(queryParam.name, supplyValidator.apply(queryParam.validator)); + queryParams.put(queryParam.name, supplyValidator.apply(queryParam.model)); } } diff --git a/runtime/binding-http/src/main/java/io/aklivity/zilla/runtime/binding/http/internal/config/HttpRequestConfigAdapter.java b/runtime/binding-http/src/main/java/io/aklivity/zilla/runtime/binding/http/internal/config/HttpRequestConfigAdapter.java index e3234ff350..ad0633424b 100644 --- a/runtime/binding-http/src/main/java/io/aklivity/zilla/runtime/binding/http/internal/config/HttpRequestConfigAdapter.java +++ b/runtime/binding-http/src/main/java/io/aklivity/zilla/runtime/binding/http/internal/config/HttpRequestConfigAdapter.java @@ -30,8 +30,8 @@ import io.aklivity.zilla.runtime.binding.http.config.HttpParamConfig; import io.aklivity.zilla.runtime.binding.http.config.HttpRequestConfig; -import io.aklivity.zilla.runtime.engine.config.ValidatorConfig; -import io.aklivity.zilla.runtime.engine.config.ValidatorConfigAdapter; +import io.aklivity.zilla.runtime.engine.config.ModelConfig; +import io.aklivity.zilla.runtime.engine.config.ModelConfigAdapter; public class HttpRequestConfigAdapter implements JsonbAdapter { @@ -44,7 +44,7 @@ public class HttpRequestConfigAdapter implements JsonbAdapter ((JsonString) i).getString()) .collect(Collectors.toList()); } - ValidatorConfig content = null; + ModelConfig content = null; if (object.containsKey(CONTENT_NAME)) { JsonValue contentJson = object.get(CONTENT_NAME); - content = validator.adaptFromJson(contentJson); + content = model.adaptFromJson(contentJson); } List headers = null; if (object.containsKey(HEADERS_NAME)) @@ -145,7 +145,7 @@ public HttpRequestConfig adaptFromJson( { HttpParamConfig header = HttpParamConfig.builder() .name(entry.getKey()) - .validator(validator.adaptFromJson(entry.getValue())) + .model(model.adaptFromJson(entry.getValue())) .build(); headers.add(header); } @@ -163,7 +163,7 @@ public HttpRequestConfig adaptFromJson( { HttpParamConfig pathParam = HttpParamConfig.builder() .name(entry.getKey()) - .validator(validator.adaptFromJson(entry.getValue())) + .model(model.adaptFromJson(entry.getValue())) .build(); pathParams.add(pathParam); } @@ -176,7 +176,7 @@ public HttpRequestConfig adaptFromJson( { HttpParamConfig queryParam = HttpParamConfig.builder() .name(entry.getKey()) - .validator(validator.adaptFromJson(entry.getValue())) + .model(model.adaptFromJson(entry.getValue())) .build(); queryParams.add(queryParam); } diff --git a/runtime/binding-http/src/main/java/io/aklivity/zilla/runtime/binding/http/internal/config/HttpRequestType.java b/runtime/binding-http/src/main/java/io/aklivity/zilla/runtime/binding/http/internal/config/HttpRequestType.java index fcaa8f97f2..b0066fb708 100644 --- a/runtime/binding-http/src/main/java/io/aklivity/zilla/runtime/binding/http/internal/config/HttpRequestType.java +++ b/runtime/binding-http/src/main/java/io/aklivity/zilla/runtime/binding/http/internal/config/HttpRequestType.java @@ -22,8 +22,8 @@ import io.aklivity.zilla.runtime.binding.http.config.HttpRequestConfig; import io.aklivity.zilla.runtime.binding.http.internal.types.String8FW; -import io.aklivity.zilla.runtime.engine.config.ValidatorConfig; -import io.aklivity.zilla.runtime.engine.validator.ValidatorHandler; +import io.aklivity.zilla.runtime.engine.config.ModelConfig; +import io.aklivity.zilla.runtime.engine.model.ValidatorHandler; public final class HttpRequestType { @@ -47,7 +47,7 @@ public final class HttpRequestType public final Map headers; public final Map pathParams; public final Map queryParams; - public final ValidatorConfig content; + public final ModelConfig content; private HttpRequestType( String path, @@ -58,7 +58,7 @@ private HttpRequestType( Map headers, Map pathParams, Map queryParams, - ValidatorConfig content) + ModelConfig content) { this.path = path; this.method = method; @@ -84,7 +84,7 @@ public static final class Builder private Map headers; private Map pathParams; private Map queryParams; - private ValidatorConfig content; + private ModelConfig content; public Builder path( String path) @@ -129,7 +129,7 @@ public Builder queryParams( } public Builder content( - ValidatorConfig content) + ModelConfig content) { this.content = content; return this; diff --git a/runtime/binding-http/src/main/java/io/aklivity/zilla/runtime/binding/http/internal/stream/HttpServerFactory.java b/runtime/binding-http/src/main/java/io/aklivity/zilla/runtime/binding/http/internal/stream/HttpServerFactory.java index 1f2604c6be..5723ba920a 100644 --- a/runtime/binding-http/src/main/java/io/aklivity/zilla/runtime/binding/http/internal/stream/HttpServerFactory.java +++ b/runtime/binding-http/src/main/java/io/aklivity/zilla/runtime/binding/http/internal/stream/HttpServerFactory.java @@ -140,10 +140,10 @@ import io.aklivity.zilla.runtime.engine.buffer.BufferPool; import io.aklivity.zilla.runtime.engine.concurrent.Signaler; import io.aklivity.zilla.runtime.engine.config.BindingConfig; -import io.aklivity.zilla.runtime.engine.config.ValidatorConfig; -import io.aklivity.zilla.runtime.engine.converter.function.ValueConsumer; +import io.aklivity.zilla.runtime.engine.config.ModelConfig; import io.aklivity.zilla.runtime.engine.guard.GuardHandler; -import io.aklivity.zilla.runtime.engine.validator.ValidatorHandler; +import io.aklivity.zilla.runtime.engine.model.ValidatorHandler; +import io.aklivity.zilla.runtime.engine.model.function.ValueConsumer; public final class HttpServerFactory implements HttpStreamFactory { @@ -499,7 +499,7 @@ public final class HttpServerFactory implements HttpStreamFactory private final Http2ServerDecoder decodeHttp2IgnoreAll = this::decodeHttp2IgnoreAll; private final EnumMap decodersByFrameType; - private final Function supplyValidator; + private final Function supplyValidator; { final EnumMap decodersByFrameType = new EnumMap<>(Http2FrameType.class); diff --git a/runtime/binding-http/src/test/java/io/aklivity/zilla/runtime/binding/http/internal/config/HttpOptionsConfigAdapterTest.java b/runtime/binding-http/src/test/java/io/aklivity/zilla/runtime/binding/http/internal/config/HttpOptionsConfigAdapterTest.java index 451c7668e6..85eed5cc82 100644 --- a/runtime/binding-http/src/test/java/io/aklivity/zilla/runtime/binding/http/internal/config/HttpOptionsConfigAdapterTest.java +++ b/runtime/binding-http/src/test/java/io/aklivity/zilla/runtime/binding/http/internal/config/HttpOptionsConfigAdapterTest.java @@ -42,7 +42,7 @@ import io.aklivity.zilla.runtime.binding.http.config.HttpVersion; import io.aklivity.zilla.runtime.binding.http.internal.types.String16FW; import io.aklivity.zilla.runtime.binding.http.internal.types.String8FW; -import io.aklivity.zilla.runtime.engine.test.internal.validator.config.TestValidatorConfig; +import io.aklivity.zilla.runtime.engine.test.internal.model.config.TestModelConfig; public class HttpOptionsConfigAdapterTest { @@ -158,15 +158,15 @@ public void shouldReadOptions() assertThat(request.method, equalTo(HttpRequestConfig.Method.GET)); assertThat(request.contentType.get(0), equalTo("application/json")); assertThat(request.headers.get(0).name, equalTo("content-type")); - assertThat(request.headers.get(0).validator, instanceOf(TestValidatorConfig.class)); - assertThat(request.headers.get(0).validator.type, equalTo("test")); + assertThat(request.headers.get(0).model, instanceOf(TestModelConfig.class)); + assertThat(request.headers.get(0).model.type, equalTo("test")); assertThat(request.pathParams.get(0).name, equalTo("id")); - assertThat(request.pathParams.get(0).validator, instanceOf(TestValidatorConfig.class)); - assertThat(request.pathParams.get(0).validator.type, equalTo("test")); + assertThat(request.pathParams.get(0).model, instanceOf(TestModelConfig.class)); + assertThat(request.pathParams.get(0).model.type, equalTo("test")); assertThat(request.queryParams.get(0).name, equalTo("index")); - assertThat(request.queryParams.get(0).validator, instanceOf(TestValidatorConfig.class)); - assertThat(request.queryParams.get(0).validator.type, equalTo("test")); - assertThat(request.content, instanceOf(TestValidatorConfig.class)); + assertThat(request.queryParams.get(0).model, instanceOf(TestModelConfig.class)); + assertThat(request.queryParams.get(0).model.type, equalTo("test")); + assertThat(request.content, instanceOf(TestModelConfig.class)); assertThat(request.content.type, equalTo("test")); } @@ -280,20 +280,20 @@ public void shouldWriteOptions() .contentType("application/json") .header() .name("content-type") - .validator(TestValidatorConfig::builder) + .model(TestModelConfig::builder) .build() .build() .pathParam() .name("id") - .validator(TestValidatorConfig::builder) + .model(TestModelConfig::builder) .build() .build() .queryParam() .name("index") - .validator(TestValidatorConfig::builder) + .model(TestModelConfig::builder) .build() .build() - .content(TestValidatorConfig::builder) + .content(TestModelConfig::builder) .build() .build() .build(); diff --git a/runtime/binding-http/src/test/java/io/aklivity/zilla/runtime/binding/http/internal/config/HttpRequestConfigAdapterTest.java b/runtime/binding-http/src/test/java/io/aklivity/zilla/runtime/binding/http/internal/config/HttpRequestConfigAdapterTest.java index 5178001925..5babab7283 100644 --- a/runtime/binding-http/src/test/java/io/aklivity/zilla/runtime/binding/http/internal/config/HttpRequestConfigAdapterTest.java +++ b/runtime/binding-http/src/test/java/io/aklivity/zilla/runtime/binding/http/internal/config/HttpRequestConfigAdapterTest.java @@ -29,7 +29,7 @@ import org.junit.Test; import io.aklivity.zilla.runtime.binding.http.config.HttpRequestConfig; -import io.aklivity.zilla.runtime.engine.test.internal.validator.config.TestValidatorConfig; +import io.aklivity.zilla.runtime.engine.test.internal.model.config.TestModelConfig; public class HttpRequestConfigAdapterTest { @@ -81,15 +81,15 @@ public void shouldReadOptions() assertThat(request.method, equalTo(HttpRequestConfig.Method.GET)); assertThat(request.contentType.get(0), equalTo("application/json")); assertThat(request.headers.get(0).name, equalTo("content-type")); - assertThat(request.headers.get(0).validator, instanceOf(TestValidatorConfig.class)); - assertThat(request.headers.get(0).validator.type, equalTo("test")); + assertThat(request.headers.get(0).model, instanceOf(TestModelConfig.class)); + assertThat(request.headers.get(0).model.type, equalTo("test")); assertThat(request.pathParams.get(0).name, equalTo("id")); - assertThat(request.pathParams.get(0).validator, instanceOf(TestValidatorConfig.class)); - assertThat(request.pathParams.get(0).validator.type, equalTo("test")); + assertThat(request.pathParams.get(0).model, instanceOf(TestModelConfig.class)); + assertThat(request.pathParams.get(0).model.type, equalTo("test")); assertThat(request.queryParams.get(0).name, equalTo("index")); - assertThat(request.queryParams.get(0).validator, instanceOf(TestValidatorConfig.class)); - assertThat(request.queryParams.get(0).validator.type, equalTo("test")); - assertThat(request.content, instanceOf(TestValidatorConfig.class)); + assertThat(request.queryParams.get(0).model, instanceOf(TestModelConfig.class)); + assertThat(request.queryParams.get(0).model.type, equalTo("test")); + assertThat(request.content, instanceOf(TestModelConfig.class)); assertThat(request.content.type, equalTo("test")); } @@ -128,20 +128,20 @@ public void shouldWriteOptions() .contentType("application/json") .header() .name("content-type") - .validator(TestValidatorConfig::builder) + .model(TestModelConfig::builder) .build() .build() .pathParam() .name("id") - .validator(TestValidatorConfig::builder) + .model(TestModelConfig::builder) .build() .build() .queryParam() .name("index") - .validator(TestValidatorConfig::builder) + .model(TestModelConfig::builder) .build() .build() - .content(TestValidatorConfig::builder) + .content(TestModelConfig::builder) .build() .build(); diff --git a/runtime/binding-kafka/src/main/java/io/aklivity/zilla/runtime/binding/kafka/config/KafkaOptionsConfig.java b/runtime/binding-kafka/src/main/java/io/aklivity/zilla/runtime/binding/kafka/config/KafkaOptionsConfig.java index 2a516ccfc5..e151ea1111 100644 --- a/runtime/binding-kafka/src/main/java/io/aklivity/zilla/runtime/binding/kafka/config/KafkaOptionsConfig.java +++ b/runtime/binding-kafka/src/main/java/io/aklivity/zilla/runtime/binding/kafka/config/KafkaOptionsConfig.java @@ -40,7 +40,7 @@ public KafkaOptionsConfig( .flatMap(t -> Stream.of(t.key, t.value)) .filter(Objects::nonNull) .collect(toList()) - : emptyList(), emptyList()); + : emptyList()); this.bootstrap = bootstrap; this.topics = topics; this.sasl = sasl; diff --git a/runtime/binding-kafka/src/main/java/io/aklivity/zilla/runtime/binding/kafka/config/KafkaTopicConfig.java b/runtime/binding-kafka/src/main/java/io/aklivity/zilla/runtime/binding/kafka/config/KafkaTopicConfig.java index b4d833f385..8eafe82740 100644 --- a/runtime/binding-kafka/src/main/java/io/aklivity/zilla/runtime/binding/kafka/config/KafkaTopicConfig.java +++ b/runtime/binding-kafka/src/main/java/io/aklivity/zilla/runtime/binding/kafka/config/KafkaTopicConfig.java @@ -19,22 +19,22 @@ import io.aklivity.zilla.runtime.binding.kafka.internal.types.KafkaDeltaType; import io.aklivity.zilla.runtime.binding.kafka.internal.types.KafkaOffsetType; -import io.aklivity.zilla.runtime.engine.config.ConverterConfig; +import io.aklivity.zilla.runtime.engine.config.ModelConfig; public class KafkaTopicConfig { public final String name; public final KafkaOffsetType defaultOffset; public final KafkaDeltaType deltaType; - public final ConverterConfig key; - public final ConverterConfig value; + public final ModelConfig key; + public final ModelConfig value; public KafkaTopicConfig( String name, KafkaOffsetType defaultOffset, KafkaDeltaType deltaType, - ConverterConfig key, - ConverterConfig value) + ModelConfig key, + ModelConfig value) { this.name = name; this.defaultOffset = defaultOffset; diff --git a/runtime/binding-kafka/src/main/java/io/aklivity/zilla/runtime/binding/kafka/internal/cache/KafkaCachePartition.java b/runtime/binding-kafka/src/main/java/io/aklivity/zilla/runtime/binding/kafka/internal/cache/KafkaCachePartition.java index 3ae561409a..ccd9c38fc8 100644 --- a/runtime/binding-kafka/src/main/java/io/aklivity/zilla/runtime/binding/kafka/internal/cache/KafkaCachePartition.java +++ b/runtime/binding-kafka/src/main/java/io/aklivity/zilla/runtime/binding/kafka/internal/cache/KafkaCachePartition.java @@ -73,8 +73,8 @@ import io.aklivity.zilla.runtime.binding.kafka.internal.types.Varint32FW; import io.aklivity.zilla.runtime.binding.kafka.internal.types.cache.KafkaCacheDeltaFW; import io.aklivity.zilla.runtime.binding.kafka.internal.types.cache.KafkaCacheEntryFW; -import io.aklivity.zilla.runtime.engine.converter.ConverterHandler; -import io.aklivity.zilla.runtime.engine.converter.function.ValueConsumer; +import io.aklivity.zilla.runtime.engine.model.ConverterHandler; +import io.aklivity.zilla.runtime.engine.model.function.ValueConsumer; public final class KafkaCachePartition { diff --git a/runtime/binding-kafka/src/main/java/io/aklivity/zilla/runtime/binding/kafka/internal/config/KafkaBindingConfig.java b/runtime/binding-kafka/src/main/java/io/aklivity/zilla/runtime/binding/kafka/internal/config/KafkaBindingConfig.java index 36832b61e4..b3f96afa3f 100644 --- a/runtime/binding-kafka/src/main/java/io/aklivity/zilla/runtime/binding/kafka/internal/config/KafkaBindingConfig.java +++ b/runtime/binding-kafka/src/main/java/io/aklivity/zilla/runtime/binding/kafka/internal/config/KafkaBindingConfig.java @@ -31,7 +31,7 @@ import io.aklivity.zilla.runtime.engine.EngineContext; import io.aklivity.zilla.runtime.engine.config.BindingConfig; import io.aklivity.zilla.runtime.engine.config.KindConfig; -import io.aklivity.zilla.runtime.engine.converter.ConverterHandler; +import io.aklivity.zilla.runtime.engine.model.ConverterHandler; public final class KafkaBindingConfig { @@ -61,7 +61,7 @@ public KafkaBindingConfig( .collect(Collectors.toMap( t -> t.name, t -> t.key != null - ? context.supplyReadHandler(t.key) + ? context.supplyReadConverter(t.key) : ConverterHandler.NONE)) : null; this.keyWriters = options != null && options.topics != null @@ -69,7 +69,7 @@ public KafkaBindingConfig( .collect(Collectors.toMap( t -> t.name, t -> t.key != null - ? context.supplyWriteHandler(t.key) + ? context.supplyWriteConverter(t.key) : ConverterHandler.NONE)) : null; this.valueReaders = options != null && options.topics != null @@ -77,7 +77,7 @@ public KafkaBindingConfig( .collect(Collectors.toMap( t -> t.name, t -> t.value != null - ? context.supplyReadHandler(t.value) + ? context.supplyReadConverter(t.value) : ConverterHandler.NONE)) : null; this.valueWriters = options != null && options.topics != null @@ -85,7 +85,7 @@ public KafkaBindingConfig( .collect(Collectors.toMap( t -> t.name, t -> t.value != null - ? context.supplyWriteHandler(t.value) + ? context.supplyWriteConverter(t.value) : ConverterHandler.NONE)) : null; } diff --git a/runtime/binding-kafka/src/main/java/io/aklivity/zilla/runtime/binding/kafka/internal/config/KafkaTopicConfigAdapter.java b/runtime/binding-kafka/src/main/java/io/aklivity/zilla/runtime/binding/kafka/internal/config/KafkaTopicConfigAdapter.java index 6c1ac96c94..a223ec4abc 100644 --- a/runtime/binding-kafka/src/main/java/io/aklivity/zilla/runtime/binding/kafka/internal/config/KafkaTopicConfigAdapter.java +++ b/runtime/binding-kafka/src/main/java/io/aklivity/zilla/runtime/binding/kafka/internal/config/KafkaTopicConfigAdapter.java @@ -23,8 +23,8 @@ import io.aklivity.zilla.runtime.binding.kafka.config.KafkaTopicConfig; import io.aklivity.zilla.runtime.binding.kafka.internal.types.KafkaDeltaType; import io.aklivity.zilla.runtime.binding.kafka.internal.types.KafkaOffsetType; -import io.aklivity.zilla.runtime.engine.config.ConverterConfig; -import io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapter; +import io.aklivity.zilla.runtime.engine.config.ModelConfig; +import io.aklivity.zilla.runtime.engine.config.ModelConfigAdapter; public final class KafkaTopicConfigAdapter implements JsonbAdapter { @@ -35,7 +35,7 @@ public final class KafkaTopicConfigAdapter implements JsonbAdapter topics) { - super(emptyList(), topics != null && !topics.isEmpty() + super(topics != null && !topics.isEmpty() ? topics.stream() .map(t -> t.content) .filter(Objects::nonNull) diff --git a/runtime/binding-mqtt/src/main/java/io/aklivity/zilla/runtime/binding/mqtt/config/MqttTopicConfig.java b/runtime/binding-mqtt/src/main/java/io/aklivity/zilla/runtime/binding/mqtt/config/MqttTopicConfig.java index bcba8eb11f..586ee4e318 100644 --- a/runtime/binding-mqtt/src/main/java/io/aklivity/zilla/runtime/binding/mqtt/config/MqttTopicConfig.java +++ b/runtime/binding-mqtt/src/main/java/io/aklivity/zilla/runtime/binding/mqtt/config/MqttTopicConfig.java @@ -17,16 +17,16 @@ import static java.util.function.Function.identity; -import io.aklivity.zilla.runtime.engine.config.ValidatorConfig; +import io.aklivity.zilla.runtime.engine.config.ModelConfig; public class MqttTopicConfig { public final String name; - public final ValidatorConfig content; + public final ModelConfig content; public MqttTopicConfig( String name, - ValidatorConfig content) + ModelConfig content) { this.name = name; this.content = content; diff --git a/runtime/binding-mqtt/src/main/java/io/aklivity/zilla/runtime/binding/mqtt/config/MqttTopicConfigBuilder.java b/runtime/binding-mqtt/src/main/java/io/aklivity/zilla/runtime/binding/mqtt/config/MqttTopicConfigBuilder.java index 382d56b951..4a4dd1c372 100644 --- a/runtime/binding-mqtt/src/main/java/io/aklivity/zilla/runtime/binding/mqtt/config/MqttTopicConfigBuilder.java +++ b/runtime/binding-mqtt/src/main/java/io/aklivity/zilla/runtime/binding/mqtt/config/MqttTopicConfigBuilder.java @@ -18,14 +18,14 @@ import java.util.function.Function; import io.aklivity.zilla.runtime.engine.config.ConfigBuilder; -import io.aklivity.zilla.runtime.engine.config.ValidatorConfig; +import io.aklivity.zilla.runtime.engine.config.ModelConfig; public class MqttTopicConfigBuilder extends ConfigBuilder> { private final Function mapper; private String name; - private ValidatorConfig content; + private ModelConfig content; MqttTopicConfigBuilder( Function mapper) @@ -48,14 +48,14 @@ public MqttTopicConfigBuilder name( } public MqttTopicConfigBuilder content( - ValidatorConfig content) + ModelConfig content) { this.content = content; return this; } public , C>> C content( - Function>, C> content) + Function>, C> content) { return content.apply(this::content); } diff --git a/runtime/binding-mqtt/src/main/java/io/aklivity/zilla/runtime/binding/mqtt/internal/config/MqttBindingConfig.java b/runtime/binding-mqtt/src/main/java/io/aklivity/zilla/runtime/binding/mqtt/internal/config/MqttBindingConfig.java index 8b73458cae..e723314553 100644 --- a/runtime/binding-mqtt/src/main/java/io/aklivity/zilla/runtime/binding/mqtt/internal/config/MqttBindingConfig.java +++ b/runtime/binding-mqtt/src/main/java/io/aklivity/zilla/runtime/binding/mqtt/internal/config/MqttBindingConfig.java @@ -32,7 +32,7 @@ import io.aklivity.zilla.runtime.engine.EngineContext; import io.aklivity.zilla.runtime.engine.config.BindingConfig; import io.aklivity.zilla.runtime.engine.config.KindConfig; -import io.aklivity.zilla.runtime.engine.config.ValidatorConfig; +import io.aklivity.zilla.runtime.engine.config.ModelConfig; import io.aklivity.zilla.runtime.engine.guard.GuardHandler; public final class MqttBindingConfig @@ -45,7 +45,7 @@ public final class MqttBindingConfig public final MqttOptionsConfig options; public final List routes; public final Function credentials; - public final Map topics; + public final Map topics; public final ToLongFunction resolveId; public final GuardHandler guard; @@ -108,7 +108,7 @@ public MqttRouteConfig resolvePublish( .orElse(null); } - public ValidatorConfig supplyValidatorConfig( + public ModelConfig supplyModelConfig( String topic) { return topics != null ? topics.getOrDefault(topic, null) : null; diff --git a/runtime/binding-mqtt/src/main/java/io/aklivity/zilla/runtime/binding/mqtt/internal/config/MqttTopicConfigAdapter.java b/runtime/binding-mqtt/src/main/java/io/aklivity/zilla/runtime/binding/mqtt/internal/config/MqttTopicConfigAdapter.java index ba00810967..aa559083fe 100644 --- a/runtime/binding-mqtt/src/main/java/io/aklivity/zilla/runtime/binding/mqtt/internal/config/MqttTopicConfigAdapter.java +++ b/runtime/binding-mqtt/src/main/java/io/aklivity/zilla/runtime/binding/mqtt/internal/config/MqttTopicConfigAdapter.java @@ -23,14 +23,14 @@ import io.aklivity.zilla.runtime.binding.mqtt.config.MqttTopicConfig; import io.aklivity.zilla.runtime.binding.mqtt.config.MqttTopicConfigBuilder; -import io.aklivity.zilla.runtime.engine.config.ValidatorConfigAdapter; +import io.aklivity.zilla.runtime.engine.config.ModelConfigAdapter; public class MqttTopicConfigAdapter implements JsonbAdapter { private static final String NAME_NAME = "name"; private static final String CONTENT_NAME = "content"; - private final ValidatorConfigAdapter validator = new ValidatorConfigAdapter(); + private final ModelConfigAdapter model = new ModelConfigAdapter(); @Override public JsonObject adaptToJson( @@ -44,8 +44,8 @@ public JsonObject adaptToJson( if (topic.content != null) { - validator.adaptType(topic.content.type); - JsonValue content = validator.adaptToJson(topic.content); + model.adaptType(topic.content.type); + JsonValue content = model.adaptToJson(topic.content); object.add(CONTENT_NAME, content); } @@ -65,7 +65,7 @@ public MqttTopicConfig adaptFromJson( if (object.containsKey(CONTENT_NAME)) { JsonValue contentJson = object.get(CONTENT_NAME); - mqttTopic.content(validator.adaptFromJson(contentJson)); + mqttTopic.content(model.adaptFromJson(contentJson)); } return mqttTopic.build(); } diff --git a/runtime/binding-mqtt/src/main/java/io/aklivity/zilla/runtime/binding/mqtt/internal/stream/MqttServerFactory.java b/runtime/binding-mqtt/src/main/java/io/aklivity/zilla/runtime/binding/mqtt/internal/stream/MqttServerFactory.java index 55ab04c737..0b6199280a 100644 --- a/runtime/binding-mqtt/src/main/java/io/aklivity/zilla/runtime/binding/mqtt/internal/stream/MqttServerFactory.java +++ b/runtime/binding-mqtt/src/main/java/io/aklivity/zilla/runtime/binding/mqtt/internal/stream/MqttServerFactory.java @@ -189,10 +189,10 @@ import io.aklivity.zilla.runtime.engine.buffer.BufferPool; import io.aklivity.zilla.runtime.engine.concurrent.Signaler; import io.aklivity.zilla.runtime.engine.config.BindingConfig; -import io.aklivity.zilla.runtime.engine.config.ValidatorConfig; -import io.aklivity.zilla.runtime.engine.converter.function.ValueConsumer; +import io.aklivity.zilla.runtime.engine.config.ModelConfig; import io.aklivity.zilla.runtime.engine.guard.GuardHandler; -import io.aklivity.zilla.runtime.engine.validator.ValidatorHandler; +import io.aklivity.zilla.runtime.engine.model.ValidatorHandler; +import io.aklivity.zilla.runtime.engine.model.function.ValueConsumer; public final class MqttServerFactory implements MqttStreamFactory { @@ -2277,7 +2277,7 @@ private final class MqttServer private final GuardHandler guard; private final Function credentials; private final MqttConnectProperty authField; - private final Function supplyValidator; + private final Function supplyValidator; private MqttSessionStream session; @@ -2967,7 +2967,7 @@ private MqttPublishStream resolvePublishStream( final long topicKey = topicKey(topic, qos); stream = publishes.computeIfAbsent(topicKey, s -> - new MqttPublishStream(routedId, resolvedId, topic, qos, binding.supplyValidatorConfig(topic))); + new MqttPublishStream(routedId, resolvedId, topic, qos, binding.supplyModelConfig(topic))); stream.doPublishBegin(traceId, affinity); } else @@ -5284,7 +5284,7 @@ private class MqttPublishStream long routedId, String topic, int qos, - ValidatorConfig config) + ModelConfig config) { this.originId = originId; this.routedId = routedId; diff --git a/runtime/binding-mqtt/src/test/java/io/aklivity/zilla/runtime/binding/mqtt/internal/config/MqttOptionsConfigAdapterTest.java b/runtime/binding-mqtt/src/test/java/io/aklivity/zilla/runtime/binding/mqtt/internal/config/MqttOptionsConfigAdapterTest.java index 786ff4959a..2c67b0f4d3 100644 --- a/runtime/binding-mqtt/src/test/java/io/aklivity/zilla/runtime/binding/mqtt/internal/config/MqttOptionsConfigAdapterTest.java +++ b/runtime/binding-mqtt/src/test/java/io/aklivity/zilla/runtime/binding/mqtt/internal/config/MqttOptionsConfigAdapterTest.java @@ -38,7 +38,7 @@ import io.aklivity.zilla.runtime.binding.mqtt.config.MqttOptionsConfig; import io.aklivity.zilla.runtime.binding.mqtt.config.MqttPatternConfig; import io.aklivity.zilla.runtime.binding.mqtt.config.MqttTopicConfig; -import io.aklivity.zilla.runtime.engine.test.internal.validator.config.TestValidatorConfig; +import io.aklivity.zilla.runtime.engine.test.internal.model.config.TestModelConfig; public class MqttOptionsConfigAdapterTest { @@ -95,7 +95,7 @@ public void shouldReadOptions() MqttTopicConfig topic = options.topics.get(0); assertThat(topic.name, equalTo("sensor/one")); - assertThat(topic.content, instanceOf(TestValidatorConfig.class)); + assertThat(topic.content, instanceOf(TestModelConfig.class)); assertThat(topic.content.type, equalTo("test")); } @@ -104,7 +104,7 @@ public void shouldWriteOptions() { List topics = new ArrayList<>(); topics.add(new MqttTopicConfig("sensor/one", - TestValidatorConfig.builder() + TestModelConfig.builder() .length(0) .build())); diff --git a/runtime/engine/pom.xml b/runtime/engine/pom.xml index 82da7726e6..1c344d8b69 100644 --- a/runtime/engine/pom.xml +++ b/runtime/engine/pom.xml @@ -210,7 +210,7 @@ io/aklivity/zilla/specs/engine/schema/guard/test.schema.patch.json, io/aklivity/zilla/specs/engine/schema/metrics/test.schema.patch.json, io/aklivity/zilla/specs/engine/schema/catalog/test.schema.patch.json, - io/aklivity/zilla/specs/engine/schema/converter/test.schema.patch.json, + io/aklivity/zilla/specs/engine/schema/model/test.schema.patch.json, io/aklivity/zilla/specs/engine/schema/vault/test.schema.patch.json ${project.build.directory}/test-classes @@ -252,7 +252,7 @@ io/aklivity/zilla/runtime/engine/test/internal/guard/**/*.class io/aklivity/zilla/runtime/engine/test/internal/catalog/**/*.class io/aklivity/zilla/runtime/engine/test/internal/metrics/**/*.class - io/aklivity/zilla/runtime/engine/test/internal/converter/**/*.class + io/aklivity/zilla/runtime/engine/test/internal/model/**/*.class io/aklivity/zilla/runtime/engine/test/internal/validator/**/*.class io/aklivity/zilla/runtime/engine/test/internal/vault/**/*.class io/aklivity/zilla/runtime/engine/internal/concurrent/bench/**/*.class diff --git a/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/Engine.java b/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/Engine.java index 71f4a0c74a..46181bd3f6 100644 --- a/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/Engine.java +++ b/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/Engine.java @@ -64,7 +64,6 @@ import io.aklivity.zilla.runtime.engine.config.BindingConfig; import io.aklivity.zilla.runtime.engine.config.KindConfig; import io.aklivity.zilla.runtime.engine.config.NamespaceConfig; -import io.aklivity.zilla.runtime.engine.converter.Converter; import io.aklivity.zilla.runtime.engine.exporter.Exporter; import io.aklivity.zilla.runtime.engine.ext.EngineExtContext; import io.aklivity.zilla.runtime.engine.ext.EngineExtSpi; @@ -81,7 +80,7 @@ import io.aklivity.zilla.runtime.engine.internal.stream.NamespacedId; import io.aklivity.zilla.runtime.engine.metrics.Collector; import io.aklivity.zilla.runtime.engine.metrics.MetricGroup; -import io.aklivity.zilla.runtime.engine.validator.Validator; +import io.aklivity.zilla.runtime.engine.model.Model; import io.aklivity.zilla.runtime.engine.vault.Vault; public final class Engine implements Collector, AutoCloseable @@ -114,8 +113,7 @@ public final class Engine implements Collector, AutoCloseable Collection metricGroups, Collection vaults, Collection catalogs, - Collection validators, - Collection converters, + Collection models, ErrorHandler errorHandler, Collection affinities, boolean readonly) @@ -170,7 +168,7 @@ public final class Engine implements Collector, AutoCloseable { DispatchAgent agent = new DispatchAgent(config, tasks, labels, errorHandler, tuning::affinity, - bindings, exporters, guards, vaults, catalogs, validators, converters, metricGroups, + bindings, exporters, guards, vaults, catalogs, models, metricGroups, this, coreIndex, readonly); dispatchers.add(agent); } @@ -191,8 +189,7 @@ public final class Engine implements Collector, AutoCloseable schemaTypes.addAll(metricGroups.stream().map(MetricGroup::type).filter(Objects::nonNull).collect(toList())); schemaTypes.addAll(vaults.stream().map(Vault::type).filter(Objects::nonNull).collect(toList())); schemaTypes.addAll(catalogs.stream().map(Catalog::type).filter(Objects::nonNull).collect(toList())); - schemaTypes.addAll(validators.stream().map(Validator::type).filter(Objects::nonNull).collect(toList())); - schemaTypes.addAll(converters.stream().map(Converter::type).filter(Objects::nonNull).collect(toList())); + schemaTypes.addAll(models.stream().map(Model::type).filter(Objects::nonNull).collect(toList())); bindingsByType = bindings.stream().collect(Collectors.toMap(b -> b.name(), b -> b)); final Map guardsByType = guards.stream() diff --git a/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/EngineBuilder.java b/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/EngineBuilder.java index 3b460bb859..ae989060c0 100644 --- a/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/EngineBuilder.java +++ b/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/EngineBuilder.java @@ -27,16 +27,14 @@ import io.aklivity.zilla.runtime.engine.binding.BindingFactory; import io.aklivity.zilla.runtime.engine.catalog.Catalog; import io.aklivity.zilla.runtime.engine.catalog.CatalogFactory; -import io.aklivity.zilla.runtime.engine.converter.Converter; -import io.aklivity.zilla.runtime.engine.converter.ConverterFactory; import io.aklivity.zilla.runtime.engine.exporter.Exporter; import io.aklivity.zilla.runtime.engine.exporter.ExporterFactory; import io.aklivity.zilla.runtime.engine.guard.Guard; import io.aklivity.zilla.runtime.engine.guard.GuardFactory; import io.aklivity.zilla.runtime.engine.metrics.MetricGroup; import io.aklivity.zilla.runtime.engine.metrics.MetricGroupFactory; -import io.aklivity.zilla.runtime.engine.validator.Validator; -import io.aklivity.zilla.runtime.engine.validator.ValidatorFactory; +import io.aklivity.zilla.runtime.engine.model.Model; +import io.aklivity.zilla.runtime.engine.model.ModelFactory; import io.aklivity.zilla.runtime.engine.vault.Vault; import io.aklivity.zilla.runtime.engine.vault.VaultFactory; @@ -133,25 +131,17 @@ public Engine build() catalogs.add(catalog); } - final Set validators = new LinkedHashSet<>(); - final ValidatorFactory validatorFactory = ValidatorFactory.instantiate(); - for (String name : validatorFactory.names()) + final Set models = new LinkedHashSet<>(); + final ModelFactory modelFactory = ModelFactory.instantiate(); + for (String name : modelFactory.names()) { - Validator validator = validatorFactory.create(name, config); - validators.add(validator); - } - - final Set converters = new LinkedHashSet<>(); - final ConverterFactory converterFactory = ConverterFactory.instantiate(); - for (String name : converterFactory.names()) - { - Converter converter = converterFactory.create(name, config); - converters.add(converter); + Model model = modelFactory.create(name, config); + models.add(model); } final ErrorHandler errorHandler = requireNonNull(this.errorHandler, "errorHandler"); return new Engine(config, bindings, exporters, guards, metricGroups, vaults, - catalogs, validators, converters, errorHandler, affinities, readonly); + catalogs, models, errorHandler, affinities, readonly); } } diff --git a/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/EngineContext.java b/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/EngineContext.java index aadb2630d9..2f113352a8 100644 --- a/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/EngineContext.java +++ b/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/EngineContext.java @@ -30,14 +30,13 @@ import io.aklivity.zilla.runtime.engine.catalog.CatalogHandler; import io.aklivity.zilla.runtime.engine.concurrent.Signaler; import io.aklivity.zilla.runtime.engine.config.BindingConfig; -import io.aklivity.zilla.runtime.engine.config.ConverterConfig; +import io.aklivity.zilla.runtime.engine.config.ModelConfig; import io.aklivity.zilla.runtime.engine.config.NamespaceConfig; -import io.aklivity.zilla.runtime.engine.config.ValidatorConfig; -import io.aklivity.zilla.runtime.engine.converter.ConverterHandler; import io.aklivity.zilla.runtime.engine.guard.GuardHandler; import io.aklivity.zilla.runtime.engine.metrics.Metric; +import io.aklivity.zilla.runtime.engine.model.ConverterHandler; +import io.aklivity.zilla.runtime.engine.model.ValidatorHandler; import io.aklivity.zilla.runtime.engine.poller.PollerKey; -import io.aklivity.zilla.runtime.engine.validator.ValidatorHandler; import io.aklivity.zilla.runtime.engine.vault.VaultHandler; public interface EngineContext @@ -130,13 +129,13 @@ CatalogHandler supplyCatalog( long catalogId); ValidatorHandler supplyValidator( - ValidatorConfig config); + ModelConfig config); - ConverterHandler supplyReadHandler( - ConverterConfig config); + ConverterHandler supplyReadConverter( + ModelConfig config); - ConverterHandler supplyWriteHandler( - ConverterConfig config); + ConverterHandler supplyWriteConverter( + ModelConfig config); URL resolvePath( String path); diff --git a/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/catalog/CatalogHandler.java b/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/catalog/CatalogHandler.java index a1cf9321ee..425509494f 100644 --- a/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/catalog/CatalogHandler.java +++ b/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/catalog/CatalogHandler.java @@ -17,7 +17,7 @@ import org.agrona.DirectBuffer; -import io.aklivity.zilla.runtime.engine.converter.function.ValueConsumer; +import io.aklivity.zilla.runtime.engine.model.function.ValueConsumer; public interface CatalogHandler { diff --git a/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/config/ConverterConfig.java b/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/config/ConverterConfig.java deleted file mode 100644 index 0380d31702..0000000000 --- a/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/config/ConverterConfig.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright 2021-2023 Aklivity Inc. - * - * Aklivity licenses this file to you under the Apache License, - * version 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS 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.engine.config; - -import java.util.List; - -public abstract class ConverterConfig -{ - public final String type; - public final List cataloged; - - public ConverterConfig( - String type) - { - this(type, null); - } - - public ConverterConfig( - String type, - List cataloged) - { - this.type = type; - this.cataloged = cataloged; - } -} diff --git a/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/config/ValidatorConfig.java b/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/config/ModelConfig.java similarity index 91% rename from runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/config/ValidatorConfig.java rename to runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/config/ModelConfig.java index 67458f862c..48b4d7e28b 100644 --- a/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/config/ValidatorConfig.java +++ b/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/config/ModelConfig.java @@ -17,18 +17,18 @@ import java.util.List; -public abstract class ValidatorConfig +public abstract class ModelConfig { public final String type; public final List cataloged; - public ValidatorConfig( + public ModelConfig( String type) { this(type, null); } - public ValidatorConfig( + public ModelConfig( String type, List cataloged) { diff --git a/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/config/ConverterConfigAdapter.java b/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/config/ModelConfigAdapter.java similarity index 82% rename from runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/config/ConverterConfigAdapter.java rename to runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/config/ModelConfigAdapter.java index 9616510f1d..88e26c966d 100644 --- a/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/config/ConverterConfigAdapter.java +++ b/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/config/ModelConfigAdapter.java @@ -28,20 +28,20 @@ import jakarta.json.JsonValue; import jakarta.json.bind.adapter.JsonbAdapter; -public final class ConverterConfigAdapter implements JsonbAdapter +public final class ModelConfigAdapter implements JsonbAdapter { private static final String TYPE_NAME = "type"; - private final Map delegatesByName; - private ConverterConfigAdapterSpi delegate; + private final Map delegatesByName; + private ModelConfigAdapterSpi delegate; - public ConverterConfigAdapter() + public ModelConfigAdapter() { delegatesByName = ServiceLoader - .load(ConverterConfigAdapterSpi.class) + .load(ModelConfigAdapterSpi.class) .stream() .map(Supplier::get) - .collect(toMap(ConverterConfigAdapterSpi::type, identity())); + .collect(toMap(ModelConfigAdapterSpi::type, identity())); } public void adaptType( @@ -52,13 +52,13 @@ public void adaptType( @Override public JsonValue adaptToJson( - ConverterConfig options) + ModelConfig options) { return delegate != null ? delegate.adaptToJson(options) : null; } @Override - public ConverterConfig adaptFromJson( + public ModelConfig adaptFromJson( JsonValue value) { JsonObject object = null; diff --git a/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/config/ConverterConfigAdapterSpi.java b/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/config/ModelConfigAdapterSpi.java similarity index 84% rename from runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/config/ConverterConfigAdapterSpi.java rename to runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/config/ModelConfigAdapterSpi.java index 9bbcbd2286..320d529652 100644 --- a/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/config/ConverterConfigAdapterSpi.java +++ b/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/config/ModelConfigAdapterSpi.java @@ -18,16 +18,16 @@ import jakarta.json.JsonValue; import jakarta.json.bind.adapter.JsonbAdapter; -public interface ConverterConfigAdapterSpi extends JsonbAdapter +public interface ModelConfigAdapterSpi extends JsonbAdapter { String type(); @Override JsonValue adaptToJson( - ConverterConfig options); + ModelConfig options); @Override - ConverterConfig adaptFromJson( + ModelConfig adaptFromJson( JsonValue object); } diff --git a/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/config/OptionsConfig.java b/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/config/OptionsConfig.java index 51f1313d06..2e83dcc8f6 100644 --- a/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/config/OptionsConfig.java +++ b/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/config/OptionsConfig.java @@ -20,19 +20,16 @@ public class OptionsConfig { - public final List converters; - public final List validators; + public final List models; public OptionsConfig() { - this(Collections.emptyList(), Collections.emptyList()); + this(Collections.emptyList()); } public OptionsConfig( - List converters, - List validators) + List models) { - this.converters = converters; - this.validators = validators; + this.models = models; } } diff --git a/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/config/ValidatorConfigAdapter.java b/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/config/ValidatorConfigAdapter.java deleted file mode 100644 index 22705005c9..0000000000 --- a/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/config/ValidatorConfigAdapter.java +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Copyright 2021-2023 Aklivity Inc. - * - * Aklivity licenses this file to you under the Apache License, - * version 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS 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.engine.config; - -import static java.util.function.Function.identity; -import static java.util.stream.Collectors.toMap; - -import java.util.Map; -import java.util.ServiceLoader; -import java.util.function.Supplier; - -import jakarta.json.Json; -import jakarta.json.JsonObject; -import jakarta.json.JsonString; -import jakarta.json.JsonValue; -import jakarta.json.bind.adapter.JsonbAdapter; - -public final class ValidatorConfigAdapter implements JsonbAdapter -{ - private static final String TYPE_NAME = "type"; - - private final Map delegatesByName; - private ValidatorConfigAdapterSpi delegate; - - public ValidatorConfigAdapter() - { - delegatesByName = ServiceLoader - .load(ValidatorConfigAdapterSpi.class) - .stream() - .map(Supplier::get) - .collect(toMap(ValidatorConfigAdapterSpi::type, identity())); - } - - public void adaptType( - String type) - { - delegate = delegatesByName.get(type); - } - - @Override - public JsonValue adaptToJson( - ValidatorConfig options) - { - return delegate != null ? delegate.adaptToJson(options) : null; - } - - @Override - public ValidatorConfig adaptFromJson( - JsonValue value) - { - JsonObject object = null; - if (value instanceof JsonString) - { - object = Json.createObjectBuilder() - .add(TYPE_NAME, ((JsonString) value).getString()) - .build(); - } - else if (value instanceof JsonObject) - { - object = (JsonObject) value; - } - else - { - assert false; - } - - String type = object.containsKey(TYPE_NAME) - ? object.getString(TYPE_NAME) - : null; - - adaptType(type); - - return delegate != null ? delegate.adaptFromJson(object) : null; - } -} diff --git a/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/config/ValidatorConfigAdapterSpi.java b/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/config/ValidatorConfigAdapterSpi.java deleted file mode 100644 index f7bf322a3e..0000000000 --- a/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/config/ValidatorConfigAdapterSpi.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright 2021-2023 Aklivity Inc. - * - * Aklivity licenses this file to you under the Apache License, - * version 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS 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.engine.config; - -import jakarta.json.JsonValue; -import jakarta.json.bind.adapter.JsonbAdapter; - -public interface ValidatorConfigAdapterSpi extends JsonbAdapter -{ - String type(); - - @Override - JsonValue adaptToJson( - ValidatorConfig options); - - @Override - ValidatorConfig adaptFromJson( - JsonValue object); - -} diff --git a/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/converter/ConverterContext.java b/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/converter/ConverterContext.java deleted file mode 100644 index cc5561b2f9..0000000000 --- a/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/converter/ConverterContext.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright 2021-2023 Aklivity Inc. - * - * Aklivity licenses this file to you under the Apache License, - * version 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS 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.engine.converter; - -import io.aklivity.zilla.runtime.engine.config.ConverterConfig; - -public interface ConverterContext -{ - ConverterHandler supplyReadHandler( - ConverterConfig config); - - ConverterHandler supplyWriteHandler( - ConverterConfig config); -} diff --git a/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/internal/registry/ConfigurationManager.java b/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/internal/registry/ConfigurationManager.java index d55686b298..a165e38367 100644 --- a/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/internal/registry/ConfigurationManager.java +++ b/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/internal/registry/ConfigurationManager.java @@ -38,15 +38,14 @@ import io.aklivity.zilla.runtime.engine.config.CatalogedConfig; import io.aklivity.zilla.runtime.engine.config.ConfigAdapterContext; import io.aklivity.zilla.runtime.engine.config.ConfigReader; -import io.aklivity.zilla.runtime.engine.config.ConverterConfig; import io.aklivity.zilla.runtime.engine.config.GuardConfig; import io.aklivity.zilla.runtime.engine.config.GuardedConfig; import io.aklivity.zilla.runtime.engine.config.KindConfig; import io.aklivity.zilla.runtime.engine.config.MetricConfig; import io.aklivity.zilla.runtime.engine.config.MetricRefConfig; +import io.aklivity.zilla.runtime.engine.config.ModelConfig; import io.aklivity.zilla.runtime.engine.config.NamespaceConfig; import io.aklivity.zilla.runtime.engine.config.RouteConfig; -import io.aklivity.zilla.runtime.engine.config.ValidatorConfig; import io.aklivity.zilla.runtime.engine.config.VaultConfig; import io.aklivity.zilla.runtime.engine.expression.ExpressionResolver; import io.aklivity.zilla.runtime.engine.ext.EngineExtContext; @@ -167,21 +166,11 @@ public NamespaceConfig parse( if (binding.options != null) { - for (ConverterConfig converter : binding.options.converters) + for (ModelConfig model : binding.options.models) { - if (converter.cataloged != null) + if (model.cataloged != null) { - for (CatalogedConfig cataloged : converter.cataloged) - { - cataloged.id = namespace.resolveId.applyAsLong(cataloged.name); - } - } - } - for (ValidatorConfig validator : binding.options.validators) - { - if (validator.cataloged != null) - { - for (CatalogedConfig cataloged : validator.cataloged) + for (CatalogedConfig cataloged : model.cataloged) { cataloged.id = namespace.resolveId.applyAsLong(cataloged.name); } diff --git a/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/internal/registry/ConfigurationRegistry.java b/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/internal/registry/ConfigurationRegistry.java index a20dbd60c8..3d1408e7d5 100644 --- a/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/internal/registry/ConfigurationRegistry.java +++ b/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/internal/registry/ConfigurationRegistry.java @@ -31,7 +31,6 @@ import io.aklivity.zilla.runtime.engine.metrics.Metric; import io.aklivity.zilla.runtime.engine.metrics.MetricContext; import io.aklivity.zilla.runtime.engine.util.function.ObjectLongLongFunction; -import io.aklivity.zilla.runtime.engine.validator.ValidatorContext; import io.aklivity.zilla.runtime.engine.vault.VaultContext; public class ConfigurationRegistry @@ -40,7 +39,6 @@ public class ConfigurationRegistry private final Function guardsByType; private final Function vaultsByType; private final Function catalogsByType; - private final Function validatorsByType; private final Function metricsByName; private final Function exportersByType; private final ToIntFunction supplyLabelId; @@ -56,7 +54,6 @@ public ConfigurationRegistry( Function guardsByType, Function vaultsByType, Function catalogsByType, - Function validatorsByType, Function metricsByName, Function exportersByType, ToIntFunction supplyLabelId, @@ -70,7 +67,6 @@ public ConfigurationRegistry( this.guardsByType = guardsByType; this.vaultsByType = vaultsByType; this.catalogsByType = catalogsByType; - this.validatorsByType = validatorsByType; this.metricsByName = metricsByName; this.exportersByType = exportersByType; this.supplyLabelId = supplyLabelId; @@ -170,7 +166,7 @@ private void attachNamespace( NamespaceConfig namespace) { NamespaceRegistry registry = - new NamespaceRegistry(namespace, bindingsByType, guardsByType, vaultsByType, catalogsByType, validatorsByType, + new NamespaceRegistry(namespace, bindingsByType, guardsByType, vaultsByType, catalogsByType, metricsByName, exportersByType, supplyLabelId, this::resolveMetric, exporterAttached, exporterDetached, supplyMetricRecorder, detachBinding, collector); namespacesById.put(registry.namespaceId(), registry); diff --git a/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/internal/registry/DispatchAgent.java b/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/internal/registry/DispatchAgent.java index f6191d4672..9585125343 100644 --- a/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/internal/registry/DispatchAgent.java +++ b/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/internal/registry/DispatchAgent.java @@ -94,12 +94,8 @@ import io.aklivity.zilla.runtime.engine.catalog.CatalogHandler; import io.aklivity.zilla.runtime.engine.concurrent.Signaler; import io.aklivity.zilla.runtime.engine.config.BindingConfig; -import io.aklivity.zilla.runtime.engine.config.ConverterConfig; +import io.aklivity.zilla.runtime.engine.config.ModelConfig; import io.aklivity.zilla.runtime.engine.config.NamespaceConfig; -import io.aklivity.zilla.runtime.engine.config.ValidatorConfig; -import io.aklivity.zilla.runtime.engine.converter.Converter; -import io.aklivity.zilla.runtime.engine.converter.ConverterContext; -import io.aklivity.zilla.runtime.engine.converter.ConverterHandler; import io.aklivity.zilla.runtime.engine.exporter.Exporter; import io.aklivity.zilla.runtime.engine.exporter.ExporterContext; import io.aklivity.zilla.runtime.engine.exporter.ExporterHandler; @@ -133,11 +129,12 @@ import io.aklivity.zilla.runtime.engine.metrics.Metric; import io.aklivity.zilla.runtime.engine.metrics.MetricContext; import io.aklivity.zilla.runtime.engine.metrics.MetricGroup; +import io.aklivity.zilla.runtime.engine.model.ConverterHandler; +import io.aklivity.zilla.runtime.engine.model.Model; +import io.aklivity.zilla.runtime.engine.model.ModelContext; +import io.aklivity.zilla.runtime.engine.model.ValidatorHandler; import io.aklivity.zilla.runtime.engine.poller.PollerKey; import io.aklivity.zilla.runtime.engine.util.function.LongLongFunction; -import io.aklivity.zilla.runtime.engine.validator.Validator; -import io.aklivity.zilla.runtime.engine.validator.ValidatorContext; -import io.aklivity.zilla.runtime.engine.validator.ValidatorHandler; import io.aklivity.zilla.runtime.engine.vault.Vault; import io.aklivity.zilla.runtime.engine.vault.VaultContext; import io.aklivity.zilla.runtime.engine.vault.VaultHandler; @@ -202,8 +199,7 @@ public class DispatchAgent implements EngineContext, Agent private final ElektronSignaler signaler; private final Long2ObjectHashMap correlations; private final Long2ObjectHashMap exportersById; - private final Map validatorsByType; - private final Map convertersByType; + private final Map modelsByType; private final ConfigurationRegistry configuration; private final Deque taskQueue; @@ -233,8 +229,7 @@ public DispatchAgent( Collection guards, Collection vaults, Collection catalogs, - Collection validators, - Collection converters, + Collection models, Collection metricGroups, Collector collector, int index, @@ -378,21 +373,13 @@ public DispatchAgent( catalogsByType.put(type, catalog.supply(this)); } - Map validatorsByType = new LinkedHashMap<>(); - for (Validator validator : validators) + Map modelsByType = new LinkedHashMap<>(); + for (Model model : models) { - String type = validator.name(); - validatorsByType.put(type, validator.supply(this)); + String type = model.name(); + modelsByType.put(type, model.supply(this)); } - this.validatorsByType = validatorsByType; - - Map convertersByType = new LinkedHashMap<>(); - for (Converter converter : converters) - { - String type = converter.name(); - convertersByType.put(type, converter.supply(this)); - } - this.convertersByType = convertersByType; + this.modelsByType = modelsByType; Map metricsByName = new LinkedHashMap<>(); for (MetricGroup metricGroup : metricGroups) @@ -411,7 +398,7 @@ public DispatchAgent( } this.configuration = new ConfigurationRegistry( - bindingsByType::get, guardsByType::get, vaultsByType::get, catalogsByType::get, validatorsByType::get, + bindingsByType::get, guardsByType::get, vaultsByType::get, catalogsByType::get, metricsByName::get, exportersByType::get, labels::supplyLabelId, this::onExporterAttached, this::onExporterDetached, this::supplyMetricWriter, this::detachStreams, collector); this.taskQueue = new ConcurrentLinkedDeque<>(); @@ -677,26 +664,26 @@ public CatalogHandler supplyCatalog( @Override public ValidatorHandler supplyValidator( - ValidatorConfig config) + ModelConfig config) { - ValidatorContext validator = validatorsByType.get(config.type); - return validator != null ? validator.supplyHandler(config) : null; + ModelContext model = modelsByType.get(config.type); + return model != null ? model.supplyValidatorHandler(config) : null; } @Override - public ConverterHandler supplyReadHandler( - ConverterConfig config) + public ConverterHandler supplyReadConverter( + ModelConfig config) { - ConverterContext converter = convertersByType.get(config.type); - return converter != null ? converter.supplyReadHandler(config) : null; + ModelContext model = modelsByType.get(config.type); + return model != null ? model.supplyReadConverterHandler(config) : null; } @Override - public ConverterHandler supplyWriteHandler( - ConverterConfig config) + public ConverterHandler supplyWriteConverter( + ModelConfig config) { - ConverterContext converter = convertersByType.get(config.type); - return converter != null ? converter.supplyWriteHandler(config) : null; + ModelContext model = modelsByType.get(config.type); + return model != null ? model.supplyWriteConverterHandler(config) : null; } @Override diff --git a/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/internal/registry/NamespaceRegistry.java b/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/internal/registry/NamespaceRegistry.java index 79b7aae87c..ce36736c1d 100644 --- a/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/internal/registry/NamespaceRegistry.java +++ b/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/internal/registry/NamespaceRegistry.java @@ -48,7 +48,6 @@ import io.aklivity.zilla.runtime.engine.metrics.Metric; import io.aklivity.zilla.runtime.engine.metrics.MetricContext; import io.aklivity.zilla.runtime.engine.util.function.ObjectLongLongFunction; -import io.aklivity.zilla.runtime.engine.validator.ValidatorContext; import io.aklivity.zilla.runtime.engine.vault.VaultContext; public class NamespaceRegistry @@ -81,7 +80,6 @@ public NamespaceRegistry( Function guardsByType, Function vaultsByType, Function catalogsByType, - Function validatorsByType, Function metricsByName, Function exportersByType, ToIntFunction supplyLabelId, diff --git a/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/converter/ConverterHandler.java b/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/model/ConverterHandler.java similarity index 89% rename from runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/converter/ConverterHandler.java rename to runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/model/ConverterHandler.java index 048e88408c..dccd29248c 100644 --- a/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/converter/ConverterHandler.java +++ b/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/model/ConverterHandler.java @@ -13,11 +13,11 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.aklivity.zilla.runtime.engine.converter; +package io.aklivity.zilla.runtime.engine.model; import org.agrona.DirectBuffer; -import io.aklivity.zilla.runtime.engine.converter.function.ValueConsumer; +import io.aklivity.zilla.runtime.engine.model.function.ValueConsumer; public interface ConverterHandler { diff --git a/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/converter/Converter.java b/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/model/Model.java similarity index 87% rename from runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/converter/Converter.java rename to runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/model/Model.java index 6b53f7e44a..d193d4b412 100644 --- a/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/converter/Converter.java +++ b/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/model/Model.java @@ -13,17 +13,17 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.aklivity.zilla.runtime.engine.converter; +package io.aklivity.zilla.runtime.engine.model; import java.net.URL; import io.aklivity.zilla.runtime.engine.EngineContext; -public interface Converter +public interface Model { String name(); - ConverterContext supply( + ModelContext supply( EngineContext context); URL type(); diff --git a/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/converter/ConverterTest.java b/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/model/ModelContext.java similarity index 61% rename from runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/converter/ConverterTest.java rename to runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/model/ModelContext.java index 41d80f0ca1..14609ced0c 100644 --- a/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/converter/ConverterTest.java +++ b/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/model/ModelContext.java @@ -13,20 +13,21 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.aklivity.zilla.runtime.engine.converter; +package io.aklivity.zilla.runtime.engine.model; -import static org.junit.Assert.assertEquals; +import io.aklivity.zilla.runtime.engine.config.ModelConfig; -import org.agrona.concurrent.UnsafeBuffer; -import org.junit.Test; - -public class ConverterTest +public interface ModelContext { - @Test - public void shouldCreateAndVerifyNoOpValueConverter() - { - ConverterHandler converter = ConverterHandler.NONE; + ConverterHandler supplyReadConverterHandler( + ModelConfig config); - assertEquals(1, converter.convert(new UnsafeBuffer(), 1, 1, (b, i, l) -> {})); + ConverterHandler supplyWriteConverterHandler( + ModelConfig config); + + default ValidatorHandler supplyValidatorHandler( + ModelConfig config) + { + return null; } } diff --git a/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/converter/ConverterFactory.java b/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/model/ModelFactory.java similarity index 57% rename from runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/converter/ConverterFactory.java rename to runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/model/ModelFactory.java index a8b1a96b24..c4d4a400e5 100644 --- a/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/converter/ConverterFactory.java +++ b/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/model/ModelFactory.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.aklivity.zilla.runtime.engine.converter; +package io.aklivity.zilla.runtime.engine.model; import static java.util.Collections.unmodifiableMap; import static java.util.Objects.requireNonNull; @@ -26,48 +26,48 @@ import io.aklivity.zilla.runtime.engine.Configuration; -public final class ConverterFactory +public final class ModelFactory { - private final Map converterSpis; + private final Map modelSpis; - public static ConverterFactory instantiate() + public static ModelFactory instantiate() { - return instantiate(load(ConverterFactorySpi.class)); + return instantiate(load(ModelFactorySpi.class)); } public Iterable names() { - return converterSpis.keySet(); + return modelSpis.keySet(); } - public Converter create( + public Model create( String name, Configuration config) { requireNonNull(name, "name"); - ConverterFactorySpi converterSpi = requireNonNull(converterSpis.get(name), () -> "Unrecognized Converter name: " + name); + ModelFactorySpi converterSpi = requireNonNull(modelSpis.get(name), () -> "Unrecognized Model name: " + name); return converterSpi.create(config); } - public Collection converterSpis() + public Collection converterSpis() { - return converterSpis.values(); + return modelSpis.values(); } - private static ConverterFactory instantiate( - ServiceLoader converters) + private static ModelFactory instantiate( + ServiceLoader converters) { - Map converterSpisByName = new TreeMap<>(); + Map converterSpisByName = new TreeMap<>(); converters.forEach(converterSpi -> converterSpisByName.put(converterSpi.type(), converterSpi)); - return new ConverterFactory(unmodifiableMap(converterSpisByName)); + return new ModelFactory(unmodifiableMap(converterSpisByName)); } - private ConverterFactory( - Map converterSpis) + private ModelFactory( + Map modelSpis) { - this.converterSpis = converterSpis; + this.modelSpis = modelSpis; } } diff --git a/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/converter/ConverterFactorySpi.java b/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/model/ModelFactorySpi.java similarity index 87% rename from runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/converter/ConverterFactorySpi.java rename to runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/model/ModelFactorySpi.java index e030ca53f2..13c8754c77 100644 --- a/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/converter/ConverterFactorySpi.java +++ b/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/model/ModelFactorySpi.java @@ -13,18 +13,18 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.aklivity.zilla.runtime.engine.converter; +package io.aklivity.zilla.runtime.engine.model; import java.net.URL; import io.aklivity.zilla.runtime.engine.Configuration; -public interface ConverterFactorySpi +public interface ModelFactorySpi { String type(); URL schema(); - Converter create( + Model create( Configuration config); } diff --git a/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/validator/ValidatorHandler.java b/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/model/ValidatorHandler.java similarity index 89% rename from runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/validator/ValidatorHandler.java rename to runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/model/ValidatorHandler.java index 6af816e749..6e979b4abf 100644 --- a/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/validator/ValidatorHandler.java +++ b/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/model/ValidatorHandler.java @@ -13,11 +13,11 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.aklivity.zilla.runtime.engine.validator; +package io.aklivity.zilla.runtime.engine.model; import org.agrona.DirectBuffer; -import io.aklivity.zilla.runtime.engine.converter.function.ValueConsumer; +import io.aklivity.zilla.runtime.engine.model.function.ValueConsumer; public interface ValidatorHandler { diff --git a/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/converter/function/ValueConsumer.java b/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/model/function/ValueConsumer.java similarity index 93% rename from runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/converter/function/ValueConsumer.java rename to runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/model/function/ValueConsumer.java index 75334aeb2b..f0076fc2d0 100644 --- a/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/converter/function/ValueConsumer.java +++ b/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/model/function/ValueConsumer.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.aklivity.zilla.runtime.engine.converter.function; +package io.aklivity.zilla.runtime.engine.model.function; import org.agrona.DirectBuffer; diff --git a/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/validator/Validator.java b/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/validator/Validator.java deleted file mode 100644 index 607fd7c825..0000000000 --- a/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/validator/Validator.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright 2021-2023 Aklivity Inc. - * - * Aklivity licenses this file to you under the Apache License, - * version 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS 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.engine.validator; - -import java.net.URL; - -import io.aklivity.zilla.runtime.engine.EngineContext; - -public interface Validator -{ - String name(); - - ValidatorContext supply( - EngineContext context); - - URL type(); -} diff --git a/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/validator/ValidatorContext.java b/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/validator/ValidatorContext.java deleted file mode 100644 index 83440dd345..0000000000 --- a/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/validator/ValidatorContext.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright 2021-2023 Aklivity Inc. - * - * Aklivity licenses this file to you under the Apache License, - * version 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS 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.engine.validator; - -import io.aklivity.zilla.runtime.engine.config.ValidatorConfig; - -public interface ValidatorContext -{ - ValidatorHandler supplyHandler( - ValidatorConfig validator); -} diff --git a/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/validator/ValidatorFactory.java b/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/validator/ValidatorFactory.java deleted file mode 100644 index 608611f246..0000000000 --- a/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/validator/ValidatorFactory.java +++ /dev/null @@ -1,73 +0,0 @@ -/* - * Copyright 2021-2023 Aklivity Inc. - * - * Aklivity licenses this file to you under the Apache License, - * version 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS 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.engine.validator; - -import static java.util.Collections.unmodifiableMap; -import static java.util.Objects.requireNonNull; -import static java.util.ServiceLoader.load; - -import java.util.Collection; -import java.util.Map; -import java.util.ServiceLoader; -import java.util.TreeMap; - -import io.aklivity.zilla.runtime.engine.Configuration; - -public final class ValidatorFactory -{ - private final Map factorySpis; - - public static ValidatorFactory instantiate() - { - return instantiate(load(ValidatorFactorySpi.class)); - } - - public Iterable names() - { - return factorySpis.keySet(); - } - - public Validator create( - String name, - Configuration config) - { - requireNonNull(name, "name"); - - ValidatorFactorySpi factorySpi = requireNonNull(factorySpis.get(name), () -> "Unrecognized validator name: " + name); - - return factorySpi.create(config); - } - - public Collection validatorSpis() - { - return factorySpis.values(); - } - - private static ValidatorFactory instantiate( - ServiceLoader factories) - { - Map factorySpisByName = new TreeMap<>(); - factories.forEach(factorySpi -> factorySpisByName.put(factorySpi.type(), factorySpi)); - - return new ValidatorFactory(unmodifiableMap(factorySpisByName)); - } - - private ValidatorFactory( - Map factorySpis) - { - this.factorySpis = factorySpis; - } -} diff --git a/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/validator/ValidatorFactorySpi.java b/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/validator/ValidatorFactorySpi.java deleted file mode 100644 index e84849a206..0000000000 --- a/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/validator/ValidatorFactorySpi.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright 2021-2023 Aklivity Inc. - * - * Aklivity licenses this file to you under the Apache License, - * version 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS 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.engine.validator; - -import io.aklivity.zilla.runtime.engine.Configuration; - -public interface ValidatorFactorySpi -{ - String type(); - - Validator create( - Configuration config); -} diff --git a/runtime/engine/src/main/moditect/module-info.java b/runtime/engine/src/main/moditect/module-info.java index 2890df2a2d..97b79d1339 100644 --- a/runtime/engine/src/main/moditect/module-info.java +++ b/runtime/engine/src/main/moditect/module-info.java @@ -21,15 +21,14 @@ exports io.aklivity.zilla.runtime.engine.binding; exports io.aklivity.zilla.runtime.engine.binding.function; exports io.aklivity.zilla.runtime.engine.catalog; - exports io.aklivity.zilla.runtime.engine.converter; - exports io.aklivity.zilla.runtime.engine.converter.function; + exports io.aklivity.zilla.runtime.engine.model; + exports io.aklivity.zilla.runtime.engine.model.function; exports io.aklivity.zilla.runtime.engine.exporter; exports io.aklivity.zilla.runtime.engine.guard; exports io.aklivity.zilla.runtime.engine.metrics; exports io.aklivity.zilla.runtime.engine.metrics.reader; exports io.aklivity.zilla.runtime.engine.reader; exports io.aklivity.zilla.runtime.engine.util.function; - exports io.aklivity.zilla.runtime.engine.validator; exports io.aklivity.zilla.runtime.engine.vault; exports io.aklivity.zilla.runtime.engine.ext; @@ -51,17 +50,15 @@ uses io.aklivity.zilla.runtime.engine.config.ConditionConfigAdapterSpi; uses io.aklivity.zilla.runtime.engine.config.OptionsConfigAdapterSpi; - uses io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi; - uses io.aklivity.zilla.runtime.engine.config.ValidatorConfigAdapterSpi; + uses io.aklivity.zilla.runtime.engine.config.ModelConfigAdapterSpi; uses io.aklivity.zilla.runtime.engine.config.WithConfigAdapterSpi; uses io.aklivity.zilla.runtime.engine.binding.BindingFactorySpi; uses io.aklivity.zilla.runtime.engine.catalog.CatalogFactorySpi; - uses io.aklivity.zilla.runtime.engine.converter.ConverterFactorySpi; + uses io.aklivity.zilla.runtime.engine.model.ModelFactorySpi; uses io.aklivity.zilla.runtime.engine.exporter.ExporterFactorySpi; uses io.aklivity.zilla.runtime.engine.guard.GuardFactorySpi; uses io.aklivity.zilla.runtime.engine.metrics.MetricGroupFactorySpi; - uses io.aklivity.zilla.runtime.engine.validator.ValidatorFactorySpi; uses io.aklivity.zilla.runtime.engine.vault.VaultFactorySpi; uses io.aklivity.zilla.runtime.engine.ext.EngineExtSpi; uses io.aklivity.zilla.runtime.engine.expression.ExpressionResolverSpi; diff --git a/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/internal/config/ValidatorConfigAdapterTest.java b/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/internal/config/ValidatorConfigAdapterTest.java deleted file mode 100644 index 74f539de9c..0000000000 --- a/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/internal/config/ValidatorConfigAdapterTest.java +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Copyright 2021-2023 Aklivity Inc. - * - * Aklivity licenses this file to you under the Apache License, - * version 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS 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.engine.internal.config; - -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.not; -import static org.hamcrest.Matchers.nullValue; - -import jakarta.json.bind.Jsonb; -import jakarta.json.bind.JsonbBuilder; -import jakarta.json.bind.JsonbConfig; - -import org.junit.Before; -import org.junit.Test; - -import io.aklivity.zilla.runtime.engine.config.ValidatorConfig; -import io.aklivity.zilla.runtime.engine.config.ValidatorConfigAdapter; -import io.aklivity.zilla.runtime.engine.test.internal.validator.config.TestValidatorConfig; - -public class ValidatorConfigAdapterTest -{ - private Jsonb jsonb; - - @Before - public void initJson() - { - ValidatorConfigAdapter adapter = new ValidatorConfigAdapter(); - adapter.adaptType("test"); - JsonbConfig config = new JsonbConfig() - .withAdapters(adapter); - jsonb = JsonbBuilder.create(config); - } - - @Test - public void shouldReadValidator() - { - // GIVEN - String json = - "{" + - "\"type\": \"test\"" + - "}"; - - // WHEN - ValidatorConfig config = jsonb.fromJson(json, ValidatorConfig.class); - - // THEN - assertThat(config, not(nullValue())); - assertThat(config.type, equalTo("test")); - } - - @Test - public void shouldWriteValidator() - { - // GIVEN - String expectedJson = "\"test\""; - ValidatorConfig config = TestValidatorConfig.builder().build(); - - // WHEN - String json = jsonb.toJson(config); - - // THEN - assertThat(json, not(nullValue())); - assertThat(json, equalTo(expectedJson)); - } -} diff --git a/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/internal/converter/ConverterFactoryTest.java b/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/internal/converter/ConverterFactoryTest.java deleted file mode 100644 index 2e4c7e956d..0000000000 --- a/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/internal/converter/ConverterFactoryTest.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright 2021-2023 Aklivity Inc. - * - * Aklivity licenses this file to you under the Apache License, - * version 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS 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.engine.internal.converter; - -import static org.hamcrest.CoreMatchers.instanceOf; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.mockito.Mockito.mock; - -import org.junit.Test; - -import io.aklivity.zilla.runtime.engine.Configuration; -import io.aklivity.zilla.runtime.engine.EngineContext; -import io.aklivity.zilla.runtime.engine.converter.Converter; -import io.aklivity.zilla.runtime.engine.converter.ConverterContext; -import io.aklivity.zilla.runtime.engine.converter.ConverterFactory; -import io.aklivity.zilla.runtime.engine.test.internal.converter.TestConverter; -import io.aklivity.zilla.runtime.engine.test.internal.converter.TestConverterContext; -import io.aklivity.zilla.runtime.engine.test.internal.converter.TestConverterHandler; -import io.aklivity.zilla.runtime.engine.test.internal.converter.config.TestConverterConfig; - -public class ConverterFactoryTest -{ - @Test - public void shouldLoadAndCreate() - { - Configuration config = new Configuration(); - ConverterFactory factory = ConverterFactory.instantiate(); - Converter converter = factory.create("test", config); - - TestConverterConfig converterConfig = TestConverterConfig.builder().length(4).build(); - ConverterContext context = new TestConverterContext(mock(EngineContext.class)); - - assertThat(converter, instanceOf(TestConverter.class)); - assertThat(context.supplyReadHandler(converterConfig), instanceOf(TestConverterHandler.class)); - assertThat(context.supplyWriteHandler(converterConfig), instanceOf(TestConverterHandler.class)); - } -} diff --git a/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/internal/model/ModelFactoryTest.java b/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/internal/model/ModelFactoryTest.java new file mode 100644 index 0000000000..552cd627c1 --- /dev/null +++ b/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/internal/model/ModelFactoryTest.java @@ -0,0 +1,50 @@ +/* + * Copyright 2021-2023 Aklivity Inc. + * + * Aklivity licenses this file to you under the Apache License, + * version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at: + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS 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.engine.internal.model; + +import static org.hamcrest.CoreMatchers.instanceOf; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.mockito.Mockito.mock; + +import org.junit.Test; + +import io.aklivity.zilla.runtime.engine.Configuration; +import io.aklivity.zilla.runtime.engine.EngineContext; +import io.aklivity.zilla.runtime.engine.model.Model; +import io.aklivity.zilla.runtime.engine.model.ModelContext; +import io.aklivity.zilla.runtime.engine.model.ModelFactory; +import io.aklivity.zilla.runtime.engine.test.internal.model.TestConverterHandler; +import io.aklivity.zilla.runtime.engine.test.internal.model.TestModel; +import io.aklivity.zilla.runtime.engine.test.internal.model.TestModelContext; +import io.aklivity.zilla.runtime.engine.test.internal.model.config.TestModelConfig; + +public class ModelFactoryTest +{ + @Test + public void shouldLoadAndCreate() + { + Configuration config = new Configuration(); + ModelFactory factory = ModelFactory.instantiate(); + Model model = factory.create("test", config); + + TestModelConfig converterConfig = TestModelConfig.builder().length(4).build(); + ModelContext context = new TestModelContext(mock(EngineContext.class)); + + assertThat(model, instanceOf(TestModel.class)); + assertThat(context.supplyReadConverterHandler(converterConfig), instanceOf(TestConverterHandler.class)); + assertThat(context.supplyWriteConverterHandler(converterConfig), instanceOf(TestConverterHandler.class)); + } +} diff --git a/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/internal/converter/ConverterTest.java b/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/internal/model/ModelTest.java similarity index 73% rename from runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/internal/converter/ConverterTest.java rename to runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/internal/model/ModelTest.java index fb53d74738..94c3361c7b 100644 --- a/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/internal/converter/ConverterTest.java +++ b/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/internal/model/ModelTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.aklivity.zilla.runtime.engine.internal.converter; +package io.aklivity.zilla.runtime.engine.internal.model; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.mock; @@ -25,19 +25,19 @@ import org.junit.Test; import io.aklivity.zilla.runtime.engine.catalog.CatalogHandler; -import io.aklivity.zilla.runtime.engine.config.ConverterConfig; -import io.aklivity.zilla.runtime.engine.converter.ConverterHandler; -import io.aklivity.zilla.runtime.engine.converter.function.ValueConsumer; -import io.aklivity.zilla.runtime.engine.test.internal.converter.TestConverterHandler; -import io.aklivity.zilla.runtime.engine.test.internal.converter.config.TestConverterConfig; +import io.aklivity.zilla.runtime.engine.config.ModelConfig; +import io.aklivity.zilla.runtime.engine.model.ConverterHandler; +import io.aklivity.zilla.runtime.engine.model.function.ValueConsumer; +import io.aklivity.zilla.runtime.engine.test.internal.model.TestConverterHandler; +import io.aklivity.zilla.runtime.engine.test.internal.model.config.TestModelConfig; -public class ConverterTest +public class ModelTest { @Test public void shouldValidateWithoutFlag() { LongFunction supplyCatalog = mock(LongFunction.class); - ConverterConfig config = TestConverterConfig.builder() + ModelConfig config = TestModelConfig.builder() .length(4) .catalog() .name("test0") @@ -47,7 +47,7 @@ public void shouldValidateWithoutFlag() .build() .read(true) .build(); - ConverterHandler handler = new TestConverterHandler(TestConverterConfig.class.cast(config), supplyCatalog); + ConverterHandler handler = new TestConverterHandler(TestModelConfig.class.cast(config), supplyCatalog); DirectBuffer data = new UnsafeBuffer(); diff --git a/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/internal/converter/config/ConverterConfigAdapterTest.java b/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/internal/model/config/ModelConfigAdapterTest.java similarity index 76% rename from runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/internal/converter/config/ConverterConfigAdapterTest.java rename to runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/internal/model/config/ModelConfigAdapterTest.java index 75d7ce1c14..8dd0f8419b 100644 --- a/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/internal/converter/config/ConverterConfigAdapterTest.java +++ b/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/internal/model/config/ModelConfigAdapterTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.aklivity.zilla.runtime.engine.internal.converter.config; +package io.aklivity.zilla.runtime.engine.internal.model.config; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; @@ -27,18 +27,18 @@ import org.junit.Before; import org.junit.Test; -import io.aklivity.zilla.runtime.engine.config.ConverterConfig; -import io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapter; -import io.aklivity.zilla.runtime.engine.test.internal.converter.config.TestConverterConfig; +import io.aklivity.zilla.runtime.engine.config.ModelConfig; +import io.aklivity.zilla.runtime.engine.config.ModelConfigAdapter; +import io.aklivity.zilla.runtime.engine.test.internal.model.config.TestModelConfig; -public class ConverterConfigAdapterTest +public class ModelConfigAdapterTest { private Jsonb jsonb; @Before public void initJson() { - ConverterConfigAdapter adapter = new ConverterConfigAdapter(); + ModelConfigAdapter adapter = new ModelConfigAdapter(); adapter.adaptType("test"); JsonbConfig config = new JsonbConfig() .withAdapters(adapter); @@ -55,7 +55,7 @@ public void shouldReadConverter() "}"; // WHEN - ConverterConfig converter = jsonb.fromJson(json, ConverterConfig.class); + ModelConfig converter = jsonb.fromJson(json, ModelConfig.class); // THEN assertThat(converter, not(nullValue())); @@ -67,7 +67,7 @@ public void shouldWriteConverter() { // GIVEN String expectedJson = "\"test\""; - ConverterConfig converter = TestConverterConfig.builder().build(); + ModelConfig converter = TestModelConfig.builder().build(); // WHEN String json = jsonb.toJson(converter); diff --git a/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/model/ModelFactoryTest.java b/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/model/ModelFactoryTest.java new file mode 100644 index 0000000000..5ce28f2008 --- /dev/null +++ b/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/model/ModelFactoryTest.java @@ -0,0 +1,71 @@ +/* + * Copyright 2021-2023 Aklivity Inc. + * + * Aklivity licenses this file to you under the Apache License, + * version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at: + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS 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.engine.model; + +import static org.hamcrest.CoreMatchers.instanceOf; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertNull; +import static org.mockito.Mockito.mock; + +import org.junit.Test; + +import io.aklivity.zilla.runtime.engine.Configuration; +import io.aklivity.zilla.runtime.engine.EngineContext; +import io.aklivity.zilla.runtime.engine.config.ModelConfig; +import io.aklivity.zilla.runtime.engine.test.internal.model.TestModel; +import io.aklivity.zilla.runtime.engine.test.internal.model.TestModelContext; +import io.aklivity.zilla.runtime.engine.test.internal.model.TestValidatorHandler; +import io.aklivity.zilla.runtime.engine.test.internal.model.config.TestModelConfig; + +public class ModelFactoryTest +{ + @Test + public void shouldLoadAndCreate() + { + Configuration config = new Configuration(); + ModelFactory factory = ModelFactory.instantiate(); + Model model = factory.create("test", config); + + TestModelConfig modelConfig = TestModelConfig.builder().length(4).build(); + ModelContext context = new TestModelContext(mock(EngineContext.class)); + + assertThat(model, instanceOf(TestModel.class)); + assertThat(context.supplyValidatorHandler(modelConfig), instanceOf(TestValidatorHandler.class)); + } + + @Test + public void shouldCreateNullValidator() + { + TestModelConfig config = TestModelConfig.builder().length(4).build(); + ModelContext context = new ModelContext() + { + @Override + public ConverterHandler supplyReadConverterHandler( + ModelConfig config) + { + return null; + } + + @Override + public ConverterHandler supplyWriteConverterHandler( + ModelConfig config) + { + return null; + } + }; + assertNull(context.supplyValidatorHandler(config)); + } +} diff --git a/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/validator/ValidatorTest.java b/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/model/ModelTest.java similarity index 52% rename from runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/validator/ValidatorTest.java rename to runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/model/ModelTest.java index dd0f3a0bec..93d4b93e23 100644 --- a/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/validator/ValidatorTest.java +++ b/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/model/ModelTest.java @@ -13,26 +13,40 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.aklivity.zilla.runtime.engine.validator; +package io.aklivity.zilla.runtime.engine.model; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.mock; import org.agrona.DirectBuffer; import org.agrona.concurrent.UnsafeBuffer; import org.junit.Test; -import io.aklivity.zilla.runtime.engine.converter.function.ValueConsumer; -import io.aklivity.zilla.runtime.engine.test.internal.validator.TestValidatorHandler; -import io.aklivity.zilla.runtime.engine.test.internal.validator.config.TestValidatorConfig; +import io.aklivity.zilla.runtime.engine.EngineContext; +import io.aklivity.zilla.runtime.engine.model.function.ValueConsumer; +import io.aklivity.zilla.runtime.engine.test.internal.model.TestModelContext; +import io.aklivity.zilla.runtime.engine.test.internal.model.config.TestModelConfig; -public class ValidatorTest +public class ModelTest { - private final TestValidatorConfig config = TestValidatorConfig.builder().length(4).build(); - private final ValidatorHandler handler = new TestValidatorHandler(config); + @Test + public void shouldCreateAndVerifyNoOpValueConverter() + { + ConverterHandler converter = ConverterHandler.NONE; + + assertEquals(1, converter.convert(new UnsafeBuffer(), 1, 1, (b, i, l) -> {})); + } @Test public void shouldValidateWithoutFlag() { + TestModelConfig modelConfig = TestModelConfig.builder() + .length(4) + .build(); + ModelContext context = new TestModelContext(mock(EngineContext.class)); + ValidatorHandler handler = context.supplyValidatorHandler(modelConfig); + DirectBuffer data = new UnsafeBuffer(); byte[] bytes = {0, 0, 0, 42}; diff --git a/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/converter/function/ValueConsumerTest.java b/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/model/function/ValueConsumerTest.java similarity index 95% rename from runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/converter/function/ValueConsumerTest.java rename to runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/model/function/ValueConsumerTest.java index 08660514a3..4c3f5d76ca 100644 --- a/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/converter/function/ValueConsumerTest.java +++ b/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/model/function/ValueConsumerTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.aklivity.zilla.runtime.engine.converter.function; +package io.aklivity.zilla.runtime.engine.model.function; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; diff --git a/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/catalog/DecoderTest.java b/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/catalog/DecoderTest.java index 85607d5277..176010c27f 100644 --- a/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/catalog/DecoderTest.java +++ b/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/catalog/DecoderTest.java @@ -21,7 +21,7 @@ import org.junit.Test; 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 DecoderTest { diff --git a/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/catalog/EncoderTest.java b/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/catalog/EncoderTest.java index 46cbf987e9..aec980f6ff 100644 --- a/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/catalog/EncoderTest.java +++ b/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/catalog/EncoderTest.java @@ -21,7 +21,7 @@ import org.junit.Test; 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 EncoderTest { diff --git a/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/converter/TestConverterContext.java b/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/converter/TestConverterContext.java deleted file mode 100644 index ead297216f..0000000000 --- a/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/converter/TestConverterContext.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright 2021-2023 Aklivity Inc. - * - * Aklivity licenses this file to you under the Apache License, - * version 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS 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.engine.test.internal.converter; - -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.engine.test.internal.converter.config.TestConverterConfig; - -public class TestConverterContext implements ConverterContext -{ - private final LongFunction supplyCatalog; - - public TestConverterContext( - EngineContext context) - { - this.supplyCatalog = context::supplyCatalog; - } - - @Override - public ConverterHandler supplyReadHandler( - ConverterConfig config) - { - return new TestConverterHandler(TestConverterConfig.class.cast(config), supplyCatalog); - } - - @Override - public ConverterHandler supplyWriteHandler( - ConverterConfig config) - { - return new TestConverterHandler(TestConverterConfig.class.cast(config), supplyCatalog); - } -} diff --git a/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/converter/TestConverterHandler.java b/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/model/TestConverterHandler.java similarity index 86% rename from runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/converter/TestConverterHandler.java rename to runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/model/TestConverterHandler.java index 9ae9a5e9c0..63de57e233 100644 --- a/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/converter/TestConverterHandler.java +++ b/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/model/TestConverterHandler.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.aklivity.zilla.runtime.engine.test.internal.converter; +package io.aklivity.zilla.runtime.engine.test.internal.model; import java.util.function.LongFunction; @@ -22,9 +22,9 @@ import io.aklivity.zilla.runtime.engine.catalog.CatalogHandler; import io.aklivity.zilla.runtime.engine.config.CatalogedConfig; import io.aklivity.zilla.runtime.engine.config.SchemaConfig; -import io.aklivity.zilla.runtime.engine.converter.ConverterHandler; -import io.aklivity.zilla.runtime.engine.converter.function.ValueConsumer; -import io.aklivity.zilla.runtime.engine.test.internal.converter.config.TestConverterConfig; +import io.aklivity.zilla.runtime.engine.model.ConverterHandler; +import io.aklivity.zilla.runtime.engine.model.function.ValueConsumer; +import io.aklivity.zilla.runtime.engine.test.internal.model.config.TestModelConfig; public class TestConverterHandler implements ConverterHandler { @@ -35,7 +35,7 @@ public class TestConverterHandler implements ConverterHandler private final SchemaConfig schema; public TestConverterHandler( - TestConverterConfig config, + TestModelConfig config, LongFunction supplyCatalog) { this.length = config.length; diff --git a/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/converter/TestConverter.java b/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/model/TestModel.java similarity index 75% rename from runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/converter/TestConverter.java rename to runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/model/TestModel.java index 8f15872a57..80590ffceb 100644 --- a/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/converter/TestConverter.java +++ b/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/model/TestModel.java @@ -13,15 +13,15 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.aklivity.zilla.runtime.engine.test.internal.converter; +package io.aklivity.zilla.runtime.engine.test.internal.model; 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; +import io.aklivity.zilla.runtime.engine.model.Model; +import io.aklivity.zilla.runtime.engine.model.ModelContext; -public class TestConverter implements Converter +public class TestModel implements Model { public static final String NAME = "test"; @@ -32,10 +32,10 @@ public String name() } @Override - public ConverterContext supply( + public ModelContext supply( EngineContext context) { - return new TestConverterContext(context); + return new TestModelContext(context); } @Override diff --git a/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/model/TestModelContext.java b/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/model/TestModelContext.java new file mode 100644 index 0000000000..b15c72a9b4 --- /dev/null +++ b/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/model/TestModelContext.java @@ -0,0 +1,58 @@ +/* + * Copyright 2021-2023 Aklivity Inc. + * + * Aklivity licenses this file to you under the Apache License, + * version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at: + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS 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.engine.test.internal.model; + +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.ModelConfig; +import io.aklivity.zilla.runtime.engine.model.ConverterHandler; +import io.aklivity.zilla.runtime.engine.model.ModelContext; +import io.aklivity.zilla.runtime.engine.model.ValidatorHandler; +import io.aklivity.zilla.runtime.engine.test.internal.model.config.TestModelConfig; + +public class TestModelContext implements ModelContext +{ + private final LongFunction supplyCatalog; + + public TestModelContext( + EngineContext context) + { + this.supplyCatalog = context::supplyCatalog; + } + + @Override + public ConverterHandler supplyReadConverterHandler( + ModelConfig config) + { + return new TestConverterHandler(TestModelConfig.class.cast(config), supplyCatalog); + } + + @Override + public ConverterHandler supplyWriteConverterHandler( + ModelConfig config) + { + return new TestConverterHandler(TestModelConfig.class.cast(config), supplyCatalog); + } + + @Override + public ValidatorHandler supplyValidatorHandler( + ModelConfig config) + { + return new TestValidatorHandler(TestModelConfig.class.cast(config)); + } +} diff --git a/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/converter/TestConverterFactorySpi.java b/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/model/TestModelFactorySpi.java similarity index 74% rename from runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/converter/TestConverterFactorySpi.java rename to runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/model/TestModelFactorySpi.java index 6314c07b52..d1a9e73c57 100644 --- a/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/converter/TestConverterFactorySpi.java +++ b/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/model/TestModelFactorySpi.java @@ -13,15 +13,15 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.aklivity.zilla.runtime.engine.test.internal.converter; +package io.aklivity.zilla.runtime.engine.test.internal.model; import java.net.URL; 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.engine.model.Model; +import io.aklivity.zilla.runtime.engine.model.ModelFactorySpi; -public class TestConverterFactorySpi implements ConverterFactorySpi +public class TestModelFactorySpi implements ModelFactorySpi { @Override public String type() @@ -36,9 +36,9 @@ public URL schema() } @Override - public Converter create( + public Model create( Configuration config) { - return new TestConverter(); + return new TestModel(); } } diff --git a/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/validator/TestValidatorHandler.java b/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/model/TestValidatorHandler.java similarity index 78% rename from runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/validator/TestValidatorHandler.java rename to runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/model/TestValidatorHandler.java index 310fc3aa2d..76b2ded963 100644 --- a/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/validator/TestValidatorHandler.java +++ b/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/model/TestValidatorHandler.java @@ -13,20 +13,21 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.aklivity.zilla.runtime.engine.test.internal.validator; +package io.aklivity.zilla.runtime.engine.test.internal.model; import org.agrona.DirectBuffer; -import io.aklivity.zilla.runtime.engine.converter.function.ValueConsumer; -import io.aklivity.zilla.runtime.engine.test.internal.validator.config.TestValidatorConfig; -import io.aklivity.zilla.runtime.engine.validator.ValidatorHandler; +import io.aklivity.zilla.runtime.engine.model.ValidatorHandler; +import io.aklivity.zilla.runtime.engine.model.function.ValueConsumer; +import io.aklivity.zilla.runtime.engine.test.internal.model.config.TestModelConfig; public class TestValidatorHandler implements ValidatorHandler { private final int length; private int pendingBytes; - public TestValidatorHandler(TestValidatorConfig config) + public TestValidatorHandler( + TestModelConfig config) { this.length = config.length; } diff --git a/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/converter/config/TestConverterConfig.java b/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/model/config/TestModelConfig.java similarity index 65% rename from runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/converter/config/TestConverterConfig.java rename to runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/model/config/TestModelConfig.java index 35caa8b391..73f0f06c7e 100644 --- a/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/converter/config/TestConverterConfig.java +++ b/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/model/config/TestModelConfig.java @@ -13,20 +13,20 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.aklivity.zilla.runtime.engine.test.internal.converter.config; +package io.aklivity.zilla.runtime.engine.test.internal.model.config; import java.util.List; import java.util.function.Function; import io.aklivity.zilla.runtime.engine.config.CatalogedConfig; -import io.aklivity.zilla.runtime.engine.config.ConverterConfig; +import io.aklivity.zilla.runtime.engine.config.ModelConfig; -public class TestConverterConfig extends ConverterConfig +public class TestModelConfig extends ModelConfig { public final int length; public final boolean read; - public TestConverterConfig( + public TestModelConfig( int length, List cataloged, boolean read) @@ -36,14 +36,14 @@ public TestConverterConfig( this.read = read; } - public static TestConverterConfigBuilder builder( - Function mapper) + public static TestModelConfigBuilder builder( + Function mapper) { - return new TestConverterConfigBuilder<>(mapper); + return new TestModelConfigBuilder<>(mapper); } - public static TestConverterConfigBuilder builder() + public static TestModelConfigBuilder builder() { - return new TestConverterConfigBuilder<>(TestConverterConfig.class::cast); + return new TestModelConfigBuilder<>(TestModelConfig.class::cast); } } diff --git a/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/converter/config/TestConverterConfigAdapter.java b/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/model/config/TestModelConfigAdapter.java similarity index 85% rename from runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/converter/config/TestConverterConfigAdapter.java rename to runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/model/config/TestModelConfigAdapter.java index 90c3e555b8..c9c0778e00 100644 --- a/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/converter/config/TestConverterConfigAdapter.java +++ b/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/model/config/TestModelConfigAdapter.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.aklivity.zilla.runtime.engine.test.internal.converter.config; +package io.aklivity.zilla.runtime.engine.test.internal.model.config; import java.util.LinkedList; import java.util.List; @@ -25,12 +25,12 @@ import jakarta.json.bind.adapter.JsonbAdapter; import io.aklivity.zilla.runtime.engine.config.CatalogedConfig; -import io.aklivity.zilla.runtime.engine.config.ConverterConfig; -import io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi; +import io.aklivity.zilla.runtime.engine.config.ModelConfig; +import io.aklivity.zilla.runtime.engine.config.ModelConfigAdapterSpi; import io.aklivity.zilla.runtime.engine.config.SchemaConfig; import io.aklivity.zilla.runtime.engine.config.SchemaConfigAdapter; -public class TestConverterConfigAdapter implements ConverterConfigAdapterSpi, JsonbAdapter +public class TestModelConfigAdapter implements ModelConfigAdapterSpi, JsonbAdapter { private static final String TEST = "test"; private static final String LENGTH = "length"; @@ -48,13 +48,13 @@ public String type() @Override public JsonValue adaptToJson( - ConverterConfig config) + ModelConfig config) { return Json.createValue(TEST); } @Override - public TestConverterConfig adaptFromJson( + public TestModelConfig adaptFromJson( JsonValue value) { JsonObject object = (JsonObject) value; @@ -85,6 +85,6 @@ public TestConverterConfig adaptFromJson( } } - return new TestConverterConfig(length, catalogs, read); + return new TestModelConfig(length, catalogs, read); } } diff --git a/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/converter/config/TestConverterConfigBuilder.java b/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/model/config/TestModelConfigBuilder.java similarity index 66% rename from runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/converter/config/TestConverterConfigBuilder.java rename to runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/model/config/TestModelConfigBuilder.java index 8aa3455583..5f3842fd3d 100644 --- a/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/converter/config/TestConverterConfigBuilder.java +++ b/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/model/config/TestModelConfigBuilder.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.aklivity.zilla.runtime.engine.test.internal.converter.config; +package io.aklivity.zilla.runtime.engine.test.internal.model.config; import java.util.LinkedList; import java.util.List; @@ -22,49 +22,49 @@ import io.aklivity.zilla.runtime.engine.config.CatalogedConfig; import io.aklivity.zilla.runtime.engine.config.CatalogedConfigBuilder; import io.aklivity.zilla.runtime.engine.config.ConfigBuilder; -import io.aklivity.zilla.runtime.engine.config.ConverterConfig; +import io.aklivity.zilla.runtime.engine.config.ModelConfig; -public class TestConverterConfigBuilder extends ConfigBuilder> +public class TestModelConfigBuilder extends ConfigBuilder> { - private final Function mapper; + private final Function mapper; private int length; private boolean read; private List catalogs; - TestConverterConfigBuilder( - Function mapper) + TestModelConfigBuilder( + Function mapper) { this.mapper = mapper; } @Override @SuppressWarnings("unchecked") - protected Class> thisType() + protected Class> thisType() { - return (Class>) getClass(); + return (Class>) getClass(); } - public TestConverterConfigBuilder length( + public TestModelConfigBuilder length( int length) { this.length = length; return this; } - public TestConverterConfigBuilder read( + public TestModelConfigBuilder read( boolean read) { this.read = read; return this; } - public CatalogedConfigBuilder> catalog() + public CatalogedConfigBuilder> catalog() { return CatalogedConfig.builder(this::catalog); } - public TestConverterConfigBuilder catalog( + public TestModelConfigBuilder catalog( CatalogedConfig catalog) { if (catalogs == null) @@ -78,6 +78,6 @@ public TestConverterConfigBuilder catalog( @Override public T build() { - return mapper.apply(new TestConverterConfig(length, catalogs, read)); + return mapper.apply(new TestModelConfig(length, catalogs, read)); } } diff --git a/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/validator/TestValidator.java b/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/validator/TestValidator.java deleted file mode 100644 index 10e16fd841..0000000000 --- a/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/validator/TestValidator.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright 2021-2023 Aklivity Inc. - * - * Aklivity licenses this file to you under the Apache License, - * version 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS 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.engine.test.internal.validator; - -import java.net.URL; - -import io.aklivity.zilla.runtime.engine.EngineContext; -import io.aklivity.zilla.runtime.engine.validator.Validator; -import io.aklivity.zilla.runtime.engine.validator.ValidatorContext; - -public class TestValidator implements Validator -{ - public static final String NAME = "test"; - - public TestValidator() - { - } - - @Override - public String name() - { - return TestValidator.NAME; - } - - @Override - public ValidatorContext supply( - EngineContext context) - { - return new TestValidatorContext(context); - } - - @Override - public URL type() - { - return getClass().getResource("test.schema.patch.json"); - } -} diff --git a/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/validator/TestValidatorContext.java b/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/validator/TestValidatorContext.java deleted file mode 100644 index a4a2e7fe19..0000000000 --- a/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/validator/TestValidatorContext.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright 2021-2023 Aklivity Inc. - * - * Aklivity licenses this file to you under the Apache License, - * version 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS 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.engine.test.internal.validator; - -import io.aklivity.zilla.runtime.engine.EngineContext; -import io.aklivity.zilla.runtime.engine.config.ValidatorConfig; -import io.aklivity.zilla.runtime.engine.test.internal.validator.config.TestValidatorConfig; -import io.aklivity.zilla.runtime.engine.validator.ValidatorContext; -import io.aklivity.zilla.runtime.engine.validator.ValidatorHandler; - -public class TestValidatorContext implements ValidatorContext -{ - public TestValidatorContext(EngineContext context) - { - } - - @Override - public ValidatorHandler supplyHandler( - ValidatorConfig config) - { - return new TestValidatorHandler(TestValidatorConfig.class.cast(config)); - } -} diff --git a/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/validator/TestValidatorFactorySpi.java b/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/validator/TestValidatorFactorySpi.java deleted file mode 100644 index 791ce4be97..0000000000 --- a/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/validator/TestValidatorFactorySpi.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright 2021-2023 Aklivity Inc. - * - * Aklivity licenses this file to you under the Apache License, - * version 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS 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.engine.test.internal.validator; - -import io.aklivity.zilla.runtime.engine.Configuration; -import io.aklivity.zilla.runtime.engine.validator.Validator; -import io.aklivity.zilla.runtime.engine.validator.ValidatorFactorySpi; - -public class TestValidatorFactorySpi implements ValidatorFactorySpi -{ - - @Override - public String type() - { - return TestValidator.NAME; - } - - @Override - public Validator create( - Configuration config) - { - return new TestValidator(); - } -} diff --git a/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/validator/config/TestValidatorConfig.java b/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/validator/config/TestValidatorConfig.java deleted file mode 100644 index 53aa0c3b25..0000000000 --- a/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/validator/config/TestValidatorConfig.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright 2021-2023 Aklivity Inc. - * - * Aklivity licenses this file to you under the Apache License, - * version 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS 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.engine.test.internal.validator.config; - -import java.util.function.Function; - -import io.aklivity.zilla.runtime.engine.config.ValidatorConfig; - -public class TestValidatorConfig extends ValidatorConfig -{ - public final int length; - - public TestValidatorConfig( - int length) - { - super("test"); - this.length = length; - } - - public static TestValidatorConfigBuilder builder( - Function mapper) - { - return new TestValidatorConfigBuilder<>(mapper); - } - - public static TestValidatorConfigBuilder builder() - { - return new TestValidatorConfigBuilder<>(TestValidatorConfig.class::cast); - } -} diff --git a/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/validator/config/TestValidatorConfigAdapter.java b/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/validator/config/TestValidatorConfigAdapter.java deleted file mode 100644 index 805785f3f1..0000000000 --- a/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/validator/config/TestValidatorConfigAdapter.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright 2021-2023 Aklivity Inc. - * - * Aklivity licenses this file to you under the Apache License, - * version 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS 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.engine.test.internal.validator.config; - -import jakarta.json.Json; -import jakarta.json.JsonObject; -import jakarta.json.JsonValue; -import jakarta.json.bind.adapter.JsonbAdapter; - -import io.aklivity.zilla.runtime.engine.config.ValidatorConfig; -import io.aklivity.zilla.runtime.engine.config.ValidatorConfigAdapterSpi; - -public class TestValidatorConfigAdapter implements ValidatorConfigAdapterSpi, JsonbAdapter -{ - private static final String TEST = "test"; - private static final String LENGTH = "length"; - - @Override - public String type() - { - return TEST; - } - - @Override - public JsonValue adaptToJson( - ValidatorConfig config) - { - return Json.createValue(TEST); - } - - @Override - public TestValidatorConfig adaptFromJson( - JsonValue value) - { - JsonObject object = (JsonObject) value; - - int length = object.containsKey(LENGTH) - ? object.getInt(LENGTH) - : 0; - - return TestValidatorConfig.builder().length(length).build(); - } -} diff --git a/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/validator/config/TestValidatorConfigBuilder.java b/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/validator/config/TestValidatorConfigBuilder.java deleted file mode 100644 index 3fed97b2c8..0000000000 --- a/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/validator/config/TestValidatorConfigBuilder.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright 2021-2023 Aklivity Inc. - * - * Aklivity licenses this file to you under the Apache License, - * version 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS 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.engine.test.internal.validator.config; - -import java.util.function.Function; - -import io.aklivity.zilla.runtime.engine.config.ConfigBuilder; -import io.aklivity.zilla.runtime.engine.config.ValidatorConfig; - -public class TestValidatorConfigBuilder extends ConfigBuilder> -{ - private final Function mapper; - - private int length; - - TestValidatorConfigBuilder( - Function mapper) - { - this.mapper = mapper; - } - - @Override - @SuppressWarnings("unchecked") - protected Class> thisType() - { - return (Class>) getClass(); - } - - public TestValidatorConfigBuilder length( - int length) - { - this.length = length; - return this; - } - - @Override - public T build() - { - return mapper.apply(new TestValidatorConfig(length)); - } -} diff --git a/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/validator/ValidatorFactoryTest.java b/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/validator/ValidatorFactoryTest.java deleted file mode 100644 index 34babcd3ed..0000000000 --- a/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/validator/ValidatorFactoryTest.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright 2021-2023 Aklivity Inc. - * - * Aklivity licenses this file to you under the Apache License, - * version 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS 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.engine.validator; - -import static org.hamcrest.CoreMatchers.instanceOf; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.mockito.Mockito.mock; - -import org.junit.Test; - -import io.aklivity.zilla.runtime.engine.Configuration; -import io.aklivity.zilla.runtime.engine.EngineContext; -import io.aklivity.zilla.runtime.engine.test.internal.validator.TestValidator; -import io.aklivity.zilla.runtime.engine.test.internal.validator.TestValidatorContext; -import io.aklivity.zilla.runtime.engine.test.internal.validator.TestValidatorHandler; -import io.aklivity.zilla.runtime.engine.test.internal.validator.config.TestValidatorConfig; - -public class ValidatorFactoryTest -{ - @Test - public void shouldLoadAndCreate() - { - Configuration config = new Configuration(); - ValidatorFactory factory = ValidatorFactory.instantiate(); - Validator validator = factory.create("test", config); - - TestValidatorConfig validatorConfig = TestValidatorConfig.builder().length(4).build(); - ValidatorContext context = new TestValidatorContext(mock(EngineContext.class)); - - assertThat(validator, instanceOf(TestValidator.class)); - assertThat(context.supplyHandler(validatorConfig), instanceOf(TestValidatorHandler.class)); - } -} diff --git a/runtime/engine/src/test/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi b/runtime/engine/src/test/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi deleted file mode 100644 index 9d9c9e5105..0000000000 --- a/runtime/engine/src/test/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi +++ /dev/null @@ -1 +0,0 @@ -io.aklivity.zilla.runtime.engine.test.internal.converter.config.TestConverterConfigAdapter diff --git a/runtime/engine/src/test/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ModelConfigAdapterSpi b/runtime/engine/src/test/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ModelConfigAdapterSpi new file mode 100644 index 0000000000..97ebb30d31 --- /dev/null +++ b/runtime/engine/src/test/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ModelConfigAdapterSpi @@ -0,0 +1 @@ +io.aklivity.zilla.runtime.engine.test.internal.model.config.TestModelConfigAdapter diff --git a/runtime/engine/src/test/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ValidatorConfigAdapterSpi b/runtime/engine/src/test/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ValidatorConfigAdapterSpi deleted file mode 100644 index f41416a365..0000000000 --- a/runtime/engine/src/test/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.ValidatorConfigAdapterSpi +++ /dev/null @@ -1 +0,0 @@ -io.aklivity.zilla.runtime.engine.test.internal.validator.config.TestValidatorConfigAdapter diff --git a/runtime/engine/src/test/resources/META-INF/services/io.aklivity.zilla.runtime.engine.converter.ConverterFactorySpi b/runtime/engine/src/test/resources/META-INF/services/io.aklivity.zilla.runtime.engine.converter.ConverterFactorySpi deleted file mode 100644 index 6343f631d5..0000000000 --- a/runtime/engine/src/test/resources/META-INF/services/io.aklivity.zilla.runtime.engine.converter.ConverterFactorySpi +++ /dev/null @@ -1 +0,0 @@ -io.aklivity.zilla.runtime.engine.test.internal.converter.TestConverterFactorySpi diff --git a/runtime/engine/src/test/resources/META-INF/services/io.aklivity.zilla.runtime.engine.model.ModelFactorySpi b/runtime/engine/src/test/resources/META-INF/services/io.aklivity.zilla.runtime.engine.model.ModelFactorySpi new file mode 100644 index 0000000000..b161468dac --- /dev/null +++ b/runtime/engine/src/test/resources/META-INF/services/io.aklivity.zilla.runtime.engine.model.ModelFactorySpi @@ -0,0 +1 @@ +io.aklivity.zilla.runtime.engine.test.internal.model.TestModelFactorySpi diff --git a/specs/binding-kafka.spec/src/test/java/io/aklivity/zilla/specs/binding/kafka/config/SchemaTest.java b/specs/binding-kafka.spec/src/test/java/io/aklivity/zilla/specs/binding/kafka/config/SchemaTest.java index 7e96d27481..d4fc6ca88e 100644 --- a/specs/binding-kafka.spec/src/test/java/io/aklivity/zilla/specs/binding/kafka/config/SchemaTest.java +++ b/specs/binding-kafka.spec/src/test/java/io/aklivity/zilla/specs/binding/kafka/config/SchemaTest.java @@ -32,7 +32,7 @@ public class SchemaTest public final ConfigSchemaRule schema = new ConfigSchemaRule() .schemaPatch("io/aklivity/zilla/specs/binding/kafka/schema/kafka.schema.patch.json") .schemaPatch("io/aklivity/zilla/specs/engine/schema/catalog/test.schema.patch.json") - .schemaPatch("io/aklivity/zilla/specs/engine/schema/converter/test.schema.patch.json") + .schemaPatch("io/aklivity/zilla/specs/engine/schema/model/test.schema.patch.json") .configurationRoot("io/aklivity/zilla/specs/binding/kafka/config"); @Test diff --git a/specs/binding-mqtt.spec/src/test/java/io/aklivity/zilla/specs/binding/mqtt/config/SchemaTest.java b/specs/binding-mqtt.spec/src/test/java/io/aklivity/zilla/specs/binding/mqtt/config/SchemaTest.java index f40d1d9de6..bab6aa6279 100644 --- a/specs/binding-mqtt.spec/src/test/java/io/aklivity/zilla/specs/binding/mqtt/config/SchemaTest.java +++ b/specs/binding-mqtt.spec/src/test/java/io/aklivity/zilla/specs/binding/mqtt/config/SchemaTest.java @@ -34,7 +34,7 @@ public class SchemaTest .schemaPatch("io/aklivity/zilla/specs/binding/mqtt/schema/mqtt.schema.patch.json") .schemaPatch("io/aklivity/zilla/specs/engine/schema/guard/test.schema.patch.json") .schemaPatch("io/aklivity/zilla/specs/engine/schema/catalog/test.schema.patch.json") - .schemaPatch("io/aklivity/zilla/specs/engine/schema/converter/test.schema.patch.json") + .schemaPatch("io/aklivity/zilla/specs/engine/schema/model/test.schema.patch.json") .configurationRoot("io/aklivity/zilla/specs/binding/mqtt/config"); @Ignore("TODO") diff --git a/specs/engine.spec/src/main/scripts/io/aklivity/zilla/specs/engine/schema/converter/test.schema.patch.json b/specs/engine.spec/src/main/scripts/io/aklivity/zilla/specs/engine/schema/model/test.schema.patch.json similarity index 100% rename from specs/engine.spec/src/main/scripts/io/aklivity/zilla/specs/engine/schema/converter/test.schema.patch.json rename to specs/engine.spec/src/main/scripts/io/aklivity/zilla/specs/engine/schema/model/test.schema.patch.json diff --git a/specs/engine.spec/src/test/java/io/aklivity/zilla/specs/engine/config/SchemaTest.java b/specs/engine.spec/src/test/java/io/aklivity/zilla/specs/engine/config/SchemaTest.java index 7b54774949..c4da35cab3 100644 --- a/specs/engine.spec/src/test/java/io/aklivity/zilla/specs/engine/config/SchemaTest.java +++ b/specs/engine.spec/src/test/java/io/aklivity/zilla/specs/engine/config/SchemaTest.java @@ -33,7 +33,7 @@ public class SchemaTest .schemaPatch("io/aklivity/zilla/specs/engine/schema/exporter/test.schema.patch.json") .schemaPatch("io/aklivity/zilla/specs/engine/schema/guard/test.schema.patch.json") .schemaPatch("io/aklivity/zilla/specs/engine/schema/metrics/test.schema.patch.json") - .schemaPatch("io/aklivity/zilla/specs/engine/schema/converter/test.schema.patch.json") + .schemaPatch("io/aklivity/zilla/specs/engine/schema/model/test.schema.patch.json") .schemaPatch("io/aklivity/zilla/specs/engine/schema/vault/test.schema.patch.json") .schemaPatch("io/aklivity/zilla/specs/engine/schema/catalog/test.schema.patch.json") .configurationRoot("io/aklivity/zilla/specs/engine/config"); From 17b3d70edaf16b4f8b10a35b7ec1987d75dab45a Mon Sep 17 00:00:00 2001 From: Ankit Kumar Date: Fri, 26 Jan 2024 00:40:40 +0530 Subject: [PATCH 4/4] schema update to support model and view --- .../asyncapi/http/proxy/complete/zilla.yaml | 4 ++-- .../asyncapi/http/proxy/validator/zilla.yaml | 4 ++-- .../asyncapi/mqtt/proxy/complete/zilla.yaml | 2 +- .../asyncapi/mqtt/proxy/validator/zilla.yaml | 2 +- .../openapi/http/proxy/complete/zilla.yaml | 2 +- .../internal/openapi/http/proxy/jwt/zilla.yaml | 2 +- .../openapi/http/proxy/validator/zilla.yaml | 2 +- .../avro/config/{converter.yaml => model.yaml} | 4 ++-- .../model/avro/schema/avro.schema.patch.json | 6 +++--- .../specs/model/avro/config/SchemaTest.java | 2 +- .../model/avro/config/AvroModelConfig.java | 6 +++--- .../avro/config/AvroModelConfigBuilder.java | 10 +++++----- .../avro/internal/AvroConverterHandler.java | 6 +++--- .../avro/internal/AvroReadConverterHandler.java | 4 ++-- .../avro/internal/AvroWriteConverterHandler.java | 2 +- .../internal/config/AvroModelConfigAdapter.java | 16 ++++++++-------- .../model/avro/internal/AvroModelTest.java | 6 +++--- .../config/AvroModelConfigAdapterTest.java | 14 +++++++------- .../{string.converter.yaml => string.model.yaml} | 2 +- .../model/core/schema/string.schema.patch.json | 8 ++++---- .../specs/model/core/config/SchemaTest.java | 2 +- .../config/StringModelConfigAdapter.java | 4 ++-- .../config/IntegerModelConfigAdapterTest.java | 4 ++-- .../config/StringModelConfigAdapterTest.java | 16 ++++++++-------- .../json/config/{converter.yaml => model.yaml} | 2 +- .../model/json/schema/json.schema.patch.json | 8 ++++---- .../specs/model/json/config/SchemaTest.java | 2 +- .../internal/config/JsonModelConfigAdapter.java | 4 ++-- .../config/JsonModelConfigAdapterTest.java | 6 +++--- .../config/{converter.yaml => model.yaml} | 4 ++-- .../protobuf/schema/protobuf.schema.patch.json | 6 +++--- .../specs/model/protobuf/config/SchemaTest.java | 2 +- .../protobuf/config/ProtobufModelConfig.java | 6 +++--- .../config/ProtobufModelConfigBuilder.java | 10 +++++----- .../internal/ProtobufConverterHandler.java | 6 +++--- .../internal/ProtobufReadConverterHandler.java | 4 ++-- .../internal/ProtobufWriteConverterHandler.java | 2 +- .../config/ProtobufModelConfigAdapter.java | 16 ++++++++-------- .../protobuf/internal/ProtobufModelTest.java | 6 +++--- .../config/ProtobufModelConfigAdapterTest.java | 6 +++--- .../config/HttpRequestConfigAdapter.java | 8 ++++---- .../config/HttpOptionsConfigAdapterTest.java | 8 ++++---- .../config/HttpRequestConfigAdapterTest.java | 8 ++++---- .../streams/rfc7230/server/ValidationIT.java | 4 ++-- .../streams/rfc7540/server/ValidationIT.java | 4 ++-- .../internal/config/KafkaTopicConfigAdapter.java | 4 ++-- .../internal/config/MqttTopicConfigAdapter.java | 2 +- .../config/MqttOptionsConfigAdapterTest.java | 2 +- .../zilla/runtime/engine/config/ModelConfig.java | 10 +++++----- .../engine/config/ModelConfigAdapter.java | 8 ++++---- .../engine/internal/registry/DispatchAgent.java | 6 +++--- .../model/config/ModelConfigAdapterTest.java | 12 ++++++------ ...{server.validation.yaml => server.model.yaml} | 12 ++++++------ ...{server.validation.yaml => server.model.yaml} | 12 ++++++------ .../config/cache.client.options.validate.yaml | 2 +- .../kafka/config/cache.options.convert.yaml | 2 +- .../kafka/config/cache.options.validate.yaml | 2 +- .../binding/mqtt/config/server.validator.yaml | 2 +- .../zilla/specs/engine/schema/engine.schema.json | 8 ++++---- .../engine/schema/model/test.schema.patch.json | 8 ++++---- 60 files changed, 172 insertions(+), 172 deletions(-) rename incubator/model-avro.spec/src/main/scripts/io/aklivity/zilla/specs/model/avro/config/{converter.yaml => model.yaml} (96%) rename incubator/model-core.spec/src/main/scripts/io/aklivity/zilla/specs/model/core/config/{string.converter.yaml => string.model.yaml} (96%) rename incubator/model-json.spec/src/main/scripts/io/aklivity/zilla/specs/model/json/config/{converter.yaml => model.yaml} (98%) rename incubator/model-protobuf.spec/src/main/scripts/io/aklivity/zilla/specs/model/protobuf/config/{converter.yaml => model.yaml} (95%) rename specs/binding-http.spec/src/main/scripts/io/aklivity/zilla/specs/binding/http/config/v1.1/{server.validation.yaml => server.model.yaml} (89%) rename specs/binding-http.spec/src/main/scripts/io/aklivity/zilla/specs/binding/http/config/v2/{server.validation.yaml => server.model.yaml} (89%) diff --git a/incubator/command-generate/src/test/resources/io/aklivity/zilla/runtime/command/generate/internal/asyncapi/http/proxy/complete/zilla.yaml b/incubator/command-generate/src/test/resources/io/aklivity/zilla/runtime/command/generate/internal/asyncapi/http/proxy/complete/zilla.yaml index 5d06b7424f..2043045175 100644 --- a/incubator/command-generate/src/test/resources/io/aklivity/zilla/runtime/command/generate/internal/asyncapi/http/proxy/complete/zilla.yaml +++ b/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 diff --git a/incubator/command-generate/src/test/resources/io/aklivity/zilla/runtime/command/generate/internal/asyncapi/http/proxy/validator/zilla.yaml b/incubator/command-generate/src/test/resources/io/aklivity/zilla/runtime/command/generate/internal/asyncapi/http/proxy/validator/zilla.yaml index 449cdb7269..d97ca1fed1 100644 --- a/incubator/command-generate/src/test/resources/io/aklivity/zilla/runtime/command/generate/internal/asyncapi/http/proxy/validator/zilla.yaml +++ b/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 diff --git a/incubator/command-generate/src/test/resources/io/aklivity/zilla/runtime/command/generate/internal/asyncapi/mqtt/proxy/complete/zilla.yaml b/incubator/command-generate/src/test/resources/io/aklivity/zilla/runtime/command/generate/internal/asyncapi/mqtt/proxy/complete/zilla.yaml index b2ab4388cd..0a77660ae3 100644 --- a/incubator/command-generate/src/test/resources/io/aklivity/zilla/runtime/command/generate/internal/asyncapi/mqtt/proxy/complete/zilla.yaml +++ b/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 diff --git a/incubator/command-generate/src/test/resources/io/aklivity/zilla/runtime/command/generate/internal/asyncapi/mqtt/proxy/validator/zilla.yaml b/incubator/command-generate/src/test/resources/io/aklivity/zilla/runtime/command/generate/internal/asyncapi/mqtt/proxy/validator/zilla.yaml index 4204654d97..8f8348a2f0 100644 --- a/incubator/command-generate/src/test/resources/io/aklivity/zilla/runtime/command/generate/internal/asyncapi/mqtt/proxy/validator/zilla.yaml +++ b/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 diff --git a/incubator/command-generate/src/test/resources/io/aklivity/zilla/runtime/command/generate/internal/openapi/http/proxy/complete/zilla.yaml b/incubator/command-generate/src/test/resources/io/aklivity/zilla/runtime/command/generate/internal/openapi/http/proxy/complete/zilla.yaml index a5235d262e..0984f11f17 100644 --- a/incubator/command-generate/src/test/resources/io/aklivity/zilla/runtime/command/generate/internal/openapi/http/proxy/complete/zilla.yaml +++ b/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 diff --git a/incubator/command-generate/src/test/resources/io/aklivity/zilla/runtime/command/generate/internal/openapi/http/proxy/jwt/zilla.yaml b/incubator/command-generate/src/test/resources/io/aklivity/zilla/runtime/command/generate/internal/openapi/http/proxy/jwt/zilla.yaml index cd157b190e..65dc139e8c 100644 --- a/incubator/command-generate/src/test/resources/io/aklivity/zilla/runtime/command/generate/internal/openapi/http/proxy/jwt/zilla.yaml +++ b/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 diff --git a/incubator/command-generate/src/test/resources/io/aklivity/zilla/runtime/command/generate/internal/openapi/http/proxy/validator/zilla.yaml b/incubator/command-generate/src/test/resources/io/aklivity/zilla/runtime/command/generate/internal/openapi/http/proxy/validator/zilla.yaml index c0150d0213..e6297596ef 100644 --- a/incubator/command-generate/src/test/resources/io/aklivity/zilla/runtime/command/generate/internal/openapi/http/proxy/validator/zilla.yaml +++ b/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 diff --git a/incubator/model-avro.spec/src/main/scripts/io/aklivity/zilla/specs/model/avro/config/converter.yaml b/incubator/model-avro.spec/src/main/scripts/io/aklivity/zilla/specs/model/avro/config/model.yaml similarity index 96% rename from incubator/model-avro.spec/src/main/scripts/io/aklivity/zilla/specs/model/avro/config/converter.yaml rename to incubator/model-avro.spec/src/main/scripts/io/aklivity/zilla/specs/model/avro/config/model.yaml index 50f97b55a1..dbb4b6ecdd 100644 --- a/incubator/model-avro.spec/src/main/scripts/io/aklivity/zilla/specs/model/avro/config/converter.yaml +++ b/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 diff --git a/incubator/model-avro.spec/src/main/scripts/io/aklivity/zilla/specs/model/avro/schema/avro.schema.patch.json b/incubator/model-avro.spec/src/main/scripts/io/aklivity/zilla/specs/model/avro/schema/avro.schema.patch.json index e9a6c3be00..7d1a7c526b 100644 --- a/incubator/model-avro.spec/src/main/scripts/io/aklivity/zilla/specs/model/avro/schema/avro.schema.patch.json +++ b/incubator/model-avro.spec/src/main/scripts/io/aklivity/zilla/specs/model/avro/schema/avro.schema.patch.json @@ -13,7 +13,7 @@ { "properties": { - "type": + "model": { "const": "avro" } @@ -23,11 +23,11 @@ { "properties": { - "type": + "model": { "const": "avro" }, - "format": + "view": { "type": "string", "enum": diff --git a/incubator/model-avro.spec/src/test/java/io/aklivity/zilla/specs/model/avro/config/SchemaTest.java b/incubator/model-avro.spec/src/test/java/io/aklivity/zilla/specs/model/avro/config/SchemaTest.java index 5d8794dcad..e907872462 100644 --- a/incubator/model-avro.spec/src/test/java/io/aklivity/zilla/specs/model/avro/config/SchemaTest.java +++ b/incubator/model-avro.spec/src/test/java/io/aklivity/zilla/specs/model/avro/config/SchemaTest.java @@ -37,7 +37,7 @@ public class SchemaTest @Test public void shouldValidateCatalog() { - JsonObject config = schema.validate("converter.yaml"); + JsonObject config = schema.validate("model.yaml"); assertThat(config, not(nullValue())); } diff --git a/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/config/AvroModelConfig.java b/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/config/AvroModelConfig.java index 8ae75b4106..57005925db 100644 --- a/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/config/AvroModelConfig.java +++ b/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/config/AvroModelConfig.java @@ -23,16 +23,16 @@ public final class AvroModelConfig extends ModelConfig { public final String subject; - public final String format; + public final String view; public AvroModelConfig( List cataloged, String subject, - String format) + String view) { super("avro", cataloged); this.subject = subject; - this.format = format; + this.view = view; } public static AvroModelConfigBuilder builder( diff --git a/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/config/AvroModelConfigBuilder.java b/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/config/AvroModelConfigBuilder.java index c931cb67ac..476bc23ee8 100644 --- a/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/config/AvroModelConfigBuilder.java +++ b/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/config/AvroModelConfigBuilder.java @@ -28,7 +28,7 @@ public class AvroModelConfigBuilder extends ConfigBuilder catalogs; private String subject; - private String format; + private String view; AvroModelConfigBuilder( Function mapper) @@ -50,10 +50,10 @@ public AvroModelConfigBuilder subject( return this; } - public AvroModelConfigBuilder format( - String format) + public AvroModelConfigBuilder view( + String view) { - this.format = format; + this.view = view; return this; } @@ -76,6 +76,6 @@ public AvroModelConfigBuilder catalog( @Override public T build() { - return mapper.apply(new AvroModelConfig(catalogs, subject, format)); + return mapper.apply(new AvroModelConfig(catalogs, subject, view)); } } diff --git a/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/internal/AvroConverterHandler.java b/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/internal/AvroConverterHandler.java index 343e7b081c..c85d45194d 100644 --- a/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/internal/AvroConverterHandler.java +++ b/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/internal/AvroConverterHandler.java @@ -45,7 +45,7 @@ public abstract class AvroConverterHandler { - protected static final String FORMAT_JSON = "json"; + protected static final String VIEW_JSON = "json"; private static final InputStream EMPTY_INPUT_STREAM = new ByteArrayInputStream(new byte[0]); private static final OutputStream EMPTY_OUTPUT_STREAM = new ByteArrayOutputStream(0); @@ -58,7 +58,7 @@ public abstract class AvroConverterHandler protected final BinaryDecoder decoder; protected final BinaryEncoder encoder; protected final String subject; - protected final String format; + protected final String view; protected final ExpandableDirectBufferOutputStream expandable; protected final DirectBufferInputStream in; @@ -79,7 +79,7 @@ protected AvroConverterHandler( CatalogedConfig cataloged = config.cataloged.get(0); this.handler = supplyCatalog.apply(cataloged.id); this.catalog = cataloged.schemas.size() != 0 ? cataloged.schemas.get(0) : null; - this.format = config.format; + this.view = config.view; this.subject = catalog != null && catalog.subject != null ? catalog.subject : config.subject; diff --git a/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/internal/AvroReadConverterHandler.java b/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/internal/AvroReadConverterHandler.java index 2c86a8f891..7b47f60817 100644 --- a/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/internal/AvroReadConverterHandler.java +++ b/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/internal/AvroReadConverterHandler.java @@ -48,7 +48,7 @@ public int padding( int length) { int padding = 0; - if (FORMAT_JSON.equals(format)) + if (VIEW_JSON.equals(view)) { int schemaId = handler.resolve(data, index, length); @@ -99,7 +99,7 @@ private int decodePayload( } } - if (FORMAT_JSON.equals(format)) + if (VIEW_JSON.equals(view)) { deserializeRecord(schemaId, data, index, length); int recordLength = expandable.position(); diff --git a/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/internal/AvroWriteConverterHandler.java b/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/internal/AvroWriteConverterHandler.java index e49d51608f..7fa17fba7a 100644 --- a/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/internal/AvroWriteConverterHandler.java +++ b/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/internal/AvroWriteConverterHandler.java @@ -60,7 +60,7 @@ public int convert( ? catalog.id : handler.resolve(subject, catalog.version); - if (FORMAT_JSON.equals(format)) + if (VIEW_JSON.equals(view)) { valLength = handler.encode(schemaId, data, index, length, next, this::serializeJsonRecord); } diff --git a/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/internal/config/AvroModelConfigAdapter.java b/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/internal/config/AvroModelConfigAdapter.java index 9ef6bf61ff..f635804a60 100644 --- a/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/internal/config/AvroModelConfigAdapter.java +++ b/incubator/model-avro/src/main/java/io/aklivity/zilla/runtime/model/avro/internal/config/AvroModelConfigAdapter.java @@ -35,10 +35,10 @@ public final class AvroModelConfigAdapter implements ModelConfigAdapterSpi, JsonbAdapter { private static final String AVRO = "avro"; - private static final String TYPE_NAME = "type"; + private static final String MODEL_NAME = "model"; private static final String CATALOG_NAME = "catalog"; private static final String SUBJECT_NAME = "subject"; - private static final String FORMAT = "format"; + private static final String VIEW = "view"; private final SchemaConfigAdapter schema = new SchemaConfigAdapter(); @@ -55,12 +55,12 @@ public JsonValue adaptToJson( AvroModelConfig converterConfig = (AvroModelConfig) config; JsonObjectBuilder converter = Json.createObjectBuilder(); - if (converterConfig.format != null) + if (converterConfig.view != null) { - converter.add(FORMAT, converterConfig.format); + converter.add(VIEW, converterConfig.view); } - converter.add(TYPE_NAME, AVRO); + converter.add(MODEL_NAME, AVRO); if (converterConfig.cataloged != null && !converterConfig.cataloged.isEmpty()) { JsonObjectBuilder catalogs = Json.createObjectBuilder(); @@ -105,10 +105,10 @@ public ModelConfig adaptFromJson( ? object.getString(SUBJECT_NAME) : null; - String expect = object.containsKey(FORMAT) - ? object.getString(FORMAT) + String view = object.containsKey(VIEW) + ? object.getString(VIEW) : null; - return new AvroModelConfig(catalogs, subject, expect); + return new AvroModelConfig(catalogs, subject, view); } } diff --git a/incubator/model-avro/src/test/java/io/aklivity/zilla/runtime/model/avro/internal/AvroModelTest.java b/incubator/model-avro/src/test/java/io/aklivity/zilla/runtime/model/avro/internal/AvroModelTest.java index 765da64d1a..0be2ff3f13 100644 --- a/incubator/model-avro/src/test/java/io/aklivity/zilla/runtime/model/avro/internal/AvroModelTest.java +++ b/incubator/model-avro/src/test/java/io/aklivity/zilla/runtime/model/avro/internal/AvroModelTest.java @@ -131,7 +131,7 @@ public void shouldReadAvroEventExpectJson() .build()); LongFunction handler = value -> context.attach(catalogConfig); AvroModelConfig config = AvroModelConfig.builder() - .format("json") + .view("json") .catalog() .name("test0") .schema() @@ -174,7 +174,7 @@ public void shouldWriteJsonEventExpectAvro() .build()); LongFunction handler = value -> context.attach(catalogConfig); AvroModelConfig config = AvroModelConfig.builder() - .format("json") + .view("json") .catalog() .name("test0") .schema() @@ -216,7 +216,7 @@ public void shouldVerifyPaddingLength() .build()); LongFunction handler = value -> context.attach(catalogConfig); AvroModelConfig config = AvroModelConfig.builder() - .format("json") + .view("json") .catalog() .name("test0") .schema() diff --git a/incubator/model-avro/src/test/java/io/aklivity/zilla/runtime/model/avro/internal/config/AvroModelConfigAdapterTest.java b/incubator/model-avro/src/test/java/io/aklivity/zilla/runtime/model/avro/internal/config/AvroModelConfigAdapterTest.java index ba97c65f1e..94af0fe895 100644 --- a/incubator/model-avro/src/test/java/io/aklivity/zilla/runtime/model/avro/internal/config/AvroModelConfigAdapterTest.java +++ b/incubator/model-avro/src/test/java/io/aklivity/zilla/runtime/model/avro/internal/config/AvroModelConfigAdapterTest.java @@ -46,8 +46,8 @@ public void shouldReadAvroconverter() // GIVEN String json = "{" + - "\"format\":\"json\"," + - "\"type\": \"avro\"," + + "\"view\":\"json\"," + + "\"model\": \"avro\"," + "\"catalog\":" + "{" + "\"test0\":" + @@ -72,8 +72,8 @@ public void shouldReadAvroconverter() // THEN assertThat(converter, not(nullValue())); - assertThat(converter.format, equalTo("json")); - assertThat(converter.type, equalTo("avro")); + assertThat(converter.view, equalTo("json")); + assertThat(converter.model, equalTo("avro")); assertThat(converter.cataloged.size(), equalTo(1)); assertThat(converter.cataloged.get(0).name, equalTo("test0")); assertThat(converter.cataloged.get(0).schemas.get(0).strategy, equalTo("topic")); @@ -94,8 +94,8 @@ public void shouldWriteAvroconverter() // GIVEN String expectedJson = "{" + - "\"format\":\"json\"," + - "\"type\":\"avro\"," + + "\"view\":\"json\"," + + "\"model\":\"avro\"," + "\"catalog\":" + "{" + "\"test0\":" + @@ -115,7 +115,7 @@ public void shouldWriteAvroconverter() "}" + "}"; AvroModelConfig converter = AvroModelConfig.builder() - .format("json") + .view("json") .catalog() .name("test0") .schema() diff --git a/incubator/model-core.spec/src/main/scripts/io/aklivity/zilla/specs/model/core/config/string.converter.yaml b/incubator/model-core.spec/src/main/scripts/io/aklivity/zilla/specs/model/core/config/string.model.yaml similarity index 96% rename from incubator/model-core.spec/src/main/scripts/io/aklivity/zilla/specs/model/core/config/string.converter.yaml rename to incubator/model-core.spec/src/main/scripts/io/aklivity/zilla/specs/model/core/config/string.model.yaml index cdab4f77bc..83777f49cf 100644 --- a/incubator/model-core.spec/src/main/scripts/io/aklivity/zilla/specs/model/core/config/string.converter.yaml +++ b/incubator/model-core.spec/src/main/scripts/io/aklivity/zilla/specs/model/core/config/string.model.yaml @@ -21,6 +21,6 @@ bindings: type: test options: value: - type: string + model: string encoding: utf_8 exit: test diff --git a/incubator/model-core.spec/src/main/scripts/io/aklivity/zilla/specs/model/core/schema/string.schema.patch.json b/incubator/model-core.spec/src/main/scripts/io/aklivity/zilla/specs/model/core/schema/string.schema.patch.json index 382e313435..80ad373a2f 100644 --- a/incubator/model-core.spec/src/main/scripts/io/aklivity/zilla/specs/model/core/schema/string.schema.patch.json +++ b/incubator/model-core.spec/src/main/scripts/io/aklivity/zilla/specs/model/core/schema/string.schema.patch.json @@ -13,7 +13,7 @@ { "properties": { - "type": + "model": { "const": "string" } @@ -23,7 +23,7 @@ { "properties": { - "type": + "model": { "const": "string" }, @@ -55,7 +55,7 @@ { "properties": { - "type": + "model": { "const": "string" } @@ -65,7 +65,7 @@ { "properties": { - "type": + "model": { "const": "string" }, diff --git a/incubator/model-core.spec/src/test/java/io/aklivity/zilla/specs/model/core/config/SchemaTest.java b/incubator/model-core.spec/src/test/java/io/aklivity/zilla/specs/model/core/config/SchemaTest.java index aaa90054ca..e8895daca3 100644 --- a/incubator/model-core.spec/src/test/java/io/aklivity/zilla/specs/model/core/config/SchemaTest.java +++ b/incubator/model-core.spec/src/test/java/io/aklivity/zilla/specs/model/core/config/SchemaTest.java @@ -36,7 +36,7 @@ public class SchemaTest @Test public void shouldValidateCatalog() { - JsonObject config = schema.validate("string.converter.yaml"); + JsonObject config = schema.validate("string.model.yaml"); assertThat(config, not(nullValue())); } diff --git a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/config/StringModelConfigAdapter.java b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/config/StringModelConfigAdapter.java index 0b5c1f968a..5265efecd9 100644 --- a/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/config/StringModelConfigAdapter.java +++ b/incubator/model-core/src/main/java/io/aklivity/zilla/runtime/model/core/internal/config/StringModelConfigAdapter.java @@ -27,7 +27,7 @@ public final class StringModelConfigAdapter implements ModelConfigAdapterSpi, JsonbAdapter { - private static final String TYPE_NAME = "type"; + private static final String MODEL_NAME = "model"; private static final String ENCODING_NAME = "encoding"; @Override @@ -39,7 +39,7 @@ public JsonValue adaptToJson( if (encoding != null && !encoding.isEmpty() && !encoding.equals(StringModelConfig.DEFAULT_ENCODING)) { JsonObjectBuilder converter = Json.createObjectBuilder(); - converter.add(TYPE_NAME, type()); + converter.add(MODEL_NAME, type()); converter.add(ENCODING_NAME, encoding); result = converter.build(); } diff --git a/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/config/IntegerModelConfigAdapterTest.java b/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/config/IntegerModelConfigAdapterTest.java index 558f705713..384e75c76b 100644 --- a/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/config/IntegerModelConfigAdapterTest.java +++ b/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/config/IntegerModelConfigAdapterTest.java @@ -46,7 +46,7 @@ public void shouldReadIntegerconverter() // GIVEN String json = "{" + - "\"type\": \"integer\"" + + "\"model\": \"integer\"" + "}"; // WHEN @@ -54,7 +54,7 @@ public void shouldReadIntegerconverter() // THEN assertThat(converter, not(nullValue())); - assertThat(converter.type, equalTo("integer")); + assertThat(converter.model, equalTo("integer")); } @Test diff --git a/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/config/StringModelConfigAdapterTest.java b/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/config/StringModelConfigAdapterTest.java index 17df835fbc..a05af5433c 100644 --- a/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/config/StringModelConfigAdapterTest.java +++ b/incubator/model-core/src/test/java/io/aklivity/zilla/runtime/model/core/internal/config/StringModelConfigAdapterTest.java @@ -46,17 +46,17 @@ public void shouldReadStringconverter() // GIVEN String json = "{" + - "\"type\": \"string\"," + + "\"model\": \"string\"," + "\"encoding\": \"utf_8\"" + "}"; // WHEN - StringModelConfig converter = jsonb.fromJson(json, StringModelConfig.class); + StringModelConfig model = jsonb.fromJson(json, StringModelConfig.class); // THEN - assertThat(converter, not(nullValue())); - assertThat(converter.type, equalTo("string")); - assertThat(converter.encoding, equalTo("utf_8")); + assertThat(model, not(nullValue())); + assertThat(model.model, equalTo("string")); + assertThat(model.encoding, equalTo("utf_8")); } @Test @@ -80,15 +80,15 @@ public void shouldWriteStringconverter() // GIVEN String expectedJson = "{" + - "\"type\":\"string\"," + + "\"model\":\"string\"," + "\"encoding\":\"utf_16\"" + "}"; - StringModelConfig converter = StringModelConfig.builder() + StringModelConfig model = StringModelConfig.builder() .encoding("utf_16") .build(); // WHEN - String json = jsonb.toJson(converter); + String json = jsonb.toJson(model); // THEN assertThat(json, not(nullValue())); diff --git a/incubator/model-json.spec/src/main/scripts/io/aklivity/zilla/specs/model/json/config/converter.yaml b/incubator/model-json.spec/src/main/scripts/io/aklivity/zilla/specs/model/json/config/model.yaml similarity index 98% rename from incubator/model-json.spec/src/main/scripts/io/aklivity/zilla/specs/model/json/config/converter.yaml rename to incubator/model-json.spec/src/main/scripts/io/aklivity/zilla/specs/model/json/config/model.yaml index ad66290ec7..bffde5db5b 100644 --- a/incubator/model-json.spec/src/main/scripts/io/aklivity/zilla/specs/model/json/config/converter.yaml +++ b/incubator/model-json.spec/src/main/scripts/io/aklivity/zilla/specs/model/json/config/model.yaml @@ -41,7 +41,7 @@ bindings: type: test options: value: - type: json + model: json catalog: catalog0: - subject: test0 diff --git a/incubator/model-json.spec/src/main/scripts/io/aklivity/zilla/specs/model/json/schema/json.schema.patch.json b/incubator/model-json.spec/src/main/scripts/io/aklivity/zilla/specs/model/json/schema/json.schema.patch.json index 0d1e9710e3..b9469bc6dc 100644 --- a/incubator/model-json.spec/src/main/scripts/io/aklivity/zilla/specs/model/json/schema/json.schema.patch.json +++ b/incubator/model-json.spec/src/main/scripts/io/aklivity/zilla/specs/model/json/schema/json.schema.patch.json @@ -13,7 +13,7 @@ { "properties": { - "type": + "model": { "const": "json" } @@ -23,7 +23,7 @@ { "properties": { - "type": + "model": { "const": "json" }, @@ -139,7 +139,7 @@ { "properties": { - "type": + "model": { "const": "json" } @@ -149,7 +149,7 @@ { "properties": { - "type": + "model": { "const": "json" }, diff --git a/incubator/model-json.spec/src/test/java/io/aklivity/zilla/specs/model/json/config/SchemaTest.java b/incubator/model-json.spec/src/test/java/io/aklivity/zilla/specs/model/json/config/SchemaTest.java index 5bee9a1d6a..2d0ad426ba 100644 --- a/incubator/model-json.spec/src/test/java/io/aklivity/zilla/specs/model/json/config/SchemaTest.java +++ b/incubator/model-json.spec/src/test/java/io/aklivity/zilla/specs/model/json/config/SchemaTest.java @@ -37,7 +37,7 @@ public class SchemaTest @Test public void shouldValidateCatalog() { - JsonObject config = schema.validate("converter.yaml"); + JsonObject config = schema.validate("model.yaml"); assertThat(config, not(nullValue())); } diff --git a/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/config/JsonModelConfigAdapter.java b/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/config/JsonModelConfigAdapter.java index aac79a1f3b..fd38445239 100644 --- a/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/config/JsonModelConfigAdapter.java +++ b/incubator/model-json/src/main/java/io/aklivity/zilla/runtime/model/json/internal/config/JsonModelConfigAdapter.java @@ -35,7 +35,7 @@ public final class JsonModelConfigAdapter implements ModelConfigAdapterSpi, JsonbAdapter { private static final String JSON = "json"; - private static final String TYPE_NAME = "type"; + private static final String MODEL_NAME = "model"; private static final String CATALOG_NAME = "catalog"; private static final String SUBJECT_NAME = "subject"; @@ -53,7 +53,7 @@ public JsonValue adaptToJson( { JsonModelConfig jsonConfig = (JsonModelConfig) config; JsonObjectBuilder converter = Json.createObjectBuilder(); - converter.add(TYPE_NAME, JSON); + converter.add(MODEL_NAME, JSON); if (jsonConfig.cataloged != null && !jsonConfig.cataloged.isEmpty()) { JsonObjectBuilder catalogs = Json.createObjectBuilder(); diff --git a/incubator/model-json/src/test/java/io/aklivity/zilla/runtime/model/json/internal/config/JsonModelConfigAdapterTest.java b/incubator/model-json/src/test/java/io/aklivity/zilla/runtime/model/json/internal/config/JsonModelConfigAdapterTest.java index 3851ab5032..670b7748e2 100644 --- a/incubator/model-json/src/test/java/io/aklivity/zilla/runtime/model/json/internal/config/JsonModelConfigAdapterTest.java +++ b/incubator/model-json/src/test/java/io/aklivity/zilla/runtime/model/json/internal/config/JsonModelConfigAdapterTest.java @@ -46,7 +46,7 @@ public void shouldReadJsonConverter() // GIVEN String json = "{" + - "\"type\": \"json\"," + + "\"model\": \"json\"," + "\"catalog\":" + "{" + "\"test0\":" + @@ -71,7 +71,7 @@ public void shouldReadJsonConverter() // THEN assertThat(config, not(nullValue())); - assertThat(config.type, equalTo("json")); + assertThat(config.model, equalTo("json")); assertThat(config.cataloged.size(), equalTo(1)); assertThat(config.cataloged.get(0).name, equalTo("test0")); assertThat(config.cataloged.get(0).schemas.get(0).subject, equalTo("subject1")); @@ -91,7 +91,7 @@ public void shouldWriteJsonConverter() // GIVEN String expectedJson = "{" + - "\"type\":\"json\"," + + "\"model\":\"json\"," + "\"catalog\":" + "{" + "\"test0\":" + diff --git a/incubator/model-protobuf.spec/src/main/scripts/io/aklivity/zilla/specs/model/protobuf/config/converter.yaml b/incubator/model-protobuf.spec/src/main/scripts/io/aklivity/zilla/specs/model/protobuf/config/model.yaml similarity index 95% rename from incubator/model-protobuf.spec/src/main/scripts/io/aklivity/zilla/specs/model/protobuf/config/converter.yaml rename to incubator/model-protobuf.spec/src/main/scripts/io/aklivity/zilla/specs/model/protobuf/config/model.yaml index e7f8d62b55..cb958f494c 100644 --- a/incubator/model-protobuf.spec/src/main/scripts/io/aklivity/zilla/specs/model/protobuf/config/converter.yaml +++ b/incubator/model-protobuf.spec/src/main/scripts/io/aklivity/zilla/specs/model/protobuf/config/model.yaml @@ -32,8 +32,8 @@ bindings: type: test options: value: - type: protobuf - format: json + model: protobuf + view: json catalog: catalog0: - subject: test0 diff --git a/incubator/model-protobuf.spec/src/main/scripts/io/aklivity/zilla/specs/model/protobuf/schema/protobuf.schema.patch.json b/incubator/model-protobuf.spec/src/main/scripts/io/aklivity/zilla/specs/model/protobuf/schema/protobuf.schema.patch.json index 570fdd3b9e..578800f5d2 100644 --- a/incubator/model-protobuf.spec/src/main/scripts/io/aklivity/zilla/specs/model/protobuf/schema/protobuf.schema.patch.json +++ b/incubator/model-protobuf.spec/src/main/scripts/io/aklivity/zilla/specs/model/protobuf/schema/protobuf.schema.patch.json @@ -13,7 +13,7 @@ { "properties": { - "type": + "model": { "const": "protobuf" } @@ -23,11 +23,11 @@ { "properties": { - "type": + "model": { "const": "protobuf" }, - "format": + "view": { "type": "string", "enum": diff --git a/incubator/model-protobuf.spec/src/test/java/io/aklivity/zilla/specs/model/protobuf/config/SchemaTest.java b/incubator/model-protobuf.spec/src/test/java/io/aklivity/zilla/specs/model/protobuf/config/SchemaTest.java index d1de785a9a..53b15a4b87 100644 --- a/incubator/model-protobuf.spec/src/test/java/io/aklivity/zilla/specs/model/protobuf/config/SchemaTest.java +++ b/incubator/model-protobuf.spec/src/test/java/io/aklivity/zilla/specs/model/protobuf/config/SchemaTest.java @@ -37,7 +37,7 @@ public class SchemaTest @Test public void shouldValidateCatalog() { - JsonObject config = schema.validate("converter.yaml"); + JsonObject config = schema.validate("model.yaml"); assertThat(config, not(nullValue())); } diff --git a/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/config/ProtobufModelConfig.java b/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/config/ProtobufModelConfig.java index b294cc3af9..35da0ec2b4 100644 --- a/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/config/ProtobufModelConfig.java +++ b/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/config/ProtobufModelConfig.java @@ -23,16 +23,16 @@ public final class ProtobufModelConfig extends ModelConfig { public final String subject; - public final String format; + public final String view; public ProtobufModelConfig( List cataloged, String subject, - String format) + String view) { super("protobuf", cataloged); this.subject = subject; - this.format = format; + this.view = view; } public static ProtobufModelConfigBuilder builder( diff --git a/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/config/ProtobufModelConfigBuilder.java b/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/config/ProtobufModelConfigBuilder.java index b9a7bdb539..86a17c2ac7 100644 --- a/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/config/ProtobufModelConfigBuilder.java +++ b/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/config/ProtobufModelConfigBuilder.java @@ -28,7 +28,7 @@ public class ProtobufModelConfigBuilder extends ConfigBuilder catalogs; private String subject; - private String format; + private String view; ProtobufModelConfigBuilder( Function mapper) @@ -66,16 +66,16 @@ public ProtobufModelConfigBuilder catalog( return this; } - public ProtobufModelConfigBuilder format( - String format) + public ProtobufModelConfigBuilder view( + String view) { - this.format = format; + this.view = view; return this; } @Override public T build() { - return mapper.apply(new ProtobufModelConfig(catalogs, subject, format)); + return mapper.apply(new ProtobufModelConfig(catalogs, subject, view)); } } diff --git a/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufConverterHandler.java b/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufConverterHandler.java index ddbaca27a4..3fb20561be 100644 --- a/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufConverterHandler.java +++ b/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufConverterHandler.java @@ -48,7 +48,7 @@ public class ProtobufConverterHandler { protected static final byte[] ZERO_INDEX = new byte[]{0x0}; - protected static final String FORMAT_JSON = "json"; + protected static final String VIEW_JSON = "json"; private static final int JSON_FIELD_STRUCTURE_LENGTH = "\"\":\"\",".length(); private static final int JSON_OBJECT_CURLY_BRACES = 2; @@ -56,7 +56,7 @@ public class ProtobufConverterHandler protected final SchemaConfig catalog; protected final CatalogHandler handler; protected final String subject; - protected final String format; + protected final String view; protected final List indexes; protected final DirectBufferInputStream in; protected final ExpandableDirectBufferOutputStream out; @@ -77,7 +77,7 @@ protected ProtobufConverterHandler( this.subject = catalog != null && catalog.subject != null ? catalog.subject : config.subject; - this.format = config.format; + this.view = config.view; this.descriptors = new Int2ObjectCache<>(1, 1024, i -> {}); this.tree = new Int2ObjectCache<>(1, 1024, i -> {}); this.builders = new Object2ObjectHashMap<>(); diff --git a/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufReadConverterHandler.java b/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufReadConverterHandler.java index 43344a926a..010dace5d0 100644 --- a/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufReadConverterHandler.java +++ b/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufReadConverterHandler.java @@ -55,7 +55,7 @@ public int padding( int length) { int padding = 0; - if (FORMAT_JSON.equals(format)) + if (VIEW_JSON.equals(view)) { int schemaId = handler.resolve(data, index, length); @@ -130,7 +130,7 @@ private int validate( break validate; } - if (FORMAT_JSON.equals(format)) + if (VIEW_JSON.equals(view)) { out.wrap(out.buffer()); printer.appendTo(message, output); diff --git a/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufWriteConverterHandler.java b/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufWriteConverterHandler.java index 64c7df1924..e55778ddde 100644 --- a/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufWriteConverterHandler.java +++ b/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufWriteConverterHandler.java @@ -75,7 +75,7 @@ public int convert( ? catalog.id : handler.resolve(subject, catalog.version); - if (FORMAT_JSON.equals(format)) + if (VIEW_JSON.equals(view)) { valLength = handler.encode(schemaId, data, index, length, next, this::serializeJsonRecord); } diff --git a/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/config/ProtobufModelConfigAdapter.java b/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/config/ProtobufModelConfigAdapter.java index 02b4386174..495eff2ca7 100644 --- a/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/config/ProtobufModelConfigAdapter.java +++ b/incubator/model-protobuf/src/main/java/io/aklivity/zilla/runtime/model/protobuf/internal/config/ProtobufModelConfigAdapter.java @@ -35,10 +35,10 @@ public final class ProtobufModelConfigAdapter implements ModelConfigAdapterSpi, JsonbAdapter { private static final String PROTOBUF = "protobuf"; - private static final String TYPE_NAME = "type"; + private static final String MODEL_NAME = "model"; private static final String CATALOG_NAME = "catalog"; private static final String SUBJECT_NAME = "subject"; - private static final String FORMAT = "format"; + private static final String VIEW = "view"; private final SchemaConfigAdapter schema = new SchemaConfigAdapter(); @@ -54,11 +54,11 @@ public JsonValue adaptToJson( { ProtobufModelConfig protobufConfig = (ProtobufModelConfig) config; JsonObjectBuilder converter = Json.createObjectBuilder(); - converter.add(TYPE_NAME, PROTOBUF); + converter.add(MODEL_NAME, PROTOBUF); - if (protobufConfig.format != null) + if (protobufConfig.view != null) { - converter.add(FORMAT, protobufConfig.format); + converter.add(VIEW, protobufConfig.view); } if (protobufConfig.cataloged != null && !protobufConfig.cataloged.isEmpty()) @@ -105,10 +105,10 @@ public ModelConfig adaptFromJson( ? object.getString(SUBJECT_NAME) : null; - String format = object.containsKey(FORMAT) - ? object.getString(FORMAT) + String view = object.containsKey(VIEW) + ? object.getString(VIEW) : null; - return new ProtobufModelConfig(catalogs, subject, format); + return new ProtobufModelConfig(catalogs, subject, view); } } diff --git a/incubator/model-protobuf/src/test/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufModelTest.java b/incubator/model-protobuf/src/test/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufModelTest.java index 71e5f221ad..e52fa1bf95 100644 --- a/incubator/model-protobuf/src/test/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufModelTest.java +++ b/incubator/model-protobuf/src/test/java/io/aklivity/zilla/runtime/model/protobuf/internal/ProtobufModelTest.java @@ -248,7 +248,7 @@ public void shouldReadValidProtobufEventFormatJson() .build()); ProtobufModelConfig config = ProtobufModelConfig.builder() - .format("json") + .view("json") .catalog() .name("test0") .schema() @@ -294,7 +294,7 @@ public void shouldWriteValidProtobufEventFormatJson() .build()); ProtobufModelConfig config = ProtobufModelConfig.builder() - .format("json") + .view("json") .catalog() .name("test0") .schema() @@ -337,7 +337,7 @@ public void shouldVerifyJsonFormatPaddingLength() .build()); LongFunction handler = value -> context.attach(catalogConfig); ProtobufModelConfig config = ProtobufModelConfig.builder() - .format("json") + .view("json") .catalog() .name("test0") .schema() diff --git a/incubator/model-protobuf/src/test/java/io/aklivity/zilla/runtime/model/protobuf/internal/config/ProtobufModelConfigAdapterTest.java b/incubator/model-protobuf/src/test/java/io/aklivity/zilla/runtime/model/protobuf/internal/config/ProtobufModelConfigAdapterTest.java index 9add92e1de..9c95ad4832 100644 --- a/incubator/model-protobuf/src/test/java/io/aklivity/zilla/runtime/model/protobuf/internal/config/ProtobufModelConfigAdapterTest.java +++ b/incubator/model-protobuf/src/test/java/io/aklivity/zilla/runtime/model/protobuf/internal/config/ProtobufModelConfigAdapterTest.java @@ -46,7 +46,7 @@ public void shouldReadAvroConverter() // GIVEN String json = "{" + - "\"type\": \"protobuf\"," + + "\"model\": \"protobuf\"," + "\"catalog\":" + "{" + "\"test0\":" + @@ -71,7 +71,7 @@ public void shouldReadAvroConverter() // THEN assertThat(converter, not(nullValue())); - assertThat(converter.type, equalTo("protobuf")); + assertThat(converter.model, equalTo("protobuf")); assertThat(converter.cataloged.size(), equalTo(1)); assertThat(converter.cataloged.get(0).name, equalTo("test0")); assertThat(converter.cataloged.get(0).schemas.get(0).strategy, equalTo("topic")); @@ -92,7 +92,7 @@ public void shouldWriteAvroConverter() // GIVEN String expectedJson = "{" + - "\"type\":\"protobuf\"," + + "\"model\":\"protobuf\"," + "\"catalog\":" + "{" + "\"test0\":" + diff --git a/runtime/binding-http/src/main/java/io/aklivity/zilla/runtime/binding/http/internal/config/HttpRequestConfigAdapter.java b/runtime/binding-http/src/main/java/io/aklivity/zilla/runtime/binding/http/internal/config/HttpRequestConfigAdapter.java index ad0633424b..99d2a27578 100644 --- a/runtime/binding-http/src/main/java/io/aklivity/zilla/runtime/binding/http/internal/config/HttpRequestConfigAdapter.java +++ b/runtime/binding-http/src/main/java/io/aklivity/zilla/runtime/binding/http/internal/config/HttpRequestConfigAdapter.java @@ -70,7 +70,7 @@ public JsonObject adaptToJson( JsonObjectBuilder headers = Json.createObjectBuilder(); for (HttpParamConfig header : request.headers) { - model.adaptType(header.model.type); + model.adaptType(header.model.model); headers.add(header.name, model.adaptToJson(header.model)); } object.add(HEADERS_NAME, headers); @@ -83,7 +83,7 @@ public JsonObject adaptToJson( JsonObjectBuilder pathParams = Json.createObjectBuilder(); for (HttpParamConfig pathParam : request.pathParams) { - model.adaptType(pathParam.model.type); + model.adaptType(pathParam.model.model); pathParams.add(pathParam.name, model.adaptToJson(pathParam.model)); } params.add(PATH_PARAMS_NAME, pathParams); @@ -93,7 +93,7 @@ public JsonObject adaptToJson( JsonObjectBuilder queryParams = Json.createObjectBuilder(); for (HttpParamConfig queryParam : request.queryParams) { - model.adaptType(queryParam.model.type); + model.adaptType(queryParam.model.model); queryParams.add(queryParam.name, model.adaptToJson(queryParam.model)); } params.add(QUERY_PARAMS_NAME, queryParams); @@ -102,7 +102,7 @@ public JsonObject adaptToJson( } if (request.content != null) { - model.adaptType(request.content.type); + model.adaptType(request.content.model); JsonValue content = model.adaptToJson(request.content); object.add(CONTENT_NAME, content); } diff --git a/runtime/binding-http/src/test/java/io/aklivity/zilla/runtime/binding/http/internal/config/HttpOptionsConfigAdapterTest.java b/runtime/binding-http/src/test/java/io/aklivity/zilla/runtime/binding/http/internal/config/HttpOptionsConfigAdapterTest.java index 85eed5cc82..2fd6c947ab 100644 --- a/runtime/binding-http/src/test/java/io/aklivity/zilla/runtime/binding/http/internal/config/HttpOptionsConfigAdapterTest.java +++ b/runtime/binding-http/src/test/java/io/aklivity/zilla/runtime/binding/http/internal/config/HttpOptionsConfigAdapterTest.java @@ -159,15 +159,15 @@ public void shouldReadOptions() assertThat(request.contentType.get(0), equalTo("application/json")); assertThat(request.headers.get(0).name, equalTo("content-type")); assertThat(request.headers.get(0).model, instanceOf(TestModelConfig.class)); - assertThat(request.headers.get(0).model.type, equalTo("test")); + assertThat(request.headers.get(0).model.model, equalTo("test")); assertThat(request.pathParams.get(0).name, equalTo("id")); assertThat(request.pathParams.get(0).model, instanceOf(TestModelConfig.class)); - assertThat(request.pathParams.get(0).model.type, equalTo("test")); + assertThat(request.pathParams.get(0).model.model, equalTo("test")); assertThat(request.queryParams.get(0).name, equalTo("index")); assertThat(request.queryParams.get(0).model, instanceOf(TestModelConfig.class)); - assertThat(request.queryParams.get(0).model.type, equalTo("test")); + assertThat(request.queryParams.get(0).model.model, equalTo("test")); assertThat(request.content, instanceOf(TestModelConfig.class)); - assertThat(request.content.type, equalTo("test")); + assertThat(request.content.model, equalTo("test")); } @Test diff --git a/runtime/binding-http/src/test/java/io/aklivity/zilla/runtime/binding/http/internal/config/HttpRequestConfigAdapterTest.java b/runtime/binding-http/src/test/java/io/aklivity/zilla/runtime/binding/http/internal/config/HttpRequestConfigAdapterTest.java index 5babab7283..15885903f2 100644 --- a/runtime/binding-http/src/test/java/io/aklivity/zilla/runtime/binding/http/internal/config/HttpRequestConfigAdapterTest.java +++ b/runtime/binding-http/src/test/java/io/aklivity/zilla/runtime/binding/http/internal/config/HttpRequestConfigAdapterTest.java @@ -82,15 +82,15 @@ public void shouldReadOptions() assertThat(request.contentType.get(0), equalTo("application/json")); assertThat(request.headers.get(0).name, equalTo("content-type")); assertThat(request.headers.get(0).model, instanceOf(TestModelConfig.class)); - assertThat(request.headers.get(0).model.type, equalTo("test")); + assertThat(request.headers.get(0).model.model, equalTo("test")); assertThat(request.pathParams.get(0).name, equalTo("id")); assertThat(request.pathParams.get(0).model, instanceOf(TestModelConfig.class)); - assertThat(request.pathParams.get(0).model.type, equalTo("test")); + assertThat(request.pathParams.get(0).model.model, equalTo("test")); assertThat(request.queryParams.get(0).name, equalTo("index")); assertThat(request.queryParams.get(0).model, instanceOf(TestModelConfig.class)); - assertThat(request.queryParams.get(0).model.type, equalTo("test")); + assertThat(request.queryParams.get(0).model.model, equalTo("test")); assertThat(request.content, instanceOf(TestModelConfig.class)); - assertThat(request.content.type, equalTo("test")); + assertThat(request.content.model, equalTo("test")); } @Test diff --git a/runtime/binding-http/src/test/java/io/aklivity/zilla/runtime/binding/http/internal/streams/rfc7230/server/ValidationIT.java b/runtime/binding-http/src/test/java/io/aklivity/zilla/runtime/binding/http/internal/streams/rfc7230/server/ValidationIT.java index 831b5e9c02..b679417f02 100644 --- a/runtime/binding-http/src/test/java/io/aklivity/zilla/runtime/binding/http/internal/streams/rfc7230/server/ValidationIT.java +++ b/runtime/binding-http/src/test/java/io/aklivity/zilla/runtime/binding/http/internal/streams/rfc7230/server/ValidationIT.java @@ -50,7 +50,7 @@ public class ValidationIT public final TestRule chain = outerRule(engine).around(k3po).around(timeout); @Test - @Configuration("server.validation.yaml") + @Configuration("server.model.yaml") @Specification({ "${net}/invalid/client", "${app}/invalid/server" }) @@ -60,7 +60,7 @@ public void shouldRejectInvalidRequests() throws Exception } @Test - @Configuration("server.validation.yaml") + @Configuration("server.model.yaml") @Specification({ "${net}/valid/client", "${app}/valid/server" }) diff --git a/runtime/binding-http/src/test/java/io/aklivity/zilla/runtime/binding/http/internal/streams/rfc7540/server/ValidationIT.java b/runtime/binding-http/src/test/java/io/aklivity/zilla/runtime/binding/http/internal/streams/rfc7540/server/ValidationIT.java index 1d82bc0d13..2034d6a41e 100644 --- a/runtime/binding-http/src/test/java/io/aklivity/zilla/runtime/binding/http/internal/streams/rfc7540/server/ValidationIT.java +++ b/runtime/binding-http/src/test/java/io/aklivity/zilla/runtime/binding/http/internal/streams/rfc7540/server/ValidationIT.java @@ -50,7 +50,7 @@ public class ValidationIT public final TestRule chain = outerRule(engine).around(k3po).around(timeout); @Test - @Configuration("server.validation.yaml") + @Configuration("server.model.yaml") @Specification({ "${net}/invalid/client", "${app}/invalid/server" }) @@ -60,7 +60,7 @@ public void shouldRejectInvalidRequests() throws Exception } @Test - @Configuration("server.validation.yaml") + @Configuration("server.model.yaml") @Specification({ "${net}/valid/client", "${app}/valid/server" }) diff --git a/runtime/binding-kafka/src/main/java/io/aklivity/zilla/runtime/binding/kafka/internal/config/KafkaTopicConfigAdapter.java b/runtime/binding-kafka/src/main/java/io/aklivity/zilla/runtime/binding/kafka/internal/config/KafkaTopicConfigAdapter.java index a223ec4abc..2fb99e5ca0 100644 --- a/runtime/binding-kafka/src/main/java/io/aklivity/zilla/runtime/binding/kafka/internal/config/KafkaTopicConfigAdapter.java +++ b/runtime/binding-kafka/src/main/java/io/aklivity/zilla/runtime/binding/kafka/internal/config/KafkaTopicConfigAdapter.java @@ -58,14 +58,14 @@ public JsonObject adaptToJson( if (topic.key != null) { - converter.adaptType(topic.key.type); + converter.adaptType(topic.key.model); object.add(EVENT_KEY, converter.adaptToJson(topic.key)); } if (topic.value != null) { - converter.adaptType(topic.value.type); + converter.adaptType(topic.value.model); object.add(EVENT_VALUE, converter.adaptToJson(topic.value)); } diff --git a/runtime/binding-mqtt/src/main/java/io/aklivity/zilla/runtime/binding/mqtt/internal/config/MqttTopicConfigAdapter.java b/runtime/binding-mqtt/src/main/java/io/aklivity/zilla/runtime/binding/mqtt/internal/config/MqttTopicConfigAdapter.java index aa559083fe..2105c49863 100644 --- a/runtime/binding-mqtt/src/main/java/io/aklivity/zilla/runtime/binding/mqtt/internal/config/MqttTopicConfigAdapter.java +++ b/runtime/binding-mqtt/src/main/java/io/aklivity/zilla/runtime/binding/mqtt/internal/config/MqttTopicConfigAdapter.java @@ -44,7 +44,7 @@ public JsonObject adaptToJson( if (topic.content != null) { - model.adaptType(topic.content.type); + model.adaptType(topic.content.model); JsonValue content = model.adaptToJson(topic.content); object.add(CONTENT_NAME, content); } diff --git a/runtime/binding-mqtt/src/test/java/io/aklivity/zilla/runtime/binding/mqtt/internal/config/MqttOptionsConfigAdapterTest.java b/runtime/binding-mqtt/src/test/java/io/aklivity/zilla/runtime/binding/mqtt/internal/config/MqttOptionsConfigAdapterTest.java index 2c67b0f4d3..c6cd04080d 100644 --- a/runtime/binding-mqtt/src/test/java/io/aklivity/zilla/runtime/binding/mqtt/internal/config/MqttOptionsConfigAdapterTest.java +++ b/runtime/binding-mqtt/src/test/java/io/aklivity/zilla/runtime/binding/mqtt/internal/config/MqttOptionsConfigAdapterTest.java @@ -96,7 +96,7 @@ public void shouldReadOptions() MqttTopicConfig topic = options.topics.get(0); assertThat(topic.name, equalTo("sensor/one")); assertThat(topic.content, instanceOf(TestModelConfig.class)); - assertThat(topic.content.type, equalTo("test")); + assertThat(topic.content.model, equalTo("test")); } @Test diff --git a/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/config/ModelConfig.java b/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/config/ModelConfig.java index 48b4d7e28b..637e0d60df 100644 --- a/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/config/ModelConfig.java +++ b/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/config/ModelConfig.java @@ -19,20 +19,20 @@ public abstract class ModelConfig { - public final String type; + public final String model; public final List cataloged; public ModelConfig( - String type) + String model) { - this(type, null); + this(model, null); } public ModelConfig( - String type, + String model, List cataloged) { - this.type = type; + this.model = model; this.cataloged = cataloged; } } diff --git a/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/config/ModelConfigAdapter.java b/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/config/ModelConfigAdapter.java index 88e26c966d..652d728051 100644 --- a/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/config/ModelConfigAdapter.java +++ b/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/config/ModelConfigAdapter.java @@ -30,7 +30,7 @@ public final class ModelConfigAdapter implements JsonbAdapter { - private static final String TYPE_NAME = "type"; + private static final String MODEL_NAME = "model"; private final Map delegatesByName; private ModelConfigAdapterSpi delegate; @@ -65,7 +65,7 @@ public ModelConfig adaptFromJson( if (value instanceof JsonString) { object = Json.createObjectBuilder() - .add(TYPE_NAME, ((JsonString) value).getString()) + .add(MODEL_NAME, ((JsonString) value).getString()) .build(); } else if (value instanceof JsonObject) @@ -77,8 +77,8 @@ else if (value instanceof JsonObject) assert false; } - String type = object.containsKey(TYPE_NAME) - ? object.getString(TYPE_NAME) + String type = object.containsKey(MODEL_NAME) + ? object.getString(MODEL_NAME) : null; adaptType(type); diff --git a/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/internal/registry/DispatchAgent.java b/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/internal/registry/DispatchAgent.java index 9585125343..5dae0af4ae 100644 --- a/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/internal/registry/DispatchAgent.java +++ b/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/internal/registry/DispatchAgent.java @@ -666,7 +666,7 @@ public CatalogHandler supplyCatalog( public ValidatorHandler supplyValidator( ModelConfig config) { - ModelContext model = modelsByType.get(config.type); + ModelContext model = modelsByType.get(config.model); return model != null ? model.supplyValidatorHandler(config) : null; } @@ -674,7 +674,7 @@ public ValidatorHandler supplyValidator( public ConverterHandler supplyReadConverter( ModelConfig config) { - ModelContext model = modelsByType.get(config.type); + ModelContext model = modelsByType.get(config.model); return model != null ? model.supplyReadConverterHandler(config) : null; } @@ -682,7 +682,7 @@ public ConverterHandler supplyReadConverter( public ConverterHandler supplyWriteConverter( ModelConfig config) { - ModelContext model = modelsByType.get(config.type); + ModelContext model = modelsByType.get(config.model); return model != null ? model.supplyWriteConverterHandler(config) : null; } diff --git a/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/internal/model/config/ModelConfigAdapterTest.java b/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/internal/model/config/ModelConfigAdapterTest.java index 8dd0f8419b..d88e442f4f 100644 --- a/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/internal/model/config/ModelConfigAdapterTest.java +++ b/runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/internal/model/config/ModelConfigAdapterTest.java @@ -51,15 +51,15 @@ public void shouldReadConverter() // GIVEN String json = "{" + - "\"type\": \"test\"" + + "\"model\": \"test\"" + "}"; // WHEN - ModelConfig converter = jsonb.fromJson(json, ModelConfig.class); + ModelConfig model = jsonb.fromJson(json, ModelConfig.class); // THEN - assertThat(converter, not(nullValue())); - assertThat(converter.type, equalTo("test")); + assertThat(model, not(nullValue())); + assertThat(model.model, equalTo("test")); } @Test @@ -67,10 +67,10 @@ public void shouldWriteConverter() { // GIVEN String expectedJson = "\"test\""; - ModelConfig converter = TestModelConfig.builder().build(); + ModelConfig model = TestModelConfig.builder().build(); // WHEN - String json = jsonb.toJson(converter); + String json = jsonb.toJson(model); // THEN assertThat(json, not(nullValue())); diff --git a/specs/binding-http.spec/src/main/scripts/io/aklivity/zilla/specs/binding/http/config/v1.1/server.validation.yaml b/specs/binding-http.spec/src/main/scripts/io/aklivity/zilla/specs/binding/http/config/v1.1/server.model.yaml similarity index 89% rename from specs/binding-http.spec/src/main/scripts/io/aklivity/zilla/specs/binding/http/config/v1.1/server.validation.yaml rename to specs/binding-http.spec/src/main/scripts/io/aklivity/zilla/specs/binding/http/config/v1.1/server.model.yaml index 2fca06a103..f70ed53ed2 100644 --- a/specs/binding-http.spec/src/main/scripts/io/aklivity/zilla/specs/binding/http/config/v1.1/server.validation.yaml +++ b/specs/binding-http.spec/src/main/scripts/io/aklivity/zilla/specs/binding/http/config/v1.1/server.model.yaml @@ -25,7 +25,7 @@ bindings: - path: /hello method: GET content: - type: test + model: test length: 13 - path: /valid/{category}/{id} method: POST @@ -33,22 +33,22 @@ bindings: - text/plain headers: code: - type: test + model: test length: 13 params: path: category: - type: test + model: test length: 13 id: - type: test + model: test length: 13 query: page: - type: test + model: test length: 13 content: - type: test + model: test length: 13 versions: - http/1.1 diff --git a/specs/binding-http.spec/src/main/scripts/io/aklivity/zilla/specs/binding/http/config/v2/server.validation.yaml b/specs/binding-http.spec/src/main/scripts/io/aklivity/zilla/specs/binding/http/config/v2/server.model.yaml similarity index 89% rename from specs/binding-http.spec/src/main/scripts/io/aklivity/zilla/specs/binding/http/config/v2/server.validation.yaml rename to specs/binding-http.spec/src/main/scripts/io/aklivity/zilla/specs/binding/http/config/v2/server.model.yaml index 9576d4db7f..ad507a7721 100644 --- a/specs/binding-http.spec/src/main/scripts/io/aklivity/zilla/specs/binding/http/config/v2/server.validation.yaml +++ b/specs/binding-http.spec/src/main/scripts/io/aklivity/zilla/specs/binding/http/config/v2/server.model.yaml @@ -25,7 +25,7 @@ bindings: - path: /hello method: GET content: - type: test + model: test length: 13 - path: /valid/{category}/{id} method: POST @@ -33,22 +33,22 @@ bindings: - text/plain headers: code: - type: test + model: test length: 13 params: path: category: - type: test + model: test length: 13 id: - type: test + model: test length: 13 query: page: - type: test + model: test length: 13 content: - type: test + model: test length: 13 versions: - h2 diff --git a/specs/binding-kafka.spec/src/main/scripts/io/aklivity/zilla/specs/binding/kafka/config/cache.client.options.validate.yaml b/specs/binding-kafka.spec/src/main/scripts/io/aklivity/zilla/specs/binding/kafka/config/cache.client.options.validate.yaml index c016f884fb..2895815a17 100644 --- a/specs/binding-kafka.spec/src/main/scripts/io/aklivity/zilla/specs/binding/kafka/config/cache.client.options.validate.yaml +++ b/specs/binding-kafka.spec/src/main/scripts/io/aklivity/zilla/specs/binding/kafka/config/cache.client.options.validate.yaml @@ -45,7 +45,7 @@ bindings: topics: - name: test value: - type: test + model: test length: 13 catalog: test0: diff --git a/specs/binding-kafka.spec/src/main/scripts/io/aklivity/zilla/specs/binding/kafka/config/cache.options.convert.yaml b/specs/binding-kafka.spec/src/main/scripts/io/aklivity/zilla/specs/binding/kafka/config/cache.options.convert.yaml index fd181216f7..bac0e616b8 100644 --- a/specs/binding-kafka.spec/src/main/scripts/io/aklivity/zilla/specs/binding/kafka/config/cache.options.convert.yaml +++ b/specs/binding-kafka.spec/src/main/scripts/io/aklivity/zilla/specs/binding/kafka/config/cache.options.convert.yaml @@ -52,7 +52,7 @@ bindings: topics: - name: test value: - type: test + model: test length: 13 catalog: test0: diff --git a/specs/binding-kafka.spec/src/main/scripts/io/aklivity/zilla/specs/binding/kafka/config/cache.options.validate.yaml b/specs/binding-kafka.spec/src/main/scripts/io/aklivity/zilla/specs/binding/kafka/config/cache.options.validate.yaml index 008f88088a..42192fdf2e 100644 --- a/specs/binding-kafka.spec/src/main/scripts/io/aklivity/zilla/specs/binding/kafka/config/cache.options.validate.yaml +++ b/specs/binding-kafka.spec/src/main/scripts/io/aklivity/zilla/specs/binding/kafka/config/cache.options.validate.yaml @@ -52,7 +52,7 @@ bindings: topics: - name: test value: - type: test + model: test capability: read length: 13 catalog: diff --git a/specs/binding-mqtt.spec/src/main/scripts/io/aklivity/zilla/specs/binding/mqtt/config/server.validator.yaml b/specs/binding-mqtt.spec/src/main/scripts/io/aklivity/zilla/specs/binding/mqtt/config/server.validator.yaml index c742555b83..72f42032be 100644 --- a/specs/binding-mqtt.spec/src/main/scripts/io/aklivity/zilla/specs/binding/mqtt/config/server.validator.yaml +++ b/specs/binding-mqtt.spec/src/main/scripts/io/aklivity/zilla/specs/binding/mqtt/config/server.validator.yaml @@ -44,7 +44,7 @@ bindings: topics: - name: sensor/one content: - type: test + model: test length: 13 routes: - exit: app0 diff --git a/specs/engine.spec/src/main/scripts/io/aklivity/zilla/specs/engine/schema/engine.schema.json b/specs/engine.spec/src/main/scripts/io/aklivity/zilla/specs/engine/schema/engine.schema.json index 8ef359caf0..123c6207b7 100644 --- a/specs/engine.spec/src/main/scripts/io/aklivity/zilla/specs/engine/schema/engine.schema.json +++ b/specs/engine.spec/src/main/scripts/io/aklivity/zilla/specs/engine/schema/engine.schema.json @@ -364,14 +364,14 @@ "type": "object", "properties": { - "type": + "model": { "$ref": "#/$defs/converter/types" } }, "required": [ - "type" + "model" ], "allOf": [ @@ -387,14 +387,14 @@ "type": "object", "properties": { - "type": + "model": { "$ref": "#/$defs/validator/types" } }, "required": [ - "type" + "model" ], "allOf": [ diff --git a/specs/engine.spec/src/main/scripts/io/aklivity/zilla/specs/engine/schema/model/test.schema.patch.json b/specs/engine.spec/src/main/scripts/io/aklivity/zilla/specs/engine/schema/model/test.schema.patch.json index ebbe8adeeb..8fb9fd98ff 100644 --- a/specs/engine.spec/src/main/scripts/io/aklivity/zilla/specs/engine/schema/model/test.schema.patch.json +++ b/specs/engine.spec/src/main/scripts/io/aklivity/zilla/specs/engine/schema/model/test.schema.patch.json @@ -13,7 +13,7 @@ { "properties": { - "type": + "model": { "const": "test" } @@ -23,7 +23,7 @@ { "properties": { - "type": + "model": { "const": "test" }, @@ -147,7 +147,7 @@ { "properties": { - "type": + "model": { "const": "test" } @@ -157,7 +157,7 @@ { "properties": { - "type": + "model": { "const": "test" },