improved boolean detection

andimarek · andimarek · commit 2bbdee48e147 · 2015-08-16T23:33:39.000+02:00
diff --git a/src/main/java/graphql/schema/PropertyDataFetcher.java b/src/main/java/graphql/schema/PropertyDataFetcher.java
@@ -1,12 +1,12 @@
 package graphql.schema;
 
 
-import graphql.Scalars;
-
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.Map;
 
+import static graphql.Scalars.GraphQLBoolean;
+
 public class PropertyDataFetcher implements DataFetcher {
 
     private final String propertyName;
@@ -22,11 +22,11 @@ public Object get(DataFetchingEnvironment environment) {
         if (source instanceof Map) {
             return ((Map<?, ?>) source).get(propertyName);
         }
-        return getPropertyViaGetter(source,environment.getFieldType());
+        return getPropertyViaGetter(source, environment.getFieldType());
     }
 
     private Object getPropertyViaGetter(Object object, GraphQLOutputType outputType) {
-        String prefix = outputType == Scalars.GraphQLBoolean ? "is" : "get";
+        String prefix = isBooleanProperty(outputType) ? "is" : "get";
         String getterName = prefix + propertyName.substring(0, 1).toUpperCase() + propertyName.substring(1);
         try {
             Method method = object.getClass().getMethod(getterName);
@@ -38,4 +38,12 @@ private Object getPropertyViaGetter(Object object, GraphQLOutputType outputType)
             throw new RuntimeException(e);
         }
     }
+
+    private boolean isBooleanProperty(GraphQLOutputType outputType) {
+        if (outputType == GraphQLBoolean) return true;
+        if (outputType instanceof GraphQLNonNull) {
+            return ((GraphQLNonNull) outputType).getWrappedType() == GraphQLBoolean;
+        }
+        return false;
+    }
 }
