Merge pull request #163 from phocassoftware/ignore-not-propogating-from-field.-Local-Context-not-coming-through

fix ignore propagation and local context

Author: ashley-taylor

graphql-builder/src/main/java/com/phocassoftware/graphql/builder/EntityUtil.java

@@ -98,6 +98,11 @@ public static Optional<String> getter(Method method) {
 			} else {
 				name = method.getName().substring("is".length(), "is".length() + 1).toLowerCase() + method.getName().substring("is".length() + 1);
 			}
+
+			if (fieldSpecifiesIgnore(method, name)) {
+				return Optional.empty();
+			}
+
 			return Optional.of(getName(name, method));
 		}
 		return Optional.empty();
@@ -122,12 +127,32 @@ public static Optional<String> setter(Method method) {
 		} else if (method.getName().matches("set[A-Z].*")) {
 			if (method.getParameterCount() == 1 && !method.isAnnotationPresent(InputIgnore.class)) {
 				String name = method.getName().substring("set".length(), "set".length() + 1).toLowerCase() + method.getName().substring("set".length() + 1);
+
+				if (fieldSpecifiesIgnore(method, name)) {
+					return Optional.empty();
+				}
+
 				return Optional.of(getName(name, method));
 			}
 		}
 		return Optional.empty();
 	}
 
+	static boolean fieldSpecifiesIgnore(Method method, String name) {
+		var fields = method.getDeclaringClass().getDeclaredFields();
+		for (var field : fields) {
+			if (!field.getName().equals(name)) {
+				continue;
+			}
+			if (!field.isAnnotationPresent(GraphQLIgnore.class)) {
+				return false;
+			}
+
+			return field.getType().equals(method.getReturnType());
+		}
+		return false;
+	}
+
 	static String getName(String fallback, AnnotatedElement... annotated) {
 		for (var anno : annotated) {
 			if (anno.isAnnotationPresent(GraphQLName.class)) {

graphql-builder/src/main/java/com/phocassoftware/graphql/builder/TypeMeta.java

@@ -12,6 +12,9 @@
 package com.phocassoftware.graphql.builder;
 
 import com.phocassoftware.graphql.builder.annotations.InnerNullable;
+
+import graphql.execution.DataFetcherResult;
+
 import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
@@ -199,6 +202,18 @@ private void process(Class<?> type, Type genericType, AnnotatedElement element)
 			}
 			return;
 		}
+		if (DataFetcherResult.class.isAssignableFrom(type)) {
+			types.add(type);
+			genericType = ((ParameterizedType) genericType).getActualTypeArguments()[0];
+			if (genericType instanceof ParameterizedType) {
+				process((Class<?>) ((ParameterizedType) genericType).getRawType(), genericType, element);
+			} else if (genericType instanceof TypeVariable) {
+				processGeneric(parent, (TypeVariable) genericType, element);
+			} else {
+				process((Class<?>) genericType, null, element);
+			}
+			return;
+		}
 
 		if (Optional.class.isAssignableFrom(type)) {
 			flags.add(Flag.OPTIONAL);

graphql-builder/src/test/java/com/phocassoftware/graphql/builder/ContextTest.java

@@ -64,6 +64,18 @@ public void testMissing() throws ReflectiveOperationException {
 		assertTrue(error.getMessage().contains("Context object notPresent not found"));
 	}
 
+	@Test
+	public void testLocalContext() throws ReflectiveOperationException {
+		var response = execute("""
+			query {
+				localContext {
+					name
+				}
+			}
+			""", b -> b.graphQLContext(c -> c.of("context", new GraphContext("not john")))).getData();
+		assertEquals(Map.of("localContext", Map.of("name", "John")), response);
+	}
+
 	private ExecutionResult execute(String query, Consumer<ExecutionInput.Builder> modify) {
 		GraphQL schema = GraphQL
 			.newGraphQL(new IntrospectionWithDirectivesSupport().apply(SchemaBuilder.build("com.phocassoftware.graphql.builder.context")))

graphql-builder/src/test/java/com/phocassoftware/graphql/builder/IgnoreTest.java

@@ -0,0 +1,71 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.phocassoftware.graphql.builder;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.Map;
+
+import org.junit.jupiter.api.Test;
+
+import graphql.*;
+import graphql.introspection.IntrospectionWithDirectivesSupport;
+
+public class IgnoreTest {
+
+	@Test
+	public void testValid() {
+		var response = execute(
+			"""
+				query person {
+					person {
+						age
+						occupation
+					}
+				}
+				""",
+			Map.of()
+		);
+		assertEquals(Map.of("person", Map.of("age", 30, "occupation", true)), response.getData());
+	}
+
+	@Test
+	public void testErrors() {
+		var response = execute(
+			"""
+				query person {
+					person {
+						age
+						name
+					}
+				}
+				""",
+			Map.of()
+		);
+		assertTrue(response.getErrors().size() > 0);
+		assertTrue(response.getErrors().getFirst().getMessage().contains("Field 'name' in type 'Person' is undefined"));
+	}
+
+	private ExecutionResult execute(String query, Map<String, Object> variables) {
+		GraphQL schema = GraphQL
+			.newGraphQL(new IntrospectionWithDirectivesSupport().apply(SchemaBuilder.build("com.phocassoftware.graphql.builder.ignore")))
+			.build();
+		var input = ExecutionInput.newExecutionInput();
+		input.query(query);
+		if (variables != null) {
+			input.variables(variables);
+		}
+		ExecutionResult result = schema.execute(input);
+		return result;
+	}
+}

graphql-builder/src/test/java/com/phocassoftware/graphql/builder/context/Queries.java

@@ -14,6 +14,7 @@
 import com.phocassoftware.graphql.builder.annotations.Context;
 import com.phocassoftware.graphql.builder.annotations.Query;
 import graphql.GraphQLContext;
+import graphql.execution.DataFetcherResult;
 import graphql.schema.DataFetchingEnvironment;
 
 public class Queries {
@@ -47,4 +48,17 @@ public static boolean namedParemeterContext(@Context String context) {
 	public static boolean missingContext(GraphContext notPresent) {
 		return false;
 	}
+
+	@Query
+	public static DataFetcherResult<Person> localContext(GraphContext context) {
+		return DataFetcherResult.<Person>newResult().data(new Person()).localContext(new GraphContext("John")).build();
+	}
+
+	public static class Person {
+
+		public String getName(GraphContext context) {
+			return context.getSomething();
+		}
+
+	}
 }

graphql-builder/src/test/java/com/phocassoftware/graphql/builder/ignore/Queries.java

@@ -0,0 +1,52 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.phocassoftware.graphql.builder.ignore;
+
+import com.phocassoftware.graphql.builder.annotations.GraphQLIgnore;
+import com.phocassoftware.graphql.builder.annotations.Query;
+
+public class Queries {
+
+	@Query
+	public static Person person() {
+		return new Person("John", 30, "Engineer");
+	}
+
+	public static class Person {
+
+		@GraphQLIgnore
+		private final String name;
+		private final int age;
+		@GraphQLIgnore
+		private final String occupation;
+
+		public Person(String name, int age, String occupation) {
+			super();
+			this.name = name;
+			this.age = age;
+			this.occupation = occupation;
+		}
+
+		public String getName() {
+			return name;
+		}
+
+		public int getAge() {
+			return age;
+		}
+
+		public boolean getOccupation() {
+			return true;
+		}
+	}
+
+}