Skip to content

Merge requires/provides with their auto variants #851

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 9 commits into from
Jul 14, 2025
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 @@ -25,7 +25,6 @@ final class MetaDataOrdering {
private final List<DependencyLink> circularDependencies = new ArrayList<>();
private final Set<String> missingDependencyTypes = new LinkedHashSet<>();
private final Set<String> autoRequires = new TreeSet<>();
private final Set<String> autoRequiresAspects = new TreeSet<>();

MetaDataOrdering(Collection<MetaData> values, ScopeInfo scopeInfo) {
this.scopeInfo = scopeInfo;
Expand Down Expand Up @@ -224,11 +223,7 @@ private boolean dependencySatisfied(Dependency dependency, boolean includeExtern

private boolean isExternal(String dependencyName, boolean includeExternal, MetaData queuedMeta) {
if (includeExternal && externallyProvided(dependencyName)) {
if (Util.isAspectProvider(dependencyName)) {
autoRequiresAspects.add(Util.extractAspectType(dependencyName));
} else {
autoRequires.add(dependencyName);
}
autoRequires.add(dependencyName);
queuedMeta.markWithExternalDependency(dependencyName);
return true;
}
Expand All @@ -239,10 +234,6 @@ Set<String> autoRequires() {
return autoRequires;
}

Set<String> autoRequiresAspects() {
return autoRequiresAspects;
}

List<MetaData> ordered() {
return orderedList;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -474,7 +474,7 @@ private void attributeClasses(boolean leadingComma, Append writer, String prefix
writer.append("}");
}

void buildProvides(Append writer) {
void buildProvides(Append writer, Set<String> provides, Set<String> requires) {
if (!provides.isEmpty()) {
buildProvidesMethod(writer, "providesBeans", provides);
}
Expand All @@ -501,34 +501,6 @@ private void buildProvidesMethod(Append writer, String fieldName, Set<String> ty
writer.append(" }").eol().eol();
}

void buildAutoProvides(Append writer, Set<String> autoProvides) {
autoProvides.removeAll(provides);
if (!autoProvides.isEmpty()) {
buildProvidesMethod(writer, "autoProvidesBeans", autoProvides);
}
}

void buildAutoProvidesAspects(Append writer, Set<String> autoProvidesAspects) {
autoProvidesAspects.removeAll(provides);
if (!autoProvidesAspects.isEmpty()) {
buildProvidesMethod(writer, "autoProvidesAspectBeans", autoProvidesAspects);
}
}

void buildAutoRequires(Append writer, Set<String> autoRequires) {
autoRequires.removeAll(requires);
if (!autoRequires.isEmpty()) {
buildProvidesMethod(writer, "autoRequiresBeans", autoRequires);
}
}

void buildAutoRequiresAspects(Append writer, Set<String> autoRequires) {
autoRequires.removeAll(requires);
if (!autoRequires.isEmpty()) {
buildProvidesMethod(writer, "autoRequiresAspectBeans", autoRequires);
}
}

void readModuleMetaData(TypeElement moduleType) {
final InjectModulePrism module = InjectModulePrism.getInstanceOn(moduleType);
final String name = module == null ? null : module.name();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,9 @@ void write() throws IOException {
} else {
writeRequiredModules();
}
writeBuildMethod();
writeProvides();
writeClassesMethod();
writeBuildMethod();
writeBuildMethods();
writeEndClass();
writer.close();
Expand Down Expand Up @@ -188,45 +188,28 @@ private void writeServicesFile(ScopeInfo.Type scopeType) {
}

private void writeProvides() {
final Set<String> autoProvidesAspects = new TreeSet<>();
final Set<String> autoProvides = new TreeSet<>();
final Set<String> scopeProvides = new TreeSet<>(scopeInfo.provides());

if (scopeType == ScopeInfo.Type.CUSTOM) {
autoProvides.add(scopeInfo.scopeAnnotationFQN());
autoProvides.add(shortName);
scopeProvides.add(scopeInfo.scopeAnnotationFQN());
scopeProvides.add(shortName);
}

for (MetaData metaData : ordering.ordered()) {
final String aspect = metaData.providesAspect();
if (aspect != null && !aspect.isEmpty()) {
autoProvidesAspects.add(aspect);
scopeProvides.add(Util.wrapAspect(aspect));
}
final var forExternal = metaData.autoProvides();
if (forExternal != null && !forExternal.isEmpty()) {
autoProvides.addAll(forExternal);
scopeProvides.addAll(forExternal);
}
}
if (!autoProvides.isEmpty()) {
scopeInfo.buildAutoProvides(writer, autoProvides);
}
if (!autoProvidesAspects.isEmpty()) {
scopeInfo.buildAutoProvidesAspects(writer, autoProvidesAspects);
}
Set<String> autoRequires = ordering.autoRequires();
if (!autoRequires.isEmpty()) {
scopeInfo.buildAutoRequires(writer, autoRequires);
}
Set<String> autoRequiresAspects = ordering.autoRequiresAspects();
if (!autoRequiresAspects.isEmpty()) {
scopeInfo.buildAutoRequiresAspects(writer, autoRequiresAspects);
}
Set<String> scopeRequires = new TreeSet<>(scopeInfo.requires());
scopeRequires.addAll(ordering.autoRequires());
scopeInfo.buildProvides(writer, scopeProvides, scopeRequires);

var requires = new ArrayList<>(scopeInfo.requires());
var provides = new ArrayList<>(scopeInfo.provides());
requires.addAll(autoRequires);
autoRequiresAspects.stream().map(Util::wrapAspect).forEach(requires::add);
provides.addAll(autoProvides);
autoProvidesAspects.stream().map(Util::wrapAspect).forEach(provides::add);
var requires = new ArrayList<>(scopeRequires);
var provides = new ArrayList<>(scopeProvides);

ProcessingContext.addModule(new ModuleData(fullName, provides, requires));
}
Expand Down Expand Up @@ -320,7 +303,6 @@ private void writeStartClass() {
if (scopeInfo.addModuleConstructor()) {
writeConstructor();
}
scopeInfo.buildProvides(writer);
}

private void writeWithBeans() {
Expand Down