Skip to content

Commit 6c3aa8f

Browse files
bnasslahsenbnasslahsen
committed
Merge branch 'mpleine-main'
2 parents 8439195 + 35b7114 commit 6c3aa8f

File tree

7 files changed

+176
-61
lines changed

7 files changed

+176
-61
lines changed

‎springdoc-openapi-starter-common/src/main/java/org/springdoc/core/data/DataRestRequestService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ private void addParameters(OpenAPI openAPI, RequestMethod requestMethod, MethodA
227227
MethodParameter methodParameter, ParameterInfo parameterInfo, Parameter parameter) {
228228
List<Annotation> parameterAnnotations = Arrays.asList(getParameterAnnotations(methodParameter));
229229
if (requestBuilder.isValidParameter(parameter,methodAttributes)) {
230-
requestBuilder.applyBeanValidatorAnnotations(methodParameter, parameter, parameterAnnotations, parameterInfo.isParameterObject());
230+
requestBuilder.applyBeanValidatorAnnotations(methodParameter, parameter, parameterAnnotations, parameterInfo.isParameterObject(), openAPI.getOpenapi());
231231
operation.addParametersItem(parameter);
232232
}
233233
else if (!RequestMethod.GET.equals(requestMethod)) {

‎springdoc-openapi-starter-common/src/main/java/org/springdoc/core/service/AbstractRequestService.java‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ public Operation build(HandlerMethod handlerMethod, RequestMethod requestMethod,
328328
}
329329
}
330330
// Process: applyValidationsToSchema
331-
applyBeanValidatorAnnotations(methodParameter, parameter, parameterAnnotations, parameterInfo.isParameterObject());
331+
applyBeanValidatorAnnotations(methodParameter, parameter, parameterAnnotations, parameterInfo.isParameterObject(), openAPI.getOpenapi());
332332
}
333333
else if (!RequestMethod.GET.equals(requestMethod) || OpenApiVersion.OPENAPI_3_1.getVersion().equals(openAPI.getOpenapi())) {
334334
if (operation.getRequestBody() != null)
@@ -604,26 +604,27 @@ public Parameter buildParam(ParameterInfo parameterInfo, Components components,
604604
/**
605605
* Apply bean validator annotations.
606606
*
607-
* @param methodParameter the method parameter
608-
* @param parameter the parameter
609-
* @param annotations the annotations
607+
* @param methodParameter the method parameter
608+
* @param parameter the parameter
609+
* @param annotations the annotations
610610
* @param isParameterObject the is parameter object
611+
* @param openapiVersion the openapi version
611612
*/
612-
public void applyBeanValidatorAnnotations(final MethodParameter methodParameter, final Parameter parameter, final List<Annotation> annotations, final boolean isParameterObject) {
613+
public void applyBeanValidatorAnnotations(final MethodParameter methodParameter, final Parameter parameter, final List<Annotation> annotations, final boolean isParameterObject, String openapiVersion) {
613614
boolean annotatedNotNull = annotations != null && SchemaUtils.annotatedNotNull(annotations);
614615
if (annotatedNotNull && !isParameterObject) {
615616
parameter.setRequired(true);
616617
}
617618
if (annotations != null) {
618619
Schema<?> schema = parameter.getSchema();
619-
SchemaUtils.applyValidationsToSchema(schema, annotations);
620+
SchemaUtils.applyValidationsToSchema(schema, annotations, openapiVersion);
620621
if (schema instanceof ArraySchema && isParameterObject && methodParameter instanceof DelegatingMethodParameter mp) {
621622
Field field = mp.getField();
622623
if (field != null && field.getAnnotatedType() instanceof AnnotatedParameterizedType paramType) {
623624
java.lang.reflect.AnnotatedType[] typeArgs = paramType.getAnnotatedActualTypeArguments();
624625
for (java.lang.reflect.AnnotatedType typeArg : typeArgs) {
625626
List<Annotation> genericAnnotations = Arrays.stream(typeArg.getAnnotations()).toList();
626-
SchemaUtils.applyValidationsToSchema(schema.getItems(), genericAnnotations);
627+
SchemaUtils.applyValidationsToSchema(schema.getItems(), genericAnnotations, openapiVersion);
627628
}
628629
}
629630
}

‎springdoc-openapi-starter-common/src/main/java/org/springdoc/core/utils/SchemaUtils.java‎

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,15 @@
2121
import jakarta.validation.constraints.DecimalMin;
2222
import jakarta.validation.constraints.Max;
2323
import jakarta.validation.constraints.Min;
24+
import jakarta.validation.constraints.Negative;
2425
import jakarta.validation.constraints.NegativeOrZero;
2526
import jakarta.validation.constraints.Pattern;
27+
import jakarta.validation.constraints.Positive;
2628
import jakarta.validation.constraints.PositiveOrZero;
2729
import jakarta.validation.constraints.Size;
2830
import kotlin.reflect.KProperty;
2931
import kotlin.reflect.jvm.ReflectJvmMapping;
32+
import org.springdoc.core.properties.SpringDocConfigProperties.ApiDocs.OpenApiVersion;
3033

3134
import org.springframework.core.KotlinDetector;
3235
import org.springframework.lang.Nullable;
@@ -183,18 +186,36 @@ public static boolean fieldRequired(Field field, @Nullable io.swagger.v3.oas.ann
183186
/**
184187
* Apply validations to schema. the annotation order effects the result of the
185188
* validation.
186-
* @param schema the schema
187-
* @param annotations the annotations
189+
*
190+
* @param schema the schema
191+
* @param annotations the annotations
192+
* @param openapiVersion the openapi version
188193
*/
189-
public static void applyValidationsToSchema(Schema<?> schema, List<Annotation> annotations) {
194+
public static void applyValidationsToSchema(Schema<?> schema, List<Annotation> annotations, String openapiVersion) {
190195
annotations.forEach(anno -> {
191196
String annotationName = anno.annotationType().getSimpleName();
197+
if (annotationName.equals(Positive.class.getSimpleName())) {
198+
if(OpenApiVersion.OPENAPI_3_1.getVersion().equals(openapiVersion)){
199+
schema.setExclusiveMinimumValue(BigDecimal.ZERO);
200+
} else {
201+
schema.setMinimum(BigDecimal.ZERO);
202+
schema.setExclusiveMinimum(true);
203+
}
204+
}
192205
if (annotationName.equals(PositiveOrZero.class.getSimpleName())) {
193206
schema.setMinimum(BigDecimal.ZERO);
194207
}
195208
if (annotationName.equals(NegativeOrZero.class.getSimpleName())) {
196209
schema.setMaximum(BigDecimal.ZERO);
197210
}
211+
if (annotationName.equals(Negative.class.getSimpleName())) {
212+
if(OpenApiVersion.OPENAPI_3_1.getVersion().equals(openapiVersion)){
213+
schema.setExclusiveMaximumValue(BigDecimal.ZERO);
214+
} else {
215+
schema.setMaximum(BigDecimal.ZERO);
216+
schema.setExclusiveMaximum(true);
217+
}
218+
}
198219
if (annotationName.equals(Min.class.getSimpleName())) {
199220
schema.setMinimum(BigDecimal.valueOf(((Min) anno).value()));
200221
}

‎springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app18/HelloController.java‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import jakarta.validation.constraints.NegativeOrZero;
3131
import jakarta.validation.constraints.NotBlank;
3232
import jakarta.validation.constraints.NotEmpty;
33+
import jakarta.validation.constraints.Positive;
3334
import jakarta.validation.constraints.PositiveOrZero;
3435

3536
import org.springframework.web.bind.annotation.GetMapping;
@@ -108,4 +109,14 @@ public String persons6(@NotEmpty @Parameter(description = "persons name") String
108109
return "OK";
109110
}
110111

112+
/**
113+
* Persons 7 string.
114+
*
115+
* @param age the age
116+
* @return the string
117+
*/
118+
@GetMapping(value = "/persons7")
119+
public String persons7(@Positive int age) {
120+
return "OK";
121+
}
111122
}

‎springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app18/HelloController.java‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import jakarta.validation.constraints.NegativeOrZero;
3131
import jakarta.validation.constraints.NotBlank;
3232
import jakarta.validation.constraints.NotEmpty;
33+
import jakarta.validation.constraints.Positive;
3334
import jakarta.validation.constraints.PositiveOrZero;
3435

3536
import org.springframework.web.bind.annotation.GetMapping;
@@ -108,4 +109,14 @@ public String persons6(@NotEmpty @Parameter(description = "persons name") String
108109
return "OK";
109110
}
110111

112+
/**
113+
* Persons 7 string.
114+
*
115+
* @param age the age
116+
* @return the string
117+
*/
118+
@GetMapping(value = "/persons7")
119+
public String persons7(@Positive int age) {
120+
return "OK";
121+
}
111122
}

‎springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.0.1/app18.json‎

Lines changed: 61 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -51,23 +51,25 @@
5151
}
5252
}
5353
},
54-
"/persons2": {
54+
"/persons7": {
5555
"get": {
5656
"tags": [
5757
"hello-controller"
5858
],
59-
"summary": "Persons 2 string.",
60-
"description": "Persons 2 string.",
61-
"operationId": "persons2",
59+
"summary": "Persons 7 string.",
60+
"description": "Persons 7 string.",
61+
"operationId": "persons7",
6262
"parameters": [
6363
{
64-
"name": "name",
64+
"name": "age",
6565
"in": "query",
66-
"description": "persons name",
66+
"description": "the age",
6767
"required": true,
6868
"schema": {
69-
"minLength": 1,
70-
"type": "string"
69+
"minimum": 0,
70+
"exclusiveMinimum": true,
71+
"type": "integer",
72+
"format": "int32"
7173
}
7274
}
7375
],
@@ -85,14 +87,14 @@
8587
}
8688
}
8789
},
88-
"/persons3": {
90+
"/persons6": {
8991
"get": {
9092
"tags": [
9193
"hello-controller"
9294
],
93-
"summary": "Persons 3 string.",
94-
"description": "Persons 3 string.",
95-
"operationId": "persons3",
95+
"summary": "Persons 6 string.",
96+
"description": "Persons 6 string.",
97+
"operationId": "persons6",
9698
"parameters": [
9799
{
98100
"name": "name",
@@ -119,6 +121,41 @@
119121
}
120122
}
121123
},
124+
"/persons5": {
125+
"get": {
126+
"tags": [
127+
"hello-controller"
128+
],
129+
"summary": "Persons 5 string.",
130+
"description": "Persons 5 string.",
131+
"operationId": "persons5",
132+
"parameters": [
133+
{
134+
"name": "age",
135+
"in": "query",
136+
"description": "the age",
137+
"required": true,
138+
"schema": {
139+
"maximum": 0,
140+
"type": "integer",
141+
"format": "int32"
142+
}
143+
}
144+
],
145+
"responses": {
146+
"200": {
147+
"description": "the string",
148+
"content": {
149+
"*/*": {
150+
"schema": {
151+
"type": "string"
152+
}
153+
}
154+
}
155+
}
156+
}
157+
}
158+
},
122159
"/persons4": {
123160
"get": {
124161
"tags": [
@@ -154,24 +191,23 @@
154191
}
155192
}
156193
},
157-
"/persons5": {
194+
"/persons3": {
158195
"get": {
159196
"tags": [
160197
"hello-controller"
161198
],
162-
"summary": "Persons 5 string.",
163-
"description": "Persons 5 string.",
164-
"operationId": "persons5",
199+
"summary": "Persons 3 string.",
200+
"description": "Persons 3 string.",
201+
"operationId": "persons3",
165202
"parameters": [
166203
{
167-
"name": "age",
204+
"name": "name",
168205
"in": "query",
169-
"description": "the age",
206+
"description": "persons name",
170207
"required": true,
171208
"schema": {
172-
"maximum": 0,
173-
"type": "integer",
174-
"format": "int32"
209+
"minLength": 1,
210+
"type": "string"
175211
}
176212
}
177213
],
@@ -189,14 +225,14 @@
189225
}
190226
}
191227
},
192-
"/persons6": {
228+
"/persons2": {
193229
"get": {
194230
"tags": [
195231
"hello-controller"
196232
],
197-
"summary": "Persons 6 string.",
198-
"description": "Persons 6 string.",
199-
"operationId": "persons6",
233+
"summary": "Persons 2 string.",
234+
"description": "Persons 2 string.",
235+
"operationId": "persons2",
200236
"parameters": [
201237
{
202238
"name": "name",

0 commit comments

Comments
 (0)