fix constraints description on primitives with a default value; fixes #…

…1049
stoicflame · Aug 27, 2020 · 3a4a44e · 3a4a44e
1 parent 12a237d
commit 3a4a44e
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/core/src/main/java/com/webcohesion/enunciate/util/BeanValidationUtils.java b/core/src/main/java/com/webcohesion/enunciate/util/BeanValidationUtils.java
@@ -128,14 +128,14 @@ public static boolean hasConstraints(Element el, boolean required) {
     return false;
   }
 
-  public static String describeConstraints(Element el, boolean required) {
+  public static String describeConstraints(Element el, boolean required, String defaultValue) {
     Null mustBeNull = el.getAnnotation(Null.class);
     if (mustBeNull != null) {
       return "must be null";
     }
 
     List<String> constraints = new ArrayList<String>();
-    required = required || isNotNull(el);
+    required = required || (isNotNull(el) && defaultValue == null);
     if (required) {
       constraints.add("required");
     }

diff --git a/jackson/src/main/java/com/webcohesion/enunciate/modules/jackson/api/impl/PropertyImpl.java b/jackson/src/main/java/com/webcohesion/enunciate/modules/jackson/api/impl/PropertyImpl.java
@@ -104,7 +104,7 @@ public boolean isReadOnly() {
   }
 
   public String getConstraints() {
-    return BeanValidationUtils.describeConstraints(member, isRequired());
+    return BeanValidationUtils.describeConstraints(member, isRequired(), getDefaultValue());
   }
 
   public String getDefaultValue() {

diff --git a/jackson1/src/main/java/com/webcohesion/enunciate/modules/jackson1/api/impl/PropertyImpl.java b/jackson1/src/main/java/com/webcohesion/enunciate/modules/jackson1/api/impl/PropertyImpl.java
@@ -98,7 +98,7 @@ public boolean isReadOnly() {
   }
 
   public String getConstraints() {
-    return BeanValidationUtils.describeConstraints(member, isRequired());
+    return BeanValidationUtils.describeConstraints(member, isRequired(), getDefaultValue());
   }
 
   public String getDefaultValue() {

diff --git a/jaxb/src/main/java/com/webcohesion/enunciate/modules/jaxb/api/impl/PropertyImpl.java b/jaxb/src/main/java/com/webcohesion/enunciate/modules/jaxb/api/impl/PropertyImpl.java
@@ -129,7 +129,7 @@ public String getConstraints() {
     } else if (this.accessor instanceof Attribute) {
         required = ((Attribute) this.accessor).isRequired();
     }
-    return BeanValidationUtils.describeConstraints(this.accessor, required);
+    return BeanValidationUtils.describeConstraints(this.accessor, required, getDefaultValue());
   }
 
   @Override

diff --git a/jaxrs/src/main/java/com/webcohesion/enunciate/modules/jaxrs/api/impl/ParameterImpl.java b/jaxrs/src/main/java/com/webcohesion/enunciate/modules/jaxrs/api/impl/ParameterImpl.java
@@ -79,7 +79,7 @@ public String getDefaultValue() {
 
   @Override
   public String getConstraints() {
-    String validationConstraints = BeanValidationUtils.describeConstraints(this.param, false);
+    String validationConstraints = BeanValidationUtils.describeConstraints(this.param, false, getDefaultValue());
     if (validationConstraints != null && !validationConstraints.isEmpty()) {
       return validationConstraints;
     }

diff --git a/...eb/src/main/java/com/webcohesion/enunciate/modules/spring_web/api/impl/ParameterImpl.java b/...eb/src/main/java/com/webcohesion/enunciate/modules/spring_web/api/impl/ParameterImpl.java
@@ -70,7 +70,7 @@ public String getDefaultValue() {
 
   @Override
   public String getConstraints() {
-    String validationConstraints = BeanValidationUtils.describeConstraints(this.param, this.param.isRequired());
+    String validationConstraints = BeanValidationUtils.describeConstraints(this.param, this.param.isRequired(), getDefaultValue());
     String dateTimeFormatDescription = describeDateTimeFormat(this.param);
     if (validationConstraints != null || dateTimeFormatDescription != null) {
       StringBuilder constraints = new StringBuilder();