Skip to content

Commit 5f8b4bf

Browse files
committed
compiles
1 parent e7577ca commit 5f8b4bf

File tree

4 files changed

+46
-13
lines changed

4 files changed

+46
-13
lines changed

inject-generator/src/main/java/io/avaje/inject/generator/AllScopes.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
package io.avaje.inject.generator;
22

3-
import io.avaje.inject.prism.InjectModulePrism;
3+
import java.util.HashMap;
4+
import java.util.List;
5+
import java.util.Map;
46

57
import javax.annotation.processing.RoundEnvironment;
68
import javax.lang.model.element.Element;
79
import javax.lang.model.element.TypeElement;
810

11+
import io.avaje.inject.prism.InjectModulePrism;
12+
913
final class AllScopes {
1014

1115
private final Map<String, Data> scopeAnnotations = new HashMap<>();

inject-generator/src/main/java/io/avaje/inject/generator/ScopeInfo.java

Lines changed: 25 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,24 @@
11
package io.avaje.inject.generator;
22

3-
import io.avaje.inject.prism.DependencyMetaPrism;
4-
import io.avaje.inject.prism.InjectModulePrism;
3+
import java.io.IOException;
4+
import java.util.ArrayList;
5+
import java.util.Collection;
6+
import java.util.HashSet;
7+
import java.util.LinkedHashMap;
8+
import java.util.LinkedHashSet;
9+
import java.util.List;
10+
import java.util.Map;
11+
import java.util.Set;
512

613
import javax.annotation.processing.FilerException;
714
import javax.lang.model.element.Element;
815
import javax.lang.model.element.ElementKind;
916
import javax.lang.model.element.Name;
1017
import javax.lang.model.element.TypeElement;
1118
import javax.tools.JavaFileObject;
12-
import java.io.IOException;
13-
import java.util.*;
19+
20+
import io.avaje.inject.prism.DependencyMetaPrism;
21+
import io.avaje.inject.prism.InjectModulePrism;
1422

1523
final class ScopeInfo {
1624

@@ -110,13 +118,20 @@ void details(String name, Element contextElement) {
110118
}
111119

112120
private void read(Element element) {
113-
ignoreSingleton = ScopeUtil.readIgnoreSingleton(element);
114-
requires(ScopeUtil.readRequires(element));
115-
provides(ScopeUtil.readProvides(element));
116-
for (String require : ScopeUtil.readRequiresPackages(element)) {
117-
requiresPackages.add(require);
118-
requirePkg.add(Util.packageOf(require) + ".");
121+
final var injectModule = InjectModulePrism.getInstanceOn(element);
122+
if (injectModule == null) {
123+
return;
119124
}
125+
ignoreSingleton = injectModule.ignoreSingleton();
126+
injectModule.requires().stream().map(Object::toString).forEach(requires::add);
127+
injectModule.provides().stream().map(Object::toString).forEach(provides::add);
128+
injectModule.requiresPackages().stream()
129+
.map(Object::toString)
130+
.forEach(
131+
require -> {
132+
requiresPackages.add(require);
133+
requirePkg.add(Util.packageOf(require) + ".");
134+
});
120135
}
121136

122137
private String initName(String topPackage) {
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
module io.avaje.inject.generator {
22

33
requires java.compiler;
4+
requires io.avaje.inject;
45
requires io.avaje.inject.prism;
56

6-
//uses io.avaje.inject.spi.Plugin;
7-
//uses io.avaje.inject.spi.Module;
7+
uses io.avaje.inject.spi.Plugin;
8+
uses io.avaje.inject.spi.Module;
89

910
provides javax.annotation.processing.Processor with io.avaje.inject.generator.Processor;
1011
}

inject-prism/pom.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,19 @@
88
<artifactId>avaje-inject-prism</artifactId>
99
<build>
1010
<plugins>
11+
<plugin>
12+
<groupId>org.apache.maven.plugins</groupId>
13+
<artifactId>maven-javadoc-plugin</artifactId>
14+
<configuration>
15+
<skip>true</skip>
16+
</configuration>
17+
<executions>
18+
<execution>
19+
<id>attach-javadocs</id>
20+
<phase>none</phase>
21+
</execution>
22+
</executions>
23+
</plugin>
1124
<plugin>
1225
<groupId>org.apache.maven.plugins</groupId>
1326
<artifactId>maven-jar-plugin</artifactId>

0 commit comments

Comments
 (0)