Skip to content

Commit 46e053b

Browse files
committed
#145 - Missing full qualifier on private fields in module classes
1 parent 4924f7d commit 46e053b

File tree

6 files changed

+14
-7
lines changed

6 files changed

+14
-7
lines changed

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -401,18 +401,23 @@ boolean providesDependency(String dependency) {
401401
return false;
402402
}
403403

404-
boolean addModuleConstructor() {
404+
Set<String> initModuleDependencies(Set<String> importTypes) {
405405
if (defaultScope || requires.isEmpty()) {
406-
return false;
406+
return importTypes;
407407
}
408408
for (String require : requires) {
409409
final ScopeInfo otherScope = scopes.get(require);
410410
if (otherScope == null) {
411+
importTypes.add(require);
411412
final String type = Util.shortName(require);
412413
final String var = Util.initLower(type);
413414
constructorDependencies.put(type, var);
414415
}
415416
}
417+
return importTypes;
418+
}
419+
420+
boolean addModuleConstructor() {
416421
return !constructorDependencies.isEmpty();
417422
}
418423

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ private void writePackage() {
114114
for (String type : factoryImportTypes()) {
115115
writer.append("import %s;", type).eol();
116116
}
117-
for (String type : ordering.getImportTypes()) {
117+
for (String type : scopeInfo.initModuleDependencies(ordering.getImportTypes())) {
118118
if (Util.validImportType(type)) {
119119
writer.append("import %s;", type).eol();
120120
}
@@ -156,14 +156,14 @@ private void writeStartClass() {
156156

157157
private void writeWithBeans() {
158158
writer.append(" // register external dependencies").eol();
159-
final Map<String,String> dependencies = scopeInfo.constructorDependencies();
159+
final Map<String, String> dependencies = scopeInfo.constructorDependencies();
160160
for (Map.Entry<String, String> entry : dependencies.entrySet()) {
161161
writer.append(" builder.withBean(%s.class, %s);", entry.getKey(), entry.getValue()).eol();
162162
}
163163
}
164164

165165
private void writeConstructor() {
166-
final Map<String,String> dependencies = scopeInfo.constructorDependencies();
166+
final Map<String, String> dependencies = scopeInfo.constructorDependencies();
167167
for (Map.Entry<String, String> entry : dependencies.entrySet()) {
168168
writer.append(" private %s %s;", entry.getKey(), entry.getValue()).eol();
169169
}

inject-test/src/test/java/org/example/MyCustomScope.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import io.avaje.inject.InjectModule;
44
import jakarta.inject.Scope;
5-
import org.example.custom.LocalExternal;
5+
import org.example.custom.loc.LocalExternal;
66

77
@Scope
88
@InjectModule(requires = {LocalExternal.class})

inject-test/src/test/java/org/example/custom/CustomScopeTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import io.avaje.inject.BeanScope;
55
import org.example.MyCustomScope;
66
import org.example.coffee.CoffeeMaker;
7+
import org.example.custom.loc.LocalExternal;
78
import org.junit.jupiter.api.Test;
89
import org.mockito.Mockito;
910

inject-test/src/test/java/org/example/custom/FooCustom.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import org.example.MyCustomScope;
44
import org.example.coffee.CoffeeMaker;
5+
import org.example.custom.loc.LocalExternal;
56

67
@MyCustomScope
78
public class FooCustom {
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.example.custom;
1+
package org.example.custom.loc;
22

33
public interface LocalExternal {
44
}

0 commit comments

Comments
 (0)