Find protected methods as well again in scan (fix #182, fix #184)

Author: oliemansm

pom.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.graphql-java</groupId>
@@ -259,6 +260,6 @@
         <connection>scm:git:git://github.com/graphql-java/graphql-java-tools.git</connection>
         <developerConnection>scm:git:git@github.com:graphql-java/graphql-java-tools.git</developerConnection>
         <url>http://github.com/graphql-java/graphql-java-tools</url>
-      <tag>HEAD</tag>
-  </scm>
+        <tag>HEAD</tag>
+    </scm>
 </project>

src/main/kotlin/com/coxautodev/graphql/tools/FieldResolverScanner.kt

@@ -9,7 +9,6 @@ import org.apache.commons.lang3.reflect.FieldUtils
 import org.slf4j.LoggerFactory
 import java.lang.reflect.Modifier
 import java.lang.reflect.ParameterizedType
-import java.lang.reflect.TypeVariable
 
 /**
  * @author Andrew Potter
@@ -22,7 +21,7 @@ internal class FieldResolverScanner(val options: SchemaParserOptions) {
         private val log = LoggerFactory.getLogger(FieldResolverScanner::class.java)
 
         fun getAllMethods(type: Class<*>) =
-                (type.methods.toList() + ClassUtils.getAllSuperclasses(type).flatMap { it.methods.toList() })
+                (type.declaredMethods.toList() + ClassUtils.getAllSuperclasses(type).flatMap { it.methods.toList() })
                         .asSequence()
                         .filter { !it.isSynthetic }
                         .filter { !Modifier.isPrivate(it.modifiers) }
@@ -74,7 +73,6 @@ internal class FieldResolverScanner(val options: SchemaParserOptions) {
     private fun isBoolean(type: GraphQLLangType) = type.unwrap().let { it is TypeName && it.name == Scalars.GraphQLBoolean.name }
 
     private fun findResolverMethod(field: FieldDefinition, search: Search): java.lang.reflect.Method? {
-
         val methods = getAllMethods(search.type)
         val argumentCount = field.inputValueDefinitions.size + if (search.requiredFirstParameterType != null) 1 else 0
         val name = field.name

src/main/kotlin/com/coxautodev/graphql/tools/SchemaObjects.kt

@@ -3,6 +3,7 @@ package com.coxautodev.graphql.tools
 import graphql.schema.GraphQLObjectType
 import graphql.schema.GraphQLSchema
 import graphql.schema.GraphQLType
+import graphql.schema.visibility.NoIntrospectionGraphqlFieldVisibility
 
 /**
  * @author Andrew Potter
@@ -17,6 +18,7 @@ data class SchemaObjects(val query: GraphQLObjectType, val mutation: GraphQLObje
             .mutation(mutation)
             .subscription(subscription)
             .additionalTypes(dictionary)
+//            .fieldVisibility(NoIntrospectionGraphqlFieldVisibility.NO_INTROSPECTION_FIELD_VISIBILITY)
             .build()
 
     /**

src/test/java/com/coxautodev/graphql/tools/RelayConnectionTest.java

@@ -0,0 +1,60 @@
+package com.coxautodev.graphql.tools;
+
+import graphql.relay.*;
+import graphql.schema.DataFetchingEnvironment;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class RelayConnectionTest {
+
+    @Test
+    public void compiles() {
+        SchemaParser.newParser().file("RelayConnection.graphqls")
+                .resolvers(new QueryResolver())
+                .dictionary(User.class)
+                .build()
+                .makeExecutableSchema();
+    }
+
+    static class QueryResolver implements GraphQLQueryResolver {
+        // fixme #114: desired return type to use: Connection<User>
+        public UserConnection users(int first, String after, DataFetchingEnvironment env) {
+            return (UserConnection) new SimpleListConnection<User>(new ArrayList()).get(env);
+        }
+    }
+
+    // fixme #114: remove this implementation
+    static class UserConnection extends DefaultConnection<User> {
+
+        UserConnection(List<Edge<User>> edges, PageInfo pageInfo) {
+            super(edges, pageInfo);
+        }
+
+        public List<UserEdge> edges() {
+            return super.getEdges().stream()
+                    .map(UserEdge.class::cast)
+                    .collect(Collectors.toList());
+        }
+
+        public PageInfo getPageInfo() {
+            return super.getPageInfo();
+        }
+    }
+
+    // fixme #114: remove this implementation
+    static class UserEdge extends DefaultEdge<User> {
+
+        UserEdge(User node, ConnectionCursor cursor) {
+            super(node, cursor);
+        }
+
+    }
+
+    static class User {
+        Long id;
+        String name;
+    }
+}

src/test/resources/RelayConnection.graphqls

@@ -0,0 +1,22 @@
+type Query {
+    users(first: Int, after: String): UserConnection
+}
+
+type UserConnection {
+    edges: [UserEdge!]!
+    pageInfo: PageInfo!
+}
+
+type UserEdge {
+    cursor: String!
+    node: User!
+}
+
+type User {
+    id: ID!
+    name: String
+}
+
+type PageInfo {
+
+}