Rename GeneratedComponentModel to ComponentImplementation.
Rename ComponentModelBuilder to ComponentImplementationBuilder.
Use "supercomponent implementation" instead of "supermodel".
Use "child component" or "child" instead of "subcomponent" when referring to the child of a parent.
RELNOTES=n/a
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=219694916
diff --git a/java/dagger/internal/codegen/MembersInjectionMethods.java b/java/dagger/internal/codegen/MembersInjectionMethods.java
index 36108cf..34c6179 100644
--- a/java/dagger/internal/codegen/MembersInjectionMethods.java
+++ b/java/dagger/internal/codegen/MembersInjectionMethods.java
@@ -19,7 +19,7 @@
import static com.google.common.base.Preconditions.checkNotNull;
import static com.squareup.javapoet.MethodSpec.methodBuilder;
import static dagger.internal.codegen.Accessibility.isTypeAccessibleFrom;
-import static dagger.internal.codegen.GeneratedComponentModel.MethodSpecKind.MEMBERS_INJECTION_METHOD;
+import static dagger.internal.codegen.ComponentImplementation.MethodSpecKind.MEMBERS_INJECTION_METHOD;
import static dagger.internal.codegen.Util.reentrantComputeIfAbsent;
import static javax.lang.model.element.Modifier.PRIVATE;
@@ -41,19 +41,19 @@
/** Manages the member injection methods for a component. */
final class MembersInjectionMethods {
private final Map<Key, MethodSpec> membersInjectionMethods = new LinkedHashMap<>();
- private final GeneratedComponentModel generatedComponentModel;
+ private final ComponentImplementation componentImplementation;
private final ComponentBindingExpressions bindingExpressions;
private final BindingGraph graph;
private final DaggerElements elements;
private final DaggerTypes types;
MembersInjectionMethods(
- GeneratedComponentModel generatedComponentModel,
+ ComponentImplementation componentImplementation,
ComponentBindingExpressions bindingExpressions,
BindingGraph graph,
DaggerElements elements,
DaggerTypes types) {
- this.generatedComponentModel = checkNotNull(generatedComponentModel);
+ this.componentImplementation = checkNotNull(componentImplementation);
this.bindingExpressions = checkNotNull(bindingExpressions);
this.graph = checkNotNull(graph);
this.elements = checkNotNull(elements);
@@ -74,14 +74,14 @@
Binding binding = resolvedBindings.binding();
TypeMirror keyType = binding.key().type();
TypeMirror membersInjectedType =
- isTypeAccessibleFrom(keyType, generatedComponentModel.name().packageName())
+ isTypeAccessibleFrom(keyType, componentImplementation.name().packageName())
? keyType
: elements.getTypeElement(Object.class).asType();
TypeName membersInjectedTypeName = TypeName.get(membersInjectedType);
Name bindingTypeName = binding.bindingTypeElement().get().getSimpleName();
// TODO(ronshapiro): include type parameters in this name e.g. injectFooOfT, and outer class
// simple names Foo.Builder -> injectFooBuilder
- String methodName = generatedComponentModel.getUniqueMethodName("inject" + bindingTypeName);
+ String methodName = componentImplementation.getUniqueMethodName("inject" + bindingTypeName);
ParameterSpec parameter = ParameterSpec.builder(membersInjectedTypeName, "instance").build();
MethodSpec.Builder methodBuilder =
methodBuilder(methodName)
@@ -97,18 +97,18 @@
methodBuilder.addCode(
InjectionSiteMethod.invokeAll(
injectionSites(binding),
- generatedComponentModel.name(),
+ componentImplementation.name(),
instance,
membersInjectedType,
types,
request ->
bindingExpressions
- .getDependencyArgumentExpression(request, generatedComponentModel.name())
+ .getDependencyArgumentExpression(request, componentImplementation.name())
.codeBlock()));
methodBuilder.addStatement("return $L", instance);
MethodSpec method = methodBuilder.build();
- generatedComponentModel.addMethod(MEMBERS_INJECTION_METHOD, method);
+ componentImplementation.addMethod(MEMBERS_INJECTION_METHOD, method);
return method;
}