Merge pull request #36 from kudlatyamroth/bugfix/keep-nullable-proper…

…ty-after-resolving-one-of fix: after resolving oneOf with null, keep it as nullable attribute
kstasik · Jul 23, 2021 · a61cbd4 · a61cbd4
2 parents 4452da2 + 668cb15
commit a61cbd4
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/codegen/jsonschema/mod.rs b/src/codegen/jsonschema/mod.rs
@@ -374,7 +374,7 @@ fn add_validation_and_nullable(
     let nullable = schema
         .get("nullable")
         .map(|v| v.as_bool().unwrap_or(false))
-        .unwrap_or(false);
+        .unwrap_or_else(|| model.attributes.nullable);
 
     let validation = if !result.is_empty() {
         Some(result)