Skip to content

fix: treat empty operation name the same as null #4211

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
RafeArnold wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −3
Open

fix: treat empty operation name the same as null #4211

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
5 changes: 3 additions & 2 deletions src/main/java/graphql/language/NodeUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,13 @@ public static GetOperationResult getOperation(Document document, String operatio
fragmentsByName.put(fragmentDefinition.getName(), fragmentDefinition);
}
}
if (operationName == null && operationsByName.size() > 1) {
boolean operationNameProvided = operationName != null && !operationName.isEmpty();
if (!operationNameProvided && operationsByName.size() > 1) {
throw new UnknownOperationException("Must provide operation name if query contains multiple operations.");
}
OperationDefinition operation;

if (operationName == null || operationName.isEmpty()) {
if (!operationNameProvided) {
operation = operationsByName.values().iterator().next();
} else {
operation = operationsByName.get(operationName);
Expand Down
5 changes: 4 additions & 1 deletion src/test/groovy/graphql/language/NodeUtilTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,14 @@ class NodeUtilTest extends Specification {
''')

when:
NodeUtil.getOperation(doc, null)
NodeUtil.getOperation(doc, operationName)

then:
def ex = thrown(UnknownOperationException)
ex.message == "Must provide operation name if query contains multiple operations."

where:
operationName << [null, '']
}

def "getOperation: when multiple operations are defined in the query and operation name doesn't match any of the query operations then it should throw UnknownOperationException"() {
Expand Down