|
6 | 6 | import io.avaje.inject.spi.AvajeModule;
|
7 | 7 | import io.avaje.inject.spi.InjectPlugin;
|
8 | 8 | import io.avaje.inject.spi.InjectExtension;
|
9 |
| -import io.avaje.inject.spi.Module; |
10 |
| -import io.avaje.inject.spi.Plugin; |
11 | 9 |
|
12 | 10 | import org.gradle.api.*;
|
13 | 11 |
|
@@ -124,42 +122,36 @@ private void writeModuleCSV(ClassLoader classLoader, FileWriter moduleWriter) th
|
124 | 122 | .map(Provider::get)
|
125 | 123 | .filter(AvajeModule.class::isInstance)
|
126 | 124 | .map(AvajeModule.class::cast)
|
127 |
| - .forEach( |
128 |
| - module -> { |
129 |
| - final var name = module.getClass().getTypeName(); |
130 |
| - log.info("Detected External Module: " + name); |
131 |
| - |
132 |
| - final var provides = new ArrayList<String>(); |
133 |
| - for (final var provide : module.provides()) { |
134 |
| - var type = provide.getTypeName(); |
135 |
| - provides.add(type); |
136 |
| - } |
137 |
| - |
138 |
| - for (final var provide : module.autoProvides()) { |
139 |
| - var type = provide.getTypeName(); |
140 |
| - provides.add(type); |
141 |
| - } |
142 |
| - |
143 |
| - for (final var provide : module.autoProvidesAspects()) { |
144 |
| - var type = wrapAspect(provide.getTypeName()); |
145 |
| - provides.add(type); |
146 |
| - } |
147 |
| - |
148 |
| - final var requires = |
149 |
| - Arrays.<Type>stream(module.requires()).map(Type::getTypeName).collect(toList()); |
150 |
| - |
151 |
| - Arrays.<Type>stream(module.autoRequires()) |
152 |
| - .map(Type::getTypeName) |
153 |
| - .forEach(requires::add); |
154 |
| - Arrays.<Type>stream(module.requiresPackages()) |
155 |
| - .map(Type::getTypeName) |
156 |
| - .forEach(requires::add); |
157 |
| - Arrays.<Type>stream(module.autoRequiresAspects()) |
158 |
| - .map(Type::getTypeName) |
159 |
| - .map(AutoProvidesMojo::wrapAspect) |
160 |
| - .forEach(requires::add); |
161 |
| - modules.add(new ModuleData(name, provides, requires)); |
162 |
| - }); |
| 125 | + .forEach(avajeModules::add); |
| 126 | + |
| 127 | + for (final var module : avajeModules) { |
| 128 | + final var name = module.getClass().getTypeName(); |
| 129 | + System.out.println("Detected External Module: " + name); |
| 130 | + |
| 131 | + final var provides = new ArrayList<String>(); |
| 132 | + for (final var provide : module.provides()) { |
| 133 | + var type = provide.getTypeName(); |
| 134 | + provides.add(type); |
| 135 | + } |
| 136 | + for (final var provide : module.autoProvides()) { |
| 137 | + var type = provide.getTypeName(); |
| 138 | + provides.add(type); |
| 139 | + } |
| 140 | + for (final var provide : module.autoProvidesAspects()) { |
| 141 | + var type = wrapAspect(provide.getTypeName()); |
| 142 | + provides.add(type); |
| 143 | + } |
| 144 | + |
| 145 | + final var requires = Arrays.<Type>stream(module.requires()).map(Type::getTypeName).collect(toList()); |
| 146 | + |
| 147 | + Arrays.<Type>stream(module.autoRequires()).map(Type::getTypeName).forEach(requires::add); |
| 148 | + Arrays.<Type>stream(module.requiresPackages()).map(Type::getTypeName).forEach(requires::add); |
| 149 | + Arrays.<Type>stream(module.autoRequiresAspects()) |
| 150 | + .map(Type::getTypeName) |
| 151 | + .map(AvajeInjectPlugin::wrapAspect) |
| 152 | + .forEach(requires::add); |
| 153 | + modules.add(new ModuleData(name, provides, requires)); |
| 154 | + } |
163 | 155 |
|
164 | 156 | moduleWriter.write("\nExternal Module Type|Provides|Requires");
|
165 | 157 | for (ModuleData avajeModule : modules) {
|
|
0 commit comments