Resolved issues after rebase

Thomas Draier · Thomas Draier · commit 7369cb0fab50 · 2017-10-18T12:11:59.000+02:00
diff --git a/src/main/java/graphql/annotations/DefaultTypeFunction.java b/src/main/java/graphql/annotations/DefaultTypeFunction.java
@@ -62,7 +62,7 @@ public boolean canBuildType(Class<?> aClass, AnnotatedType annotatedType) {
         }
 
         @Override
-        public GraphQLType buildType(String typeName, Class<?> aClass, AnnotatedType annotatedType) {
+        public GraphQLType buildType(boolean inputType, Class<?> aClass, AnnotatedType annotatedType) {
             return Scalars.GraphQLID;
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public boolean canBuildType(Class<?> aClass, AnnotatedType annotatedType) {`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`@Override`
`65`		`- public GraphQLType buildType(String typeName, Class<?> aClass, AnnotatedType annotatedType) {`
	`65`	`+ public GraphQLType buildType(boolean inputType, Class<?> aClass, AnnotatedType annotatedType) {`
`66`	`66`	`return Scalars.GraphQLID;`
`67`	`67`	`}`
`68`	`68`	`}`