Generate Moshi adapters

This is supposed to be faster than using reflection.

Author: code-asher

build.gradle.kts

@@ -16,22 +16,25 @@ plugins {
     id("org.jetbrains.changelog") version "2.2.0"
     // Gradle Qodana Plugin
     id("org.jetbrains.qodana") version "0.1.13"
+    // Generate Moshi adapters.
+    id("com.google.devtools.ksp") version "1.9.23-1.0.19"
 }
 
 group = properties("pluginGroup")
 version = properties("pluginVersion")
 
 dependencies {
-    implementation("com.squareup.retrofit2:retrofit:2.9.0")
-    // define a BOM and its version
     implementation(platform("com.squareup.okhttp3:okhttp-bom:4.12.0"))
-    implementation("com.squareup.retrofit2:converter-moshi:2.9.0")
     implementation("com.squareup.okhttp3:okhttp")
     implementation("com.squareup.okhttp3:logging-interceptor")
 
-    implementation("org.zeroturnaround:zt-exec:1.12") {
-        exclude("org.slf4j")
-    }
+    implementation("com.squareup.moshi:moshi:1.15.1")
+    ksp("com.squareup.moshi:moshi-kotlin-codegen:1.15.1")
+
+    implementation("com.squareup.retrofit2:retrofit:2.9.0")
+    implementation("com.squareup.retrofit2:converter-moshi:2.9.0")
+
+    implementation("org.zeroturnaround:zt-exec:1.12")
 
     testImplementation(kotlin("test"))
 }

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

@@ -19,6 +19,8 @@ import com.coder.gateway.util.sha1
 import com.intellij.openapi.diagnostic.Logger
 import com.intellij.openapi.progress.ProgressIndicator
 import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+import com.squareup.moshi.JsonDataException
 import com.squareup.moshi.Moshi
 import org.zeroturnaround.exec.ProcessExecutor
 import java.io.EOFException
@@ -33,6 +35,14 @@ import java.nio.file.StandardCopyOption
 import java.util.zip.GZIPInputStream
 import javax.net.ssl.HttpsURLConnection
 
+/**
+ * Version output from the CLI's version command.
+ */
+@JsonClass(generateAdapter = true)
+internal data class Version(
+    @Json(name = "version") val version: String,
+)
+
 /**
  * Do as much as possible to get a valid, up-to-date CLI.
  *
@@ -325,13 +335,6 @@ class CoderCLIManager(
         }
     }
 
-    /**
-     * Version output from the CLI's version command.
-     */
-    private data class Version(
-        @Json(name = "version") val version: String,
-    )
-
     /**
      * Return the binary version.
      *
@@ -341,10 +344,12 @@ class CoderCLIManager(
         val raw = exec("version", "--output", "json")
         try {
             val json = Moshi.Builder().build().adapter(Version::class.java).fromJson(raw)
-            if (json?.version == null) {
+            if (json?.version == null || json.version.isBlank()) {
                 throw MissingVersionException("No version found in output")
             }
             return SemVer.parse(json.version)
+        } catch (exception: JsonDataException) {
+            throw MissingVersionException("No version found in output")
         } catch (exception: EOFException) {
             throw MissingVersionException("No version found in output")
         }

src/main/kotlin/com/coder/gateway/sdk/v2/models/BuildInfo.kt

@@ -1,6 +1,7 @@
 package com.coder.gateway.sdk.v2.models
 
 import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
 
 /**
  * Contains build information for a Coder instance.
@@ -11,6 +12,7 @@ import com.squareup.moshi.Json
  *
  * @param version the semantic version of the build.
  */
+@JsonClass(generateAdapter = true)
 data class BuildInfo(
     @Json(name = "external_url") val externalUrl: String,
     @Json(name = "version") val version: String

src/main/kotlin/com/coder/gateway/sdk/v2/models/CreateWorkspaceBuildRequest.kt

@@ -1,8 +1,10 @@
 package com.coder.gateway.sdk.v2.models
 
 import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
 import java.util.UUID
 
+@JsonClass(generateAdapter = true)
 data class CreateWorkspaceBuildRequest(
     // Use to update the workspace to a new template version.
     @Json(name = "template_version_id") val templateVersionID: UUID?,

src/main/kotlin/com/coder/gateway/sdk/v2/models/Response.kt

@@ -1,12 +1,15 @@
 package com.coder.gateway.sdk.v2.models
 
 import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
 
+@JsonClass(generateAdapter = true)
 data class Validation (
     @Json(name = "field") val field: String,
     @Json(name = "detail") val detail: String,
 )
 
+@JsonClass(generateAdapter = true)
 data class Response (
     @Json(name = "message") val message: String,
     @Json(name = "detail") val detail: String,

src/main/kotlin/com/coder/gateway/sdk/v2/models/Template.kt

@@ -1,8 +1,10 @@
 package com.coder.gateway.sdk.v2.models
 
 import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
 import java.util.UUID
 
+@JsonClass(generateAdapter = true)
 data class Template(
     @Json(name = "id") val id: UUID,
     @Json(name = "active_version_id") val activeVersionID: UUID,

src/main/kotlin/com/coder/gateway/sdk/v2/models/User.kt

@@ -1,7 +1,9 @@
 package com.coder.gateway.sdk.v2.models
 
 import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
 
+@JsonClass(generateAdapter = true)
 data class User(
     @Json(name = "username") val username: String,
 )

src/main/kotlin/com/coder/gateway/sdk/v2/models/Workspace.kt

@@ -2,11 +2,14 @@ package com.coder.gateway.sdk.v2.models
 
 import com.coder.gateway.models.WorkspaceAgentListModel
 import com.squareup.moshi.Json
-import java.util.*
+import com.squareup.moshi.JsonClass
+import java.util.UUID
 
 /**
- * Represents a deployment of a template. It references a specific version and can be updated.
+ * Represents a deployment of a template. It references a specific version and
+ * can be updated.
  */
+@JsonClass(generateAdapter = true)
 data class Workspace(
     @Json(name = "id") val id: UUID,
     @Json(name = "template_id") val templateID: UUID,

src/main/kotlin/com/coder/gateway/sdk/v2/models/WorkspaceAgent.kt

@@ -3,8 +3,10 @@ package com.coder.gateway.sdk.v2.models
 import com.coder.gateway.util.Arch
 import com.coder.gateway.util.OS
 import com.squareup.moshi.Json
-import java.util.*
+import com.squareup.moshi.JsonClass
+import java.util.UUID
 
+@JsonClass(generateAdapter = true)
 data class WorkspaceAgent(
     @Json(name = "id") val id: UUID,
     @Json(name = "status") val status: WorkspaceAgentStatus,

src/main/kotlin/com/coder/gateway/sdk/v2/models/WorkspaceBuild.kt

@@ -1,12 +1,14 @@
 package com.coder.gateway.sdk.v2.models
 
 import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
 import java.util.UUID
 
 /**
  * WorkspaceBuild is an at-point representation of a workspace state.
  * BuildNumbers start at 1 and increase by 1 for each subsequent build.
  */
+@JsonClass(generateAdapter = true)
 data class WorkspaceBuild(
     @Json(name = "template_version_id") val templateVersionID: UUID,
     @Json(name = "resources") val resources: List<WorkspaceResource>,

src/main/kotlin/com/coder/gateway/sdk/v2/models/WorkspaceResource.kt

@@ -1,7 +1,9 @@
 package com.coder.gateway.sdk.v2.models
 
 import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
 
+@JsonClass(generateAdapter = true)
 data class WorkspaceResource(
     @Json(name = "agents") val agents: List<WorkspaceAgent>?,
 )

src/main/kotlin/com/coder/gateway/sdk/v2/models/WorkspacesResponse.kt

@@ -1,7 +1,9 @@
 package com.coder.gateway.sdk.v2.models
 
 import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
 
+@JsonClass(generateAdapter = true)
 data class WorkspacesResponse(
     @Json(name = "workspaces") val workspaces: List<Workspace>,
 )

src/test/kotlin/com/coder/gateway/cli/CoderCLIManagerTest.kt

@@ -377,6 +377,7 @@ internal class CoderCLIManagerTest {
         val tests = mapOf(
             null                                to ProcessInitException::class,
             echo("""{"foo": true, "baz": 1}""") to MissingVersionException::class,
+            echo("""{"version": ""}""")         to MissingVersionException::class,
             echo("""v0.0.1""")                  to JsonEncodingException::class,
             echo("""{"version: """)             to JsonEncodingException::class,
             echo("""{"version": "invalid"}""")  to InvalidVersionException::class,
@@ -409,6 +410,7 @@ internal class CoderCLIManagerTest {
         val test = listOf(
             Triple(null, "v1.0.0", null),
             Triple(echo("""{"version": "v1.0.0"}"""), "v1.0.0", true),
+            Triple(echo("""{"version": "v1.0.0", "foo": "bar"}"""), "v1.0.0", true),
             Triple(echo("""{"version": "v1.0.0"}"""), "v1.0.0-devel+b5b5b5b5", true),
             Triple(echo("""{"version": "v1.0.0-devel+b5b5b5b5"}"""), "v1.0.0-devel+b5b5b5b5", true),
             Triple(echo("""{"version": "v1.0.0-devel+b5b5b5b5"}"""), "v1.0.0", true),
@@ -466,7 +468,7 @@ internal class CoderCLIManagerTest {
             return
         }
 
-        val tests = listOf(
+        @Suppress("BooleanLiteralArgument") val tests = listOf(
             // CLI is writable.
             EnsureCLITest(null,    null,    "1.0.0", true,  true,  true,  Result.DL_BIN),  // Download.
             EnsureCLITest(null,    null,    "1.0.0", true,  false, true,  Result.NONE),    // No download, error when used.