From d5515fbde2caf1069a781cf6642403364b9275cf Mon Sep 17 00:00:00 2001
From: "arash.shokoufandeh" <arash.shokoufandeh@nfl.com>
Date: Mon, 25 Sep 2017 18:34:15 -0700
Subject: [PATCH 1/3] adding a registry to connection creation to allow for
 reusable connections as long as the underlying GraphQL types is equals

---
 gradle.properties                             |  2 +-
 .../relay/type/PagingOutputTypeConverter.java | 24 +++++++-
 .../com/nfl/glitr/data/query/QueryType.java   |  5 ++
 .../data/query/additionalTypes/Cyborg.java    | 60 ++++++++++---------
 .../glitr/data/query/additionalTypes/Man.java | 60 ++++++++++---------
 .../data/query/additionalTypes/Person.java    |  5 +-
 .../data/query/additionalTypes/QueryRoot.java |  6 +-
 .../TypeRegistryIntegrationTest.groovy        | 50 ++++++++++------
 8 files changed, 127 insertions(+), 85 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 29b8dac..57f7dc8 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -5,6 +5,6 @@ maven.central.sync=false
 sonatype.username=DUMMY_SONATYPE_USER
 sonatype.password=DUMMY_SONATYPE_PASSWORD
 
-PROJECT_VERSION=1.1.6
+PROJECT_VERSION=1.2.1
 PROJECT_GITHUB_REPO_URL=https://github.com/nfl/glitr
 PROJECT_LICENSE_URL=https://github.com/nfl/glitr/blob/master/LICENSE
\ No newline at end of file
diff --git a/src/main/java/com/nfl/glitr/relay/type/PagingOutputTypeConverter.java b/src/main/java/com/nfl/glitr/relay/type/PagingOutputTypeConverter.java
index 83ba626..58060d8 100644
--- a/src/main/java/com/nfl/glitr/relay/type/PagingOutputTypeConverter.java
+++ b/src/main/java/com/nfl/glitr/relay/type/PagingOutputTypeConverter.java
@@ -2,6 +2,7 @@
 
 import com.google.common.collect.Lists;
 import com.googlecode.gentyref.GenericTypeReflector;
+import com.nfl.glitr.exception.GlitrException;
 import com.nfl.glitr.relay.RelayHelper;
 import com.nfl.glitr.util.ReflectionUtil;
 import com.nfl.glitr.annotation.GlitrForwardPagingArguments;
@@ -19,6 +20,8 @@
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.util.Collections;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 /**
  *  Output type converter function for paging arguments annotations.
@@ -28,6 +31,8 @@ public class PagingOutputTypeConverter implements Func4<Field, Method, Class, An
     private RelayHelper relayHelper;
     private TypeRegistry typeRegistry;
 
+    private final Map<String, GraphQLObjectType> connectionRegistry = new ConcurrentHashMap<>();
+
 
     @Override
     public GraphQLOutputType call(@Nullable Field field, Method method, Class declaringClass, Annotation annotation) {
@@ -64,8 +69,23 @@ public GraphQLOutputType call(@Nullable Field field, Method method, Class declar
                                                     edgeGraphQLOutputType,
                                                     relayHelper.getNodeInterface(),
                                                     Collections.emptyList());
-        // last build the relay connection!
-        return relayHelper.connectionType(endEdgeClass.getSimpleName(), edgeType, Lists.newArrayList());
+        // build the relay connection
+        GraphQLObjectType connectionType = relayHelper.connectionType(endEdgeClass.getSimpleName(), edgeType, Lists.newArrayList());
+
+        // check if a connection with this name already exists
+        GraphQLObjectType qlObjectType = connectionRegistry.get(connectionType.getName());
+        if (qlObjectType != null) {
+            // TODO: better equality function
+            if (!qlObjectType.toString().equals(connectionType.toString())) {
+                throw new GlitrException("Attempting to create two types with the same name. All types within a GraphQL schema must have unique names. " +
+                        "You have defined the type [" + connectionType.getName() + "] as both [" + qlObjectType + "] and [" + connectionType + "]");
+            }
+            return qlObjectType;
+        }
+
+        // add the connection to the registry and return the connection
+        connectionRegistry.put(connectionType.getName(), connectionType);
+        return connectionType;
     }
 
     public PagingOutputTypeConverter setTypeRegistry(TypeRegistry typeRegistry) {
diff --git a/src/test/groovy/com/nfl/glitr/data/query/QueryType.java b/src/test/groovy/com/nfl/glitr/data/query/QueryType.java
index 21f1225..33c4b99 100644
--- a/src/test/groovy/com/nfl/glitr/data/query/QueryType.java
+++ b/src/test/groovy/com/nfl/glitr/data/query/QueryType.java
@@ -22,4 +22,9 @@ public Video getVideo() {
 
     @GlitrArgument(name = "ids", type = String[].class, nullable = false)
     public List<com.nfl.glitr.relay.Node> getNodes() { return null; }
+
+    @GlitrForwardPagingArguments
+    public List<Video> getOtherVideos() {
+        return null;
+    }
 }
diff --git a/src/test/groovy/com/nfl/glitr/data/query/additionalTypes/Cyborg.java b/src/test/groovy/com/nfl/glitr/data/query/additionalTypes/Cyborg.java
index e80eda9..35042ad 100644
--- a/src/test/groovy/com/nfl/glitr/data/query/additionalTypes/Cyborg.java
+++ b/src/test/groovy/com/nfl/glitr/data/query/additionalTypes/Cyborg.java
@@ -1,32 +1,34 @@
 package com.nfl.glitr.data.query.additionalTypes;
 
 public class Cyborg implements Person {
-        public String getId() {
-            return id;
-        }
-
-        public String getCodeName() {
-            return codeName;
-        }
-
-        @Override
-        public String getAge() {
-            return this.age;
-        }
-
-        public void setId(String id) {
-            this.id = id;
-        }
-
-        public void setCodeName(String codeName) {
-            this.codeName = codeName;
-        }
-
-        public void setAge(String age) {
-            this.age = age;
-        }
-
-        private String id;
-        private String codeName;
-        private String age;
-    }
\ No newline at end of file
+
+    private String id;
+    private String codeName;
+    private String age;
+
+
+    public String getId() {
+        return id;
+    }
+
+    public String getCodeName() {
+        return codeName;
+    }
+
+    @Override
+    public String getAge() {
+        return this.age;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public void setCodeName(String codeName) {
+        this.codeName = codeName;
+    }
+
+    public void setAge(String age) {
+        this.age = age;
+    }
+}
\ No newline at end of file
diff --git a/src/test/groovy/com/nfl/glitr/data/query/additionalTypes/Man.java b/src/test/groovy/com/nfl/glitr/data/query/additionalTypes/Man.java
index c15151d..5a6f8cb 100644
--- a/src/test/groovy/com/nfl/glitr/data/query/additionalTypes/Man.java
+++ b/src/test/groovy/com/nfl/glitr/data/query/additionalTypes/Man.java
@@ -1,32 +1,34 @@
 package com.nfl.glitr.data.query.additionalTypes;
 
 public class Man implements Person {
-        public String getId() {
-            return id;
-        }
-
-        public String getFirstName() {
-            return firstName;
-        }
-
-        @Override
-        public String getAge() {
-            return this.age;
-        }
-
-        public void setId(String id) {
-            this.id = id;
-        }
-
-        public void setFirstName(String firstName) {
-            this.firstName = firstName;
-        }
-
-        public void setAge(String age) {
-            this.age = age;
-        }
-
-        private String id;
-        private String firstName;
-        private String age;
-    }
\ No newline at end of file
+
+    private String id;
+    private String firstName;
+    private String age;
+
+
+    public String getId() {
+        return id;
+    }
+
+    public String getFirstName() {
+        return firstName;
+    }
+
+    @Override
+    public String getAge() {
+        return this.age;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public void setFirstName(String firstName) {
+        this.firstName = firstName;
+    }
+
+    public void setAge(String age) {
+        this.age = age;
+    }
+}
\ No newline at end of file
diff --git a/src/test/groovy/com/nfl/glitr/data/query/additionalTypes/Person.java b/src/test/groovy/com/nfl/glitr/data/query/additionalTypes/Person.java
index 28fb739..dfc0b9f 100644
--- a/src/test/groovy/com/nfl/glitr/data/query/additionalTypes/Person.java
+++ b/src/test/groovy/com/nfl/glitr/data/query/additionalTypes/Person.java
@@ -1,5 +1,6 @@
 package com.nfl.glitr.data.query.additionalTypes;
 
 public interface Person {
-        public abstract String getAge();
-    }
\ No newline at end of file
+
+    public abstract String getAge();
+}
\ No newline at end of file
diff --git a/src/test/groovy/com/nfl/glitr/data/query/additionalTypes/QueryRoot.java b/src/test/groovy/com/nfl/glitr/data/query/additionalTypes/QueryRoot.java
index 775a546..05bcbe4 100644
--- a/src/test/groovy/com/nfl/glitr/data/query/additionalTypes/QueryRoot.java
+++ b/src/test/groovy/com/nfl/glitr/data/query/additionalTypes/QueryRoot.java
@@ -1,8 +1,8 @@
 package com.nfl.glitr.data.query.additionalTypes;
 
 public class QueryRoot {
-        public Person getPerson() {
+
+    public Person getPerson() {
             return null;
         }
-
-    }
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/test/groovy/com/nfl/glitr/registry/TypeRegistryIntegrationTest.groovy b/src/test/groovy/com/nfl/glitr/registry/TypeRegistryIntegrationTest.groovy
index b32982f..7cd0f9e 100644
--- a/src/test/groovy/com/nfl/glitr/registry/TypeRegistryIntegrationTest.groovy
+++ b/src/test/groovy/com/nfl/glitr/registry/TypeRegistryIntegrationTest.groovy
@@ -59,34 +59,46 @@ class TypeRegistryIntegrationTest extends Specification {
         inputWrappedType1.name == "ID"
         inputWrappedType1.description == "Built-in ID"
 
-        // Video field
+        // Other Video field
         def fieldDef2 = type.fieldDefinitions[2]
-        fieldDef2.name == "video"
+        fieldDef2.name == "otherVideos"
         fieldDef2.description == "No Description"
+        fieldDef2.arguments.name as Set == ["first", "after"] as Set
         fieldDef2.type instanceof GraphQLObjectType
         GraphQLObjectType fieldDefType2 = (GraphQLObjectType) fieldDef2.type
-        fieldDefType2.name == "Video"
-        fieldDefType2.description == "No Description"
-        fieldDefType2.fieldDefinitions.size() == 5
-        def input2 = (GraphQLArgument) fieldDef2.arguments[0]
-        input2.name == "id"
-        input2.description == "No Description"
-        input2.type instanceof GraphQLNonNull
-        def inputWrappedType2 = (GraphQLScalarType) ((GraphQLNonNull)input.type).wrappedType
-        inputWrappedType2.name == "ID"
-        inputWrappedType2.description == "Built-in ID"
+        fieldDefType2.name == "VideoConnection"
+        fieldDefType2.description == "A connection to a list of items."
+        fieldDefType2.fieldDefinitions.size() == 2
+        fieldDefType2.fieldDefinitions.name as Set == ["edges", "pageInfo"] as Set
 
-        // Videos field
+        // Video field
         def fieldDef3 = type.fieldDefinitions[3]
-        fieldDef3.name == "videos"
+        fieldDef3.name == "video"
         fieldDef3.description == "No Description"
-        fieldDef3.arguments.name as Set == ["first", "after"] as Set
         fieldDef3.type instanceof GraphQLObjectType
         GraphQLObjectType fieldDefType3 = (GraphQLObjectType) fieldDef3.type
-        fieldDefType3.name == "VideoConnection"
-        fieldDefType3.description == "A connection to a list of items."
-        fieldDefType3.fieldDefinitions.size() == 2
-        fieldDefType3.fieldDefinitions.name as Set == ["edges", "pageInfo"] as Set
+        fieldDefType3.name == "Video"
+        fieldDefType3.description == "No Description"
+        fieldDefType3.fieldDefinitions.size() == 5
+        def input3 = (GraphQLArgument) fieldDef3.arguments[0]
+        input3.name == "id"
+        input3.description == "No Description"
+        input3.type instanceof GraphQLNonNull
+        def inputWrappedType3 = (GraphQLScalarType) ((GraphQLNonNull)input.type).wrappedType
+        inputWrappedType3.name == "ID"
+        inputWrappedType3.description == "Built-in ID"
+
+        // Videos field
+        def fieldDef4 = type.fieldDefinitions[4]
+        fieldDef4.name == "videos"
+        fieldDef4.description == "No Description"
+        fieldDef4.arguments.name as Set == ["first", "after"] as Set
+        fieldDef4.type instanceof GraphQLObjectType
+        GraphQLObjectType fieldDefType4 = (GraphQLObjectType) fieldDef4.type
+        fieldDefType4.name == "VideoConnection"
+        fieldDefType4.description == "A connection to a list of items."
+        fieldDefType4.fieldDefinitions.size() == 2
+        fieldDefType4.fieldDefinitions.name as Set == ["edges", "pageInfo"] as Set
     }
 
     def "Inspect Simple Object type"() {

From 8680a0ded95beaeed1f4accfb2801708c695b60b Mon Sep 17 00:00:00 2001
From: "arash.shokoufandeh" <arash.shokoufandeh@nfl.com>
Date: Mon, 25 Sep 2017 19:33:11 -0700
Subject: [PATCH 2/3] more test cases

---
 .../com/nfl/glitr/data/query/QueryType.java   | 18 ++++++++-
 .../data/query/additionalTypes/QueryRoot.java |  4 +-
 .../TypeRegistryIntegrationTest.groovy        | 39 ++++++++++++++++---
 3 files changed, 52 insertions(+), 9 deletions(-)

diff --git a/src/test/groovy/com/nfl/glitr/data/query/QueryType.java b/src/test/groovy/com/nfl/glitr/data/query/QueryType.java
index 33c4b99..c8aba49 100644
--- a/src/test/groovy/com/nfl/glitr/data/query/QueryType.java
+++ b/src/test/groovy/com/nfl/glitr/data/query/QueryType.java
@@ -18,13 +18,27 @@ public Video getVideo() {
     }
 
     @GlitrArgument(name = "id", type = String.class, nullable = false)
-    public com.nfl.glitr.relay.Node getNode() { return null; }
+    public com.nfl.glitr.relay.Node getNode() {
+        return null;
+    }
 
     @GlitrArgument(name = "ids", type = String[].class, nullable = false)
-    public List<com.nfl.glitr.relay.Node> getNodes() { return null; }
+    public List<com.nfl.glitr.relay.Node> getNodes() {
+        return null;
+    }
 
     @GlitrForwardPagingArguments
     public List<Video> getOtherVideos() {
         return null;
     }
+
+    @GlitrArgument(name = "ids", type = String[].class, nullable = false)
+    public List<com.nfl.glitr.relay.Node> getZZZNodes() {
+        return null;
+    }
+
+    // no arguments
+    public List<Video> getZZZVideos() {
+        return null;
+    }
 }
diff --git a/src/test/groovy/com/nfl/glitr/data/query/additionalTypes/QueryRoot.java b/src/test/groovy/com/nfl/glitr/data/query/additionalTypes/QueryRoot.java
index 05bcbe4..b4f5f87 100644
--- a/src/test/groovy/com/nfl/glitr/data/query/additionalTypes/QueryRoot.java
+++ b/src/test/groovy/com/nfl/glitr/data/query/additionalTypes/QueryRoot.java
@@ -3,6 +3,6 @@
 public class QueryRoot {
 
     public Person getPerson() {
-            return null;
-        }
+        return null;
+    }
 }
\ No newline at end of file
diff --git a/src/test/groovy/com/nfl/glitr/registry/TypeRegistryIntegrationTest.groovy b/src/test/groovy/com/nfl/glitr/registry/TypeRegistryIntegrationTest.groovy
index 7cd0f9e..c30610f 100644
--- a/src/test/groovy/com/nfl/glitr/registry/TypeRegistryIntegrationTest.groovy
+++ b/src/test/groovy/com/nfl/glitr/registry/TypeRegistryIntegrationTest.groovy
@@ -47,10 +47,10 @@ class TypeRegistryIntegrationTest extends Specification {
         fieldDef1.description == "No Description"
         fieldDef1.type instanceof GraphQLList
         GraphQLList fieldDefType1 = (GraphQLList) fieldDef1.type
-        GraphQLInterfaceType wrappedType = (GraphQLInterfaceType) fieldDefType1.wrappedType
-        wrappedType.name == "Node"
-        wrappedType.description == "An object with an ID"
-        wrappedType.fieldDefinitions.size() == 1
+        GraphQLInterfaceType wrappedType1 = (GraphQLInterfaceType) fieldDefType1.wrappedType
+        wrappedType1.name == "Node"
+        wrappedType1.description == "An object with an ID"
+        wrappedType1.fieldDefinitions.size() == 1
         def input1 = (GraphQLArgument) fieldDef1.arguments[0]
         input1.name == "ids"
         input1.description == "No Description"
@@ -84,7 +84,7 @@ class TypeRegistryIntegrationTest extends Specification {
         input3.name == "id"
         input3.description == "No Description"
         input3.type instanceof GraphQLNonNull
-        def inputWrappedType3 = (GraphQLScalarType) ((GraphQLNonNull)input.type).wrappedType
+        def inputWrappedType3 = (GraphQLScalarType) ((GraphQLNonNull)input3.type).wrappedType
         inputWrappedType3.name == "ID"
         inputWrappedType3.description == "Built-in ID"
 
@@ -99,6 +99,35 @@ class TypeRegistryIntegrationTest extends Specification {
         fieldDefType4.description == "A connection to a list of items."
         fieldDefType4.fieldDefinitions.size() == 2
         fieldDefType4.fieldDefinitions.name as Set == ["edges", "pageInfo"] as Set
+
+        // ZZZ Nodes field
+        def fieldDef5 = type.fieldDefinitions[5]
+        fieldDef5.name == "zZZNodes"
+        fieldDef5.description == "No Description"
+        fieldDef5.type instanceof GraphQLList
+        GraphQLList fieldDefType5 = (GraphQLList) fieldDef5.type
+        GraphQLInterfaceType wrappedType5 = (GraphQLInterfaceType) fieldDefType5.wrappedType
+        wrappedType5.name == "Node"
+        wrappedType5.description == "An object with an ID"
+        wrappedType5.fieldDefinitions.size() == 1
+        def input5 = (GraphQLArgument) fieldDef5.arguments[0]
+        input5.name == "ids"
+        input5.description == "No Description"
+        input5.type instanceof GraphQLNonNull
+        def inputWrappedType5 = (GraphQLScalarType) ((GraphQLNonNull)input.type).wrappedType
+        inputWrappedType5.name == "ID"
+        inputWrappedType5.description == "Built-in ID"
+
+        // ZZZ Videos field
+        def fieldDef6 = type.fieldDefinitions[6]
+        fieldDef6.name == "zZZVideos"
+        fieldDef6.description == "No Description"
+        fieldDef6.type instanceof GraphQLList
+        GraphQLList fieldDefType6 = (GraphQLList) fieldDef6.type
+        GraphQLObjectType wrappedType6 = (GraphQLObjectType) fieldDefType6.wrappedType
+        wrappedType6.name == "Video"
+        wrappedType6.description == "No Description"
+        wrappedType6.fieldDefinitions.size() == 5
     }
 
     def "Inspect Simple Object type"() {

From 0b022b231c3561435b91f12bbd396ad92e3e2dd7 Mon Sep 17 00:00:00 2001
From: "arash.shokoufandeh" <arash.shokoufandeh@nfl.com>
Date: Tue, 26 Sep 2017 14:56:37 -0700
Subject: [PATCH 3/3] moving connection registry to type registry and renaming
 nameRegistry. also adding a custom map implementation to sync the maps more
 dynamically (not currently in use).

---
 .../com/nfl/glitr/registry/GlitrTypeMap.java  | 194 ++++++++++++++++++
 .../com/nfl/glitr/registry/TypeRegistry.java  |   9 +
 .../relay/type/PagingOutputTypeConverter.java |   9 +-
 3 files changed, 207 insertions(+), 5 deletions(-)
 create mode 100644 src/main/java/com/nfl/glitr/registry/GlitrTypeMap.java

diff --git a/src/main/java/com/nfl/glitr/registry/GlitrTypeMap.java b/src/main/java/com/nfl/glitr/registry/GlitrTypeMap.java
new file mode 100644
index 0000000..0f20438
--- /dev/null
+++ b/src/main/java/com/nfl/glitr/registry/GlitrTypeMap.java
@@ -0,0 +1,194 @@
+package com.nfl.glitr.registry;
+
+import com.nfl.glitr.exception.GlitrException;
+import graphql.schema.GraphQLType;
+
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+/**
+ * A map implementation to sync the two kinds of registries currently in {@link com.nfl.glitr.registry.TypeRegistry}.
+ * Syncs happen dynamically, keeping the nameRegistry appraised of classRegistry additions to ensure unique GraphQLTypes
+ */
+public class GlitrTypeMap implements ConcurrentMap {
+
+    private final Map<Class, GraphQLType> classRegistry = new ConcurrentHashMap<>();
+    private final Map<String, GraphQLType> nameRegistry = new ConcurrentHashMap<>();
+
+
+    @Override
+    public Object getOrDefault(Object key, Object defaultValue) {
+        if (isClass(key)) {
+            return classRegistry.getOrDefault(key, (GraphQLType) defaultValue);
+        } else if (isString(key)) {
+            return nameRegistry.getOrDefault(key, (GraphQLType) defaultValue);
+        }
+        throw new GlitrException("Unsupported type passed as key to GlitrTypeMap");
+    }
+
+    @Override
+    public Object putIfAbsent(Object key, Object value) {
+        if (isClass(key)) {
+            nameRegistry.putIfAbsent(((Class) key).getSimpleName(), (GraphQLType) value);
+            return classRegistry.putIfAbsent((Class) key, (GraphQLType) value);
+        } else if (isString(key)) {
+            return nameRegistry.putIfAbsent((String) key, (GraphQLType) value);
+        }
+        throw new GlitrException("Unsupported type passed as key to GlitrTypeMap");
+    }
+
+    @Override
+    public boolean remove(Object key, Object value) {
+        if (isClass(key)) {
+            nameRegistry.remove(((Class) key).getSimpleName(), value);
+            return classRegistry.remove(key, value);
+        } else if (isString(key)) {
+            return nameRegistry.remove(key, value);
+        }
+        throw new GlitrException("Unsupported type passed as key to GlitrTypeMap");
+    }
+
+    @Override
+    public boolean replace(Object key, Object oldValue, Object newValue) {
+        if (isClass(key)) {
+            nameRegistry.replace(((Class) key).getSimpleName(), (GraphQLType) oldValue, (GraphQLType) newValue);
+            return classRegistry.replace((Class) key, (GraphQLType) oldValue, (GraphQLType) newValue);
+        } else if (isString(key)) {
+            return nameRegistry.replace((String) key, (GraphQLType) oldValue, (GraphQLType) newValue);
+        }
+        throw new GlitrException("Unsupported type passed as key to GlitrTypeMap");
+    }
+
+    @Override
+    public Object replace(Object key, Object value) {
+        if (isClass(key)) {
+            nameRegistry.replace(((Class) key).getSimpleName(), (GraphQLType) value);
+            return classRegistry.replace((Class) key, (GraphQLType) value);
+        } else if (isString(key)) {
+            return nameRegistry.replace((String) key, (GraphQLType) value);
+        }
+        throw new GlitrException("Unsupported type passed as key to GlitrTypeMap");
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return nameRegistry.isEmpty();
+    }
+
+    @Override
+    public boolean containsKey(Object key) {
+        if (isClass(key)) {
+            return classRegistry.containsKey(key);
+        } else if (isString(key)) {
+            return nameRegistry.containsKey(key);
+        }
+        throw new GlitrException("Unsupported type passed as key to GlitrTypeMap");
+    }
+
+    @Override
+    public boolean containsValue(Object value) {
+        return nameRegistry.containsValue(value);
+    }
+
+    @Override
+    public Object get(Object key) {
+        if (isClass(key)) {
+            return classRegistry.get(key);
+        } else if (isString(key)) {
+            return nameRegistry.get(key);
+        }
+        throw new GlitrException("Unsupported type passed as key to GlitrTypeMap");
+    }
+
+    @Override
+    public Object put(Object key, Object value) {
+        if (isClass(key)) {
+            nameRegistry.put(((Class) key).getSimpleName(), (GraphQLType) value);
+            return classRegistry.put((Class) key, (GraphQLType) value);
+        } else if (isString(key)) {
+            return nameRegistry.put((String) key, (GraphQLType) value);
+        }
+        throw new GlitrException("Unsupported type passed as key to GlitrTypeMap");
+    }
+
+    @Override
+    public Object remove(Object key) {
+        if (isClass(key)) {
+            nameRegistry.remove(((Class) key).getSimpleName());
+            return classRegistry.remove(key);
+        } else if (isString(key)) {
+            return nameRegistry.remove(key);
+        }
+        throw new GlitrException("Unsupported type passed as key to GlitrTypeMap");
+    }
+
+    @Override
+    public void clear() {
+        classRegistry.clear();
+        nameRegistry.clear();
+    }
+
+    @Override
+    public int size() {
+        return nameRegistry.size();
+    }
+
+    @Override
+    public void putAll(Map m) {
+        Set set = m.keySet();
+        Object next = set.iterator().next();
+        if (isClass(next)) {
+            for (Object o : m.entrySet()) {
+                Entry pair = (Entry) o;
+                nameRegistry.put(((Class) pair.getKey()).getSimpleName(), (GraphQLType) pair.getValue());
+                classRegistry.put((Class) pair.getKey(), (GraphQLType) pair.getValue());
+            }
+        } else if (isString(next)) {
+            nameRegistry.putAll(m);
+        }
+        throw new GlitrException("Unsupported type passed as key to GlitrTypeMap");
+    }
+
+    @Override
+    public Collection values() {
+        return nameRegistry.values();
+    }
+
+    @Override
+    public Set keySet() {
+        throw new GlitrException("Unsupported method, GlitrTypeMap does not support this method to ensure expected return types");
+    }
+
+    @Override
+    public Set<Entry> entrySet() {
+        throw new GlitrException("Unsupported method, GlitrTypeMap does not support this method to ensure expected return types");
+    }
+
+    public Set ClassKeySet() {
+        return classRegistry.keySet();
+    }
+
+    public Set NameKeySet() {
+        return nameRegistry.keySet();
+    }
+
+    public Set<Entry<Class, GraphQLType>> ClassEntrySet() {
+        return classRegistry.entrySet();
+    }
+
+    public Set<Entry<String, GraphQLType>> NameEntrySet() {
+        return nameRegistry.entrySet();
+    }
+
+    private boolean isClass(Object obj) {
+        return obj instanceof Class;
+    }
+
+    private boolean isString(Object obj) {
+        return obj instanceof String;
+    }
+}
diff --git a/src/main/java/com/nfl/glitr/registry/TypeRegistry.java b/src/main/java/com/nfl/glitr/registry/TypeRegistry.java
index c93e0f4..de8b9c7 100644
--- a/src/main/java/com/nfl/glitr/registry/TypeRegistry.java
+++ b/src/main/java/com/nfl/glitr/registry/TypeRegistry.java
@@ -75,6 +75,7 @@ public class TypeRegistry implements TypeResolver {
     private static final Logger logger = LoggerFactory.getLogger(TypeRegistry.class);
 
     private final Map<Class, GraphQLType> registry = new ConcurrentHashMap<>();
+    private final Map<String, GraphQLType> nameRegistry = new ConcurrentHashMap<>();
     private final Map<Class, List<Object>> overrides;
 
     private final Map<Class<? extends Annotation>, Func4<Field, Method, Class, Annotation, List<GraphQLArgument>>> annotationToArgumentsProviderMap;
@@ -108,6 +109,7 @@ public class TypeRegistry implements TypeResolver {
             this.nodeInterface = relay.nodeInterface(this);
             // register Node so we don't inadvertently recreate it later
             this.registry.put(Node.class, this.nodeInterface);
+            this.nameRegistry.put(Node.class.getSimpleName(), this.nodeInterface);
         }
         this.explicitRelayNodeScanEnabled = explicitRelayNodeScanEnabled;
     }
@@ -175,11 +177,13 @@ public GraphQLType lookupOutput(Class clazz) {
 
         // put a type reference in while building the type to work around circular references
         registry.put(clazz, new GraphQLTypeReference(clazz.getSimpleName()));
+        nameRegistry.put(clazz.getSimpleName(), new GraphQLTypeReference(clazz.getSimpleName()));
 
         GraphQLOutputType type = graphQLTypeFactory.createGraphQLOutputType(clazz);
 
         if (type != null) {
             registry.put(clazz, type);
+            nameRegistry.put(clazz.getSimpleName(), type);
         } else {
             throw new IllegalArgumentException("Unable to create GraphQLOutputType for: " + clazz.getCanonicalName());
         }
@@ -203,6 +207,7 @@ public GraphQLType lookupInput(Class clazz) {
 
         if (type != null) {
             registry.put(clazz, type);
+            nameRegistry.put(clazz.getSimpleName(), type);
         } else {
             throw new IllegalArgumentException("Unable to create GraphQLInputType for: " + clazz.getCanonicalName());
         }
@@ -644,4 +649,8 @@ private GraphQLType getGraphQLTypeForInputParameterizedType(Type type) {
             throw new IllegalArgumentException("Unable to convert type " + type.getTypeName() + " to GraphQLInputType");
         }
     }
+
+    public Map<String, GraphQLType> getNameRegistry() {
+        return nameRegistry;
+    }
 }
diff --git a/src/main/java/com/nfl/glitr/relay/type/PagingOutputTypeConverter.java b/src/main/java/com/nfl/glitr/relay/type/PagingOutputTypeConverter.java
index 58060d8..aaabcc2 100644
--- a/src/main/java/com/nfl/glitr/relay/type/PagingOutputTypeConverter.java
+++ b/src/main/java/com/nfl/glitr/relay/type/PagingOutputTypeConverter.java
@@ -11,6 +11,7 @@
 import graphql.schema.GraphQLNonNull;
 import graphql.schema.GraphQLObjectType;
 import graphql.schema.GraphQLOutputType;
+import graphql.schema.GraphQLType;
 import rx.functions.Func4;
 
 import javax.annotation.Nullable;
@@ -21,7 +22,6 @@
 import java.lang.reflect.Type;
 import java.util.Collections;
 import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 
 /**
  *  Output type converter function for paging arguments annotations.
@@ -31,8 +31,6 @@ public class PagingOutputTypeConverter implements Func4<Field, Method, Class, An
     private RelayHelper relayHelper;
     private TypeRegistry typeRegistry;
 
-    private final Map<String, GraphQLObjectType> connectionRegistry = new ConcurrentHashMap<>();
-
 
     @Override
     public GraphQLOutputType call(@Nullable Field field, Method method, Class declaringClass, Annotation annotation) {
@@ -73,7 +71,8 @@ public GraphQLOutputType call(@Nullable Field field, Method method, Class declar
         GraphQLObjectType connectionType = relayHelper.connectionType(endEdgeClass.getSimpleName(), edgeType, Lists.newArrayList());
 
         // check if a connection with this name already exists
-        GraphQLObjectType qlObjectType = connectionRegistry.get(connectionType.getName());
+        Map<String, GraphQLType> nameRegistry = typeRegistry.getNameRegistry();
+        GraphQLObjectType qlObjectType = (GraphQLObjectType) nameRegistry.get(connectionType.getName());
         if (qlObjectType != null) {
             // TODO: better equality function
             if (!qlObjectType.toString().equals(connectionType.toString())) {
@@ -84,7 +83,7 @@ public GraphQLOutputType call(@Nullable Field field, Method method, Class declar
         }
 
         // add the connection to the registry and return the connection
-        connectionRegistry.put(connectionType.getName(), connectionType);
+        nameRegistry.put(connectionType.getName(), connectionType);
         return connectionType;
     }