Merge pull request #149 from phocassoftware/make-work-with-java-25

make work with java 25

Author: ashley-taylor

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

@@ -63,6 +63,9 @@ public static DirectiveProcessor build(EntityProcessor entityProcessor, Class<?
 			if (method.getParameterCount() != 0) {
 				continue;
 			}
+			if (!validResponseType(method.getReturnType())) {
+				continue;
+			}
 			var name = method.getName();
 
 			GraphQLArgument.Builder argument = GraphQLArgument.newArgument();
@@ -92,6 +95,16 @@ public static DirectiveProcessor build(EntityProcessor entityProcessor, Class<?
 		return new DirectiveProcessor(builder.build(), builders);
 	}
 
+	private static boolean validResponseType(Class<?> returnType) {
+		if (returnType.isArray()) {
+			return validResponseType(returnType.getComponentType());
+		}
+		if (returnType.equals(Class.class)) {
+			return false;
+		}
+		return true;
+	}
+
 	public void apply(Annotation annotation, Consumer<GraphQLAppliedDirective> builder) throws InvocationTargetException, IllegalAccessException {
 		var methods = annotation.annotationType().getDeclaredMethods();
 
@@ -101,6 +114,9 @@ public void apply(Annotation annotation, Consumer<GraphQLAppliedDirective> build
 
 		// To get the value we loop through each method and get the method name and value
 		for (Method m : methods) {
+			if (!validResponseType(m.getReturnType())) {
+				continue;
+			}
 			// Using the builder created earlier populate the values of each method.
 			arguments.argument(builders.get(m.getName()).apply(annotation));
 		}

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

@@ -56,12 +56,10 @@ void testJakartaSizeDirectiveArgumentDefinition() {
 		assertEquals(32, dir.size());
 		assertEquals("ARGUMENT_DEFINITION", ((List<String>) constraint.get("locations")).get(0));
 		assertEquals("INPUT_FIELD_DEFINITION", ((List<String>) constraint.get("locations")).get(1));
-		assertEquals(5, ((List<Object>) constraint.get("args")).size());
-		assertEquals("{name=payload}", ((List<Object>) constraint.get("args")).getFirst().toString());
-		assertEquals("{name=min}", ((List<Object>) constraint.get("args")).get(1).toString());
-		assertEquals("{name=max}", ((List<Object>) constraint.get("args")).get(2).toString());
-		assertEquals("{name=message}", ((List<Object>) constraint.get("args")).get(3).toString());
-		assertEquals("{name=groups}", ((List<Object>) constraint.get("args")).get(4).toString());
+		assertEquals(3, ((List<Object>) constraint.get("args")).size());
+		assertEquals("{name=min}", ((List<Object>) constraint.get("args")).get(0).toString());
+		assertEquals("{name=max}", ((List<Object>) constraint.get("args")).get(1).toString());
+		assertEquals("{name=message}", ((List<Object>) constraint.get("args")).get(2).toString());
 	}
 
 	@Test

graphql-builder/src/test/java/com/phocassoftware/graphql/builder/type/directive/Admin.java

@@ -27,6 +27,8 @@
 public @interface Admin {
 	String value();
 
+	Class<?>[] toIgnore() default {};
+
 	static class Processor implements DirectiveCaller<Admin> {
 
 		@Override