Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Validations for Collections in Maps. #786

Merged
merged 1 commit into from
Jul 15, 2022
+41 −5
Merged

Validations for Collections in Maps. #786

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 30 additions & 1 deletion validator/src/main/java/io/smallrye/config/validator/BeanValidationConfigValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,35 @@ default void validateProperty(
throw new UndeclaredThrowableException(t2);
}
}
} else if (mapProperty.getValueProperty().isCollection()) {
try {
CollectionProperty collectionProperty = mapProperty.getValueProperty().asCollection();
if (collectionProperty.getElement().isGroup()) {
Map<?, ?> map = (Map<?, ?>) property.getMethod().invoke(mappingObject);
for (Map.Entry<?, ?> entry : map.entrySet()) {
Collection<?> elements = (Collection<?>) entry.getValue();
int i = 0;
for (Object element : elements) {
validateMappingInterface(collectionProperty.getElement().asGroup().getGroupType(),
appendPropertyName(currentPath, property) + "." + entry.getKey() + "[" + i + "]",
namingStrategy, element, problems);
i++;
}
}
} else if (collectionProperty.getElement().isLeaf()) {
validatePropertyValue(property, currentPath, namingStrategy, mappingObject, problems);
}
} catch (IllegalAccessException e) {
throw new IllegalAccessError(e.getMessage());
} catch (InvocationTargetException e) {
try {
throw e.getCause();
} catch (RuntimeException | Error e2) {
throw e2;
} catch (Throwable t2) {
throw new UndeclaredThrowableException(t2);
}
}
} else if (mapProperty.getValueProperty().isLeaf()) {
validatePropertyValue(property, currentPath, namingStrategy, mappingObject, problems);
}
Expand Down Expand Up @@ -224,6 +253,6 @@ default String interpolateMessage(
}
}
}
return propertyName.toString() + " " + violation.getMessage();
return propertyName + " " + violation.getMessage();
}
}
15 changes: 11 additions & 4 deletions validator/src/test/java/io/smallrye/config/validator/ValidateConfigTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,10 @@ void validateConfigMapping() {
"server.info.name", "Bond",
"server.info.code", "007",
"server.info.alias[0]", "James",
"server.info.admins.root.username", "root"))
"server.info.admins.root[0].username", "root",
"server.info.admins.root[1].username", "admin",
"server.info.firewall.accepted[0]", "127.0.0.1",
"server.info.firewall.accepted[1]", "8.8.8"))
.withMapping(Server.class, "server")
.build();

Expand All @@ -57,6 +60,7 @@ void validateConfigMapping() {
for (int i = 0; i < validationException.getProblemCount(); i++) {
validations.add(validationException.getProblem(i).getMessage());
}
assertEquals(14, validations.size());
assertTrue(validations.contains("server.port must be less than or equal to 10"));
assertTrue(validations.contains("server.log.days must be less than or equal to 15"));
assertTrue(validations.contains("server.proxy.timeout must be less than or equal to 10"));
Expand All @@ -69,7 +73,8 @@ void validateConfigMapping() {
assertTrue(validations.contains("server.info.name size must be between 0 and 3"));
assertTrue(validations.contains("server.info.code must be less than or equal to 3"));
assertTrue(validations.contains("server.info.alias[0] size must be between 0 and 3"));
assertTrue(validations.contains("server.info.admins.root.username size must be between 0 and 3"));
assertTrue(validations.contains("server.info.admins.root[1].username size must be between 0 and 4"));
assertTrue(validations.contains("server.info.firewall.accepted[1] size must be between 8 and 15"));
}

@Test
Expand Down Expand Up @@ -173,10 +178,12 @@ interface Info {

Optional<List<@Size(max = 3) String>> alias();

Map<String, Admin> admins();
Map<String, List<Admin>> admins();

Map<String, List<@Size(min = 8, max = 15) String>> firewall();

interface Admin {
@Size(max = 3)
@Size(max = 4)
String username();
}
}
Expand Down