Can add Size annotation

Author: josie-atkins

src/main/java/com/fleetpin/graphql/builder/DirectiveProcessor.java

@@ -27,15 +27,29 @@ public DirectiveProcessor(GraphQLDirective directive, Map<String, Function<Objec
 
 	public static DirectiveProcessor build(EntityProcessor entityProcessor, Class<? extends Annotation> directive) {
 		var builder = GraphQLDirective.newDirective().name(directive.getSimpleName());
-		var validLocations = directive.getAnnotation(Directive.class).value();
+
+		Introspection.DirectiveLocation[] validLocations;
+		if (
+			!directive.isAnnotationPresent(Directive.class) &&
+				directive
+					.getName()
+					.startsWith("jakarta.validation.constraints") // Jakarta constraint annotations don't have the Directive annotation, so we need to manually add in the locations
+		) {
+			validLocations = new Introspection.DirectiveLocation[] {
+				Introspection.DirectiveLocation.ARGUMENT_DEFINITION,
+				Introspection.DirectiveLocation.INPUT_FIELD_DEFINITION };
+		} else {
+			validLocations = directive.getAnnotation(Directive.class).value();
+
+			// Check for repeatable tag in annotation and add it
+			builder.repeatable(directive.getAnnotation(Directive.class).repeatable());
+		}
+
 		// loop through and add valid locations
 		for (Introspection.DirectiveLocation location : validLocations) {
 			builder.validLocation(location);
 		}
 
-		// Check for repeatable tag in annotation and add it
-		builder.repeatable(directive.getAnnotation(Directive.class).repeatable());
-
 		// Go through each argument and add name/type to directive
 		var methods = directive.getDeclaredMethods();
 		Map<String, Function<Object, GraphQLAppliedDirectiveArgument>> builders = new HashMap<>();

src/main/java/com/fleetpin/graphql/builder/DirectivesSchema.java

@@ -61,7 +61,7 @@ public static DirectivesSchema build(List<RestrictTypeFactory<?>> globalDirectiv
 				}
 				continue;
 			}
-			if (!directiveType.isAnnotationPresent(Directive.class)) {
+			if (!directiveType.isAnnotationPresent(Directive.class) && !directiveType.getName().startsWith("jakarta.validation.constraints")) {
 				continue;
 			}
 			if (!directiveType.isAnnotation()) {

src/main/java/com/fleetpin/graphql/builder/MethodProcessor.java

@@ -2,13 +2,17 @@
 
 import com.fleetpin.graphql.builder.annotations.*;
 import graphql.GraphQLContext;
+import graphql.GraphQLError;
+import graphql.execution.DataFetcherResult;
 import graphql.schema.*;
 import graphql.schema.GraphQLFieldDefinition.Builder;
+import graphql.validation.rules.ValidationRules;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
+import java.util.List;
 import java.util.function.Function;
 
 import static com.fleetpin.graphql.builder.EntityUtil.isContext;
@@ -61,8 +65,7 @@ void process(AuthorizerSchema authorizer, Method method) throws ReflectiveOperat
 		object.field(process(authorizer, coordinates, null, method));
 	}
 
-	Builder process(AuthorizerSchema authorizer, FieldCoordinates coordinates, TypeMeta parentMeta, Method method)
-		throws InvocationTargetException, IllegalAccessException {
+	Builder process(AuthorizerSchema authorizer, FieldCoordinates coordinates, TypeMeta parentMeta, Method method) {
 		GraphQLFieldDefinition.Builder field = GraphQLFieldDefinition.newFieldDefinition();
 
 		entityProcessor.addSchemaDirective(method, method.getDeclaringClass(), field::withAppliedDirective);
@@ -133,8 +136,17 @@ private DataFetcher<?> buildDataFetcher(TypeMeta meta, Method method) {
 			resolvers[i] = buildResolver(name, argMeta, parameter.getAnnotations());
 		}
 
+		ValidationRules validationRules = ValidationRules
+			.newValidationRules()
+			.build();
+
 		DataFetcher<?> fetcher = env -> {
 			try {
+				List<GraphQLError> errors = validationRules.runValidationRules(env);
+				if (!errors.isEmpty()) {
+					return DataFetcherResult.newResult().errors(errors).data(null).build();
+				}
+
 				Object[] args = new Object[resolvers.length];
 				for (int i = 0; i < resolvers.length; i++) {
 					args[i] = resolvers[i].apply(env);

src/main/java/com/fleetpin/graphql/builder/SchemaBuilder.java

@@ -14,6 +14,7 @@
 import com.fleetpin.graphql.builder.annotations.*;
 import graphql.schema.GraphQLScalarType;
 import graphql.schema.GraphQLSchema;
+import jakarta.validation.constraints.Size;
 import org.reflections.Reflections;
 import org.reflections.scanners.Scanners;
 
@@ -161,11 +162,17 @@ private static DirectivesSchema getDirectivesSchema(Reflections reflections) thr
 			Set<Class<?>> directivesTypes = reflections.getTypesAnnotatedWith(Directive.class);
 			directivesTypes.addAll(reflections.getTypesAnnotatedWith(DataFetcherWrapper.class));
 
+			addAllJakartaAnnotations(directivesTypes);
+
 			List<RestrictTypeFactory<?>> globalRestricts = getGlobalRestricts(reflections);
 
 			return DirectivesSchema.build(globalRestricts, directivesTypes);
 		}
 
+		private static void addAllJakartaAnnotations(Set<Class<?>> directivesTypes) {
+			directivesTypes.add(Size.class); // use reflection?
+		}
+
 		private static List<RestrictTypeFactory<?>> getGlobalRestricts(Reflections reflections)
 			throws InstantiationException, IllegalAccessException, InvocationTargetException, NoSuchMethodException {
 			Set<Class<?>> restrict = reflections.getTypesAnnotatedWith(Restrict.class);
@@ -198,7 +205,7 @@ private static List<RestrictTypeFactory<?>> getGlobalRestricts(Reflections refle
 					globalRestricts.add(factory);
 				}
 			}
-			
+
 			return globalRestricts;
 		}
 	}

src/test/java/com/fleetpin/graphql/builder/JakartaValidationDirectiveTest.java

@@ -20,7 +20,7 @@ public class JakartaValidationDirectiveTest {
 	public void testJakartaArgumentAnnotationChangedToConstraint() {
 		GraphQL schema = GraphQL.newGraphQL(SchemaBuilder.build("com.fleetpin.graphql.builder.type.directive")).build();
 		var name = schema.getGraphQLSchema().getFieldDefinition(FieldCoordinates.coordinates(schema.getGraphQLSchema().getMutationType(), "setName"));
-		var constraint = name.getArgument("name").getAppliedDirective("Constraint");
+		var constraint = name.getArgument("name").getAppliedDirective("Size");
 		var argument = constraint.getArgument("min");
 		var min = argument.getValue();
 		assertEquals(3, min);
@@ -30,7 +30,7 @@ public void testJakartaArgumentAnnotationChangedToConstraint() {
 	public void testDirectiveArgumentDefinition() {
 		Map<String, Object> response = execute("query IntrospectionQuery { __schema { directives { name locations args { name } } } }", null).getData();
 		List<LinkedHashMap<String, Object>> dir = (List<LinkedHashMap<String, Object>>) ((Map<String, Object>) response.get("__schema")).get("directives");
-		LinkedHashMap<String, Object> constraint = dir.stream().filter(map -> map.get("name").equals("Constraint")).collect(Collectors.toList()).get(0);
+		LinkedHashMap<String, Object> constraint = dir.stream().filter(map -> map.get("name").equals("Size")).collect(Collectors.toList()).get(0);
 
 		assertEquals(9, dir.size());
 		assertEquals("ARGUMENT_DEFINITION", ((List<String>) constraint.get("locations")).get(0));