Skip to content

Commit b7b1ac4

Browse files
committed
remove scala-java8-compat test dependency
1 parent 47fe25a commit b7b1ac4

8 files changed

Lines changed: 12 additions & 22 deletions

build.sbt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,6 @@ else
119119
)
120120

121121
libraryDependencies ++= jacksonDependencies ++ Seq(
122-
"org.scala-lang.modules" %% "scala-java8-compat" % "1.0.2" % Test,
123122
"javax.ws.rs" % "javax.ws.rs-api" % "2.1.1" % Test,
124123
"io.swagger" % "swagger-core" % "1.6.8" % Test,
125124
"org.scalatest" %% "scalatest" % "3.2.20" % Test

src/test/scala/tools/jackson/module/scala/deser/CaseObjectDeserializerTest.scala

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ import tools.jackson.databind.json.JsonMapper
88
import tools.jackson.module.scala.{ClassTagExtensions, DefaultScalaModule}
99
import tools.jackson.module.scala.introspect.ScalaAnnotationIntrospectorModule
1010

11-
import scala.compat.java8.FunctionConverters.asJavaUnaryOperator
12-
1311
object CaseObjectDeserializerTest {
1412
case object TestObject
1513

@@ -51,11 +49,11 @@ class CaseObjectDeserializerTest extends DeserializerTest {
5149

5250
it should "deserialize Foo and not create a new instance (visibility settings)" in {
5351
val mapper = newBuilder
54-
.changeDefaultVisibility(asJavaUnaryOperator((a: Any) => {
52+
.changeDefaultVisibility(_ => {
5553
VisibilityChecker.defaultInstance()
5654
.withFieldVisibility(JsonAutoDetect.Visibility.ANY)
5755
.withGetterVisibility(JsonAutoDetect.Visibility.NONE)
58-
}))
56+
})
5957
.build()
6058
val original = Foo
6159
val json = mapper.writeValueAsString(original)

src/test/scala/tools/jackson/module/scala/deser/OptionDeserializerTest.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import tools.jackson.module.scala.DefaultScalaModule
99
import tools.jackson.module.scala.introspect.ScalaAnnotationIntrospectorModule
1010

1111
import scala.annotation.meta.field
12-
import scala.compat.java8.FunctionConverters
1312

1413
object OptionDeserializerTest {
1514
case class UnavailableField(foo: Option[String])
@@ -97,7 +96,7 @@ class OptionDeserializerTest extends DeserializerTest {
9796

9897
it should "handle conversion of null to empty collection" in {
9998
val mapper = newBuilder
100-
.changeDefaultNullHandling(FunctionConverters.asJavaUnaryOperator(_ => JsonSetter.Value.construct(Nulls.AS_EMPTY, Nulls.AS_EMPTY)))
99+
.changeDefaultNullHandling(_ => JsonSetter.Value.construct(Nulls.AS_EMPTY, Nulls.AS_EMPTY))
101100
.build()
102101
val json = """{"o": null}"""
103102
val result1 = mapper.readValue(json, classOf[JavaOptionalWrapper])

src/test/scala/tools/jackson/module/scala/deser/SeqDeserializerTest.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import tools.jackson.module.scala.{DefaultScalaModule, JacksonModule}
99

1010
import java.util.UUID
1111
import scala.collection.{immutable, mutable}
12-
import scala.compat.java8.FunctionConverters
1312

1413
object SeqDeserializerTest {
1514
case class JavaListWrapper(s: java.util.ArrayList[String])
@@ -247,7 +246,7 @@ class SeqDeserializerTest extends DeserializerTest {
247246
it should "handle conversion of null to empty collection" in {
248247
val mapper = JsonMapper.builder()
249248
.addModule(DefaultScalaModule)
250-
.changeDefaultNullHandling(FunctionConverters.asJavaUnaryOperator(_ => JsonSetter.Value.construct(Nulls.AS_EMPTY, Nulls.AS_EMPTY)))
249+
.changeDefaultNullHandling(_ => JsonSetter.Value.construct(Nulls.AS_EMPTY, Nulls.AS_EMPTY))
251250
.build()
252251
val json = """{"s": null}"""
253252
val result1 = mapper.readValue(json, classOf[JavaListWrapper])

src/test/scala/tools/jackson/module/scala/deser/UnsortedMapDeserializerTest.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import org.scalatest.OptionValues
1010

1111
import java.util.UUID
1212
import scala.collection._
13-
import scala.compat.java8.FunctionConverters
1413

1514
case class JavaMapWrapper(m: java.util.HashMap[String, String])
1615
case class MapWrapper(m: Map[String, String])
@@ -106,7 +105,7 @@ class UnsortedMapDeserializerTest extends DeserializerTest with OptionValues {
106105
it should "handle conversion of null to empty collection" in {
107106
val mapper = JsonMapper.builder()
108107
.addModule(DefaultScalaModule)
109-
.changeDefaultNullHandling(FunctionConverters.asJavaUnaryOperator(_ => JsonSetter.Value.construct(Nulls.AS_EMPTY, Nulls.AS_EMPTY)))
108+
.changeDefaultNullHandling(_ => JsonSetter.Value.construct(Nulls.AS_EMPTY, Nulls.AS_EMPTY))
110109
.build()
111110
val json = """{"m": null}"""
112111
val result1 = mapper.readValue(json, classOf[JavaMapWrapper])

src/test/scala/tools/jackson/module/scala/ser/CaseClassSerializerTest.scala

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import tools.jackson.databind.{MapperFeature, ObjectMapper, PropertyNamingStrate
77
import tools.jackson.module.scala.DefaultScalaModule
88

99
import scala.beans.BeanProperty
10-
import scala.compat.java8.FunctionConverters
1110

1211
case class ConstructorTestCaseClass(intValue: Int, stringValue: String)
1312

@@ -134,8 +133,8 @@ class CaseClassSerializerTest extends SerializerTest {
134133

135134
def nonNullMapper: ObjectMapper = {
136135
newBuilder
137-
.changeDefaultPropertyInclusion(FunctionConverters.asJavaUnaryOperator(_ =>
138-
JsonInclude.Value.construct(JsonInclude.Include.NON_NULL, JsonInclude.Include.NON_NULL)))
136+
.changeDefaultPropertyInclusion(_ =>
137+
JsonInclude.Value.construct(JsonInclude.Include.NON_NULL, JsonInclude.Include.NON_NULL))
139138
.build()
140139
}
141140

src/test/scala/tools/jackson/module/scala/ser/CaseObjectSerializerTest.scala

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ import com.fasterxml.jackson.annotation.{JsonAutoDetect, PropertyAccessor}
44
import tools.jackson.databind.introspect.VisibilityChecker
55
import tools.jackson.module.scala.DefaultScalaModule
66

7-
import scala.compat.java8.FunctionConverters.asJavaUnaryOperator
8-
97
case object CaseObjectExample {
108
val field1: String = "test"
119
val field2: Int = 42
@@ -29,11 +27,11 @@ class CaseObjectSerializerTest extends SerializerTest {
2927
// https://github.com/FasterXML/jackson-module-scala/issues/596
3028
it should "serialize a case object when visibility settings set" ignore {
3129
val mapper = newBuilder
32-
.changeDefaultVisibility(asJavaUnaryOperator((a: Any) => {
30+
.changeDefaultVisibility(_ => {
3331
VisibilityChecker.defaultInstance()
3432
.withFieldVisibility(JsonAutoDetect.Visibility.ANY)
3533
.withGetterVisibility(JsonAutoDetect.Visibility.NONE)
36-
}))
34+
})
3735
.build()
3836
mapper.writeValueAsString(CaseObjectExample) should (
3937
equal("""{"field1":"test","field2":42}""") or
@@ -43,11 +41,11 @@ class CaseObjectSerializerTest extends SerializerTest {
4341

4442
it should "serialize an inner case object when visibility settings set" in {
4543
val mapper = newBuilder
46-
.changeDefaultVisibility(asJavaUnaryOperator((a: Any) => {
44+
.changeDefaultVisibility(_ => {
4745
VisibilityChecker.defaultInstance()
4846
.withFieldVisibility(JsonAutoDetect.Visibility.ANY)
4947
.withGetterVisibility(JsonAutoDetect.Visibility.NONE)
50-
}))
48+
})
5149
.build()
5250
mapper.writeValueAsString(Foo) shouldEqual """{"field":"bar"}"""
5351
}

src/test/scala/tools/jackson/module/scala/ser/OptionSerializerTest.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import tools.jackson.module.scala.{DefaultScalaModule, JacksonModule}
77

88
import java.util
99
import scala.annotation.meta.{field, getter}
10-
import scala.compat.java8.FunctionConverters._
1110

1211
object OptionSerializerTest {
1312
class NonEmptyOptions {
@@ -263,7 +262,7 @@ class OptionSerializerTest extends SerializerTest {
263262
}
264263

265264
private def newMapperWithPropertyInclusion(includeValue: JsonInclude.Value): ObjectMapper = {
266-
val builder = newBuilder.changeDefaultPropertyInclusion(asJavaUnaryOperator((a: Any) => includeValue))
265+
val builder = newBuilder.changeDefaultPropertyInclusion(_ => includeValue)
267266
builder.build()
268267
}
269268
}

0 commit comments

Comments
 (0)