Annotate with @JsonClass classes with no parameters/variables

Yelp · Feb 3, 2020 · 24eae7b · 24eae7b
1 parent bb15a09
commit 24eae7b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/plugin/src/main/java/com/yelp/codegen/KotlinGenerator.kt b/plugin/src/main/java/com/yelp/codegen/KotlinGenerator.kt
@@ -205,8 +205,13 @@ open class KotlinGenerator : SharedCodegen() {
     @VisibleForTesting
     internal fun addRequiredImports(codegenModel: CodegenModel) {
         // If there are any vars, we will mark them with the @Json annotation so we have to make sure to import it
-        if (codegenModel.vars.isNotEmpty() || codegenModel.isEnum) {
+        if (codegenModel.allVars.isNotEmpty() || codegenModel.isEnum) {
             codegenModel.imports.add("com.squareup.moshi.Json")
+        }
+
+        if (!codegenModel.isAlias) {
+            // If we are rendering a model (or enum) we are annotating it with @JsonClass,
+            // so we need to make sure that we're importing it
             codegenModel.imports.add("com.squareup.moshi.JsonClass")
         }
 

diff --git a/plugin/src/main/resources/kotlin/data_class.mustache b/plugin/src/main/resources/kotlin/data_class.mustache
@@ -4,8 +4,8 @@
  * @property {{{name}}} {{description}}
 {{/vars}}
  */
-{{#hasVars}}@JsonClass(generateAdapter = true)
-data {{/hasVars}}class {{classname}} {{#hasVars}}(
+@JsonClass(generateAdapter = true)
+{{#hasVars}}data {{/hasVars}}class {{classname}} {{#hasVars}}(
 {{#requiredVars}}
 {{>data_class_req_var}}{{^-last}},
 {{/-last}}{{/requiredVars}}{{#hasRequired}}{{#hasOptional}},