Skip to content

Commit 6667b22

Browse files
authored
register generic supertype (#836)
1 parent a952c9b commit 6667b22

File tree

3 files changed

+17
-7
lines changed

3 files changed

+17
-7
lines changed

blackbox-test-inject/src/main/java/org/example/myapp/generic/MyUseGenericDependencies.java

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,28 @@
11
package org.example.myapp.generic;
22

3-
import jakarta.inject.Singleton;
4-
3+
import java.util.List;
54
import java.util.Map;
65
import java.util.function.BiConsumer;
76

7+
import jakarta.inject.Singleton;
8+
89
@Singleton
910
class MyUseGenericDependencies {
1011

1112
private final Aldrich<String, String> aldrich;
1213
private final Map<String, MyConsumer> genericMap;
1314
private final BiConsumer<MyA, MyB> biConsumer;
15+
private final List<Generic<?>> genList;
1416

15-
MyUseGenericDependencies(Aldrich<String, String> aldrich,
16-
Map<String, MyConsumer> genericMap,
17-
BiConsumer<MyA, MyB> biConsumer) {
17+
MyUseGenericDependencies(
18+
Aldrich<String, String> aldrich,
19+
Map<String, MyConsumer> genericMap,
20+
BiConsumer<MyA, MyB> biConsumer,
21+
List<Generic<?>> genList) {
1822
this.aldrich = aldrich;
1923
this.genericMap = genericMap;
2024
this.biConsumer = biConsumer;
25+
this.genList = genList;
2126
}
2227

2328
Aldrich<String, String> getAldrich() {
@@ -31,4 +36,8 @@ Map<String, MyConsumer> getGenericMap() {
3136
BiConsumer<MyA, MyB> getBiConsumer() {
3237
return biConsumer;
3338
}
39+
40+
public List<Generic<?>> getGenList() {
41+
return genList;
42+
}
3443
}

blackbox-test-inject/src/test/java/org/example/myapp/generic/GenericFactoryTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,7 @@ void test() {
2121
assertThat(others.getAldrich()).isNotNull();
2222
assertThat(others.getGenericMap()).isNotNull();
2323
assertThat(others.getBiConsumer()).isNotNull();
24+
assertThat(others.getGenList()).hasSize(2);
25+
assertThat(others.getGenList()).contains(stringy, intymcintface);
2426
}
2527
}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,8 @@ void add(UType utype) {
2424
var type = Util.unwrapProvider(utype);
2525
if (isAddGenericType(type)) {
2626
addUType(type);
27-
} else {
28-
addSimpleType(type.mainType());
2927
}
28+
addSimpleType(type.mainType());
3029
}
3130

3231
private static boolean isAddGenericType(UType type) {

0 commit comments

Comments
 (0)