Remove all overloads to ComponentBindingExpressions.getDependencyExpression; make everyone use BindingRequest.
Rename all the BindingRequest factory methods to bindingRequest. Statically import them all.
RELNOTES=n/a
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=214322005
diff --git a/java/dagger/internal/codegen/MapBindingExpression.java b/java/dagger/internal/codegen/MapBindingExpression.java
index 4884d2b..b5fe890 100644
--- a/java/dagger/internal/codegen/MapBindingExpression.java
+++ b/java/dagger/internal/codegen/MapBindingExpression.java
@@ -19,6 +19,7 @@
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.collect.Iterables.getOnlyElement;
import static dagger.internal.codegen.Accessibility.isTypeAccessibleFrom;
+import static dagger.internal.codegen.BindingRequest.bindingRequest;
import static dagger.internal.codegen.CodeBlocks.toParametersCodeBlock;
import static dagger.internal.codegen.MapKeys.getMapKeyExpression;
import static dagger.model.BindingKind.MULTIBOUND_MAP;
@@ -134,7 +135,7 @@
"$L, $L",
getMapKeyExpression(dependencies.get(dependency), requestingClass, elements),
componentBindingExpressions
- .getDependencyExpression(dependency, requestingClass)
+ .getDependencyExpression(bindingRequest(dependency), requestingClass)
.codeBlock());
}