Skip to content

Commit 7295dfc

Browse files
committed
remove unnecessary import and rename some clashing test classes
1 parent 632aeda commit 7295dfc

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
@@ -8,7 +8,7 @@ import com.fasterxml.jackson.core.TreeNode
88
import com.fasterxml.jackson.databind.annotation.JsonDeserialize
99
import com.fasterxml.jackson.databind.exc.InvalidFormatException
1010
import com.fasterxml.jackson.databind.{JsonMappingException, Module, ObjectMapper}
11-
import com.fasterxml.jackson.module.scala.deser.OptionDeserializerTest.{Foo, Wrapper}
11+
import com.fasterxml.jackson.module.scala.deser.OptionDeserializerTest.{Foo, TWrapper}
1212

1313
import scala.collection.JavaConverters._
1414

@@ -294,7 +294,7 @@ class ScalaObjectMapperTest extends JacksonTest {
294294

295295
it should "deserialize a type param wrapped option" in {
296296
val json: String = """{"t": {"bar": "baz"}}"""
297-
val result = mapper.readValue[Wrapper[Option[Foo]]](json)
297+
val result = mapper.readValue[TWrapper[Option[Foo]]](json)
298298
result.t.get.isInstanceOf[Foo] should be(true)
299299
}
300300

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import com.fasterxml.jackson.core.TreeNode
88
import com.fasterxml.jackson.databind.annotation.JsonDeserialize
99
import com.fasterxml.jackson.databind.exc.InvalidFormatException
1010
import com.fasterxml.jackson.databind.{JsonMappingException, Module, ObjectMapper}
11-
import com.fasterxml.jackson.module.scala.deser.OptionDeserializerTest.{Foo, Wrapper}
11+
import com.fasterxml.jackson.module.scala.deser.OptionDeserializerTest.{Foo, TWrapper}
1212

1313
import scala.collection.JavaConverters._
1414

@@ -266,7 +266,7 @@ class ClassTagExtensionsTest extends JacksonTest {
266266

267267
it should "deserialize a type param wrapped option" in {
268268
val json: String = """{"t": {"bar": "baz"}}"""
269-
val result = mapper.readValue[Wrapper[Option[Foo]]](json)
269+
val result = mapper.readValue[TWrapper[Option[Foo]]](json)
270270
result.t.get.isInstanceOf[Foo] should be(true)
271271
}
272272

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
@@ -32,7 +32,7 @@ object OptionDeserializerTest {
3232
}
3333

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

3737
trait Marker
3838
case class AMarker(a: Int) extends Marker
@@ -87,7 +87,7 @@ class OptionDeserializerTest extends DeserializerTest {
8787

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

0 commit comments

Comments
 (0)