Move ref down closer to usage

gnawf · gnawf · commit 52e229ee0618 · 2023-06-07T11:32:36.000+12:00
diff --git a/src/main/java/graphql/normalized/ExecutableNormalizedField.java b/src/main/java/graphql/normalized/ExecutableNormalizedField.java
@@ -510,8 +510,6 @@ private void traverseImpl(ExecutableNormalizedField root,
      */
     @SuppressWarnings({"unchecked", "rawtypes"})
     private Set<GraphQLInterfaceType> getInterfacesCommonToAllOutputTypes(GraphQLSchema schema) {
-        Ref<Set<GraphQLInterfaceType>> ref = new Ref<>();
-
         // Shortcut for performance
         if (objectTypeNames.size() == 1) {
             var fieldDef = getOneFieldDefinition(schema);
@@ -528,6 +526,7 @@ private Set<GraphQLInterfaceType> getInterfacesCommonToAllOutputTypes(GraphQLSch
             }
         }
 
+        Ref<Set<GraphQLInterfaceType>> commonInterfaces = new Ref<>();
         forEachFieldDefinition(schema, (fieldDef) -> {
             var outputType = unwrapAll(fieldDef.getType());
 
@@ -548,14 +547,14 @@ private Set<GraphQLInterfaceType> getInterfacesCommonToAllOutputTypes(GraphQLSch
                 outputTypeInterfaces = Collections.emptyList();
             }
 
-            if (ref.value == null) {
-                ref.value = new LinkedHashSet<>(outputTypeInterfaces);
+            if (commonInterfaces.value == null) {
+                commonInterfaces.value = new LinkedHashSet<>(outputTypeInterfaces);
             } else {
-                ref.value.retainAll(outputTypeInterfaces);
+                commonInterfaces.value.retainAll(outputTypeInterfaces);
             }
         });
 
-        return ref.value;
+        return commonInterfaces.value;
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -510,8 +510,6 @@ private void traverseImpl(ExecutableNormalizedField root,`
`510`	`510`	`*/`
`511`	`511`	`@SuppressWarnings({"unchecked", "rawtypes"})`
`512`	`512`	`private Set<GraphQLInterfaceType> getInterfacesCommonToAllOutputTypes(GraphQLSchema schema) {`
`513`		`- Ref<Set<GraphQLInterfaceType>> ref = new Ref<>();`
`514`		`-`
`515`	`513`	`// Shortcut for performance`
`516`	`514`	`if (objectTypeNames.size() == 1) {`
`517`	`515`	`var fieldDef = getOneFieldDefinition(schema);`
`@@ -528,6 +526,7 @@ private Set<GraphQLInterfaceType> getInterfacesCommonToAllOutputTypes(GraphQLSch`
`528`	`526`	`}`
`529`	`527`	`}`
`530`	`528`
	`529`	`+ Ref<Set<GraphQLInterfaceType>> commonInterfaces = new Ref<>();`
`531`	`530`	`forEachFieldDefinition(schema, (fieldDef) -> {`
`532`	`531`	`var outputType = unwrapAll(fieldDef.getType());`
`533`	`532`
`@@ -548,14 +547,14 @@ private Set<GraphQLInterfaceType> getInterfacesCommonToAllOutputTypes(GraphQLSch`
`548`	`547`	`outputTypeInterfaces = Collections.emptyList();`
`549`	`548`	`}`
`550`	`549`
`551`		`- if (ref.value == null) {`
`552`		`- ref.value = new LinkedHashSet<>(outputTypeInterfaces);`
	`550`	`+ if (commonInterfaces.value == null) {`
	`551`	`+ commonInterfaces.value = new LinkedHashSet<>(outputTypeInterfaces);`
`553`	`552`	`} else {`
`554`		`- ref.value.retainAll(outputTypeInterfaces);`
	`553`	`+ commonInterfaces.value.retainAll(outputTypeInterfaces);`
`555`	`554`	`}`
`556`	`555`	`});`
`557`	`556`
`558`		`- return ref.value;`
	`557`	`+ return commonInterfaces.value;`
`559`	`558`	`}`
`560`	`559`
`561`	`560`	`/**`