fix: apply minItems/minLength from @NotEmpty/@notblank regardless of requiredMode (#5033)

burneyy · Daniel Berninghoff · web-flow · commit 1dafa44cc59c · 2026-01-08T11:28:15.000+01:00
Co-authored-by: Daniel Berninghoff &lt;ext.daniel.berninghoff@bankfrick.li&gt;
diff --git a/modules/swagger-core/src/main/java/io/swagger/v3/core/jackson/ModelResolver.java b/modules/swagger-core/src/main/java/io/swagger/v3/core/jackson/ModelResolver.java
@@ -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);
@@ -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) {
@@ -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) {
@@ -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")) {
diff --git a/modules/swagger-core/src/test/java/io/swagger/v3/core/converting/ModelPropertyTest.java b/modules/swagger-core/src/test/java/io/swagger/v3/core/converting/ModelPropertyTest.java
@@ -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
@@ -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 {

Original file line number	Diff line number	Diff line change
`@@ -349,7 +349,7 @@ public Schema resolve(AnnotatedType annotatedType, ModelConverterContext context`
`349`	`349`	`model = openapi31 ? primitiveType.createProperty31() : primitiveType.createProperty();`
`350`	`350`	`isPrimitive = true;`
`351`	`351`	`}`
`352`		`- }`
	`352`	`+ }`
`353`	`353`
`354`	`354`	`if (model == null) {`
`355`	`355`	`PrimitiveType primitiveType = PrimitiveType.fromType(type);`
`@@ -1841,7 +1841,7 @@ protected boolean applyBeanValidatorAnnotations(Schema property, Annotation[] an`
`1841`	`1841`	`}`
`1842`	`1842`	`}`
`1843`	`1843`
`1844`		`- if (annos.containsKey("javax.validation.constraints.NotEmpty") && applyNotNullAnnotations ) {`
	`1844`	`+ if (annos.containsKey("javax.validation.constraints.NotEmpty")) {`
`1845`	`1845`	`NotEmpty anno = (NotEmpty) annos.get("javax.validation.constraints.NotEmpty");`
`1846`	`1846`	`boolean apply = checkGroupValidation(anno.groups(), invocationGroups, acceptNoGroups);`
`1847`	`1847`	`if (apply) {`
`@@ -1863,11 +1863,13 @@ protected boolean applyBeanValidatorAnnotations(Schema property, Annotation[] an`
`1863`	`1863`	`modified = true;`
`1864`	`1864`	`}`
`1865`	`1865`	`}`
`1866`		`- modified = updateRequiredItem(parent, property.getName()) \|\| modified;`
	`1866`	`+ if (applyNotNullAnnotations) {`
	`1867`	`+ modified = updateRequiredItem(parent, property.getName()) \|\| modified;`
	`1868`	`+ }`
`1867`	`1869`	`}`
`1868`	`1870`	`}`
`1869`	`1871`
`1870`		`- if (annos.containsKey("javax.validation.constraints.NotBlank") && applyNotNullAnnotations ) {`
	`1872`	`+ if (annos.containsKey("javax.validation.constraints.NotBlank")) {`
`1871`	`1873`	`NotBlank anno = (NotBlank) annos.get("javax.validation.constraints.NotBlank");`
`1872`	`1874`	`boolean apply = checkGroupValidation(anno.groups(), invocationGroups, acceptNoGroups);`
`1873`	`1875`	`if (apply) {`
`@@ -1878,7 +1880,9 @@ protected boolean applyBeanValidatorAnnotations(Schema property, Annotation[] an`
`1878`	`1880`	`modified = true;`
`1879`	`1881`	`}`
`1880`	`1882`	`}`
`1881`		`- modified = updateRequiredItem(parent, property.getName()) \|\| modified;`
	`1883`	`+ if (applyNotNullAnnotations) {`
	`1884`	`+ modified = updateRequiredItem(parent, property.getName()) \|\| modified;`
	`1885`	`+ }`
`1882`	`1886`	`}`
`1883`	`1887`	`}`
`1884`	`1888`	`if (annos.containsKey("javax.validation.constraints.Min")) {`