Skip to content

Commit 2c1f81d

Browse files
committed
Fix controller test XMLMapper setup
Also add Kotlin serialization Jackson module.
1 parent b857038 commit 2c1f81d

File tree

2 files changed

+15
-13
lines changed

2 files changed

+15
-13
lines changed

server/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,11 @@
5151
<groupId>com.fasterxml.jackson.datatype</groupId>
5252
<artifactId>jackson-datatype-jdk8</artifactId>
5353
</dependency>
54+
<dependency>
55+
<groupId>com.fasterxml.jackson.module</groupId>
56+
<artifactId>jackson-module-kotlin</artifactId>
57+
<scope>test</scope>
58+
</dependency>
5459
<dependency>
5560
<groupId>software.amazon.awssdk</groupId>
5661
<artifactId>regions</artifactId>

server/src/test/kotlin/com/adobe/testing/s3mock/BaseControllerTest.kt

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,23 +20,20 @@ import com.fasterxml.jackson.annotation.JsonInclude
2020
import com.fasterxml.jackson.dataformat.xml.XmlMapper
2121
import com.fasterxml.jackson.dataformat.xml.deser.FromXmlParser
2222
import com.fasterxml.jackson.dataformat.xml.ser.ToXmlGenerator
23-
import org.junit.jupiter.api.BeforeAll
2423

2524
internal abstract class BaseControllerTest {
2625
companion object {
27-
@JvmStatic
28-
protected lateinit var MAPPER: XmlMapper
26+
val MAPPER: XmlMapper = XmlMapper.builder()
27+
.findAndAddModules()
28+
.enable(ToXmlGenerator.Feature.WRITE_XML_DECLARATION)
29+
.enable(ToXmlGenerator.Feature.AUTO_DETECT_XSI_TYPE)
30+
.enable(FromXmlParser.Feature.AUTO_DETECT_XSI_TYPE)
31+
.build()
2932

30-
@JvmStatic
31-
@BeforeAll
32-
fun setup() {
33-
MAPPER = XmlMapper().enable(ToXmlGenerator.Feature.WRITE_XML_DECLARATION).apply {
34-
this as XmlMapper
35-
this.setSerializationInclusion(JsonInclude.Include.NON_EMPTY)
36-
this.enable(ToXmlGenerator.Feature.AUTO_DETECT_XSI_TYPE)
37-
this.enable(FromXmlParser.Feature.AUTO_DETECT_XSI_TYPE)
38-
this.factory.xmlOutputFactory.setProperty(WstxOutputProperties.P_USE_DOUBLE_QUOTES_IN_XML_DECL, true)
39-
} as XmlMapper
33+
init {
34+
MAPPER.setSerializationInclusion(JsonInclude.Include.NON_EMPTY)
35+
MAPPER.factory.xmlOutputFactory
36+
.setProperty(WstxOutputProperties.P_USE_DOUBLE_QUOTES_IN_XML_DECL, true)
4037
}
4138
}
4239
}

0 commit comments

Comments
 (0)