Update anonymizer

Author: dondonz

src/main/java/graphql/util/Anonymizer.java

@@ -70,6 +70,7 @@
 import graphql.schema.GraphQLTypeVisitor;
 import graphql.schema.GraphQLTypeVisitorStub;
 import graphql.schema.GraphQLUnionType;
+import graphql.schema.InputValueWithState;
 import graphql.schema.SchemaTransformer;
 import graphql.schema.TypeResolver;
 import graphql.schema.idl.DirectiveInfo;
@@ -94,6 +95,7 @@
 import static graphql.Assert.assertNotNull;
 import static graphql.parser.ParserEnvironment.newParserEnvironment;
 import static graphql.schema.GraphQLArgument.newArgument;
+import static graphql.schema.GraphQLNonNull.nonNull;
 import static graphql.schema.GraphQLTypeUtil.unwrapNonNull;
 import static graphql.schema.GraphQLTypeUtil.unwrapNonNullAs;
 import static graphql.schema.GraphQLTypeUtil.unwrapOneAs;
@@ -260,16 +262,6 @@ public TraversalControl visitGraphQLFieldDefinition(GraphQLFieldDefinition graph
 
             @Override
             public TraversalControl visitGraphQLDirective(GraphQLDirective graphQLDirective, TraverserContext<GraphQLSchemaElement> context) {
-                if (Directives.DEPRECATED_DIRECTIVE_DEFINITION.getName().equals(graphQLDirective.getName())) {
-                    GraphQLArgument reason = newArgument().name("reason")
-                            .type(Scalars.GraphQLString)
-                            .clearValue().build();
-                    GraphQLDirective newElement = graphQLDirective.transform(builder -> {
-                        builder.description(null).argument(reason);
-                    });
-                    changeNode(context, newElement);
-                    return TraversalControl.ABORT;
-                }
                 if (DirectiveInfo.isGraphqlSpecifiedDirective(graphQLDirective.getName())) {
                     return TraversalControl.ABORT;
                 }
@@ -285,7 +277,8 @@ public TraversalControl visitGraphQLAppliedDirective(GraphQLAppliedDirective gra
                 if (Directives.DEPRECATED_DIRECTIVE_DEFINITION.getName().equals(graphQLDirective.getName())) {
                     GraphQLAppliedDirectiveArgument reason = GraphQLAppliedDirectiveArgument.newArgument().name("reason")
                             .type(Scalars.GraphQLString)
-                            .clearValue().build();
+                            .clearValue()
+                            .build();
                     GraphQLAppliedDirective newElement = graphQLDirective.transform(builder -> {
                         builder.description(null).argument(reason);
                     });
@@ -918,7 +911,7 @@ private static GraphQLType fromTypeToGraphQLType(Type type, GraphQLSchema schema
             graphql.Assert.assertNotNull(graphQLType, "Schema must contain type %s", typeName);
             return graphQLType;
         } else if (type instanceof NonNullType) {
-            return GraphQLNonNull.nonNull(fromTypeToGraphQLType(TypeUtil.unwrapOne(type), schema));
+            return nonNull(fromTypeToGraphQLType(TypeUtil.unwrapOne(type), schema));
         } else if (type instanceof ListType) {
             return GraphQLList.list(fromTypeToGraphQLType(TypeUtil.unwrapOne(type), schema));
         } else {

src/test/groovy/graphql/util/AnonymizerTest.groovy

@@ -729,8 +729,12 @@ type Object1 {
             
             directive @Directive1(argument1: String! = "stringValue4") repeatable on SCHEMA | SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | INTERFACE | UNION | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION
             
-            directive @deprecated(reason: String!) on FIELD_DEFINITION | ARGUMENT_DEFINITION | ENUM_VALUE | INPUT_FIELD_DEFINITION
-
+            "Marks the field, argument, input field or enum value as deprecated"
+            directive @deprecated(
+                "The reason for the deprecation"
+                reason: String! = "No longer supported"
+              ) on FIELD_DEFINITION | ARGUMENT_DEFINITION | ENUM_VALUE | INPUT_FIELD_DEFINITION
+ 
             interface Interface1 @Directive1(argument1 : "stringValue12") {
               field2: String
               field3: Enum1