Merge pull request #4149 from kilink/is-right-location-allocations

bbakerman · web-flow · commit 01b880b701b2 · 2025-10-24T12:22:59.000+11:00
Avoid List and String allocation in inRightLocation
diff --git a/src/main/java/graphql/schema/idl/SchemaTypeDirectivesChecker.java b/src/main/java/graphql/schema/idl/SchemaTypeDirectivesChecker.java
@@ -2,7 +2,6 @@
 
 import graphql.GraphQLError;
 import graphql.Internal;
-import graphql.collect.ImmutableKit;
 import graphql.introspection.Introspection.DirectiveLocation;
 import graphql.language.Argument;
 import graphql.language.Directive;
@@ -148,10 +147,13 @@ private void checkDirectives(DirectiveLocation expectedLocation, List<GraphQLErr
         });
     }
 
-    private boolean inRightLocation(DirectiveLocation expectedLocation, DirectiveDefinition directiveDefinition) {
-        List<String> names = ImmutableKit.map(directiveDefinition.getDirectiveLocations(),
-                it -> it.getName().toUpperCase());
-        return names.contains(expectedLocation.name().toUpperCase());
+    private static boolean inRightLocation(DirectiveLocation expectedLocation, DirectiveDefinition directiveDefinition) {
+        for (graphql.language.DirectiveLocation location : directiveDefinition.getDirectiveLocations()) {
+            if (location.getName().equalsIgnoreCase(expectedLocation.name())) {
+                return true;
+            }
+        }
+        return false;
     }
 
     private void checkDirectiveArguments(List<GraphQLError> errors, TypeDefinitionRegistry typeRegistry, Node<?> element, String elementName, Directive directive, DirectiveDefinition directiveDefinition) {
@@ -175,7 +177,7 @@ private void checkDirectiveArguments(List<GraphQLError> errors, TypeDefinitionRe
         });
     }
 
-    private boolean isNoNullArgWithoutDefaultValue(InputValueDefinition definitionArgument) {
+    private static boolean isNoNullArgWithoutDefaultValue(InputValueDefinition definitionArgument) {
         return definitionArgument.getType() instanceof NonNullType && definitionArgument.getDefaultValue() == null;
     }
 
@@ -192,7 +194,7 @@ private void commonCheck(Collection<DirectiveDefinition> directiveDefinitions, L
         });
     }
 
-    private void assertTypeName(NamedNode<?> node, List<GraphQLError> errors) {
+    private static void assertTypeName(NamedNode<?> node, List<GraphQLError> errors) {
         if (node.getName().length() >= 2 && node.getName().startsWith("__")) {
             errors.add((new IllegalNameError(node)));
         }
@@ -215,7 +217,7 @@ public void assertExistAndIsInputType(InputValueDefinition definition, List<Grap
         }
     }
 
-    private TypeDefinition<?> findTypeDefFromRegistry(String typeName, TypeDefinitionRegistry typeRegistry) {
+    private static TypeDefinition<?> findTypeDefFromRegistry(String typeName, TypeDefinitionRegistry typeRegistry) {
         TypeDefinition<?> typeDefinition = typeRegistry.getTypeOrNull(typeName);
         if (typeDefinition != null) {
             return typeDefinition;

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`
`3`	`3`	`import graphql.GraphQLError;`
`4`	`4`	`import graphql.Internal;`
`5`		`-import graphql.collect.ImmutableKit;`
`6`	`5`	`import graphql.introspection.Introspection.DirectiveLocation;`
`7`	`6`	`import graphql.language.Argument;`
`8`	`7`	`import graphql.language.Directive;`
`@@ -148,10 +147,13 @@ private void checkDirectives(DirectiveLocation expectedLocation, List<GraphQLErr`
`148`	`147`	`});`
`149`	`148`	`}`
`150`	`149`
`151`		`- private boolean inRightLocation(DirectiveLocation expectedLocation, DirectiveDefinition directiveDefinition) {`
`152`		`- List<String> names = ImmutableKit.map(directiveDefinition.getDirectiveLocations(),`
`153`		`- it -> it.getName().toUpperCase());`
`154`		`- return names.contains(expectedLocation.name().toUpperCase());`
	`150`	`+ private static boolean inRightLocation(DirectiveLocation expectedLocation, DirectiveDefinition directiveDefinition) {`
	`151`	`+ for (graphql.language.DirectiveLocation location : directiveDefinition.getDirectiveLocations()) {`
	`152`	`+ if (location.getName().equalsIgnoreCase(expectedLocation.name())) {`
	`153`	`+ return true;`
	`154`	`+ }`
	`155`	`+ }`
	`156`	`+ return false;`
`155`	`157`	`}`
`156`	`158`
`157`	`159`	`private void checkDirectiveArguments(List<GraphQLError> errors, TypeDefinitionRegistry typeRegistry, Node<?> element, String elementName, Directive directive, DirectiveDefinition directiveDefinition) {`
`@@ -175,7 +177,7 @@ private void checkDirectiveArguments(List<GraphQLError> errors, TypeDefinitionRe`
`175`	`177`	`});`
`176`	`178`	`}`
`177`	`179`
`178`		`- private boolean isNoNullArgWithoutDefaultValue(InputValueDefinition definitionArgument) {`
	`180`	`+ private static boolean isNoNullArgWithoutDefaultValue(InputValueDefinition definitionArgument) {`
`179`	`181`	`return definitionArgument.getType() instanceof NonNullType && definitionArgument.getDefaultValue() == null;`
`180`	`182`	`}`
`181`	`183`
`@@ -192,7 +194,7 @@ private void commonCheck(Collection<DirectiveDefinition> directiveDefinitions, L`
`192`	`194`	`});`
`193`	`195`	`}`
`194`	`196`
`195`		`- private void assertTypeName(NamedNode<?> node, List<GraphQLError> errors) {`
	`197`	`+ private static void assertTypeName(NamedNode<?> node, List<GraphQLError> errors) {`
`196`	`198`	`if (node.getName().length() >= 2 && node.getName().startsWith("__")) {`
`197`	`199`	`errors.add((new IllegalNameError(node)));`
`198`	`200`	`}`
`@@ -215,7 +217,7 @@ public void assertExistAndIsInputType(InputValueDefinition definition, List<Grap`
`215`	`217`	`}`
`216`	`218`	`}`
`217`	`219`
`218`		`- private TypeDefinition<?> findTypeDefFromRegistry(String typeName, TypeDefinitionRegistry typeRegistry) {`
	`220`	`+ private static TypeDefinition<?> findTypeDefFromRegistry(String typeName, TypeDefinitionRegistry typeRegistry) {`
`219`	`221`	`TypeDefinition<?> typeDefinition = typeRegistry.getTypeOrNull(typeName);`
`220`	`222`	`if (typeDefinition != null) {`
`221`	`223`	`return typeDefinition;`