feat: also use jakarta annotations in specimen

Refs: #82

Author: akutschera

pom.xml

@@ -38,15 +38,25 @@
             <artifactId>javassist</artifactId>
             <version>3.27.0-GA</version>
         </dependency>
+        <dependency>
+            <groupId>javax.validation</groupId>
+            <artifactId>validation-api</artifactId>
+            <version>2.0.1.Final</version>
+        </dependency>
         <dependency>
             <groupId>jakarta.validation</groupId>
             <artifactId>jakarta.validation-api</artifactId>
-            <version>2.0.2</version>
+            <version>3.0.1</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.persistence</groupId>
+            <artifactId>javax.persistence-api</artifactId>
+            <version>2.2</version>
         </dependency>
         <dependency>
             <groupId>jakarta.persistence</groupId>
             <artifactId>jakarta.persistence-api</artifactId>
-            <version>2.2.3</version>
+            <version>3.1.0</version>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>

src/main/java/com/github/nylle/javafixture/specimen/PrimitiveSpecimen.java

@@ -89,6 +89,10 @@ private StringConstraints getStringConstraints(Annotation[] annotations) {
                 constraints = new StringConstraints(((Size)annotation).min(), ((Size)annotation).max());
             } else if(Column.class.isAssignableFrom(annotation.annotationType())) {
                 constraints = new StringConstraints(0, ((Column) annotation).length());
+            } else if (jakarta.validation.constraints.Size.class.isAssignableFrom(annotation.annotationType())) {
+                constraints = new StringConstraints(((jakarta.validation.constraints.Size)annotation).min(), ((jakarta.validation.constraints.Size)annotation).max());
+            } else if (jakarta.persistence.Column.class.isAssignableFrom(annotation.annotationType())) {
+                constraints = new StringConstraints(0, ((jakarta.persistence.Column) annotation).length());
             }
         }
         return constraints;

src/test/java/com/github/nylle/javafixture/FixtureWithValidationTest.java

@@ -1,6 +1,7 @@
 package com.github.nylle.javafixture;
 
 import com.github.nylle.javafixture.annotations.fixture.TestWithFixture;
+import com.github.nylle.javafixture.testobjects.TestObjectWithJakartaValidationAnnotations;
 import com.github.nylle.javafixture.testobjects.TestObjectWithJavaxValidationAnnotations;
 import org.junit.jupiter.api.Test;
 
@@ -20,6 +21,16 @@ void javaxSizeAnnotationIsSupported() {
         assertThat(sut.getWithColumnLengthAnnotation().length()).isBetween(0, 5);
     }
 
+    @Test
+    void jakartaSizeAnnotationIsSupported() {
+        var sut = new Fixture().create(TestObjectWithJakartaValidationAnnotations.class);
+
+        assertThat(sut.getWithMinAnnotation().length()).isGreaterThanOrEqualTo(5);
+        assertThat(sut.getWithMaxAnnotation().length()).isLessThanOrEqualTo(100);
+        assertThat(sut.getWithMinMaxAnnotation().length()).isBetween(3, 6);
+        assertThat(sut.getWithColumnLengthAnnotation().length()).isBetween(0, 5);
+    }
+
     @Test
     void lastOfMultipleAnnotationsWins() {
         var sut = new Fixture().create(TestObjectWithJavaxValidationAnnotations.class);

src/test/java/com/github/nylle/javafixture/testobjects/TestObjectWithJakartaValidationAnnotations.java

@@ -0,0 +1,43 @@
+package com.github.nylle.javafixture.testobjects;
+
+
+import jakarta.persistence.Column;
+import jakarta.validation.constraints.Size;
+
+public class TestObjectWithJakartaValidationAnnotations {
+    @Size(min = 3, max = 6)
+    private String withMinMaxAnnotation;
+
+    @Size(min = 5)
+    private String withMinAnnotation;
+
+    @Size(max = 100)
+    private String withMaxAnnotation;
+
+    @Column(length = 5)
+    private String withColumnLengthAnnotation;
+
+    @Size(max = 100)
+    @Column(length = 5)
+    private String withMaxAnnotationAndColumnLengthAnnotation;
+
+    public String getWithMinMaxAnnotation() {
+        return withMinMaxAnnotation;
+    }
+
+    public String getWithMinAnnotation() {
+        return withMinAnnotation;
+    }
+
+    public String getWithMaxAnnotation() {
+        return withMaxAnnotation;
+    }
+
+    public String getWithColumnLengthAnnotation() {
+        return withColumnLengthAnnotation;
+    }
+
+    public String getWithColumnLengthAnnotationAndMaxAnnotation() {
+        return withMaxAnnotationAndColumnLengthAnnotation;
+    }
+}