third pass

Author: andrewwilsonnew

bin/configs/kotlin-misk-config.yaml

@@ -6,4 +6,5 @@ validateSpec: false
 additionalProperties:
   hideGenerationTimestamp: "true"
   moduleClassName: "PetStoreModule"
-  generateStubImplClasses: true
+  generateStubImplClasses: true
+  addModelMoshiJsonAnnotation: true

modules/openapi-generator/src/main/resources/kotlin-misk/build.gradle.kts.mustache

@@ -10,7 +10,7 @@ version = "{{artifactVersion}}"
 dependencies {
     implementation("jakarta.validation:jakarta.validation-api:3.1.1")
     implementation("com.squareup.misk:misk:2025.04.02.195630-a61d550")
-    //implementation("com.squareup.wire:wire-runtime:5.2.1")
+    implementation("com.squareup.moshi:moshi:1.15.2")
 
     testImplementation("com.squareup.misk:misk-testing:2025.02.11.123913-8a41324")
     testImplementation("org.junit.jupiter:junit-jupiter:5.9.2")

modules/openapi-generator/src/main/resources/kotlin-misk/model.mustache

@@ -3,7 +3,6 @@ package {{modelPackage}}
 {{#imports}}
 import {{import}}
 {{/imports}}
-import com.squareup.moshi.JsonClass
 {{#models}}
 {{#model}}
 {{#isEnum}}
@@ -16,8 +15,9 @@ enum class {{classname}} {
 }
 {{/isEnum}}
 {{^isEnum}}
+{{#addModelMoshiJsonAnnotation}}import com.squareup.moshi.JsonClass
 
-@JsonClass(generateAdapter = true)
+@JsonClass(generateAdapter = true){{/addModelMoshiJsonAnnotation}}
 data class {{classname}}(
     {{#vars}}
     {{#description}}

samples/server/petstore/kotlin-misk-config/build.gradle.kts

@@ -10,7 +10,7 @@ version = "1.0.0-SNAPSHOT"
 dependencies {
     implementation("jakarta.validation:jakarta.validation-api:3.1.1")
     implementation("com.squareup.misk:misk:2025.04.02.195630-a61d550")
-    //implementation("com.squareup.wire:wire-runtime:5.2.1")
+    implementation("com.squareup.moshi:moshi:1.15.2")
 
     testImplementation("com.squareup.misk:misk-testing:2025.02.11.123913-8a41324")
     testImplementation("org.junit.jupiter:junit-jupiter:5.9.2")