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

Jump to bottom

Refactor tidy Handler registration #127

Merged
merged 1 commit into from
Aug 4, 2023
Merged

Refactor tidy Handler registration #127

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
30 changes: 14 additions & 16 deletions validator-generator/src/main/java/io/avaje/validation/generator/AnnotationUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,37 +80,31 @@ interface Handler {
private static final Map<String, Handler> handlers = new HashMap<>();
static {
final var pattern = new PatternHandler();
handlers.put("io.avaje.constraints.Pattern", pattern);
handlers.put("jakarta.validation.constraints.Pattern", pattern);
register(pattern, "Pattern");

final var decimalHandler = new DecimalHandler();
handlers.put("io.avaje.validation.constraints.DecimalMax", decimalHandler);
handlers.put("io.avaje.validation.constraints.DecimalMin", decimalHandler);
handlers.put("jakarta.validation.constraints.DecimalMax", decimalHandler);
handlers.put("jakarta.validation.constraints.DecimalMin", decimalHandler);
for (String key : List.of("DecimalMax", "DecimalMin")) {
register(decimalHandler, key);
}

final var numberHandler = new TypeCheckingHandler(new HandlerMeta(NUMBER_TYPES, "non-numeric", false));
for (final String key : NUMBER_TYPE_ONLY_ANNOTATIONS) {
handlers.put("io.avaje.validation.constraints." + key, numberHandler);
handlers.put("jakarta.validation.constraints." + key, numberHandler);
register(numberHandler, key);
}

final var booleanHandler = new TypeCheckingHandler(new HandlerMeta(Set.of("Boolean"), "non-boolean", true));
for (final String key : BOOLEAN_TYPE_ONLY_ANNOTATIONS) {
handlers.put("io.avaje.validation.constraints." + key, booleanHandler);
handlers.put("jakarta.validation.constraints." + key, booleanHandler);
register(booleanHandler, key);
}

final var temporalHandler = new TypeCheckingHandler(new TemporalMeta());
for (final String key : TEMPORAL_ONLY_ANNOTATIONS) {
handlers.put("io.avaje.validation.constraints." + key, temporalHandler);
handlers.put("jakarta.validation.constraints." + key, temporalHandler);
register(temporalHandler, key);
}

final var stringOnlyHandler = new TypeCheckingHandler(new HandlerMeta(Set.of("String", "CharSequence"), "non-string", true));
for (final String key : STRING_TYPE_ONLY_ANNOTATIONS) {
handlers.put("io.avaje.validation.constraints." + key, stringOnlyHandler);
handlers.put("jakarta.validation.constraints." + key, stringOnlyHandler);
register(stringOnlyHandler, key);
}

final var commonHandler = new CommonHandler();
Expand All @@ -126,11 +120,15 @@ interface Handler {
"UUID",
};
for (final String key : keys) {
handlers.put("io.avaje.validation.constraints." + key, commonHandler);
handlers.put("jakarta.validation.constraints." + key, commonHandler);
register(commonHandler, key);
}
}

private static void register(Handler handler, String key) {
handlers.put("io.avaje.validation.constraints." + key, handler);
handlers.put("jakarta.validation.constraints." + key, handler);
}

static String lookupType(TypeMirror typeMirror) {
String rawType = trimAnnotations(typeMirror.toString());
final String val = KNOWN_TYPES.get(rawType);
Expand Down