Skip to content

Commit 4d82ff5

Browse files
committed
scala 2.11 support
1 parent e99a975 commit 4d82ff5

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

weejson-jsoniter-scala/src/main/scala/com/rallyhealth/weejson/v1/wee_jsoniter_scala/WeePickleJsonValueCodecs.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ object WeePickleJsonValueCodecs {
171171
* trailing hyphens.
172172
*
173173
*/
174-
require(ValidJsonNum.matches(cs), "invalid number")
174+
require(ValidJsonNum.pattern.matcher(cs).matches(), "invalid number")
175175
v.visitFloat64String(cs)
176176
}
177177
}

weepickle-tests/src/test/scala/com/rallyhealth/weepickle/v1/NumberSoup.scala

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
11
package com.rallyhealth.weepickle.v1
22

3+
import com.rallyhealth.weepickle.v1.NumberSoup.ValidJsonNum
34
import org.scalacheck.{Arbitrary, Gen}
45

56
case class NumberSoup(value: String) {
67

78
override def toString: String = value
9+
10+
def isValid: Boolean = ValidJsonNum.pattern.matcher(value).matches()
11+
12+
def isInvalid: Boolean = !isValid
813
}
914
object NumberSoup {
1015
val ValidJsonNum = """-?(0|[1-9]\d*)(\.\d+)?([eE][-+]?\d+)?""".r // based on https://datatracker.ietf.org/doc/html/rfc7159#page-6
@@ -16,7 +21,7 @@ object NumberSoup {
1621
1 -> "-",
1722
1 -> "+",
1823
1 -> "E",
19-
1 -> "e",
24+
1 -> "e"
2025
)
2126
Gen.listOf(numberParts).map(_.mkString).map(NumberSoup(_))
2227
}

weepickle-tests/src/test/scala/com/rallyhealth/weepickle/v1/ParserSpec.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@ abstract class ParserSpec(parse: Array[Byte] => FromInput, depthLimit: Int = 100
3737
"deep arr" in testDepth(Arr(_))
3838
"deep obj" in testDepth(b => Obj("k" -> b))
3939
"number soup" in forAll { soup: NumberSoup =>
40-
val isValid = ValidJsonNum.matches(soup.value)
41-
whenever(!isValid) {
40+
whenever(soup.isInvalid) {
4241
intercept[Exception] {
4342
parse(soup.value.getBytes()).transform(NoOpVisitor)
4443
}

0 commit comments

Comments
 (0)