Move ComponentTree into processor/internal/root since it's the only usage.

Actually, there was a usage in DefineComponents, but I removed it since it wasn't really necessary.

RELNOTES=N/A
PiperOrigin-RevId: 356736330

7 files changed, 22 insertions, 25 deletions

diff --git a/java/dagger/hilt/processor/internal/BUILD b/java/dagger/hilt/processor/internal/BUILD
index 4fd7a2c7f..d2815d053 100644
--- a/java/dagger/hilt/processor/internal/BUILD
+++ b/java/dagger/hilt/processor/internal/BUILD
@@ -97,15 +97,9 @@ java_library(
 
 java_library(
     name = "component_descriptor",
-    srcs = [
-        "ComponentDescriptor.java",
-        "ComponentTree.java",
-    ],
+    srcs = ["ComponentDescriptor.java"],
     deps = [
-        "//java/dagger/internal/codegen/extension",
-        "//java/dagger/internal/guava:base",
         "//java/dagger/internal/guava:collect",
-        "//java/dagger/internal/guava:graph",
         "@google_bazel_common//third_party/java/auto:value",
         "@google_bazel_common//third_party/java/javapoet",
     ],
diff --git a/java/dagger/hilt/processor/internal/definecomponent/DefineComponents.java b/java/dagger/hilt/processor/internal/definecomponent/DefineComponents.java
index 0b330111a..73dccb563 100644
--- a/java/dagger/hilt/processor/internal/definecomponent/DefineComponents.java
+++ b/java/dagger/hilt/processor/internal/definecomponent/DefineComponents.java
@@ -24,12 +24,12 @@ import com.google.auto.common.MoreElements;
 import com.google.auto.value.AutoValue;
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ListMultimap;
 import com.squareup.javapoet.ClassName;
 import dagger.hilt.processor.internal.AnnotationValues;
 import dagger.hilt.processor.internal.ClassNames;
 import dagger.hilt.processor.internal.ComponentDescriptor;
-import dagger.hilt.processor.internal.ComponentTree;
 import dagger.hilt.processor.internal.ProcessorErrors;
 import dagger.hilt.processor.internal.Processors;
 import dagger.hilt.processor.internal.definecomponent.DefineComponentBuilderMetadatas.DefineComponentBuilderMetadata;
@@ -89,8 +89,8 @@ public final class DefineComponents {
     return builder.build();
   }
 
-  /** Returns the {@link ComponentTree} from the aggregated {@link ComponentDescriptor}s. */
-  public ComponentTree getComponentTree(Elements elements) {
+  /** Returns the set of aggregated {@link ComponentDescriptor}s. */
+  public ImmutableSet<ComponentDescriptor> getComponentDescriptors(Elements elements) {
     AggregatedMetadata aggregatedMetadata =
         AggregatedMetadata.from(elements, componentMetadatas, componentBuilderMetadatas);
     ListMultimap<DefineComponentMetadata, DefineComponentBuilderMetadata> builderMultimap =
@@ -120,9 +120,9 @@ public final class DefineComponents {
     builderMultimap.entries().forEach(e -> builderMap.put(e.getKey(), e.getValue()));
 
 
-    return ComponentTree.from(aggregatedMetadata.components().stream()
+    return aggregatedMetadata.components().stream()
         .map(componentMetadata -> toComponentDescriptor(componentMetadata, builderMap))
-        .collect(toImmutableSet()));
+        .collect(toImmutableSet());
   }
 
   private static ComponentDescriptor toComponentDescriptor(
diff --git a/java/dagger/hilt/processor/internal/root/BUILD b/java/dagger/hilt/processor/internal/root/BUILD
index 39396914d..94eb72b3e 100644
--- a/java/dagger/hilt/processor/internal/root/BUILD
+++ b/java/dagger/hilt/processor/internal/root/BUILD
@@ -63,6 +63,7 @@ java_library(
 java_library(
     name = "root_metadata",
     srcs = [
+        "ComponentTree.java",
         "Root.java",
         "RootMetadata.java",
         "TestRootMetadata.java",
@@ -80,6 +81,7 @@ java_library(
         "//java/dagger/internal/codegen/kotlin",
         "//java/dagger/internal/guava:base",
         "//java/dagger/internal/guava:collect",
+        "//java/dagger/internal/guava:graph",
         "@google_bazel_common//third_party/java/auto:value",
         "@google_bazel_common//third_party/java/javapoet",
         "@maven//:com_google_auto_auto_common",
diff --git a/java/dagger/hilt/processor/internal/ComponentTree.java b/java/dagger/hilt/processor/internal/root/ComponentTree.java
index 6d2137a02..fe3d4b133 100644
--- a/java/dagger/hilt/processor/internal/ComponentTree.java
+++ b/java/dagger/hilt/processor/internal/root/ComponentTree.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package dagger.hilt.processor.internal;
+package dagger.hilt.processor.internal.root;
 
 import static dagger.internal.codegen.extension.DaggerStreams.toImmutableList;
 
@@ -27,17 +27,18 @@ import com.google.common.graph.Graphs;
 import com.google.common.graph.ImmutableGraph;
 import com.google.common.graph.MutableGraph;
 import com.squareup.javapoet.ClassName;
+import dagger.hilt.processor.internal.ComponentDescriptor;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 
 /** A representation of the full tree of scopes. */
-public final class ComponentTree {
+final class ComponentTree {
   private final ImmutableGraph<ComponentDescriptor> graph;
   private final ComponentDescriptor root;
 
   /** Creates a new tree from a set of descriptors. */
-  public static ComponentTree from(Set<ComponentDescriptor> descriptors) {
+  static ComponentTree from(Set<ComponentDescriptor> descriptors) {
     MutableGraph<ComponentDescriptor> graph =
         GraphBuilder.directed().allowsSelfLoops(false).build();
 
@@ -88,19 +89,19 @@ public final class ComponentTree {
     root = Iterables.getOnlyElement(roots);
   }
 
-  public ImmutableSet<ComponentDescriptor> getComponentDescriptors() {
+  ImmutableSet<ComponentDescriptor> getComponentDescriptors() {
     return ImmutableSet.copyOf(graph.nodes());
   }
 
-  public ImmutableSet<ComponentDescriptor> childrenOf(ComponentDescriptor componentDescriptor) {
+  ImmutableSet<ComponentDescriptor> childrenOf(ComponentDescriptor componentDescriptor) {
     return ImmutableSet.copyOf(graph.successors(componentDescriptor));
   }
 
-  public ImmutableGraph<ComponentDescriptor> graph() {
+  ImmutableGraph<ComponentDescriptor> graph() {
     return graph;
   }
 
-  public ComponentDescriptor root() {
+  ComponentDescriptor root() {
     return root;
   }
 }
diff --git a/java/dagger/hilt/processor/internal/root/RootGenerator.java b/java/dagger/hilt/processor/internal/root/RootGenerator.java
index b5cf4a656..bee468a43 100644
--- a/java/dagger/hilt/processor/internal/root/RootGenerator.java
+++ b/java/dagger/hilt/processor/internal/root/RootGenerator.java
@@ -37,7 +37,6 @@ import com.squareup.javapoet.TypeSpec;
 import dagger.hilt.processor.internal.ClassNames;
 import dagger.hilt.processor.internal.ComponentDescriptor;
 import dagger.hilt.processor.internal.ComponentNames;
-import dagger.hilt.processor.internal.ComponentTree;
 import dagger.hilt.processor.internal.Processors;
 import java.io.IOException;
 import java.util.HashMap;
diff --git a/java/dagger/hilt/processor/internal/root/RootMetadata.java b/java/dagger/hilt/processor/internal/root/RootMetadata.java
index 4c43f1d61..70e53d332 100644
--- a/java/dagger/hilt/processor/internal/root/RootMetadata.java
+++ b/java/dagger/hilt/processor/internal/root/RootMetadata.java
@@ -29,7 +29,6 @@ import com.squareup.javapoet.ClassName;
 import com.squareup.javapoet.TypeName;
 import dagger.hilt.processor.internal.ClassNames;
 import dagger.hilt.processor.internal.ComponentDescriptor;
-import dagger.hilt.processor.internal.ComponentTree;
 import dagger.hilt.processor.internal.KotlinMetadataUtils;
 import dagger.hilt.processor.internal.Processors;
 import dagger.hilt.processor.internal.aggregateddeps.ComponentDependencies;
diff --git a/java/dagger/hilt/processor/internal/root/RootProcessor.java b/java/dagger/hilt/processor/internal/root/RootProcessor.java
index 8f8c94874..bb1539cfd 100644
--- a/java/dagger/hilt/processor/internal/root/RootProcessor.java
+++ b/java/dagger/hilt/processor/internal/root/RootProcessor.java
@@ -28,7 +28,7 @@ import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.squareup.javapoet.ClassName;
 import dagger.hilt.processor.internal.BaseProcessor;
-import dagger.hilt.processor.internal.ComponentTree;
+import dagger.hilt.processor.internal.ComponentDescriptor;
 import dagger.hilt.processor.internal.ProcessorErrors;
 import dagger.hilt.processor.internal.aggregateddeps.ComponentDependencies;
 import dagger.hilt.processor.internal.definecomponent.DefineComponents;
@@ -132,9 +132,11 @@ public final class RootProcessor extends BaseProcessor {
     // all roots. We should consider if it's worth trying to continue processing for other
     // roots. At the moment, I think it's rare that if one root failed the others would not.
     try {
-      ComponentTree tree = defineComponents.getComponentTree(getElementUtils());
-      ComponentDependencies deps = ComponentDependencies.from(
-          tree.getComponentDescriptors(), getElementUtils());
+      ImmutableSet<ComponentDescriptor> componentDescriptors =
+          defineComponents.getComponentDescriptors(getElementUtils());
+      ComponentTree tree = ComponentTree.from(componentDescriptors);
+      ComponentDependencies deps =
+          ComponentDependencies.from(componentDescriptors, getElementUtils());
       ImmutableList<RootMetadata> rootMetadatas =
           rootsToProcess.stream()
               .map(root -> RootMetadata.create(root, tree, deps, getProcessingEnv()))