From 0d03bc73465239901e92858ca33e8a3840636864 Mon Sep 17 00:00:00 2001 From: Brad Corso Date: Fri, 29 Sep 2023 14:53:27 -0700 Subject: [PATCH] Refactor BindingGraphConverter. This CL inlines some functions that are only used at a single call-site and are essentially 1-liners. RELNOTES=N/A PiperOrigin-RevId: 569594969 --- .../binding/BindingGraphConverter.java | 58 ++++--------------- .../binding/ChildFactoryMethodEdgeImpl.java | 5 +- 2 files changed, 14 insertions(+), 49 deletions(-) diff --git a/java/dagger/internal/codegen/binding/BindingGraphConverter.java b/java/dagger/internal/codegen/binding/BindingGraphConverter.java index 8e76e09e248..5ef60657b45 100644 --- a/java/dagger/internal/codegen/binding/BindingGraphConverter.java +++ b/java/dagger/internal/codegen/binding/BindingGraphConverter.java @@ -21,14 +21,12 @@ import static dagger.internal.codegen.extension.DaggerGraphs.unreachableNodes; import static dagger.internal.codegen.model.BindingKind.SUBCOMPONENT_CREATOR; -import androidx.room.compiler.processing.XMethodElement; import androidx.room.compiler.processing.XType; import androidx.room.compiler.processing.XTypeElement; import com.google.auto.value.AutoValue; import com.google.auto.value.extension.memoized.Memoized; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Iterators; import com.google.common.graph.ImmutableNetwork; import com.google.common.graph.MutableNetwork; import com.google.common.graph.NetworkBuilder; @@ -40,7 +38,6 @@ import dagger.internal.codegen.model.BindingGraph.MissingBinding; import dagger.internal.codegen.model.BindingGraph.Node; import dagger.internal.codegen.model.ComponentPath; -import dagger.internal.codegen.model.DaggerExecutableElement; import dagger.internal.codegen.model.DaggerTypeElement; import dagger.internal.codegen.model.DependencyRequest; import dagger.internal.codegen.model.Key; @@ -110,10 +107,9 @@ private void visitRootComponent(LegacyBindingGraph graph) { *

This implementation does the following: * *

    - *
  1. If this component is installed in its parent by a subcomponent factory method, calls - * {@link #visitSubcomponentFactoryMethod(ComponentNode, ComponentNode, XMethodElement)}. - *
  2. For each entry point in the component, calls {@link #visitEntryPoint(ComponentNode, - * DependencyRequest)}. + *
  3. If this component is installed in its parent by a subcomponent factory method, adds + * an edge between the parent and child components. + *
  4. For each entry point, adds an edge between the component and the entry point. *
  5. For each child component, calls {@link #visitComponent(LegacyBindingGraph)}, * updating the traversal state. *
@@ -127,7 +123,7 @@ private void visitComponent(LegacyBindingGraph graph) { for (ComponentMethodDescriptor entryPointMethod : graph.componentDescriptor().entryPointMethods()) { - visitEntryPoint(graph.componentNode(), entryPointMethod.dependencyRequest().get()); + addDependencyEdges(graph.componentNode(), entryPointMethod.dependencyRequest().get()); } for (ResolvedBindings resolvedBindings : graph.resolvedBindings()) { @@ -149,54 +145,22 @@ private void visitComponent(LegacyBindingGraph graph) { } } - if (bindingGraphPath.size() > 1) { - LegacyBindingGraph parentGraph = Iterators.get(bindingGraphPath.descendingIterator(), 1); - parentGraph + for (LegacyBindingGraph childGraph : graph.subgraphs()) { + visitComponent(childGraph); + graph .componentDescriptor() - .getFactoryMethodForChildComponent(graph.componentDescriptor()) + .getFactoryMethodForChildComponent(childGraph.componentDescriptor()) .ifPresent( childFactoryMethod -> - visitSubcomponentFactoryMethod( - parentGraph.componentNode(), + network.addEdge( graph.componentNode(), - childFactoryMethod.methodElement())); - } - - for (LegacyBindingGraph child : graph.subgraphs()) { - visitComponent(child); + childGraph.componentNode(), + new ChildFactoryMethodEdgeImpl(childFactoryMethod.methodElement()))); } verify(bindingGraphPath.removeLast().equals(graph)); } - /** - * Called once for each entry point in a component. - * - * @param componentNode the component that contains the entry point - * @param entryPoint the entry point to visit - */ - private void visitEntryPoint(ComponentNode componentNode, DependencyRequest entryPoint) { - addDependencyEdges(componentNode, entryPoint); - } - - /** - * Called if this component was installed in its parent by a subcomponent factory method. - * - * @param parentComponent the parent graph - * @param currentComponent the currently visited graph - * @param factoryMethod the factory method in the parent component that declares that the - * current component is a child - */ - private void visitSubcomponentFactoryMethod( - ComponentNode parentComponent, - ComponentNode currentComponent, - XMethodElement factoryMethod) { - network.addEdge( - parentComponent, - currentComponent, - new ChildFactoryMethodEdgeImpl(DaggerExecutableElement.from(factoryMethod))); - } - /** * Returns an immutable snapshot of the path from the root component to the currently visited * component. diff --git a/java/dagger/internal/codegen/binding/ChildFactoryMethodEdgeImpl.java b/java/dagger/internal/codegen/binding/ChildFactoryMethodEdgeImpl.java index 077f4546a0a..4b1e15edec7 100644 --- a/java/dagger/internal/codegen/binding/ChildFactoryMethodEdgeImpl.java +++ b/java/dagger/internal/codegen/binding/ChildFactoryMethodEdgeImpl.java @@ -18,6 +18,7 @@ import static dagger.internal.codegen.base.ElementFormatter.elementToString; +import androidx.room.compiler.processing.XMethodElement; import dagger.internal.codegen.model.BindingGraph.ChildFactoryMethodEdge; import dagger.internal.codegen.model.DaggerExecutableElement; @@ -26,8 +27,8 @@ public final class ChildFactoryMethodEdgeImpl implements ChildFactoryMethodEdge private final DaggerExecutableElement factoryMethod; - ChildFactoryMethodEdgeImpl(DaggerExecutableElement factoryMethod) { - this.factoryMethod = factoryMethod; + ChildFactoryMethodEdgeImpl(XMethodElement factoryMethod) { + this.factoryMethod = DaggerExecutableElement.from(factoryMethod); } @Override