Use Jackson 3 annotations and mappers.

Author: afranken

CHANGELOG.md

@@ -143,6 +143,7 @@ Running S3Mock in unit tests is still supported by using [TestContainers](https:
 * Features and fixes
   * Get object with range now returns the same headers as non-range calls.
 * Refactorings
+  * Use Jackson 3 annotations and mappers.
   * AWS has deprecated SDK for Java v1 and will remove support EOY 2025.
     * Remove Java SDK v1.
   * JUnit 4.x deprecation

integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/S3TestBase.kt

@@ -18,10 +18,6 @@ package com.adobe.testing.s3mock.its
 import aws.smithy.kotlin.runtime.net.url.Url
 import com.ctc.wstx.api.WstxOutputProperties
 import com.fasterxml.jackson.annotation.JsonInclude
-import com.fasterxml.jackson.dataformat.xml.XmlMapper
-import com.fasterxml.jackson.dataformat.xml.deser.FromXmlParser
-import com.fasterxml.jackson.dataformat.xml.ser.ToXmlGenerator
-import com.fasterxml.jackson.module.kotlin.KotlinModule
 import org.apache.http.client.config.RequestConfig
 import org.apache.http.impl.client.CloseableHttpClient
 import org.apache.http.impl.client.HttpClientBuilder
@@ -63,6 +59,9 @@ import software.amazon.awssdk.services.s3.presigner.S3Presigner
 import software.amazon.awssdk.transfer.s3.S3TransferManager
 import software.amazon.awssdk.utils.AttributeMap
 import tel.schich.awss3postobjectpresigner.S3PostObjectPresigner
+import tools.jackson.dataformat.xml.XmlMapper
+import tools.jackson.dataformat.xml.XmlReadFeature
+import tools.jackson.dataformat.xml.XmlWriteFeature
 import java.io.ByteArrayInputStream
 import java.io.File
 import java.io.IOException
@@ -646,15 +645,15 @@ internal abstract class S3TestBase {
     val MAPPER: XmlMapper =
       XmlMapper
         .builder()
-        .addModule(KotlinModule.Builder().build())
         .findAndAddModules()
-        .enable(ToXmlGenerator.Feature.WRITE_XML_DECLARATION)
-        .enable(ToXmlGenerator.Feature.AUTO_DETECT_XSI_TYPE)
-        .enable(FromXmlParser.Feature.AUTO_DETECT_XSI_TYPE)
+        .enable(XmlWriteFeature.WRITE_XML_DECLARATION)
+        .enable(XmlWriteFeature.AUTO_DETECT_XSI_TYPE)
+        .enable(XmlReadFeature.AUTO_DETECT_XSI_TYPE)
+        .changeDefaultPropertyInclusion { it.withValueInclusion(JsonInclude.Include.NON_EMPTY) }
         .build()
         .apply {
-          setSerializationInclusion(JsonInclude.Include.NON_EMPTY)
-          factory.xmlOutputFactory
+          tokenStreamFactory()
+            .xmlOutputFactory
             .setProperty(WstxOutputProperties.P_USE_DOUBLE_QUOTES_IN_XML_DECL, true)
         }
 

server/pom.xml

@@ -40,19 +40,15 @@
       <artifactId>spring-boot-starter-web</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.fasterxml.jackson.dataformat</groupId>
+      <groupId>tools.jackson.dataformat</groupId>
       <artifactId>jackson-dataformat-xml</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.fasterxml.jackson.datatype</groupId>
-      <artifactId>jackson-datatype-jsr310</artifactId>
+      <groupId>tools.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.fasterxml.jackson.datatype</groupId>
-      <artifactId>jackson-datatype-jdk8</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.module</groupId>
+      <groupId>tools.jackson.module</groupId>
       <artifactId>jackson-module-kotlin</artifactId>
     </dependency>
     <dependency>

server/src/main/kotlin/com/adobe/testing/s3mock/controller/ControllerConfiguration.kt

@@ -24,9 +24,6 @@ import com.adobe.testing.s3mock.store.KmsKeyStore
 import com.adobe.testing.s3mock.util.AwsHttpHeaders.X_AMZ_DELETE_MARKER
 import com.ctc.wstx.api.WstxOutputProperties
 import com.fasterxml.jackson.annotation.JsonInclude
-import com.fasterxml.jackson.dataformat.xml.XmlMapper
-import com.fasterxml.jackson.dataformat.xml.deser.FromXmlParser
-import com.fasterxml.jackson.dataformat.xml.ser.ToXmlGenerator
 import jakarta.servlet.Filter
 import jakarta.servlet.http.HttpServletRequest
 import org.slf4j.Logger
@@ -40,21 +37,24 @@ import org.springframework.http.HttpHeaders
 import org.springframework.http.HttpStatus
 import org.springframework.http.MediaType
 import org.springframework.http.ResponseEntity
-import org.springframework.http.converter.xml.MappingJackson2XmlHttpMessageConverter
+import org.springframework.http.converter.xml.JacksonXmlHttpMessageConverter
 import org.springframework.web.bind.annotation.ControllerAdvice
 import org.springframework.web.bind.annotation.ExceptionHandler
 import org.springframework.web.filter.CommonsRequestLoggingFilter
 import org.springframework.web.servlet.config.annotation.ContentNegotiationConfigurer
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer
 import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler
+import tools.jackson.dataformat.xml.XmlMapper
+import tools.jackson.dataformat.xml.XmlReadFeature
+import tools.jackson.dataformat.xml.XmlWriteFeature
 
 @Configuration
 @EnableConfigurationProperties(ControllerProperties::class)
 class ControllerConfiguration : WebMvcConfigurer {
   @Bean
   fun kmsFilter(
     kmsKeyStore: KmsKeyStore,
-    messageConverter: MappingJackson2XmlHttpMessageConverter
+    messageConverter: JacksonXmlHttpMessageConverter
   ): Filter = KmsValidationFilter(kmsKeyStore, messageConverter)
 
   override fun configureContentNegotiation(configurer: ContentNegotiationConfigurer) {
@@ -82,28 +82,30 @@ class ControllerConfiguration : WebMvcConfigurer {
   /**
    * Creates an HttpMessageConverter for XML.
    *
-   * @return The configured [MappingJackson2XmlHttpMessageConverter].
+   * @return The configured [JacksonXmlHttpMessageConverter].
    */
   @Bean
-  fun messageConverter(): MappingJackson2XmlHttpMessageConverter {
+  fun messageConverter(): JacksonXmlHttpMessageConverter {
     val mediaTypes = listOf(
       MediaType.APPLICATION_XML,
       MediaType.APPLICATION_FORM_URLENCODED,
       MediaType.APPLICATION_OCTET_STREAM
     )
 
-    return MappingJackson2XmlHttpMessageConverter().apply {
-      supportedMediaTypes = mediaTypes
-      (objectMapper as XmlMapper).apply {
-        setSerializationInclusion(JsonInclude.Include.NON_EMPTY)
-        enable(ToXmlGenerator.Feature.AUTO_DETECT_XSI_TYPE)
-        enable(FromXmlParser.Feature.AUTO_DETECT_XSI_TYPE)
-        enable(ToXmlGenerator.Feature.WRITE_XML_DECLARATION)
-        factory.xmlOutputFactory.setProperty(
-          WstxOutputProperties.P_USE_DOUBLE_QUOTES_IN_XML_DECL,
-          true
-        )
+    val mapper = XmlMapper.builder()
+      .findAndAddModules()
+      .enable(XmlWriteFeature.WRITE_XML_DECLARATION)
+      .enable(XmlWriteFeature.AUTO_DETECT_XSI_TYPE)
+      .enable(XmlReadFeature.AUTO_DETECT_XSI_TYPE)
+      .changeDefaultPropertyInclusion { it.withValueInclusion(JsonInclude.Include.NON_EMPTY) }
+      .build().apply {
+        tokenStreamFactory()
+          .xmlOutputFactory
+          .setProperty(WstxOutputProperties.P_USE_DOUBLE_QUOTES_IN_XML_DECL, true)
       }
+
+    return JacksonXmlHttpMessageConverter(mapper).apply {
+      supportedMediaTypes = mediaTypes
     }
   }
 
@@ -143,23 +145,24 @@ class ControllerConfiguration : WebMvcConfigurer {
   fun objectCannedAclHeaderConverter(): ObjectCannedAclHeaderConverter = ObjectCannedAclHeaderConverter()
 
   /**
-   * Spring only provides an ObjectMapper that can serialize but not deserialize XML.
+   * Builds an XmlMapper for header converters.
    */
-  private fun xmlMapper(): XmlMapper =
-    XmlMapper.builder()
+  private fun xmlMapper(): XmlMapper {
+    val mapper = XmlMapper.builder()
       .findAndAddModules()
-      .enable(ToXmlGenerator.Feature.WRITE_XML_DECLARATION)
-      .enable(ToXmlGenerator.Feature.AUTO_DETECT_XSI_TYPE)
-      .enable(FromXmlParser.Feature.AUTO_DETECT_XSI_TYPE)
-      .build()
-      .apply {
-        setSerializationInclusion(JsonInclude.Include.NON_EMPTY)
-        factory.xmlOutputFactory.setProperty(
-          WstxOutputProperties.P_USE_DOUBLE_QUOTES_IN_XML_DECL,
-          true
-        )
+      .enable(XmlWriteFeature.WRITE_XML_DECLARATION)
+      .enable(XmlWriteFeature.AUTO_DETECT_XSI_TYPE)
+      .enable(XmlReadFeature.AUTO_DETECT_XSI_TYPE)
+      .changeDefaultPropertyInclusion { it.withValueInclusion(JsonInclude.Include.NON_EMPTY) }
+      .build().apply {
+        tokenStreamFactory()
+          .xmlOutputFactory
+          .setProperty(WstxOutputProperties.P_USE_DOUBLE_QUOTES_IN_XML_DECL, true)
       }
 
+    return mapper
+  }
+
   @Bean
   fun taggingHeaderConverter(): TaggingHeaderConverter = TaggingHeaderConverter(xmlMapper())
 

server/src/main/kotlin/com/adobe/testing/s3mock/controller/KmsValidationFilter.kt

@@ -28,7 +28,8 @@ import org.slf4j.LoggerFactory
 import org.springframework.http.HttpHeaders
 import org.springframework.http.HttpStatus
 import org.springframework.http.MediaType
-import org.springframework.http.converter.xml.MappingJackson2XmlHttpMessageConverter
+import org.springframework.http.converter.xml.JacksonXmlHttpMessageConverter
+import org.springframework.http.server.ServletServerHttpResponse
 import org.springframework.web.filter.OncePerRequestFilter
 import java.io.IOException
 
@@ -43,7 +44,7 @@ internal class KmsValidationFilter
  * @param keystore Keystore for validation of KMS Keys
  */(
   private val keystore: KmsKeyStore,
-  private val messageConverter: MappingJackson2XmlHttpMessageConverter
+  private val messageConverter: JacksonXmlHttpMessageConverter
 ) : OncePerRequestFilter() {
   @Throws(ServletException::class, IOException::class)
   override fun doFilterInternal(
@@ -73,7 +74,7 @@ internal class KmsValidationFilter
           null,
           null
         )
-        messageConverter.objectMapper.writeValue(response.outputStream, error)
+        messageConverter.write(error, MediaType.APPLICATION_XML, ServletServerHttpResponse(response))
         response.flushBuffer()
         return
       }

server/src/main/kotlin/com/adobe/testing/s3mock/controller/TaggingHeaderConverter.kt

@@ -17,9 +17,9 @@ package com.adobe.testing.s3mock.controller
 
 import com.adobe.testing.s3mock.dto.Tag
 import com.adobe.testing.s3mock.dto.Tagging
-import com.fasterxml.jackson.core.JsonProcessingException
-import com.fasterxml.jackson.dataformat.xml.XmlMapper
 import org.springframework.core.convert.converter.Converter
+import tools.jackson.core.JacksonException
+import tools.jackson.dataformat.xml.XmlMapper
 
 /**
  * Converts values of the [com.adobe.testing.s3mock.util.AwsHttpHeaders.X_AMZ_TAGGING] which is sent by the Amazon client.
@@ -46,7 +46,7 @@ class TaggingHeaderConverter(private val xmlMapper: XmlMapper) : Converter<Strin
     try {
       val tagging = xmlMapper.readValue(source, Tagging::class.java)
       tagging.tagSet.tags.takeIf { it.isNotEmpty() }
-    } catch (e: JsonProcessingException) {
+    } catch (e: JacksonException) {
       throw IllegalArgumentException("Failed to parse XML tags from header: $source", e)
     }
 

server/src/main/kotlin/com/adobe/testing/s3mock/dto/AbortIncompleteMultipartUpload.kt

@@ -23,6 +23,6 @@ import com.fasterxml.jackson.annotation.JsonProperty
  */
 @S3Verified(year = 2025)
 data class AbortIncompleteMultipartUpload(
-    @param:JsonProperty("DaysAfterInitiation")
+    @param:JsonProperty("DaysAfterInitiation", namespace = "http://s3.amazonaws.com/doc/2006-03-01/")
     val daysAfterInitiation: Int?
 )

server/src/main/kotlin/com/adobe/testing/s3mock/dto/AccessControlPolicy.kt

@@ -17,33 +17,26 @@ package com.adobe.testing.s3mock.dto
 
 import com.adobe.testing.S3Verified
 import com.fasterxml.jackson.annotation.JsonCreator
-import com.fasterxml.jackson.annotation.JsonIgnore
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.fasterxml.jackson.annotation.JsonRootName
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement
+import tools.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper
+import tools.jackson.dataformat.xml.annotation.JacksonXmlProperty
 
 /**
  * [API Reference](https://docs.aws.amazon.com/AmazonS3/latest/API/API_AccessControlPolicy.html).
  * Use bean-style binding (no-args + fields) to avoid creator conflicts with @JacksonXmlElementWrapper.
  */
 @S3Verified(year = 2025)
-@JsonRootName("AccessControlPolicy")
-@JacksonXmlRootElement(localName = "AccessControlPolicy")
+@JsonRootName("AccessControlPolicy", namespace = "http://s3.amazonaws.com/doc/2006-03-01/")
 class AccessControlPolicy() {
-  @field:JacksonXmlElementWrapper(localName = "AccessControlList")
-  @field:JacksonXmlProperty(localName = "Grant")
-  @field:JsonProperty("Grant")
+  @field:JacksonXmlElementWrapper(localName = "AccessControlList", namespace = "http://s3.amazonaws.com/doc/2006-03-01/")
+  @field:JacksonXmlProperty(localName = "Grant", namespace = "http://s3.amazonaws.com/doc/2006-03-01/")
+  @field:JsonProperty("Grant", namespace = "http://s3.amazonaws.com/doc/2006-03-01/")
   var accessControlList: List<Grant>? = null
 
-  @field:JsonProperty("Owner")
+  @field:JsonProperty("Owner", namespace = "http://s3.amazonaws.com/doc/2006-03-01/")
   var owner: Owner? = null
 
-  @get:JsonIgnore
-  @field:JacksonXmlProperty(isAttribute = true, localName = "xmlns")
-  var xmlns: String = "http://s3.amazonaws.com/doc/2006-03-01/"
-
   // Convenience constructor for tests; disabled for Jackson
   @JsonCreator(mode = JsonCreator.Mode.DISABLED)
   constructor(accessControlList: List<Grant>?, owner: Owner?) : this() {
@@ -59,15 +52,13 @@ class AccessControlPolicy() {
 
     if (accessControlList != other.accessControlList) return false
     if (owner != other.owner) return false
-    if (xmlns != other.xmlns) return false
 
     return true
   }
 
   override fun hashCode(): Int {
     var result = accessControlList?.hashCode() ?: 0
     result = 31 * result + (owner?.hashCode() ?: 0)
-    result = 31 * result + xmlns.hashCode()
     return result
   }
 }

server/src/main/kotlin/com/adobe/testing/s3mock/dto/AmazonCustomerByEmail.kt

@@ -25,6 +25,6 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo
 @S3Verified(year = 2025)
 @JsonTypeInfo(use = JsonTypeInfo.Id.SIMPLE_NAME, property = "xsi:type")
 data class AmazonCustomerByEmail(
-  @param:JsonProperty("EmailAddress")
+  @param:JsonProperty("EmailAddress", namespace = "http://s3.amazonaws.com/doc/2006-03-01/")
   val emailAddress: String?
 ) : Grantee

server/src/main/kotlin/com/adobe/testing/s3mock/dto/Bucket.kt

@@ -26,11 +26,11 @@ import java.nio.file.Path
  */
 @S3Verified(year = 2025)
 data class Bucket(
-  @param:JsonProperty("BucketRegion")
+  @param:JsonProperty("BucketRegion", namespace = "http://s3.amazonaws.com/doc/2006-03-01/")
   val bucketRegion: String?,
-  @param:JsonProperty("CreationDate")
+  @param:JsonProperty("CreationDate", namespace = "http://s3.amazonaws.com/doc/2006-03-01/")
   val creationDate: String?,
-  @param:JsonProperty("Name")
+  @param:JsonProperty("Name", namespace = "http://s3.amazonaws.com/doc/2006-03-01/")
   val name: String,
   @JsonIgnore
   val path: Path?