Refactor without query into separate method

daplf · daplf · commit 47a38fb8f495 · 2021-07-03T01:15:48.000+01:00
diff --git a/server/src/main/kotlin/org/javacs/kt/externalsources/JarClassContentProvider.kt b/server/src/main/kotlin/org/javacs/kt/externalsources/JarClassContentProvider.kt
@@ -56,7 +56,7 @@ class JarClassContentProvider(
     }
 
     private fun tryReadContentOf(uri: KlsURI): Pair<String, String>? = try {
-        val actualUri = KlsURI(uri.fileUri, mapOf())
+        val actualUri = uri.withoutQuery()
         when (actualUri.fileExtension) {
             "class" -> Pair(actualUri.extractToTemporaryFile(tempDir)
                 .let(decompiler::decompileClass)
diff --git a/server/src/main/kotlin/org/javacs/kt/externalsources/KlsURI.kt b/server/src/main/kotlin/org/javacs/kt/externalsources/KlsURI.kt
@@ -83,6 +83,8 @@ data class KlsURI(val fileUri: URI, val query: Map<QueryParam, Any>) {
         return KlsURI(fileUri, newQuery)
     }
 
+    fun withoutQuery(): KlsURI = KlsURI(fileUri, mapOf())
+
     fun toURI(): URI = URI(fileUri.toString() + queryString)
 
     private fun toJarURL(): URL = URL("jar:${fileUri.schemeSpecificPart}")

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ class JarClassContentProvider(`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`private fun tryReadContentOf(uri: KlsURI): Pair<String, String>? = try {`
`59`		`- val actualUri = KlsURI(uri.fileUri, mapOf())`
	`59`	`+ val actualUri = uri.withoutQuery()`
`60`	`60`	`when (actualUri.fileExtension) {`
`61`	`61`	`"class" -> Pair(actualUri.extractToTemporaryFile(tempDir)`
`62`	`62`	`.let(decompiler::decompileClass)`
Original file line number	Diff line number	Diff line change
`@@ -83,6 +83,8 @@ data class KlsURI(val fileUri: URI, val query: Map<QueryParam, Any>) {`
`83`	`83`	`return KlsURI(fileUri, newQuery)`
`84`	`84`	`}`
`85`	`85`
	`86`	`+ fun withoutQuery(): KlsURI = KlsURI(fileUri, mapOf())`
	`87`	`+`
`86`	`88`	`fun toURI(): URI = URI(fileUri.toString() + queryString)`
`87`	`89`
`88`	`90`	`private fun toJarURL(): URL = URL("jar:${fileUri.schemeSpecificPart}")`