Skip to content

Add Default Group #82

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.

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

Merged
merged 1 commit into from
Jul 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,6 @@ default ValidationAdapter<T> andThen(ValidationAdapter<? super T> after) {
default boolean checkGroups(Set<Class<?>> adapterGroups, ValidationRequest request) {
final var requestGroups = request.groups();

if (requestGroups.isEmpty()) return true;

for (final var group : requestGroups) {
if (adapterGroups.contains(group)) {
return true;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,14 @@
import io.avaje.validation.core.adapters.BasicAdapters;
import io.avaje.validation.core.adapters.FuturePastAdapterFactory;
import io.avaje.validation.core.adapters.NumberAdapters;
import io.avaje.validation.groups.Default;

/** Builds and caches the ValidationAdapter adapters for DValidator. */
final class CoreAdapterBuilder {
@SuppressWarnings("rawtypes")
public static final ValidationAdapter NOOP = (type, req, propertyName) -> true;

private static final Set<Class<?>> DEFAULT_GROUP = Set.of(Default.class);
private final DValidator context;
private final List<ValidationContext.AdapterFactory> factories = new ArrayList<>();
private final List<ValidationContext.AnnotationFactory> annotationFactories = new ArrayList<>();
Expand Down Expand Up @@ -55,7 +57,7 @@ <T> ValidationAdapter<T> build(Type type) {

<T> ValidationAdapter<T> annotationAdapter(
Class<? extends Annotation> cls, Map<String, Object> attributes, Set<Class<?>> groups) {
return buildAnnotation(cls, attributes,groups);
return buildAnnotation(cls, attributes, groups);
}

/** Build given type and annotations. */
Expand Down Expand Up @@ -84,11 +86,15 @@ <T> ValidationAdapter<T> buildAnnotation(
Map<String, Object> attributes,
@Nullable Set<Class<?>> groups) {

final var paramGroups =
groups != null ? groups : (Set<Class<?>>) attributes.getOrDefault("groups", Set.of());
var paramGroups =
groups != null ? groups : (Set<Class<?>>) attributes.getOrDefault("groups", DEFAULT_GROUP);

if (paramGroups.isEmpty()) {
paramGroups = DEFAULT_GROUP;
}

// Ask each factory to create the validation adapter.
for (final ValidationContext.AnnotationFactory factory : annotationFactories) {
for (final var factory : annotationFactories) {
final var result =
(ValidationAdapter<T>) factory.create(cls, context, paramGroups, attributes);
if (result != null) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,14 @@
import io.avaje.validation.ConstraintViolationException;
import io.avaje.validation.adapter.ValidationContext;
import io.avaje.validation.adapter.ValidationRequest;
import io.avaje.validation.groups.Default;

import java.util.*;

final class DRequest implements ValidationRequest {

private static final List<Class<?>> DEFAULT_GROUP = List.of(Default.class);

private final ArrayDeque<String> pathStack = new ArrayDeque<>();

private final Set<ConstraintViolation> violations = new LinkedHashSet<>();
Expand All @@ -23,7 +26,7 @@ final class DRequest implements ValidationRequest {
this.validator = validator;
this.failfast = failfast;
this.locale = locale;
this.groups = groups;
this.groups = !groups.isEmpty() ? groups : DEFAULT_GROUP;
}

private String currentPath() {
Expand Down
15 changes: 15 additions & 0 deletions validator/src/main/java/io/avaje/validation/groups/Default.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package io.avaje.validation.groups;

/**
* Default Validation group.
*
* <p>Unless a list of groups is explicitly defined:
*
* <ul>
* <li>constraints belong to the {@code Default} group
* <li>validation applies to the {@code Default} group
* </ul>
*
* Most structural constraints should belong to the default group.
*/
public interface Default {}
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ void testRecurse() {
fail("");
} catch (ConstraintViolationException e) {
Set<ConstraintViolation> violations = e.violations();
assertThat(violations).hasSize(7);
assertThat(violations).hasSize(6);
List<ConstraintViolation> asList = new ArrayList<>(violations);

var last = asList.get(violations.size() - 1);
Expand Down