Remove private modifier from fields/methods within generated Dagger component's private implementation classes.

This change has a couple benefits:

  1. Reduces the amount of synthetic accessor methods needed for JDK<11/Dalvik/ART which don't support nestmates (see #4544).
  2. Will likely be needed before we start generating Kotlin source anyway since Kotlin doesn't allow a class to access another class's private members in such a way.

RELNOTES=Remove private modifier from fields/methods within generated Dagger component's private implementation classes.
PiperOrigin-RevId: 722747732

Author: bcorso

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

@@ -557,7 +557,7 @@ public CodeBlock shardFieldReference() {
         // Add the shard if this is the first time it's requested by something.
         String shardFieldName =
             componentShard.getUniqueFieldName(UPPER_CAMEL.to(LOWER_CAMEL, name.simpleName()));
-        FieldSpec shardField = FieldSpec.builder(name, shardFieldName, PRIVATE).build();
+        FieldSpec shardField = FieldSpec.builder(name, shardFieldName).build();
 
         shardFieldsByImplementation.put(this, shardField);
       }
@@ -726,6 +726,10 @@ public void claimMethodName(CharSequence name) {
       componentMethodNames.claim(name);
     }
 
+    public boolean isShardClassPrivate() {
+      return modifiers().contains(PRIVATE);
+    }
+
     @Override
     public TypeSpec generate() {
       TypeSpec.Builder builder = classBuilder(name);
@@ -938,7 +942,11 @@ private void addShards() {
 
     /** Creates and adds the constructor and methods needed for initializing the component. */
     private void addConstructorAndInitializationMethods() {
-      MethodSpec.Builder constructor = constructorBuilder().addModifiers(PRIVATE);
+      MethodSpec.Builder constructor = constructorBuilder();
+      // TODO(bcorso): remove once dagger.generatedClassExtendsComponent flag is removed.
+      if (!isShardClassPrivate()) {
+        constructor.addModifiers(PRIVATE);
+      }
       ImmutableList<ParameterSpec> parameters = constructorParameters.values().asList();
 
       // Add a constructor parameter and initialization for each component field. We initialize

java/dagger/internal/codegen/writing/FrameworkFieldInitializer.java

@@ -166,7 +166,10 @@ private FieldSpec getOrCreateField() {
         FieldSpec.builder(
             toJavaPoet(fieldType),
             shardImplementation.getUniqueFieldName(contributionBindingField.name()));
-    contributionField.addModifiers(PRIVATE);
+    // TODO(bcorso): remove once dagger.generatedClassExtendsComponent flag is removed.
+    if (!shardImplementation.isShardClassPrivate()) {
+      contributionField.addModifiers(PRIVATE);
+    }
     if (useRawType) {
       contributionField.addAnnotation(AnnotationSpecs.suppressWarnings(RAWTYPES));
     }

java/dagger/internal/codegen/writing/PrivateMethodRequestRepresentation.java

@@ -26,6 +26,7 @@
 
 import androidx.room.compiler.processing.XProcessingEnv;
 import androidx.room.compiler.processing.XType;
+import com.google.common.collect.ImmutableSet;
 import com.squareup.javapoet.CodeBlock;
 import com.squareup.javapoet.TypeName;
 import dagger.assisted.Assisted;
@@ -99,7 +100,11 @@ private String methodName() {
       shardImplementation.addMethod(
           PRIVATE_METHOD,
           methodBuilder(methodName)
-              .addModifiers(PRIVATE)
+              // TODO(bcorso): remove once dagger.generatedClassExtendsComponent flag is removed.
+              .addModifiers(
+                  !shardImplementation.isShardClassPrivate()
+                      ? ImmutableSet.of(PRIVATE)
+                      : ImmutableSet.of())
               .returns(returnType().getTypeName())
               .addStatement(
                   "return $L",

java/dagger/internal/codegen/writing/SwitchingProviders.java

@@ -162,7 +162,7 @@ private CodeBlock createSwitchCaseCodeBlock(
 
       return CodeBlock.builder()
           // TODO(bcorso): Is there something else more useful than the key?
-          .add("case $L: // $L \n", switchIds.get(key), key)
+          .add("case $L: // $L\n", switchIds.get(key), key)
           .addStatement("return ($T) $L", T, instanceCodeBlock)
           .build();
     }

javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_assistedParamConflictsWithComponentFieldName_successfulyDeduped_DEFAULT_MODE_test.DaggerTestComponent

@@ -42,11 +42,11 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private Foo_Factory fooProvider;
+    Foo_Factory fooProvider;
 
-    private Provider<FooFactory> fooFactoryProvider;
+    Provider<FooFactory> fooFactoryProvider;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
       initialize();
 

javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_assistedParamConflictsWithComponentFieldName_successfulyDeduped_FAST_INIT_MODE_test.DaggerTestComponent

@@ -43,11 +43,11 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private Provider<Bar> barProvider;
+    Provider<Bar> barProvider;
 
-    private Provider<FooFactory> fooFactoryProvider;
+    Provider<FooFactory> fooFactoryProvider;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
       initialize();
 

javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_testAssistedFactoryCycle_DEFAULT_MODE_test.DaggerTestComponent

@@ -43,13 +43,13 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private Provider<FooFactory> fooFactoryProvider;
+    Provider<FooFactory> fooFactoryProvider;
 
-    private Provider<Bar> barProvider;
+    Provider<Bar> barProvider;
 
-    private Foo_Factory fooProvider;
+    Foo_Factory fooProvider;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
       initialize();
 

javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_testAssistedFactoryCycle_FAST_INIT_MODE_test.DaggerTestComponent

@@ -44,15 +44,15 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private Provider<FooFactory> fooFactoryProvider;
+    Provider<FooFactory> fooFactoryProvider;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
       initialize();
 
     }
 
-    private Bar bar() {
+    Bar bar() {
       return new Bar(fooFactoryProvider.get());
     }
 

javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_testAssistedFactory_DEFAULT_MODE_test.DaggerTestComponent

@@ -42,11 +42,11 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private Foo_Factory fooProvider;
+    Foo_Factory fooProvider;
 
-    private Provider<FooFactory> fooFactoryProvider;
+    Provider<FooFactory> fooFactoryProvider;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
       initialize();
 

javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_testAssistedFactory_FAST_INIT_MODE_test.DaggerTestComponent

@@ -43,9 +43,9 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private Provider<FooFactory> fooFactoryProvider;
+    Provider<FooFactory> fooFactoryProvider;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
       initialize();