Skip to content

Commit 1e1ea2f

Browse files
committed
Fix ArrayOfYearsWriting for jackson-module-scala
1 parent b108585 commit 1e1ea2f

File tree

5 files changed

+7
-8
lines changed

5 files changed

+7
-8
lines changed

jsoniter-scala-benchmark/jvm/src/test/scala-2/com/github/plokhotnyuk/jsoniter_scala/benchmark/ArrayOfYearsWritingSpec.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ class ArrayOfYearsWritingSpec extends BenchmarkSpecBase {
1212
toString(b.borer()) shouldBe b.jsonString
1313
toString(b.circe()) shouldBe b.jsonString
1414
toString(b.circeJsoniter()) shouldBe b.jsonString
15-
//FIXME: jackson 3.0.0-rc1 serializes `java.time.Year` values as numbers
16-
//toString(b.jacksonScala()) shouldBe b.jsonString
15+
toString(b.jacksonScala()) shouldBe b.jsonString
1716
toString(b.json4sJackson()) shouldBe b.jsonString
1817
toString(b.json4sNative()) shouldBe b.jsonString
1918
toString(b.jsoniterScala()) shouldBe b.jsonString

jsoniter-scala-benchmark/jvm/src/test/scala-3/com/github/plokhotnyuk/jsoniter_scala/benchmark/ArrayOfYearsWritingSpec.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ class ArrayOfYearsWritingSpec extends BenchmarkSpecBase {
1111
toString(b.borer()) shouldBe b.jsonString
1212
toString(b.circe()) shouldBe b.jsonString
1313
toString(b.circeJsoniter()) shouldBe b.jsonString
14-
//FIXME: jackson 3.0.0-rc1 serializes `java.time.Year` values as numbers
15-
//toString(b.jacksonScala()) shouldBe b.jsonString
14+
toString(b.jacksonScala()) shouldBe b.jsonString
1615
toString(b.json4sJackson()) shouldBe b.jsonString
1716
toString(b.json4sNative()) shouldBe b.jsonString
1817
toString(b.jsoniterScala()) shouldBe b.jsonString

jsoniter-scala-benchmark/shared/src/main/scala-2/com/github/plokhotnyuk/jsoniter_scala/benchmark/ArrayOfYearsWriting.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@ class ArrayOfYearsWriting extends ArrayOfYearsBenchmark {
3838

3939
writeToArray(obj.asJson)
4040
}
41-
/* FIXME: jackson 3.0.0-rc1 serializes `java.time.Year` values as numbers
41+
4242
@Benchmark
4343
def jacksonScala(): Array[Byte] = {
4444
import com.github.plokhotnyuk.jsoniter_scala.benchmark.JacksonSerDesers._
4545

4646
jacksonMapper.writeValueAsBytes(obj)
4747
}
48-
*/
48+
4949
@Benchmark
5050
def json4sJackson(): Array[Byte] = {
5151
import com.github.plokhotnyuk.jsoniter_scala.benchmark.JavaTimeJson4sFormats._

jsoniter-scala-benchmark/shared/src/main/scala-3/com/github/plokhotnyuk/jsoniter_scala/benchmark/ArrayOfYearsWriting.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@ class ArrayOfYearsWriting extends ArrayOfYearsBenchmark {
2929

3030
writeToArray(obj.asJson)
3131
}
32-
/* FIXME: jackson 3.0.0-rc1 serializes `java.time.Year` values as numbers
32+
3333
@Benchmark
3434
def jacksonScala(): Array[Byte] = {
3535
import com.github.plokhotnyuk.jsoniter_scala.benchmark.JacksonSerDesers._
3636

3737
jacksonMapper.writeValueAsBytes(obj)
3838
}
39-
*/
39+
4040
@Benchmark
4141
def json4sJackson(): Array[Byte] = {
4242
import com.github.plokhotnyuk.jsoniter_scala.benchmark.JavaTimeJson4sFormats._

jsoniter-scala-benchmark/shared/src/main/scala/com/github/plokhotnyuk/jsoniter_scala/benchmark/JacksonSerDesers.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ object JacksonSerDesers {
5454
.addModule(DefaultScalaModule)
5555
.addModule(BitSetDeserializerModule)
5656
.addModule(new JavaTimeModule)
57+
.withConfigOverride(classOf[Year], x => x.setFormat(JsonFormat.Value.forShape(JsonFormat.Shape.STRING)))
5758
.addModule(new SimpleModule()
5859
.addDeserializer(classOf[BitSet], ImmutableBitSetDeserializer)
5960
.addDeserializer(classOf[mutable.BitSet], MutableBitSetDeserializer)

0 commit comments

Comments
 (0)