Skip to content

refactor scala number deserialization to reuse java equivalents #574

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 31, 2022
Merged

refactor scala number deserialization to reuse java equivalents #574

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,5 +153,10 @@ mimaBinaryIssueFilters ++= Seq(
ProblemFilters.exclude[ReversedMissingMethodProblem]("com.fasterxml.jackson.module.scala.introspect.ScalaAnnotationIntrospectorModule.getRegisteredReferencedValueType"),
ProblemFilters.exclude[DirectMissingMethodProblem]("com.fasterxml.jackson.module.scala.introspect.ScalaAnnotationIntrospector#ScalaValueInstantiator.this"),
ProblemFilters.exclude[DirectMissingMethodProblem]("com.fasterxml.jackson.module.scala.deser.NumberDeserializers.BigIntClass"),
ProblemFilters.exclude[DirectMissingMethodProblem]("com.fasterxml.jackson.module.scala.deser.NumberDeserializers.BigDecimalClass")
ProblemFilters.exclude[DirectMissingMethodProblem]("com.fasterxml.jackson.module.scala.deser.NumberDeserializers.BigDecimalClass"),
ProblemFilters.exclude[IncompatibleResultTypeProblem]("com.fasterxml.jackson.module.scala.deser.BigDecimalDeserializer.deserialize"),
ProblemFilters.exclude[IncompatibleResultTypeProblem]("com.fasterxml.jackson.module.scala.deser.BigIntDeserializer.deserialize"),
ProblemFilters.exclude[MissingTypesProblem]("com.fasterxml.jackson.module.scala.deser.BigDecimalDeserializer$"),
ProblemFilters.exclude[MissingTypesProblem]("com.fasterxml.jackson.module.scala.deser.BigIntDeserializer$"),
ProblemFilters.exclude[MissingClassProblem]("com.fasterxml.jackson.module.scala.deser.BigNumberDeserializer")
)
55 changes: 14 additions & 41 deletions src/main/scala/com/fasterxml/jackson/module/scala/deser/ScalaNumberDeserializersModule.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,56 +2,29 @@ package com.fasterxml.jackson
package module.scala
package deser

import com.fasterxml.jackson.core.JsonToken.{START_ARRAY, VALUE_NUMBER_FLOAT, VALUE_NUMBER_INT, VALUE_STRING}
import com.fasterxml.jackson.core.io.BigDecimalParser
import com.fasterxml.jackson.core.{JsonParser, JsonToken}
import com.fasterxml.jackson.databind.DeserializationFeature.UNWRAP_SINGLE_VALUE_ARRAYS
import com.fasterxml.jackson.core.JsonParser
import com.fasterxml.jackson.databind.deser.Deserializers
import com.fasterxml.jackson.databind.deser.std.StdScalarDeserializer
import com.fasterxml.jackson.databind._
import com.fasterxml.jackson.databind.deser.std.NumberDeserializers.{
BigDecimalDeserializer => JavaBigDecimalDeserializer, BigIntegerDeserializer
}

import scala.reflect.{ClassTag, classTag}

private abstract class BigNumberDeserializer[T >: Null : ClassTag](creator: (String) => T)
extends StdScalarDeserializer[T](classTag[T].runtimeClass)
{
override def deserialize(jp: JsonParser, ctxt: DeserializationContext): T = {
val t = jp.getCurrentToken
t match {
case VALUE_NUMBER_INT | VALUE_NUMBER_FLOAT => creator(jp.getText.trim)
case VALUE_STRING =>
val text = jp.getText.trim
if (text.isEmpty) None.orNull else try {
creator(text)
}
catch {
case _: IllegalArgumentException => throw ctxt.weirdStringException(text, _valueClass, "not a valid representation")
}
case START_ARRAY if ctxt.isEnabled(UNWRAP_SINGLE_VALUE_ARRAYS) =>
jp.nextToken()
val value = deserialize(jp, ctxt)
if (jp.nextToken() != JsonToken.END_ARRAY) {
throw ctxt.wrongTokenException(jp, ctxt.getContextualType, JsonToken.END_ARRAY, "Attempted to unwrap array for single value but there was more than a single value in the array")
}
value
case _ =>
ctxt.handleUnexpectedToken(_valueClass, jp).asInstanceOf[T]
}
private object BigDecimalDeserializer extends StdScalarDeserializer[BigDecimal](classOf[BigDecimal]) {
override def deserialize(p: JsonParser, ctxt: DeserializationContext): BigDecimal = {
JavaBigDecimalDeserializer.instance.deserialize(p, ctxt)
}
}

private object ScalaBigDecimalParser {
def fromString(str: String): BigDecimal = BigDecimalParser.parse(str)
private object BigIntDeserializer extends StdScalarDeserializer[BigInt](classOf[BigInt]) {
override def deserialize(p: JsonParser, ctxt: DeserializationContext): BigInt = {
BigIntegerDeserializer.instance.deserialize(p, ctxt)
}
}

private object BigDecimalDeserializer extends BigNumberDeserializer(ScalaBigDecimalParser.fromString)

private object BigIntDeserializer extends BigNumberDeserializer(BigInt.apply)

private object NumberDeserializers extends Deserializers.Base
{
private val BigDecimalClass = BigDecimalDeserializer.handledType()
private val BigIntClass = BigIntDeserializer.handledType()
private object NumberDeserializers extends Deserializers.Base {
private val BigDecimalClass = classOf[BigDecimal]
private val BigIntClass = classOf[BigInt]

override def findBeanDeserializer(tpe: JavaType, config: DeserializationConfig, beanDesc: BeanDescription): JsonDeserializer[_] =
tpe.getRawClass match {
Expand Down