Skip to content

Use strings for provides/requires #835

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

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

Use strings for provides/requires #835

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
475d0ea
use strings for provides/requires
SentryMan Jun 19, 2025
8838559
allow generics in `@InjectModule`
SentryMan Jun 19, 2025
10c7ac6
gradle
SentryMan Jun 19, 2025
1cf855b
separate generics in generated annotation
SentryMan Jun 20, 2025
2944168
Merge branch 'master' into string-spi
SentryMan Jun 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
34 changes: 16 additions & 18 deletions inject-generator/src/main/java/io/avaje/inject/generator/ExternalProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@

import java.io.FileWriter;
import java.io.IOException;
import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
Expand Down Expand Up @@ -84,24 +84,22 @@ static void registerModuleProvidedTypes(Set<String> providedTypes) {
for (final var module : modules) {
final var name = module.getClass().getTypeName();
final var provides = new TreeSet<String>();
for (final var provide : module.provides()) {
provides.add(provide.getTypeName());
}
for (final var provide : module.autoProvides()) {
provides.add(provide.getTypeName());
}
for (final var provide : module.autoProvidesAspects()) {
final var aspectType = Util.wrapAspect(provide.getTypeName());
Collections.addAll(provides, module.providesBeans());
Collections.addAll(provides, module.autoProvidesBeans());
for (final var provide : module.autoProvidesAspectBeans()) {
final var aspectType = Util.wrapAspect(provide);
provides.add(aspectType);
}
registerExternalMetaData(name);
readMetaDataProvides(provides);
providedTypes.addAll(provides);
final var requires = Arrays.stream(module.requires()).map(Type::getTypeName).collect(toList());

Arrays.stream(module.autoRequires()).map(Type::getTypeName).forEach(requires::add);
Arrays.stream(module.requiresPackages()).map(Type::getTypeName).forEach(requires::add);
Arrays.stream(module.autoRequiresAspects()).map(Type::getTypeName).map(Util::wrapAspect).forEach(requires::add);
final List<String> requires = new ArrayList<>();
Collections.addAll(requires, module.requiresBeans());
Collections.addAll(requires, module.autoRequiresBeans());
Collections.addAll(requires, module.requiresPackagesFromType());
Arrays.stream(module.autoRequiresAspectBeans())
.map(Util::wrapAspect)
.forEach(requires::add);

ProcessingContext.addModule(new ModuleData(name, List.copyOf(provides), requires));
}
Expand All @@ -127,11 +125,11 @@ static void registerPluginProvidedTypes(ScopeInfo defaultScope) {
continue;
}
APContext.logNote("Loaded Plugin: %s", plugin.getClass().getTypeName());
for (final var provide : plugin.provides()) {
defaultScope.pluginProvided(provide.getTypeName());
for (final var provide : plugin.providesBeans()) {
defaultScope.pluginProvided(provide);
}
for (final var provide : plugin.providesAspects()) {
defaultScope.pluginProvided(Util.wrapAspect(provide.getTypeName()));
for (final var provide : plugin.providesAspectBeans()) {
defaultScope.pluginProvided(Util.wrapAspect(provide));
}
}
}
Expand Down
82 changes: 62 additions & 20 deletions inject-generator/src/main/java/io/avaje/inject/generator/ScopeInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,8 @@ private void read(Element element) {
ignoreSingleton = injectModule.ignoreSingleton();
injectModule.requires().stream().map(Object::toString).forEach(requires::add);
injectModule.provides().stream().map(Object::toString).forEach(provides::add);
requires.addAll(injectModule.requiresString());
provides.addAll(injectModule.providesString());
injectModule.requiresPackages().stream()
.map(Object::toString)
.forEach(
Expand Down Expand Up @@ -391,12 +393,42 @@ void buildAtInjectModule(Append writer) {
writer.append(Constants.AT_GENERATED).eol();
writer.append("@InjectModule(");
boolean leadingComma = false;
if (!provides.isEmpty()) {
List<String> regularProvides = new ArrayList<>();
List<String> genericProvides = new ArrayList<>();

for (var type : provides) {
if (type.contains("<")) {
genericProvides.add(type);
} else {
regularProvides.add(type);
}
}

if (!regularProvides.isEmpty()) {
attributeClasses(false, writer, "provides", provides);
leadingComma = true;
}
if (!requires.isEmpty()) {
attributeClasses(leadingComma, writer, "requires", requires);
if (!genericProvides.isEmpty()) {
attributeString(false, writer, "providesString", provides);
leadingComma = true;
}

List<String> regularRequires = new ArrayList<>();
List<String> genericRequires = new ArrayList<>();

for (var type : requires) {
if (type.contains("<")) {
genericRequires.add(type);
} else {
regularRequires.add(type);
}
}
if (!regularRequires.isEmpty()) {
attributeClasses(leadingComma, writer, "requires", regularRequires);
leadingComma = true;
}
if (!genericRequires.isEmpty()) {
attributeString(leadingComma, writer, "requiresString", requires);
leadingComma = true;
}
if (!requiresPackages.isEmpty()) {
Expand All @@ -412,7 +444,23 @@ void buildAtInjectModule(Append writer) {
writer.append(")").eol();
}

private void attributeClasses(boolean leadingComma, Append writer, String prefix, Set<String> classNames) {
private void attributeString(
boolean leadingComma, Append writer, String prefix, Set<String> classNames) {
if (leadingComma) {
writer.append(", ");
}
writer.append("%s = {", prefix);
int c = 0;
for (final String value : classNames) {
if (c++ > 0) {
writer.append(",");
}
writer.append("\"%s\"", value);
}
writer.append("}");
}

private void attributeClasses(boolean leadingComma, Append writer, String prefix, Collection<String> classNames) {
if (leadingComma) {
writer.append(", ");
}
Expand All @@ -429,32 +477,26 @@ private void attributeClasses(boolean leadingComma, Append writer, String prefix

void buildProvides(Append writer) {
if (!provides.isEmpty()) {
buildProvidesMethod(writer, "provides", provides);
buildProvidesMethod(writer, "providesBeans", provides);
}
if (!requires.isEmpty()) {
buildProvidesMethod(writer, "requires", requires);
buildProvidesMethod(writer, "requiresBeans", requires);
}
if (!requiresPackages.isEmpty()) {
buildProvidesMethod(writer, "requiresPackages", requiresPackages);
buildProvidesMethod(writer, "requiresPackagesFromType", requiresPackages);
}
}

private void buildProvidesMethod(Append writer, String fieldName, Set<String> types) {
writer.append(" @Override").eol();
final var arrayType = fieldName.contains("Aspects") ? "Class<?>" : "Type";
writer.append(" public %s[] %s() {", arrayType, fieldName).eol();
writer.append(" return new %s[] {", arrayType).eol();
writer.append(" public String[] %s() {", fieldName).eol();
writer.append(" return new String[] {").eol();
for (final String rawType : types) {

if (rawType.contains(":")) {
continue;
}

if (rawType.contains("<")) {
writer.append(" new GenericType<%s>(){},", rawType).eol();
} else {
writer.append(" %s.class,", rawType).eol();
}
writer.append(" \"%s\",", rawType).eol();
}
writer.append(" };").eol();
writer.append(" }").eol().eol();
Expand All @@ -463,28 +505,28 @@ private void buildProvidesMethod(Append writer, String fieldName, Set<String> ty
void buildAutoProvides(Append writer, Set<String> autoProvides) {
autoProvides.removeAll(provides);
if (!autoProvides.isEmpty()) {
buildProvidesMethod(writer, "autoProvides", autoProvides);
buildProvidesMethod(writer, "autoProvidesBeans", autoProvides);
}
}

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

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

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

Expand Down
16 changes: 13 additions & 3 deletions inject-generator/src/main/java/io/avaje/inject/generator/SimpleModuleWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,23 @@
package io.avaje.inject.generator;

import static io.avaje.inject.generator.APContext.*;
import static io.avaje.inject.generator.ProcessingContext.*;
import static io.avaje.inject.generator.APContext.logError;
import static io.avaje.inject.generator.APContext.typeElement;
import static io.avaje.inject.generator.ProcessingContext.allScopes;
import static io.avaje.inject.generator.ProcessingContext.createMetaInfWriterFor;
import static java.util.stream.Collectors.toList;
import static java.util.stream.Collectors.toSet;

import java.io.IOException;
import java.io.Writer;
import java.util.*;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeSet;
import java.util.function.Predicate;
import java.util.stream.Stream;

Expand Down
6 changes: 3 additions & 3 deletions inject-generator/src/test/java/io/avaje/inject/generator/models/valid/_Wiring.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import io.avaje.inject.Factory;
import io.avaje.inject.InjectModule;
@InjectModule(strictWiring = true)

@InjectModule(strictWiring = true, providesString = "java.util.Queue<java.util.String>")
@Factory
public class _Wiring {
}
public class _Wiring {}
27 changes: 13 additions & 14 deletions inject-gradle-plugin/src/main/java/io/avaje/inject/plugin/AvajeInjectPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,10 @@ private void writeProvidedPlugins(ClassLoader classLoader, FileWriter pluginWrit
final List<String> provides = new ArrayList<>();
final var typeName = plugin.getClass().getTypeName();
System.out.println("Loaded Plugin: " + typeName);
for (final var provide : plugin.provides()) {
provides.add(provide.getTypeName());
for (final var provide : plugin.providesBeans()) {
provides.add(provide);
}
for (final var provide : plugin.providesAspects()) {
for (final var provide : plugin.providesAspectBeans()) {
provides.add(wrapAspect(provide.getCanonicalName()));
}
pluginEntries.put(typeName, provides);
Expand Down Expand Up @@ -129,25 +129,24 @@ private void writeModuleCSV(ClassLoader classLoader, FileWriter moduleWriter) th
System.out.println("Detected External Module: " + name);

final var provides = new ArrayList<String>();
for (final var provide : module.provides()) {
var type = provide.getTypeName();
for (final var provide : module.providesBeans()) {
var type = provide;
provides.add(type);
}
for (final var provide : module.autoProvides()) {
var type = provide.getTypeName();
for (final var provide : module.autoProvidesBeans()) {
var type = provide;
provides.add(type);
}
for (final var provide : module.autoProvidesAspects()) {
var type = wrapAspect(provide.getTypeName());
for (final var provide : module.autoprovidesAspectBeans()) {
var type = wrapAspect(provide);
provides.add(type);
}

final var requires = Arrays.<Type>stream(module.requires()).map(Type::getTypeName).collect(toList());
final var requires = Arrays.stream(module.requiresBeans()).collect(toList());

Arrays.<Type>stream(module.autoRequires()).map(Type::getTypeName).forEach(requires::add);
Arrays.<Type>stream(module.requiresPackages()).map(Type::getTypeName).forEach(requires::add);
Arrays.<Type>stream(module.autoRequiresAspects())
.map(Type::getTypeName)
Arrays.stream(module.autoRequires()).forEach(requires::add);
Arrays.stream(module.requiresPackages()).forEach(requires::add);
Arrays.stream(module.autoRequiresAspects())
.map(AvajeInjectPlugin::wrapAspect)
.forEach(requires::add);
modules.add(new ModuleData(name, provides, requires));
Expand Down
Loading