Skip to content

Fix argument / format string mismatches #2779

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 1 commit into from
Apr 3, 2022
Merged

Fix argument / format string mismatches #2779

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
4 changes: 2 additions & 2 deletions src/main/java/graphql/schema/idl/errors/NonSDLDefinitionError.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
public class NonSDLDefinitionError extends BaseError {

public NonSDLDefinitionError(Definition definition) {
super(definition, format("The schema definition text contains a non schema definition language (SDL) element '%s'",
definition.getClass().getSimpleName(), lineCol(definition), lineCol(definition)));
super(definition, format("%s The schema definition text contains a non schema definition language (SDL) element '%s'",
lineCol(definition), definition.getClass().getSimpleName()));
}
}
4 changes: 2 additions & 2 deletions src/main/java/graphql/util/Anonymizer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -702,7 +702,7 @@ private static List<GraphQLArgument> getMatchingArgumentDefinitions(
Set<GraphQLFieldDefinition> fieldDefinitions) {
List<GraphQLArgument> result = new ArrayList<>();
for (GraphQLFieldDefinition fieldDefinition : fieldDefinitions) {
Optional.ofNullable(fieldDefinition.getArgument(name)).map(result::add);
Optional.ofNullable(fieldDefinition.getArgument(name)).ifPresent(result::add);
}
return result;
}
Expand Down Expand Up @@ -738,7 +738,7 @@ public void visitField(QueryVisitorFieldEnvironment env) {

for (Argument argument : directive.getArguments()) {
GraphQLArgument argumentDefinition = directiveDefinition.getArgument(argument.getName());
String newArgumentName = assertNotNull(newNames.get(argumentDefinition), () -> format("%s no new name found for directive argument %s %s", directiveName, argument.getName()));
String newArgumentName = assertNotNull(newNames.get(argumentDefinition), () -> format("No new name found for directive %s argument %s", directiveName, argument.getName()));
astNodeToNewName.put(argument, newArgumentName);
visitDirectiveArgumentValues(directive, argument.getValue());
}
Expand Down