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 '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, getDirectiveLocation());
         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/Creator.java

@@ -13,4 +13,6 @@
 public interface Creator<T> {
 
     T create(ClassInfo classInfo, Reference reference);
+
+    String getDirectiveLocation();
 }

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

@@ -77,8 +77,13 @@ public EnumType create(ClassInfo classInfo, Reference reference) {
         return enumType;
     }
 
+    @Override
+    public String getDirectiveLocation() {
+        return "ENUM";
+    }
+
     private List<DirectiveInstance> getDirectiveInstances(Annotations annotations) {
-        return directives.buildDirectiveInstances(annotations);
+        return directives.buildDirectiveInstances(annotations, getDirectiveLocation());
     }
 
 }

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

@@ -37,7 +37,6 @@
  */
 public class InputTypeCreator implements Creator<InputType> {
     private static final Logger LOG = Logger.getLogger(InputTypeCreator.class.getName());
-
     private final FieldCreator fieldCreator;
     private Directives directives;
 
@@ -78,6 +77,11 @@ public InputType create(ClassInfo classInfo, Reference reference) {
         return inputType;
     }
 
+    @Override
+    public String getDirectiveLocation() {
+        return "INPUT_OBJECT";
+    }
+
     public boolean hasUseableConstructor(ClassInfo classInfo) {
         MethodInfo constructor = findCreator(classInfo);
         return constructor != null;
@@ -138,7 +142,7 @@ public void setDirectives(Directives directives) {
     }
 
     private List<DirectiveInstance> getDirectiveInstances(Annotations annotations) {
-        return directives.buildDirectiveInstances(annotations);
+        return directives.buildDirectiveInstances(annotations, getDirectiveLocation());
     }
 
     private void addFields(InputType inputType, ClassInfo classInfo, Reference reference) {

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

@@ -57,6 +57,11 @@ protected void addFields(Type interfaceType, ClassInfo classInfo, Reference refe
         }
     }
 
+    @Override
+    public String getDirectiveLocation() {
+        return "INTERFACE";
+    }
+
     private static final String JAVA_DOT = "java.";
 
     /**

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

@@ -112,4 +112,8 @@ private boolean isNotGenericType(MethodInfo method) {
                         type.kind() != org.jboss.jandex.Type.Kind.PARAMETERIZED_TYPE);
     }
 
+    @Override
+    public String getDirectiveLocation() {
+        return "OBJECT";
+    }
 }

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

@@ -41,4 +41,11 @@ public UnionType create(ClassInfo classInfo, Reference reference) {
 
         return new UnionType(classInfo.name().toString(), name, maybeDescription.orElse(null));
     }
+
+    // TODO: create feature that allows adding UNION directives  (graphql.schema)
+    @Override
+    public String getDirectiveLocation() {
+        return "UNION";
+    }
+
 }

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

@@ -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,6 +1,6 @@
 package io.smallrye.graphql.index.app;
 
-import static io.smallrye.graphql.api.DirectiveLocation.FIELD;
+import static io.smallrye.graphql.api.DirectiveLocation.FIELD_DEFINITION;
 import static io.smallrye.graphql.api.DirectiveLocation.INTERFACE;
 import static io.smallrye.graphql.api.DirectiveLocation.OBJECT;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
@@ -9,7 +9,7 @@
 
 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/DirectiveLocation.java

@@ -32,7 +32,7 @@ public enum DirectiveLocation {
     INLINE_FRAGMENT,
     VARIABLE_DEFINITION,
 
-    // TypeSystemDirectiveLocation
+    // TypeSystemDirectiveLocation:
     SCHEMA,
     SCALAR,
     OBJECT,

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.DirectiveLocation.OBJECT;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 import java.lang.annotation.Retention;

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

@@ -1,13 +1,13 @@
 package io.smallrye.graphql.schema;
 
-import static io.smallrye.graphql.api.DirectiveLocation.FIELD;
+import static io.smallrye.graphql.api.DirectiveLocation.FIELD_DEFINITION;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 import java.lang.annotation.Retention;
 
 import io.smallrye.graphql.api.Directive;
 
 @Retention(RUNTIME)
-@Directive(on = FIELD)
+@Directive(on = FIELD_DEFINITION)
 public @interface FieldDirective {
 }

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

@@ -3,6 +3,8 @@
 import org.eclipse.microprofile.graphql.GraphQLApi;
 import org.eclipse.microprofile.graphql.Query;
 
+import io.smallrye.graphql.schema.schemadirectives.OutputDirective;
+
 @GraphQLApi
 public class InputTestApi {
 
@@ -11,6 +13,11 @@ public int query(InputWithDirectives input) {
         return 0;
     }
 
+    @Query
+    public int someQuery(SomeObject someObject) {
+        return 1;
+    }
+
     @InputDirective
     public static class InputWithDirectives {
         @InputDirective
@@ -21,4 +28,13 @@ public void setBar(int bar) {
         }
     }
 
+    @OutputDirective
+    public static class SomeObject {
+        int boo;
+
+        public void setBoo(int boo) {
+            this.boo = boo;
+        }
+    }
+
 }

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

@@ -1,13 +1,13 @@
 package io.smallrye.graphql.schema;
 
-import static io.smallrye.graphql.api.DirectiveLocation.*;
+import static io.smallrye.graphql.api.DirectiveLocation.FIELD_DEFINITION;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 import java.lang.annotation.Retention;
 
 import io.smallrye.graphql.api.Directive;
 
 @Retention(RUNTIME)
-@Directive(on = { QUERY, MUTATION, SUBSCRIPTION })
+@Directive(on = { FIELD_DEFINITION })
 public @interface OperationDirective {
 }

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

@@ -55,6 +55,7 @@
 import io.smallrye.graphql.schema.rolesallowedschemas.RolesSchema2;
 import io.smallrye.graphql.schema.rolesallowedschemas.RolesSchema3;
 import io.smallrye.graphql.schema.schemadirectives.NonRepeatableSchemaDirective;
+import io.smallrye.graphql.schema.schemadirectives.OutputDirective;
 import io.smallrye.graphql.schema.schemadirectives.RepeatableSchemaDirective;
 import io.smallrye.graphql.schema.schemadirectives.Schema1;
 import io.smallrye.graphql.schema.schemadirectives.Schema2;
@@ -125,8 +126,8 @@ void schemaWithEnumDirectives() {
 
     @Test
     void schemaWithInputDirectives() {
-        GraphQLSchema graphQLSchema = createGraphQLSchema(InputDirective.class, InputTestApi.class,
-                InputTestApi.InputWithDirectives.class);
+        GraphQLSchema graphQLSchema = createGraphQLSchema(InputDirective.class, OutputDirective.class, InputTestApi.class,
+                InputTestApi.InputWithDirectives.class, InputTestApi.SomeObject.class);
 
         GraphQLInputObjectType inputWithDirectives = graphQLSchema.getTypeAs("InputWithDirectivesInput");
         assertNotNull(inputWithDirectives.getDirective("inputDirective"),
@@ -135,6 +136,10 @@ void schemaWithInputDirectives() {
                 "Input type field InputWithDirectivesInput.foo should have directive @inputDirective");
         assertNotNull(inputWithDirectives.getField("bar").getDirective("inputDirective"),
                 "Input type field InputWithDirectivesInput.bar should have directive @inputDirective");
+
+        GraphQLInputObjectType outputAsInputWithDirectives = graphQLSchema.getTypeAs("SomeObjectInput");
+        assertNull(outputAsInputWithDirectives.getDirective("outputDirective"),
+                "Input type SomeObject should not have directive @outputDirective");
     }
 
     @Test

server/implementation/src/test/java/io/smallrye/graphql/schema/schemadirectives/OutputDirective.java

@@ -0,0 +1,13 @@
+package io.smallrye.graphql.schema.schemadirectives;
+
+import static io.smallrye.graphql.api.DirectiveLocation.OBJECT;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
+
+import io.smallrye.graphql.api.Directive;
+
+@Retention(RUNTIME)
+@Directive(on = { OBJECT })
+public @interface OutputDirective {
+}

server/implementation/src/test/resources/schemaTest.graphql

@@ -9,7 +9,7 @@ directive @deprecated(
     reason: String = "No longer supported"
   ) on FIELD_DEFINITION | ARGUMENT_DEFINITION | ENUM_VALUE | INPUT_FIELD_DEFINITION
 
-directive @fieldDirective on FIELD
+directive @fieldDirective on FIELD_DEFINITION
 
 "Directs the executor to include this field or fragment only when the `if` argument is true"
 directive @include(
@@ -20,7 +20,7 @@ directive @include(
 "test-description"
 directive @intArrayTestDirective(value: [Int]) on OBJECT | INTERFACE
 
-directive @operationDirective on QUERY | MUTATION | SUBSCRIPTION
+directive @operationDirective on FIELD_DEFINITION
 
 "Used to specify the role required to execute a given field or operation."
 directive @rolesAllowed(value: String) on FIELD_DEFINITION