Filter out @Valid annotations from jakarta.validation

Add test for filtering out @Valid annotations

Although validation using the Jakarta validation API is not yet supported (it would require a Hibernator version bump and likely migration away from javax validation), this adds a dependency on it to test filtering out Jakarta @Valid annotations.

pom.xml

@@ -62,6 +62,7 @@
         <asm-version>7.2</asm-version>
         <validation-api-version>2.0.1.Final</validation-api-version>
         <hibernate-validator-version>6.2.0.Final</hibernate-validator-version>
+        <jakarta-validation-api-version>3.1.0</jakarta-validation-api-version>
         <javax-el-version>3.0.1-b09</javax-el-version>
     </properties>
 
@@ -164,6 +165,12 @@
                 <version>${validation-api-version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>jakarta.validation</groupId>
+                <artifactId>jakarta.validation-api</artifactId>
+                <version>${jakarta-validation-api-version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>org.hibernate.validator</groupId>
                 <artifactId>hibernate-validator</artifactId>

record-builder-processor/src/main/java/io/soabase/recordbuilder/processor/InternalRecordBuilderProcessor.java

@@ -53,7 +53,8 @@ class InternalRecordBuilderProcessor {
 
     private static final TypeName optionalType = TypeName.get(Optional.class);
     private static final TypeName overrideType = TypeName.get(Override.class);
-    private static final TypeName validType = ClassName.get("javax.validation", "Valid");
+    private static final TypeName javaxValidType = ClassName.get("javax.validation", "Valid");
+    private static final TypeName jakartaValidType = ClassName.get("jakarta.validation", "Valid");
     private static final TypeName validatorTypeName = ClassName.get("io.soabase.recordbuilder.validator",
             "RecordBuilderValidator");
     private static final TypeVariableName rType = TypeVariableName.get("R");
@@ -868,7 +869,7 @@ private boolean filterOutOverride(AnnotationSpec annotationSpec) {
     }
 
     private boolean filterOutValid(AnnotationSpec annotationSpec) {
-        return !annotationSpec.type.equals(validType);
+        return !annotationSpec.type.equals(javaxValidType) && !annotationSpec.type.equals(jakartaValidType);
     }
 
     private void addConstructorAnnotations(RecordClassType component, ParameterSpec.Builder parameterSpecBuilder) {

record-builder-test/pom.xml

@@ -36,6 +36,11 @@
             <artifactId>validation-api</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>io.soabase.record-builder</groupId>
             <artifactId>record-builder-processor</artifactId>

record-builder-test/src/main/java/io/soabase/recordbuilder/test/RequestWithValid.java

@@ -23,7 +23,8 @@
 
 @RecordBuilder
 @RecordBuilder.Options(useValidationApi = true)
-public record RequestWithValid(@NotNull @Valid Part part) implements RequestWithValidBuilder.With {
+public record RequestWithValid(@NotNull @Valid @jakarta.validation.Valid Part part)
+        implements RequestWithValidBuilder.With {
     public record Part(@NotBlank String name) {
     }
 }

record-builder-test/src/test/java/io/soabase/recordbuilder/test/TestAnnotated.java

@@ -18,6 +18,7 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
+import javax.validation.Valid;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
@@ -31,6 +32,18 @@ void testInheritComponentAnnotationsFalse() throws NoSuchMethodException {
         Assertions.assertNull(method.getAnnotation(NotNull.class));
     }
 
+    @Test
+    void testFiltersOutJavaXValid() throws NoSuchMethodException {
+        var method = RequestWithValidBuilder.With.class.getMethod("part");
+        Assertions.assertNull(method.getAnnotation(Valid.class));
+    }
+
+    @Test
+    void testFiltersOutJakartaValid() throws NoSuchMethodException {
+        var method = RequestWithValidBuilder.With.class.getMethod("part");
+        Assertions.assertNull(method.getAnnotation(jakarta.validation.Valid.class));
+    }
+
     @Test
     void testStaticConstructor() throws NoSuchMethodException {
         var method = AnnotatedBuilder.class.getMethod("Annotated", String.class, Integer.TYPE, Double.TYPE);