Skip to content

Remove hard dependency on inject aop #236

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 2 commits into from
Jul 12, 2024
Merged
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
1 change: 1 addition & 0 deletions blackbox-test/src/main/java/module-info.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
@io.avaje.inject.InjectModule(name="GeneratedModule")
module blackbox.test {

requires io.avaje.inject.aop;
requires io.avaje.validation.http;
requires io.avaje.validation.contraints;
requires jakarta.validation;
Original file line number Diff line number Diff line change
@@ -19,20 +19,33 @@
/** Plugin for avaje inject that provides a default Validator instance. */
public final class DefaultValidatorProvider implements InjectPlugin {

private static final boolean WIRE_ASPECTS = aspectsOnClasspath();

private static boolean aspectsOnClasspath() {
try {
Class.forName("io.avaje.inject.aop.Aspect");
return true;
} catch (ClassNotFoundException e) {
return false;
}
}

@Override
public Class<?>[] provides() {
return new Class<?>[] {Validator.class};
}

@Override
public Class<?>[] providesAspects() {
return new Class<?>[] {ValidMethod.class};
return WIRE_ASPECTS ? new Class<?>[] {ValidMethod.class} : new Class<?>[] {};
}

@Override
public void apply(BeanScopeBuilder builder) {
validator(builder);
paramAspect(builder);
if (WIRE_ASPECTS) {
paramAspect(builder);
}
}

private void validator(BeanScopeBuilder builder) {
2 changes: 1 addition & 1 deletion validator-inject-plugin/src/main/java/module-info.java
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

requires transitive io.avaje.validation;
requires transitive io.avaje.inject;
requires transitive io.avaje.inject.aop;
requires io.avaje.inject.aop;

provides io.avaje.inject.spi.InjectExtension with io.avaje.validation.inject.spi.DefaultValidatorProvider;
}
Loading