Tests pass

Author: josie-atkins

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

@@ -51,11 +51,9 @@ private DirectivesSchema(
 		this.jakartaDirectives = jakartaDirectives;
 	}
 
-	//TODO:mess of exceptions
+	// TODO:mess of exceptions
 	public static DirectivesSchema build(
-		List<RestrictTypeFactory<?>> globalDirectives,
-		Set<Class<?>> directiveTypes,
-		Set<Class<?>> jakartaDirectiveTypes
+		List<RestrictTypeFactory<?>> globalDirectives, Set<Class<?>> directiveTypes, Set<Class<?>> jakartaDirectiveTypes
 	) throws ReflectiveOperationException {
 		Map<Class<? extends Annotation>, DirectiveCaller<?>> targets = new HashMap<>();
 

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

@@ -21,8 +21,16 @@
 import graphql.GraphQLContext;
 import graphql.GraphQLError;
 import graphql.execution.DataFetcherResult;
-import graphql.schema.*;
+import graphql.schema.DataFetcher;
+import graphql.schema.DataFetchingEnvironment;
+import graphql.schema.FieldCoordinates;
+import graphql.schema.GraphQLAppliedDirective;
+import graphql.schema.GraphQLAppliedDirectiveArgument;
+import graphql.schema.GraphQLArgument;
+import graphql.schema.GraphQLCodeRegistry;
+import graphql.schema.GraphQLFieldDefinition;
 import graphql.schema.GraphQLFieldDefinition.Builder;
+import graphql.schema.GraphQLObjectType;
 import graphql.validation.rules.ValidationRules;
 
 import java.lang.annotation.Annotation;
@@ -151,9 +159,7 @@ private DataFetcher<?> buildDataFetcher(TypeMeta meta, Method method) {
 			resolvers[i] = buildResolver(name, argMeta, parameter.getAnnotations());
 		}
 
-		ValidationRules validationRules = ValidationRules
-			.newValidationRules()
-			.build();
+		ValidationRules validationRules = ValidationRules.newValidationRules().build();
 
 		DataFetcher<?> fetcher = env -> {
 			try {

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

@@ -12,18 +12,22 @@
 package com.phocassoftware.graphql.builder;
 
 import com.phocassoftware.graphql.builder.annotations.*;
+import graphql.scalars.ExtendedScalars;
 import graphql.schema.GraphQLScalarType;
 import graphql.schema.GraphQLSchema;
-import graphql.scalars.ExtendedScalars;
-import jakarta.validation.Constraint;
-import org.reflections.Reflections;
-import org.reflections.scanners.Scanners;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 import java.util.stream.Collectors;
 
+import jakarta.validation.Constraint;
+import org.reflections.Reflections;
+import org.reflections.scanners.Scanners;
+
 import static org.reflections.scanners.Scanners.SubTypes;
 
 public class SchemaBuilder {

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

@@ -14,7 +14,6 @@
 import java.util.stream.Collectors;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
 
 class JakartaValidationDirectiveTest {
 	@Test
@@ -63,10 +62,9 @@ void testJakartaSizeValidationIsApplied() {
 		assertEquals(name, result);
 
 		name = "Po";
-		response = execute("mutation setName($name: String!){setName(name: $name)} ", Map.of("name", name)).getData();
+		var error = execute("mutation setName($name: String!){setName(name: $name)} ", Map.of("name", name)).getErrors().getFirst();
 
-		// TODO: response is currently null, I would expect it to return an error.
-		assertNull(response);
+		assertEquals("size must be between 3 and 2147483647", error.getMessage());
 	}
 
 	@Test
@@ -78,16 +76,14 @@ void testJakartaMinAndMaxValidationIsApplied() {
 		assertEquals(age, result);
 
 		age = 2;
-		response = execute("mutation setAge($age: int!){setAge(age: $age)} ", Map.of("age", age)).getData();
+		var error = execute("mutation setAge($age: Int!){setAge(age: $age)} ", Map.of("age", age)).getErrors().getFirst();
 
-		// TODO: response is currently null, I would expect it to return an error.
-		assertNull(response);
+		assertEquals("must be greater than or equal to 3", error.getMessage());
 
 		age = 100;
-		response = execute("mutation setAge($age: int!){setAge(age: $age)} ", Map.of("age", age)).getData();
+		error = execute("mutation setAge($age: Int!){setAge(age: $age)} ", Map.of("age", age)).getErrors().getFirst();
 
-		// TODO: response is currently null, I would expect it to return an error.
-		assertNull(response);
+		assertEquals("must be less than or equal to 99", error.getMessage());
 	}
 
 	private ExecutionResult execute(String query, Map<String, Object> variables) {