Fix default array issue.

We can only support basic defaults for field types, and should ignore any more complicated defaults for now. Closes #312
cjbooms · Sep 16, 2024 · 8e2e419 · 8e2e419
1 parent 6528da2
commit 8e2e419
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/src/main/kotlin/com/cjbooms/fabrikt/generators/PropertyUtils.kt b/src/main/kotlin/com/cjbooms/fabrikt/generators/PropertyUtils.kt
@@ -205,9 +205,10 @@ object PropertyUtils {
     }
 
     fun PropertyInfo.isNullable() = when (this) {
-        is PropertyInfo.Field, is PropertyInfo.ListField, is PropertyInfo.MapField,
+        is PropertyInfo.Field -> !isRequired && schema.default == null || schema.isNullable
+        is PropertyInfo.ListField, is PropertyInfo.MapField,
         is PropertyInfo.ObjectRefField, is PropertyInfo.ObjectInlinedField ->
-            !isRequired && schema.default == null || schema.isNullable
+            !isRequired || schema.isNullable
         else -> !isRequired
     }
 

diff --git a/src/test/resources/examples/arrays/api.yaml b/src/test/resources/examples/arrays/api.yaml
@@ -16,6 +16,11 @@ components:
             properties:
               some-array-prop:
                 type: string
+        array_with_empty_default:
+          type: array
+          default: []
+          items:
+            type: string
         a-nullable-array:
           type: array
           nullable: true

diff --git a/src/test/resources/examples/arrays/models/ContainsArrayOfArrays.kt b/src/test/resources/examples/arrays/models/ContainsArrayOfArrays.kt
@@ -14,6 +14,9 @@ public data class ContainsArrayOfArrays(
   @get:JsonProperty("absent-object-type-in-array")
   @get:Valid
   public val absentObjectTypeInArray: List<ContainsArrayOfArraysAbsentObjectTypeInArray>? = null,
+  @param:JsonProperty("array_with_empty_default")
+  @get:JsonProperty("array_with_empty_default")
+  public val arrayWithEmptyDefault: List<String>? = null,
   @param:JsonProperty("a-nullable-array")
   @get:JsonProperty("a-nullable-array")
   public val aNullableArray: List<String?>? = null,