Enable required usage with schema_with attribute

salvo-rs · Nov 27, 2023 · a5ceada · a5ceada
1 parent 1f79496
commit a5ceada
Showing 1 changed file with 9 additions and 11 deletions.
diff --git a/crates/oapi-macros/src/schema/struct_schemas.rs b/crates/oapi-macros/src/schema/struct_schemas.rs
@@ -162,17 +162,15 @@ impl ToTokens for NamedStructSchema<'_> {
                                 .property(#name, #property)
                             });
 
-                            if let Property::Schema(_) = property {
-                                if (!is_option && crate::is_required(field_rule.as_ref(), container_rules.as_ref()))
-                                    || required
-                                        .as_ref()
-                                        .map(crate::feature::Required::is_true)
-                                        .unwrap_or(false)
-                                {
-                                    object_tokens.extend(quote! {
-                                        .required(#name)
-                                    })
-                                }
+                            if (!is_option && crate::is_required(field_rule.as_ref(), container_rules.as_ref()))
+                                || required
+                                    .as_ref()
+                                    .map(crate::feature::Required::is_true)
+                                    .unwrap_or(false)
+                            {
+                                object_tokens.extend(quote! {
+                                    .required(#name)
+                                })
                             }
 
                             object_tokens