Skip to content

Commit 7e959f5

Browse files
author
springdoc
committed
project update
1 parent 55f484d commit 7e959f5

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,10 @@ public abstract class AbstractRequestBuilder {
2424
private final AbstractParameterBuilder parameterBuilder;
2525
private final RequestBodyBuilder requestBodyBuilder;
2626
private final OperationBuilder operationBuilder;
27-
private static final String[] ANNOTATIONS_FOR_REQUIRED = {NotNull.class.getName(), NotBlank.class.getName(), NotEmpty.class.getName()};
27+
// using string litterals to support both validation-api v1 and v2
28+
private static final String[] ANNOTATIONS_FOR_REQUIRED = {NotNull.class.getName(), "javax.validation.constraints.NotBlank", "javax.validation.constraints.NotEmpty"};
29+
private static final String POSITIVE_OR_ZERO = "javax.validation.constraints.PositiveOrZero";
30+
private static final String NEGATIVE_OR_ZERO= "javax.validation.constraints.NegativeOrZero";
2831

2932
protected AbstractRequestBuilder(AbstractParameterBuilder parameterBuilder, RequestBodyBuilder requestBodyBuilder,
3033
OperationBuilder operationBuilder) {
@@ -243,10 +246,10 @@ private void applyBeanValidatorAnnotations(final Parameter parameter, final List
243246
schema.setExclusiveMaximum(!max.inclusive());
244247
}
245248
}
246-
if (annos.containsKey(PositiveOrZero.class.getName())) {
249+
if (annos.containsKey(POSITIVE_OR_ZERO)) {
247250
schema.setMinimum(BigDecimal.ZERO);
248251
}
249-
if (annos.containsKey(NegativeOrZero .class.getName())) {
252+
if (annos.containsKey(NEGATIVE_OR_ZERO)) {
250253
schema.setMaximum(BigDecimal.ZERO);
251254
}
252255
if (annos.containsKey(Pattern.class.getName())) {

0 commit comments

Comments
 (0)