graphql-java · bbakerman · Oct 25, 2020 · Jun 8, 2020 · Oct 17, 2020 · Oct 19, 2020
diff --git a/src/main/java/graphql/schema/GraphQLArgument.java b/src/main/java/graphql/schema/GraphQLArgument.java
@@ -184,6 +184,23 @@ public GraphQLArgument withNewChildren(SchemaElementChildrenContainer newChildre
                         .replaceDirectives(newChildren.getChildren(CHILD_DIRECTIVES)));
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public final boolean equals(Object o) {
+        return super.equals(o);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public final int hashCode() {
+        return super.hashCode();
+    }
+
+
     /**
      * This helps you transform the current GraphQLArgument into another one by starting a builder with all
      * the current values and allows you to transform it how you want.

diff --git a/src/main/java/graphql/schema/GraphQLDirective.java b/src/main/java/graphql/schema/GraphQLDirective.java
@@ -140,6 +140,23 @@ public GraphQLDirective withNewChildren(SchemaElementChildrenContainer newChildr
         );
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public final boolean equals(Object o) {
+        return super.equals(o);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public final int hashCode() {
+        return super.hashCode();
+    }
+
+
     public static Builder newDirective() {
         return new Builder();
     }

diff --git a/src/main/java/graphql/schema/GraphQLEnumType.java b/src/main/java/graphql/schema/GraphQLEnumType.java
@@ -45,7 +45,6 @@ public class GraphQLEnumType implements GraphQLNamedInputType, GraphQLNamedOutpu
     public static final String CHILD_DIRECTIVES = "directives";
 
 
-
     /**
      * @param name        the name
      * @param description the description
@@ -236,6 +235,23 @@ public GraphQLEnumType withNewChildren(SchemaElementChildrenContainer newChildre
         );
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public final boolean equals(Object o) {
+        return super.equals(o);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public final int hashCode() {
+        return super.hashCode();
+    }
+
+
     public static Builder newEnum() {
         return new Builder();
     }

diff --git a/src/main/java/graphql/schema/GraphQLEnumValueDefinition.java b/src/main/java/graphql/schema/GraphQLEnumValueDefinition.java
@@ -171,6 +171,23 @@ public GraphQLEnumValueDefinition withNewChildren(SchemaElementChildrenContainer
         );
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public final boolean equals(Object o) {
+        return super.equals(o);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public final int hashCode() {
+        return super.hashCode();
+    }
+
+
     public static Builder newEnumValueDefinition() {
         return new Builder();
     }

diff --git a/src/main/java/graphql/schema/GraphQLFieldDefinition.java b/src/main/java/graphql/schema/GraphQLFieldDefinition.java
@@ -209,6 +209,23 @@ public GraphQLSchemaElement withNewChildren(SchemaElementChildrenContainer newCh
         );
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public final boolean equals(Object o) {
+        return super.equals(o);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public final int hashCode() {
+        return super.hashCode();
+    }
+
+
     public static Builder newFieldDefinition(GraphQLFieldDefinition existing) {
         return new Builder(existing);
     }

diff --git a/src/main/java/graphql/schema/GraphQLInputObjectField.java b/src/main/java/graphql/schema/GraphQLInputObjectField.java
@@ -165,6 +165,23 @@ public GraphQLInputObjectField withNewChildren(SchemaElementChildrenContainer ne
         );
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public final boolean equals(Object o) {
+        return super.equals(o);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public final int hashCode() {
+        return super.hashCode();
+    }
+
+
     @Override
     public String toString() {
         return "GraphQLInputObjectField{" +

diff --git a/src/main/java/graphql/schema/GraphQLInputObjectType.java b/src/main/java/graphql/schema/GraphQLInputObjectType.java
@@ -173,6 +173,23 @@ public GraphQLInputObjectType withNewChildren(SchemaElementChildrenContainer new
         );
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public final boolean equals(Object o) {
+        return super.equals(o);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public final int hashCode() {
+        return super.hashCode();
+    }
+
+
     @Override
     public String toString() {
         return "GraphQLInputObjectType{" +

diff --git a/src/main/java/graphql/schema/GraphQLInterfaceType.java b/src/main/java/graphql/schema/GraphQLInterfaceType.java
@@ -228,6 +228,22 @@ void replaceInterfaces(List<GraphQLNamedOutputType> interfaces) {
         this.replacedInterfaces = sortTypes(interfaceComparator, interfaces);
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public final boolean equals(Object o) {
+        return super.equals(o);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public final int hashCode() {
+        return super.hashCode();
+    }
+
 
     public static Builder newInterface() {
         return new Builder();

diff --git a/src/main/java/graphql/schema/GraphQLList.java b/src/main/java/graphql/schema/GraphQLList.java
@@ -51,30 +51,30 @@ public GraphQLType getWrappedType() {
         return replacedWrappedType != null ? replacedWrappedType : originalWrappedType;
     }
 
+    public GraphQLType getOriginalWrappedType() {
+        return originalWrappedType;
+    }
+
     void replaceType(GraphQLType type) {
         this.replacedWrappedType = type;
     }
 
-    @Override
-    public boolean equals(Object o) {
+
+    public boolean isEqualTo(Object o) {
         if (this == o) {
             return true;
         }
         if (o == null || getClass() != o.getClass()) {
             return false;
         }
-
         GraphQLList that = (GraphQLList) o;
         GraphQLType wrappedType = getWrappedType();
-
+        if (wrappedType instanceof GraphQLNonNull) {
+            return ((GraphQLNonNull) wrappedType).isEqualTo(that.getWrappedType());
+        }
         return Objects.equals(wrappedType, that.getWrappedType());
     }
 
-    @Override
-    public int hashCode() {
-        return getWrappedType() != null ? getWrappedType().hashCode() : 0;
-    }
-
     @Override
     public TraversalControl accept(TraverserContext<GraphQLSchemaElement> context, GraphQLTypeVisitor visitor) {
         return visitor.visitGraphQLList(this, context);
@@ -102,4 +102,20 @@ public String toString() {
         return GraphQLTypeUtil.simplePrint(this);
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public final boolean equals(Object o) {
+        return super.equals(o);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public final int hashCode() {
+        return super.hashCode();
+    }
+
 }
diff --git a/src/main/java/graphql/schema/GraphQLNonNull.java b/src/main/java/graphql/schema/GraphQLNonNull.java
@@ -18,7 +18,6 @@
  * See http://graphql.org/learn/schema/#lists-and-non-null for more details on the concept
  */
 @PublicApi
-
 public class GraphQLNonNull implements GraphQLType, GraphQLInputType, GraphQLOutputType, GraphQLModifiedType {
 
     /**
@@ -27,6 +26,7 @@ public class GraphQLNonNull implements GraphQLType, GraphQLInputType, GraphQLOut
      * {@code .type(nonNull(GraphQLString)) }
      *
      * @param wrappedType the type to wrap as being non null
+     *
      * @return a GraphQLNonNull of that wrapped type
      */
     public static GraphQLNonNull nonNull(GraphQLType wrappedType) {
@@ -55,31 +55,30 @@ public GraphQLType getWrappedType() {
         return replacedWrappedType != null ? replacedWrappedType : originalWrappedType;
     }
 
+    public GraphQLType getOriginalWrappedType() {
+        return originalWrappedType;
+    }
 
     void replaceType(GraphQLType type) {
         assertNonNullWrapping(type);
         this.replacedWrappedType = type;
     }
 
-    @Override
-    public boolean equals(Object o) {
+    public boolean isEqualTo(Object o) {
         if (this == o) {
             return true;
         }
         if (o == null || getClass() != o.getClass()) {
             return false;
         }
-
         GraphQLNonNull that = (GraphQLNonNull) o;
         GraphQLType wrappedType = getWrappedType();
-
+        if (wrappedType instanceof GraphQLList) {
+            return ((GraphQLList) wrappedType).isEqualTo(that.getWrappedType());
+        }
         return Objects.equals(wrappedType, that.getWrappedType());
     }
 
-    @Override
-    public int hashCode() {
-        return getWrappedType() != null ? getWrappedType().hashCode() : 0;
-    }
 
     @Override
     public String toString() {
@@ -107,4 +106,21 @@ public SchemaElementChildrenContainer getChildrenWithTypeReferences() {
     public GraphQLSchemaElement withNewChildren(SchemaElementChildrenContainer newChildren) {
         return nonNull(newChildren.getChildOrNull(CHILD_WRAPPED_TYPE));
     }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public final boolean equals(Object o) {
+        return super.equals(o);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public final int hashCode() {
+        return super.hashCode();
+    }
+
 }
diff --git a/src/main/java/graphql/schema/GraphQLObjectType.java b/src/main/java/graphql/schema/GraphQLObjectType.java
@@ -222,6 +222,23 @@ public GraphQLSchemaElement withNewChildren(SchemaElementChildrenContainer newCh
         );
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public final boolean equals(Object o) {
+        return super.equals(o);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public final int hashCode() {
+        return super.hashCode();
+    }
+
+
     public static Builder newObject() {
         return new Builder();
     }

diff --git a/src/main/java/graphql/schema/GraphQLScalarType.java b/src/main/java/graphql/schema/GraphQLScalarType.java
@@ -176,6 +176,23 @@ public GraphQLScalarType withNewChildren(SchemaElementChildrenContainer newChild
         );
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public final boolean equals(Object o) {
+        return super.equals(o);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public final int hashCode() {
+        return super.hashCode();
+    }
+
+
     public static Builder newScalar() {
         return new Builder();
     }