Changed KLS URI query parameter values to String

Author: daplf

server/src/main/kotlin/org/javacs/kt/externalsources/KlsURI.kt

@@ -29,18 +29,12 @@ fun URI.toKlsURI(): KlsURI? = when (scheme) {
  * Other file extensions for classes (such as .kt and .java) are supported too, in
  * which case the file will directly be used without invoking the decompiler.
  */
-data class KlsURI(val fileUri: URI, val query: Map<QueryParam, Any>) {
+data class KlsURI(val fileUri: URI, val query: Map<QueryParam, String>) {
     /** Possible KLS URI query parameters. */
     enum class QueryParam(val parameterName: String) {
         SOURCE("source");
 
         override fun toString(): String = parameterName
-
-        companion object {
-            val VALUE_PARSERS: Map<QueryParam, (String) -> Any> = mapOf(
-                Pair(QueryParam.SOURCE) { it.toBoolean() }
-            )
-        }
     }
 
     private val queryString: String
@@ -60,7 +54,7 @@ data class KlsURI(val fileUri: URI, val query: Map<QueryParam, Any>) {
         get() = fileUri.schemeSpecificPart.split("!", limit = 2).get(1)
 
     val source: Boolean
-        get() = query[QueryParam.SOURCE].toString().toBoolean()
+        get() = query[QueryParam.SOURCE].toBoolean()
     val isCompiled: Boolean
         get() = fileExtension == "class"
 
@@ -77,7 +71,7 @@ data class KlsURI(val fileUri: URI, val query: Map<QueryParam, Any>) {
     }
 
     fun withSource(source: Boolean): KlsURI {
-        val newQuery: MutableMap<QueryParam, Any> = mutableMapOf()
+        val newQuery: MutableMap<QueryParam, String> = mutableMapOf()
         newQuery.putAll(query)
         newQuery[QueryParam.SOURCE] = source.toString()
         return KlsURI(fileUri, newQuery)
@@ -124,21 +118,19 @@ data class KlsURI(val fileUri: URI, val query: Map<QueryParam, Any>) {
 
 private fun parseKlsURIFileURI(uri: URI): URI = URI(uri.toString().split("?")[0])
 
-private fun parseKlsURIQuery(uri: URI): Map<KlsURI.QueryParam, Any> = parseQuery(uri.toString().split("?").getOrElse(1) { "" })
+private fun parseKlsURIQuery(uri: URI): Map<KlsURI.QueryParam, String> = parseQuery(uri.toString().split("?").getOrElse(1) { "" })
 
-private fun parseQuery(query: String): Map<KlsURI.QueryParam, Any> =
+private fun parseQuery(query: String): Map<KlsURI.QueryParam, String> =
     query.split("&").mapNotNull {
         val parts = it.split("=")
         if (parts.size == 2) getQueryParameter(parts[0], parts[1]) else null
     }.toMap()
 
-private fun getQueryParameter(property: String, value: String): Pair<KlsURI.QueryParam, Any>? {
+private fun getQueryParameter(property: String, value: String): Pair<KlsURI.QueryParam, String>? {
     val queryParam: KlsURI.QueryParam? = KlsURI.QueryParam.values().find { it.parameterName == property }
 
     if (queryParam != null) {
-        val typeParser = KlsURI.QueryParam.VALUE_PARSERS[queryParam]
-        val queryParamValue = typeParser?.invoke(value)
-        return queryParamValue?.let { Pair(queryParam, it) }
+        return Pair(queryParam, value)
     }
 
     return null