Allow interfaces to be mapped as types or inputs

Signed-off-by:Phillip Kruger <phillip.kruger@gmail.com>

Author: phillip-kruger

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

@@ -177,8 +177,10 @@ public Reference createReference(Direction direction, ClassInfo classInfo, boole
         // we figure out this is actually an enum or interface
         ReferenceType referenceType = getCorrectReferenceType(direction);
 
+        Annotations annotationsForClass = Annotations.getAnnotationsForClass(classInfo);
+
         // Now check if this is an interface or enum
-        if (Classes.isInterface(classInfo)) {
+        if (isInterface(classInfo, annotationsForClass)) {
             // Also check that we create all implementations
             Collection<ClassInfo> knownDirectImplementors = ScanningContext.getIndex()
                     .getAllKnownImplementors(classInfo.name());
@@ -218,7 +220,7 @@ public Reference createReference(Direction direction, ClassInfo classInfo, boole
 
         // Now we should have the correct reference type.
         String className = classInfo.name().toString();
-        Annotations annotationsForClass = Annotations.getAnnotationsForClass(classInfo);
+
         String name = TypeNameHelper.getAnyTypeName(
                 addParametrizedTypeNameExtension
                         ? TypeNameHelper.createParametrizedTypeNameExtension(parametrizedTypeArgumentsReferences)
@@ -241,6 +243,18 @@ public Reference createReference(Direction direction, ClassInfo classInfo, boole
         return reference;
     }
 
+    private boolean isInterface(ClassInfo classInfo, Annotations annotationsForClass) {
+        boolean isJavaInterface = Classes.isInterface(classInfo);
+        if (isJavaInterface) {
+            if (annotationsForClass.containsOneOfTheseAnnotations(Annotations.TYPE, Annotations.INPUT)) {
+                // This should be mapped to a type/input and not an interface
+                return false;
+            }
+            return true;
+        }
+        return false;
+    }
+
     private Reference getReference(Direction direction, Type fieldType, Type methodType, Annotations annotations) {
         return getReference(direction, fieldType, methodType, annotations, null);
     }

server/tck/src/test/java/io/smallrye/graphql/SmallRyeGraphQLArchiveProcessor.java

@@ -22,6 +22,7 @@
 import io.smallrye.graphql.test.apps.fieldexistence.api.FieldExistenceApi;
 import io.smallrye.graphql.test.apps.generics.api.ControllerWithGenerics;
 import io.smallrye.graphql.test.apps.grouping.api.BookGraphQLApi;
+import io.smallrye.graphql.test.apps.interfaces.api.FoodResource;
 import io.smallrye.graphql.test.apps.jsonp.api.JsonPApi;
 import io.smallrye.graphql.test.apps.mapping.api.MappingResource;
 import io.smallrye.graphql.test.apps.mutiny.api.MutinyApi;
@@ -99,7 +100,7 @@ public void process(Archive<?> applicationArchive, TestClass testClass) {
             war.addPackage(CreatorApi.class.getPackage());
             war.addPackage(EnumListApi.class.getPackage());
             war.addPackage(ExceptionListApi.class.getPackage());
-
+            war.addPackage(FoodResource.class.getPackage());
         }
     }
 }

server/tck/src/test/java/io/smallrye/graphql/test/apps/interfaces/api/Eatable.java

@@ -0,0 +1,21 @@
+package io.smallrye.graphql.test.apps.interfaces.api;
+
+import org.eclipse.microprofile.graphql.Type;
+
+/**
+ * Define something that is fit to be consumed as food
+ * 
+ * @author Phillip Kruger (phillip.kruger@redhat.com)
+ */
+@Type
+public interface Eatable {
+
+    public String getColor();
+
+    public void setColor(String color);
+
+    public String getName();
+
+    public void setName(String name);
+
+}

server/tck/src/test/java/io/smallrye/graphql/test/apps/interfaces/api/FoodResource.java

@@ -0,0 +1,49 @@
+package io.smallrye.graphql.test.apps.interfaces.api;
+
+import org.eclipse.microprofile.graphql.GraphQLApi;
+import org.eclipse.microprofile.graphql.Query;
+
+@GraphQLApi
+public class FoodResource {
+
+    @Query
+    public Eatable getApple() {
+        return new Apple("Granny Smith", "green");
+    }
+
+    public static class Apple implements Eatable {
+
+        private String name;
+        private String color;
+
+        public Apple() {
+        }
+
+        public Apple(String name, String color) {
+            this.name = name;
+            this.color = color;
+        }
+
+        @Override
+        public String getColor() {
+            return color;
+        }
+
+        @Override
+        public void setColor(String color) {
+            this.color = color;
+        }
+
+        @Override
+        public String getName() {
+            return name;
+        }
+
+        @Override
+        public void setName(String name) {
+            this.name = name;
+        }
+
+    }
+
+}

server/tck/src/test/resources/tests/interfaceTests.csv

@@ -0,0 +1,3 @@
+# testInterfaceAsType
+1| type Query             |   apple: Eatable           |   Eatable should be mapped to a type in Query
+2| type Eatable           |   color: String            |   Eatable should be mapped to a type