Merge pull request #20 from coder/qodana-and-plugin-verifier-inspections

Address Qodana and plugin verifier inspections

- remove usage of Gateway internal API
- delete unused V1 models
- used proper naming convention in serialized enum values
- remove unused methods
- remove unused property declarations
- remove redundant calls on non-nullable types
- suppress warnings about string capitalization & unstable API usage

Author: fioan89

lib/webrtc-java-0.6.0-windows-x86_64.jar

@@ -1,3 +1,5 @@
+@file:Suppress("DialogTitleCapitalization")
+
 package com.coder.gateway
 
 import com.coder.gateway.models.RecentWorkspaceConnection
@@ -63,7 +65,7 @@ class CoderGatewayConnectionProvider : GatewayConnectionProvider {
                 buildNumber = ideBuildNumber
             )
 
-            clientLifetime.launchUnderBackgroundProgress("Coder Gateway Deploy", true, true, null) {
+            clientLifetime.launchUnderBackgroundProgress("Coder Gateway Deploy", canBeCancelled = true, isIndeterminate = true, project = null) {
                 val context = SshMultistagePanelContext().apply {
                     deploy = true
                     sshConfig = sshConfiguration
@@ -74,6 +76,7 @@ class CoderGatewayConnectionProvider : GatewayConnectionProvider {
                     ide = ideConfig
                 }
                 launch {
+                    @Suppress("UnstableApiUsage")
                     SshDeployFlowUtil.fullDeployCycle(
                         clientLifetime,
                         context,

lib/webrtc-java-0.6.0.jar

@@ -25,15 +25,15 @@ class CoderGatewayMainView : GatewayConnector {
         return CoderGatewayBundle.message("gateway.connector.action.text")
     }
 
-    override fun getDescription(): String? {
+    override fun getDescription(): String {
         return CoderGatewayBundle.message("gateway.connector.description")
     }
 
-    override fun getDocumentationLink(): ActionLink? {
+    override fun getDocumentationLink(): ActionLink {
         return BrowserLink(null, "Learn more about Coder Workspaces", null, "https://coder.com/docs/coder/latest/workspaces")
     }
 
-    override fun getRecentConnections(setContentCallback: (Component) -> Unit): GatewayRecentConnections? {
+    override fun getRecentConnections(setContentCallback: (Component) -> Unit): GatewayRecentConnections {
         return CoderGatewayRecentWorkspaceConnectionsView()
     }
 

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

@@ -11,7 +11,7 @@ import java.nio.file.StandardCopyOption
 class CoderCLIDownloader(private val buildVersion: String) {
 
     fun downloadCLI(url: URL, outputName: String, ext: String): Path {
-        val filename = if (ext.isNullOrBlank()) "${outputName}-$buildVersion" else "${outputName}-${buildVersion}.${ext}"
+        val filename = if (ext.isBlank()) "${outputName}-$buildVersion" else "${outputName}-${buildVersion}.${ext}"
         val cliPath = Paths.get(System.getProperty("java.io.tmpdir"), filename)
         if (Files.exists(cliPath)) {
             logger.info("${cliPath.toAbsolutePath()} already exists, skipping download")

src/main/kotlin/com/coder/gateway/CoderGatewayMainView.kt

@@ -4,7 +4,7 @@ import com.intellij.openapi.diagnostic.Logger
 import java.net.URL
 import java.nio.file.Path
 
-class CoderCLIManager(private val url: URL, private val buildVersion: String) {
+class CoderCLIManager(private val url: URL, buildVersion: String) {
     private val coderCLIDownloader = CoderCLIDownloader(buildVersion)
 
     fun download(): Path? {
@@ -21,19 +21,19 @@ class CoderCLIManager(private val url: URL, private val buildVersion: String) {
         }
         return when (os) {
             OS.WINDOWS -> when (arch) {
-                Arch.amd64 -> "coder-windows-amd64"
-                Arch.arm64 -> "coder-windows-arm64"
+                Arch.AMD64 -> "coder-windows-amd64"
+                Arch.ARM64 -> "coder-windows-arm64"
                 else -> "coder-windows-amd64"
             }
             OS.LINUX -> when (arch) {
-                Arch.amd64 -> "coder-linux-amd64"
-                Arch.arm64 -> "coder-linux-arm64"
-                Arch.armv7 -> "coder-linux-armv7"
+                Arch.AMD64 -> "coder-linux-amd64"
+                Arch.ARM64 -> "coder-linux-arm64"
+                Arch.ARMV7 -> "coder-linux-armv7"
                 else -> "coder-linux-amd64"
             }
             OS.MAC -> when (arch) {
-                Arch.amd64 -> "coder-darwin-amd64"
-                Arch.arm64 -> "coder-darwin-arm64"
+                Arch.AMD64 -> "coder-darwin-amd64"
+                Arch.ARM64 -> "coder-darwin-arm64"
                 else -> "coder-darwin-amd64"
             }
         }

src/main/kotlin/com/coder/gateway/sdk/CoderCLIDownloader.kt

@@ -3,7 +3,6 @@ package com.coder.gateway.sdk
 import com.coder.gateway.sdk.convertors.InstantConverter
 import com.coder.gateway.sdk.ex.AuthenticationException
 import com.coder.gateway.sdk.v2.CoderV2RestFacade
-import com.coder.gateway.sdk.v2.models.AgentGitSSHKeys
 import com.coder.gateway.sdk.v2.models.BuildInfo
 import com.coder.gateway.sdk.v2.models.User
 import com.coder.gateway.sdk.v2.models.Workspace
@@ -24,16 +23,16 @@ import java.time.Instant
 @Service(Service.Level.APP)
 class CoderRestClientService {
     private lateinit var retroRestClient: CoderV2RestFacade
+    private lateinit var sessionToken: String
     lateinit var coderURL: URL
-    lateinit var sessionToken: String
     lateinit var me: User
     lateinit var buildVersion: String
 
     /**
      * This must be called before anything else. It will authenticate with coder and retrieve a session token
      * @throws [AuthenticationException] if authentication failed
      */
-    fun initClientSession(url: URL, token: String): User? {
+    fun initClientSession(url: URL, token: String): User {
         val cookieUrl = url.toHttpUrlOrNull()!!
         val cookieJar = JavaNetCookieJar(CookieManager()).apply {
             saveFromResponse(
@@ -82,16 +81,7 @@ class CoderRestClientService {
         return workspacesResponse.body()!!
     }
 
-    fun userSSHKeys(): AgentGitSSHKeys {
-        val sshKeysResponse = retroRestClient.sshKeys().execute()
-        if (!sshKeysResponse.isSuccessful) {
-            throw IllegalStateException("Could not retrieve Coder Workspaces:${sshKeysResponse.code()}, reason: ${sshKeysResponse.message()}")
-        }
-
-        return sshKeysResponse.body()!!
-    }
-
-    fun buildInfo(): BuildInfo {
+    private fun buildInfo(): BuildInfo {
         val buildInfoResponse = retroRestClient.buildInfo().execute()
         if (!buildInfoResponse.isSuccessful) {
             throw java.lang.IllegalStateException("Could not retrieve build information for Coder instance $coderURL, reason:${buildInfoResponse.message()}")

src/main/kotlin/com/coder/gateway/sdk/CoderCLIManager.kt

@@ -32,7 +32,7 @@ class InstantConverter : JsonSerializer<Instant?>, JsonDeserializer<Instant?> {
      * @param typeOfSrc the actual type (fully genericized version) of the source object.
      * @return a JsonElement corresponding to the specified object.
      */
-    override fun serialize(src: Instant?, typeOfSrc: Type?, context: JsonSerializationContext?): JsonElement? {
+    override fun serialize(src: Instant?, typeOfSrc: Type?, context: JsonSerializationContext?): JsonElement {
         return JsonPrimitive(FORMATTER.format(src))
     }
 

src/main/kotlin/com/coder/gateway/sdk/CoderRestClientService.kt

@@ -2,4 +2,4 @@ package com.coder.gateway.sdk.ex
 
 import java.io.IOException
 
-class AuthenticationException(val reason: String) : IOException(reason)
+class AuthenticationException(reason: String) : IOException(reason)

src/main/kotlin/com/coder/gateway/sdk/convertors/InstantConverter.kt

@@ -19,9 +19,9 @@ fun getOS(): OS? {
 fun getArch(): Arch? {
     val arch = System.getProperty("os.arch").toLowerCase()
     return when {
-        arch.contains("amd64", true) || arch.contains("x86_64", true) -> Arch.amd64
-        arch.contains("arm64", true) || arch.contains("aarch64", true) -> Arch.arm64
-        arch.contains("armv7", true) -> Arch.armv7
+        arch.contains("amd64", true) || arch.contains("x86_64", true) -> Arch.AMD64
+        arch.contains("arm64", true) || arch.contains("aarch64", true) -> Arch.ARM64
+        arch.contains("armv7", true) -> Arch.ARMV7
         else -> null
     }
 }
@@ -31,5 +31,5 @@ enum class OS {
 }
 
 enum class Arch {
-    amd64, arm64, armv7
+    AMD64, ARM64, ARMV7
 }