[WFLY-20133] Replace usage of the deprecated constraints

jmfinelli · Dec 17, 2024 · b4c40a9 · b4c40a9
1 parent 860944d
commit b4c40a9
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 12 deletions.
diff --git a/...c/src/test/java/org/jboss/as/test/integration/beanvalidation/hibernate/validator/Car.java b/...c/src/test/java/org/jboss/as/test/integration/beanvalidation/hibernate/validator/Car.java
@@ -9,9 +9,9 @@
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.AssertTrue;
 import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotEmpty;
 
-import org.hibernate.validator.constraints.NotBlank;
-import org.hibernate.validator.constraints.NotEmpty;
 import org.hibernate.validator.group.GroupSequenceProvider;
 
 /**

diff --git a/.../test/java/org/jboss/as/test/integration/beanvalidation/hibernate/validator/Employee.java b/.../test/java/org/jboss/as/test/integration/beanvalidation/hibernate/validator/Employee.java
@@ -4,7 +4,7 @@
  */
 package org.jboss.as.test.integration.beanvalidation.hibernate.validator;
 
-import org.hibernate.validator.constraints.Email;
+import jakarta.validation.constraints.Email;
 
 /**
  * @author Madhumita Sadhukhan

diff --git a/.../test/java/org/jboss/as/test/integration/beanvalidation/hibernate/validator/UserBean.java b/.../test/java/org/jboss/as/test/integration/beanvalidation/hibernate/validator/UserBean.java
@@ -4,9 +4,9 @@
  */
 package org.jboss.as.test.integration.beanvalidation.hibernate.validator;
 
-import org.hibernate.validator.constraints.Email;
-import org.hibernate.validator.constraints.NotBlank;
-import org.hibernate.validator.constraints.NotEmpty;
+import jakarta.validation.constraints.Email;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotEmpty;
 
 /**
  * @author Madhumita Sadhukhan

diff --git a/.../test/java/org/jboss/as/test/integration/jca/beanvalidation/ra/ValidAdminObjectImpl1.java b/.../test/java/org/jboss/as/test/integration/jca/beanvalidation/ra/ValidAdminObjectImpl1.java
@@ -10,8 +10,7 @@
 import jakarta.resource.Referenceable;
 import jakarta.resource.spi.ResourceAdapter;
 import jakarta.resource.spi.ResourceAdapterAssociation;
-
-import org.hibernate.validator.constraints.NotEmpty;
+import jakarta.validation.constraints.NotEmpty;
 
 /**
  * Admin object implementation

diff --git a/...egration/basic/src/test/java/org/jboss/as/test/integration/jpa/beanvalidation/Player.java b/...egration/basic/src/test/java/org/jboss/as/test/integration/jpa/beanvalidation/Player.java
@@ -12,11 +12,11 @@
 import jakarta.persistence.Inheritance;
 import jakarta.persistence.InheritanceType;
 import jakarta.persistence.Table;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotEmpty;
 
 import org.hibernate.envers.Audited;
 import org.hibernate.envers.NotAudited;
-import org.hibernate.validator.constraints.NotBlank;
-import org.hibernate.validator.constraints.NotEmpty;
 
 /**
  * @author Madhumita Sadhukhan

diff --git a/...on/basic/src/test/java/org/jboss/as/test/integration/jpa/beanvalidation/SoccerPlayer.java b/...on/basic/src/test/java/org/jboss/as/test/integration/jpa/beanvalidation/SoccerPlayer.java
@@ -7,9 +7,9 @@
 import jakarta.persistence.Entity;
 import jakarta.persistence.PrimaryKeyJoinColumn;
 import jakarta.persistence.Table;
+import jakarta.validation.constraints.NotBlank;
 
 import org.hibernate.envers.Audited;
-import org.hibernate.validator.constraints.NotBlank;
 
 /**
  * @author Madhumita Sadhukhan

diff --git a/...pa/beanvalidation/beanvalidationinheritancetest/BeanValidationJPAInheritanceTestCase.java b/...pa/beanvalidation/beanvalidationinheritancetest/BeanValidationJPAInheritanceTestCase.java
@@ -83,7 +83,7 @@ public void testConstraintValidationforJPA() throws NamingException, SQLExceptio
             String stacktrace = w.toString();
 
             if (Locale.getDefault().getLanguage().equals("en")) {
-                Assert.assertTrue(stacktrace.contains("interpolatedMessage='may not be empty', propertyPath=lastName, rootBeanClass=class org.jboss.as.test.integration.jpa.beanvalidation.SoccerPlayer"));
+                Assert.assertTrue(stacktrace.contains("interpolatedMessage='must not be empty', propertyPath=lastName, rootBeanClass=class org.jboss.as.test.integration.jpa.beanvalidation.SoccerPlayer"));
             } else {
                 Assert.assertTrue(stacktrace.contains("propertyPath=lastName, rootBeanClass=class org.jboss.as.test.integration.jpa.beanvalidation.SoccerPlayer"));
             }