From 2635092ec06ede5149d8d4e1a3e45fbc1aacae44 Mon Sep 17 00:00:00 2001 From: frantuma Date: Tue, 17 Jul 2018 11:08:12 +0200 Subject: [PATCH] refs #2778 - also consider NotEmpty and NotBlank to resolve required --- .../java/io/swagger/v3/core/jackson/ModelResolver.java | 7 ++++++- .../java/io/swagger/v3/core/util/ParameterProcessor.java | 6 +++++- 2 files changed, 11 insertions(+), 2 deletions(-) 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 index bdbbdf7a06..df134f711a 100644 --- 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 @@ -1025,7 +1025,12 @@ protected void applyBeanValidatorAnnotations(Schema property, Annotation[] annot annos.put(anno.annotationType().getName(), anno); } } - if (parent != null && annos.containsKey("javax.validation.constraints.NotNull")) { + if (parent != null && + ( + annos.containsKey("javax.validation.constraints.NotNull") || + annos.containsKey("javax.validation.constraints.NotBlank") || + annos.containsKey("javax.validation.constraints.NotEmpty") + )) { addRequiredItem(parent, property.getName()); } if (annos.containsKey("javax.validation.constraints.Min")) { diff --git a/modules/swagger-core/src/main/java/io/swagger/v3/core/util/ParameterProcessor.java b/modules/swagger-core/src/main/java/io/swagger/v3/core/util/ParameterProcessor.java index a3aa0d3021..36bcdc8cc0 100644 --- a/modules/swagger-core/src/main/java/io/swagger/v3/core/util/ParameterProcessor.java +++ b/modules/swagger-core/src/main/java/io/swagger/v3/core/util/ParameterProcessor.java @@ -154,7 +154,11 @@ public static Parameter applyAnnotations( } catch (Exception e) { LOGGER.error("failed on " + annotation.annotationType().getName(), e); } - } else if (annotation.annotationType().getName().equals("javax.validation.constraints.NotNull")) { + } else if ( + annotation.annotationType().getName().equals("javax.validation.constraints.NotNull") || + annotation.annotationType().getName().equals("javax.validation.constraints.NotBlank") || + annotation.annotationType().getName().equals("javax.validation.constraints.NotEmpty") + ) { parameter.setRequired(true); } else if (annotation.annotationType().getName().equals("javax.ws.rs.FormParam")) { try {