refactor

Author: pjfanning

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

@@ -1,16 +1,22 @@
 package com.fasterxml.jackson.module.scala
 
-import java.io.{File, InputStream, Reader}
-import java.net.URL
-
 import com.fasterxml.jackson.core.{JsonParser, TreeNode}
+import com.fasterxml.jackson.databind._
+import com.fasterxml.jackson.databind.json.JsonMapper
 import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper
 import com.fasterxml.jackson.databind.jsonschema.JsonSchema
-import com.fasterxml.jackson.databind._
+
+import java.io.{File, InputStream, Reader}
+import java.net.URL
 
 object ScalaObjectMapper {
-  def ::(o: ObjectMapper) = new Mixin(o)
-  final class Mixin private[ScalaObjectMapper](mapper: ObjectMapper)
+  def ::(o: JsonMapper): JsonMapper with ScalaObjectMapper = new Mixin(o)
+  def ::(o: ObjectMapper): ObjectMapper with ScalaObjectMapper = new ObjectMapperMixin(o)
+
+  final class Mixin private[ScalaObjectMapper](mapper: JsonMapper)
+    extends JsonMapper(mapper) with ScalaObjectMapper
+
+  final class ObjectMapperMixin private[ScalaObjectMapper](mapper: ObjectMapper)
     extends ObjectMapper(mapper) with ScalaObjectMapper
 }
 

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

@@ -3,6 +3,7 @@ package com.fasterxml.jackson.module.scala
 import com.fasterxml.jackson.core.{JsonParser, TreeNode}
 import com.fasterxml.jackson.databind._
 import com.fasterxml.jackson.databind.`type`.{MapLikeType, TypeFactory}
+import com.fasterxml.jackson.databind.json.JsonMapper
 
 import java.io.{File, InputStream, Reader}
 import java.net.URL
@@ -11,8 +12,13 @@ import scala.collection.immutable.IntMap
 import scala.reflect.ClassTag
 
 object ClassTagExtensions {
-  def ::(o: ObjectMapper) = new Mixin(o)
-  final class Mixin private[ClassTagExtensions](mapper: ObjectMapper)
+  def ::(o: JsonMapper): JsonMapper with ClassTagExtensions = new Mixin(o)
+  def ::(o: ObjectMapper): ObjectMapper with ClassTagExtensions = new ObjectMapperMixin(o)
+
+  final class Mixin private[ClassTagExtensions](mapper: JsonMapper)
+    extends JsonMapper(mapper) with ClassTagExtensions
+
+  final class ObjectMapperMixin private[ClassTagExtensions](mapper: ObjectMapper)
     extends ObjectMapper(mapper) with ClassTagExtensions
 }