Skip to content

Include Nonnull annotation from Jakarta Annotations for required items #4875

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
frantuma merged 1 commit into from
May 7, 2025
Merged

Include Nonnull annotation from Jakarta Annotations for required items #4875

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion 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 @@ -1741,7 +1741,7 @@ protected boolean applyBeanValidatorAnnotations(Schema property, Annotation[] an

if (parent != null &&
Arrays.stream(annotations).anyMatch(
annotation -> annotation.annotationType().getSimpleName().equals("NonNull"))) {
annotation -> annotation.annotationType().getSimpleName().equalsIgnoreCase("NonNull"))) {
modified = updateRequiredItem(parent, property.getName()) || modified;

}
Expand Down
2 changes: 2 additions & 0 deletions modules/swagger-core/src/test/java/io/swagger/v3/core/oas/models/BeanValidationsModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package io.swagger.v3.core.oas.models;

import javax.annotation.Nonnull;
import javax.validation.constraints.DecimalMax;
import javax.validation.constraints.DecimalMin;
import javax.validation.constraints.Email;
Expand All @@ -20,6 +21,7 @@ public class BeanValidationsModel {
protected Integer age;

@Pattern(regexp = "(?![-._])[-._a-zA-Z0-9]{3,32}")
@Nonnull
protected String username;

@Size(min = 6, max = 20)
Expand Down
1 change: 1 addition & 0 deletions modules/swagger-core/src/test/java/io/swagger/v3/core/resolving/BeanValidatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ public void readBeanValidatorTest() {
final Map<String, Schema> properties = model.getProperties();

assertTrue(model.getRequired().contains("id"));
assertTrue(model.getRequired().contains("username"));

final StringSchema username = (StringSchema) properties.get("username");
assertEquals((String) username.getPattern(), "(?![-._])[-._a-zA-Z0-9]{3,32}");
Expand Down
Loading