Migrate units validation to jakarta

.github/workflows/ci.yml

@@ -11,7 +11,6 @@ jobs:
       fail-fast: false
       matrix:
         java-version:
-          - 11
           - 17
     steps:
       - uses: actions/checkout@v1

pom.xml

@@ -12,7 +12,7 @@
     <parent>
         <groupId>io.airlift</groupId>
         <artifactId>airbase</artifactId>
-        <version>129</version>
+        <version>143</version>
     </parent>
 
     <inceptionYear>2016</inceptionYear>
@@ -21,7 +21,8 @@
         <air.check.skip-license>true</air.check.skip-license>
         <air.check.skip-pmd>true</air.check.skip-pmd>
         <air.javadoc.lint>-missing</air.javadoc.lint>
-        <project.build.targetJdk>11</project.build.targetJdk>
+        <project.build.targetJdk>17</project.build.targetJdk>
+        <dep.airlift.version>234</dep.airlift.version>
     </properties>
 
     <organization>
@@ -38,8 +39,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
             <optional>true</optional>
         </dependency>
 
@@ -71,20 +72,20 @@
         <dependency>
             <groupId>io.airlift</groupId>
             <artifactId>testing</artifactId>
-            <version>218</version>
+            <version>${dep.airlift.version}</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>io.airlift</groupId>
             <artifactId>json</artifactId>
-            <version>218</version>
+            <version>${dep.airlift.version}</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.bval</groupId>
-            <artifactId>bval-jsr</artifactId>
+            <groupId>org.hibernate.validator</groupId>
+            <artifactId>hibernate-validator</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

src/main/java/io/airlift/units/DataSize.java

@@ -79,6 +79,7 @@ public static DataSize succinctBytes(long bytes)
     /**
      * Prefer {@link DataSize#of(long, Unit)} when conversion to the most 'succinct' unit is not necessary or desirable.
      * Otherwise, use {@link DataSize#succinctBytes(long)} since it will not incur rounding and loss of precision.
+     *
      * @deprecated use {@link DataSize#succinctBytes(long)} instead, double values are imprecise
      */
     @Deprecated
@@ -93,6 +94,7 @@ public static DataSize succinctDataSize(double size, Unit unit)
     /**
      * Private constructor to avoid confusing usage sites with having to pass a number of bytes
      * alongside non-bytes unit
+     *
      * @param bytes The number of bytes, regardless of unit
      * @param unit The preferred display unit of this value
      */

src/main/java/io/airlift/units/MaxDataSize.java

@@ -13,8 +13,8 @@
  */
 package io.airlift.units;
 
-import javax.validation.Constraint;
-import javax.validation.Payload;
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;

src/main/java/io/airlift/units/MaxDataSizeValidator.java

@@ -13,8 +13,8 @@
  */
 package io.airlift.units;
 
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
 
 public class MaxDataSizeValidator
         implements ConstraintValidator<MaxDataSize, DataSize>

src/main/java/io/airlift/units/MaxDuration.java

@@ -15,8 +15,8 @@
  */
 package io.airlift.units;
 
-import javax.validation.Constraint;
-import javax.validation.Payload;
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;

src/main/java/io/airlift/units/MaxDurationValidator.java

@@ -15,8 +15,8 @@
  */
 package io.airlift.units;
 
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
 
 public class MaxDurationValidator
         implements ConstraintValidator<MaxDuration, Duration>

src/main/java/io/airlift/units/MinDataSize.java

@@ -13,8 +13,8 @@
  */
 package io.airlift.units;
 
-import javax.validation.Constraint;
-import javax.validation.Payload;
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;

src/main/java/io/airlift/units/MinDataSizeValidator.java

@@ -13,8 +13,8 @@
  */
 package io.airlift.units;
 
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
 
 public class MinDataSizeValidator
         implements ConstraintValidator<MinDataSize, DataSize>

src/main/java/io/airlift/units/MinDuration.java

@@ -15,8 +15,8 @@
  */
 package io.airlift.units;
 
-import javax.validation.Constraint;
-import javax.validation.Payload;
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;

src/main/java/io/airlift/units/MinDurationValidator.java

@@ -15,8 +15,8 @@
  */
 package io.airlift.units;
 
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
 
 public class MinDurationValidator
         implements ConstraintValidator<MinDuration, Duration>

src/test/java/io/airlift/units/ConstraintValidatorAssert.java

@@ -13,12 +13,11 @@
  */
 package io.airlift.units;
 
+import jakarta.validation.ClockProvider;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
 import org.assertj.core.api.AbstractAssert;
 
-import javax.validation.ClockProvider;
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
-
 import java.lang.annotation.Annotation;
 
 final class ConstraintValidatorAssert<A extends Annotation, T>

src/test/java/io/airlift/units/MockMaxDataSize.java

@@ -13,7 +13,7 @@
  */
 package io.airlift.units;
 
-import javax.validation.Payload;
+import jakarta.validation.Payload;
 
 import java.lang.annotation.Annotation;
 

src/test/java/io/airlift/units/MockMaxDuration.java

@@ -15,7 +15,7 @@
  */
 package io.airlift.units;
 
-import javax.validation.Payload;
+import jakarta.validation.Payload;
 
 import java.lang.annotation.Annotation;
 

src/test/java/io/airlift/units/MockMinDataSize.java

@@ -13,7 +13,7 @@
  */
 package io.airlift.units;
 
-import javax.validation.Payload;
+import jakarta.validation.Payload;
 
 import java.lang.annotation.Annotation;
 

src/test/java/io/airlift/units/MockMinDuration.java

@@ -15,7 +15,7 @@
  */
 package io.airlift.units;
 
-import javax.validation.Payload;
+import jakarta.validation.Payload;
 
 import java.lang.annotation.Annotation;