Skip to content

Commit e53bb5c

Browse files
committed
fix MergeTest issues with enable(MapperFeature.ALLOW_FINAL_FIELDS_AS_MUTATORS)
1 parent 0003d60 commit e53bb5c

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

src/test/scala/tools/jackson/module/scala/deser/MergeTest.scala

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package tools.jackson.module.scala.deser
22

33
import com.fasterxml.jackson.annotation.JsonMerge
44
import tools.jackson.core.`type`.TypeReference
5-
import tools.jackson.databind.{ObjectMapper, ObjectReader}
5+
import tools.jackson.databind.{MapperFeature, ObjectMapper, ObjectReader}
66
import tools.jackson.module.scala.DefaultScalaModule
77

88
import scala.collection.{Map, mutable}
@@ -17,9 +17,16 @@ class MergeTest extends DeserializerTest {
1717

1818
val module: DefaultScalaModule.type = DefaultScalaModule
1919

20-
def newScalaMapper: ObjectMapper = newMapper
20+
// This test replies on enabling MapperFeature.ALLOW_FINAL_FIELDS_AS_MUTATORS
21+
// which is not enabled by default in the Jackson v2 but not in Jackson v3
22+
def newScalaMapper: ObjectMapper = newBuilder
23+
.enable(MapperFeature.ALLOW_FINAL_FIELDS_AS_MUTATORS)
24+
.build()
2125

22-
def newMergeableScalaMapper: ObjectMapper = newBuilder.defaultMergeable(true).build()
26+
def newMergeableScalaMapper: ObjectMapper = newBuilder
27+
.enable(MapperFeature.ALLOW_FINAL_FIELDS_AS_MUTATORS)
28+
.defaultMergeable(true)
29+
.build()
2330

2431
behavior of "The DefaultScalaModule when reading for updating"
2532

0 commit comments

Comments
 (0)