Move ComponentGenerator into processor/internal/root since it's the o…

…nly usage. RELNOTES=N/A PiperOrigin-RevId: 356504954
google · Feb 9, 2021 · 438bb1d · 438bb1d
1 parent 785838e
commit 438bb1d
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/java/dagger/hilt/processor/internal/BUILD b/java/dagger/hilt/processor/internal/BUILD
@@ -99,12 +99,9 @@ java_library(
     name = "component_descriptor",
     srcs = [
         "ComponentDescriptor.java",
-        "ComponentGenerator.java",
         "ComponentTree.java",
     ],
     deps = [
-        ":classnames",
-        ":processors",
         "//java/dagger/internal/codegen/extension",
         "//java/dagger/internal/guava:base",
         "//java/dagger/internal/guava:collect",

diff --git a/java/dagger/hilt/processor/internal/root/BUILD b/java/dagger/hilt/processor/internal/root/BUILD
@@ -29,6 +29,7 @@ java_plugin(
 java_library(
     name = "processor_lib",
     srcs = [
+        "ComponentGenerator.java",
         "RootFileFormatter.java",
         "RootGenerator.java",
         "RootProcessor.java",

diff --git a/...rocessor/internal/ComponentGenerator.java → ...sor/internal/root/ComponentGenerator.java b/...rocessor/internal/ComponentGenerator.java → ...sor/internal/root/ComponentGenerator.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;
 import static java.util.Comparator.comparing;
@@ -28,6 +28,8 @@
 import com.squareup.javapoet.JavaFile;
 import com.squareup.javapoet.TypeName;
 import com.squareup.javapoet.TypeSpec;
+import dagger.hilt.processor.internal.ClassNames;
+import dagger.hilt.processor.internal.Processors;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Comparator;
@@ -39,8 +41,7 @@
 import javax.lang.model.element.TypeElement;
 
 /** Generates a Dagger component or subcomponent interface. */
-// TODO(bcorso): Make this non-public
-public final class ComponentGenerator {
+final class ComponentGenerator {
   private static final Joiner JOINER = Joiner.on(".");
   private static final Comparator<ClassName> SIMPLE_NAME_SORTER =
       Comparator.comparing((ClassName c) -> JOINER.join(c.simpleNames()))

diff --git a/java/dagger/hilt/processor/internal/root/RootGenerator.java b/java/dagger/hilt/processor/internal/root/RootGenerator.java
@@ -36,7 +36,6 @@
 import com.squareup.javapoet.TypeSpec;
 import dagger.hilt.processor.internal.ClassNames;
 import dagger.hilt.processor.internal.ComponentDescriptor;
-import dagger.hilt.processor.internal.ComponentGenerator;
 import dagger.hilt.processor.internal.ComponentNames;
 import dagger.hilt.processor.internal.ComponentTree;
 import dagger.hilt.processor.internal.Processors;