Fix b/116268009 -- qualify switching binding requests that request component methods.
RELNOTES=Fixes bug in fast init (b/116268009).
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=215797111
diff --git a/java/dagger/internal/codegen/InnerSwitchingProviders.java b/java/dagger/internal/codegen/InnerSwitchingProviders.java
index 388d315..c4e968d 100644
--- a/java/dagger/internal/codegen/InnerSwitchingProviders.java
+++ b/java/dagger/internal/codegen/InnerSwitchingProviders.java
@@ -88,17 +88,17 @@
}
@Override
- public Expression getProviderExpression(ClassName switchType, int switchId) {
+ public Expression getProviderExpression(ClassName switchingProviderClass, int switchId) {
TypeMirror instanceType = types.accessibleType(binding.contributedType(), requestingClass);
return Expression.create(
types.wrapType(instanceType, Provider.class),
- CodeBlock.of("new $T<>($L)", switchType, switchId));
+ CodeBlock.of("new $T<>($L)", switchingProviderClass, switchId));
}
@Override
- public Expression getReturnExpression() {
+ public Expression getReturnExpression(ClassName switchingProviderClass) {
return componentBindingExpressions.getDependencyExpression(
- bindingRequest(binding.key(), INSTANCE), requestingClass);
+ bindingRequest(binding.key(), INSTANCE), switchingProviderClass);
}
}
}