Rollback changelist 640960016.

PiperOrigin-RevId: 641013296

Author: java-team-github-bot

java/dagger/internal/codegen/binding/BindingGraph.java

@@ -74,8 +74,7 @@ public abstract class BindingGraph {
   public abstract static class TopLevelBindingGraph
       extends dagger.internal.codegen.model.BindingGraph {
     static TopLevelBindingGraph create(
-        ImmutableNetwork<Node, Edge> network,
-        boolean isFullBindingGraph) {
+        ImmutableNetwork<Node, Edge> network, boolean isFullBindingGraph) {
       TopLevelBindingGraph topLevelBindingGraph =
           new AutoValue_BindingGraph_TopLevelBindingGraph(network, isFullBindingGraph);
 

java/dagger/internal/codegen/binding/BindingGraphConverter.java

@@ -77,9 +77,7 @@ BindingGraph convert(LegacyBindingGraph legacyBindingGraph, boolean isFullBindin
     }
 
     TopLevelBindingGraph topLevelBindingGraph =
-        TopLevelBindingGraph.create(
-            ImmutableNetwork.copyOf(network),
-            isFullBindingGraph);
+        TopLevelBindingGraph.create(ImmutableNetwork.copyOf(network), isFullBindingGraph);
     return BindingGraph.create(rootNode, topLevelBindingGraph);
   }
 
@@ -124,7 +122,8 @@ private void visitComponent(LegacyBindingGraph graph) {
 
       network.addNode(graph.componentNode());
 
-      for (ComponentMethodDescriptor entryPointMethod : graph.entryPointMethods()) {
+      for (ComponentMethodDescriptor entryPointMethod :
+          graph.componentDescriptor().entryPointMethods()) {
         addDependencyEdges(graph.componentNode(), entryPointMethod.dependencyRequest().get());
       }
 

java/dagger/internal/codegen/binding/BindingGraphFactory.java

@@ -22,7 +22,6 @@
 import static dagger.internal.codegen.base.Util.reentrantComputeIfAbsent;
 import static dagger.internal.codegen.binding.AssistedInjectionAnnotations.isAssistedFactoryType;
 import static dagger.internal.codegen.binding.SourceFiles.generatedMonitoringModuleName;
-import static dagger.internal.codegen.extension.DaggerStreams.toImmutableList;
 import static dagger.internal.codegen.model.BindingKind.ASSISTED_INJECTION;
 import static dagger.internal.codegen.model.BindingKind.DELEGATE;
 import static dagger.internal.codegen.model.BindingKind.INJECTION;
@@ -49,7 +48,6 @@
 import dagger.internal.codegen.base.Keys;
 import dagger.internal.codegen.base.MapType;
 import dagger.internal.codegen.base.OptionalType;
-import dagger.internal.codegen.binding.ComponentDescriptor.ComponentMethodDescriptor;
 import dagger.internal.codegen.compileroption.CompilerOptions;
 import dagger.internal.codegen.javapoet.TypeNames;
 import dagger.internal.codegen.model.BindingGraph.ComponentNode;
@@ -214,7 +212,14 @@ private LegacyBindingGraph createLegacyBindingGraph(
 
     componentDescriptor.entryPointMethods().stream()
         .map(method -> method.dependencyRequest().get())
-        .forEach(entryPoint -> resolveEntryPointsHelper(entryPoint, requestResolver));
+        .forEach(
+            entryPoint -> {
+              if (entryPoint.kind().equals(MEMBERS_INJECTION)) {
+                requestResolver.resolveMembersInjection(entryPoint.key());
+              } else {
+                requestResolver.resolve(entryPoint.key());
+              }
+            });
 
     if (createFullBindingGraph) {
       // Resolve the keys for all bindings in all modules, stripping any multibinding contribution
@@ -244,14 +249,6 @@ private LegacyBindingGraph createLegacyBindingGraph(
     return new LegacyBindingGraph(requestResolver, subgraphs.build());
   }
 
-  private void resolveEntryPointsHelper(DependencyRequest entryPoint, Resolver requestResolver) {
-    if (entryPoint.kind().equals(MEMBERS_INJECTION)) {
-      requestResolver.resolveMembersInjection(entryPoint.key());
-    } else {
-      requestResolver.resolve(entryPoint.key());
-    }
-  }
-
   /**
    * Returns all the modules that should be installed in the component. For production components
    * and production subcomponents that have a parent that is not a production component or
@@ -299,7 +296,7 @@ static final class LegacyBindingGraph {
     private final ImmutableList<LegacyBindingGraph> resolvedSubgraphs;
     private final ComponentNode componentNode;
 
-        LegacyBindingGraph(Resolver resolver, ImmutableList<LegacyBindingGraph> resolvedSubgraphs) {
+    LegacyBindingGraph(Resolver resolver, ImmutableList<LegacyBindingGraph> resolvedSubgraphs) {
       this.resolver = resolver;
       this.resolvedSubgraphs = resolvedSubgraphs;
       this.componentNode =
@@ -321,11 +318,6 @@ ComponentDescriptor componentDescriptor() {
       return resolver.componentDescriptor;
     }
 
-    ImmutableList<ComponentMethodDescriptor> entryPointMethods() {
-      return componentDescriptor().entryPointMethods().stream()
-          .collect(toImmutableList());
-    }
-
     /**
      * Returns the {@link ResolvedBindings} in this graph or a parent graph that matches the given
      * request.

java/dagger/internal/codegen/writing/ComponentImplementation.java

@@ -59,6 +59,7 @@
 import com.google.common.collect.ListMultimap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.MultimapBuilder;
+import com.google.common.collect.Sets;
 import com.squareup.javapoet.ClassName;
 import com.squareup.javapoet.CodeBlock;
 import com.squareup.javapoet.FieldSpec;
@@ -96,6 +97,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.Set;
 import javax.inject.Inject;
 import javax.inject.Provider;
 import javax.lang.model.element.Modifier;
@@ -884,19 +886,14 @@ private void addInterfaceMethods() {
       // Each component method may have been declared by several supertypes. We want to implement
       // only one method for each distinct signature.
       XType componentType = graph.componentTypeElement().getType();
-      Map<MethodSignature, ComponentMethodDescriptor> methodDescriptors = new LinkedHashMap<>();
+      Set<MethodSignature> signatures = Sets.newHashSet();
       for (ComponentMethodDescriptor method : graph.componentDescriptor().entryPointMethods()) {
-        MethodSignature signature =
-            MethodSignature.forComponentMethod(method, componentType, processingEnv);
-        if (!methodDescriptors.containsKey(signature)) {
-          methodDescriptors.put(signature, method);
-        }
-      }
-
-      for (ComponentMethodDescriptor method : methodDescriptors.values()) {
+        if (signatures.add(
+            MethodSignature.forComponentMethod(method, componentType, processingEnv))) {
           addMethod(
               COMPONENT_METHOD,
               componentRequestRepresentationsProvider.get().getComponentMethod(method));
+        }
       }
     }