Added fix for NPE for objects with methods 'get' or 'is' (#11)

bpatters · Feb 10, 2017 · ec73016 · ec73016
1 parent 541d281
commit ec73016
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 2 deletions.
diff --git a/src/main/java/com/bretpatterson/schemagen/graphql/impl/GraphQLObjectMapper.java b/src/main/java/com/bretpatterson/schemagen/graphql/impl/GraphQLObjectMapper.java
@@ -154,10 +154,13 @@ private void buildGenericArgumentTypeMap(ParameterizedType type) {
 
 	private Optional<String> getFieldNameFromMethod(Method m) {
 		Optional<String> fieldName = Optional.absent();
-		if (m.getName().startsWith("get")) {
+
+		// Do not match 'get' method
+		if (m.getName().startsWith("get") && m.getName().length() > 3) {
 			fieldName =  Optional.of(m.getName().substring(3, 4).toLowerCase() + m.getName().substring(4));
 		}
-		if (m.getName().startsWith("is")) {
+		// Do not match 'is' method
+		if (m.getName().startsWith("is") && m.getName().length() > 2) {
 			fieldName = Optional.of(m.getName().substring(2, 3).toLowerCase() + m.getName().substring(3));
 		}
 		GraphQLQuery query = m.getAnnotation(GraphQLQuery.class);

diff --git a/src/test/java/com/bretpatterson/schemagen/graphql/impl/GraphQLObjectMapperTest.java b/src/test/java/com/bretpatterson/schemagen/graphql/impl/GraphQLObjectMapperTest.java
@@ -571,4 +571,28 @@ public void testAbstractMethods() {
 		assertEquals("field1", objectType.getFieldDefinition("field1").getName());
 		assertEquals(Scalars.GraphQLInt, objectType.getFieldDefinition("field1").getType());
 	}
+
+	public class GetAndIs {
+		public GetAndIs get() {
+			return this;
+		}
+
+		public boolean is(Object obj) {
+			return this == obj;
+		}
+	}
+
+	/**
+	 * Issue #10
+	 */
+	@Test
+	public void testGetAndIs() {
+		IGraphQLObjectMapper graphQLObjectMapper = newGraphQLObjectMapper(
+				ImmutableList.<IGraphQLTypeMapper> builder().addAll(GraphQLSchemaBuilder.getDefaultTypeMappers()).build());
+
+		GraphQLObjectType objectType = (GraphQLObjectType) graphQLObjectMapper.getOutputType(new TypeToken<GetAndIs>() {
+		}.getType());
+
+		assertTrue(objectType.getFieldDefinitions().isEmpty());
+	}
 }