Merge pull request #3518 from gnawf/empty-directives-holder

bbakerman · web-flow · commit 0bc2fd5481f3 · 2024-03-11T10:29:05.000Z
Return empty singleton DirectivesHolder if directives are empty
diff --git a/src/main/java/graphql/DirectivesUtil.java b/src/main/java/graphql/DirectivesUtil.java
@@ -9,6 +9,7 @@
 import graphql.util.FpKit;
 
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -91,7 +92,6 @@ public static GraphQLDirective getFirstDirective(String name, Map<String, List<G
      * directives collection takes precedence.
      *
      * @param directiveContainer the schema element holding applied directives
-     *
      * @return a combined list unique by name
      */
     public static List<GraphQLAppliedDirective> toAppliedDirectives(GraphQLDirectiveContainer directiveContainer) {
@@ -104,7 +104,6 @@ public static List<GraphQLAppliedDirective> toAppliedDirectives(GraphQLDirective
      *
      * @param appliedDirectives the applied directives to use
      * @param directives        the legacy directives to use
-     *
      * @return a combined list unique by name
      */
     public static List<GraphQLAppliedDirective> toAppliedDirectives(Collection<GraphQLAppliedDirective> appliedDirectives, Collection<GraphQLDirective> directives) {
@@ -127,6 +126,7 @@ public static List<GraphQLAppliedDirective> toAppliedDirectives(Collection<Graph
      * A holder class that breaks a list of directives into maps to be more easily accessible in using classes
      */
     public static class DirectivesHolder {
+        private static final DirectivesHolder EMPTY_HOLDER = new DirectivesHolder(Collections.emptyList(), Collections.emptyList());
 
         private final ImmutableMap<String, List<GraphQLDirective>> allDirectivesByName;
         private final ImmutableMap<String, GraphQLDirective> nonRepeatableDirectivesByName;
@@ -145,7 +145,14 @@ public DirectivesHolder(Collection<GraphQLDirective> allDirectives, Collection<G
 
             this.allAppliedDirectives = ImmutableList.copyOf(allAppliedDirectives);
             this.allAppliedDirectivesByName = ImmutableMap.copyOf(FpKit.groupingBy(allAppliedDirectives, GraphQLAppliedDirective::getName));
+        }
+
+        public static DirectivesHolder create(List<GraphQLDirective> directives, List<GraphQLAppliedDirective> appliedDirectives) {
+            if (directives.isEmpty() && appliedDirectives.isEmpty()) {
+                return EMPTY_HOLDER;
+            }
 
+            return new DirectivesHolder(directives, appliedDirectives);
         }
 
         public ImmutableMap<String, List<GraphQLDirective>> getAllDirectivesByName() {
diff --git a/src/main/java/graphql/schema/GraphQLArgument.java b/src/main/java/graphql/schema/GraphQLArgument.java
@@ -82,7 +82,7 @@ private GraphQLArgument(String name,
         this.value = value;
         this.definition = definition;
         this.deprecationReason = deprecationReason;
-        this.directivesHolder = new DirectivesUtil.DirectivesHolder(directives, appliedDirectives);
+        this.directivesHolder = DirectivesUtil.DirectivesHolder.create(directives, appliedDirectives);
     }
 
 
diff --git a/src/main/java/graphql/schema/GraphQLEnumType.java b/src/main/java/graphql/schema/GraphQLEnumType.java
@@ -66,7 +66,7 @@ private GraphQLEnumType(String name,
         this.description = description;
         this.definition = definition;
         this.extensionDefinitions = ImmutableList.copyOf(extensionDefinitions);
-        this.directivesHolder = new DirectivesUtil.DirectivesHolder(directives, appliedDirectives);
+        this.directivesHolder = DirectivesUtil.DirectivesHolder.create(directives, appliedDirectives);
         this.valueDefinitionMap = buildMap(values);
     }
 
diff --git a/src/main/java/graphql/schema/GraphQLEnumValueDefinition.java b/src/main/java/graphql/schema/GraphQLEnumValueDefinition.java
@@ -48,7 +48,7 @@ private GraphQLEnumValueDefinition(String name,
         this.description = description;
         this.value = value;
         this.deprecationReason = deprecationReason;
-        this.directivesHolder = new DirectivesUtil.DirectivesHolder(directives, appliedDirectives);
+        this.directivesHolder = DirectivesUtil.DirectivesHolder.create(directives, appliedDirectives);
         this.definition = definition;
     }
 
diff --git a/src/main/java/graphql/schema/GraphQLFieldDefinition.java b/src/main/java/graphql/schema/GraphQLFieldDefinition.java
@@ -66,7 +66,7 @@ private GraphQLFieldDefinition(String name,
         this.originalType = type;
         this.dataFetcherFactory = dataFetcherFactory;
         this.arguments = ImmutableList.copyOf(arguments);
-        this.directivesHolder = new DirectivesUtil.DirectivesHolder(directives, appliedDirectives);
+        this.directivesHolder = DirectivesUtil.DirectivesHolder.create(directives, appliedDirectives);
         this.deprecationReason = deprecationReason;
         this.definition = definition;
     }
diff --git a/src/main/java/graphql/schema/GraphQLInputObjectField.java b/src/main/java/graphql/schema/GraphQLInputObjectField.java
@@ -62,7 +62,7 @@ private GraphQLInputObjectField(
         this.originalType = type;
         this.defaultValue = defaultValue;
         this.description = description;
-        this.directivesHolder = new DirectivesUtil.DirectivesHolder(directives, appliedDirectives);
+        this.directivesHolder = DirectivesUtil.DirectivesHolder.create(directives, appliedDirectives);
         this.definition = definition;
         this.deprecationReason = deprecationReason;
     }
diff --git a/src/main/java/graphql/schema/GraphQLInputObjectType.java b/src/main/java/graphql/schema/GraphQLInputObjectType.java
@@ -61,7 +61,7 @@ private GraphQLInputObjectType(String name,
         this.description = description;
         this.definition = definition;
         this.extensionDefinitions = ImmutableList.copyOf(extensionDefinitions);
-        this.directives = new DirectivesUtil.DirectivesHolder(directives, appliedDirectives);
+        this.directives = DirectivesUtil.DirectivesHolder.create(directives, appliedDirectives);
         this.fieldMap = buildDefinitionMap(fields);
         this.isOneOf = hasOneOf(directives, appliedDirectives);
     }
diff --git a/src/main/java/graphql/schema/GraphQLInterfaceType.java b/src/main/java/graphql/schema/GraphQLInterfaceType.java
@@ -77,7 +77,7 @@ private GraphQLInterfaceType(String name,
         this.interfaceComparator = interfaceComparator;
         this.originalInterfaces = ImmutableList.copyOf(sortTypes(interfaceComparator, interfaces));
         this.extensionDefinitions = ImmutableList.copyOf(extensionDefinitions);
-        this.directivesHolder = new DirectivesUtil.DirectivesHolder(directives, appliedDirectives);
+        this.directivesHolder = DirectivesUtil.DirectivesHolder.create(directives, appliedDirectives);
         this.fieldDefinitionsByName = buildDefinitionMap(fieldDefinitions);
     }
 
diff --git a/src/main/java/graphql/schema/GraphQLObjectType.java b/src/main/java/graphql/schema/GraphQLObjectType.java
@@ -74,7 +74,7 @@ private GraphQLObjectType(String name,
         this.originalInterfaces = ImmutableList.copyOf(sortTypes(interfaceComparator, interfaces));
         this.definition = definition;
         this.extensionDefinitions = ImmutableList.copyOf(extensionDefinitions);
-        this.directivesHolder = new DirectivesUtil.DirectivesHolder(directives, appliedDirectives);
+        this.directivesHolder = DirectivesUtil.DirectivesHolder.create(directives, appliedDirectives);
         this.fieldDefinitionsByName = buildDefinitionMap(fieldDefinitions);
     }
 
diff --git a/src/main/java/graphql/schema/GraphQLScalarType.java b/src/main/java/graphql/schema/GraphQLScalarType.java
@@ -64,7 +64,7 @@ private GraphQLScalarType(String name,
         this.description = description;
         this.coercing = coercing;
         this.definition = definition;
-        this.directivesHolder = new DirectivesUtil.DirectivesHolder(directives, appliedDirectives);
+        this.directivesHolder = DirectivesUtil.DirectivesHolder.create(directives, appliedDirectives);
         this.extensionDefinitions = ImmutableList.copyOf(extensionDefinitions);
         this.specifiedByUrl = specifiedByUrl;
     }
diff --git a/src/main/java/graphql/schema/GraphQLUnionType.java b/src/main/java/graphql/schema/GraphQLUnionType.java
@@ -69,7 +69,7 @@ private GraphQLUnionType(String name,
         this.typeResolver = typeResolver;
         this.definition = definition;
         this.extensionDefinitions = ImmutableList.copyOf(extensionDefinitions);
-        this.directives = new DirectivesUtil.DirectivesHolder(directives, appliedDirectives);
+        this.directives = DirectivesUtil.DirectivesHolder.create(directives, appliedDirectives);
     }
 
     void replaceTypes(List<GraphQLNamedOutputType> types) {

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ private GraphQLArgument(String name,`
`82`	`82`	`this.value = value;`
`83`	`83`	`this.definition = definition;`
`84`	`84`	`this.deprecationReason = deprecationReason;`
`85`		`- this.directivesHolder = new DirectivesUtil.DirectivesHolder(directives, appliedDirectives);`
	`85`	`+ this.directivesHolder = DirectivesUtil.DirectivesHolder.create(directives, appliedDirectives);`
`86`	`86`	`}`
`87`	`87`
`88`	`88`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ private GraphQLEnumType(String name,`
`66`	`66`	`this.description = description;`
`67`	`67`	`this.definition = definition;`
`68`	`68`	`this.extensionDefinitions = ImmutableList.copyOf(extensionDefinitions);`
`69`		`- this.directivesHolder = new DirectivesUtil.DirectivesHolder(directives, appliedDirectives);`
	`69`	`+ this.directivesHolder = DirectivesUtil.DirectivesHolder.create(directives, appliedDirectives);`
`70`	`70`	`this.valueDefinitionMap = buildMap(values);`
`71`	`71`	`}`
`72`	`72`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ private GraphQLEnumValueDefinition(String name,`
`48`	`48`	`this.description = description;`
`49`	`49`	`this.value = value;`
`50`	`50`	`this.deprecationReason = deprecationReason;`
`51`		`- this.directivesHolder = new DirectivesUtil.DirectivesHolder(directives, appliedDirectives);`
	`51`	`+ this.directivesHolder = DirectivesUtil.DirectivesHolder.create(directives, appliedDirectives);`
`52`	`52`	`this.definition = definition;`
`53`	`53`	`}`
`54`	`54`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ private GraphQLFieldDefinition(String name,`
`66`	`66`	`this.originalType = type;`
`67`	`67`	`this.dataFetcherFactory = dataFetcherFactory;`
`68`	`68`	`this.arguments = ImmutableList.copyOf(arguments);`
`69`		`- this.directivesHolder = new DirectivesUtil.DirectivesHolder(directives, appliedDirectives);`
	`69`	`+ this.directivesHolder = DirectivesUtil.DirectivesHolder.create(directives, appliedDirectives);`
`70`	`70`	`this.deprecationReason = deprecationReason;`
`71`	`71`	`this.definition = definition;`
`72`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ private GraphQLInputObjectField(`
`62`	`62`	`this.originalType = type;`
`63`	`63`	`this.defaultValue = defaultValue;`
`64`	`64`	`this.description = description;`
`65`		`- this.directivesHolder = new DirectivesUtil.DirectivesHolder(directives, appliedDirectives);`
	`65`	`+ this.directivesHolder = DirectivesUtil.DirectivesHolder.create(directives, appliedDirectives);`
`66`	`66`	`this.definition = definition;`
`67`	`67`	`this.deprecationReason = deprecationReason;`
`68`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ private GraphQLInputObjectType(String name,`
`61`	`61`	`this.description = description;`
`62`	`62`	`this.definition = definition;`
`63`	`63`	`this.extensionDefinitions = ImmutableList.copyOf(extensionDefinitions);`
`64`		`- this.directives = new DirectivesUtil.DirectivesHolder(directives, appliedDirectives);`
	`64`	`+ this.directives = DirectivesUtil.DirectivesHolder.create(directives, appliedDirectives);`
`65`	`65`	`this.fieldMap = buildDefinitionMap(fields);`
`66`	`66`	`this.isOneOf = hasOneOf(directives, appliedDirectives);`
`67`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ private GraphQLInterfaceType(String name,`
`77`	`77`	`this.interfaceComparator = interfaceComparator;`
`78`	`78`	`this.originalInterfaces = ImmutableList.copyOf(sortTypes(interfaceComparator, interfaces));`
`79`	`79`	`this.extensionDefinitions = ImmutableList.copyOf(extensionDefinitions);`
`80`		`- this.directivesHolder = new DirectivesUtil.DirectivesHolder(directives, appliedDirectives);`
	`80`	`+ this.directivesHolder = DirectivesUtil.DirectivesHolder.create(directives, appliedDirectives);`
`81`	`81`	`this.fieldDefinitionsByName = buildDefinitionMap(fieldDefinitions);`
`82`	`82`	`}`
`83`	`83`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ private GraphQLObjectType(String name,`
`74`	`74`	`this.originalInterfaces = ImmutableList.copyOf(sortTypes(interfaceComparator, interfaces));`
`75`	`75`	`this.definition = definition;`
`76`	`76`	`this.extensionDefinitions = ImmutableList.copyOf(extensionDefinitions);`
`77`		`- this.directivesHolder = new DirectivesUtil.DirectivesHolder(directives, appliedDirectives);`
	`77`	`+ this.directivesHolder = DirectivesUtil.DirectivesHolder.create(directives, appliedDirectives);`
`78`	`78`	`this.fieldDefinitionsByName = buildDefinitionMap(fieldDefinitions);`
`79`	`79`	`}`
`80`	`80`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ private GraphQLScalarType(String name,`
`64`	`64`	`this.description = description;`
`65`	`65`	`this.coercing = coercing;`
`66`	`66`	`this.definition = definition;`
`67`		`- this.directivesHolder = new DirectivesUtil.DirectivesHolder(directives, appliedDirectives);`
	`67`	`+ this.directivesHolder = DirectivesUtil.DirectivesHolder.create(directives, appliedDirectives);`
`68`	`68`	`this.extensionDefinitions = ImmutableList.copyOf(extensionDefinitions);`
`69`	`69`	`this.specifiedByUrl = specifiedByUrl;`
`70`	`70`	`}`