Added directive filtration for SchemaDirectives (TypeSystemDirectiveL…

…ocation)

common/schema-builder/src/main/java/io/smallrye/graphql/schema/SchemaBuilder.java

@@ -128,7 +128,7 @@ private Schema generateSchema() {
             Annotations annotations = Annotations.getAnnotationsForClass(graphQLApiAnnotation.target().asClass());
             schema.getDirectiveInstances()
                     .addAll(directivesHelper
-                            .buildDirectiveInstances(annotations)
+                            .buildDirectiveInstances(annotations, "SCHEMA")
                             .stream()
                             .map(directiveInstance -> {
                                 String directiveClassName = directiveInstance.getType().getClassName();

common/schema-builder/src/main/java/io/smallrye/graphql/schema/creator/ArgumentCreator.java

@@ -39,6 +39,11 @@ public ArgumentCreator(ReferenceCreator referenceCreator) {
         deprecatedHelper = new DeprecatedDirectivesHelper();
     }
 
+    @Override
+    public String getDirectiveLocation() {
+        return "ARGUMENT_DEFINITION";
+    }
+
     /**
      * Create an argument model. Arguments exist on Operations as input parameters
      *

common/schema-builder/src/main/java/io/smallrye/graphql/schema/creator/DirectiveTypeCreator.java

@@ -26,6 +26,12 @@ public DirectiveTypeCreator(ReferenceCreator referenceCreator) {
         super(referenceCreator);
     }
 
+    @Override
+    public String getDirectiveLocation() {
+        throw new IllegalArgumentException(
+                "This method should never be called since it DirectiveType cannot have another Directives");
+    }
+
     private static DotName NON_NULL = DotName.createSimple("org.eclipse.microprofile.graphql.NonNull");
 
     public DirectiveType create(ClassInfo classInfo) {

common/schema-builder/src/main/java/io/smallrye/graphql/schema/creator/FieldCreator.java

@@ -40,6 +40,11 @@ public FieldCreator(ReferenceCreator referenceCreator) {
         deprecatedHelper = new DeprecatedDirectivesHelper();
     }
 
+    @Override
+    public String getDirectiveLocation() {
+        return "FIELD_DEFINITION";
+    }
+
     /**
      * Creates a field from a method only.This is used in the case of an interface
      *

common/schema-builder/src/main/java/io/smallrye/graphql/schema/creator/ModelCreator.java

@@ -43,7 +43,7 @@ public TypeAutoNameStrategy getTypeAutoNameStrategy() {
     }
 
     /**
-     * The the return type.This is usually the method return type, but can also be adapted to something else
+     * The return type.This is usually the method return type, but can also be adapted to something else
      *
      * @param methodInfo method
      * @return the return type
@@ -60,6 +60,8 @@ protected static Type getReturnType(FieldInfo fieldInfo) {
 
     }
 
+    public abstract String getDirectiveLocation();
+
     protected void populateField(Direction direction, Field field, Type type, Annotations annotations) {
         // Wrapper
         field.setWrapper(WrapperCreator.createWrapper(type).orElse(null));
@@ -97,7 +99,15 @@ private void doPopulateField(Direction direction, Field field, Type type, Annota
 
         // Directives
         if (directives != null) { // this happens while scanning for the directive types
-            field.addDirectiveInstances(directives.buildDirectiveInstances(annotations));
+            field.addDirectiveInstances(directives.buildDirectiveInstances(annotations, getDirectiveLocation(direction)));
+        }
+    }
+
+    private String getDirectiveLocation(Direction direction) {
+        String directiveLocation = getDirectiveLocation();
+        if (direction.equals(Direction.IN) && directiveLocation.equals("FIELD_DEFINITION")) {
+            return "INPUT_FIELD_DEFINITION";
         }
+        return directiveLocation;
     }
 }

common/schema-builder/src/main/java/io/smallrye/graphql/schema/creator/OperationCreator.java

@@ -255,4 +255,9 @@ private void addDirectivesForRolesAllowed(Annotations annotationsForPojo, Annota
             operation.addDirectiveInstance(rolesAllowedDirectives);
         }
     }
+
+    @Override
+    public String getDirectiveLocation() {
+        return "FIELD_DEFINITION";
+    }
 }

common/schema-builder/src/main/java/io/smallrye/graphql/schema/creator/type/AbstractCreator.java

@@ -74,15 +74,14 @@ public Type create(ClassInfo classInfo, Reference reference) {
         addOperations(type, classInfo);
 
         // Directives
-        addDirectives(type, annotations);
-
+        addDirectives(type, annotations, type.isInterface() ? "INTERFACE" : "OBJECT");
         return type;
     }
 
     protected abstract void addFields(Type type, ClassInfo classInfo, Reference reference);
 
-    private void addDirectives(Type type, Annotations annotations) {
-        type.setDirectiveInstances(directives.buildDirectiveInstances(annotations));
+    private void addDirectives(Type type, Annotations annotations, String directiveLocation) {
+        type.setDirectiveInstances(directives.buildDirectiveInstances(annotations, directiveLocation));
     }
 
     private void addPolymorphicTypes(Type type, ClassInfo classInfo, Reference reference) {

common/schema-builder/src/main/java/io/smallrye/graphql/schema/creator/type/EnumCreator.java

@@ -78,7 +78,7 @@ public EnumType create(ClassInfo classInfo, Reference reference) {
     }
 
     private List<DirectiveInstance> getDirectiveInstances(Annotations annotations) {
-        return directives.buildDirectiveInstances(annotations);
+        return directives.buildDirectiveInstances(annotations, "ENUM");
     }
 
 }

common/schema-builder/src/main/java/io/smallrye/graphql/schema/creator/type/InputTypeCreator.java

@@ -6,6 +6,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 import org.jboss.jandex.ClassInfo;
 import org.jboss.jandex.FieldInfo;
@@ -37,7 +38,7 @@
  */
 public class InputTypeCreator implements Creator<InputType> {
     private static final Logger LOG = Logger.getLogger(InputTypeCreator.class.getName());
-
+    private static final String DIRECTIVE_LOCATION = "INPUT_OBJECT";
     private final FieldCreator fieldCreator;
     private Directives directives;
 
@@ -138,7 +139,15 @@ public void setDirectives(Directives directives) {
     }
 
     private List<DirectiveInstance> getDirectiveInstances(Annotations annotations) {
-        return directives.buildDirectiveInstances(annotations);
+        return directives.buildDirectiveInstances(annotations, "INPUT_OBJECT");
+    }
+
+    private List<DirectiveInstance> filterUnwantedDirectiveInstances(List<DirectiveInstance> directiveInstances,
+            String directivesLocation) {
+        return directiveInstances.stream()
+                .filter(directiveInstance -> directiveInstance.getType()
+                        .getLocations().contains(directivesLocation))
+                .collect(Collectors.toList());
     }
 
     private void addFields(InputType inputType, ClassInfo classInfo, Reference reference) {

common/schema-builder/src/main/java/io/smallrye/graphql/schema/helper/Directives.java

@@ -38,12 +38,13 @@ public Directives(List<DirectiveType> directiveTypes) {
         }
     }
 
-    public List<DirectiveInstance> buildDirectiveInstances(Annotations annotations) {
+    public List<DirectiveInstance> buildDirectiveInstances(Annotations annotations, String directiveLocation) {
         // only build directive instances from `@Directive` annotations here (that means the `directiveTypes` map),
         // because `directiveTypesOther` directives get their instances added on-the-go by classes that extend `ModelCreator`
         return directiveTypes.keySet().stream()
                 .flatMap(annotations::resolve)
                 .map(this::toDirectiveInstance)
+                .filter(directiveInstance -> directiveInstance.getType().getLocations().contains(directiveLocation))
                 .collect(toList());
     }
 

common/schema-builder/src/test/java/io/smallrye/graphql/index/SchemaBuilderTest.java

@@ -136,7 +136,7 @@ public void testSchemaWithDirectives() throws IOException {
         Path apiDir = Paths.get(System.getProperty("user.dir"), "../../server/api/target/classes/io/smallrye/graphql/api")
                 .normalize();
         indexer.index(Files.newInputStream(apiDir.resolve("Directive.class")));
-        indexer.index(Files.newInputStream(apiDir.resolve("DirectiveLocation.class")));
+        indexer.index(Files.newInputStream(apiDir.resolve("TypeSystemDirectiveLocation.class")));
         indexer.index(getResourceAsStream("io/smallrye/graphql/index/app/SomeDirective.class"));
         indexer.index(getResourceAsStream("io/smallrye/graphql/index/app/Movie.class"));
         indexer.index(getResourceAsStream("io/smallrye/graphql/index/app/MovieTriviaController.class"));
@@ -153,7 +153,7 @@ public void testSchemaWithDirectives() throws IOException {
         assertEquals("someDirective", someDirective.getName());
         assertEquals(SomeDirective.class.getName(), someDirective.getClassName());
         assertEquals(singleton("value"), someDirective.argumentNames());
-        assertEquals(new HashSet<>(asList("INTERFACE", "FIELD", "OBJECT")), someDirective.getLocations());
+        assertEquals(new HashSet<>(asList("INTERFACE", "FIELD_DEFINITION", "OBJECT")), someDirective.getLocations());
 
         // check directive instances on type
         Type movie = schema.getTypes().get("Movie");

common/schema-builder/src/test/java/io/smallrye/graphql/index/app/SomeDirective.java

@@ -1,15 +1,15 @@
 package io.smallrye.graphql.index.app;
 
-import static io.smallrye.graphql.api.DirectiveLocation.FIELD;
-import static io.smallrye.graphql.api.DirectiveLocation.INTERFACE;
-import static io.smallrye.graphql.api.DirectiveLocation.OBJECT;
+import static io.smallrye.graphql.api.TypeSystemDirectiveLocation.FIELD_DEFINITION;
+import static io.smallrye.graphql.api.TypeSystemDirectiveLocation.INTERFACE;
+import static io.smallrye.graphql.api.TypeSystemDirectiveLocation.OBJECT;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 import java.lang.annotation.Retention;
 
 import io.smallrye.graphql.api.Directive;
 
-@Directive(on = { OBJECT, INTERFACE, FIELD })
+@Directive(on = { OBJECT, INTERFACE, FIELD_DEFINITION })
 @Retention(RUNTIME)
 public @interface SomeDirective {
     String[] value();

server/api/src/main/java/io/smallrye/graphql/api/Deprecated.java

@@ -1,9 +1,9 @@
 package io.smallrye.graphql.api;
 
-import static io.smallrye.graphql.api.DirectiveLocation.ARGUMENT_DEFINITION;
-import static io.smallrye.graphql.api.DirectiveLocation.ENUM_VALUE;
-import static io.smallrye.graphql.api.DirectiveLocation.FIELD_DEFINITION;
-import static io.smallrye.graphql.api.DirectiveLocation.INPUT_FIELD_DEFINITION;
+import static io.smallrye.graphql.api.TypeSystemDirectiveLocation.ARGUMENT_DEFINITION;
+import static io.smallrye.graphql.api.TypeSystemDirectiveLocation.ENUM_VALUE;
+import static io.smallrye.graphql.api.TypeSystemDirectiveLocation.FIELD_DEFINITION;
+import static io.smallrye.graphql.api.TypeSystemDirectiveLocation.INPUT_FIELD_DEFINITION;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

server/api/src/main/java/io/smallrye/graphql/api/Directive.java

@@ -33,5 +33,5 @@
 @Target(ANNOTATION_TYPE)
 @Experimental("Not covered by the specification, yet, so subject to change.")
 public @interface Directive {
-    DirectiveLocation[] on();
+    TypeSystemDirectiveLocation[] on();
 }

server/api/src/main/java/io/smallrye/graphql/api/ExecutableDirectiveLocation.java

@@ -0,0 +1,12 @@
+package io.smallrye.graphql.api;
+
+public enum ExecutableDirectiveLocation {
+    QUERY,
+    MUTATION,
+    SUBSCRIPTION,
+    FIELD,
+    FRAGMENT_DEFINITION,
+    FRAGMENT_SPREAD,
+    INLINE_FRAGMENT,
+    VARIABLE_DEFINITION,
+}

server/api/src/main/java/io/smallrye/graphql/api/DirectiveLocation.java → server/api/src/main/java/io/smallrye/graphql/api/TypeSystemDirectiveLocation.java

@@ -21,18 +21,7 @@
  *
  * @see <a href="http://spec.graphql.org/draft/#DirectiveLocations">GraphQL Spec Directives</a>
  */
-public enum DirectiveLocation {
-    // ExecutableDirectiveLocations:
-    QUERY,
-    MUTATION,
-    SUBSCRIPTION,
-    FIELD,
-    FRAGMENT_DEFINITION,
-    FRAGMENT_SPREAD,
-    INLINE_FRAGMENT,
-    VARIABLE_DEFINITION,
-
-    // TypeSystemDirectiveLocation
+public enum TypeSystemDirectiveLocation {
     SCHEMA,
     SCALAR,
     OBJECT,

server/api/src/main/java/io/smallrye/graphql/api/federation/ComposeDirective.java

@@ -1,6 +1,6 @@
 package io.smallrye.graphql.api.federation;
 
-import static io.smallrye.graphql.api.DirectiveLocation.SCHEMA;
+import static io.smallrye.graphql.api.TypeSystemDirectiveLocation.SCHEMA;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 import java.lang.annotation.Repeatable;

server/api/src/main/java/io/smallrye/graphql/api/federation/Extends.java

@@ -1,7 +1,7 @@
 package io.smallrye.graphql.api.federation;
 
-import static io.smallrye.graphql.api.DirectiveLocation.INTERFACE;
-import static io.smallrye.graphql.api.DirectiveLocation.OBJECT;
+import static io.smallrye.graphql.api.TypeSystemDirectiveLocation.INTERFACE;
+import static io.smallrye.graphql.api.TypeSystemDirectiveLocation.OBJECT;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 import java.lang.annotation.Retention;

server/api/src/main/java/io/smallrye/graphql/api/federation/External.java

@@ -1,7 +1,7 @@
 package io.smallrye.graphql.api.federation;
 
-import static io.smallrye.graphql.api.DirectiveLocation.FIELD_DEFINITION;
-import static io.smallrye.graphql.api.DirectiveLocation.OBJECT;
+import static io.smallrye.graphql.api.TypeSystemDirectiveLocation.FIELD_DEFINITION;
+import static io.smallrye.graphql.api.TypeSystemDirectiveLocation.OBJECT;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 import java.lang.annotation.Retention;

server/api/src/main/java/io/smallrye/graphql/api/federation/Inaccessible.java

@@ -1,15 +1,15 @@
 package io.smallrye.graphql.api.federation;
 
-import static io.smallrye.graphql.api.DirectiveLocation.ARGUMENT_DEFINITION;
-import static io.smallrye.graphql.api.DirectiveLocation.ENUM;
-import static io.smallrye.graphql.api.DirectiveLocation.ENUM_VALUE;
-import static io.smallrye.graphql.api.DirectiveLocation.FIELD_DEFINITION;
-import static io.smallrye.graphql.api.DirectiveLocation.INPUT_FIELD_DEFINITION;
-import static io.smallrye.graphql.api.DirectiveLocation.INPUT_OBJECT;
-import static io.smallrye.graphql.api.DirectiveLocation.INTERFACE;
-import static io.smallrye.graphql.api.DirectiveLocation.OBJECT;
-import static io.smallrye.graphql.api.DirectiveLocation.SCALAR;
-import static io.smallrye.graphql.api.DirectiveLocation.UNION;
+import static io.smallrye.graphql.api.TypeSystemDirectiveLocation.ARGUMENT_DEFINITION;
+import static io.smallrye.graphql.api.TypeSystemDirectiveLocation.ENUM;
+import static io.smallrye.graphql.api.TypeSystemDirectiveLocation.ENUM_VALUE;
+import static io.smallrye.graphql.api.TypeSystemDirectiveLocation.FIELD_DEFINITION;
+import static io.smallrye.graphql.api.TypeSystemDirectiveLocation.INPUT_FIELD_DEFINITION;
+import static io.smallrye.graphql.api.TypeSystemDirectiveLocation.INPUT_OBJECT;
+import static io.smallrye.graphql.api.TypeSystemDirectiveLocation.INTERFACE;
+import static io.smallrye.graphql.api.TypeSystemDirectiveLocation.OBJECT;
+import static io.smallrye.graphql.api.TypeSystemDirectiveLocation.SCALAR;
+import static io.smallrye.graphql.api.TypeSystemDirectiveLocation.UNION;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 import java.lang.annotation.Retention;

server/api/src/main/java/io/smallrye/graphql/api/federation/InterfaceObject.java

@@ -1,6 +1,6 @@
 package io.smallrye.graphql.api.federation;
 
-import static io.smallrye.graphql.api.DirectiveLocation.*;
+import static io.smallrye.graphql.api.TypeSystemDirectiveLocation.*;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 import java.lang.annotation.Retention;

server/api/src/main/java/io/smallrye/graphql/api/federation/Key.java

@@ -1,7 +1,7 @@
 package io.smallrye.graphql.api.federation;
 
-import static io.smallrye.graphql.api.DirectiveLocation.INTERFACE;
-import static io.smallrye.graphql.api.DirectiveLocation.OBJECT;
+import static io.smallrye.graphql.api.TypeSystemDirectiveLocation.INTERFACE;
+import static io.smallrye.graphql.api.TypeSystemDirectiveLocation.OBJECT;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 import java.lang.annotation.Repeatable;

server/api/src/main/java/io/smallrye/graphql/api/federation/Override.java

@@ -1,6 +1,6 @@
 package io.smallrye.graphql.api.federation;
 
-import static io.smallrye.graphql.api.DirectiveLocation.FIELD_DEFINITION;
+import static io.smallrye.graphql.api.TypeSystemDirectiveLocation.FIELD_DEFINITION;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 import java.lang.annotation.Retention;

server/api/src/main/java/io/smallrye/graphql/api/federation/Provides.java

@@ -1,6 +1,6 @@
 package io.smallrye.graphql.api.federation;
 
-import static io.smallrye.graphql.api.DirectiveLocation.FIELD_DEFINITION;
+import static io.smallrye.graphql.api.TypeSystemDirectiveLocation.FIELD_DEFINITION;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 import java.lang.annotation.Retention;

server/api/src/main/java/io/smallrye/graphql/api/federation/Requires.java

@@ -1,6 +1,6 @@
 package io.smallrye.graphql.api.federation;
 
-import static io.smallrye.graphql.api.DirectiveLocation.FIELD_DEFINITION;
+import static io.smallrye.graphql.api.TypeSystemDirectiveLocation.FIELD_DEFINITION;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 import java.lang.annotation.Retention;

server/api/src/main/java/io/smallrye/graphql/api/federation/Shareable.java

@@ -1,7 +1,7 @@
 package io.smallrye.graphql.api.federation;
 
-import static io.smallrye.graphql.api.DirectiveLocation.FIELD_DEFINITION;
-import static io.smallrye.graphql.api.DirectiveLocation.OBJECT;
+import static io.smallrye.graphql.api.TypeSystemDirectiveLocation.FIELD_DEFINITION;
+import static io.smallrye.graphql.api.TypeSystemDirectiveLocation.OBJECT;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 import java.lang.annotation.Retention;

server/api/src/main/java/io/smallrye/graphql/api/federation/Tag.java

@@ -1,15 +1,15 @@
 package io.smallrye.graphql.api.federation;
 
-import static io.smallrye.graphql.api.DirectiveLocation.ARGUMENT_DEFINITION;
-import static io.smallrye.graphql.api.DirectiveLocation.ENUM;
-import static io.smallrye.graphql.api.DirectiveLocation.ENUM_VALUE;
-import static io.smallrye.graphql.api.DirectiveLocation.FIELD_DEFINITION;
-import static io.smallrye.graphql.api.DirectiveLocation.INPUT_FIELD_DEFINITION;
-import static io.smallrye.graphql.api.DirectiveLocation.INPUT_OBJECT;
-import static io.smallrye.graphql.api.DirectiveLocation.INTERFACE;
-import static io.smallrye.graphql.api.DirectiveLocation.OBJECT;
-import static io.smallrye.graphql.api.DirectiveLocation.SCALAR;
-import static io.smallrye.graphql.api.DirectiveLocation.UNION;
+import static io.smallrye.graphql.api.TypeSystemDirectiveLocation.ARGUMENT_DEFINITION;
+import static io.smallrye.graphql.api.TypeSystemDirectiveLocation.ENUM;
+import static io.smallrye.graphql.api.TypeSystemDirectiveLocation.ENUM_VALUE;
+import static io.smallrye.graphql.api.TypeSystemDirectiveLocation.FIELD_DEFINITION;
+import static io.smallrye.graphql.api.TypeSystemDirectiveLocation.INPUT_FIELD_DEFINITION;
+import static io.smallrye.graphql.api.TypeSystemDirectiveLocation.INPUT_OBJECT;
+import static io.smallrye.graphql.api.TypeSystemDirectiveLocation.INTERFACE;
+import static io.smallrye.graphql.api.TypeSystemDirectiveLocation.OBJECT;
+import static io.smallrye.graphql.api.TypeSystemDirectiveLocation.SCALAR;
+import static io.smallrye.graphql.api.TypeSystemDirectiveLocation.UNION;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 import java.lang.annotation.Repeatable;

server/implementation/src/test/java/io/smallrye/graphql/schema/ArgumentDirective.java

@@ -1,6 +1,6 @@
 package io.smallrye.graphql.schema;
 
-import static io.smallrye.graphql.api.DirectiveLocation.ARGUMENT_DEFINITION;
+import static io.smallrye.graphql.api.TypeSystemDirectiveLocation.ARGUMENT_DEFINITION;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 import java.lang.annotation.Retention;