Skip to content

Commit f13de2b

Browse files
committed
Replace to new wildcard syntax
1 parent f0b4abb commit f13de2b

File tree

7 files changed

+59
-59
lines changed

7 files changed

+59
-59
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ object DslPlatformJson {
1515
.doublePrecision(JsonReader.DoublePrecision.EXACT))
1616

1717
dslJson.registerReader(classOf[Char], new JsonReader.ReadObject[Char] {
18-
override def read(reader: JsonReader[_]): Char = {
18+
override def read(reader: JsonReader[?]): Char = {
1919
val s = reader.readString()
2020
if (s.length != 1) reader.newParseError("expected string with a single char (not surrogate pair)")
2121
s.charAt(0)
@@ -28,8 +28,8 @@ object DslPlatformJson {
2828
private[this] val threadLocalJsonWriter = new ThreadLocal[JsonWriter] {
2929
override def initialValue(): JsonWriter = dslJson.newWriter
3030
}
31-
private[this] val threadLocalJsonReader = new ThreadLocal[JsonReader[_]] {
32-
override def initialValue(): JsonReader[_] = dslJson.newReader
31+
private[this] val threadLocalJsonReader = new ThreadLocal[JsonReader[?]] {
32+
override def initialValue(): JsonReader[?] = dslJson.newReader
3333
}
3434

3535
val (stringEncoder: JsonWriter.WriteObject[String],

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class MissingRequiredFieldsReading extends MissingRequiredFieldsBenchmark {
2626
try {
2727
Json.decode(jsonBytes).to[MissingRequiredFields].value.toString // toString shouldn't be called
2828
} catch {
29-
case ex: Error[_] => ex.getMessage
29+
case ex: Error[?] => ex.getMessage
3030
}
3131
}
3232

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class MissingRequiredFieldsReading extends MissingRequiredFieldsBenchmark {
1212
try {
1313
Json.decode(jsonBytes).to[MissingRequiredFields].value.toString // toString shouldn't be called
1414
} catch {
15-
case ex: Error[_] => ex.getMessage
15+
case ex: Error[?] => ex.getMessage
1616
}
1717
}
1818

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,11 @@ object StringifiedFormats {
8787
}))
8888
}
8989

90-
class SimpleTypeHints(override val hints: List[Class[_]],
90+
class SimpleTypeHints(override val hints: List[Class[?]],
9191
override val typeHintFieldName: String = "type") extends TypeHints {
92-
override def hintFor(clazz: Class[_]): Option[String] = new Some(clazz.getSimpleName)
92+
override def hintFor(clazz: Class[?]): Option[String] = new Some(clazz.getSimpleName)
9393

94-
override def classFor(hint: String, parent: Class[_]): Option[Class[_]] = hints.collectFirst {
94+
override def classFor(hint: String, parent: Class[?]): Option[Class[?]] = hints.collectFirst {
9595
case clazz if clazz.getSimpleName == hint => clazz
9696
}
9797
}

jsoniter-scala-macros/shared/src/main/scala-2/com/github/plokhotnyuk/jsoniter_scala/macros/JsonCodecMaker.scala

Lines changed: 46 additions & 46 deletions
Large diffs are not rendered by default.

jsoniter-scala-macros/shared/src/test/scala-3/com/github/plokhotnyuk/jsoniter_scala/macros/JsonCodecMakerNewEnumSpec.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,8 @@ class JsonCodecMakerNewEnumSpec extends VerifyingSpec {
146146
List(ColorADT.Red, ColorADT.Green, ColorADT.Mix(0)), """["Red","Green",{"Mix":{"mix":0}}]""")
147147
}
148148
"serialize and deserialize Scala3 generic enum ADTs" in {
149-
verifySerDeser(make[Array[GEnum[_]]],
150-
Array[GEnum[_]](GEnum.Exists("WWW"), GEnum.ReadBytes("QQQ"), GEnum.CopyOver(ArraySeq.unsafeWrapArray("AAA".getBytes(UTF_8)), "OOO")),
149+
verifySerDeser(make[Array[GEnum[?]]],
150+
Array(GEnum.Exists("WWW"), GEnum.ReadBytes("QQQ"), GEnum.CopyOver(ArraySeq.unsafeWrapArray("AAA".getBytes(UTF_8)), "OOO")),
151151
"""[{"type":"Exists","path":"WWW"},{"type":"ReadBytes","path":"QQQ"},{"type":"CopyOver","src":[65,65,65],"path":"OOO"}]""")
152152
}
153153
"serialize and deserialize enum ADTs with self-recursive (aka F-bounded) types" in {

jsoniter-scala-macros/shared/src/test/scala/com/github/plokhotnyuk/jsoniter_scala/macros/JsonCodecMakerSpec.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3085,11 +3085,11 @@ class JsonCodecMakerSpec extends VerifyingSpec {
30853085

30863086
case object Qux extends GADT[String]
30873087

3088-
verifySerDeser(makeWithoutDiscriminator[Array[GADT[_]]],
3088+
verifySerDeser(makeWithoutDiscriminator[Array[GADT[?]]],
30893089
_root_.scala.Array[GADT[_]](Foo, Bar, Baz, Qux), """["Foo","Bar","Baz","Qux"]""")
3090-
verifySerDeser(make[Array[GADT[_]]](CodecMakerConfig.withDiscriminatorFieldName(_root_.scala.None)),
3090+
verifySerDeser(make[Array[GADT[?]]](CodecMakerConfig.withDiscriminatorFieldName(_root_.scala.None)),
30913091
_root_.scala.Array[GADT[_]](Foo, Bar, Baz, Qux), """["Foo","Bar","Baz","Qux"]""")
3092-
verifySerDeser(make[Array[GADT2[_]]],
3092+
verifySerDeser(make[Array[GADT2[?]]],
30933093
_root_.scala.Array[GADT2[_]](GADT2.Exists("WWW"), GADT2.ReadBytes("QQQ"), GADT2.CopyOver("AAA".getBytes.toSeq, "OOO")),
30943094
"""[{"type":"Exists","path":"WWW"},{"type":"ReadBytes","path":"QQQ"},{"type":"CopyOver","src":[65,65,65],"path":"OOO"}]""")
30953095
}

0 commit comments

Comments
 (0)