Skip to content

Support for custom validation error #2528

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

Merged
bbakerman merged 6 commits into from
Oct 4, 2021
Merged

Support for custom validation error #2528

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
db5c9e9
Merge pull request #43 from graphql-java/master
dugenkui03 Apr 22, 2021
98917ee
Merge branch 'graphql-java:master' into master
dugenkui03 Jul 10, 2021
b772a0d
Merge branch 'graphql-java:master' into master
dugenkui03 Aug 2, 2021
39d087e
Merge branch 'graphql-java:master' into master
dugenkui03 Aug 30, 2021
f7b302a
support for custom validation error type
dugenkui03 Aug 30, 2021
1cf9a90
rename ValidationErrorTypeInterface to ValidationErrorClassification
dugenkui03 Oct 2, 2021
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
14 changes: 7 additions & 7 deletions src/main/java/graphql/validation/ValidationError.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@ public class ValidationError implements GraphQLError {
private final String message;
private final List<SourceLocation> locations = new ArrayList<>();
private final String description;
private final ValidationErrorType validationErrorType;
private final ValidationErrorClassification validationErrorType;
private final List<String> queryPath;
private final Map<String, Object> extensions;

public ValidationError(ValidationErrorType validationErrorType) {
public ValidationError(ValidationErrorClassification validationErrorType) {
this(newValidationError()
.validationErrorType(validationErrorType));
}

public ValidationError(ValidationErrorType validationErrorType, SourceLocation sourceLocation, String description) {
public ValidationError(ValidationErrorClassification validationErrorType, SourceLocation sourceLocation, String description) {
this(newValidationError()
.validationErrorType(validationErrorType)
.sourceLocation(sourceLocation)
Expand Down Expand Up @@ -68,7 +68,7 @@ private ValidationError(Builder builder) {
this.extensions = builder.extensions;
}

private String mkMessage(ValidationErrorType validationErrorType, String description, List<String> queryPath) {
private String mkMessage(ValidationErrorClassification validationErrorType, String description, List<String> queryPath) {
return String.format("Validation error of type %s: %s%s", validationErrorType, description, toPath(queryPath));
}

Expand All @@ -79,7 +79,7 @@ private String toPath(List<String> queryPath) {
return String.format(" @ '%s'", String.join("/", queryPath));
}

public ValidationErrorType getValidationErrorType() {
public ValidationErrorClassification getValidationErrorType() {
return validationErrorType;
}

Expand Down Expand Up @@ -142,11 +142,11 @@ public static class Builder {
private List<SourceLocation> sourceLocations;
private Map<String, Object> extensions;
private String description;
private ValidationErrorType validationErrorType;
private ValidationErrorClassification validationErrorType;
private List<String> queryPath;


public Builder validationErrorType(ValidationErrorType validationErrorType) {
public Builder validationErrorType(ValidationErrorClassification validationErrorType) {
this.validationErrorType = validationErrorType;
return this;
}
Expand Down
8 changes: 8 additions & 0 deletions src/main/java/graphql/validation/ValidationErrorClassification.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package graphql.validation;


import graphql.PublicApi;

@PublicApi
public interface ValidationErrorClassification {
}
5 changes: 4 additions & 1 deletion src/main/java/graphql/validation/ValidationErrorType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
package graphql.validation;


public enum ValidationErrorType {
import graphql.PublicApi;

@PublicApi
public enum ValidationErrorType implements ValidationErrorClassification {

DefaultForNonNullArgument,
WrongType,
Expand Down