Skip to content

Commit b29cdf9

Browse files
committed
allow ClassTagExtensions to be used with plain ObjectMapper
1 parent e2ac75f commit b29cdf9

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

src/main/scala-2.+/com/fasterxml/jackson/module/scala/ScalaObjectMapper.scala

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,11 @@ import com.fasterxml.jackson.core.{JsonParser, TreeNode}
77
import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper
88
import com.fasterxml.jackson.databind.jsonschema.JsonSchema
99
import com.fasterxml.jackson.databind._
10-
import com.fasterxml.jackson.databind.json.JsonMapper
1110

1211
object ScalaObjectMapper {
13-
def ::(o: JsonMapper) = new Mixin(o)
14-
final class Mixin private[ScalaObjectMapper](mapper: JsonMapper)
15-
extends JsonMapper(mapper.rebuild().build()) with ScalaObjectMapper
12+
def ::(o: ObjectMapper) = new Mixin(o)
13+
final class Mixin private[ScalaObjectMapper](mapper: ObjectMapper)
14+
extends ObjectMapper(mapper) with ScalaObjectMapper
1615
}
1716

1817
@deprecated("ScalaObjectMapper is deprecated because Manifests are not supported in Scala3, you might want to use ClassTagExtensions as a replacement", "2.12.1")

src/main/scala/com/fasterxml/jackson/module/scala/ClassTagExtensions.scala

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ package com.fasterxml.jackson.module.scala
22

33
import com.fasterxml.jackson.core.{JsonParser, TreeNode}
44
import com.fasterxml.jackson.databind._
5-
import com.fasterxml.jackson.databind.`type`.{CollectionLikeType, MapLikeType, TypeFactory}
6-
import com.fasterxml.jackson.databind.json.JsonMapper
5+
import com.fasterxml.jackson.databind.`type`.{MapLikeType, TypeFactory}
76

87
import java.io.{File, InputStream, Reader}
98
import java.net.URL
@@ -12,9 +11,9 @@ import scala.collection.immutable.IntMap
1211
import scala.reflect.ClassTag
1312

1413
object ClassTagExtensions {
15-
def ::(o: JsonMapper) = new Mixin(o)
16-
final class Mixin private[ClassTagExtensions](mapper: JsonMapper)
17-
extends JsonMapper(mapper.rebuild().build()) with ClassTagExtensions
14+
def ::(o: ObjectMapper) = new Mixin(o)
15+
final class Mixin private[ClassTagExtensions](mapper: ObjectMapper)
16+
extends ObjectMapper(mapper) with ClassTagExtensions
1817
}
1918

2019
/**

0 commit comments

Comments
 (0)