#4182 - code built schemas should perform deprecated non null field validations as well as SDL built ones

bbakerman · bbakerman · commit dd5bc0309af8 · 2025-12-19T10:25:21.000+11:00
diff --git a/src/main/java/graphql/schema/validation/DeprecatedInputObjectAndArgumentsAreValid.java b/src/main/java/graphql/schema/validation/DeprecatedInputObjectAndArgumentsAreValid.java
@@ -42,7 +42,8 @@ public TraversalControl visitGraphQLInputObjectField(GraphQLInputObjectField inp
     // An applied directive's argument cannot be deprecated.
     @Override
     public TraversalControl visitGraphQLArgument(GraphQLArgument argument, TraverserContext<GraphQLSchemaElement> context) {
-        boolean isDeprecated = isDeprecated(argument);
+        // even if an argument is built using SLD or direct via code, the isDeprecated() method works
+        boolean isDeprecated = argument.isDeprecated();
         if (isDeprecated && GraphQLTypeUtil.isNonNull(argument.getType()) && !argument.hasSetDefaultValue()) {
             if (context.getParentNode() instanceof GraphQLFieldDefinition) {
                 GraphQLFieldDefinition fieldDefinition = (GraphQLFieldDefinition) context.getParentNode();
@@ -59,14 +60,4 @@ public TraversalControl visitGraphQLArgument(GraphQLArgument argument, Traverser
         return TraversalControl.CONTINUE;
     }
 
-    private boolean isDeprecated(GraphQLArgument argument) {
-        // There can only be at most one @deprecated, because it is not a repeatable directive
-        GraphQLAppliedDirective deprecatedDirective = argument.getAppliedDirective(Directives.DEPRECATED_DIRECTIVE_DEFINITION.getName());
-        if (deprecatedDirective != null) {
-            return true;
-        }
-        // handle code built schemas, where they have no directive but `graphql.schema.GraphQLArgument.Builder#deprecate` has been called directly
-        return argument.isDeprecated();
-    }
-
 }
