File tree Expand file tree Collapse file tree 6 files changed +14
-11
lines changed
common-api/src/main/kotlin/com/itangcent/http
main/kotlin/com/itangcent/idea
test/kotlin/com/itangcent
idea/plugin/api/export/markdown Expand file tree Collapse file tree 6 files changed +14
-11
lines changed Original file line number Diff line number Diff line change @@ -2,7 +2,6 @@ package com.itangcent.http
22
33import com.itangcent.common.constant.Attrs
44import com.itangcent.common.utils.*
5- import java.net.URL
65
76object RequestUtils {
87
@@ -57,7 +56,7 @@ object RequestUtils {
5756 return url
5857 }
5958 return try {
60- URL ( url)
59+ url.asUrl( )
6160 url
6261 } catch (e: Exception ) {
6362 protocol.removeSuffix(" ://" ) + " ://" + url
@@ -79,11 +78,11 @@ object RequestUtils {
7978 return this
8079 }
8180
82- fun host (host : String? ): UrlBuild {
81+ fun host (host : String ): UrlBuild {
8382 try {
84- val parsedURL = URL ( host)
83+ val parsedURL = host.asUrl( )
8584 this .protocol = parsedURL.protocol
86- this .host = host!! .removePrefix(this .protocol!! + " ://" )
85+ this .host = host.removePrefix(this .protocol!! + " ://" )
8786 } catch (e: Exception ) {
8887 this .host = host
8988 }
Original file line number Diff line number Diff line change @@ -5,6 +5,7 @@ import com.google.inject.Singleton
55import com.itangcent.common.logger.Log
66import com.itangcent.common.logger.traceError
77import com.itangcent.common.utils.TimeSpanUtils
8+ import com.itangcent.common.utils.asUrl
89import com.itangcent.idea.plugin.api.cache.ProjectCacheRepository
910import com.itangcent.idea.plugin.settings.helper.HttpSettingsHelper
1011import com.itangcent.idea.sqlite.SqliteDataResourceHelper
@@ -51,7 +52,7 @@ open class CachedResourceResolver : DefaultResourceResolver() {
5152 }
5253
5354 override fun createUrlResource (url : String ): URLResource {
54- return CachedURLResource (URL ( url))
55+ return CachedURLResource (url.asUrl( ))
5556 }
5657
5758 open inner class CachedURLResource (url : URL ) : URLResource(url) {
Original file line number Diff line number Diff line change @@ -3,6 +3,7 @@ package com.itangcent.idea.icons
33import com.intellij.util.ReflectionUtil
44import com.itangcent.common.logger.Log
55import com.itangcent.common.spi.SpiUtils
6+ import com.itangcent.common.utils.asUrl
67import com.itangcent.common.utils.invokeMethod
78import com.itangcent.common.utils.safe
89import com.itangcent.idea.sqlite.encodeBase64
@@ -155,7 +156,7 @@ object EasyIcons : Log() {
155156 }
156157
157158 private fun tryLoadByUrl (vararg urls : String ): Icon ? {
158- return tryLoadByUrl(* urls.map { URL (it ) }.toTypedArray())
159+ return tryLoadByUrl(* urls.map { it.asUrl( ) }.toTypedArray())
159160 }
160161
161162 private fun tryLoadByUrl (vararg urls : URL ): Icon ? {
Original file line number Diff line number Diff line change @@ -4,11 +4,11 @@ import com.google.inject.ImplementedBy
44import com.google.inject.Inject
55import com.google.inject.Singleton
66import com.intellij.openapi.ui.Messages
7+ import com.itangcent.common.utils.asUrl
78import com.itangcent.idea.plugin.settings.SettingBinder
89import com.itangcent.idea.plugin.settings.update
910import com.itangcent.idea.plugin.utils.RegexUtils
1011import com.itangcent.idea.swing.MessagesHelper
11- import java.net.URL
1212import java.time.Duration
1313import java.util.concurrent.TimeUnit
1414
@@ -93,7 +93,7 @@ class HttpSettingsHelperImpl : HttpSettingsHelper {
9393 HOST_RESOLVERS .forEach { resolver ->
9494 resolver(url)?.let { return it.removeSuffix(" /" ) }
9595 }
96- return URL ( url).let { " ${it.protocol} ://${it.host} " }.removeSuffix(" /" )
96+ return url.asUrl( ).let { " ${it.protocol} ://${it.host} " }.removeSuffix(" /" )
9797 } catch (e: Exception ) {
9898 return url
9999 }
Original file line number Diff line number Diff line change @@ -4,6 +4,7 @@ import com.itangcent.common.model.Header
44import com.itangcent.common.model.Param
55import com.itangcent.common.model.Request
66import com.itangcent.common.model.URL
7+ import com.itangcent.common.utils.asUrl
78import com.itangcent.intellij.config.resource.Resource
89import com.itangcent.test.StringResource
910import com.itangcent.testFramework.PluginContextLightCodeInsightFixtureTestCase
@@ -277,7 +278,7 @@ class TemplateMarkdownFormatterTest : PluginContextLightCodeInsightFixtureTestCa
277278 fun testUnreachableTemplate () {
278279 val resource = object : Resource () {
279280 override val url: java.net.URL
280- get() = java.net. URL ( " file:template.md" )
281+ get() = " file:template.md" .asUrl( )
281282
282283 override val content: String?
283284 get() = " template content"
Original file line number Diff line number Diff line change 11package com.itangcent.test
22
3+ import com.itangcent.common.utils.asUrl
34import com.itangcent.intellij.config.resource.Resource
45import java.io.InputStream
56import java.net.URL
@@ -9,7 +10,7 @@ class StringResource(
910 private val str : String ,
1011) : Resource() {
1112 override val url: URL
12- get() = URL ( _url )
13+ get() = _url .asUrl( )
1314
1415 override val bytes: ByteArray
1516 get() = str.toByteArray(Charsets .UTF_8 )
You can’t perform that action at this time.
0 commit comments