made getPropertyViaGetter cleaner

ayhanap · ayhanap · commit c25ed3eaee0b · 2016-08-20T02:45:55.000+03:00
diff --git a/src/main/java/graphql/schema/PropertyDataFetcher.java b/src/main/java/graphql/schema/PropertyDataFetcher.java
@@ -27,20 +27,18 @@ public Object get(DataFetchingEnvironment environment) {
     }
 
     private Object getPropertyViaGetter(Object object, GraphQLOutputType outputType) {
-        boolean isBooleanProperty = isBooleanProperty(outputType);
-        String prefix = isBooleanProperty ? "is" : "get";
         try {
-            return getPropertyViaGetterUsingPrefix(object, outputType, prefix);
-        } catch (NoSuchMethodException e) {
-            if (isBooleanProperty){
+            if (isBooleanProperty(outputType)) {
                 try {
+                    return getPropertyViaGetterUsingPrefix(object, outputType, "is");
+                } catch (NoSuchMethodException e) {
                     return getPropertyViaGetterUsingPrefix(object, outputType, "get");
-                } catch (NoSuchMethodException e1) {
-                    return getPropertyViaFieldAccess(object, outputType);
                 }
-            }else{
-                return getPropertyViaFieldAccess(object, outputType);
+            } else {
+                return getPropertyViaGetterUsingPrefix(object, outputType, "get");
             }
+        } catch (NoSuchMethodException e1) {
+            return getPropertyViaFieldAccess(object, outputType);
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -27,20 +27,18 @@ public Object get(DataFetchingEnvironment environment) {`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`private Object getPropertyViaGetter(Object object, GraphQLOutputType outputType) {`
`30`		`- boolean isBooleanProperty = isBooleanProperty(outputType);`
`31`		`- String prefix = isBooleanProperty ? "is" : "get";`
`32`	`30`	`try {`
`33`		`- return getPropertyViaGetterUsingPrefix(object, outputType, prefix);`
`34`		`- } catch (NoSuchMethodException e) {`
`35`		`- if (isBooleanProperty){`
	`31`	`+ if (isBooleanProperty(outputType)) {`
`36`	`32`	`try {`
	`33`	`+ return getPropertyViaGetterUsingPrefix(object, outputType, "is");`
	`34`	`+ } catch (NoSuchMethodException e) {`
`37`	`35`	`return getPropertyViaGetterUsingPrefix(object, outputType, "get");`
`38`		`- } catch (NoSuchMethodException e1) {`
`39`		`- return getPropertyViaFieldAccess(object, outputType);`
`40`	`36`	`}`
`41`		`- }else{`
`42`		`- return getPropertyViaFieldAccess(object, outputType);`
	`37`	`+ } else {`
	`38`	`+ return getPropertyViaGetterUsingPrefix(object, outputType, "get");`
`43`	`39`	`}`
	`40`	`+ } catch (NoSuchMethodException e1) {`
	`41`	`+ return getPropertyViaFieldAccess(object, outputType);`
`44`	`42`	`}`
`45`	`43`	`}`
`46`	`44`