reduce use of ScalaObjectMapper

FasterXML · Dec 20, 2020 · 9a56d6e · 9a56d6e
1 parent 6724059
commit 9a56d6e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/test/scala/com/fasterxml/jackson/module/scala/JacksonTest.scala b/src/test/scala/com/fasterxml/jackson/module/scala/JacksonTest.scala
@@ -11,8 +11,4 @@ abstract class JacksonTest extends BaseSpec {
   }
 
   def newMapper: ObjectMapper = newBuilder.build()
-
-  def newMapperWithScalaObjectMapper: ObjectMapper with ScalaObjectMapper = {
-    newBuilder.build() :: ScalaObjectMapper
-  }
 }
diff --git a/src/test/scala/com/fasterxml/jackson/module/scala/ScalaObjectMapperTest.scala b/src/test/scala/com/fasterxml/jackson/module/scala/ScalaObjectMapperTest.scala
@@ -299,4 +299,8 @@ class ScalaObjectMapperTest extends JacksonTest {
       }
     }
   }
+
+  private def newMapperWithScalaObjectMapper: ObjectMapper with ScalaObjectMapper = {
+    newBuilder.build() :: ScalaObjectMapper
+  }
 }
diff --git a/...scala/com/fasterxml/jackson/module/scala/introspect/ScalaAnnotationIntrospectorTest.scala b/...scala/com/fasterxml/jackson/module/scala/introspect/ScalaAnnotationIntrospectorTest.scala
@@ -34,10 +34,10 @@ object ScalaAnnotationIntrospectorTest {
 class ScalaAnnotationIntrospectorTest extends FixtureAnyFlatSpec with Matchers {
   import ScalaAnnotationIntrospectorTest._
 
-  type FixtureParam = ObjectMapper with ScalaObjectMapper
+  type FixtureParam = ObjectMapper
 
   override def withFixture(test: OneArgTest): Outcome = {
-    val mapper = new ObjectMapper with ScalaObjectMapper
+    val mapper = new ObjectMapper
     mapper.registerModule(DefaultScalaModule)
     withFixture(test.toNoArgTest(mapper))
   }