Internal change

dagger-compiler/main/java/dagger/internal/codegen/writing/ComponentNames.java

@@ -172,6 +172,10 @@ private static ImmutableMap<ComponentPath, String> disambiguateConflictingSimple
     UniqueNameSet nameSet = new UniqueNameSet();
     ImmutableMap.Builder<ComponentPath, String> uniqueNames = ImmutableMap.builder();
     for (ComponentPath componentPath : componentsWithConflictingNames) {
+      if (componentPath.atRoot()) {
+        uniqueNames.put(componentPath, simpleName(componentPath));
+        continue;
+      }
       String simpleName = simpleName(componentPath);
       String basePrefix = uniquingPrefix(componentPath);
       uniqueNames.put(
@@ -181,7 +185,9 @@ private static ImmutableMap<ComponentPath, String> disambiguateConflictingSimple
   }
 
   private static String simpleName(ComponentPath componentPath) {
-    return getSimpleName(componentPath.currentComponent().xprocessing());
+    return componentPath.atRoot()
+        ? ""
+        : getSimpleName(componentPath.currentComponent().xprocessing());
   }
 
   /** Returns a prefix that could make the component's simple name more unique. */

javatests/dagger/functional/cycle/LongCycleTest.java

@@ -51,8 +51,7 @@ public void longCycleHasMoreThanOneInitializeMethod() throws Exception {
     ClassName componentImpl =
         System.getProperty("dagger.mode").contains("ExtendsComponent")
             ? ClassName.get(DaggerLongCycle_LongCycleComponent.class)
-            : ClassName.get(DaggerLongCycle_LongCycleComponent.class)
-                .nestedClass("LongCycleComponentImpl");
+            : ClassName.get(DaggerLongCycle_LongCycleComponent.class).nestedClass("Impl");
     boolean hasInitialize2 =
         stream(
                 DaggerLongCycle_LongCycleComponent.class

javatests/dagger/functional/kotlinsrc/cycle/LongCycleTest.kt

@@ -20,7 +20,6 @@ import com.google.common.truth.Truth.assertThat
 import com.google.common.truth.TruthJUnit.assume
 import com.squareup.javapoet.ClassName
 import java.lang.reflect.Method
-import java.util.Arrays
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4

javatests/dagger/hilt/android/MultiTestRoot1Test.java

@@ -282,7 +282,7 @@ public void testMissingMultiTestRoot2EntryPoint() throws Exception {
         .hasMessageThat()
         .isEqualTo(
             "Cannot cast dagger.hilt.android.internal.testing.root."
-                + "DaggerMultiTestRoot1Test_HiltComponents_SingletonC$SingletonCImpl"
+                + "DaggerMultiTestRoot1Test_HiltComponents_SingletonC$Impl"
                 + " to dagger.hilt.android.MultiTestRoot2Test$BarEntryPoint");
   }
 

javatests/dagger/hilt/android/MultiTestRoot2Test.java

@@ -260,7 +260,7 @@ public void testMissingMultiTestRoot1EntryPoint() throws Exception {
         .hasMessageThat()
         .isEqualTo(
             "Cannot cast dagger.hilt.android.internal.testing.root."
-                + "DaggerMultiTestRoot2Test_HiltComponents_SingletonC$SingletonCImpl"
+                + "DaggerMultiTestRoot2Test_HiltComponents_SingletonC$Impl"
                 + " to dagger.hilt.android.MultiTestRoot1Test$BarEntryPoint");
   }
 

javatests/dagger/hilt/android/UsesComponentHelper.java

@@ -23,7 +23,7 @@ public abstract class UsesComponentHelper {
 
   public static String defaultComponentName() {
     return "dagger.hilt.android.internal.testing.root."
-        + "DaggerDefault_HiltComponents_SingletonC$SingletonCImpl";
+        + "DaggerDefault_HiltComponents_SingletonC$Impl";
   }
 
   /**
@@ -33,7 +33,7 @@ public static String defaultComponentName() {
   public static String perTestComponentName(Object testInstance) {
     return "dagger.hilt.android.internal.testing.root.Dagger"
         + testInstance.getClass().getSimpleName()
-        + "_HiltComponents_SingletonC$SingletonCImpl";
+        + "_HiltComponents_SingletonC$Impl";
   }
 
   /**
@@ -45,7 +45,7 @@ public static String perTestComponentNameWithDedupePrefix(
     return "dagger.hilt.android.internal.testing.root.Dagger"
         + expectedPrefix
         + testInstance.getClass().getSimpleName()
-        + "_HiltComponents_SingletonC$SingletonCImpl";
+        + "_HiltComponents_SingletonC$Impl";
   }
 
   private UsesComponentHelper() {}

javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/assistedParamConflictsWithComponentFieldName_successfulyDeduped/test.DaggerTestComponent_DEFAULT_MODE

@@ -35,18 +35,18 @@ final class DaggerTestComponent {
     }
 
     public TestComponent build() {
-      return new TestComponentImpl();
+      return new Impl();
     }
   }
 
-  private static final class TestComponentImpl implements TestComponent {
-    private final TestComponentImpl testComponentImpl = this;
+  private static final class Impl implements TestComponent {
+    private final Impl impl = this;
 
     Foo_Factory fooProvider;
 
     Provider<FooFactory> fooFactoryProvider;
 
-    TestComponentImpl() {
+    Impl() {
 
       initialize();
 

javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/assistedParamConflictsWithComponentFieldName_successfulyDeduped/test.DaggerTestComponent_FAST_INIT_MODE

@@ -36,27 +36,27 @@ final class DaggerTestComponent {
     }
 
     public TestComponent build() {
-      return new TestComponentImpl();
+      return new Impl();
     }
   }
 
-  private static final class TestComponentImpl implements TestComponent {
-    private final TestComponentImpl testComponentImpl = this;
+  private static final class Impl implements TestComponent {
+    private final Impl impl = this;
 
     Provider<Bar> barProvider;
 
     Provider<FooFactory> fooFactoryProvider;
 
-    TestComponentImpl() {
+    Impl() {
 
       initialize();
 
     }
 
     @SuppressWarnings("unchecked")
     private void initialize() {
-      this.barProvider = new SwitchingProvider<>(testComponentImpl, 1);
-      this.fooFactoryProvider = SingleCheck.provider(new SwitchingProvider<FooFactory>(testComponentImpl, 0));
+      this.barProvider = new SwitchingProvider<>(impl, 1);
+      this.fooFactoryProvider = SingleCheck.provider(new SwitchingProvider<FooFactory>(impl, 0));
     }
 
     @Override
@@ -65,12 +65,12 @@ final class DaggerTestComponent {
     }
 
     private static final class SwitchingProvider<T> implements Provider<T> {
-      private final TestComponentImpl testComponentImpl;
+      private final Impl impl;
 
       private final int id;
 
-      SwitchingProvider(TestComponentImpl testComponentImpl, int id) {
-        this.testComponentImpl = testComponentImpl;
+      SwitchingProvider(Impl impl, int id) {
+        this.impl = impl;
         this.id = id;
       }
 
@@ -81,8 +81,8 @@ final class DaggerTestComponent {
           case 0: // test.FooFactory
           return (T) new FooFactory() {
             @Override
-            public Foo create(String testComponentImpl2) {
-              return new Foo(testComponentImpl2, testComponentImpl.barProvider);
+            public Foo create(String testComponentImpl) {
+              return new Foo(testComponentImpl, impl.barProvider);
             }
           };
 

javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/assistedParamConflictsWithComponentFieldName_successfulyDeduped/test.DaggerTestComponent_KT_DEFAULT_MODE

@@ -35,12 +35,12 @@ final class DaggerTestComponent {
     }
 
     public TestComponent build() {
-      return new TestComponentImpl();
+      return new Impl();
     }
   }
 
-  private static final class TestComponentImpl implements TestComponent {
-    private final TestComponentImpl testComponentImpl = this;
+  private static final class Impl implements TestComponent {
+    private final Impl impl = this;
 
     Foo_Factory fooProvider;
 
@@ -49,7 +49,7 @@ final class DaggerTestComponent {
      */
     Provider<?> fooFactoryProvider;
 
-    TestComponentImpl() {
+    Impl() {
 
       initialize();
 

javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/assistedParamConflictsWithComponentFieldName_successfulyDeduped/test.DaggerTestComponent_KT_FAST_INIT_MODE

@@ -36,12 +36,12 @@ final class DaggerTestComponent {
     }
 
     public TestComponent build() {
-      return new TestComponentImpl();
+      return new Impl();
     }
   }
 
-  private static final class TestComponentImpl implements TestComponent {
-    private final TestComponentImpl testComponentImpl = this;
+  private static final class Impl implements TestComponent {
+    private final Impl impl = this;
 
     /**
      * {@code Provider<Bar>}
@@ -53,16 +53,16 @@ final class DaggerTestComponent {
      */
     Provider<?> fooFactoryProvider;
 
-    TestComponentImpl() {
+    Impl() {
 
       initialize();
 
     }
 
     @SuppressWarnings("unchecked")
     private void initialize() {
-      this.barProvider = new SwitchingProvider<>(testComponentImpl, 1);
-      this.fooFactoryProvider = SingleCheck.provider(new SwitchingProvider<>(testComponentImpl, 0));
+      this.barProvider = new SwitchingProvider<>(impl, 1);
+      this.fooFactoryProvider = SingleCheck.provider(new SwitchingProvider<>(impl, 0));
     }
 
     @Override
@@ -71,12 +71,12 @@ final class DaggerTestComponent {
     }
 
     private static final class SwitchingProvider<T> implements Provider<T> {
-      private final TestComponentImpl testComponentImpl;
+      private final Impl impl;
 
       private final int id;
 
-      SwitchingProvider(TestComponentImpl testComponentImpl, int id) {
-        this.testComponentImpl = testComponentImpl;
+      SwitchingProvider(Impl impl, int id) {
+        this.impl = impl;
         this.id = id;
       }
 
@@ -87,8 +87,8 @@ final class DaggerTestComponent {
           case 0: // test.FooFactory
           return (T) new FooFactory() {
             @Override
-            public Foo create(String testComponentImpl2) {
-              return (Foo) (Foo_Factory.newInstance(testComponentImpl2, testComponentImpl.barProvider));
+            public Foo create(String testComponentImpl) {
+              return (Foo) (Foo_Factory.newInstance(testComponentImpl, impl.barProvider));
             }
           };
 

javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testAssistedFactory/test.DaggerTestComponent_DEFAULT_MODE

@@ -35,18 +35,18 @@ final class DaggerTestComponent {
     }
 
     public TestComponent build() {
-      return new TestComponentImpl();
+      return new Impl();
     }
   }
 
-  private static final class TestComponentImpl implements TestComponent {
-    private final TestComponentImpl testComponentImpl = this;
+  private static final class Impl implements TestComponent {
+    private final Impl impl = this;
 
     Foo_Factory fooProvider;
 
     Provider<FooFactory> fooFactoryProvider;
 
-    TestComponentImpl() {
+    Impl() {
 
       initialize();
 

javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testAssistedFactory/test.DaggerTestComponent_FAST_INIT_MODE

@@ -36,24 +36,24 @@ final class DaggerTestComponent {
     }
 
     public TestComponent build() {
-      return new TestComponentImpl();
+      return new Impl();
     }
   }
 
-  private static final class TestComponentImpl implements TestComponent {
-    private final TestComponentImpl testComponentImpl = this;
+  private static final class Impl implements TestComponent {
+    private final Impl impl = this;
 
     Provider<FooFactory> fooFactoryProvider;
 
-    TestComponentImpl() {
+    Impl() {
 
       initialize();
 
     }
 
     @SuppressWarnings("unchecked")
     private void initialize() {
-      this.fooFactoryProvider = SingleCheck.provider(new SwitchingProvider<FooFactory>(testComponentImpl, 0));
+      this.fooFactoryProvider = SingleCheck.provider(new SwitchingProvider<FooFactory>(impl, 0));
     }
 
     @Override
@@ -62,12 +62,12 @@ final class DaggerTestComponent {
     }
 
     private static final class SwitchingProvider<T> implements Provider<T> {
-      private final TestComponentImpl testComponentImpl;
+      private final Impl impl;
 
       private final int id;
 
-      SwitchingProvider(TestComponentImpl testComponentImpl, int id) {
-        this.testComponentImpl = testComponentImpl;
+      SwitchingProvider(Impl impl, int id) {
+        this.impl = impl;
         this.id = id;
       }
 

javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testAssistedFactory/test.DaggerTestComponent_KT_DEFAULT_MODE

@@ -35,12 +35,12 @@ final class DaggerTestComponent {
     }
 
     public TestComponent build() {
-      return new TestComponentImpl();
+      return new Impl();
     }
   }
 
-  private static final class TestComponentImpl implements TestComponent {
-    private final TestComponentImpl testComponentImpl = this;
+  private static final class Impl implements TestComponent {
+    private final Impl impl = this;
 
     Foo_Factory fooProvider;
 
@@ -49,7 +49,7 @@ final class DaggerTestComponent {
      */
     Provider<?> fooFactoryProvider;
 
-    TestComponentImpl() {
+    Impl() {
 
       initialize();
 

javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testAssistedFactory/test.DaggerTestComponent_KT_FAST_INIT_MODE

@@ -36,27 +36,27 @@ final class DaggerTestComponent {
     }
 
     public TestComponent build() {
-      return new TestComponentImpl();
+      return new Impl();
     }
   }
 
-  private static final class TestComponentImpl implements TestComponent {
-    private final TestComponentImpl testComponentImpl = this;
+  private static final class Impl implements TestComponent {
+    private final Impl impl = this;
 
     /**
      * {@code Provider<FooFactory>}
      */
     Provider<?> fooFactoryProvider;
 
-    TestComponentImpl() {
+    Impl() {
 
       initialize();
 
     }
 
     @SuppressWarnings("unchecked")
     private void initialize() {
-      this.fooFactoryProvider = SingleCheck.provider(new SwitchingProvider<>(testComponentImpl, 0));
+      this.fooFactoryProvider = SingleCheck.provider(new SwitchingProvider<>(impl, 0));
     }
 
     @Override
@@ -65,12 +65,12 @@ final class DaggerTestComponent {
     }
 
     private static final class SwitchingProvider<T> implements Provider<T> {
-      private final TestComponentImpl testComponentImpl;
+      private final Impl impl;
 
       private final int id;
 
-      SwitchingProvider(TestComponentImpl testComponentImpl, int id) {
-        this.testComponentImpl = testComponentImpl;
+      SwitchingProvider(Impl impl, int id) {
+        this.impl = impl;
         this.id = id;
       }