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

Schema Config Update #481

Merged
merged 1 commit into from
Oct 6, 2023
Merged

Schema Config Update #481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion ...idator-avro/src/test/java/io/aklivity/zilla/runtime/validator/avro/AvroValidatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ public class AvroValidatorTest
.catalog()
.name("test0")
.schema()
.schema(null)
.strategy("topic")
.version("latest")
.subject("test-value")
Expand Down
12 changes: 5 additions & 7 deletions .../java/io/aklivity/zilla/runtime/validator/avro/config/AvroValidatorConfigAdapterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public void shouldReadAvroValidator()
"\"version\": \"latest\"" +
"}," +
"{" +
"\"schema\": \"cat\"," +
"\"subject\": \"cat\"," +
"\"version\": \"latest\"" +
"}," +
"{" +
Expand All @@ -72,15 +72,13 @@ public void shouldReadAvroValidator()
assertThat(validator.type, equalTo("avro"));
assertThat(validator.catalogs.size(), equalTo(1));
assertThat(validator.catalogs.get(0).name, equalTo("test0"));
assertThat(validator.catalogs.get(0).schemas.get(0).schema, nullValue());
assertThat(validator.catalogs.get(0).schemas.get(0).strategy, equalTo("topic"));
assertThat(validator.catalogs.get(0).schemas.get(0).version, equalTo("latest"));
assertThat(validator.catalogs.get(0).schemas.get(0).id, equalTo(0));
assertThat(validator.catalogs.get(0).schemas.get(1).schema, equalTo("cat"));
assertThat(validator.catalogs.get(0).schemas.get(1).subject, equalTo("cat"));
assertThat(validator.catalogs.get(0).schemas.get(1).strategy, nullValue());
assertThat(validator.catalogs.get(0).schemas.get(1).version, nullValue());
assertThat(validator.catalogs.get(0).schemas.get(1).version, equalTo("latest"));
assertThat(validator.catalogs.get(0).schemas.get(1).id, equalTo(0));
assertThat(validator.catalogs.get(0).schemas.get(2).schema, nullValue());
assertThat(validator.catalogs.get(0).schemas.get(2).strategy, nullValue());
assertThat(validator.catalogs.get(0).schemas.get(2).version, nullValue());
assertThat(validator.catalogs.get(0).schemas.get(2).id, equalTo(42));
Expand All @@ -102,7 +100,7 @@ public void shouldWriteAvroValidator()
"\"version\":\"latest\"" +
"}," +
"{" +
"\"schema\":\"cat\"," +
"\"subject\":\"cat\"," +
"\"version\":\"latest\"" +
"}," +
"{" +
Expand All @@ -119,7 +117,7 @@ public void shouldWriteAvroValidator()
.version("latest")
.build()
.schema()
.schema("cat")
.subject("cat")
.version("latest")
.build()
.schema()
Expand Down
1 change: 0 additions & 1 deletion ...idator-json/src/test/java/io/aklivity/zilla/runtime/validator/json/JsonValidatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ public class JsonValidatorTest
.catalog()
.name("test0")
.schema()
.schema(null)
.strategy("topic")
.subject(null)
.version("latest")
Expand Down
13 changes: 5 additions & 8 deletions .../java/io/aklivity/zilla/runtime/validator/json/config/JsonValidatorConfigAdapterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public void shouldReadJsonValidator()
"\"version\": \"latest\"" +
"}," +
"{" +
"\"schema\": \"cat\"," +
"\"strategy\": \"topic\"," +
"\"version\": \"latest\"" +
"}," +
"{" +
Expand All @@ -72,15 +72,12 @@ public void shouldReadJsonValidator()
assertThat(validator.type, equalTo("json"));
assertThat(validator.catalogs.size(), equalTo(1));
assertThat(validator.catalogs.get(0).name, equalTo("test0"));
assertThat(validator.catalogs.get(0).schemas.get(0).schema, nullValue());
assertThat(validator.catalogs.get(0).schemas.get(0).subject, equalTo("subject1"));
assertThat(validator.catalogs.get(0).schemas.get(0).version, equalTo("latest"));
assertThat(validator.catalogs.get(0).schemas.get(0).id, equalTo(0));
assertThat(validator.catalogs.get(0).schemas.get(1).schema, equalTo("cat"));
assertThat(validator.catalogs.get(0).schemas.get(1).strategy, nullValue());
assertThat(validator.catalogs.get(0).schemas.get(1).version, nullValue());
assertThat(validator.catalogs.get(0).schemas.get(1).strategy, equalTo("topic"));
assertThat(validator.catalogs.get(0).schemas.get(1).version, equalTo("latest"));
assertThat(validator.catalogs.get(0).schemas.get(1).id, equalTo(0));
assertThat(validator.catalogs.get(0).schemas.get(2).schema, nullValue());
assertThat(validator.catalogs.get(0).schemas.get(2).strategy, nullValue());
assertThat(validator.catalogs.get(0).schemas.get(2).version, nullValue());
assertThat(validator.catalogs.get(0).schemas.get(2).id, equalTo(42));
Expand All @@ -102,7 +99,7 @@ public void shouldWriteJsonValidator()
"\"version\":\"latest\"" +
"}," +
"{" +
"\"schema\":\"cat\"," +
"\"strategy\":\"topic\"," +
"\"version\":\"latest\"" +
"}," +
"{" +
Expand All @@ -119,7 +116,7 @@ public void shouldWriteJsonValidator()
.version("latest")
.build()
.schema()
.schema("cat")
.strategy("topic")
.version("latest")
.build()
.schema()
Expand Down
3 changes: 0 additions & 3 deletions runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/config/SchemaConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,17 @@

public class SchemaConfig
{
public final String schema;
public final String strategy;
public final String version;
public final String subject;
public final int id;

SchemaConfig(
String schema,
String strategy,
String subject,
String version,
int id)
{
this.schema = schema;
this.strategy = strategy;
this.version = version;
this.subject = subject;
Expand Down
10 changes: 0 additions & 10 deletions ...ime/engine/src/main/java/io/aklivity/zilla/runtime/engine/config/SchemaConfigAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@

public class SchemaConfigAdapter implements JsonbAdapter<SchemaConfig, JsonObject>
{
private static final String SCHEMA_NAME = "schema";
private static final String STRATEGY_NAME = "strategy";
private static final String SUBJECT_NAME = "subject";
private static final String VERSION_NAME = "version";
Expand All @@ -34,10 +33,6 @@ public JsonObject adaptToJson(
SchemaConfig schema)
{
JsonObjectBuilder object = Json.createObjectBuilder();
if (schema.schema != null)
{
object.add(SCHEMA_NAME, schema.schema);
}
if (schema.strategy != null)
{
object.add(STRATEGY_NAME, schema.strategy);
Expand All @@ -63,11 +58,6 @@ public SchemaConfig adaptFromJson(
{
SchemaConfigBuilder<SchemaConfig> builder = SchemaConfig.builder();

if (object.containsKey(SCHEMA_NAME))
{
builder.schema(object.getString(SCHEMA_NAME));
}

if (object.containsKey(STRATEGY_NAME))
{
builder.strategy(object.getString(STRATEGY_NAME));
Expand Down
10 changes: 1 addition & 9 deletions ...ime/engine/src/main/java/io/aklivity/zilla/runtime/engine/config/SchemaConfigBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ public class SchemaConfigBuilder<T> extends ConfigBuilder<T, SchemaConfigBuilder
{
private final Function<SchemaConfig, T> mapper;

private String schema;
private String strategy;
private String version;
private String subject;
Expand All @@ -40,13 +39,6 @@ protected Class<SchemaConfigBuilder<T>> thisType()
return (Class<SchemaConfigBuilder<T>>) getClass();
}

public SchemaConfigBuilder<T> schema(
String schema)
{
this.schema = schema;
return this;
}

public SchemaConfigBuilder<T> strategy(
String strategy)
{
Expand Down Expand Up @@ -78,6 +70,6 @@ public SchemaConfigBuilder<T> id(
@Override
public T build()
{
return mapper.apply(new SchemaConfig(schema, strategy, subject, version, id));
return mapper.apply(new SchemaConfig(strategy, subject, version, id));
}
}
2 changes: 0 additions & 2 deletions ...ime/engine/src/test/java/io/aklivity/zilla/runtime/engine/config/CatalogedConfigTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ public class CatalogedConfigTest
public void shouldWork()
{
SchemaConfig schema = SchemaConfig.builder()
.schema("schema")
.strategy("strategy")
.subject(null)
.version("version")
Expand All @@ -37,7 +36,6 @@ public void shouldWork()
CatalogedConfig cataloged = new CatalogedConfig("test", List.of(schema));

assertThat(cataloged.name, equalTo("test"));
assertThat(cataloged.schemas.get(0).schema, equalTo("schema"));
assertThat(cataloged.schemas.get(0).strategy, equalTo("strategy"));
assertThat(cataloged.schemas.get(0).version, equalTo("version"));
assertThat(cataloged.schemas.get(0).id, equalTo(42));
Expand Down