Skip to content

Commit 4fbc045

Browse files
bcorsoDagger Team
authored andcommitted
Fix an issue where subcomponent factory method fails when defined with type parameters.
This CL updates `BindingGraph.factoryMethodRequirements()` to explicitly resolve the factory method's parameters against the parent component's concrete type using `asMemberOf(parentType)` to properly handle cases where a component might inherit from a generic interface. For example, ``` @component interface Parent extends SubcomponentProvider<Child, ChildModule> {} interface SubcomponentProvider<C, M> { C createSubcomponent(M module); } ``` Previously, the compiler failed to resolve the parameter `M` to the concrete `ChildModule` type which leads to the following error: ``` java.lang.IllegalArgumentException at plugin.apt.turbine//com.google.common.base.Preconditions.checkArgument(Preconditions.java:136) at plugin.apt.turbine//dagger.internal.codegen.binding.ComponentRequirement.forModule(ComponentRequirement.java:190) at plugin.apt.turbine//dagger.internal.codegen.binding.BindingGraph.lambda$factoryMethodRequirements$0(BindingGraph.java:450) ``` RELNOTES=N/A PiperOrigin-RevId: 972676784
1 parent b7edb67 commit 4fbc045

3 files changed

Lines changed: 138 additions & 2 deletions

File tree

‎dagger-compiler/main/java/dagger/internal/codegen/binding/BindingGraph.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@
2727
importstaticdagger.internal.codegen.extension.DaggerStreams.toImmutableSet;
2828

2929
importandroidx.room3.compiler.processing.XExecutableElement;
30+
importandroidx.room3.compiler.processing.XExecutableType;
3031
importandroidx.room3.compiler.processing.XMethodElement;
32+
importandroidx.room3.compiler.processing.XType;
3133
importandroidx.room3.compiler.processing.XTypeElement;
3234
importcom.google.auto.value.AutoValue;
3335
importcom.google.auto.value.extension.memoized.Memoized;
@@ -409,8 +411,10 @@ public final Optional<XMethodElement> factoryMethod() {
409411
*/
410412
// TODO(dpb): Consider disallowing modules if none of their bindings are used.
411413
publicfinalImmutableSet<ComponentRequirement> factoryMethodRequirements() {
412-
returnfactoryMethod().get().getParameters().stream()
413-
.map(parameter -> ComponentRequirement.forModule(parameter.getType()))
414+
XTypeparentType = componentPath().parentComponent().xprocessing().getType();
415+
XExecutableTyperesolvedFactoryMethod = factoryMethod().get().asMemberOf(parentType);
416+
returnresolvedFactoryMethod.getParameterTypes().stream()
417+
.map(ComponentRequirement::forModule)
414418
.collect(toImmutableSet());
415419
}
416420

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
/*
2+
* Copyright (C) 2026 The Dagger Authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
packagedagger.functional.kotlinsrc.subcomponent
18+
19+
importcom.google.common.truth.Truth.assertThat
20+
importdagger.Component
21+
importdagger.Module
22+
importdagger.Provides
23+
importdagger.Subcomponent
24+
importorg.junit.Test
25+
importorg.junit.runner.RunWith
26+
importorg.junit.runners.JUnit4
27+
28+
/** Tests for subcomponent factory methods defined on generic supertypes. */
29+
@RunWith(JUnit4::class)
30+
classGenericSubcomponentFactoryMethodTest {
31+
@Component(modules = [ParentModule::class])
32+
internalinterfaceParent : SubcomponentProvider<Child, ChildModule> {}
33+
34+
@Module
35+
internalclassParentModule {
36+
@Provides funprovideInt(): Int=42
37+
}
38+
39+
@Subcomponent(modules = [ChildModule::class])
40+
internalinterfaceChild {
41+
funstring(): String
42+
}
43+
44+
@Module
45+
internalclassChildModule(vals:String) {
46+
@Provides funprovideString(i:Int): String= s + i
47+
}
48+
49+
interfaceSubcomponentProvider<C, M> {
50+
funcreateSubcomponent(module:M): C
51+
}
52+
53+
@Test
54+
funfactoryMethod_genericSupertype() {
55+
val parent:Parent=DaggerGenericSubcomponentFactoryMethodTest_Parent.create()
56+
val child:Child= parent.createSubcomponent(ChildModule("hello "))
57+
assertThat(child.string()).isEqualTo("hello 42")
58+
}
59+
}
Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
/*
2+
* Copyright (C) 2026 The Dagger Authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
packagedagger.functional.subcomponent;
18+
19+
importstaticcom.google.common.truth.Truth.assertThat;
20+
21+
importdagger.Component;
22+
importdagger.Module;
23+
importdagger.Provides;
24+
importdagger.Subcomponent;
25+
importorg.junit.Test;
26+
importorg.junit.runner.RunWith;
27+
importorg.junit.runners.JUnit4;
28+
29+
/** Tests for subcomponent factory methods defined on generic supertypes. */
30+
@RunWith(JUnit4.class)
31+
publicfinalclassGenericSubcomponentFactoryMethodTest {
32+
33+
@Component(modules = ParentModule.class)
34+
interfaceParentextendsSubcomponentProvider<Child, ChildModule> {}
35+
36+
@Module
37+
staticclassParentModule {
38+
@Provides
39+
intprovideInt() {
40+
return42;
41+
}
42+
}
43+
44+
@Subcomponent(modules = ChildModule.class)
45+
interfaceChild {
46+
Stringstring();
47+
}
48+
49+
@Module
50+
staticclassChildModule {
51+
finalStrings;
52+
53+
ChildModule(Strings) {
54+
this.s = s;
55+
}
56+
57+
@Provides
58+
StringprovideString(inti) {
59+
returns + i;
60+
}
61+
}
62+
63+
publicinterfaceSubcomponentProvider<C, M> {
64+
CcreateSubcomponent(Mmodule);
65+
}
66+
67+
@Test
68+
publicvoidfactoryMethod_genericSupertype() {
69+
Parentparent = DaggerGenericSubcomponentFactoryMethodTest_Parent.create();
70+
Childchild = parent.createSubcomponent(newChildModule("hello "));
71+
assertThat(child.string()).isEqualTo("hello 42");
72+
}
73+
}

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Fix an issue where subcomponent factory method fails when defined wit… · google/dagger@4fbc045 · GitHub
Skip to content

Commit 4fbc045

Browse files
bcorsoDagger Team
authored andcommitted
Fix an issue where subcomponent factory method fails when defined with type parameters.
This CL updates `BindingGraph.factoryMethodRequirements()` to explicitly resolve the factory method's parameters against the parent component's concrete type using `asMemberOf(parentType)` to properly handle cases where a component might inherit from a generic interface. For example, ``` @component interface Parent extends SubcomponentProvider<Child, ChildModule> {} interface SubcomponentProvider<C, M> { C createSubcomponent(M module); } ``` Previously, the compiler failed to resolve the parameter `M` to the concrete `ChildModule` type which leads to the following error: ``` java.lang.IllegalArgumentException at plugin.apt.turbine//com.google.common.base.Preconditions.checkArgument(Preconditions.java:136) at plugin.apt.turbine//dagger.internal.codegen.binding.ComponentRequirement.forModule(ComponentRequirement.java:190) at plugin.apt.turbine//dagger.internal.codegen.binding.BindingGraph.lambda$factoryMethodRequirements$0(BindingGraph.java:450) ``` RELNOTES=N/A PiperOrigin-RevId: 972676784
1 parent b7edb67 commit 4fbc045

3 files changed

Lines changed: 138 additions & 2 deletions

File tree

‎dagger-compiler/main/java/dagger/internal/codegen/binding/BindingGraph.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@
2727
importstaticdagger.internal.codegen.extension.DaggerStreams.toImmutableSet;
2828

2929
importandroidx.room3.compiler.processing.XExecutableElement;
30+
importandroidx.room3.compiler.processing.XExecutableType;
3031
importandroidx.room3.compiler.processing.XMethodElement;
32+
importandroidx.room3.compiler.processing.XType;
3133
importandroidx.room3.compiler.processing.XTypeElement;
3234
importcom.google.auto.value.AutoValue;
3335
importcom.google.auto.value.extension.memoized.Memoized;
@@ -409,8 +411,10 @@ public final Optional<XMethodElement> factoryMethod() {
409411
*/
410412
// TODO(dpb): Consider disallowing modules if none of their bindings are used.
411413
publicfinalImmutableSet<ComponentRequirement> factoryMethodRequirements() {
412-
returnfactoryMethod().get().getParameters().stream()
413-
.map(parameter -> ComponentRequirement.forModule(parameter.getType()))
414+
XTypeparentType = componentPath().parentComponent().xprocessing().getType();
415+
XExecutableTyperesolvedFactoryMethod = factoryMethod().get().asMemberOf(parentType);
416+
returnresolvedFactoryMethod.getParameterTypes().stream()
417+
.map(ComponentRequirement::forModule)
414418
.collect(toImmutableSet());
415419
}
416420

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
/*
2+
* Copyright (C) 2026 The Dagger Authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
packagedagger.functional.kotlinsrc.subcomponent
18+
19+
importcom.google.common.truth.Truth.assertThat
20+
importdagger.Component
21+
importdagger.Module
22+
importdagger.Provides
23+
importdagger.Subcomponent
24+
importorg.junit.Test
25+
importorg.junit.runner.RunWith
26+
importorg.junit.runners.JUnit4
27+
28+
/** Tests for subcomponent factory methods defined on generic supertypes. */
29+
@RunWith(JUnit4::class)
30+
classGenericSubcomponentFactoryMethodTest {
31+
@Component(modules = [ParentModule::class])
32+
internalinterfaceParent : SubcomponentProvider<Child, ChildModule> {}
33+
34+
@Module
35+
internalclassParentModule {
36+
@Provides funprovideInt(): Int=42
37+
}
38+
39+
@Subcomponent(modules = [ChildModule::class])
40+
internalinterfaceChild {
41+
funstring(): String
42+
}
43+
44+
@Module
45+
internalclassChildModule(vals:String) {
46+
@Provides funprovideString(i:Int): String= s + i
47+
}
48+
49+
interfaceSubcomponentProvider<C, M> {
50+
funcreateSubcomponent(module:M): C
51+
}
52+
53+
@Test
54+
funfactoryMethod_genericSupertype() {
55+
val parent:Parent=DaggerGenericSubcomponentFactoryMethodTest_Parent.create()
56+
val child:Child= parent.createSubcomponent(ChildModule("hello "))
57+
assertThat(child.string()).isEqualTo("hello 42")
58+
}
59+
}
Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
/*
2+
* Copyright (C) 2026 The Dagger Authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
packagedagger.functional.subcomponent;
18+
19+
importstaticcom.google.common.truth.Truth.assertThat;
20+
21+
importdagger.Component;
22+
importdagger.Module;
23+
importdagger.Provides;
24+
importdagger.Subcomponent;
25+
importorg.junit.Test;
26+
importorg.junit.runner.RunWith;
27+
importorg.junit.runners.JUnit4;
28+
29+
/** Tests for subcomponent factory methods defined on generic supertypes. */
30+
@RunWith(JUnit4.class)
31+
publicfinalclassGenericSubcomponentFactoryMethodTest {
32+
33+
@Component(modules = ParentModule.class)
34+
interfaceParentextendsSubcomponentProvider<Child, ChildModule> {}
35+
36+
@Module
37+
staticclassParentModule {
38+
@Provides
39+
intprovideInt() {
40+
return42;
41+
}
42+
}
43+
44+
@Subcomponent(modules = ChildModule.class)
45+
interfaceChild {
46+
Stringstring();
47+
}
48+
49+
@Module
50+
staticclassChildModule {
51+
finalStrings;
52+
53+
ChildModule(Strings) {
54+
this.s = s;
55+
}
56+
57+
@Provides
58+
StringprovideString(inti) {
59+
returns + i;
60+
}
61+
}
62+
63+
publicinterfaceSubcomponentProvider<C, M> {
64+
CcreateSubcomponent(Mmodule);
65+
}
66+
67+
@Test
68+
publicvoidfactoryMethod_genericSupertype() {
69+
Parentparent = DaggerGenericSubcomponentFactoryMethodTest_Parent.create();
70+
Childchild = parent.createSubcomponent(newChildModule("hello "));
71+
assertThat(child.string()).isEqualTo("hello 42");
72+
}
73+
}

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Fix an issue where subcomponent factory method fails when defined wit… · google/dagger@4fbc045 · GitHub
Skip to content

Commit 4fbc045

Browse files
bcorsoDagger Team
authored andcommitted
Fix an issue where subcomponent factory method fails when defined with type parameters.
This CL updates `BindingGraph.factoryMethodRequirements()` to explicitly resolve the factory method's parameters against the parent component's concrete type using `asMemberOf(parentType)` to properly handle cases where a component might inherit from a generic interface. For example, ``` @component interface Parent extends SubcomponentProvider<Child, ChildModule> {} interface SubcomponentProvider<C, M> { C createSubcomponent(M module); } ``` Previously, the compiler failed to resolve the parameter `M` to the concrete `ChildModule` type which leads to the following error: ``` java.lang.IllegalArgumentException at plugin.apt.turbine//com.google.common.base.Preconditions.checkArgument(Preconditions.java:136) at plugin.apt.turbine//dagger.internal.codegen.binding.ComponentRequirement.forModule(ComponentRequirement.java:190) at plugin.apt.turbine//dagger.internal.codegen.binding.BindingGraph.lambda$factoryMethodRequirements$0(BindingGraph.java:450) ``` RELNOTES=N/A PiperOrigin-RevId: 972676784
1 parent b7edb67 commit 4fbc045

3 files changed

Lines changed: 138 additions & 2 deletions

File tree

‎dagger-compiler/main/java/dagger/internal/codegen/binding/BindingGraph.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@
2727
importstaticdagger.internal.codegen.extension.DaggerStreams.toImmutableSet;
2828

2929
importandroidx.room3.compiler.processing.XExecutableElement;
30+
importandroidx.room3.compiler.processing.XExecutableType;
3031
importandroidx.room3.compiler.processing.XMethodElement;
32+
importandroidx.room3.compiler.processing.XType;
3133
importandroidx.room3.compiler.processing.XTypeElement;
3234
importcom.google.auto.value.AutoValue;
3335
importcom.google.auto.value.extension.memoized.Memoized;
@@ -409,8 +411,10 @@ public final Optional<XMethodElement> factoryMethod() {
409411
*/
410412
// TODO(dpb): Consider disallowing modules if none of their bindings are used.
411413
publicfinalImmutableSet<ComponentRequirement> factoryMethodRequirements() {
412-
returnfactoryMethod().get().getParameters().stream()
413-
.map(parameter -> ComponentRequirement.forModule(parameter.getType()))
414+
XTypeparentType = componentPath().parentComponent().xprocessing().getType();
415+
XExecutableTyperesolvedFactoryMethod = factoryMethod().get().asMemberOf(parentType);
416+
returnresolvedFactoryMethod.getParameterTypes().stream()
417+
.map(ComponentRequirement::forModule)
414418
.collect(toImmutableSet());
415419
}
416420

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
/*
2+
* Copyright (C) 2026 The Dagger Authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
packagedagger.functional.kotlinsrc.subcomponent
18+
19+
importcom.google.common.truth.Truth.assertThat
20+
importdagger.Component
21+
importdagger.Module
22+
importdagger.Provides
23+
importdagger.Subcomponent
24+
importorg.junit.Test
25+
importorg.junit.runner.RunWith
26+
importorg.junit.runners.JUnit4
27+
28+
/** Tests for subcomponent factory methods defined on generic supertypes. */
29+
@RunWith(JUnit4::class)
30+
classGenericSubcomponentFactoryMethodTest {
31+
@Component(modules = [ParentModule::class])
32+
internalinterfaceParent : SubcomponentProvider<Child, ChildModule> {}
33+
34+
@Module
35+
internalclassParentModule {
36+
@Provides funprovideInt(): Int=42
37+
}
38+
39+
@Subcomponent(modules = [ChildModule::class])
40+
internalinterfaceChild {
41+
funstring(): String
42+
}
43+
44+
@Module
45+
internalclassChildModule(vals:String) {
46+
@Provides funprovideString(i:Int): String= s + i
47+
}
48+
49+
interfaceSubcomponentProvider<C, M> {
50+
funcreateSubcomponent(module:M): C
51+
}
52+
53+
@Test
54+
funfactoryMethod_genericSupertype() {
55+
val parent:Parent=DaggerGenericSubcomponentFactoryMethodTest_Parent.create()
56+
val child:Child= parent.createSubcomponent(ChildModule("hello "))
57+
assertThat(child.string()).isEqualTo("hello 42")
58+
}
59+
}
Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
/*
2+
* Copyright (C) 2026 The Dagger Authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
packagedagger.functional.subcomponent;
18+
19+
importstaticcom.google.common.truth.Truth.assertThat;
20+
21+
importdagger.Component;
22+
importdagger.Module;
23+
importdagger.Provides;
24+
importdagger.Subcomponent;
25+
importorg.junit.Test;
26+
importorg.junit.runner.RunWith;
27+
importorg.junit.runners.JUnit4;
28+
29+
/** Tests for subcomponent factory methods defined on generic supertypes. */
30+
@RunWith(JUnit4.class)
31+
publicfinalclassGenericSubcomponentFactoryMethodTest {
32+
33+
@Component(modules = ParentModule.class)
34+
interfaceParentextendsSubcomponentProvider<Child, ChildModule> {}
35+
36+
@Module
37+
staticclassParentModule {
38+
@Provides
39+
intprovideInt() {
40+
return42;
41+
}
42+
}
43+
44+
@Subcomponent(modules = ChildModule.class)
45+
interfaceChild {
46+
Stringstring();
47+
}
48+
49+
@Module
50+
staticclassChildModule {
51+
finalStrings;
52+
53+
ChildModule(Strings) {
54+
this.s = s;
55+
}
56+
57+
@Provides
58+
StringprovideString(inti) {
59+
returns + i;
60+
}
61+
}
62+
63+
publicinterfaceSubcomponentProvider<C, M> {
64+
CcreateSubcomponent(Mmodule);
65+
}
66+
67+
@Test
68+
publicvoidfactoryMethod_genericSupertype() {
69+
Parentparent = DaggerGenericSubcomponentFactoryMethodTest_Parent.create();
70+
Childchild = parent.createSubcomponent(newChildModule("hello "));
71+
assertThat(child.string()).isEqualTo("hello 42");
72+
}
73+
}

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Fix an issue where subcomponent factory method fails when defined wit… · google/dagger@4fbc045 · GitHub
Skip to content

Commit 4fbc045

Browse files
bcorsoDagger Team
authored andcommitted
Fix an issue where subcomponent factory method fails when defined with type parameters.
This CL updates `BindingGraph.factoryMethodRequirements()` to explicitly resolve the factory method's parameters against the parent component's concrete type using `asMemberOf(parentType)` to properly handle cases where a component might inherit from a generic interface. For example, ``` @component interface Parent extends SubcomponentProvider<Child, ChildModule> {} interface SubcomponentProvider<C, M> { C createSubcomponent(M module); } ``` Previously, the compiler failed to resolve the parameter `M` to the concrete `ChildModule` type which leads to the following error: ``` java.lang.IllegalArgumentException at plugin.apt.turbine//com.google.common.base.Preconditions.checkArgument(Preconditions.java:136) at plugin.apt.turbine//dagger.internal.codegen.binding.ComponentRequirement.forModule(ComponentRequirement.java:190) at plugin.apt.turbine//dagger.internal.codegen.binding.BindingGraph.lambda$factoryMethodRequirements$0(BindingGraph.java:450) ``` RELNOTES=N/A PiperOrigin-RevId: 972676784
1 parent b7edb67 commit 4fbc045

3 files changed

Lines changed: 138 additions & 2 deletions

File tree

‎dagger-compiler/main/java/dagger/internal/codegen/binding/BindingGraph.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@
2727
importstaticdagger.internal.codegen.extension.DaggerStreams.toImmutableSet;
2828

2929
importandroidx.room3.compiler.processing.XExecutableElement;
30+
importandroidx.room3.compiler.processing.XExecutableType;
3031
importandroidx.room3.compiler.processing.XMethodElement;
32+
importandroidx.room3.compiler.processing.XType;
3133
importandroidx.room3.compiler.processing.XTypeElement;
3234
importcom.google.auto.value.AutoValue;
3335
importcom.google.auto.value.extension.memoized.Memoized;
@@ -409,8 +411,10 @@ public final Optional<XMethodElement> factoryMethod() {
409411
*/
410412
// TODO(dpb): Consider disallowing modules if none of their bindings are used.
411413
publicfinalImmutableSet<ComponentRequirement> factoryMethodRequirements() {
412-
returnfactoryMethod().get().getParameters().stream()
413-
.map(parameter -> ComponentRequirement.forModule(parameter.getType()))
414+
XTypeparentType = componentPath().parentComponent().xprocessing().getType();
415+
XExecutableTyperesolvedFactoryMethod = factoryMethod().get().asMemberOf(parentType);
416+
returnresolvedFactoryMethod.getParameterTypes().stream()
417+
.map(ComponentRequirement::forModule)
414418
.collect(toImmutableSet());
415419
}
416420

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
/*
2+
* Copyright (C) 2026 The Dagger Authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
packagedagger.functional.kotlinsrc.subcomponent
18+
19+
importcom.google.common.truth.Truth.assertThat
20+
importdagger.Component
21+
importdagger.Module
22+
importdagger.Provides
23+
importdagger.Subcomponent
24+
importorg.junit.Test
25+
importorg.junit.runner.RunWith
26+
importorg.junit.runners.JUnit4
27+
28+
/** Tests for subcomponent factory methods defined on generic supertypes. */
29+
@RunWith(JUnit4::class)
30+
classGenericSubcomponentFactoryMethodTest {
31+
@Component(modules = [ParentModule::class])
32+
internalinterfaceParent : SubcomponentProvider<Child, ChildModule> {}
33+
34+
@Module
35+
internalclassParentModule {
36+
@Provides funprovideInt(): Int=42
37+
}
38+
39+
@Subcomponent(modules = [ChildModule::class])
40+
internalinterfaceChild {
41+
funstring(): String
42+
}
43+
44+
@Module
45+
internalclassChildModule(vals:String) {
46+
@Provides funprovideString(i:Int): String= s + i
47+
}
48+
49+
interfaceSubcomponentProvider<C, M> {
50+
funcreateSubcomponent(module:M): C
51+
}
52+
53+
@Test
54+
funfactoryMethod_genericSupertype() {
55+
val parent:Parent=DaggerGenericSubcomponentFactoryMethodTest_Parent.create()
56+
val child:Child= parent.createSubcomponent(ChildModule("hello "))
57+
assertThat(child.string()).isEqualTo("hello 42")
58+
}
59+
}
Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
/*
2+
* Copyright (C) 2026 The Dagger Authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
packagedagger.functional.subcomponent;
18+
19+
importstaticcom.google.common.truth.Truth.assertThat;
20+
21+
importdagger.Component;
22+
importdagger.Module;
23+
importdagger.Provides;
24+
importdagger.Subcomponent;
25+
importorg.junit.Test;
26+
importorg.junit.runner.RunWith;
27+
importorg.junit.runners.JUnit4;
28+
29+
/** Tests for subcomponent factory methods defined on generic supertypes. */
30+
@RunWith(JUnit4.class)
31+
publicfinalclassGenericSubcomponentFactoryMethodTest {
32+
33+
@Component(modules = ParentModule.class)
34+
interfaceParentextendsSubcomponentProvider<Child, ChildModule> {}
35+
36+
@Module
37+
staticclassParentModule {
38+
@Provides
39+
intprovideInt() {
40+
return42;
41+
}
42+
}
43+
44+
@Subcomponent(modules = ChildModule.class)
45+
interfaceChild {
46+
Stringstring();
47+
}
48+
49+
@Module
50+
staticclassChildModule {
51+
finalStrings;
52+
53+
ChildModule(Strings) {
54+
this.s = s;
55+
}
56+
57+
@Provides
58+
StringprovideString(inti) {
59+
returns + i;
60+
}
61+
}
62+
63+
publicinterfaceSubcomponentProvider<C, M> {
64+
CcreateSubcomponent(Mmodule);
65+
}
66+
67+
@Test
68+
publicvoidfactoryMethod_genericSupertype() {
69+
Parentparent = DaggerGenericSubcomponentFactoryMethodTest_Parent.create();
70+
Childchild = parent.createSubcomponent(newChildModule("hello "));
71+
assertThat(child.string()).isEqualTo("hello 42");
72+
}
73+
}

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' Fix an issue where subcomponent factory method fails when defined wit… · google/dagger@4fbc045 · GitHub
Skip to content

Commit 4fbc045

Browse files
bcorsoDagger Team
authored andcommitted
Fix an issue where subcomponent factory method fails when defined with type parameters.
This CL updates `BindingGraph.factoryMethodRequirements()` to explicitly resolve the factory method's parameters against the parent component's concrete type using `asMemberOf(parentType)` to properly handle cases where a component might inherit from a generic interface. For example, ``` @component interface Parent extends SubcomponentProvider<Child, ChildModule> {} interface SubcomponentProvider<C, M> { C createSubcomponent(M module); } ``` Previously, the compiler failed to resolve the parameter `M` to the concrete `ChildModule` type which leads to the following error: ``` java.lang.IllegalArgumentException at plugin.apt.turbine//com.google.common.base.Preconditions.checkArgument(Preconditions.java:136) at plugin.apt.turbine//dagger.internal.codegen.binding.ComponentRequirement.forModule(ComponentRequirement.java:190) at plugin.apt.turbine//dagger.internal.codegen.binding.BindingGraph.lambda$factoryMethodRequirements$0(BindingGraph.java:450) ``` RELNOTES=N/A PiperOrigin-RevId: 972676784
1 parent b7edb67 commit 4fbc045

3 files changed

Lines changed: 138 additions & 2 deletions

File tree

‎dagger-compiler/main/java/dagger/internal/codegen/binding/BindingGraph.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@
2727
importstaticdagger.internal.codegen.extension.DaggerStreams.toImmutableSet;
2828

2929
importandroidx.room3.compiler.processing.XExecutableElement;
30+
importandroidx.room3.compiler.processing.XExecutableType;
3031
importandroidx.room3.compiler.processing.XMethodElement;
32+
importandroidx.room3.compiler.processing.XType;
3133
importandroidx.room3.compiler.processing.XTypeElement;
3234
importcom.google.auto.value.AutoValue;
3335
importcom.google.auto.value.extension.memoized.Memoized;
@@ -409,8 +411,10 @@ public final Optional<XMethodElement> factoryMethod() {
409411
*/
410412
// TODO(dpb): Consider disallowing modules if none of their bindings are used.
411413
publicfinalImmutableSet<ComponentRequirement> factoryMethodRequirements() {
412-
returnfactoryMethod().get().getParameters().stream()
413-
.map(parameter -> ComponentRequirement.forModule(parameter.getType()))
414+
XTypeparentType = componentPath().parentComponent().xprocessing().getType();
415+
XExecutableTyperesolvedFactoryMethod = factoryMethod().get().asMemberOf(parentType);
416+
returnresolvedFactoryMethod.getParameterTypes().stream()
417+
.map(ComponentRequirement::forModule)
414418
.collect(toImmutableSet());
415419
}
416420

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
/*
2+
* Copyright (C) 2026 The Dagger Authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
packagedagger.functional.kotlinsrc.subcomponent
18+
19+
importcom.google.common.truth.Truth.assertThat
20+
importdagger.Component
21+
importdagger.Module
22+
importdagger.Provides
23+
importdagger.Subcomponent
24+
importorg.junit.Test
25+
importorg.junit.runner.RunWith
26+
importorg.junit.runners.JUnit4
27+
28+
/** Tests for subcomponent factory methods defined on generic supertypes. */
29+
@RunWith(JUnit4::class)
30+
classGenericSubcomponentFactoryMethodTest {
31+
@Component(modules = [ParentModule::class])
32+
internalinterfaceParent : SubcomponentProvider<Child, ChildModule> {}
33+
34+
@Module
35+
internalclassParentModule {
36+
@Provides funprovideInt(): Int=42
37+
}
38+
39+
@Subcomponent(modules = [ChildModule::class])
40+
internalinterfaceChild {
41+
funstring(): String
42+
}
43+
44+
@Module
45+
internalclassChildModule(vals:String) {
46+
@Provides funprovideString(i:Int): String= s + i
47+
}
48+
49+
interfaceSubcomponentProvider<C, M> {
50+
funcreateSubcomponent(module:M): C
51+
}
52+
53+
@Test
54+
funfactoryMethod_genericSupertype() {
55+
val parent:Parent=DaggerGenericSubcomponentFactoryMethodTest_Parent.create()
56+
val child:Child= parent.createSubcomponent(ChildModule("hello "))
57+
assertThat(child.string()).isEqualTo("hello 42")
58+
}
59+
}
Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
/*
2+
* Copyright (C) 2026 The Dagger Authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
packagedagger.functional.subcomponent;
18+
19+
importstaticcom.google.common.truth.Truth.assertThat;
20+
21+
importdagger.Component;
22+
importdagger.Module;
23+
importdagger.Provides;
24+
importdagger.Subcomponent;
25+
importorg.junit.Test;
26+
importorg.junit.runner.RunWith;
27+
importorg.junit.runners.JUnit4;
28+
29+
/** Tests for subcomponent factory methods defined on generic supertypes. */
30+
@RunWith(JUnit4.class)
31+
publicfinalclassGenericSubcomponentFactoryMethodTest {
32+
33+
@Component(modules = ParentModule.class)
34+
interfaceParentextendsSubcomponentProvider<Child, ChildModule> {}
35+
36+
@Module
37+
staticclassParentModule {
38+
@Provides
39+
intprovideInt() {
40+
return42;
41+
}
42+
}
43+
44+
@Subcomponent(modules = ChildModule.class)
45+
interfaceChild {
46+
Stringstring();
47+
}
48+
49+
@Module
50+
staticclassChildModule {
51+
finalStrings;
52+
53+
ChildModule(Strings) {
54+
this.s = s;
55+
}
56+
57+
@Provides
58+
StringprovideString(inti) {
59+
returns + i;
60+
}
61+
}
62+
63+
publicinterfaceSubcomponentProvider<C, M> {
64+
CcreateSubcomponent(Mmodule);
65+
}
66+
67+
@Test
68+
publicvoidfactoryMethod_genericSupertype() {
69+
Parentparent = DaggerGenericSubcomponentFactoryMethodTest_Parent.create();
70+
Childchild = parent.createSubcomponent(newChildModule("hello "));
71+
assertThat(child.string()).isEqualTo("hello 42");
72+
}
73+
}

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Fix an issue where subcomponent factory method fails when defined wit… · google/dagger@4fbc045 · GitHub
Skip to content

Commit 4fbc045

Browse files
bcorsoDagger Team
authored andcommitted
Fix an issue where subcomponent factory method fails when defined with type parameters.
This CL updates `BindingGraph.factoryMethodRequirements()` to explicitly resolve the factory method's parameters against the parent component's concrete type using `asMemberOf(parentType)` to properly handle cases where a component might inherit from a generic interface. For example, ``` @component interface Parent extends SubcomponentProvider<Child, ChildModule> {} interface SubcomponentProvider<C, M> { C createSubcomponent(M module); } ``` Previously, the compiler failed to resolve the parameter `M` to the concrete `ChildModule` type which leads to the following error: ``` java.lang.IllegalArgumentException at plugin.apt.turbine//com.google.common.base.Preconditions.checkArgument(Preconditions.java:136) at plugin.apt.turbine//dagger.internal.codegen.binding.ComponentRequirement.forModule(ComponentRequirement.java:190) at plugin.apt.turbine//dagger.internal.codegen.binding.BindingGraph.lambda$factoryMethodRequirements$0(BindingGraph.java:450) ``` RELNOTES=N/A PiperOrigin-RevId: 972676784
1 parent b7edb67 commit 4fbc045

3 files changed

Lines changed: 138 additions & 2 deletions

File tree

‎dagger-compiler/main/java/dagger/internal/codegen/binding/BindingGraph.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@
2727
importstaticdagger.internal.codegen.extension.DaggerStreams.toImmutableSet;
2828

2929
importandroidx.room3.compiler.processing.XExecutableElement;
30+
importandroidx.room3.compiler.processing.XExecutableType;
3031
importandroidx.room3.compiler.processing.XMethodElement;
32+
importandroidx.room3.compiler.processing.XType;
3133
importandroidx.room3.compiler.processing.XTypeElement;
3234
importcom.google.auto.value.AutoValue;
3335
importcom.google.auto.value.extension.memoized.Memoized;
@@ -409,8 +411,10 @@ public final Optional<XMethodElement> factoryMethod() {
409411
*/
410412
// TODO(dpb): Consider disallowing modules if none of their bindings are used.
411413
publicfinalImmutableSet<ComponentRequirement> factoryMethodRequirements() {
412-
returnfactoryMethod().get().getParameters().stream()
413-
.map(parameter -> ComponentRequirement.forModule(parameter.getType()))
414+
XTypeparentType = componentPath().parentComponent().xprocessing().getType();
415+
XExecutableTyperesolvedFactoryMethod = factoryMethod().get().asMemberOf(parentType);
416+
returnresolvedFactoryMethod.getParameterTypes().stream()
417+
.map(ComponentRequirement::forModule)
414418
.collect(toImmutableSet());
415419
}
416420

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
/*
2+
* Copyright (C) 2026 The Dagger Authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
packagedagger.functional.kotlinsrc.subcomponent
18+
19+
importcom.google.common.truth.Truth.assertThat
20+
importdagger.Component
21+
importdagger.Module
22+
importdagger.Provides
23+
importdagger.Subcomponent
24+
importorg.junit.Test
25+
importorg.junit.runner.RunWith
26+
importorg.junit.runners.JUnit4
27+
28+
/** Tests for subcomponent factory methods defined on generic supertypes. */
29+
@RunWith(JUnit4::class)
30+
classGenericSubcomponentFactoryMethodTest {
31+
@Component(modules = [ParentModule::class])
32+
internalinterfaceParent : SubcomponentProvider<Child, ChildModule> {}
33+
34+
@Module
35+
internalclassParentModule {
36+
@Provides funprovideInt(): Int=42
37+
}
38+
39+
@Subcomponent(modules = [ChildModule::class])
40+
internalinterfaceChild {
41+
funstring(): String
42+
}
43+
44+
@Module
45+
internalclassChildModule(vals:String) {
46+
@Provides funprovideString(i:Int): String= s + i
47+
}
48+
49+
interfaceSubcomponentProvider<C, M> {
50+
funcreateSubcomponent(module:M): C
51+
}
52+
53+
@Test
54+
funfactoryMethod_genericSupertype() {
55+
val parent:Parent=DaggerGenericSubcomponentFactoryMethodTest_Parent.create()
56+
val child:Child= parent.createSubcomponent(ChildModule("hello "))
57+
assertThat(child.string()).isEqualTo("hello 42")
58+
}
59+
}
Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
/*
2+
* Copyright (C) 2026 The Dagger Authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
packagedagger.functional.subcomponent;
18+
19+
importstaticcom.google.common.truth.Truth.assertThat;
20+
21+
importdagger.Component;
22+
importdagger.Module;
23+
importdagger.Provides;
24+
importdagger.Subcomponent;
25+
importorg.junit.Test;
26+
importorg.junit.runner.RunWith;
27+
importorg.junit.runners.JUnit4;
28+
29+
/** Tests for subcomponent factory methods defined on generic supertypes. */
30+
@RunWith(JUnit4.class)
31+
publicfinalclassGenericSubcomponentFactoryMethodTest {
32+
33+
@Component(modules = ParentModule.class)
34+
interfaceParentextendsSubcomponentProvider<Child, ChildModule> {}
35+
36+
@Module
37+
staticclassParentModule {
38+
@Provides
39+
intprovideInt() {
40+
return42;
41+
}
42+
}
43+
44+
@Subcomponent(modules = ChildModule.class)
45+
interfaceChild {
46+
Stringstring();
47+
}
48+
49+
@Module
50+
staticclassChildModule {
51+
finalStrings;
52+
53+
ChildModule(Strings) {
54+
this.s = s;
55+
}
56+
57+
@Provides
58+
StringprovideString(inti) {
59+
returns + i;
60+
}
61+
}
62+
63+
publicinterfaceSubcomponentProvider<C, M> {
64+
CcreateSubcomponent(Mmodule);
65+
}
66+
67+
@Test
68+
publicvoidfactoryMethod_genericSupertype() {
69+
Parentparent = DaggerGenericSubcomponentFactoryMethodTest_Parent.create();
70+
Childchild = parent.createSubcomponent(newChildModule("hello "));
71+
assertThat(child.string()).isEqualTo("hello 42");
72+
}
73+
}

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Fix an issue where subcomponent factory method fails when defined wit… · google/dagger@4fbc045 · GitHub
Skip to content

Commit 4fbc045

Browse files
bcorsoDagger Team
authored andcommitted
Fix an issue where subcomponent factory method fails when defined with type parameters.
This CL updates `BindingGraph.factoryMethodRequirements()` to explicitly resolve the factory method's parameters against the parent component's concrete type using `asMemberOf(parentType)` to properly handle cases where a component might inherit from a generic interface. For example, ``` @component interface Parent extends SubcomponentProvider<Child, ChildModule> {} interface SubcomponentProvider<C, M> { C createSubcomponent(M module); } ``` Previously, the compiler failed to resolve the parameter `M` to the concrete `ChildModule` type which leads to the following error: ``` java.lang.IllegalArgumentException at plugin.apt.turbine//com.google.common.base.Preconditions.checkArgument(Preconditions.java:136) at plugin.apt.turbine//dagger.internal.codegen.binding.ComponentRequirement.forModule(ComponentRequirement.java:190) at plugin.apt.turbine//dagger.internal.codegen.binding.BindingGraph.lambda$factoryMethodRequirements$0(BindingGraph.java:450) ``` RELNOTES=N/A PiperOrigin-RevId: 972676784
1 parent b7edb67 commit 4fbc045

3 files changed

Lines changed: 138 additions & 2 deletions

File tree

‎dagger-compiler/main/java/dagger/internal/codegen/binding/BindingGraph.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@
2727
importstaticdagger.internal.codegen.extension.DaggerStreams.toImmutableSet;
2828

2929
importandroidx.room3.compiler.processing.XExecutableElement;
30+
importandroidx.room3.compiler.processing.XExecutableType;
3031
importandroidx.room3.compiler.processing.XMethodElement;
32+
importandroidx.room3.compiler.processing.XType;
3133
importandroidx.room3.compiler.processing.XTypeElement;
3234
importcom.google.auto.value.AutoValue;
3335
importcom.google.auto.value.extension.memoized.Memoized;
@@ -409,8 +411,10 @@ public final Optional<XMethodElement> factoryMethod() {
409411
*/
410412
// TODO(dpb): Consider disallowing modules if none of their bindings are used.
411413
publicfinalImmutableSet<ComponentRequirement> factoryMethodRequirements() {
412-
returnfactoryMethod().get().getParameters().stream()
413-
.map(parameter -> ComponentRequirement.forModule(parameter.getType()))
414+
XTypeparentType = componentPath().parentComponent().xprocessing().getType();
415+
XExecutableTyperesolvedFactoryMethod = factoryMethod().get().asMemberOf(parentType);
416+
returnresolvedFactoryMethod.getParameterTypes().stream()
417+
.map(ComponentRequirement::forModule)
414418
.collect(toImmutableSet());
415419
}
416420

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
/*
2+
* Copyright (C) 2026 The Dagger Authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
packagedagger.functional.kotlinsrc.subcomponent
18+
19+
importcom.google.common.truth.Truth.assertThat
20+
importdagger.Component
21+
importdagger.Module
22+
importdagger.Provides
23+
importdagger.Subcomponent
24+
importorg.junit.Test
25+
importorg.junit.runner.RunWith
26+
importorg.junit.runners.JUnit4
27+
28+
/** Tests for subcomponent factory methods defined on generic supertypes. */
29+
@RunWith(JUnit4::class)
30+
classGenericSubcomponentFactoryMethodTest {
31+
@Component(modules = [ParentModule::class])
32+
internalinterfaceParent : SubcomponentProvider<Child, ChildModule> {}
33+
34+
@Module
35+
internalclassParentModule {
36+
@Provides funprovideInt(): Int=42
37+
}
38+
39+
@Subcomponent(modules = [ChildModule::class])
40+
internalinterfaceChild {
41+
funstring(): String
42+
}
43+
44+
@Module
45+
internalclassChildModule(vals:String) {
46+
@Provides funprovideString(i:Int): String= s + i
47+
}
48+
49+
interfaceSubcomponentProvider<C, M> {
50+
funcreateSubcomponent(module:M): C
51+
}
52+
53+
@Test
54+
funfactoryMethod_genericSupertype() {
55+
val parent:Parent=DaggerGenericSubcomponentFactoryMethodTest_Parent.create()
56+
val child:Child= parent.createSubcomponent(ChildModule("hello "))
57+
assertThat(child.string()).isEqualTo("hello 42")
58+
}
59+
}
Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
/*
2+
* Copyright (C) 2026 The Dagger Authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
packagedagger.functional.subcomponent;
18+
19+
importstaticcom.google.common.truth.Truth.assertThat;
20+
21+
importdagger.Component;
22+
importdagger.Module;
23+
importdagger.Provides;
24+
importdagger.Subcomponent;
25+
importorg.junit.Test;
26+
importorg.junit.runner.RunWith;
27+
importorg.junit.runners.JUnit4;
28+
29+
/** Tests for subcomponent factory methods defined on generic supertypes. */
30+
@RunWith(JUnit4.class)
31+
publicfinalclassGenericSubcomponentFactoryMethodTest {
32+
33+
@Component(modules = ParentModule.class)
34+
interfaceParentextendsSubcomponentProvider<Child, ChildModule> {}
35+
36+
@Module
37+
staticclassParentModule {
38+
@Provides
39+
intprovideInt() {
40+
return42;
41+
}
42+
}
43+
44+
@Subcomponent(modules = ChildModule.class)
45+
interfaceChild {
46+
Stringstring();
47+
}
48+
49+
@Module
50+
staticclassChildModule {
51+
finalStrings;
52+
53+
ChildModule(Strings) {
54+
this.s = s;
55+
}
56+
57+
@Provides
58+
StringprovideString(inti) {
59+
returns + i;
60+
}
61+
}
62+
63+
publicinterfaceSubcomponentProvider<C, M> {
64+
CcreateSubcomponent(Mmodule);
65+
}
66+
67+
@Test
68+
publicvoidfactoryMethod_genericSupertype() {
69+
Parentparent = DaggerGenericSubcomponentFactoryMethodTest_Parent.create();
70+
Childchild = parent.createSubcomponent(newChildModule("hello "));
71+
assertThat(child.string()).isEqualTo("hello 42");
72+
}
73+
}

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); Fix an issue where subcomponent factory method fails when defined wit… · google/dagger@4fbc045 · GitHub
Skip to content

Commit 4fbc045

Browse files
bcorsoDagger Team
authored andcommitted
Fix an issue where subcomponent factory method fails when defined with type parameters.
This CL updates `BindingGraph.factoryMethodRequirements()` to explicitly resolve the factory method's parameters against the parent component's concrete type using `asMemberOf(parentType)` to properly handle cases where a component might inherit from a generic interface. For example, ``` @component interface Parent extends SubcomponentProvider<Child, ChildModule> {} interface SubcomponentProvider<C, M> { C createSubcomponent(M module); } ``` Previously, the compiler failed to resolve the parameter `M` to the concrete `ChildModule` type which leads to the following error: ``` java.lang.IllegalArgumentException at plugin.apt.turbine//com.google.common.base.Preconditions.checkArgument(Preconditions.java:136) at plugin.apt.turbine//dagger.internal.codegen.binding.ComponentRequirement.forModule(ComponentRequirement.java:190) at plugin.apt.turbine//dagger.internal.codegen.binding.BindingGraph.lambda$factoryMethodRequirements$0(BindingGraph.java:450) ``` RELNOTES=N/A PiperOrigin-RevId: 972676784
1 parent b7edb67 commit 4fbc045

3 files changed

Lines changed: 138 additions & 2 deletions

File tree

‎dagger-compiler/main/java/dagger/internal/codegen/binding/BindingGraph.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@
2727
importstaticdagger.internal.codegen.extension.DaggerStreams.toImmutableSet;
2828

2929
importandroidx.room3.compiler.processing.XExecutableElement;
30+
importandroidx.room3.compiler.processing.XExecutableType;
3031
importandroidx.room3.compiler.processing.XMethodElement;
32+
importandroidx.room3.compiler.processing.XType;
3133
importandroidx.room3.compiler.processing.XTypeElement;
3234
importcom.google.auto.value.AutoValue;
3335
importcom.google.auto.value.extension.memoized.Memoized;
@@ -409,8 +411,10 @@ public final Optional<XMethodElement> factoryMethod() {
409411
*/
410412
// TODO(dpb): Consider disallowing modules if none of their bindings are used.
411413
publicfinalImmutableSet<ComponentRequirement> factoryMethodRequirements() {
412-
returnfactoryMethod().get().getParameters().stream()
413-
.map(parameter -> ComponentRequirement.forModule(parameter.getType()))
414+
XTypeparentType = componentPath().parentComponent().xprocessing().getType();
415+
XExecutableTyperesolvedFactoryMethod = factoryMethod().get().asMemberOf(parentType);
416+
returnresolvedFactoryMethod.getParameterTypes().stream()
417+
.map(ComponentRequirement::forModule)
414418
.collect(toImmutableSet());
415419
}
416420

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
/*
2+
* Copyright (C) 2026 The Dagger Authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
packagedagger.functional.kotlinsrc.subcomponent
18+
19+
importcom.google.common.truth.Truth.assertThat
20+
importdagger.Component
21+
importdagger.Module
22+
importdagger.Provides
23+
importdagger.Subcomponent
24+
importorg.junit.Test
25+
importorg.junit.runner.RunWith
26+
importorg.junit.runners.JUnit4
27+
28+
/** Tests for subcomponent factory methods defined on generic supertypes. */
29+
@RunWith(JUnit4::class)
30+
classGenericSubcomponentFactoryMethodTest {
31+
@Component(modules = [ParentModule::class])
32+
internalinterfaceParent : SubcomponentProvider<Child, ChildModule> {}
33+
34+
@Module
35+
internalclassParentModule {
36+
@Provides funprovideInt(): Int=42
37+
}
38+
39+
@Subcomponent(modules = [ChildModule::class])
40+
internalinterfaceChild {
41+
funstring(): String
42+
}
43+
44+
@Module
45+
internalclassChildModule(vals:String) {
46+
@Provides funprovideString(i:Int): String= s + i
47+
}
48+
49+
interfaceSubcomponentProvider<C, M> {
50+
funcreateSubcomponent(module:M): C
51+
}
52+
53+
@Test
54+
funfactoryMethod_genericSupertype() {
55+
val parent:Parent=DaggerGenericSubcomponentFactoryMethodTest_Parent.create()
56+
val child:Child= parent.createSubcomponent(ChildModule("hello "))
57+
assertThat(child.string()).isEqualTo("hello 42")
58+
}
59+
}
Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
/*
2+
* Copyright (C) 2026 The Dagger Authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
packagedagger.functional.subcomponent;
18+
19+
importstaticcom.google.common.truth.Truth.assertThat;
20+
21+
importdagger.Component;
22+
importdagger.Module;
23+
importdagger.Provides;
24+
importdagger.Subcomponent;
25+
importorg.junit.Test;
26+
importorg.junit.runner.RunWith;
27+
importorg.junit.runners.JUnit4;
28+
29+
/** Tests for subcomponent factory methods defined on generic supertypes. */
30+
@RunWith(JUnit4.class)
31+
publicfinalclassGenericSubcomponentFactoryMethodTest {
32+
33+
@Component(modules = ParentModule.class)
34+
interfaceParentextendsSubcomponentProvider<Child, ChildModule> {}
35+
36+
@Module
37+
staticclassParentModule {
38+
@Provides
39+
intprovideInt() {
40+
return42;
41+
}
42+
}
43+
44+
@Subcomponent(modules = ChildModule.class)
45+
interfaceChild {
46+
Stringstring();
47+
}
48+
49+
@Module
50+
staticclassChildModule {
51+
finalStrings;
52+
53+
ChildModule(Strings) {
54+
this.s = s;
55+
}
56+
57+
@Provides
58+
StringprovideString(inti) {
59+
returns + i;
60+
}
61+
}
62+
63+
publicinterfaceSubcomponentProvider<C, M> {
64+
CcreateSubcomponent(Mmodule);
65+
}
66+
67+
@Test
68+
publicvoidfactoryMethod_genericSupertype() {
69+
Parentparent = DaggerGenericSubcomponentFactoryMethodTest_Parent.create();
70+
Childchild = parent.createSubcomponent(newChildModule("hello "));
71+
assertThat(child.string()).isEqualTo("hello 42");
72+
}
73+
}

0 commit comments

Comments
 (0)