Skip to content

fix(FieldBuilders): validate schema is not null in build() #605

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

Open
mliem2k wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(FieldBuilders): validate schema is not null in build() #605

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
3 changes: 3 additions & 0 deletions ...-impl-110/src/main/java/com/linkedin/avroutil1/compatibility/avro110/FieldBuilder110.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,9 @@ public FieldBuilder copyFromField() {

@Override
public Schema.Field build() {
if (_schema == null) {
throw new IllegalStateException("schema not set");
}
Object avroFriendlyDefault;
try {
avroFriendlyDefault = avroFriendlyDefaultValue(_defaultVal);
Expand Down
3 changes: 3 additions & 0 deletions ...-impl-111/src/main/java/com/linkedin/avroutil1/compatibility/avro111/FieldBuilder111.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,9 @@ public FieldBuilder copyFromField() {

@Override
public Schema.Field build() {
if (_schema == null) {
throw new IllegalStateException("schema not set");
}
Object avroFriendlyDefault;
try {
avroFriendlyDefault = avroFriendlyDefaultValue(_defaultVal);
Expand Down
3 changes: 3 additions & 0 deletions ...per-impl-14/src/main/java/com/linkedin/avroutil1/compatibility/avro14/FieldBuilder14.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,9 @@ public FieldBuilder copyFromField() {

@Override
public Schema.Field build() {
if (_schema == null) {
throw new IllegalStateException("schema not set");
}
Schema.Field result = new Schema.Field(_name, _schema, _doc, _defaultVal, _order);
if (_props != null && !_props.isEmpty()) {
Map<String, String> clonedProps = getProps(result);
Expand Down
3 changes: 3 additions & 0 deletions ...per-impl-15/src/main/java/com/linkedin/avroutil1/compatibility/avro15/FieldBuilder15.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,9 @@ public FieldBuilder copyFromField() {

@Override
public Schema.Field build() {
if (_schema == null) {
throw new IllegalStateException("schema not set");
}
Schema.Field result = new Schema.Field(_name, _schema, _doc, _defaultVal, _order);
if (_props != null && !_props.isEmpty()) {
Map<String, String> clonedProps = getProps(result);
Expand Down
3 changes: 3 additions & 0 deletions ...per-impl-16/src/main/java/com/linkedin/avroutil1/compatibility/avro16/FieldBuilder16.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,9 @@ public FieldBuilder copyFromField() {

@Override
public Schema.Field build() {
if (_schema == null) {
throw new IllegalStateException("schema not set");
}
Schema.Field result = new Schema.Field(_name, _schema, _doc, _defaultVal, _order);
if (_props != null) {
for (Map.Entry<String, String> entry : _props.entrySet()) {
Expand Down
3 changes: 3 additions & 0 deletions ...per-impl-17/src/main/java/com/linkedin/avroutil1/compatibility/avro17/FieldBuilder17.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,9 @@ public FieldBuilder copyFromField() {

@Override
public Schema.Field build() {
if (_schema == null) {
throw new IllegalStateException("schema not set");
}
Schema.Field result = new Schema.Field(_name, _schema, _doc, _defaultVal, _order);
if (_props != null) {
Avro17Utils.setProps(result, _props);
Expand Down
3 changes: 3 additions & 0 deletions ...per-impl-18/src/main/java/com/linkedin/avroutil1/compatibility/avro18/FieldBuilder18.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,9 @@ public FieldBuilder copyFromField() {

@Override
public Schema.Field build() {
if (_schema == null) {
throw new IllegalStateException("schema not set");
}
@SuppressWarnings("deprecation") //deprecated but faster
Schema.Field result = new Schema.Field(_name, _schema, _doc, _defaultVal, _order);
if (_props != null) {
Expand Down
3 changes: 3 additions & 0 deletions ...per-impl-19/src/main/java/com/linkedin/avroutil1/compatibility/avro19/FieldBuilder19.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,9 @@ public FieldBuilder copyFromField() {

@Override
public Schema.Field build() {
if (_schema == null) {
throw new IllegalStateException("schema not set");
}
Object avroFriendlyDefault;
try {
avroFriendlyDefault = avroFriendlyDefaultValue(_defaultVal);
Expand Down
10 changes: 10 additions & 0 deletions ...er-tests-allavro/src/test/java/com/linkedin/avroutil1/compatibility/FieldBuilderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,16 @@ public void testNewFieldSortOrder() throws Exception {
}
}

@Test
public void testBuildFailsOnNullSchema() throws Exception {
try {
AvroCompatibilityHelper.newField(null).setName("noSchema").build();
Assert.fail("expected an exception");
} catch (IllegalStateException expected) {
// pass - schema is required for a field to be built
}
}

private void setDefaultValues(Schema.Field field) {
Assert.assertTrue(AvroCompatibilityHelper.fieldHasDefault(field));
Schema fieldSchema = field.schema();
Expand Down