Merge pull request #12 from tedliang/feature/jakarta

Update to jakarta

build.gradle.kts

@@ -18,7 +18,7 @@ testSets {
 }
 
 
-val jacksonVersion = "2.12.5"
+val jacksonVersion = "2.15.2"
 
 
 configurations {
@@ -34,7 +34,7 @@ tasks.named("check") {
 
 dependencies {
     api("com.fasterxml.jackson.core:jackson-databind:$jacksonVersion")
-    api("javax.validation:validation-api:2.0.1.Final")
+    api("jakarta.validation:jakarta.validation-api:3.0.2")
 
     compileOnly("com.google.code.findbugs:jsr305:3.0.2")
     compileOnly(kotlin("stdlib-jdk8"))
@@ -51,13 +51,13 @@ dependencies {
     testImplementation("com.fasterxml.jackson.datatype:jackson-datatype-jdk8:$jacksonVersion")
     testImplementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jacksonVersion")
     testImplementation("com.fasterxml.jackson.module:jackson-module-kotlin:$jacksonVersion")
-    testImplementation("org.hibernate.validator:hibernate-validator:6.2.0.Final")
+    testImplementation("org.hibernate.validator:hibernate-validator:8.0.1.Final")
 
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
     testRuntimeOnly("ch.qos.logback:logback-classic:1.2.3")
 
     "javaOnlyTestImplementation"("org.junit.jupiter:junit-jupiter-api")
-    "javaOnlyTestImplementation"("org.hibernate.validator:hibernate-validator:6.2.0.Final")
+    "javaOnlyTestImplementation"("org.hibernate.validator:hibernate-validator:8.0.1.Final")
 }
 
 
@@ -82,7 +82,7 @@ tasks.withType<Test> {
 }
 
 val jacksonCompatVersions = mapOf(
-    "2.9" to (9..10), "2.10" to (4..5), "2.11" to (0..4), "2.12" to (0..5), "2.13" to (0..0)
+    "2.13" to (0..5), "2.14" to (0..3), "2.15" to (0..2)
 ).flatMap { (majorMinor, patchVersions) -> patchVersions.map { "$majorMinor.$it" } }
 
 for (compatVersion in jacksonCompatVersions) {

src/java-only-test/java/org/unbrokendome/jackson/beanvalidation/BeanValidationTest.java

@@ -7,10 +7,10 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-import javax.validation.ConstraintViolationException;
-import javax.validation.Validation;
-import javax.validation.ValidatorFactory;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.ConstraintViolationException;
+import jakarta.validation.Validation;
+import jakarta.validation.ValidatorFactory;
+import jakarta.validation.constraints.NotNull;
 
 class BeanValidationTest {
 

src/java-only-test/java/org/unbrokendome/jackson/beanvalidation/JavaOnlyTest.java

@@ -7,10 +7,10 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-import javax.validation.ConstraintViolationException;
-import javax.validation.Validation;
-import javax.validation.ValidatorFactory;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.ConstraintViolationException;
+import jakarta.validation.Validation;
+import jakarta.validation.ValidatorFactory;
+import jakarta.validation.constraints.NotNull;
 
 class JavaOnlyTest {
 

src/main/java/org/unbrokendome/jackson/beanvalidation/AbstractConstraintDescriptor.java

@@ -1,11 +1,11 @@
 package org.unbrokendome.jackson.beanvalidation;
 
-import javax.validation.ConstraintTarget;
-import javax.validation.ConstraintValidator;
-import javax.validation.Payload;
-import javax.validation.ValidationException;
-import javax.validation.metadata.ConstraintDescriptor;
-import javax.validation.metadata.ValidateUnwrappedValue;
+import jakarta.validation.ConstraintTarget;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.Payload;
+import jakarta.validation.ValidationException;
+import jakarta.validation.metadata.ConstraintDescriptor;
+import jakarta.validation.metadata.ValidateUnwrappedValue;
 import java.lang.annotation.Annotation;
 import java.util.Arrays;
 import java.util.Collections;

src/main/java/org/unbrokendome/jackson/beanvalidation/BeanValidationModule.java

@@ -8,8 +8,8 @@
 import com.fasterxml.jackson.databind.deser.DeserializationProblemHandler;
 
 import javax.annotation.Nullable;
-import javax.validation.ConstraintViolationException;
-import javax.validation.ValidatorFactory;
+import jakarta.validation.ConstraintViolationException;
+import jakarta.validation.ValidatorFactory;
 import java.io.IOException;
 import java.util.EnumSet;
 

src/main/java/org/unbrokendome/jackson/beanvalidation/ConstructorValidatorFactory.java

@@ -1,7 +1,7 @@
 package org.unbrokendome.jackson.beanvalidation;
 
-import javax.validation.Validator;
-import javax.validation.ValidatorFactory;
+import jakarta.validation.Validator;
+import jakarta.validation.ValidatorFactory;
 import java.lang.reflect.Constructor;
 
 public interface ConstructorValidatorFactory {

src/main/java/org/unbrokendome/jackson/beanvalidation/InvalidObject.java

@@ -2,8 +2,8 @@
 
 import com.fasterxml.jackson.core.JsonStreamContext;
 
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.ConstraintViolationException;
 import java.util.Collections;
 import java.util.LinkedHashSet;
 import java.util.Set;

src/main/java/org/unbrokendome/jackson/beanvalidation/JsonConstraints.java

@@ -1,8 +1,8 @@
 package org.unbrokendome.jackson.beanvalidation;
 
 import javax.annotation.Nullable;
-import javax.validation.Payload;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Payload;
+import jakarta.validation.constraints.NotNull;
 import java.lang.annotation.Annotation;
 
 
@@ -104,7 +104,7 @@ static JsonRequired required(@Nullable String messageTemplate) {
     private static final class DefaultNotNull
             extends AbstractDefaultAnnotation implements NotNull {
 
-        private static final String DEFAULT_MESSAGE = "{javax.validation.constraints.NotNull.message}";
+        private static final String DEFAULT_MESSAGE = "{jakarta.validation.constraints.NotNull.message}";
 
         @Override
         public String message() {

src/main/java/org/unbrokendome/jackson/beanvalidation/JsonRequired.java

@@ -1,7 +1,7 @@
 package org.unbrokendome.jackson.beanvalidation;
 
-import javax.validation.Payload;
-import javax.validation.metadata.ConstraintDescriptor;
+import jakarta.validation.Payload;
+import jakarta.validation.metadata.ConstraintDescriptor;
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

src/main/java/org/unbrokendome/jackson/beanvalidation/JsonValidInput.java

@@ -2,8 +2,8 @@
 
 import com.fasterxml.jackson.databind.exc.MismatchedInputException;
 
-import javax.validation.Payload;
-import javax.validation.metadata.ConstraintDescriptor;
+import jakarta.validation.Payload;
+import jakarta.validation.metadata.ConstraintDescriptor;
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

src/main/java/org/unbrokendome/jackson/beanvalidation/KotlinValidatingBeanDeserializer.java

@@ -6,10 +6,10 @@
 import com.fasterxml.jackson.databind.deser.SettableBeanProperty;
 
 import javax.annotation.Nullable;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import javax.validation.ValidatorFactory;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.ConstraintViolationException;
+import jakarta.validation.ValidatorFactory;
+import jakarta.validation.constraints.NotNull;
 import java.io.IOException;
 import java.util.Collections;
 import java.util.HashSet;

src/main/java/org/unbrokendome/jackson/beanvalidation/NotNullConstraintDescriptor.java

@@ -1,7 +1,7 @@
 package org.unbrokendome.jackson.beanvalidation;
 
-import javax.validation.Payload;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Payload;
+import jakarta.validation.constraints.NotNull;
 
 
 class NotNullConstraintDescriptor extends AbstractConstraintDescriptor<NotNull> {

src/main/java/org/unbrokendome/jackson/beanvalidation/PropertyPathUtils.java

@@ -8,7 +8,7 @@
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import javax.validation.Path;
+import jakarta.validation.Path;
 import java.lang.reflect.Constructor;
 import java.util.Collection;
 

src/main/java/org/unbrokendome/jackson/beanvalidation/ValidatingBeanDeserializer.java

@@ -18,9 +18,9 @@
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import javax.validation.*;
-import javax.validation.constraints.NotNull;
-import javax.validation.metadata.ConstraintDescriptor;
+import jakarta.validation.*;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.metadata.ConstraintDescriptor;
 import java.io.IOException;
 import java.util.Collection;
 import java.util.Collections;

src/main/java/org/unbrokendome/jackson/beanvalidation/ValidatingValueInstantiator.java

@@ -12,13 +12,13 @@
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import javax.validation.ElementKind;
-import javax.validation.Path;
-import javax.validation.Validator;
-import javax.validation.ValidatorFactory;
-import javax.validation.executable.ExecutableValidator;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.ConstraintViolationException;
+import jakarta.validation.ElementKind;
+import jakarta.validation.Path;
+import jakarta.validation.Validator;
+import jakarta.validation.ValidatorFactory;
+import jakarta.validation.executable.ExecutableValidator;
 import java.io.IOException;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Member;

src/main/java/org/unbrokendome/jackson/beanvalidation/ValidationAwareBeanProperty.java

@@ -10,8 +10,8 @@
 import com.fasterxml.jackson.databind.deser.impl.NullsConstantProvider;
 import com.fasterxml.jackson.databind.introspect.AnnotatedMember;
 
-import javax.validation.ConstraintViolation;
-import javax.validation.Validator;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.Validator;
 import java.io.IOException;
 import java.lang.annotation.Annotation;
 import java.util.Set;

src/main/java/org/unbrokendome/jackson/beanvalidation/ValidationAwareFieldProperty.java

@@ -3,7 +3,7 @@
 import com.fasterxml.jackson.databind.deser.SettableBeanProperty;
 import com.fasterxml.jackson.databind.deser.impl.FieldProperty;
 
-import javax.validation.Validator;
+import jakarta.validation.Validator;
 
 
 final class ValidationAwareFieldProperty extends ValidationAwareBeanProperty<FieldProperty> {

src/main/java/org/unbrokendome/jackson/beanvalidation/ValidationAwareMethodProperty.java

@@ -3,7 +3,7 @@
 import com.fasterxml.jackson.databind.deser.SettableBeanProperty;
 import com.fasterxml.jackson.databind.deser.impl.MethodProperty;
 
-import javax.validation.Validator;
+import jakarta.validation.Validator;
 
 
 final class ValidationAwareMethodProperty extends ValidationAwareBeanProperty<MethodProperty> {

src/main/java/org/unbrokendome/jackson/beanvalidation/ValidationAwarePropertyValueBuffer.java

@@ -13,9 +13,9 @@
 import com.fasterxml.jackson.databind.util.ClassUtil;
 import org.unbrokendome.jackson.beanvalidation.violation.ConstraintViolationUtils;
 
-import javax.validation.ConstraintViolation;
-import javax.validation.MessageInterpolator;
-import javax.validation.metadata.ConstraintDescriptor;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.MessageInterpolator;
+import jakarta.validation.metadata.ConstraintDescriptor;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;

src/main/java/org/unbrokendome/jackson/beanvalidation/ValidationBeanDeserializerModifier.java

@@ -9,8 +9,8 @@
 import com.fasterxml.jackson.databind.deser.std.StdValueInstantiator;
 
 import javax.annotation.Nullable;
-import javax.validation.Validator;
-import javax.validation.ValidatorFactory;
+import jakarta.validation.Validator;
+import jakarta.validation.ValidatorFactory;
 import java.util.ArrayList;
 import java.util.List;
 

src/main/java/org/unbrokendome/jackson/beanvalidation/path/AbstractNode.java

@@ -2,7 +2,7 @@
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import javax.validation.Path;
+import jakarta.validation.Path;
 
 
 abstract class AbstractNode implements Path.Node {

src/main/java/org/unbrokendome/jackson/beanvalidation/path/BeanNode.java

@@ -2,8 +2,8 @@
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import javax.validation.ElementKind;
-import javax.validation.Path;
+import jakarta.validation.ElementKind;
+import jakarta.validation.Path;
 
 
 final class BeanNode extends AbstractNode implements Path.BeanNode {

src/main/java/org/unbrokendome/jackson/beanvalidation/path/ConstructorNode.java

@@ -2,8 +2,8 @@
 
 
 import javax.annotation.Nonnull;
-import javax.validation.ElementKind;
-import javax.validation.Path;
+import jakarta.validation.ElementKind;
+import jakarta.validation.Path;
 import java.util.Collections;
 import java.util.List;
 

src/main/java/org/unbrokendome/jackson/beanvalidation/path/ParameterNode.java

@@ -1,8 +1,8 @@
 package org.unbrokendome.jackson.beanvalidation.path;
 
 import javax.annotation.Nonnull;
-import javax.validation.ElementKind;
-import javax.validation.Path;
+import jakarta.validation.ElementKind;
+import jakarta.validation.Path;
 
 
 final class ParameterNode extends AbstractNode implements Path.ParameterNode {

src/main/java/org/unbrokendome/jackson/beanvalidation/path/PathBuilder.java

@@ -2,7 +2,7 @@
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import javax.validation.Path;
+import jakarta.validation.Path;
 import java.lang.reflect.Constructor;
 import java.util.Arrays;
 import java.util.List;

src/main/java/org/unbrokendome/jackson/beanvalidation/path/PathBuilderImpl.java

@@ -2,8 +2,8 @@
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import javax.validation.ElementKind;
-import javax.validation.Path;
+import jakarta.validation.ElementKind;
+import jakarta.validation.Path;
 import java.util.Deque;
 import java.util.Iterator;
 import java.util.LinkedList;

src/main/java/org/unbrokendome/jackson/beanvalidation/path/PathImpl.java

@@ -1,7 +1,7 @@
 package org.unbrokendome.jackson.beanvalidation.path;
 
 import javax.annotation.Nonnull;
-import javax.validation.Path;
+import jakarta.validation.Path;
 import java.util.Deque;
 import java.util.Iterator;
 import java.util.LinkedList;

src/main/java/org/unbrokendome/jackson/beanvalidation/path/PathUtils.java

@@ -2,8 +2,8 @@
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import javax.validation.ElementKind;
-import javax.validation.Path;
+import jakarta.validation.ElementKind;
+import jakarta.validation.Path;
 import java.util.Iterator;
 
 

src/main/java/org/unbrokendome/jackson/beanvalidation/path/PropertyNode.java

@@ -2,8 +2,8 @@
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import javax.validation.ElementKind;
-import javax.validation.Path;
+import jakarta.validation.ElementKind;
+import jakarta.validation.Path;
 
 
 final class PropertyNode extends AbstractNode implements Path.PropertyNode {

src/main/java/org/unbrokendome/jackson/beanvalidation/violation/AbstractConstraintViolation.java

@@ -1,7 +1,7 @@
 package org.unbrokendome.jackson.beanvalidation.violation;
 
-import javax.validation.ConstraintViolation;
-import javax.validation.ValidationException;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.ValidationException;
 
 
 abstract class AbstractConstraintViolation<T> implements ConstraintViolation<T> {