Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

migrating from Validator to Converter #729

Merged
merged 3 commits into from
Jan 12, 2024
Merged

migrating from Validator to Converter #729

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e76f2ce
migrating from Validator to Converter
ankitk-me Jan 11, 2024
16c475d
addressing review comments
ankitk-me Jan 12, 2024
4eee22e
refactoring
ankitk-me Jan 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions cloud/docker-image/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,25 +344,25 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>validator-avro</artifactId>
<artifactId>type-avro</artifactId>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We had agreed on types-, not type-.
Please adjust the module names and module-info accordingly.

<version>${project.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>validator-core</artifactId>
<artifactId>type-core</artifactId>
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>validator-json</artifactId>
<artifactId>type-json</artifactId>
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>validator-protobuf</artifactId>
<artifactId>type-protobuf</artifactId>
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion cloud/docker-image/src/main/docker/assembly.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<include>io/aklivity/zilla/exporter-*/**</include>
<include>io/aklivity/zilla/guard-*/**</include>
<include>io/aklivity/zilla/metrics-*/**</include>
<include>io/aklivity/zilla/validator-*/**</include>
<include>io/aklivity/zilla/type-*/**</include>
<include>io/aklivity/zilla/vault-*/**</include>
<include>io/aklivity/zilla/command/**</include>
<include>io/aklivity/zilla/command-*/**</include>
Expand Down
8 changes: 4 additions & 4 deletions cloud/docker-image/src/main/docker/incubator/zpm.json.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,10 @@
"io.aklivity.zilla:metrics-stream",
"io.aklivity.zilla:metrics-http",
"io.aklivity.zilla:metrics-grpc",
"io.aklivity.zilla:validator-avro",
"io.aklivity.zilla:validator-core",
"io.aklivity.zilla:validator-json",
"io.aklivity.zilla:validator-protobuf",
"io.aklivity.zilla:type-avro",
"io.aklivity.zilla:type-core",
"io.aklivity.zilla:type-json",
"io.aklivity.zilla:type-protobuf",
"io.aklivity.zilla:vault-filesystem",
"org.slf4j:slf4j-simple",
"org.antlr:antlr4-runtime"
Expand Down
2 changes: 1 addition & 1 deletion ...alog-inline/src/test/java/io/aklivity/zilla/runtime/catalog/inline/internal/InlineIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.validator.function.ValueConsumer;
import io.aklivity.zilla.runtime.engine.converter.function.ValueConsumer;

public class InlineIT
{
Expand Down
2 changes: 1 addition & 1 deletion ...aklivity/zilla/runtime/catalog/schema/registry/internal/SchemaRegistryCatalogHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.validator.function.ValueConsumer;
import io.aklivity.zilla.runtime.engine.converter.function.ValueConsumer;

public class SchemaRegistryCatalogHandler implements CatalogHandler
{
Expand Down
2 changes: 1 addition & 1 deletion ...est/java/io/aklivity/zilla/runtime/catalog/schema/registry/internal/SchemaRegistryIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.validator.function.ValueConsumer;
import io.aklivity.zilla.runtime.engine.converter.function.ValueConsumer;

public class SchemaRegistryIT
{
Expand Down
8 changes: 4 additions & 4 deletions incubator/command-generate/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,25 +87,25 @@
</dependency>
<dependency>
<groupId>io.aklivity.zilla</groupId>
<artifactId>validator-avro</artifactId>
<artifactId>type-avro</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.aklivity.zilla</groupId>
<artifactId>validator-core</artifactId>
<artifactId>type-core</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.aklivity.zilla</groupId>
<artifactId>validator-json</artifactId>
<artifactId>type-json</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.aklivity.zilla</groupId>
<artifactId>validator-protobuf</artifactId>
<artifactId>type-protobuf</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
Expand Down
12 changes: 6 additions & 6 deletions ...ain/java/io/aklivity/zilla/runtime/command/generate/internal/airline/ConfigGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.validator.core.config.IntegerValidatorConfig;
import io.aklivity.zilla.runtime.validator.core.config.StringValidatorConfig;
import io.aklivity.zilla.runtime.converter.core.config.IntegerConverterConfig;
import io.aklivity.zilla.runtime.converter.core.config.StringConverterConfig;
import io.aklivity.zilla.runtime.engine.config.ConverterConfig;

public abstract class ConfigGenerator
{
Expand All @@ -40,9 +40,9 @@ public abstract class ConfigGenerator
protected static final String VERSION_LATEST = "latest";
protected static final Pattern JSON_CONTENT_TYPE = Pattern.compile("^application/(?:.+\\+)?json$");

protected final Map<String, ValidatorConfig> validators = Map.of(
"string", StringValidatorConfig.builder().build(),
"integer", IntegerValidatorConfig.builder().build()
protected final Map<String, ConverterConfig> converters = Map.of(
"string", StringConverterConfig.builder().build(),
"integer", IntegerConverterConfig.builder().build()
);
protected final Matcher jsonContentType = JSON_CONTENT_TYPE.matcher("");

Expand Down
12 changes: 6 additions & 6 deletions ...ntime/command/generate/internal/asyncapi/http/proxy/AsyncApiHttpProxyConfigGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,16 +50,16 @@
import io.aklivity.zilla.runtime.command.generate.internal.asyncapi.view.ChannelView;
import io.aklivity.zilla.runtime.command.generate.internal.asyncapi.view.MessageView;
import io.aklivity.zilla.runtime.command.generate.internal.asyncapi.view.ServerView;
import io.aklivity.zilla.runtime.converter.json.config.JsonConverterConfig;
import io.aklivity.zilla.runtime.engine.config.BindingConfigBuilder;
import io.aklivity.zilla.runtime.engine.config.CatalogedConfigBuilder;
import io.aklivity.zilla.runtime.engine.config.ConfigWriter;
import io.aklivity.zilla.runtime.engine.config.ConverterConfig;
import io.aklivity.zilla.runtime.engine.config.GuardedConfigBuilder;
import io.aklivity.zilla.runtime.engine.config.NamespaceConfig;
import io.aklivity.zilla.runtime.engine.config.NamespaceConfigBuilder;
import io.aklivity.zilla.runtime.engine.config.RouteConfigBuilder;
import io.aklivity.zilla.runtime.engine.config.ValidatorConfig;
import io.aklivity.zilla.runtime.guard.jwt.config.JwtOptionsConfig;
import io.aklivity.zilla.runtime.validator.json.config.JsonValidatorConfig;
import io.aklivity.zilla.runtime.vault.filesystem.config.FileSystemOptionsConfig;

public class AsyncApiHttpProxyConfigGenerator extends AsyncApiConfigGenerator
Expand Down Expand Up @@ -355,7 +355,7 @@ private <C> HttpRequestConfigBuilder<C> injectContent(
if (hasJsonContentType())
{
request.
content(JsonValidatorConfig::builder)
content(JsonConverterConfig::builder)
.catalog()
.name(INLINE_CATALOG_NAME)
.inject(catalog -> injectSchemas(catalog, messages))
Expand Down Expand Up @@ -394,13 +394,13 @@ private <C> HttpRequestConfigBuilder<C> injectPathParams(
Parameter parameter = parameters.get(name);
if (parameter.schema != null && parameter.schema.type != null)
{
ValidatorConfig validator = validators.get(parameter.schema.type);
if (validator != null)
ConverterConfig converter = converters.get(parameter.schema.type);
if (converter != null)
{
request
.pathParam()
.name(name)
.validator(validator)
.converter(converter)
.build();
}
}
Expand Down
4 changes: 2 additions & 2 deletions ...ntime/command/generate/internal/asyncapi/mqtt/proxy/AsyncApiMqttProxyConfigGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,12 @@
import io.aklivity.zilla.runtime.command.generate.internal.asyncapi.model.Message;
import io.aklivity.zilla.runtime.command.generate.internal.asyncapi.view.MessageView;
import io.aklivity.zilla.runtime.command.generate.internal.asyncapi.view.ServerView;
import io.aklivity.zilla.runtime.converter.json.config.JsonConverterConfig;
import io.aklivity.zilla.runtime.engine.config.BindingConfigBuilder;
import io.aklivity.zilla.runtime.engine.config.CatalogedConfigBuilder;
import io.aklivity.zilla.runtime.engine.config.ConfigWriter;
import io.aklivity.zilla.runtime.engine.config.NamespaceConfig;
import io.aklivity.zilla.runtime.engine.config.NamespaceConfigBuilder;
import io.aklivity.zilla.runtime.validator.json.config.JsonValidatorConfig;
import io.aklivity.zilla.runtime.vault.filesystem.config.FileSystemOptionsConfig;

public class AsyncApiMqttProxyConfigGenerator extends AsyncApiConfigGenerator
Expand Down Expand Up @@ -248,7 +248,7 @@ private BindingConfigBuilder<NamespaceConfigBuilder<NamespaceConfig>> injectMqtt
.options(MqttOptionsConfig::builder)
.topic()
.name(topic)
.content(JsonValidatorConfig::builder)
.content(JsonConverterConfig::builder)
.catalog()
.name(INLINE_CATALOG_NAME)
.inject(cataloged -> injectJsonSchemas(cataloged, messages, APPLICATION_JSON))
Expand Down
16 changes: 8 additions & 8 deletions ...runtime/command/generate/internal/openapi/http/proxy/OpenApiHttpProxyConfigGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,15 @@
import io.aklivity.zilla.runtime.command.generate.internal.openapi.view.PathView;
import io.aklivity.zilla.runtime.command.generate.internal.openapi.view.SchemaView;
import io.aklivity.zilla.runtime.command.generate.internal.openapi.view.ServerView;
import io.aklivity.zilla.runtime.converter.json.config.JsonConverterConfig;
import io.aklivity.zilla.runtime.engine.config.BindingConfigBuilder;
import io.aklivity.zilla.runtime.engine.config.ConfigWriter;
import io.aklivity.zilla.runtime.engine.config.ConverterConfig;
import io.aklivity.zilla.runtime.engine.config.GuardedConfigBuilder;
import io.aklivity.zilla.runtime.engine.config.NamespaceConfig;
import io.aklivity.zilla.runtime.engine.config.NamespaceConfigBuilder;
import io.aklivity.zilla.runtime.engine.config.RouteConfigBuilder;
import io.aklivity.zilla.runtime.engine.config.ValidatorConfig;
import io.aklivity.zilla.runtime.guard.jwt.config.JwtOptionsConfig;
import io.aklivity.zilla.runtime.validator.json.config.JsonValidatorConfig;
import io.aklivity.zilla.runtime.vault.filesystem.config.FileSystemOptionsConfig;

public class OpenApiHttpProxyConfigGenerator extends OpenApiConfigGenerator
Expand Down Expand Up @@ -326,7 +326,7 @@ private <C> HttpRequestConfigBuilder<C> injectContent(
if (schema != null)
{
request.
content(JsonValidatorConfig::builder)
content(JsonConverterConfig::builder)
.catalog()
.name(INLINE_CATALOG_NAME)
.schema()
Expand All @@ -349,30 +349,30 @@ private <C> HttpRequestConfigBuilder<C> injectParams(
{
if (parameter.schema != null && parameter.schema.type != null)
{
ValidatorConfig validator = validators.get(parameter.schema.type);
if (validator != null)
ConverterConfig converter = converters.get(parameter.schema.type);
if (converter != null)
{
switch (parameter.in)
{
case "path":
request.
pathParam()
.name(parameter.name)
.validator(validator)
.converter(converter)
.build();
break;
case "query":
request.
queryParam()
.name(parameter.name)
.validator(validator)
.converter(converter)
.build();
break;
case "header":
request.
header()
.name(parameter.name)
.validator(validator)
.converter(converter)
.build();
break;
}
Expand Down
8 changes: 4 additions & 4 deletions incubator/command-generate/src/main/moditect/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.validator.avro;
requires io.aklivity.zilla.runtime.validator.core;
requires io.aklivity.zilla.runtime.validator.json;
requires io.aklivity.zilla.runtime.validator.protobuf;
requires io.aklivity.zilla.runtime.converter.avro;
requires io.aklivity.zilla.runtime.converter.core;
requires io.aklivity.zilla.runtime.converter.json;
requires io.aklivity.zilla.runtime.converter.protobuf;

requires com.fasterxml.jackson.dataformat.yaml;
requires com.fasterxml.jackson.databind;
Expand Down
24 changes: 12 additions & 12 deletions incubator/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
<module>catalog-inline.spec</module>
<module>catalog-schema-registry.spec</module>
<module>exporter-otlp.spec</module>
<module>validator-avro.spec</module>
<module>validator-core.spec</module>
<module>validator-json.spec</module>
<module>validator-protobuf.spec</module>
<module>type-avro.spec</module>
<module>type-core.spec</module>
<module>type-json.spec</module>
<module>type-protobuf.spec</module>

<module>binding-amqp</module>

Expand All @@ -38,10 +38,10 @@

<module>exporter-otlp</module>

<module>validator-avro</module>
<module>validator-core</module>
<module>validator-json</module>
<module>validator-protobuf</module>
<module>type-avro</module>
<module>type-core</module>
<module>type-json</module>
<module>type-protobuf</module>
</modules>

<dependencyManagement>
Expand Down Expand Up @@ -88,22 +88,22 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>validator-avro</artifactId>
<artifactId>type-avro</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>validator-core</artifactId>
<artifactId>type-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>validator-json</artifactId>
<artifactId>type-json</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>validator-protobuf</artifactId>
<artifactId>type-protobuf</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
Expand Down
0 incubator/validator-avro.spec/COPYRIGHT → incubator/type-avro.spec/COPYRIGHT
View file
Open in desktop
File renamed without changes.
0 incubator/validator-avro.spec/LICENSE → incubator/type-avro.spec/LICENSE
View file
Open in desktop
File renamed without changes.
0 incubator/validator-avro.spec/NOTICE → incubator/type-avro.spec/NOTICE
View file
Open in desktop
File renamed without changes.
0 ...bator/validator-avro.spec/NOTICE.template → incubator/type-avro.spec/NOTICE.template
View file
Open in desktop
File renamed without changes.
0 incubator/validator-avro.spec/mvnw → incubator/type-avro.spec/mvnw
View file
Open in desktop
File renamed without changes.
0 incubator/validator-avro.spec/mvnw.cmd → incubator/type-avro.spec/mvnw.cmd
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions incubator/validator-avro.spec/pom.xml → incubator/type-avro.spec/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>validator-avro.spec</artifactId>
<name>zilla::incubator::validator-avro.spec</name>
<artifactId>type-avro.spec</artifactId>
<name>zilla::incubator::type-avro.spec</name>

<licenses>
<license>
Expand Down Expand Up @@ -79,7 +79,7 @@
<version>${project.version}</version>
<configuration>
<scopeNames>core</scopeNames>
<packageName>io.aklivity.zilla.specs.validator.avro.internal.types</packageName>
<packageName>io.aklivity.zilla.specs.converter.avro.internal.types</packageName>
</configuration>
<executions>
<execution>
Expand Down Expand Up @@ -135,7 +135,7 @@
<artifactId>jacoco-maven-plugin</artifactId>
<configuration>
<excludes>
<exclude>io/aklivity/zilla/specs/validator/avro/internal/types/**/*.class</exclude>
<exclude>io/aklivity/zilla/specs/converter/avro/internal/types/**/*.class</exclude>
</excludes>
<rules>
<rule>
Expand Down
2 changes: 1 addition & 1 deletion ...o.spec/src/main/moditect/module-info.java → ...o.spec/src/main/moditect/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.validator.avro
open module io.aklivity.zilla.specs.converter.avro
{
requires transitive io.aklivity.zilla.specs.engine;
}
0 ...pecs/validator/avro/config/validator.yaml → ...pecs/converter/avro/config/converter.yaml
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...idator/avro/schema/avro.schema.patch.json → ...verter/avro/schema/avro.schema.patch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[
{
"op": "add",
"path": "/$defs/validator/types/enum/-",
"path": "/$defs/converter/types/enum/-",
"value": "avro"
},
{
"op": "add",
"path": "/$defs/validator/allOf/-",
"path": "/$defs/converter/allOf/-",
"value":
{
"if":
Expand Down
Loading