Skip to content

Commit 17c0ccb

Browse files
plokhotnyukplokhotnyuk
committed
Fix #86 unexpected boxing/unboxing when parsing of primitives by renaming package methods to avoid overridding
1 parent 556615f commit 17c0ccb

File tree

45 files changed

+180
-244
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+180
-244
lines changed

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ That's it! You have generated an instance of `com.github.plokhotnyuk.jsoniter_sc
103103
Now you can use it for parsing & serialization:
104104

105105
```scala
106-
val user = read("""{"name":"John","devices":[{"id":1,model:"HTC One X"}]}""".getBytes)
107-
val json = write(User(name = "John", devices = Seq(Device(id = 2, model = "iPhone X"))))
106+
val user = readFromArray("""{"name":"John","devices":[{"id":1,model:"HTC One X"}]}""".getBytes)
107+
val json = writeToArray(User(name = "John", devices = Seq(Device(id = 2, model = "iPhone X"))))
108108
```
109109

110110
To see generated code add the following line to your sbt build file

‎benchmark/src/main/scala/com/github/plokhotnyuk/jsoniter_scala/macros/AdtBenchmark.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class AdtBenchmark extends CommonParams {
3939
def readJacksonScala(): AdtBase = jacksonMapper.readValue[AdtBase](jsonBytes)
4040

4141
@Benchmark
42-
def readJsoniterScala(): AdtBase = read[AdtBase](jsonBytes)
42+
def readJsoniterScala(): AdtBase = readFromArray[AdtBase](jsonBytes)
4343

4444
@Benchmark
4545
def readPlayJson(): AdtBase = Json.parse(jsonBytes).as[AdtBase](adtFormat)
@@ -51,7 +51,7 @@ class AdtBenchmark extends CommonParams {
5151
def writeJacksonScala(): Array[Byte] = jacksonMapper.writeValueAsBytes(obj)
5252

5353
@Benchmark
54-
def writeJsoniterScala(): Array[Byte] = write(obj)
54+
def writeJsoniterScala(): Array[Byte] = writeToArray(obj)
5555

5656
@Benchmark
5757
def writePlayJson(): Array[Byte] = Json.toBytes(Json.toJson(obj)(adtFormat))

‎benchmark/src/main/scala/com/github/plokhotnyuk/jsoniter_scala/macros/AnyRefsBenchmark.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class AnyRefsBenchmark extends CommonParams {
2727
def readJacksonScala(): AnyRefs = jacksonMapper.readValue[AnyRefs](jsonBytes)
2828

2929
@Benchmark
30-
def readJsoniterScala(): AnyRefs = read[AnyRefs](jsonBytes)
30+
def readJsoniterScala(): AnyRefs = readFromArray[AnyRefs](jsonBytes)
3131

3232
@Benchmark
3333
def readPlayJson(): AnyRefs = Json.parse(jsonBytes).as[AnyRefs](anyRefsFormat)
@@ -39,10 +39,10 @@ class AnyRefsBenchmark extends CommonParams {
3939
def writeJacksonScala(): Array[Byte] = jacksonMapper.writeValueAsBytes(obj)
4040

4141
@Benchmark
42-
def writeJsoniterScala(): Array[Byte] = write(obj)
42+
def writeJsoniterScala(): Array[Byte] = writeToArray(obj)
4343

4444
@Benchmark
45-
def writeJsoniterScalaPrealloc(): Int = write(obj, preallocatedBuf, 0)
45+
def writeJsoniterScalaPrealloc(): Int = writeToPreallocatedArray(obj, preallocatedBuf, 0)
4646

4747
@Benchmark
4848
def writePlayJson(): Array[Byte] = Json.toBytes(Json.toJson(obj)(anyRefsFormat))

‎benchmark/src/main/scala/com/github/plokhotnyuk/jsoniter_scala/macros/ArrayOfBigDecimalsBenchmark.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class ArrayOfBigDecimalsBenchmark extends CommonParams {
3030
def readJacksonScala(): Array[BigDecimal] = jacksonMapper.readValue[Array[BigDecimal]](jsonBytes)
3131

3232
@Benchmark
33-
def readJsoniterScala(): Array[BigDecimal] = read[Array[BigDecimal]](jsonBytes)
33+
def readJsoniterScala(): Array[BigDecimal] = readFromArray[Array[BigDecimal]](jsonBytes)
3434

3535
@Benchmark
3636
def readPlayJson(): Array[BigDecimal] = Json.parse(jsonBytes).as[Array[BigDecimal]]
@@ -42,10 +42,10 @@ class ArrayOfBigDecimalsBenchmark extends CommonParams {
4242
def writeJacksonScala(): Array[Byte] = jacksonMapper.writeValueAsBytes(obj)
4343

4444
@Benchmark
45-
def writeJsoniterScala(): Array[Byte] = write(obj)
45+
def writeJsoniterScala(): Array[Byte] = writeToArray(obj)
4646

4747
@Benchmark
48-
def writeJsoniterScalaPrealloc(): Int = write(obj, preallocatedBuf, 0)
48+
def writeJsoniterScalaPrealloc(): Int = writeToPreallocatedArray(obj, preallocatedBuf, 0)
4949

5050
@Benchmark
5151
def writePlayJson(): Array[Byte] = Json.toBytes(Json.toJson(obj))

‎benchmark/src/main/scala/com/github/plokhotnyuk/jsoniter_scala/macros/ArrayOfBigIntsBenchmark.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class ArrayOfBigIntsBenchmark extends CommonParams {
2323
def readJacksonScala(): Array[BigInt] = jacksonMapper.readValue[Array[BigInt]](jsonBytes)
2424

2525
@Benchmark
26-
def readJsoniterScala(): Array[BigInt] = read[Array[BigInt]](jsonBytes)
26+
def readJsoniterScala(): Array[BigInt] = readFromArray[Array[BigInt]](jsonBytes)
2727

2828
/* FIXME: add format for BigInt arrays
2929
@Benchmark
@@ -37,10 +37,10 @@ class ArrayOfBigIntsBenchmark extends CommonParams {
3737
def writeJacksonScala(): Array[Byte] = jacksonMapper.writeValueAsBytes(obj)
3838

3939
@Benchmark
40-
def writeJsoniterScala(): Array[Byte] = write(obj)
40+
def writeJsoniterScala(): Array[Byte] = writeToArray(obj)
4141

4242
@Benchmark
43-
def writeJsoniterScalaPrealloc(): Int = write(obj, preallocatedBuf, 0)
43+
def writeJsoniterScalaPrealloc(): Int = writeToPreallocatedArray(obj, preallocatedBuf, 0)
4444
/* FIXME: add format for BigInt arrays
4545
@Benchmark
4646
def writePlayJson(): Array[Byte] = Json.toBytes(Json.toJson(obj))

‎benchmark/src/main/scala/com/github/plokhotnyuk/jsoniter_scala/macros/ArrayOfBooleansBenchmark.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class ArrayOfBooleansBenchmark extends CommonParams {
2323
def readJacksonScala(): Array[Boolean] = jacksonMapper.readValue[Array[Boolean]](jsonBytes)
2424

2525
@Benchmark
26-
def readJsoniterScala(): Array[Boolean] = read[Array[Boolean]](jsonBytes)
26+
def readJsoniterScala(): Array[Boolean] = readFromArray[Array[Boolean]](jsonBytes)
2727

2828
@Benchmark
2929
def readPlayJson(): Array[Boolean] = Json.parse(jsonBytes).as[Array[Boolean]]
@@ -35,10 +35,10 @@ class ArrayOfBooleansBenchmark extends CommonParams {
3535
def writeJacksonScala(): Array[Byte] = jacksonMapper.writeValueAsBytes(obj)
3636

3737
@Benchmark
38-
def writeJsoniterScala(): Array[Byte] = write(obj)
38+
def writeJsoniterScala(): Array[Byte] = writeToArray(obj)
3939

4040
@Benchmark
41-
def writeJsoniterScalaPrealloc(): Int = write(obj, preallocatedBuf, 0)
41+
def writeJsoniterScalaPrealloc(): Int = writeToPreallocatedArray(obj, preallocatedBuf, 0)
4242

4343
@Benchmark
4444
def writePlayJson(): Array[Byte] = Json.toBytes(Json.toJson(obj))

‎benchmark/src/main/scala/com/github/plokhotnyuk/jsoniter_scala/macros/ArrayOfBytesBenchmark.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class ArrayOfBytesBenchmark extends CommonParams {
2323
def readJacksonScala(): Array[Byte] = jacksonMapper.readValue[Array[Byte]](jsonBytes)
2424

2525
@Benchmark
26-
def readJsoniterScala(): Array[Byte] = read[Array[Byte]](jsonBytes)
26+
def readJsoniterScala(): Array[Byte] = readFromArray[Array[Byte]](jsonBytes)
2727

2828
@Benchmark
2929
def readPlayJson(): Array[Byte] = Json.parse(jsonBytes).as[Array[Byte]]
@@ -37,10 +37,10 @@ class ArrayOfBytesBenchmark extends CommonParams {
3737
*/
3838

3939
@Benchmark
40-
def writeJsoniterScala(): Array[Byte] = write(obj)
40+
def writeJsoniterScala(): Array[Byte] = writeToArray(obj)
4141

4242
@Benchmark
43-
def writeJsoniterScalaPrealloc(): Int = write(obj, preallocatedBuf, 0)
43+
def writeJsoniterScalaPrealloc(): Int = writeToPreallocatedArray(obj, preallocatedBuf, 0)
4444

4545
@Benchmark
4646
def writePlayJson(): Array[Byte] = Json.toBytes(Json.toJson(obj))

‎benchmark/src/main/scala/com/github/plokhotnyuk/jsoniter_scala/macros/ArrayOfDoublesBenchmark.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class ArrayOfDoublesBenchmark extends CommonParams {
2424
def readJacksonScala(): Array[Double] = jacksonMapper.readValue[Array[Double]](jsonBytes)
2525

2626
@Benchmark
27-
def readJsoniterScala(): Array[Double] = read[Array[Double]](jsonBytes)
27+
def readJsoniterScala(): Array[Double] = readFromArray[Array[Double]](jsonBytes)
2828

2929
@Benchmark
3030
def readPlayJson(): Array[Double] = Json.parse(jsonBytes).as[Array[Double]]
@@ -36,10 +36,10 @@ class ArrayOfDoublesBenchmark extends CommonParams {
3636
def writeJacksonScala(): Array[Byte] = jacksonMapper.writeValueAsBytes(obj)
3737

3838
@Benchmark
39-
def writeJsoniterScala(): Array[Byte] = write(obj)
39+
def writeJsoniterScala(): Array[Byte] = writeToArray(obj)
4040

4141
@Benchmark
42-
def writeJsoniterScalaPrealloc(): Int = write(obj, preallocatedBuf, 0)
42+
def writeJsoniterScalaPrealloc(): Int = writeToPreallocatedArray(obj, preallocatedBuf, 0)
4343
/* FIXME: Play serializes doubles in different format than toString: 0.0 as 0, 7.0687002407403325E18 as 7068700240740332500
4444
@Benchmark
4545
def writePlayJson(): Array[Byte] = Json.toBytes(Json.toJson(obj))

‎benchmark/src/main/scala/com/github/plokhotnyuk/jsoniter_scala/macros/ArrayOfDurationsBenchmark.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class ArrayOfDurationsBenchmark extends CommonParams {
2929
def readJacksonScala(): Array[Duration] = jacksonMapper.readValue[Array[Duration]](jsonBytes)
3030

3131
@Benchmark
32-
def readJsoniterScala(): Array[Duration] = read[Array[Duration]](jsonBytes)
32+
def readJsoniterScala(): Array[Duration] = readFromArray[Array[Duration]](jsonBytes)
3333

3434
@Benchmark
3535
def readPlayJson(): Array[Duration] = Json.parse(jsonBytes).as[Array[Duration]]
@@ -41,10 +41,10 @@ class ArrayOfDurationsBenchmark extends CommonParams {
4141
def writeJacksonScala(): Array[Byte] = jacksonMapper.writeValueAsBytes(obj)
4242
*/
4343
@Benchmark
44-
def writeJsoniterScala(): Array[Byte] = write(obj)
44+
def writeJsoniterScala(): Array[Byte] = writeToArray(obj)
4545

4646
@Benchmark
47-
def writeJsoniterScalaPrealloc(): Int = write(obj, preallocatedBuf, 0)
47+
def writeJsoniterScalaPrealloc(): Int = writeToPreallocatedArray(obj, preallocatedBuf, 0)
4848

4949
@Benchmark
5050
def writePlayJson(): Array[Byte] = Json.toBytes(Json.toJson(obj))

‎benchmark/src/main/scala/com/github/plokhotnyuk/jsoniter_scala/macros/ArrayOfEnumsBenchmark.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class ArrayOfEnumsBenchmark extends CommonParams {
3434
def readJacksonScala(): Array[SuitEnum] = jacksonMapper.readValue[Array[SuitEnum]](jsonBytes)
3535
*/
3636
@Benchmark
37-
def readJsoniterScala(): Array[SuitEnum] = read[Array[SuitEnum]](jsonBytes)
37+
def readJsoniterScala(): Array[SuitEnum] = readFromArray[Array[SuitEnum]](jsonBytes)
3838

3939
@Benchmark
4040
def readPlayJson(): Array[SuitEnum] = Json.parse(jsonBytes).as[Array[SuitEnum]](enumArrayFormat)
@@ -46,10 +46,10 @@ class ArrayOfEnumsBenchmark extends CommonParams {
4646
def writeJacksonScala(): Array[Byte] = jacksonMapper.writeValueAsBytes(obj)
4747
*/
4848
@Benchmark
49-
def writeJsoniterScala(): Array[Byte] = write(obj)
49+
def writeJsoniterScala(): Array[Byte] = writeToArray(obj)
5050

5151
@Benchmark
52-
def writeJsoniterScalaPrealloc(): Int = write(obj, preallocatedBuf, 0)
52+
def writeJsoniterScalaPrealloc(): Int = writeToPreallocatedArray(obj, preallocatedBuf, 0)
5353

5454
@Benchmark
5555
def writePlayJson(): Array[Byte] = Json.toBytes(Json.toJson(obj)(enumArrayFormat))

0 commit comments

Comments
 (0)