Skip to content

Commit 699f70e

Browse files
committed
give precedence to requiredMode annotation
1 parent fc1bcca commit 699f70e

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

modules/swagger-core/src/main/java/io/swagger/v3/core/jackson/ModelResolver.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -718,11 +718,13 @@ public Schema resolve(AnnotatedType annotatedType, ModelConverterContext context
718718
}
719719
if (property != null) {
720720
Boolean required = md.getRequired();
721-
if (required != null && !Boolean.FALSE.equals(required)) {
722-
addRequiredItem(model, propName);
723-
} else {
724-
if (propDef.isRequired()) {
721+
if (!io.swagger.v3.oas.annotations.media.Schema.RequiredMode.NOT_REQUIRED.equals(requiredMode)) {
722+
if (required != null && !Boolean.FALSE.equals(required)) {
725723
addRequiredItem(model, propName);
724+
} else {
725+
if (propDef.isRequired()) {
726+
addRequiredItem(model, propName);
727+
}
726728
}
727729
}
728730
if (property.get$ref() == null || openapi31) {
@@ -801,6 +803,7 @@ public Schema resolve(AnnotatedType annotatedType, ModelConverterContext context
801803
}
802804

803805
for(String propName : requiredProps) {
806+
System.err.println("XXX PROPS " + propName);
804807
addRequiredItem(model, propName);
805808
}
806809
}

0 commit comments

Comments
 (0)