Remove deprecated code (#1243)

Author: mkurz

play-json/jvm/src/main/scala/play/api/libs/json/EnvReads.scala

@@ -724,10 +724,10 @@ trait EnvReads {
   }
 
   protected def parseBigDecimal(input: String): JsResult[java.math.BigDecimal] =
-    BigDecimalParser.parse(input, JsonParserSettings.settings)
+    BigDecimalParser.parse(input, JsonConfig.settings)
 
   protected def parseBigInteger(input: String): JsResult[java.math.BigInteger] = {
-    if (input.length > JsonParserSettings.settings.bigDecimalParseSettings.digitsLimit) {
+    if (input.length > JsonConfig.settings.bigDecimalParseConfig.digitsLimit) {
       JsError("error.expected.numberdigitlimit")
     } else {
       try {

play-json/jvm/src/main/scala/play/api/libs/json/JsonConfig.scala

@@ -259,63 +259,3 @@ private final case class JsonConfigImpl(
     bigDecimalSerializerConfig: BigDecimalSerializerConfig,
     streamReadConstraints: StreamReadConstraints
 ) extends JsonConfig
-
-@deprecated("Use BigDecimalParseConfig instead", "2.9.4")
-final case class BigDecimalParseSettings(
-    mathContext: MathContext = MathContext.DECIMAL128,
-    scaleLimit: Int,
-    digitsLimit: Int
-) extends BigDecimalParseConfig
-
-@deprecated("Use BigDecimalSerializerConfig instead", "2.9.4")
-final case class BigDecimalSerializerSettings(
-    minPlain: BigDecimal,
-    maxPlain: BigDecimal
-) extends BigDecimalSerializerConfig {
-  override def preserveZeroDecimal: Boolean = defaultPreserveZeroDecimal
-}
-
-@deprecated("Use JsonConfig instead", "2.9.4")
-final case class JsonParserSettings(
-    bigDecimalParseSettings: BigDecimalParseSettings,
-    bigDecimalSerializerSettings: BigDecimalSerializerSettings,
-    streamReadConstraints: StreamReadConstraints = JsonConfig.defaultStreamReadConstraints
-) extends JsonConfig {
-  override def bigDecimalParseConfig: BigDecimalParseConfig = bigDecimalParseSettings
-
-  override def bigDecimalSerializerConfig: BigDecimalSerializerConfig = bigDecimalSerializerSettings
-}
-
-object JsonParserSettings {
-  val defaultMathContext: MathContext = JsonConfig.defaultMathContext
-
-  // Limit for the scale considering the MathContext of 128
-  // limit for scale for decimal128: BigDecimal("0." + "0" * 33 + "1e-6143", java.math.MathContext.DECIMAL128).scale + 1
-  val defaultScaleLimit: Int = JsonConfig.defaultScaleLimit
-
-  // 307 digits should be the correct value for 128 bytes. But we are using 310
-  // because Play JSON uses BigDecimal to parse any number including Doubles and
-  // Doubles max value has 309 digits, so we are using 310 here
-  val defaultDigitsLimit: Int = JsonConfig.defaultDigitsLimit
-
-  // Maximum magnitude of BigDecimal to write out as a plain string
-  val MaxPlain: BigDecimal = JsonConfig.defaultMaxPlain
-
-  // Minimum magnitude of BigDecimal to write out as a plain string
-  val MinPlain: BigDecimal = JsonConfig.defaultMinPlain
-
-  def apply(): JsonParserSettings = JsonParserSettings(
-    BigDecimalParseSettings(defaultMathContext, defaultScaleLimit, defaultDigitsLimit),
-    BigDecimalSerializerSettings(minPlain = MinPlain, maxPlain = MaxPlain)
-  )
-
-  /**
-   * Return the default settings configured from System properties.
-   */
-  val settings: JsonParserSettings = {
-    JsonParserSettings(
-      BigDecimalParseSettings(loadMathContext, loadScaleLimit, loadDigitsLimit),
-      BigDecimalSerializerSettings(loadMinPlain, loadMaxPlain)
-    )
-  }
-}

play-json/jvm/src/main/scala/play/api/libs/json/jackson/JacksonJson.scala

@@ -42,23 +42,15 @@ import play.api.libs.json._
  * import com.fasterxml.jackson.databind.ObjectMapper
  *
  * import play.api.libs.json.JsValue
- * import play.api.libs.json.jackson.PlayJsonModule
- * import play.api.libs.json.JsonParserSettings
+ * import play.api.libs.json.jackson.PlayJsonMapperModule
+ * import play.api.libs.json.JsonConfig
  *
- * val jsonSettings = JsonSettings.settings
+ * val jsonSettings = JsonConfig.settings
  * val mapper = new ObjectMapper().registerModule(
  *   new PlayJsonMapperModule(jsonSettings))
  * val jsValue = mapper.readValue("""{"foo":"bar"}""", classOf[JsValue])
  * }}}
  */
-@deprecated("Use PlayJsonMapperModule class instead", "2.9.4")
-sealed class PlayJsonModule(parserSettings: JsonParserSettings) extends PlayJsonMapperModule(parserSettings) {
-  override def setupModule(context: SetupContext): Unit = super.setupModule(context)
-}
-
-@deprecated("Use PlayJsonModule class instead", "2.6.11")
-object PlayJsonModule extends PlayJsonModule(JsonParserSettings())
-
 sealed class PlayJsonMapperModule(jsonConfig: JsonConfig) extends SimpleModule("PlayJson", Version.unknownVersion()) {
   override def setupModule(context: SetupContext): Unit = {
     context.addDeserializers(new PlayDeserializers(jsonConfig))

play-json/jvm/src/test/scala/play/api/libs/json/JsonSpec.scala

@@ -289,7 +289,7 @@ class JsonSpec extends org.specs2.mutable.Specification {
       }
 
       "for BigDecimals" should {
-        val parserSettings = JsonParserSettings.settings
+        val parserSettings = JsonConfig.settings
 
         // note: precision refers to `JacksonJson.BigDecimalLimits.DefaultMathContext.getPrecision`
         "maintain precision when parsing BigDecimals within precision limit" in {
@@ -379,7 +379,7 @@ class JsonSpec extends org.specs2.mutable.Specification {
         }
 
         "success when not exceeding the scale limit for positive numbers" in {
-          val withinScaleLimit = BigDecimal(2, parserSettings.bigDecimalParseSettings.scaleLimit - 1)
+          val withinScaleLimit = BigDecimal(2, parserSettings.bigDecimalParseConfig.scaleLimit - 1)
           Json
             .parse(bigNumbersJson(bigDec = withinScaleLimit.toString))
             .as[BigNumbers]
@@ -388,7 +388,7 @@ class JsonSpec extends org.specs2.mutable.Specification {
         }
 
         "success when not exceeding the scale limit for negative numbers" in {
-          val withinScaleLimitNegative = BigDecimal(2, parserSettings.bigDecimalParseSettings.scaleLimit - 1).unary_-
+          val withinScaleLimitNegative = BigDecimal(2, parserSettings.bigDecimalParseConfig.scaleLimit - 1).unary_-
           Json.parse(bigNumbersJson(bigDec = withinScaleLimitNegative.toString)).as[BigNumbers].bigDec.mustEqual {
             withinScaleLimitNegative
           }
@@ -413,15 +413,15 @@ class JsonSpec extends org.specs2.mutable.Specification {
         }
 
         "fail when exceeding the scale limit for positive numbers" in {
-          val exceedsScaleLimit = BigDecimal(2, parserSettings.bigDecimalParseSettings.scaleLimit + 1)
+          val exceedsScaleLimit = BigDecimal(2, parserSettings.bigDecimalParseConfig.scaleLimit + 1)
           Json
             .parse(bigNumbersJson(bigDec = exceedsScaleLimit.toString))
             .as[BigNumbers]
             .must(throwA[IllegalArgumentException])
         }
 
         "fail when exceeding the scale limit for negative numbers" in {
-          val exceedsScaleLimit = BigDecimal(2, parserSettings.bigDecimalParseSettings.scaleLimit + 1).unary_-
+          val exceedsScaleLimit = BigDecimal(2, parserSettings.bigDecimalParseConfig.scaleLimit + 1).unary_-
           Json
             .parse(bigNumbersJson(bigDec = exceedsScaleLimit.toString))
             .as[BigNumbers]

play-json/jvm/src/test/scala/play/api/libs/json/ReadsSpec.scala

@@ -706,7 +706,7 @@ class ReadsSpec extends org.specs2.mutable.Specification {
     val DefaultReads = implicitly[Reads[BigDecimal]]
     import DefaultReads.reads
 
-    val settings = JsonParserSettings.settings.bigDecimalParseSettings
+    val settings = JsonConfig.settings.bigDecimalParseConfig
 
     val longNumberString =
       Iterator
@@ -738,7 +738,7 @@ class ReadsSpec extends org.specs2.mutable.Specification {
     val DefaultReads = implicitly[Reads[BigInt]]
     import DefaultReads.reads
 
-    val settings = JsonParserSettings.settings.bigDecimalParseSettings
+    val settings = JsonConfig.settings.bigDecimalParseConfig
 
     val longNumberString =
       Iterator