feat(#5):use custom annotation instead of graphql-java-tools interfaces

Also remove the dependency on GraphQL Java Tools. Instead of using the
marker interfaces from this library, annotations of the same name are
defined for the same purpose.

Revert Reflections library version because of a critical issue.

Author: BlasiusSecundus

README.md

@@ -407,9 +407,6 @@ manually, the schema will be constructed based on the Java code. Please see the
 library for a detailed documentation of the available annotations. This readme focuses on how GraphQL Annotations - 
 GraphQL Spring Boot Starter integration works.
 
-**Note:** *Although the GraphQL Annotations Starter has a dependency on GraphQL Java Tools and uses some interfaces from 
-that project, it will ignore schema definition files. It is not possible to combine schema- and code-first approaches.*
-
 ### Configuration
 
 ```
@@ -425,8 +422,8 @@ removed from GraphQL fields automatically.
 
 ### Root resolvers, directives, type extensions 
 
-The root resolvers must be marked by the `GraphQLQueryResolver`, `GraphQLMutationResolver` and `GraphQLSubscription` 
- interfaces (from the GraphQL Java Tools library). 
+The root resolvers must be marked with the `GraphQLQueryResolver`, `GraphQLMutationResolver` and `GraphQLSubscription` 
+ annotations (not to be confused with the marker interfaces from the GraphQL Java Tools library). 
 
 **Important:**
 

gradle.properties

@@ -44,7 +44,7 @@ LIB_SPRING_BOOT_VER = 2.3.1.RELEASE
 LIB_GRAPHQL_SERVLET_VER = 9.2.0
 LIB_GRAPHQL_JAVA_TOOLS_VER = 6.1.0
 LIB_GRAPHQL_ANNOTATIONS_VER = 8.0
-LIB_REFLECTIONS_VER = 0.9.12
+LIB_REFLECTIONS_VER = 0.9.11
 LIB_APACHE_COMMONS_TEXT=1.8
 LIB_JSOUP_VER=1.13.1
 kotlin.version=1.3.72

graphql-kickstart-spring-boot-autoconfigure-graphql-annotations/build.gradle

@@ -1,11 +1,17 @@
 dependencies {
-    api project(":graphql-spring-boot-starter")
+    api(project(":graphql-spring-boot-starter")) {
+        exclude module: "graphql-kickstart-spring-boot-starter-tools-autoconfigure"
+        exclude module: "graphql-java-tools"
+    }
     api "io.github.graphql-java:graphql-java-annotations:$LIB_GRAPHQL_ANNOTATIONS_VER"
     implementation "org.reflections:reflections:$LIB_REFLECTIONS_VER"
     implementation "org.springframework.boot:spring-boot-autoconfigure"
     annotationProcessor "org.springframework.boot:spring-boot-configuration-processor"
 
     testImplementation "org.springframework.boot:spring-boot-starter-test"
-    testImplementation project(":graphql-spring-boot-starter-test")
+    testImplementation(project(":graphql-spring-boot-starter-test")) {
+        exclude module: "graphql-kickstart-spring-boot-starter-tools-autoconfigure"
+        exclude module: "graphql-java-tools"
+    }
     testImplementation "io.reactivex.rxjava2:rxjava"
 }

graphql-kickstart-spring-boot-autoconfigure-graphql-annotations/src/main/java/graphql/kickstart/graphql/annotations/GraphQLAnnotationsAutoConfiguration.java

@@ -10,10 +10,6 @@
 import graphql.kickstart.graphql.annotations.exceptions.MultipleMutationResolversException;
 import graphql.kickstart.graphql.annotations.exceptions.MultipleQueryResolversException;
 import graphql.kickstart.graphql.annotations.exceptions.MultipleSubscriptionResolversException;
-import graphql.kickstart.tools.GraphQLMutationResolver;
-import graphql.kickstart.tools.GraphQLQueryResolver;
-import graphql.kickstart.tools.GraphQLSubscriptionResolver;
-import graphql.kickstart.tools.boot.GraphQLJavaToolsAutoConfiguration;
 import graphql.relay.Relay;
 import graphql.schema.GraphQLScalarType;
 import graphql.schema.GraphQLSchema;
@@ -24,7 +20,6 @@
 import org.reflections.scanners.MethodAnnotationsScanner;
 import org.reflections.scanners.SubTypesScanner;
 import org.reflections.scanners.TypeAnnotationsScanner;
-import org.springframework.boot.autoconfigure.AutoConfigureBefore;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
@@ -40,7 +35,6 @@
 import static graphql.annotations.AnnotationsSchemaCreator.newAnnotationsSchema;
 
 @Configuration
-@AutoConfigureBefore({GraphQLJavaToolsAutoConfiguration.class})
 @EnableConfigurationProperties(GraphQLAnnotationsProperties.class)
 @RequiredArgsConstructor
 @Slf4j
@@ -107,8 +101,8 @@ private void setSubscriptionResolverClass(
         final AnnotationsSchemaCreator.Builder builder,
         final Reflections reflections
     ) {
-        final Set<Class<? extends GraphQLSubscriptionResolver>> subscriptionResolvers
-            = getSubTypesOf(reflections, GraphQLSubscriptionResolver.class);
+        final Set<Class<?>> subscriptionResolvers
+            = getTypesAnnotatedWith(reflections, GraphQLSubscriptionResolver.class);
         if (subscriptionResolvers.size() > 1) {
             throw new MultipleSubscriptionResolversException();
         }
@@ -122,8 +116,8 @@ private void setMutationResolverClass(
         final AnnotationsSchemaCreator.Builder builder,
         final Reflections reflections
     ) {
-        final Set<Class<? extends GraphQLMutationResolver>> mutationResolvers
-            = getSubTypesOf(reflections, GraphQLMutationResolver.class);
+        final Set<Class<?>> mutationResolvers
+            = getTypesAnnotatedWith(reflections, GraphQLMutationResolver.class);
         if (mutationResolvers.size() > 1) {
             throw new MultipleMutationResolversException();
         }
@@ -137,8 +131,8 @@ private void setQueryResolverClass(
         final AnnotationsSchemaCreator.Builder builder,
         final Reflections reflections
     ) {
-        final Set<Class<? extends GraphQLQueryResolver>> queryResolvers
-            = getSubTypesOf(reflections, GraphQLQueryResolver.class);
+        final Set<Class<?>> queryResolvers
+            = getTypesAnnotatedWith(reflections, GraphQLQueryResolver.class);
         if (queryResolvers.size() == 0) {
             throw new MissingQueryResolverException();
         }
@@ -170,25 +164,6 @@ private Set<Class<?>> getTypesAnnotatedWith(
         }
     }
 
-    /**
-     * Workaround for a bug in Reflections - {@link Reflections#getSubTypesOf(Class)} will throw a
-     * {@link ReflectionsException} if there are no classes in the specified package.
-     * @param reflections the {@link Reflections} instance
-     * @param aClass a class
-     * @return The set of classes that are subclasses of the specified class, or empty set if no annotations found.
-     * @see <a href="https://github.com/ronmamo/reflections/issues/273">Issue #273</>
-     */
-    private <T> Set<Class<? extends T>> getSubTypesOf(
-        final Reflections reflections,
-        final Class<T> aClass
-    ) {
-        try {
-            return reflections.getSubTypesOf(aClass);
-        } catch (ReflectionsException e) {
-            return Collections.emptySet();
-        }
-    }
-
     /**
      * This is required, because normally implementations of interfaces are not explicitly returned by any resolver
      * method, and therefor not added to the schema automatically.

graphql-kickstart-spring-boot-autoconfigure-graphql-annotations/src/main/java/graphql/kickstart/graphql/annotations/GraphQLMutationResolver.java

@@ -0,0 +1,12 @@
+package graphql.kickstart.graphql.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface GraphQLMutationResolver {
+}
+

graphql-kickstart-spring-boot-autoconfigure-graphql-annotations/src/main/java/graphql/kickstart/graphql/annotations/GraphQLQueryResolver.java

@@ -0,0 +1,11 @@
+package graphql.kickstart.graphql.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface GraphQLQueryResolver {
+}

graphql-kickstart-spring-boot-autoconfigure-graphql-annotations/src/main/java/graphql/kickstart/graphql/annotations/GraphQLSubscriptionResolver.java

@@ -0,0 +1,11 @@
+package graphql.kickstart.graphql.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface GraphQLSubscriptionResolver {
+}

graphql-kickstart-spring-boot-autoconfigure-graphql-annotations/src/test/java/graphql/kickstart/graphql/annotations/test/custom/annotation/processor/TestQuery.java

@@ -1,9 +1,10 @@
 package graphql.kickstart.graphql.annotations.test.custom.annotation.processor;
 
 import graphql.annotations.annotationTypes.GraphQLField;
-import graphql.kickstart.tools.GraphQLQueryResolver;
+import graphql.kickstart.graphql.annotations.GraphQLQueryResolver;
 
-public class TestQuery implements GraphQLQueryResolver {
+@GraphQLQueryResolver
+public class TestQuery {
 
     @GraphQLField
     public String someQuery() {

graphql-kickstart-spring-boot-autoconfigure-graphql-annotations/src/test/java/graphql/kickstart/graphql/annotations/test/custom/relay/TestQuery.java

@@ -4,11 +4,12 @@
 import graphql.annotations.connection.AbstractPaginatedData;
 import graphql.annotations.connection.GraphQLConnection;
 import graphql.annotations.connection.PaginatedData;
-import graphql.kickstart.tools.GraphQLQueryResolver;
+import graphql.kickstart.graphql.annotations.GraphQLQueryResolver;
 
 import java.util.Collections;
 
-public class TestQuery implements GraphQLQueryResolver {
+@GraphQLQueryResolver
+public class TestQuery {
 
     @GraphQLField
     @GraphQLConnection

graphql-kickstart-spring-boot-autoconfigure-graphql-annotations/src/test/java/graphql/kickstart/graphql/annotations/test/custom/type/function/TestQuery.java

@@ -1,9 +1,10 @@
 package graphql.kickstart.graphql.annotations.test.custom.type.function;
 
 import graphql.annotations.annotationTypes.GraphQLField;
-import graphql.kickstart.tools.GraphQLQueryResolver;
+import graphql.kickstart.graphql.annotations.GraphQLQueryResolver;
 
-public class TestQuery implements GraphQLQueryResolver {
+@GraphQLQueryResolver
+public class TestQuery {
 
     @GraphQLField
     public static Foo foo(){