@@ -4,16 +4,14 @@
 import graphql.schema.GraphQLDirective;
 
 import static graphql.Scalars.GraphQLBoolean;
-import static graphql.Scalars.GraphQLString;
 import static graphql.introspection.Introspection.DirectiveLocation.FIELD;
-import static graphql.introspection.Introspection.DirectiveLocation.FIELD_DEFINITION;
 import static graphql.introspection.Introspection.DirectiveLocation.FRAGMENT_SPREAD;
 import static graphql.introspection.Introspection.DirectiveLocation.INLINE_FRAGMENT;
 import static graphql.schema.GraphQLArgument.newArgument;
 import static graphql.schema.GraphQLNonNull.nonNull;
 
 /**
- * The query directives that are under stood by graphql-java
+ * The directives that are understood by graphql-java
  */
 public class Directives {
 
@@ -38,19 +36,9 @@ public class Directives {
             .build();
 
     /**
-     * @deprecated - this is no longer needed and will be removed in a future version
+     * The @defer directive can be used to defer sending data for a field till later in the query.  This is an opt in
+     * directive that is not available unless it is explicitly put into the schema.
      */
-    @Deprecated
-    public static final GraphQLDirective FetchDirective = GraphQLDirective.newDirective()
-            .name("fetch")
-            .description("Directs the SDL type generation to create a data fetcher that uses this `from` argument as the property name")
-            .argument(newArgument()
-                    .name("from")
-                    .type(nonNull(GraphQLString))
-                    .description("The `name` used to fetch values from the underlying object"))
-            .validLocations(FIELD_DEFINITION)
-            .build();
-
     public static final GraphQLDirective DeferDirective = GraphQLDirective.newDirective()
             .name("defer")
             .description("This directive allows results to be deferred during execution")
 
@@ -290,7 +290,7 @@ public static class Builder {
         private Set<GraphQLType> additionalTypes = new LinkedHashSet<>();
         // we default these in
         private Set<GraphQLDirective> additionalDirectives = new LinkedHashSet<>(
-                asList(Directives.IncludeDirective, Directives.SkipDirective, Directives.DeferDirective)
+                asList(Directives.IncludeDirective, Directives.SkipDirective)
         );
 
         private SchemaUtil schemaUtil = new SchemaUtil();
 
@@ -430,6 +430,6 @@ class StarWarsIntrospectionTests extends Specification {
         schemaParts.get('mutationType').size() == 1
         schemaParts.get('subscriptionType') == null
         schemaParts.get('types').size() == 17
-        schemaParts.get('directives').size() == 3
+        schemaParts.get('directives').size() == 2
     }
 }
@@ -1,5 +1,6 @@
 package graphql.execution.defer
 
+import graphql.Directives
 import graphql.ExecutionInput
 import graphql.ExecutionResult
 import graphql.GraphQL
@@ -131,7 +132,9 @@ class DeferSupportIntegrationTest extends Specification {
                 .type(newTypeWiring("Review").dataFetcher("comments", commentsFetcher))
                 .build()
 
-        graphQL = TestUtil.graphQL(schemaSpec, runtimeWiring).build()
+        def schema = TestUtil.schema(schemaSpec, runtimeWiring)
+                .transform({ builder -> builder.additionalDirective(Directives.DeferDirective) })
+        this.graphQL = GraphQL.newGraphQL(schema).build()
     }
 
     def "test defer support end to end"() {
 
@@ -130,7 +130,7 @@ class GraphQLSchemaTest extends Specification {
         when: "no additional directives have been specified"
         def schema = schemaBuilder.build()
         then:
-        schema.directives.size() == 3
+        schema.directives.size() == 2
 
         when: "clear directives is called"
         schema = schemaBuilder.clearDirectives().build()
Original file line number	Diff line number	Diff line change
`@@ -430,6 +430,6 @@ class StarWarsIntrospectionTests extends Specification {`
`430`	`430`	`schemaParts.get('mutationType').size() == 1`
`431`	`431`	`schemaParts.get('subscriptionType') == null`
`432`	`432`	`schemaParts.get('types').size() == 17`
`433`		`- schemaParts.get('directives').size() == 3`
	`433`	`+ schemaParts.get('directives').size() == 2`
`434`	`434`	`}`
`435`	`435`	`}`