Skip to content

fix: apply minItems/minLength from @NotEmpty/@NotBlank regardless of requiredMode #5033

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
daniel-kmiecik merged 2 commits into from
Jan 8, 2026
+37 −5
Merged

fix: apply minItems/minLength from @NotEmpty/@NotBlank regardless of requiredMode #5033

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6240175
Add assertions to verify @NotBlank generates minLength:1 and @NotEmpt…
Jan 6, 2026
3e432d9
fix: apply minItems/minLength from @NotEmpty/@NotBlank regardless of …
Jan 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions modules/swagger-core/src/main/java/io/swagger/v3/core/jackson/ModelResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ public Schema resolve(AnnotatedType annotatedType, ModelConverterContext context
model = openapi31 ? primitiveType.createProperty31() : primitiveType.createProperty();
isPrimitive = true;
}
}
}

if (model == null) {
PrimitiveType primitiveType = PrimitiveType.fromType(type);
Expand Down Expand Up @@ -1841,7 +1841,7 @@ protected boolean applyBeanValidatorAnnotations(Schema property, Annotation[] an
}
}

if (annos.containsKey("javax.validation.constraints.NotEmpty") && applyNotNullAnnotations ) {
if (annos.containsKey("javax.validation.constraints.NotEmpty")) {
NotEmpty anno = (NotEmpty) annos.get("javax.validation.constraints.NotEmpty");
boolean apply = checkGroupValidation(anno.groups(), invocationGroups, acceptNoGroups);
if (apply) {
Expand All @@ -1863,11 +1863,13 @@ protected boolean applyBeanValidatorAnnotations(Schema property, Annotation[] an
modified = true;
}
}
modified = updateRequiredItem(parent, property.getName()) || modified;
if (applyNotNullAnnotations) {
modified = updateRequiredItem(parent, property.getName()) || modified;
}
}
}

if (annos.containsKey("javax.validation.constraints.NotBlank") && applyNotNullAnnotations ) {
if (annos.containsKey("javax.validation.constraints.NotBlank")) {
NotBlank anno = (NotBlank) annos.get("javax.validation.constraints.NotBlank");
boolean apply = checkGroupValidation(anno.groups(), invocationGroups, acceptNoGroups);
if (apply) {
Expand All @@ -1878,7 +1880,9 @@ protected boolean applyBeanValidatorAnnotations(Schema property, Annotation[] an
modified = true;
}
}
modified = updateRequiredItem(parent, property.getName()) || modified;
if (applyNotNullAnnotations) {
modified = updateRequiredItem(parent, property.getName()) || modified;
}
}
}
if (annos.containsKey("javax.validation.constraints.Min")) {
Expand Down
28 changes: 28 additions & 0 deletions modules/swagger-core/src/test/java/io/swagger/v3/core/converting/ModelPropertyTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,20 @@ public void testNotBlankNotEmptyWithRequiredModeNotRequired() {
assertFalse(model.getRequired() != null && model.getRequired().contains("notBlankNotRequired"));
assertFalse(model.getRequired() != null && model.getRequired().contains("notEmptyListNotRequired"));
assertFalse(model.getRequired() != null && model.getRequired().contains("notEmptySetNotRequired"));

// @NotBlank should generate minLength: 1
Schema notBlankSchema = (Schema) model.getProperties().get("notBlankNotRequired");
assertNotNull(notBlankSchema);
assertEquals(notBlankSchema.getMinLength(), Integer.valueOf(1));

// @NotEmpty should generate minItems: 1
ArraySchema listSchema = (ArraySchema) model.getProperties().get("notEmptyListNotRequired");
assertNotNull(listSchema);
assertEquals(listSchema.getMinItems(), Integer.valueOf(1));

ArraySchema setSchema = (ArraySchema) model.getProperties().get("notEmptySetNotRequired");
assertNotNull(setSchema);
assertEquals(setSchema.getMinItems(), Integer.valueOf(1));
}

@Test
Expand All @@ -193,6 +207,20 @@ public void testNotBlankNotEmptyWithRequiredModeRequired() {
assertTrue(model.getRequired().contains("notBlankRequired"));
assertTrue(model.getRequired().contains("notEmptyListRequired"));
assertTrue(model.getRequired().contains("notEmptySetRequired"));

// @NotBlank should generate minLength: 1
Schema notBlankSchema = (Schema) model.getProperties().get("notBlankRequired");
assertNotNull(notBlankSchema);
assertEquals(notBlankSchema.getMinLength(), Integer.valueOf(1));

// @NotEmpty should generate minItems: 1
ArraySchema listSchema = (ArraySchema) model.getProperties().get("notEmptyListRequired");
assertNotNull(listSchema);
assertEquals(listSchema.getMinItems(), Integer.valueOf(1));

ArraySchema setSchema = (ArraySchema) model.getProperties().get("notEmptySetRequired");
assertNotNull(setSchema);
assertEquals(setSchema.getMinItems(), Integer.valueOf(1));
}

class Family {
Expand Down
Loading