Skip to content

Commit e55337c

Browse files
committed
remove unnecessary import and rename some clashing test classes
1 parent 91afbff commit e55337c

File tree

5 files changed

+9
-11
lines changed

5 files changed

+9
-11
lines changed
Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
package com.fasterxml.jackson.module.scala.introspect
22

3-
import scala.language.existentials
4-
5-
case class BeanDescriptor(beanType: Class[_], properties: Seq[PropertyDescriptor])
3+
case class BeanDescriptor(beanType: Class[_], properties: Seq[PropertyDescriptor])

src/test/scala-2.+/com/fasterxml/jackson/module/scala/ScalaObjectMapperTest.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import com.fasterxml.jackson.databind.DatabindException
66
import com.fasterxml.jackson.databind.annotation.JsonDeserialize
77
import com.fasterxml.jackson.databind.exc.InvalidFormatException
88
import com.fasterxml.jackson.databind.json.JsonMapper
9-
import com.fasterxml.jackson.module.scala.deser.OptionDeserializerTest.{Foo, Wrapper}
9+
import com.fasterxml.jackson.module.scala.deser.OptionDeserializerTest.{Foo, TWrapper}
1010

1111
import java.io.{ByteArrayInputStream, File, InputStreamReader}
1212
import java.nio.charset.StandardCharsets
@@ -282,7 +282,7 @@ class ScalaObjectMapperTest extends JacksonTest {
282282

283283
it should "deserialize a type param wrapped option" in {
284284
val json: String = """{"t": {"bar": "baz"}}"""
285-
val result = mapper.readValue[Wrapper[Option[Foo]]](json)
285+
val result = mapper.readValue[TWrapper[Option[Foo]]](json)
286286
result.t.get.isInstanceOf[Foo] should be(true)
287287
}
288288

src/test/scala/com/fasterxml/jackson/module/scala/ClassTagExtensionsTest.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import com.fasterxml.jackson.core.TreeNode
55
import com.fasterxml.jackson.databind.annotation.JsonDeserialize
66
import com.fasterxml.jackson.databind.exc.InvalidFormatException
77
import com.fasterxml.jackson.databind.{DatabindException, ObjectMapper}
8-
import com.fasterxml.jackson.module.scala.deser.OptionDeserializerTest.{Foo, Wrapper}
8+
import com.fasterxml.jackson.module.scala.deser.OptionDeserializerTest.{Foo, TWrapper}
99

1010
import java.io.{ByteArrayInputStream, File, InputStreamReader}
1111
import java.nio.charset.StandardCharsets
@@ -255,7 +255,7 @@ class ClassTagExtensionsTest extends JacksonTest {
255255

256256
it should "deserialize a type param wrapped option" in {
257257
val json: String = """{"t": {"bar": "baz"}}"""
258-
val result = mapper.readValue[Wrapper[Option[Foo]]](json)
258+
val result = mapper.readValue[TWrapper[Option[Foo]]](json)
259259
result.t.get.isInstanceOf[Foo] should be(true)
260260
}
261261

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

3-
object Wrapper {
3+
object FooBazWrapper {
44
object Foo {
55
class Baz(val num: Int)
66
}
77
}
8-
class Qux(val qux: Wrapper.Foo.Baz)
8+
class Qux(val qux: FooBazWrapper.Foo.Baz)

src/test/scala/com/fasterxml/jackson/module/scala/deser/OptionDeserializerTest.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ object OptionDeserializerTest {
3434
}
3535

3636
case class Foo(bar: String)
37-
case class Wrapper[T](t: T)
37+
case class TWrapper[T](t: T)
3838

3939
trait Marker
4040
case class AMarker(a: Int) extends Marker
@@ -89,7 +89,7 @@ class OptionDeserializerTest extends DeserializerTest {
8989

9090
it should "deserialize a type param wrapped option" in {
9191
val json: String = """{"t": {"bar": "baz"}}"""
92-
val result = deserialize(json, new TypeReference[Wrapper[Option[Foo]]] {})
92+
val result = deserialize(json, new TypeReference[TWrapper[Option[Foo]]] {})
9393
result.t.get.isInstanceOf[Foo] should be(true)
9494
}
9595

0 commit comments

Comments
 (0)