fixes #161

Author: springdoc

springdoc-openapi-common/src/main/java/org/springdoc/core/AbstractRequestBuilder.java

@@ -24,6 +24,7 @@ public abstract class AbstractRequestBuilder {
     private final AbstractParameterBuilder parameterBuilder;
     private final RequestBodyBuilder requestBodyBuilder;
     private final OperationBuilder operationBuilder;
+    private static final String[] ANNOTATIONS_FOR_REQUIRED = {NotNull.class.getName(), NotBlank.class.getName(), NotEmpty.class.getName()};
 
     protected AbstractRequestBuilder(AbstractParameterBuilder parameterBuilder, RequestBodyBuilder requestBodyBuilder,
                                      OperationBuilder operationBuilder) {
@@ -87,7 +88,6 @@ public Operation build(Components components, HandlerMethod handlerMethod, Reque
         }
 
         setParams(operation, operationParameters, requestBodyInfo);
-
         // allow for customisation
         operation = customiseOperation(operation, handlerMethod);
 
@@ -210,7 +210,9 @@ private void applyBeanValidatorAnnotations(final Parameter parameter, final List
             annotations.forEach(annotation -> annos.put(annotation.annotationType().getName(), annotation));
         }
 
-        if (annos.containsKey(NotNull.class.getName())) {
+        boolean annotationExists = Arrays.stream(ANNOTATIONS_FOR_REQUIRED).anyMatch(annos::containsKey);
+
+        if (annotationExists) {
             parameter.setRequired(true);
         }
 
@@ -241,6 +243,12 @@ private void applyBeanValidatorAnnotations(final Parameter parameter, final List
                 schema.setExclusiveMaximum(!max.inclusive());
             }
         }
+        if (annos.containsKey(PositiveOrZero.class.getName())) {
+            schema.setMinimum(BigDecimal.ZERO);
+        }
+        if (annos.containsKey(NegativeOrZero .class.getName())) {
+            schema.setMaximum(BigDecimal.ZERO);
+        }
         if (annos.containsKey(Pattern.class.getName())) {
             Pattern pattern = (Pattern) annos.get(Pattern.class.getName());
             schema.setPattern(pattern.regexp());

springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app18/HelloController.java

@@ -5,7 +5,10 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.constraints.NegativeOrZero;
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.PositiveOrZero;
 
 @RestController
 public class HelloController {
@@ -25,4 +28,18 @@ public String persons3(@NotBlank @Parameter(description = "persons name") @Reque
         return "OK";
     }
 
+    @GetMapping(value = "/persons4")
+    public String persons4(@PositiveOrZero int age) {
+        return "OK";
+    }
+
+    @GetMapping(value = "/persons5")
+    public String persons5(@NegativeOrZero int age) {
+        return "OK";
+    }
+    @GetMapping(value = "/persons6")
+    public String persons6(@NotEmpty @Parameter(description = "persons name") String name) {
+        return "OK";
+    }
+
 }

springdoc-openapi-webmvc-core/src/test/resources/results/app18.json

@@ -11,6 +11,33 @@
     }
   ],
   "paths": {
+    "/persons": {
+      "get": {
+        "operationId": "persons",
+        "parameters": [
+          {
+            "name": "name",
+            "in": "query",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "default response",
+            "content": {
+              "*/*": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/persons3": {
       "get": {
         "operationId": "persons3",
@@ -39,9 +66,67 @@
         }
       }
     },
-    "/persons2": {
+    "/persons5": {
       "get": {
-        "operationId": "persons2",
+        "operationId": "persons5",
+        "parameters": [
+          {
+            "name": "age",
+            "in": "query",
+            "required": true,
+            "schema": {
+              "maximum": 0,
+              "type": "integer",
+              "format": "int32"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "default response",
+            "content": {
+              "*/*": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/persons4": {
+      "get": {
+        "operationId": "persons4",
+        "parameters": [
+          {
+            "name": "age",
+            "in": "query",
+            "required": true,
+            "schema": {
+              "minimum": 0,
+              "type": "integer",
+              "format": "int32"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "default response",
+            "content": {
+              "*/*": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/persons6": {
+      "get": {
+        "operationId": "persons6",
         "parameters": [
           {
             "name": "name",
@@ -67,13 +152,14 @@
         }
       }
     },
-    "/persons": {
+    "/persons2": {
       "get": {
-        "operationId": "persons",
+        "operationId": "persons2",
         "parameters": [
           {
             "name": "name",
             "in": "query",
+            "description": "persons name",
             "required": true,
             "schema": {
               "type": "string"
@@ -95,6 +181,5 @@
       }
     }
   },
-  "components": {
-  }
-}
+  "components": {}
+}