-
Notifications
You must be signed in to change notification settings - Fork 58
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.
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
Fix silent failure when ingesting an Asset with an unrecognized field #481
Merged
Merged
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
6b9a5db
first commit some small stuff i think
jphui 6198e5c
Merge branch 'master' into jhui/silentFail
jphui 5355817
don't spread out validation stuff
jphui 6eb212d
Nice the validation works
jphui 12a9327
checkstyle
jphui 4e0951e
address comments
jphui File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,6 +6,12 @@ | |
import com.linkedin.data.schema.DataSchema; | ||
import com.linkedin.data.schema.RecordDataSchema; | ||
import com.linkedin.data.schema.UnionDataSchema; | ||
import com.linkedin.data.schema.validation.CoercionMode; | ||
import com.linkedin.data.schema.validation.RequiredMode; | ||
import com.linkedin.data.schema.validation.UnrecognizedFieldMode; | ||
import com.linkedin.data.schema.validation.ValidateDataAgainstSchema; | ||
import com.linkedin.data.schema.validation.ValidationOptions; | ||
import com.linkedin.data.schema.validation.ValidationResult; | ||
import com.linkedin.data.template.RecordTemplate; | ||
import com.linkedin.data.template.UnionTemplate; | ||
import com.linkedin.metadata.aspect.SoftDeletedAspect; | ||
|
@@ -209,4 +215,23 @@ private static DataSchema.Type getFieldOrArrayItemType(@Nonnull RecordDataSchema | |
public static void throwNullFieldException(String field) { | ||
throw new NullFieldException(String.format("The '%s' field cannot be null.", field)); | ||
} | ||
|
||
/** | ||
* Validates a model against its schema, useful for checking to make sure that a (curli) ingestion request's | ||
* fields are all valid fields of the model. | ||
* | ||
* <p>This is copied from BaseLocalDAO, which uses this for Aspect-level ingestion validation. This is meant for | ||
* Asset-level validation.</p> | ||
* | ||
* <p>Reference ticket: META-21242</p> | ||
*/ | ||
public static void validateAgainstSchema(@Nonnull RecordTemplate model) { | ||
ValidationResult result = ValidateDataAgainstSchema.validate(model, | ||
new ValidationOptions(RequiredMode.CAN_BE_ABSENT_IF_HAS_DEFAULT, CoercionMode.NORMAL, | ||
UnrecognizedFieldMode.DISALLOW)); | ||
if (!result.isValid()) { | ||
invalidSchema(result.getMessages().toString()); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. using |
||
} | ||
} | ||
|
||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
can ValidationOptions be a constant? or it has to be instantiated every time?