Tweaks to Netflix interning PR - naming etc..

bbakerman · bbakerman · commit cc067be48bbc · 2024-03-05T20:44:00.000+11:00
diff --git a/src/main/java/graphql/language/Field.java b/src/main/java/graphql/language/Field.java
@@ -6,7 +6,7 @@
 import graphql.Internal;
 import graphql.PublicApi;
 import graphql.collect.ImmutableKit;
-import graphql.util.FieldNameInterner;
+import graphql.util.Interning;
 import graphql.util.TraversalControl;
 import graphql.util.TraverserContext;
 
@@ -51,8 +51,8 @@ protected Field(String name,
                     IgnoredChars ignoredChars,
                     Map<String, String> additionalData) {
         super(sourceLocation, comments, ignoredChars, additionalData);
-        this.name = name == null ? null : FieldNameInterner.intern(name);
-        this.alias = alias == null ? null : FieldNameInterner.intern(alias);
+        this.name = name == null ? null : Interning.intern(name);
+        this.alias = alias;
         this.arguments = ImmutableList.copyOf(arguments);
         this.directives = ImmutableList.copyOf(directives);
         this.selectionSet = selectionSet;
diff --git a/src/main/java/graphql/schema/GraphQLFieldDefinition.java b/src/main/java/graphql/schema/GraphQLFieldDefinition.java
@@ -6,7 +6,7 @@
 import graphql.Internal;
 import graphql.PublicApi;
 import graphql.language.FieldDefinition;
-import graphql.util.FieldNameInterner;
+import graphql.util.Interning;
 import graphql.util.TraversalControl;
 import graphql.util.TraverserContext;
 
@@ -62,7 +62,7 @@ private GraphQLFieldDefinition(String name,
         assertValidName(name);
         assertNotNull(type, () -> "type can't be null");
         assertNotNull(arguments, () -> "arguments can't be null");
-        this.name = FieldNameInterner.intern(name);
+        this.name = Interning.intern(name);
         this.description = description;
         this.originalType = type;
         this.dataFetcherFactory = dataFetcherFactory;
diff --git a/src/main/java/graphql/util/FieldNameInterner.java b/src/main/java/graphql/util/FieldNameInterner.java
diff --git a/src/main/java/graphql/util/Interning.java b/src/main/java/graphql/util/Interning.java
@@ -0,0 +1,25 @@
+package graphql.util;
+
+import com.google.common.collect.Interner;
+import com.google.common.collect.Interners;
+import graphql.Internal;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Interner allowing object-identity comparison of key entities like field names.  This is useful on hotspot
+ * areas like the engine where we look up field names a lot inside maps, and those maps use object identity first
+ * inside the key lookup code.
+ */
+@Internal
+public class Interning {
+
+    private Interning() {
+    }
+
+    private static final Interner<String> INTERNER = Interners.newWeakInterner();
+
+    public static @NotNull String intern(@NotNull String name) {
+        return INTERNER.intern(name);
+    }
+
+}
