Skip to content

Replace Class.forName with Module Check and Direct Load #932

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

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Replace Class.forName with Module Check and Direct Load #932

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ee18e18
Catch NCDF instead of using `Class.forName`
SentryMan Nov 22, 2025
4fdbf79
Update DBeanScopeBuilder.java
SentryMan Nov 22, 2025
3943a75
Update DBeanScopeBuilder.java
SentryMan Nov 23, 2025
b493b6a
Update DBeanScopeBuilder.java
SentryMan Nov 23, 2025
23cc6e8
Update DBeanScopeBuilder.java
SentryMan Nov 23, 2025
064e15b
Merge branch 'master' into NCDF
SentryMan Nov 24, 2025
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
26 changes: 15 additions & 11 deletions inject/src/main/java/io/avaje/inject/DBeanScopeBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,18 @@
import java.util.function.Consumer;
import java.util.function.Supplier;

import jakarta.inject.Provider;
import org.jspecify.annotations.Nullable;

import io.avaje.applog.AppLog;
import io.avaje.config.Configuration;
import io.avaje.inject.spi.AvajeModule;
import io.avaje.inject.spi.Builder;
import io.avaje.inject.spi.ClosePair;
import io.avaje.inject.spi.ConfigPropertyPlugin;
import io.avaje.inject.spi.EnrichBean;
import io.avaje.inject.spi.ModuleOrdering;
import io.avaje.inject.spi.SuppliedBean;
import jakarta.inject.Provider;

/** Build a bean scope with options for shutdown hook and supplying test doubles. */
final class DBeanScopeBuilder implements BeanScopeBuilder.ForTesting {
Expand Down Expand Up @@ -220,16 +221,19 @@ private ConfigPropertyPlugin defaultPropertyPlugin() {
return detectAvajeConfig() ? new DConfigProps() : new DSystemProps();
}

private boolean detectAvajeConfig() {
if (ModuleLayer.boot().findModule("io.avaje.config").isPresent()) {
return true;
}
try {
Class.forName("io.avaje.config.Configuration", false, classLoader);
return true;
} catch (final ClassNotFoundException e) {
return false;
}
private static boolean detectAvajeConfig() {
var modules = ModuleLayer.boot();
return modules
.findModule("io.avaje.inject")
.map(m -> modules.findModule("io.avaje.config").isPresent())
.orElseGet(
() -> {
try {
return Configuration.class != null;
} catch (NoClassDefFoundError e) {
return false;
}
});
}

private void initProfiles() {
Expand Down