Implement Jackson3 support and maintain Jackson2 support (#117)

* Implement Jackson3 support and maintain Jackson2 support

* Update JDK version in github actions

* Add java17 module

* add jackson2 dependencies to integration tests

* drop 'provides' in module-info as it doesn't work for optional dependencies

* remove use of deprecated jackson3 method

---------

Co-authored-by: pvdb <peter.vandenbosch@smals.be>

Author: smals-mavh

.github/workflows/maven_release.yml

@@ -15,10 +15,10 @@ jobs:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           fetch-depth: 0
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
         with:
-          java-version: 11
+          java-version: 17
           distribution: 'temurin'
       - name: Cache and restore Maven packages on master
         uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
@@ -59,7 +59,7 @@ jobs:
       - name: Set up Maven Central Repository
         uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
         with:
-          java-version: 11
+          java-version: 17
           distribution: 'temurin'
           server-id: central
           server-username: MAVEN_USERNAME

.github/workflows/maven_test.yml

@@ -17,10 +17,10 @@ jobs:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           fetch-depth: 0
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
         with:
-          java-version: 11
+          java-version: 17
           distribution: 'temurin'
       - name: Cache and restore Maven packages on master
         uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3

pom.xml

@@ -36,7 +36,8 @@
         <!-- region Dependency Versions -->
         <!-- Validator 8+ requires Java 11, Validator 9+ requires Java 17. -->
         <hibernate-validator.version>7.0.5.Final</hibernate-validator.version>
-        <jackson-bom.version>2.21.1</jackson-bom.version>
+        <jackson2-bom.version>2.21.1</jackson2-bom.version>
+        <jackson3-bom.version>3.0.4</jackson3-bom.version>
         <javax-validation-api.version>2.0.1.Final</javax-validation-api.version>
         <jakarta-validation-api.version>3.1.1</jakarta-validation-api.version>
         <junit.version>5.14.3</junit.version>
@@ -60,10 +61,17 @@
             <dependency>
                 <groupId>com.fasterxml.jackson</groupId>
                 <artifactId>jackson-bom</artifactId>
-                <version>${jackson-bom.version}</version>
+                <version>${jackson2-bom.version}</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
+            <dependency>
+                <groupId>tools.jackson</groupId>
+                <artifactId>jackson-bom</artifactId>
+                <version>${jackson3-bom.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
             <dependency>
                 <groupId>org.junit</groupId>
                 <artifactId>junit-bom</artifactId>
@@ -78,6 +86,12 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>tools.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>javax.validation</groupId>
@@ -166,6 +180,20 @@
                             <multiReleaseOutput>true</multiReleaseOutput>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>compile-java-17</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>compile</goal>
+                        </goals>
+                        <configuration>
+                            <release>17</release>
+                            <compileSourceRoots>
+                                <compileSourceRoot>${project.basedir}/src/main/java17</compileSourceRoot>
+                            </compileSourceRoots>
+                            <multiReleaseOutput>true</multiReleaseOutput>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
             <plugin>
@@ -233,7 +261,7 @@
                     </execution>
                 </executions>
                 <configuration>
-                    <source>${java.version}</source>
+                    <source>17</source>
                     <doclint>none</doclint>
                     <detectJavaApiLink>false</detectJavaApiLink>
                     <failOnWarnings>false</failOnWarnings>

src/it/jakarta-jar-classpath/pom.xml

@@ -25,6 +25,11 @@
             <artifactId>jakarta.validation-api</artifactId>
             <version>3.1.1</version>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>2.21.1</version>
+        </dependency>
     </dependencies>
 
     <build>

src/it/jakarta-jar-modulepath/pom.xml

@@ -25,6 +25,11 @@
             <artifactId>jakarta.validation-api</artifactId>
             <version>3.1.1</version>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>2.21.1</version>
+        </dependency>
     </dependencies>
 
     <build>

src/it/jakarta-jlink/pom.xml

@@ -25,6 +25,11 @@
             <artifactId>jakarta.validation-api</artifactId>
             <version>3.1.1</version>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>2.21.1</version>
+        </dependency>
     </dependencies>
 
     <build>

…able/JsonNullableBeanPropertyWriter.java …nNullableJackson2BeanPropertyWriter.javasrc/main/java/org/openapitools/jackson/nullable/JsonNullableBeanPropertyWriter.java renamed to src/main/java/org/openapitools/jackson/nullable/JsonNullableJackson2BeanPropertyWriter.java src/main/java/org/openapitools/jackson/nullable/JsonNullableBeanPropertyWriter.java renamed to src/main/java/org/openapitools/jackson/nullable/JsonNullableJackson2BeanPropertyWriter.java

@@ -6,26 +6,26 @@
 import com.fasterxml.jackson.databind.ser.BeanPropertyWriter;
 import com.fasterxml.jackson.databind.util.NameTransformer;
 
-public class JsonNullableBeanPropertyWriter extends BeanPropertyWriter
+public class JsonNullableJackson2BeanPropertyWriter extends BeanPropertyWriter
 {
     private static final long serialVersionUID = 1L;
 
-    protected JsonNullableBeanPropertyWriter(BeanPropertyWriter base) {
+    protected JsonNullableJackson2BeanPropertyWriter(BeanPropertyWriter base) {
         super(base);
     }
 
-    protected JsonNullableBeanPropertyWriter(BeanPropertyWriter base, PropertyName newName) {
+    protected JsonNullableJackson2BeanPropertyWriter(BeanPropertyWriter base, PropertyName newName) {
         super(base, newName);
     }
 
     @Override
     protected BeanPropertyWriter _new(PropertyName newName) {
-        return new JsonNullableBeanPropertyWriter(this, newName);
+        return new JsonNullableJackson2BeanPropertyWriter(this, newName);
     }
 
     @Override
     public BeanPropertyWriter unwrappingWriter(NameTransformer unwrapper) {
-        return new UnwrappingJsonNullableBeanPropertyWriter(this, unwrapper);
+        return new UnwrappingJsonNullableJackson2BeanPropertyWriter(this, unwrapper);
     }
 
     @Override

…/JsonNullableBeanSerializerModifier.java …lableJackson2BeanSerializerModifier.javasrc/main/java/org/openapitools/jackson/nullable/JsonNullableBeanSerializerModifier.java renamed to src/main/java/org/openapitools/jackson/nullable/JsonNullableJackson2BeanSerializerModifier.java src/main/java/org/openapitools/jackson/nullable/JsonNullableBeanSerializerModifier.java renamed to src/main/java/org/openapitools/jackson/nullable/JsonNullableJackson2BeanSerializerModifier.java

@@ -8,7 +8,7 @@
 
 import java.util.List;
 
-public class JsonNullableBeanSerializerModifier  extends BeanSerializerModifier
+public class JsonNullableJackson2BeanSerializerModifier extends BeanSerializerModifier
 {
     @Override
     public List<BeanPropertyWriter> changeProperties(SerializationConfig config,
@@ -19,7 +19,7 @@ public List<BeanPropertyWriter> changeProperties(SerializationConfig config,
             final BeanPropertyWriter writer = beanProperties.get(i);
             JavaType type = writer.getType();
             if (type.isTypeOrSubTypeOf(JsonNullable.class)) {
-                beanProperties.set(i, new JsonNullableBeanPropertyWriter(writer));
+                beanProperties.set(i, new JsonNullableJackson2BeanPropertyWriter(writer));
             }
         }
         return beanProperties;

…n/nullable/JsonNullableDeserializer.java …le/JsonNullableJackson2Deserializer.javasrc/main/java/org/openapitools/jackson/nullable/JsonNullableDeserializer.java renamed to src/main/java/org/openapitools/jackson/nullable/JsonNullableJackson2Deserializer.java src/main/java/org/openapitools/jackson/nullable/JsonNullableDeserializer.java renamed to src/main/java/org/openapitools/jackson/nullable/JsonNullableJackson2Deserializer.java

@@ -14,7 +14,7 @@
 
 import java.io.IOException;
 
-public class JsonNullableDeserializer extends ReferenceTypeDeserializer<JsonNullable<Object>> {
+public class JsonNullableJackson2Deserializer extends ReferenceTypeDeserializer<JsonNullable<Object>> {
 
     private static final long serialVersionUID = 1L;
 
@@ -25,8 +25,8 @@ public class JsonNullableDeserializer extends ReferenceTypeDeserializer<JsonNull
     /* Life-cycle
     /**********************************************************
      */
-    public JsonNullableDeserializer(JavaType fullType, ValueInstantiator inst,
-                                    TypeDeserializer typeDeser, JsonDeserializer<?> deser) {
+    public JsonNullableJackson2Deserializer(JavaType fullType, ValueInstantiator inst,
+                                            TypeDeserializer typeDeser, JsonDeserializer<?> deser) {
         super(fullType, inst, typeDeser, deser);
         if (fullType instanceof ReferenceType && ((ReferenceType) fullType).getReferencedType() != null) {
             this.isStringDeserializer = ((ReferenceType) fullType).getReferencedType().isTypeOrSubTypeOf(String.class);
@@ -52,8 +52,8 @@ public JsonNullable<Object> deserialize(JsonParser p, DeserializationContext ctx
     }
 
     @Override
-    public JsonNullableDeserializer withResolved(TypeDeserializer typeDeser, JsonDeserializer<?> valueDeser) {
-        return new JsonNullableDeserializer(_fullType, _valueInstantiator,
+    public JsonNullableJackson2Deserializer withResolved(TypeDeserializer typeDeser, JsonDeserializer<?> valueDeser) {
+        return new JsonNullableJackson2Deserializer(_fullType, _valueInstantiator,
                 typeDeser, valueDeser);
     }
 

…/nullable/JsonNullableDeserializers.java …e/JsonNullableJackson2Deserializers.javasrc/main/java/org/openapitools/jackson/nullable/JsonNullableDeserializers.java renamed to src/main/java/org/openapitools/jackson/nullable/JsonNullableJackson2Deserializers.java src/main/java/org/openapitools/jackson/nullable/JsonNullableDeserializers.java renamed to src/main/java/org/openapitools/jackson/nullable/JsonNullableJackson2Deserializers.java

@@ -7,12 +7,12 @@
 import com.fasterxml.jackson.databind.jsontype.TypeDeserializer;
 import com.fasterxml.jackson.databind.type.ReferenceType;
 
-public class JsonNullableDeserializers extends Deserializers.Base {
+public class JsonNullableJackson2Deserializers extends Deserializers.Base {
 
     @Override
     public JsonDeserializer<?> findReferenceDeserializer(ReferenceType refType,
                                                          DeserializationConfig config, BeanDescription beanDesc,
                                                          TypeDeserializer contentTypeDeserializer, JsonDeserializer<?> contentDeserializer) {
-        return (refType.hasRawClass(JsonNullable.class)) ? new JsonNullableDeserializer(refType, null, contentTypeDeserializer,contentDeserializer) : null;
+        return (refType.hasRawClass(JsonNullable.class)) ? new JsonNullableJackson2Deserializer(refType, null, contentTypeDeserializer,contentDeserializer) : null;
     }
 }