Commit0767980

committed

Allow using existing http client

1 parentdad161f commit0767980Copy full SHA for 0767980

File tree

-3

lines changed

-3

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,7 @@ open class BaseCoderRestClient(`
`50`	`50`	`privatevalsettings:CoderSettings =CoderSettings(CoderSettingsState()),`
`51`	`51`	`privatevalproxyValues:ProxyValues? =null,`
`52`	`52`	`privatevalpluginVersion:String ="development",`
	`53`	`+existingHttpClient:OkHttpClient? =null,`
`53`	`54`	`) {`
`54`	`55`	`privateval httpClient:OkHttpClient`
`55`	`56`	`privateval retroRestClient:CoderV2RestFacade`
`@@ -67,7 +68,7 @@ open class BaseCoderRestClient(`
`67`	`68`
`68`	`69`	`val socketFactory= coderSocketFactory(settings.tls)`
`69`	`70`	`val trustManagers= coderTrustManagers(settings.tls.caPath)`
`70`		`-var builder=OkHttpClient.Builder()`
	`71`	`+var builder=existingHttpClient?.newBuilder()?:OkHttpClient.Builder()`
`71`	`72`
`72`	`73`	`if (proxyValues!=null) {`
`73`	`74`	`builder= builder`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,16 +5,18 @@ import com.intellij.ide.plugins.PluginManagerCore`
`5`	`5`	`importcom.intellij.openapi.components.service`
`6`	`6`	`importcom.intellij.openapi.extensions.PluginId`
`7`	`7`	`importcom.intellij.util.net.HttpConfigurable`
	`8`	`+importokhttp3.OkHttpClient`
`8`	`9`	`importjava.net.URL`
`9`	`10`
`10`	`11`	`/**`
`11`	`12`	`* A client instance that hooks into global JetBrains services for default`
`12`	`13`	`* settings. Exists only so we can use the base client in tests.`
`13`	`14`	`*/`
`14`		`-classCoderRestClient(url:URL,token:String) : BaseCoderRestClient(url, token,`
	`15`	`+classCoderRestClient(url:URL,token:String,httpClient:OkHttpClient? =null) : BaseCoderRestClient(url, token,`
`15`	`16`	`service<CoderSettingsService>(),`
`16`	`17`	`ProxyValues(HttpConfigurable.getInstance().proxyLogin,`
`17`	`18`	`HttpConfigurable.getInstance().plainProxyPassword,`
`18`	`19`	`HttpConfigurable.getInstance().PROXY_AUTHENTICATION,`
`19`	`20`	`HttpConfigurable.getInstance().onlyBySettingsSelector),`
`20`		`-PluginManagerCore.getPlugin(PluginId.getId("com.coder.gateway"))!!.version)`
	`21`	`+PluginManagerCore.getPlugin(PluginId.getId("com.coder.gateway"))!!.version,`
	`22`	`+ httpClient)`

Comments

(0)