Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit22a3384

Browse files
committed
Use service naming for REST client and settings state
The REST client is not really a service in the same way, but it feels tome like it matches well enough. Naming it like this resolves someweirdness when using the client in other contexts (where you would usethe base client directly).
1 parent0767980 commit22a3384

17 files changed

+444
-428
lines changed

‎src/main/kotlin/com/coder/gateway/CoderGatewayConnectionProvider.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ import com.coder.gateway.cli.CoderCLIManager
66
importcom.coder.gateway.cli.ensureCLI
77
importcom.coder.gateway.models.TokenSource
88
importcom.coder.gateway.models.WorkspaceAndAgentStatus
9-
importcom.coder.gateway.sdk.BaseCoderRestClient
109
importcom.coder.gateway.sdk.CoderRestClient
1110
importcom.coder.gateway.sdk.ex.AuthenticationResponseException
1211
importcom.coder.gateway.sdk.v2.models.Workspace
1312
importcom.coder.gateway.sdk.v2.models.WorkspaceAgent
1413
importcom.coder.gateway.sdk.v2.models.WorkspaceStatus
14+
importcom.coder.gateway.services.CoderRestClientService
1515
importcom.coder.gateway.services.CoderSettingsService
1616
importcom.coder.gateway.util.toURL
1717
importcom.coder.gateway.util.withPath
@@ -183,7 +183,7 @@ class CoderGatewayConnectionProvider : GatewayConnectionProvider {
183183
* Return an authenticated Coder CLI and the user's name, asking for the
184184
* token as long as it continues to result in an authentication failure.
185185
*/
186-
privatefunauthenticate(deploymentURL:URL,queryToken:String?,lastToken:Pair<String,TokenSource>? = null):Pair<BaseCoderRestClient,String> {
186+
privatefunauthenticate(deploymentURL:URL,queryToken:String?,lastToken:Pair<String,TokenSource>? = null):Pair<CoderRestClient,String> {
187187
// Use the token from the query, unless we already tried that.
188188
val isRetry= lastToken!=null
189189
val token=if (!queryToken.isNullOrBlank()&&!isRetry)
@@ -198,7 +198,7 @@ class CoderGatewayConnectionProvider : GatewayConnectionProvider {
198198
if (token==null) {// User aborted.
199199
throwIllegalArgumentException("Unable to connect to$deploymentURL,$TOKEN is missing")
200200
}
201-
val client=CoderRestClient(deploymentURL, token.first)
201+
val client=CoderRestClientService(deploymentURL, token.first)
202202
returntry {
203203
Pair(client, client.me().username)
204204
}catch (ex:AuthenticationResponseException) {

‎src/main/kotlin/com/coder/gateway/CoderSettingsConfigurable.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
packagecom.coder.gateway
22

33
importcom.coder.gateway.services.CoderSettingsService
4-
importcom.coder.gateway.services.CoderSettingsState
4+
importcom.coder.gateway.services.CoderSettingsStateService
55
importcom.coder.gateway.util.canCreateDirectory
66
importcom.intellij.openapi.components.service
77
importcom.intellij.openapi.options.BoundConfigurable
@@ -19,7 +19,7 @@ import java.nio.file.Path
1919

2020
classCoderSettingsConfigurable :BoundConfigurable("Coder") {
2121
overridefuncreatePanel():DialogPanel {
22-
val state:CoderSettingsState= service()
22+
val state:CoderSettingsStateService= service()
2323
val settings:CoderSettingsService= service<CoderSettingsService>()
2424
return panel {
2525
row(CoderGatewayBundle.message("gateway.connector.settings.data-directory.title")) {

‎src/main/kotlin/com/coder/gateway/cli/CoderCLIManager.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package com.coder.gateway.cli
33
importcom.coder.gateway.cli.ex.MissingVersionException
44
importcom.coder.gateway.cli.ex.ResponseException
55
importcom.coder.gateway.cli.ex.SSHConfigFormatException
6-
importcom.coder.gateway.services.CoderSettingsState
76
importcom.coder.gateway.settings.CoderSettings
7+
importcom.coder.gateway.settings.CoderSettingsState
88
importcom.coder.gateway.util.CoderHostnameVerifier
99
importcom.coder.gateway.util.InvalidVersionException
1010
importcom.coder.gateway.util.OS

‎src/main/kotlin/com/coder/gateway/sdk/BaseCoderRestClient.kt‎

Lines changed: 0 additions & 265 deletions
This file was deleted.

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp