From 64676d11d9fd3afc131a6d204c111c08db601f86 Mon Sep 17 00:00:00 2001 From: Mingun Date: Tue, 24 Nov 2020 21:49:03 +0500 Subject: [PATCH] Fix unchecked casts --- .../kaitai/struct/format/JavaScriptKSYParser.scala | 2 +- .../io/kaitai/struct/formats/JavaKSYParser.scala | 4 ++-- shared/src/main/scala/io/kaitai/struct/JSON.scala | 6 +++--- .../io/kaitai/struct/datatype/Endianness.scala | 2 +- .../scala/io/kaitai/struct/format/AttrSpec.scala | 2 +- .../io/kaitai/struct/format/EnumValueSpec.scala | 2 +- .../scala/io/kaitai/struct/format/ParseUtils.scala | 14 +++++++------- .../io/kaitai/struct/format/ValidationSpec.scala | 2 +- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/js/src/main/scala/io/kaitai/struct/format/JavaScriptKSYParser.scala b/js/src/main/scala/io/kaitai/struct/format/JavaScriptKSYParser.scala index 0f7ee55a1..e522a4c93 100644 --- a/js/src/main/scala/io/kaitai/struct/format/JavaScriptKSYParser.scala +++ b/js/src/main/scala/io/kaitai/struct/format/JavaScriptKSYParser.scala @@ -29,7 +29,7 @@ object JavaScriptKSYParser { def yamlJavascriptToScala(src: Any): Any = { src match { - case array: js.Array[AnyRef] => + case array: js.Array[_] => array.toList.map(yamlJavascriptToScala) case _: String | _: Int | _: Double | _: Boolean => src diff --git a/jvm/src/main/scala/io/kaitai/struct/formats/JavaKSYParser.scala b/jvm/src/main/scala/io/kaitai/struct/formats/JavaKSYParser.scala index ed1d0aecf..a4217892e 100644 --- a/jvm/src/main/scala/io/kaitai/struct/formats/JavaKSYParser.scala +++ b/jvm/src/main/scala/io/kaitai/struct/formats/JavaKSYParser.scala @@ -82,9 +82,9 @@ object JavaKSYParser { def yamlJavaToScala(src: Any): Any = { src match { - case jlist: JList[AnyRef] => + case jlist: JList[_] => jlist.asScala.toList.map(yamlJavaToScala) - case jmap: JMap[String, AnyRef] => + case jmap: JMap[_, _] => jmap.asScala.toMap.mapValues(yamlJavaToScala) case _: String => src diff --git a/shared/src/main/scala/io/kaitai/struct/JSON.scala b/shared/src/main/scala/io/kaitai/struct/JSON.scala index cd2968ba2..659b97b57 100644 --- a/shared/src/main/scala/io/kaitai/struct/JSON.scala +++ b/shared/src/main/scala/io/kaitai/struct/JSON.scala @@ -23,7 +23,7 @@ object JSON extends CommonLiterals { case v: Int => v.toString case v: String => stringToJson(v) case v: Seq[_] => seqToJson(v) - case v: Map[String, _] => mapToJson(v) + case v: Map[_, _] => mapToJson(v) } } @@ -36,9 +36,9 @@ object JSON extends CommonLiterals { def seqToJson(obj: Seq[_]): String = "[" + obj.map((x) => stringify(x)).mkString(",") + "]" - def mapToJson(obj: Map[String, _]): String = { + def mapToJson(obj: Map[_, _]): String = { val kvs = obj.map { case (k, v) => - stringToJson(k) + ": " + stringify(v) + stringToJson(k.toString) + ": " + stringify(v) } "{" + kvs.mkString(",") + "}" } diff --git a/shared/src/main/scala/io/kaitai/struct/datatype/Endianness.scala b/shared/src/main/scala/io/kaitai/struct/datatype/Endianness.scala index 592c13e07..3b363e158 100644 --- a/shared/src/main/scala/io/kaitai/struct/datatype/Endianness.scala +++ b/shared/src/main/scala/io/kaitai/struct/datatype/Endianness.scala @@ -27,7 +27,7 @@ object Endianness { case None => None case Some("be") => Some(BigEndian) case Some("le") => Some(LittleEndian) - case Some(srcMap: Map[Any, Any]) => + case Some(srcMap: Map[_, _]) => val endianMap = ParseUtils.asMapStr(srcMap, path) Some(fromMap(endianMap, path)) case _ => diff --git a/shared/src/main/scala/io/kaitai/struct/format/AttrSpec.scala b/shared/src/main/scala/io/kaitai/struct/format/AttrSpec.scala index 1cf2b1c60..e20425c05 100644 --- a/shared/src/main/scala/io/kaitai/struct/format/AttrSpec.scala +++ b/shared/src/main/scala/io/kaitai/struct/format/AttrSpec.scala @@ -218,7 +218,7 @@ object AttrSpec { DataType.fromYaml( Some(simpleType), path, metaDef, yamlAttrArgs ) - case switchMap: Map[Any, Any] => + case switchMap: Map[_, _] => val switchMapStr = ParseUtils.anyMapToStrMap(switchMap, path) parseSwitch(switchMapStr, path, metaDef, yamlAttrArgs) case unknown => diff --git a/shared/src/main/scala/io/kaitai/struct/format/EnumValueSpec.scala b/shared/src/main/scala/io/kaitai/struct/format/EnumValueSpec.scala index 6e17ac053..bb7dcfe3d 100644 --- a/shared/src/main/scala/io/kaitai/struct/format/EnumValueSpec.scala +++ b/shared/src/main/scala/io/kaitai/struct/format/EnumValueSpec.scala @@ -11,7 +11,7 @@ object EnumValueSpec { fromSimpleName(name, path) case x: Boolean => fromSimpleName(x.toString, path) - case srcMap: Map[Any, Any] => + case srcMap: Map[_, _] => fromMap(ParseUtils.anyMapToStrMap(srcMap, path), path) case _ => throw KSYParseError.badType("string or map", src, path) diff --git a/shared/src/main/scala/io/kaitai/struct/format/ParseUtils.scala b/shared/src/main/scala/io/kaitai/struct/format/ParseUtils.scala index 998dfec42..7e7e1c3df 100644 --- a/shared/src/main/scala/io/kaitai/struct/format/ParseUtils.scala +++ b/shared/src/main/scala/io/kaitai/struct/format/ParseUtils.scala @@ -127,12 +127,12 @@ object ParseUtils { ): List[T] = { val pathField = path ++ List(field) src.get(field) match { - case Some(srcList: List[Any]) => + case Some(srcList: List[_]) => srcList.zipWithIndex.map { case (element, idx) => convertFunc(element, pathField ++ List(idx.toString)) } - case Some(singleObject: T) => - List(singleObject) + case Some(singleObject) => + List(convertFunc(singleObject, pathField)) case None => List() case unknown => @@ -197,9 +197,9 @@ object ParseUtils { } } - def asMap(src: Any, path: List[String]): Map[Any, Any] = { + def asMap(src: Any, path: List[String]): Map[_, _] = { src match { - case srcMap: Map[Any, Any] => + case srcMap: Map[_, _] => srcMap case unknown => throw KSYParseError.badType("map", unknown, path) @@ -212,14 +212,14 @@ object ParseUtils { def asMapStrStr(src: Any, path: List[String]): Map[String, String] = anyMapToStrStrMap(asMap(src, path), path) - def anyMapToStrMap(anyMap: Map[Any, Any], path: List[String]): Map[String, Any] = { + def anyMapToStrMap[V](anyMap: Map[_, V], path: List[String]): Map[String, V] = { anyMap.map { case (key, value) => val keyStr = asStr(key, path) keyStr -> value } } - def anyMapToStrStrMap(anyMap: Map[Any, Any], path: List[String]): Map[String, String] = { + def anyMapToStrStrMap(anyMap: Map[_, _], path: List[String]): Map[String, String] = { anyMap.map { case (key, value) => val keyStr = asStr(key, path) val valueStr = asStr(value, path ++ List(keyStr)) diff --git a/shared/src/main/scala/io/kaitai/struct/format/ValidationSpec.scala b/shared/src/main/scala/io/kaitai/struct/format/ValidationSpec.scala index 5142517c4..1fc84ef87 100644 --- a/shared/src/main/scala/io/kaitai/struct/format/ValidationSpec.scala +++ b/shared/src/main/scala/io/kaitai/struct/format/ValidationSpec.scala @@ -86,7 +86,7 @@ object ValidationSpec { fromString(x.toString, path) case x: Long => fromString(x.toString, path) - case srcMap: Map[Any, Any] => + case srcMap: Map[_, _] => fromMap(ParseUtils.anyMapToStrMap(srcMap, path), path) case _ => throw KSYParseError.badType("string or map", src, path)