@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.{JsonAutoDetect, PropertyAccessor}
4
4
import com .fasterxml .jackson .databind .json .JsonMapper
5
5
import com .fasterxml .jackson .module .scala .{ClassTagExtensions , DefaultScalaModule }
6
6
import com .fasterxml .jackson .module .scala .deser .CaseObjectDeserializerTest .{Foo , TestObject }
7
+ import com .fasterxml .jackson .module .scala .introspect .ScalaAnnotationIntrospectorModule
7
8
8
9
object CaseObjectDeserializerTest {
9
10
case object TestObject
@@ -13,12 +14,11 @@ object CaseObjectDeserializerTest {
13
14
}
14
15
}
15
16
16
- // see also CaseObjectScala2DeserializerTest
17
17
class CaseObjectDeserializerTest extends DeserializerTest {
18
18
def module = DefaultScalaModule
19
19
20
- " An ObjectMapper with DefaultScalaModule and ScalaObjectDeserializerModule " should " deserialize a case object and not create a new instance" in {
21
- val mapper = JsonMapper .builder().addModule(DefaultScalaModule ).addModule( ScalaObjectDeserializerModule ). build()
20
+ " An ObjectMapper with DefaultScalaModule" should " deserialize a case object and not create a new instance" in {
21
+ val mapper = JsonMapper .builder().addModule(DefaultScalaModule ).build()
22
22
val original = TestObject
23
23
val json = mapper.writeValueAsString(original)
24
24
val deserialized = mapper.readValue(json, TestObject .getClass)
@@ -36,7 +36,6 @@ class CaseObjectDeserializerTest extends DeserializerTest {
36
36
it should " deserialize Foo and not create a new instance (visibility settings)" in {
37
37
val mapper = JsonMapper .builder()
38
38
.addModule(DefaultScalaModule )
39
- .addModule(ScalaObjectDeserializerModule )
40
39
.visibility(PropertyAccessor .FIELD , JsonAutoDetect .Visibility .ANY )
41
40
.visibility(PropertyAccessor .GETTER , JsonAutoDetect .Visibility .NONE )
42
41
.build()
@@ -46,19 +45,18 @@ class CaseObjectDeserializerTest extends DeserializerTest {
46
45
assert(deserialized == original)
47
46
}
48
47
49
- " An ObjectMapper with ClassTagExtensions and ScalaObjectDeserializerModule " should " deserialize a case object and not create a new instance" in {
48
+ " An ObjectMapper with ClassTagExtensions and DefaultScalaModule " should " deserialize a case object and not create a new instance" in {
50
49
val mapper = JsonMapper .builder()
51
50
.addModule(DefaultScalaModule )
52
- .addModule(ScalaObjectDeserializerModule )
53
51
.build() :: ClassTagExtensions
54
52
val original = TestObject
55
53
val json = mapper.writeValueAsString(original)
56
54
val deserialized = mapper.readValue[TestObject .type ](json)
57
55
assert(deserialized == original)
58
56
}
59
57
60
- " An ObjectMapper with DefaultScalaModule but not ScalaObjectDeserializerModule" should " deserialize a case object but create a new instance" in {
61
- val mapper = JsonMapper .builder().addModule(DefaultScalaModule ).build()
58
+ " An ObjectMapper without ScalaObjectDeserializerModule" should " deserialize a case object but create a new instance" in {
59
+ val mapper = JsonMapper .builder().addModule(ScalaAnnotationIntrospectorModule ).build()
62
60
val original = TestObject
63
61
val json = mapper.writeValueAsString(original)
64
62
val deserialized = mapper.readValue(json, TestObject .getClass)
0 commit comments