Issue #317 Migrated javax.validation to jakarta.validation

mtedone · Jul 28, 2023 · b6ca5f6 · b6ca5f6
1 parent be66cb6
commit b6ca5f6
Show file tree

Hide file tree

Showing 14 changed files with 63 additions and 62 deletions.
diff --git a/pom.xml b/pom.xml
@@ -469,9 +469,9 @@
 			<version>2.0.7</version>
 		</dependency>
 		<dependency>
-			<groupId>javax.validation</groupId>
-			<artifactId>validation-api</artifactId>
-			<version>2.0.1.Final</version>
+			<groupId>jakarta.validation</groupId>
+			<artifactId>jakarta.validation-api</artifactId>
+			<version>3.0.2</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
@@ -510,12 +510,6 @@
 			<version>5.4.3.Final</version>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>jakarta.validation</groupId>
-			<artifactId>jakarta.validation-api</artifactId>
-			<version>3.0.2</version>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>javax.persistence</groupId>
 			<artifactId>persistence-api</artifactId>
@@ -528,6 +522,12 @@
 			<version>2.3.1</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>jakarta.annotation</groupId>
+			<artifactId>jakarta.annotation-api</artifactId>
+			<version>2.1.1</version>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.openapitools</groupId>
 			<artifactId>jackson-databind-nullable</artifactId>

diff --git a/src/main/java/uk/co/jemos/podam/api/AbstractRandomDataProviderStrategy.java b/src/main/java/uk/co/jemos/podam/api/AbstractRandomDataProviderStrategy.java
@@ -26,6 +26,8 @@
 import uk.co.jemos.podam.typeManufacturers.TypeTypeManufacturerImpl;
 import uk.co.jemos.podam.typeManufacturers.TypeManufacturer;
 
+import jakarta.validation.constraints.Email;
+
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
@@ -194,6 +196,8 @@ public AbstractRandomDataProviderStrategy(int nbrOfCollectionElements) {
 
 		TypeManufacturer<?> arrayManufacturer = new ArrayTypeManufacturerImpl();
 		typeManufacturers.put(Cloneable.class, arrayManufacturer);
+
+        addOrReplaceAttributeStrategy(Email.class, new EmailStrategy());
 	}
 
 	// ------------------->> Public methods

diff --git a/src/main/java/uk/co/jemos/podam/common/BeanValidationStrategy.java b/src/main/java/uk/co/jemos/podam/common/BeanValidationStrategy.java
@@ -8,7 +8,7 @@
 import uk.co.jemos.podam.api.PodamUtils;
 import uk.co.jemos.podam.exceptions.PodamMockeryException;
 
-import javax.validation.constraints.*;
+import jakarta.validation.constraints.*;
 import java.lang.annotation.Annotation;
 import java.math.BigDecimal;
 import java.math.BigInteger;

diff --git a/src/main/java/uk/co/jemos/podam/typeManufacturers/TypeManufacturerUtil.java b/src/main/java/uk/co/jemos/podam/typeManufacturers/TypeManufacturerUtil.java
@@ -9,11 +9,11 @@
 import uk.co.jemos.podam.api.PodamUtils;
 import uk.co.jemos.podam.common.*;
 
-import javax.validation.Constraint;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.Constraint;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.*;

diff --git a/src/site/apt/validation-api.apt b/src/site/apt/validation-api.apt
@@ -19,18 +19,18 @@ import java.util.Calendar;
 import java.util.Collection;
 import java.util.Date;
 
-import javax.validation.constraints.AssertFalse;
-import javax.validation.constraints.AssertTrue;
-import javax.validation.constraints.DecimalMax;
-import javax.validation.constraints.DecimalMin;
-import javax.validation.constraints.Digits;
-import javax.validation.constraints.Future;
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.Null;
-import javax.validation.constraints.Past;
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.AssertFalse;
+import jakarta.validation.constraints.AssertTrue;
+import jakarta.validation.constraints.DecimalMax;
+import jakarta.validation.constraints.DecimalMin;
+import jakarta.validation.constraints.Digits;
+import jakarta.validation.constraints.Future;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.Null;
+import jakarta.validation.constraints.Past;
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.Size;
 
 /**
 * POJO to test bean validation API
@@ -116,7 +116,7 @@ Assert.assertTrue("Unexpected " + violations.size() + " violations "
 
 * Custom constraints support
 
-  If you use constraint annotations, which are not part of <javax.validation.constraints>
+  If you use constraint annotations, which are not part of <jakarta.validation.constraints>
   package:
 
 +-----------------------------------

diff --git a/src/test/java/uk/co/jemos/podam/test/dto/SimplePojoWithMultipleAnnotationsToAttribute.java b/src/test/java/uk/co/jemos/podam/test/dto/SimplePojoWithMultipleAnnotationsToAttribute.java
@@ -13,9 +13,9 @@
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Version;
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.Size;
 
 /**
  * @author sba45

diff --git a/src/test/java/uk/co/jemos/podam/test/dto/ValidatedPatternPojo.java b/src/test/java/uk/co/jemos/podam/test/dto/ValidatedPatternPojo.java
@@ -4,7 +4,7 @@
 package uk.co.jemos.podam.test.dto;
 
 
-import javax.validation.constraints.Pattern;
+import jakarta.validation.constraints.Pattern;
 
 /**
  * POJO to test bean validation API

diff --git a/src/test/java/uk/co/jemos/podam/test/dto/ValidatedPojo.java b/src/test/java/uk/co/jemos/podam/test/dto/ValidatedPojo.java
@@ -17,19 +17,19 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.validation.constraints.AssertFalse;
-import javax.validation.constraints.AssertTrue;
-import javax.validation.constraints.DecimalMax;
-import javax.validation.constraints.DecimalMin;
-import javax.validation.constraints.Digits;
-import javax.validation.constraints.Future;
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Null;
-import javax.validation.constraints.Past;
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.AssertFalse;
+import jakarta.validation.constraints.AssertTrue;
+import jakarta.validation.constraints.DecimalMax;
+import jakarta.validation.constraints.DecimalMin;
+import jakarta.validation.constraints.Digits;
+import jakarta.validation.constraints.Future;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Null;
+import jakarta.validation.constraints.Past;
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.Size;
 
 /**
  * POJO to test bean validation API

diff --git a/src/test/java/uk/co/jemos/podam/test/dto/ValidatedPojo2.java b/src/test/java/uk/co/jemos/podam/test/dto/ValidatedPojo2.java
@@ -4,10 +4,10 @@
 package uk.co.jemos.podam.test.dto;
 
 
-import javax.validation.constraints.Negative;
-import javax.validation.constraints.NegativeOrZero;
-import javax.validation.constraints.Positive;
-import javax.validation.constraints.PositiveOrZero;
+import jakarta.validation.constraints.Negative;
+import jakarta.validation.constraints.NegativeOrZero;
+import jakarta.validation.constraints.Positive;
+import jakarta.validation.constraints.PositiveOrZero;
 
 /**
  * POJO to test bean validation API 2.0

diff --git a/src/test/java/uk/co/jemos/podam/test/dto/ValidatedPojoMultipleConstraints.java b/src/test/java/uk/co/jemos/podam/test/dto/ValidatedPojoMultipleConstraints.java
@@ -1,10 +1,10 @@
 package uk.co.jemos.podam.test.dto;
 
-import javax.validation.constraints.DecimalMax;
-import javax.validation.constraints.DecimalMin;
-import javax.validation.constraints.Digits;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.DecimalMax;
+import jakarta.validation.constraints.DecimalMin;
+import jakarta.validation.constraints.Digits;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 
 import org.hibernate.validator.constraints.NotEmpty;
 

diff --git a/src/test/java/uk/co/jemos/podam/test/dto/ValidationPojoForStringWithSizeAndNoMax.java b/src/test/java/uk/co/jemos/podam/test/dto/ValidationPojoForStringWithSizeAndNoMax.java
@@ -1,6 +1,6 @@
 package uk.co.jemos.podam.test.dto;
 
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.Size;
 
 /**
  * POJO to test Issue 110

diff --git a/src/test/java/uk/co/jemos/podam/test/strategies/PatternStrategy.java b/src/test/java/uk/co/jemos/podam/test/strategies/PatternStrategy.java
@@ -6,7 +6,7 @@
 import java.lang.annotation.Annotation;
 import java.util.List;
 
-import javax.validation.constraints.Pattern;
+import jakarta.validation.constraints.Pattern;
 
 import uk.co.jemos.podam.api.PodamUtils;
 import uk.co.jemos.podam.common.AttributeStrategy;

diff --git a/src/test/java/uk/co/jemos/podam/test/unit/features/annotations/AnnotationsTest.java b/src/test/java/uk/co/jemos/podam/test/unit/features/annotations/AnnotationsTest.java
@@ -6,8 +6,6 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import uk.co.jemos.podam.api.PodamFactory;
-import uk.co.jemos.podam.common.AttributeStrategy;
-import uk.co.jemos.podam.common.EmailStrategy;
 import uk.co.jemos.podam.test.dto.ConstructorWithSelfReferencesPojoAndDefaultConstructor;
 import uk.co.jemos.podam.test.dto.ExcludeAnnotationPojo;
 import uk.co.jemos.podam.test.dto.ImmutableNoHierarchicalAnnotatedPojo;
@@ -521,8 +519,7 @@ public void podamShouldAssignExactValuesDefinedInPodamStrategyValueAnnotation()
     @Title("Podam should assign exactly the values specified with the @Email annotation")
     public void podamShouldAssignExactValuesDefinedInEmailAnnotation() throws Exception {
 
-        AttributeStrategy<?> strategy = new EmailStrategy();
-        PodamFactory podamFactory = podamFactorySteps.givenAPodamFactoryWithCustomStrategy(Email.class, strategy);
+        PodamFactory podamFactory = podamFactorySteps.givenAStandardPodamFactory();
         EmailStrategyPojo pojo = podamInvocationSteps.whenIInvokeTheFactoryForClass(EmailStrategyPojo.class, podamFactory);
         podamValidationSteps.theObjectShouldNotBeNull(pojo);
         podamValidationSteps.theObjectShouldNotBeNull(pojo.getEmail());

diff --git a/src/test/java/uk/co/jemos/podam/test/unit/features/validatorFramework/ValidatedPojoTest.java b/src/test/java/uk/co/jemos/podam/test/unit/features/validatorFramework/ValidatedPojoTest.java
@@ -22,8 +22,8 @@
 import uk.co.jemos.podam.typeManufacturers.TypeManufacturer;
 
 import javax.validation.Validator;
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.Size;
 
 import java.util.ArrayList;
 import java.util.List;