Move V1 models to sdk.v1 package

fioan89 · fioan89 · commit 02d98cd2eb5f · 2022-06-02T00:29:34.000+03:00
- coder.gateway.models should contain only plugin data models
- coder data models need to go into the sdk package
diff --git a/src/main/kotlin/com/coder/gateway/models/CoderWorkspacesWizardModel.kt b/src/main/kotlin/com/coder/gateway/models/CoderWorkspacesWizardModel.kt
@@ -1,5 +1,5 @@
 package com.coder.gateway.models
 
-import com.coder.gateway.models.v1.Workspace
+import com.coder.gateway.sdk.v1.Workspace
 
 data class CoderWorkspacesWizardModel(var loginModel: LoginModel, var workspaces: List<Workspace>)
diff --git a/src/main/kotlin/com/coder/gateway/sdk/CoderRestClientService.kt b/src/main/kotlin/com/coder/gateway/sdk/CoderRestClientService.kt
@@ -1,12 +1,12 @@
 package com.coder.gateway.sdk
 
 import com.coder.gateway.models.UriScheme
-import com.coder.gateway.models.v1.LoginRequest
-import com.coder.gateway.models.v1.SSHKeys
-import com.coder.gateway.models.v1.User
-import com.coder.gateway.models.v1.Workspace
 import com.coder.gateway.sdk.ex.AuthenticationException
 import com.coder.gateway.sdk.v1.CoderV1RestFacade
+import com.coder.gateway.sdk.v1.LoginRequest
+import com.coder.gateway.sdk.v1.SSHKeys
+import com.coder.gateway.sdk.v1.User
+import com.coder.gateway.sdk.v1.Workspace
 import com.google.gson.Gson
 import com.google.gson.GsonBuilder
 import com.intellij.openapi.components.Service
diff --git a/src/main/kotlin/com/coder/gateway/sdk/v1/BrokerMessage.kt b/src/main/kotlin/com/coder/gateway/sdk/v1/BrokerMessage.kt
@@ -1,4 +1,4 @@
-package com.coder.gateway.models.v1
+package com.coder.gateway.sdk.v1
 
 import com.google.gson.annotations.SerializedName
 import dev.onvoid.webrtc.RTCIceServer
diff --git a/src/main/kotlin/com/coder/gateway/sdk/v1/CoderV1RestFacade.kt b/src/main/kotlin/com/coder/gateway/sdk/v1/CoderV1RestFacade.kt
@@ -1,10 +1,5 @@
 package com.coder.gateway.sdk.v1
 
-import com.coder.gateway.models.v1.LoginRequest
-import com.coder.gateway.models.v1.LoginResponse
-import com.coder.gateway.models.v1.SSHKeys
-import com.coder.gateway.models.v1.User
-import com.coder.gateway.models.v1.Workspace
 import retrofit2.Call
 import retrofit2.http.Body
 import retrofit2.http.GET
diff --git a/src/main/kotlin/com/coder/gateway/sdk/v1/DialPolicy.kt b/src/main/kotlin/com/coder/gateway/sdk/v1/DialPolicy.kt
@@ -1,4 +1,4 @@
-package com.coder.gateway.models.v1
+package com.coder.gateway.sdk.v1
 
 import com.google.gson.annotations.SerializedName
 
diff --git a/src/main/kotlin/com/coder/gateway/sdk/v1/LoginRequest.kt b/src/main/kotlin/com/coder/gateway/sdk/v1/LoginRequest.kt
@@ -1,4 +1,4 @@
-package com.coder.gateway.models.v1
+package com.coder.gateway.sdk.v1
 
 import com.google.gson.annotations.SerializedName
 
diff --git a/src/main/kotlin/com/coder/gateway/sdk/v1/LoginResponse.kt b/src/main/kotlin/com/coder/gateway/sdk/v1/LoginResponse.kt
@@ -1,4 +1,4 @@
-package com.coder.gateway.models.v1
+package com.coder.gateway.sdk.v1
 
 import com.google.gson.annotations.SerializedName
 
diff --git a/src/main/kotlin/com/coder/gateway/sdk/v1/RebuildMessage.kt b/src/main/kotlin/com/coder/gateway/sdk/v1/RebuildMessage.kt
@@ -1,4 +1,4 @@
-package com.coder.gateway.models.v1
+package com.coder.gateway.sdk.v1
 
 import com.google.gson.annotations.SerializedName
 import java.time.Duration
diff --git a/src/main/kotlin/com/coder/gateway/sdk/v1/SSHKeys.kt b/src/main/kotlin/com/coder/gateway/sdk/v1/SSHKeys.kt
@@ -1,4 +1,4 @@
-package com.coder.gateway.models.v1
+package com.coder.gateway.sdk.v1
 
 import com.google.gson.annotations.SerializedName
 
diff --git a/src/main/kotlin/com/coder/gateway/sdk/v1/Tunneler.kt b/src/main/kotlin/com/coder/gateway/sdk/v1/Tunneler.kt
@@ -1,7 +1,7 @@
 package com.coder.gateway.sdk
 
-import com.coder.gateway.models.v1.BrokerMessage
-import com.coder.gateway.models.v1.Workspace
+import com.coder.gateway.sdk.v1.BrokerMessage
+import com.coder.gateway.sdk.v1.Workspace
 import com.google.gson.Gson
 import com.google.gson.GsonBuilder
 import com.google.gson.annotations.SerializedName
diff --git a/src/main/kotlin/com/coder/gateway/sdk/v1/User.kt b/src/main/kotlin/com/coder/gateway/sdk/v1/User.kt
@@ -1,4 +1,4 @@
-package com.coder.gateway.models.v1
+package com.coder.gateway.sdk.v1
 
 import com.google.gson.annotations.SerializedName
 import java.time.Instant
diff --git a/src/main/kotlin/com/coder/gateway/sdk/v1/Workspace.kt b/src/main/kotlin/com/coder/gateway/sdk/v1/Workspace.kt
@@ -1,4 +1,4 @@
-package com.coder.gateway.models.v1
+package com.coder.gateway.sdk.v1
 
 import com.google.gson.annotations.SerializedName
 import java.time.Instant
diff --git a/src/main/kotlin/com/coder/gateway/sdk/v1/WorkspaceStat.kt b/src/main/kotlin/com/coder/gateway/sdk/v1/WorkspaceStat.kt
@@ -1,4 +1,4 @@
-package com.coder.gateway.models.v1
+package com.coder.gateway.sdk.v1
 
 import com.google.gson.annotations.SerializedName
 import java.time.Instant
diff --git a/src/main/kotlin/com/coder/gateway/views/steps/CoderWorkspacesStepView.kt b/src/main/kotlin/com/coder/gateway/views/steps/CoderWorkspacesStepView.kt
@@ -2,8 +2,8 @@ package com.coder.gateway.views.steps
 
 import com.coder.gateway.CoderGatewayBundle
 import com.coder.gateway.models.CoderWorkspacesWizardModel
-import com.coder.gateway.models.v1.Workspace
 import com.coder.gateway.sdk.CoderRestClientService
+import com.coder.gateway.sdk.v1.Workspace
 import com.intellij.ide.IdeBundle
 import com.intellij.openapi.Disposable
 import com.intellij.openapi.application.ApplicationManager
diff --git a/src/main/kotlin/com/coder/gateway/views/steps/WorkspaceCellRenderer.kt b/src/main/kotlin/com/coder/gateway/views/steps/WorkspaceCellRenderer.kt
@@ -1,6 +1,6 @@
 package com.coder.gateway.views.steps
 
-import com.coder.gateway.models.v1.Workspace
+import com.coder.gateway.sdk.v1.Workspace
 import com.intellij.ui.IconManager
 import com.intellij.ui.dsl.builder.panel
 import com.intellij.ui.dsl.gridLayout.HorizontalAlign

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.coder.gateway.models.v1`
	`1`	`+package com.coder.gateway.sdk.v1`
`2`	`2`
`3`	`3`	`import com.google.gson.annotations.SerializedName`
`4`	`4`	`import dev.onvoid.webrtc.RTCIceServer`