Skip to content

Commit b78cd49

Browse files
committed
1 parent 3e08804 commit b78cd49

File tree

3 files changed

+13
-10
lines changed

3 files changed

+13
-10
lines changed

openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/writer/java/StringValuesWriter.kt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@ class StringValuesWriter(
5757
val imports = mutableSetOf(
5858
"${options.beanValidationFormat}.validation.ConstraintValidator",
5959
"${options.beanValidationFormat}.validation.ConstraintValidatorContext",
60-
"java.util.Arrays"
60+
"java.util.Arrays",
61+
"java.util.Set"
6162
)
6263
imports.addAll(generatedWriter.getImports())
6364

@@ -76,16 +77,16 @@ class StringValuesWriter(
7677

7778
target.write("""
7879
public class ValueValidator implements ConstraintValidator<Values, String> {
79-
private String[] values;
80+
private Set<String> values;
8081
8182
@Override
8283
public void initialize (Values constraintAnnotation) {
83-
values = constraintAnnotation.values();
84+
values = Set.copyOf(Arrays.asList(constraintAnnotation.values()));
8485
}
8586
8687
@Override
8788
public boolean isValid (String value, ConstraintValidatorContext context) {
88-
return value != null && Arrays.asList(values).contains(value);
89+
return value != null && values.contains(value);
8990
}
9091
}
9192

openapi-processor-core/src/testInt/resources/tests/packages/outputs/io/openapiprocessor/openapi/validation/ValueValidator.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,21 @@
22

33
import io.openapiprocessor.openapi.support.Generated;
44
import java.util.Arrays;
5+
import java.util.Set;
56
import javax.validation.ConstraintValidator;
67
import javax.validation.ConstraintValidatorContext;
78

89
@Generated(value = "openapi-processor-core", version = "test")
910
public class ValueValidator implements ConstraintValidator<Values, String> {
10-
private String[] values;
11+
private Set<String> values;
1112

1213
@Override
1314
public void initialize (Values constraintAnnotation) {
14-
values = constraintAnnotation.values();
15+
values = Set.copyOf(Arrays.asList(constraintAnnotation.values()));
1516
}
1617

1718
@Override
1819
public boolean isValid (String value, ConstraintValidatorContext context) {
19-
return value != null && Arrays.asList(values).contains(value);
20+
return value != null && values.contains(value);
2021
}
2122
}

openapi-processor-core/src/testInt/resources/tests/params-enum-string/outputs/validation/ValueValidator.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,19 @@
44
import jakarta.validation.ConstraintValidator;
55
import jakarta.validation.ConstraintValidatorContext;
66
import java.util.Arrays;
7+
import java.util.Set;
78

89
@Generated(value = "openapi-processor-core", version = "test")
910
public class ValueValidator implements ConstraintValidator<Values, String> {
10-
private String[] values;
11+
private Set<String> values;
1112

1213
@Override
1314
public void initialize (Values constraintAnnotation) {
14-
values = constraintAnnotation.values();
15+
values = Set.copyOf(Arrays.asList(constraintAnnotation.values()));
1516
}
1617

1718
@Override
1819
public boolean isValid (String value, ConstraintValidatorContext context) {
19-
return value != null && Arrays.asList(values).contains(value);
20+
return value != null && values.contains(value);
2021
}
2122
}

0 commit comments

Comments
 (0)