From 79f8633e586ab825d1728fb6cd4bfd2635c820d8 Mon Sep 17 00:00:00 2001
From: Brad Corso <bcorso@google.com>
Date: Mon, 3 Feb 2025 12:07:00 -0800
Subject: [PATCH] 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 https://github.com/google/dagger/issues/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
---
 .../writing/ComponentImplementation.java      |  12 +-
 .../writing/FrameworkFieldInitializer.java    |   5 +-
 .../PrivateMethodRequestRepresentation.java   |   7 +-
 .../codegen/writing/SwitchingProviders.java   |   2 +-
 ...uped_DEFAULT_MODE_test.DaggerTestComponent |   6 +-
 ...ed_FAST_INIT_MODE_test.DaggerTestComponent |   6 +-
 ...ycle_DEFAULT_MODE_test.DaggerTestComponent |   8 +-
 ...le_FAST_INIT_MODE_test.DaggerTestComponent |   6 +-
 ...tory_DEFAULT_MODE_test.DaggerTestComponent |   6 +-
 ...ry_FAST_INIT_MODE_test.DaggerTestComponent |   4 +-
 ...onents_DEFAULT_MODE_test.DaggerMyComponent |  12 +-
 ...ents_FAST_INIT_MODE_test.DaggerMyComponent |   8 +-
 ...aram_DEFAULT_MODE_test.DaggerTestComponent |   6 +-
 ...am_FAST_INIT_MODE_test.DaggerTestComponent |   4 +-
 ...ames_DEFAULT_MODE_test.DaggerTestComponent |   2 +-
 ...es_FAST_INIT_MODE_test.DaggerTestComponent |   2 +-
 ...Component.Builder_test.DaggerTestComponent |   2 +-
 ...Component.Factory_test.DaggerTestComponent |   2 +-
 ...Component.Builder_test.DaggerTestComponent |   2 +-
 ...Component.Factory_test.DaggerTestComponent |   2 +-
 ...mponent.Builder_test.DaggerSimpleComponent |   2 +-
 ...mponent.Factory_test.DaggerSimpleComponent |   2 +-
 ...mponent.Builder_test.DaggerSimpleComponent |   2 +-
 ...mponent.Factory_test.DaggerSimpleComponent |   2 +-
 ...mponent.Builder_test.DaggerSimpleComponent |   2 +-
 ...mponent.Factory_test.DaggerSimpleComponent |   2 +-
 ...mponent.Builder_test.DaggerSimpleComponent |   2 +-
 ...mponent.Factory_test.DaggerSimpleComponent |   2 +-
 ...mponent.Builder_test.DaggerSimpleComponent |   2 +-
 ...mponent.Factory_test.DaggerSimpleComponent |   2 +-
 ...mponent.Builder_test.DaggerSimpleComponent |   2 +-
 ...mponent.Factory_test.DaggerSimpleComponent |   2 +-
 ...ames_DEFAULT_MODE_test.DaggerTestComponent |   2 +-
 ...es_FAST_INIT_MODE_test.DaggerTestComponent |   2 +-
 ...endency_DEFAULT_MODE_test.DaggerBComponent |   4 +-
 ...dency_FAST_INIT_MODE_test.DaggerBComponent |   4 +-
 ...endency_DEFAULT_MODE_test.DaggerBComponent |   4 +-
 ...dency_FAST_INIT_MODE_test.DaggerBComponent |   4 +-
 ...on_DEFAULT_MODE_test.DaggerSimpleComponent |   4 +-
 ..._FAST_INIT_MODE_test.DaggerSimpleComponent |   4 +-
 ...hodInParent_DEFAULT_MODE_test.DaggerParent |   6 +-
 ...dInParent_FAST_INIT_MODE_test.DaggerParent |   6 +-
 ...dule_DEFAULT_MODE_test.DaggerTestComponent |   4 +-
 ...le_FAST_INIT_MODE_test.DaggerTestComponent |   4 +-
 ...dule_DEFAULT_MODE_test.DaggerTestComponent |   4 +-
 ...le_FAST_INIT_MODE_test.DaggerTestComponent |   4 +-
 ...endency_DEFAULT_MODE_test.DaggerBComponent |   4 +-
 ...dency_FAST_INIT_MODE_test.DaggerBComponent |   4 +-
 ...pe_DEFAULT_MODE_test.DaggerSimpleComponent |   4 +-
 ..._FAST_INIT_MODE_test.DaggerSimpleComponent |   4 +-
 ...endency_DEFAULT_MODE_test.DaggerBComponent |   4 +-
 ...dency_FAST_INIT_MODE_test.DaggerBComponent |   4 +-
 ...llision_DEFAULT_MODE_test.DaggerBComponent |   6 +-
 ...ision_FAST_INIT_MODE_test.DaggerBComponent |   6 +-
 ...mObject_DEFAULT_MODE_test.DaggerBComponent |   2 +-
 ...bject_FAST_INIT_MODE_test.DaggerBComponent |   2 +-
 ...fier_DEFAULT_MODE_test.DaggerTestComponent |   2 +-
 ...er_FAST_INIT_MODE_test.DaggerTestComponent |   2 +-
 ...on_DEFAULT_MODE_test.DaggerSimpleComponent |   2 +-
 ..._FAST_INIT_MODE_test.DaggerSimpleComponent |   2 +-
 ...fier_DEFAULT_MODE_test.DaggerTestComponent |   2 +-
 ...er_FAST_INIT_MODE_test.DaggerTestComponent |   2 +-
 ...sion_DEFAULT_MODE_test.DaggerTestComponent |   2 +-
 ...on_FAST_INIT_MODE_test.DaggerTestComponent |   2 +-
 ...tive_DEFAULT_MODE_test.DaggerTestComponent |   2 +-
 ...ve_FAST_INIT_MODE_test.DaggerTestComponent |   2 +-
 ...ider_DEFAULT_MODE_test.DaggerTestComponent |   2 +-
 ...er_FAST_INIT_MODE_test.DaggerTestComponent |   2 +-
 ...endency_DEFAULT_MODE_test.DaggerBComponent |   4 +-
 ...dency_FAST_INIT_MODE_test.DaggerBComponent |   4 +-
 ...alifiedThis_DEFAULT_MODE_test.DaggerParent |   8 +-
 ...ifiedThis_FAST_INIT_MODE_test.DaggerParent |   8 +-
 ...Type_DEFAULT_MODE_test.DaggerTestComponent |   6 +-
 ...pe_FAST_INIT_MODE_test.DaggerTestComponent |   4 +-
 ...pe_DEFAULT_MODE_test.DaggerPublicComponent |   2 +-
 ..._FAST_INIT_MODE_test.DaggerPublicComponent |   2 +-
 ...rder_DEFAULT_MODE_test.DaggerTestComponent |   4 +-
 ...er_FAST_INIT_MODE_test.DaggerTestComponent |   4 +-
 ..._MODE_test.DaggerOuterType_SimpleComponent |   2 +-
 ..._MODE_test.DaggerOuterType_SimpleComponent |   2 +-
 ...nt_DEFAULT_MODE_test.DaggerSimpleComponent |   2 +-
 ..._FAST_INIT_MODE_test.DaggerSimpleComponent |   4 +-
 ...ep_DEFAULT_MODE_test.DaggerSimpleComponent |   2 +-
 ..._FAST_INIT_MODE_test.DaggerSimpleComponent |   2 +-
 ...od_DEFAULT_MODE_test.DaggerSimpleComponent |   2 +-
 ..._FAST_INIT_MODE_test.DaggerSimpleComponent |   2 +-
 ...UsedInGraph_DEFAULT_MODE_test.DaggerParent |   2 +-
 ...edInGraph_FAST_INIT_MODE_test.DaggerParent |   2 +-
 ...Deps_DEFAULT_MODE_test.DaggerTestComponent |   2 +-
 ...ps_FAST_INIT_MODE_test.DaggerTestComponent |   2 +-
 ...tComponents_DEFAULT_MODE_test.DaggerParent |   2 +-
 ...omponents_FAST_INIT_MODE_test.DaggerParent |   2 +-
 ...eeds_DEFAULT_MODE_test.DaggerTestComponent |   4 +-
 ...ds_FAST_INIT_MODE_test.DaggerTestComponent |   4 +-
 ...ance_DEFAULT_MODE_test.DaggerTestComponent |   2 +-
 ...ce_FAST_INIT_MODE_test.DaggerTestComponent |   2 +-
 ...nces_DEFAULT_MODE_test.DaggerTestComponent |   4 +-
 ...es_FAST_INIT_MODE_test.DaggerTestComponent |   4 +-
 ...nent_DEFAULT_MODE_test.DaggerTestComponent |  12 +-
 ...nt_FAST_INIT_MODE_test.DaggerTestComponent |  12 +-
 ...thod_DEFAULT_MODE_test.DaggerTestComponent |   3 +-
 ...od_FAST_INIT_MODE_test.DaggerTestComponent |   3 +-
 ...ance_DEFAULT_MODE_test.DaggerTestComponent |   5 +-
 ...ce_FAST_INIT_MODE_test.DaggerTestComponent |   3 +-
 ...ance_DEFAULT_MODE_test.DaggerTestComponent |   3 +-
 ...ce_FAST_INIT_MODE_test.DaggerTestComponent |   3 +-
 ...agger.internal.codegen.DaggerTestComponent |  13 +-
 ...agger.internal.codegen.DaggerTestComponent |  13 +-
 ...agger.internal.codegen.DaggerTestComponent |  24 +--
 ...agger.internal.codegen.DaggerTestComponent |  24 +--
 ...agger.internal.codegen.DaggerTestComponent |  14 +-
 ...agger.internal.codegen.DaggerTestComponent |  14 +-
 ...otationDisabled_test.DaggerSimpleComponent |   4 +-
 ...tationSucceeded_test.DaggerSimpleComponent |   4 +-
 ...tationSucceeded_test.DaggerSimpleComponent |   2 +-
 ..._get_DEFAULT_MODE_test.DaggerTestComponent |   4 +-
 ...et_FAST_INIT_MODE_test.DaggerTestComponent |   4 +-
 ...Type_DEFAULT_MODE_test.DaggerTestComponent |   2 +-
 ...pe_FAST_INIT_MODE_test.DaggerTestComponent |   4 +-
 ...inds_DEFAULT_MODE_test.DaggerTestComponent |   2 +-
 ...ds_FAST_INIT_MODE_test.DaggerTestComponent |   4 +-
 ..._MODE_test.DaggerRequestsSubtypeAsProvider |   2 +-
 ..._MODE_test.DaggerRequestsSubtypeAsProvider |   4 +-
 ...Type_DEFAULT_MODE_test.DaggerTestComponent |   4 +-
 ...pe_FAST_INIT_MODE_test.DaggerTestComponent |   4 +-
 ...cope_DEFAULT_MODE_test.DaggerTestComponent |   6 +-
 ...pe_FAST_INIT_MODE_test.DaggerTestComponent |   6 +-
 ...heck_DEFAULT_MODE_test.DaggerTestComponent |  10 +-
 ...ck_FAST_INIT_MODE_test.DaggerTestComponent |  12 +-
 ...heck_DEFAULT_MODE_test.DaggerTestComponent |   8 +-
 ...ck_FAST_INIT_MODE_test.DaggerTestComponent |  10 +-
 ...oped_DEFAULT_MODE_test.DaggerTestComponent |   6 +-
 ...ed_FAST_INIT_MODE_test.DaggerTestComponent |   6 +-
 ...nt_DEFAULT_MODE_test.DaggerSimpleComponent |   6 +-
 ..._FAST_INIT_MODE_test.DaggerSimpleComponent |   6 +-
 ...nt_DEFAULT_MODE_test.DaggerSimpleComponent |   2 +-
 ..._FAST_INIT_MODE_test.DaggerSimpleComponent |   2 +-
 ...ed_DEFAULT_MODE_test.DaggerSimpleComponent |   6 +-
 ..._FAST_INIT_MODE_test.DaggerSimpleComponent |   6 +-
 ...oped_DEFAULT_MODE_test.DaggerTestComponent |   8 +-
 ...ed_FAST_INIT_MODE_test.DaggerTestComponent |   8 +-
 ...Loop_DEFAULT_MODE_test.DaggerTestComponent |   6 +-
 ...op_FAST_INIT_MODE_test.DaggerTestComponent |   6 +-
 ...ound_DEFAULT_MODE_test.DaggerTestComponent |   4 +-
 ...nd_FAST_INIT_MODE_test.DaggerTestComponent |   6 +-
 ...lict_DEFAULT_MODE_test.DaggerTestComponent |   2 +-
 ...ct_FAST_INIT_MODE_test.DaggerTestComponent |   2 +-
 ...Keys_DEFAULT_MODE_test.DaggerTestComponent |   6 +-
 ...ys_FAST_INIT_MODE_test.DaggerTestComponent |   6 +-
 ...ding_DEFAULT_MODE_test.DaggerTestComponent |   2 +-
 ...ng_FAST_INIT_MODE_test.DaggerTestComponent |   2 +-
 ...mKey_DEFAULT_MODE_test.DaggerTestComponent |   8 +-
 ...ey_FAST_INIT_MODE_test.DaggerTestComponent |   8 +-
 ...Keys_DEFAULT_MODE_test.DaggerTestComponent |  10 +-
 ...ys_FAST_INIT_MODE_test.DaggerTestComponent |  10 +-
 ...alue_DEFAULT_MODE_test.DaggerTestComponent |   8 +-
 ...ue_FAST_INIT_MODE_test.DaggerTestComponent |   4 +-
 ...gKey_DEFAULT_MODE_test.DaggerTestComponent |   8 +-
 ...ey_FAST_INIT_MODE_test.DaggerTestComponent |   8 +-
 ...dKey_DEFAULT_MODE_test.DaggerTestComponent |   8 +-
 ...ey_FAST_INIT_MODE_test.DaggerTestComponent |  14 +-
 ...ible_DEFAULT_MODE_test.DaggerTestComponent |   2 +-
 ...le_FAST_INIT_MODE_test.DaggerTestComponent |   2 +-
 ...ings_DEFAULT_MODE_test.DaggerTestComponent |   2 +-
 ...gs_FAST_INIT_MODE_test.DaggerTestComponent |  10 +-
 ...ents_DEFAULT_MODE_test.DaggerTestComponent |   4 +-
 ...ts_FAST_INIT_MODE_test.DaggerTestComponent |   4 +-
 ...tedBindings_DEFAULT_MODE_test.DaggerParent |   4 +-
 ...dBindings_FAST_INIT_MODE_test.DaggerParent |   4 +-
 ...ible_DEFAULT_MODE_test.DaggerTestComponent |   2 +-
 ...le_FAST_INIT_MODE_test.DaggerTestComponent |   2 +-
 ...ings_DEFAULT_MODE_test.DaggerTestComponent |   4 +-
 ...gs_FAST_INIT_MODE_test.DaggerTestComponent |  18 +-
 ...ents_DEFAULT_MODE_test.DaggerTestComponent |   2 +-
 ...ts_FAST_INIT_MODE_test.DaggerTestComponent |   2 +-
 ...tedBindings_DEFAULT_MODE_test.DaggerParent |   4 +-
 ...dBindings_FAST_INIT_MODE_test.DaggerParent |   4 +-
 ...lity_DEFAULT_MODE_test.DaggerTestComponent |   4 +-
 ...ty_FAST_INIT_MODE_test.DaggerTestComponent |   4 +-
 ...Type_DEFAULT_MODE_test.DaggerTestComponent |   4 +-
 ...pe_FAST_INIT_MODE_test.DaggerTestComponent |   4 +-
 ...type_DEFAULT_MODE_test.DaggerTestComponent |   2 +-
 ...pe_FAST_INIT_MODE_test.DaggerTestComponent |   2 +-
 ...bers_DEFAULT_MODE_test.DaggerTestComponent |   2 +-
 ...rs_FAST_INIT_MODE_test.DaggerTestComponent |   2 +-
 ...type_DEFAULT_MODE_test.DaggerTestComponent |   4 +-
 ...pe_FAST_INIT_MODE_test.DaggerTestComponent |   4 +-
 ...ponent_DEFAULT_MODE_test.DaggerMyComponent |  10 +-
 ...nent_FAST_INIT_MODE_test.DaggerMyComponent |  10 +-
 ...inding_DEFAULT_MODE_test.DaggerMyComponent |   2 +-
 ...ding_FAST_INIT_MODE_test.DaggerMyComponent |   2 +-
 ...nSites_DEFAULT_MODE_test.DaggerMyComponent |   2 +-
 ...ites_FAST_INIT_MODE_test.DaggerMyComponent |   2 +-
 ...ings_DEFAULT_MODE_test.DaggerTestComponent |   2 +-
 ...gs_FAST_INIT_MODE_test.DaggerTestComponent |   4 +-
 ...ture_DEFAULT_MODE_test.DaggerTestComponent |   2 +-
 ...re_FAST_INIT_MODE_test.DaggerTestComponent |   2 +-
 ...Constructor_DEFAULT_MODE_test.DaggerParent |   6 +-
 ...nstructor_FAST_INIT_MODE_test.DaggerParent |   6 +-
 ..._MODE_test.DaggerTestClass_SimpleComponent |  16 +-
 ..._MODE_test.DaggerTestClass_SimpleComponent |  16 +-
 ...ible_DEFAULT_MODE_test.DaggerTestComponent |   4 +-
 ...le_FAST_INIT_MODE_test.DaggerTestComponent |   4 +-
 ...ents_DEFAULT_MODE_test.DaggerTestComponent |   4 +-
 ...ts_FAST_INIT_MODE_test.DaggerTestComponent |   4 +-
 ...ings_DEFAULT_MODE_test.DaggerTestComponent |   2 +-
 ...gs_FAST_INIT_MODE_test.DaggerTestComponent |   2 +-
 ...ings_DEFAULT_MODE_test.DaggerTestComponent |   4 +-
 ...gs_FAST_INIT_MODE_test.DaggerTestComponent |   4 +-
 ...ible_DEFAULT_MODE_test.DaggerTestComponent |   4 +-
 ...le_FAST_INIT_MODE_test.DaggerTestComponent |   4 +-
 ...ents_DEFAULT_MODE_test.DaggerTestComponent |   4 +-
 ...ts_FAST_INIT_MODE_test.DaggerTestComponent |   4 +-
 ...ings_DEFAULT_MODE_test.DaggerTestComponent |   2 +-
 ...gs_FAST_INIT_MODE_test.DaggerTestComponent |   2 +-
 ...tedBindings_DEFAULT_MODE_test.DaggerParent |   4 +-
 ...dBindings_FAST_INIT_MODE_test.DaggerParent |   4 +-
 ...d=dagger.Subcomponent.Builder_test.DaggerC |   4 +-
 ...d=dagger.Subcomponent.Factory_test.DaggerC |   4 +-
 ...d=dagger.Subcomponent.Builder_test.DaggerC |   4 +-
 ...d=dagger.Subcomponent.Factory_test.DaggerC |   4 +-
 ...nt_DEFAULT_MODE_test.DaggerParentComponent |  12 +-
 ..._FAST_INIT_MODE_test.DaggerParentComponent |  12 +-
 ...nt_DEFAULT_MODE_test.DaggerParentComponent |  11 +-
 ..._FAST_INIT_MODE_test.DaggerParentComponent |  11 +-
 ...houldNotConflict_DEFAULT_MODE_test.DaggerC |   6 +-
 ...uldNotConflict_FAST_INIT_MODE_test.DaggerC |   6 +-
 ...ry_DEFAULT_MODE_test.DaggerParentComponent |   6 +-
 ..._FAST_INIT_MODE_test.DaggerParentComponent |   6 +-
 ...nflictWithParent_DEFAULT_MODE_test.DaggerC |   4 +-
 ...lictWithParent_FAST_INIT_MODE_test.DaggerC |   4 +-
 ...dInRoot_DEFAULT_MODE_DaggerParentComponent |   6 +-
 ...nRoot_FAST_INIT_MODE_DaggerParentComponent |   6 +-
 ...ed_DEFAULT_MODE_test.DaggerParentComponent |   6 +-
 ..._FAST_INIT_MODE_test.DaggerParentComponent |   6 +-
 ...ders_DEFAULT_MODE_test.DaggerTestComponent |   2 +-
 ...rs_FAST_INIT_MODE_test.DaggerTestComponent |   2 +-
 ...tors_DEFAULT_MODE_test.DaggerTestComponent |   4 +-
 ...rs_FAST_INIT_MODE_test.DaggerTestComponent |   4 +-
 ...nals_DEFAULT_MODE_test.DaggerTestComponent |   6 +-
 ...ls_FAST_INIT_MODE_test.DaggerTestComponent |   6 +-
 ...inds_DEFAULT_MODE_test.DaggerTestComponent |   4 +-
 ...ds_FAST_INIT_MODE_test.DaggerTestComponent |   6 +-
 ...Test_DEFAULT_MODE_test.DaggerTestComponent |   2 +-
 ...st_FAST_INIT_MODE_test.DaggerTestComponent | 204 +++++++++---------
 ...inds_DEFAULT_MODE_test.DaggerTestComponent |   2 +-
 ...ds_FAST_INIT_MODE_test.DaggerTestComponent |   4 +-
 .../kotlin/KspComponentProcessorTest.java     |  14 +-
 248 files changed, 701 insertions(+), 687 deletions(-)

diff --git a/java/dagger/internal/codegen/writing/ComponentImplementation.java b/java/dagger/internal/codegen/writing/ComponentImplementation.java
index 4583396c75b..5ef50018543 100644
--- a/java/dagger/internal/codegen/writing/ComponentImplementation.java
+++ b/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
diff --git a/java/dagger/internal/codegen/writing/FrameworkFieldInitializer.java b/java/dagger/internal/codegen/writing/FrameworkFieldInitializer.java
index 685dd1ab981..8f0fc5d3b5f 100644
--- a/java/dagger/internal/codegen/writing/FrameworkFieldInitializer.java
+++ b/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));
     }
diff --git a/java/dagger/internal/codegen/writing/PrivateMethodRequestRepresentation.java b/java/dagger/internal/codegen/writing/PrivateMethodRequestRepresentation.java
index fe973dcc007..871355c0e99 100644
--- a/java/dagger/internal/codegen/writing/PrivateMethodRequestRepresentation.java
+++ b/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",
diff --git a/java/dagger/internal/codegen/writing/SwitchingProviders.java b/java/dagger/internal/codegen/writing/SwitchingProviders.java
index 736f51529e7..09eacb4a536 100644
--- a/java/dagger/internal/codegen/writing/SwitchingProviders.java
+++ b/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();
     }
diff --git a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_assistedParamConflictsWithComponentFieldName_successfulyDeduped_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_assistedParamConflictsWithComponentFieldName_successfulyDeduped_DEFAULT_MODE_test.DaggerTestComponent
index 0f119c24abe..14bc29c75a4 100644
--- a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_assistedParamConflictsWithComponentFieldName_successfulyDeduped_DEFAULT_MODE_test.DaggerTestComponent
+++ b/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();
 
diff --git a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_assistedParamConflictsWithComponentFieldName_successfulyDeduped_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_assistedParamConflictsWithComponentFieldName_successfulyDeduped_FAST_INIT_MODE_test.DaggerTestComponent
index 34b0dfea730..a51c1203d62 100644
--- a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_assistedParamConflictsWithComponentFieldName_successfulyDeduped_FAST_INIT_MODE_test.DaggerTestComponent
+++ b/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();
 
diff --git a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_testAssistedFactoryCycle_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_testAssistedFactoryCycle_DEFAULT_MODE_test.DaggerTestComponent
index 00ee294fce7..bfcc642545f 100644
--- a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_testAssistedFactoryCycle_DEFAULT_MODE_test.DaggerTestComponent
+++ b/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();
 
diff --git a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_testAssistedFactoryCycle_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_testAssistedFactoryCycle_FAST_INIT_MODE_test.DaggerTestComponent
index cf3e61c04cd..c100f333606 100644
--- a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_testAssistedFactoryCycle_FAST_INIT_MODE_test.DaggerTestComponent
+++ b/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());
     }
 
diff --git a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_testAssistedFactory_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_testAssistedFactory_DEFAULT_MODE_test.DaggerTestComponent
index 0f119c24abe..14bc29c75a4 100644
--- a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_testAssistedFactory_DEFAULT_MODE_test.DaggerTestComponent
+++ b/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();
 
diff --git a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_testAssistedFactory_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_testAssistedFactory_FAST_INIT_MODE_test.DaggerTestComponent
index 7ab24ddda30..2e0ce732cb0 100644
--- a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_testAssistedFactory_FAST_INIT_MODE_test.DaggerTestComponent
+++ b/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();
 
diff --git a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_testMultipleAssistedFactoryInDifferentComponents_DEFAULT_MODE_test.DaggerMyComponent b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_testMultipleAssistedFactoryInDifferentComponents_DEFAULT_MODE_test.DaggerMyComponent
index b2e28315e95..072d302a952 100644
--- a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_testMultipleAssistedFactoryInDifferentComponents_DEFAULT_MODE_test.DaggerMyComponent
+++ b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_testMultipleAssistedFactoryInDifferentComponents_DEFAULT_MODE_test.DaggerMyComponent
@@ -44,11 +44,11 @@ final class DaggerMyComponent {
 
     private final MySubcomponentImpl mySubcomponentImpl = this;
 
-    private MyAssistedClass_Factory myAssistedClassProvider;
+    MyAssistedClass_Factory myAssistedClassProvider;
 
-    private Provider<MySubcomponentAssistedFactory> mySubcomponentAssistedFactoryProvider;
+    Provider<MySubcomponentAssistedFactory> mySubcomponentAssistedFactoryProvider;
 
-    private MySubcomponentImpl(MyComponentImpl myComponentImpl) {
+    MySubcomponentImpl(MyComponentImpl myComponentImpl) {
       this.myComponentImpl = myComponentImpl;
 
       initialize();
@@ -70,11 +70,11 @@ final class DaggerMyComponent {
   private static final class MyComponentImpl implements MyComponent {
     private final MyComponentImpl myComponentImpl = this;
 
-    private MyAssistedClass_Factory myAssistedClassProvider;
+    MyAssistedClass_Factory myAssistedClassProvider;
 
-    private Provider<MyComponentAssistedFactory> myComponentAssistedFactoryProvider;
+    Provider<MyComponentAssistedFactory> myComponentAssistedFactoryProvider;
 
-    private MyComponentImpl() {
+    MyComponentImpl() {
 
       initialize();
 
diff --git a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_testMultipleAssistedFactoryInDifferentComponents_FAST_INIT_MODE_test.DaggerMyComponent b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_testMultipleAssistedFactoryInDifferentComponents_FAST_INIT_MODE_test.DaggerMyComponent
index 2a236456835..e7f102ca779 100644
--- a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_testMultipleAssistedFactoryInDifferentComponents_FAST_INIT_MODE_test.DaggerMyComponent
+++ b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_testMultipleAssistedFactoryInDifferentComponents_FAST_INIT_MODE_test.DaggerMyComponent
@@ -45,9 +45,9 @@ final class DaggerMyComponent {
 
     private final MySubcomponentImpl mySubcomponentImpl = this;
 
-    private Provider<MySubcomponentAssistedFactory> mySubcomponentAssistedFactoryProvider;
+    Provider<MySubcomponentAssistedFactory> mySubcomponentAssistedFactoryProvider;
 
-    private MySubcomponentImpl(MyComponentImpl myComponentImpl) {
+    MySubcomponentImpl(MyComponentImpl myComponentImpl) {
       this.myComponentImpl = myComponentImpl;
 
       initialize();
@@ -99,9 +99,9 @@ final class DaggerMyComponent {
   private static final class MyComponentImpl implements MyComponent {
     private final MyComponentImpl myComponentImpl = this;
 
-    private Provider<MyComponentAssistedFactory> myComponentAssistedFactoryProvider;
+    Provider<MyComponentAssistedFactory> myComponentAssistedFactoryProvider;
 
-    private MyComponentImpl() {
+    MyComponentImpl() {
 
       initialize();
 
diff --git a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_testParameterizedAssistParam_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_testParameterizedAssistParam_DEFAULT_MODE_test.DaggerTestComponent
index daaf66546f9..ce9ca5c00b8 100644
--- a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_testParameterizedAssistParam_DEFAULT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_testParameterizedAssistParam_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<String> fooProvider;
+    Foo_Factory<String> fooProvider;
 
-    private Provider<FooFactory<String>> fooFactoryProvider;
+    Provider<FooFactory<String>> fooFactoryProvider;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
       initialize();
 
diff --git a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_testParameterizedAssistParam_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_testParameterizedAssistParam_FAST_INIT_MODE_test.DaggerTestComponent
index 41faaab09de..e6e995dc994 100644
--- a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_testParameterizedAssistParam_FAST_INIT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_testParameterizedAssistParam_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<String>> fooFactoryProvider;
+    Provider<FooFactory<String>> fooFactoryProvider;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
       initialize();
 
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentBuilderTest_testUsesBuildAndSetterNames_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/ComponentBuilderTest_testUsesBuildAndSetterNames_DEFAULT_MODE_test.DaggerTestComponent
index e2576aef48a..049cf15cfbd 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentBuilderTest_testUsesBuildAndSetterNames_DEFAULT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentBuilderTest_testUsesBuildAndSetterNames_DEFAULT_MODE_test.DaggerTestComponent
@@ -53,7 +53,7 @@ final class DaggerTestComponent {
 
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl(TestModule testModuleParam) {
+    TestComponentImpl(TestModule testModuleParam) {
       this.testModule = testModuleParam;
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentBuilderTest_testUsesBuildAndSetterNames_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/ComponentBuilderTest_testUsesBuildAndSetterNames_FAST_INIT_MODE_test.DaggerTestComponent
index e2576aef48a..049cf15cfbd 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentBuilderTest_testUsesBuildAndSetterNames_FAST_INIT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentBuilderTest_testUsesBuildAndSetterNames_FAST_INIT_MODE_test.DaggerTestComponent
@@ -53,7 +53,7 @@ final class DaggerTestComponent {
 
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl(TestModule testModuleParam) {
+    TestComponentImpl(TestModule testModuleParam) {
       this.testModule = testModuleParam;
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest_testCanInstantiateModulesUserCannotSet_compilerMode=DEFAULT_MODE, creatorKind=dagger.Component.Builder_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest_testCanInstantiateModulesUserCannotSet_compilerMode=DEFAULT_MODE, creatorKind=dagger.Component.Builder_test.DaggerTestComponent
index a4a94cb9516..8e61bb2793e 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest_testCanInstantiateModulesUserCannotSet_compilerMode=DEFAULT_MODE, creatorKind=dagger.Component.Builder_test.DaggerTestComponent	
+++ b/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest_testCanInstantiateModulesUserCannotSet_compilerMode=DEFAULT_MODE, creatorKind=dagger.Component.Builder_test.DaggerTestComponent	
@@ -41,7 +41,7 @@ final class DaggerTestComponent {
 
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl(TestModule testModuleParam) {
+    TestComponentImpl(TestModule testModuleParam) {
       this.testModule = testModuleParam;
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest_testCanInstantiateModulesUserCannotSet_compilerMode=DEFAULT_MODE, creatorKind=dagger.Component.Factory_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest_testCanInstantiateModulesUserCannotSet_compilerMode=DEFAULT_MODE, creatorKind=dagger.Component.Factory_test.DaggerTestComponent
index 6df65afb31f..bc0b65addfb 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest_testCanInstantiateModulesUserCannotSet_compilerMode=DEFAULT_MODE, creatorKind=dagger.Component.Factory_test.DaggerTestComponent	
+++ b/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest_testCanInstantiateModulesUserCannotSet_compilerMode=DEFAULT_MODE, creatorKind=dagger.Component.Factory_test.DaggerTestComponent	
@@ -41,7 +41,7 @@ final class DaggerTestComponent {
 
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl(TestModule testModuleParam) {
+    TestComponentImpl(TestModule testModuleParam) {
       this.testModule = testModuleParam;
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest_testCanInstantiateModulesUserCannotSet_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Component.Builder_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest_testCanInstantiateModulesUserCannotSet_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Component.Builder_test.DaggerTestComponent
index a4a94cb9516..8e61bb2793e 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest_testCanInstantiateModulesUserCannotSet_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Component.Builder_test.DaggerTestComponent	
+++ b/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest_testCanInstantiateModulesUserCannotSet_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Component.Builder_test.DaggerTestComponent	
@@ -41,7 +41,7 @@ final class DaggerTestComponent {
 
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl(TestModule testModuleParam) {
+    TestComponentImpl(TestModule testModuleParam) {
       this.testModule = testModuleParam;
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest_testCanInstantiateModulesUserCannotSet_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Component.Factory_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest_testCanInstantiateModulesUserCannotSet_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Component.Factory_test.DaggerTestComponent
index 6df65afb31f..bc0b65addfb 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest_testCanInstantiateModulesUserCannotSet_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Component.Factory_test.DaggerTestComponent	
+++ b/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest_testCanInstantiateModulesUserCannotSet_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Component.Factory_test.DaggerTestComponent	
@@ -41,7 +41,7 @@ final class DaggerTestComponent {
 
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl(TestModule testModuleParam) {
+    TestComponentImpl(TestModule testModuleParam) {
       this.testModule = testModuleParam;
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest_testCreatorWithBindsInstanceNoStaticCreateGenerated_compilerMode=DEFAULT_MODE, creatorKind=dagger.Component.Builder_test.DaggerSimpleComponent b/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest_testCreatorWithBindsInstanceNoStaticCreateGenerated_compilerMode=DEFAULT_MODE, creatorKind=dagger.Component.Builder_test.DaggerSimpleComponent
index ee2e44d3f01..77c65d8d11b 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest_testCreatorWithBindsInstanceNoStaticCreateGenerated_compilerMode=DEFAULT_MODE, creatorKind=dagger.Component.Builder_test.DaggerSimpleComponent	
+++ b/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest_testCreatorWithBindsInstanceNoStaticCreateGenerated_compilerMode=DEFAULT_MODE, creatorKind=dagger.Component.Builder_test.DaggerSimpleComponent	
@@ -47,7 +47,7 @@ final class DaggerSimpleComponent {
 
     private final SimpleComponentImpl simpleComponentImpl = this;
 
-    private SimpleComponentImpl(Object objectParam) {
+    SimpleComponentImpl(Object objectParam) {
       this.object = objectParam;
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest_testCreatorWithBindsInstanceNoStaticCreateGenerated_compilerMode=DEFAULT_MODE, creatorKind=dagger.Component.Factory_test.DaggerSimpleComponent b/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest_testCreatorWithBindsInstanceNoStaticCreateGenerated_compilerMode=DEFAULT_MODE, creatorKind=dagger.Component.Factory_test.DaggerSimpleComponent
index 17364a36a91..527fab7d48e 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest_testCreatorWithBindsInstanceNoStaticCreateGenerated_compilerMode=DEFAULT_MODE, creatorKind=dagger.Component.Factory_test.DaggerSimpleComponent	
+++ b/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest_testCreatorWithBindsInstanceNoStaticCreateGenerated_compilerMode=DEFAULT_MODE, creatorKind=dagger.Component.Factory_test.DaggerSimpleComponent	
@@ -39,7 +39,7 @@ final class DaggerSimpleComponent {
 
     private final SimpleComponentImpl simpleComponentImpl = this;
 
-    private SimpleComponentImpl(Object objectParam) {
+    SimpleComponentImpl(Object objectParam) {
       this.object = objectParam;
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest_testCreatorWithBindsInstanceNoStaticCreateGenerated_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Component.Builder_test.DaggerSimpleComponent b/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest_testCreatorWithBindsInstanceNoStaticCreateGenerated_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Component.Builder_test.DaggerSimpleComponent
index ee2e44d3f01..77c65d8d11b 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest_testCreatorWithBindsInstanceNoStaticCreateGenerated_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Component.Builder_test.DaggerSimpleComponent	
+++ b/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest_testCreatorWithBindsInstanceNoStaticCreateGenerated_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Component.Builder_test.DaggerSimpleComponent	
@@ -47,7 +47,7 @@ final class DaggerSimpleComponent {
 
     private final SimpleComponentImpl simpleComponentImpl = this;
 
-    private SimpleComponentImpl(Object objectParam) {
+    SimpleComponentImpl(Object objectParam) {
       this.object = objectParam;
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest_testCreatorWithBindsInstanceNoStaticCreateGenerated_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Component.Factory_test.DaggerSimpleComponent b/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest_testCreatorWithBindsInstanceNoStaticCreateGenerated_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Component.Factory_test.DaggerSimpleComponent
index 17364a36a91..527fab7d48e 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest_testCreatorWithBindsInstanceNoStaticCreateGenerated_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Component.Factory_test.DaggerSimpleComponent	
+++ b/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest_testCreatorWithBindsInstanceNoStaticCreateGenerated_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Component.Factory_test.DaggerSimpleComponent	
@@ -39,7 +39,7 @@ final class DaggerSimpleComponent {
 
     private final SimpleComponentImpl simpleComponentImpl = this;
 
-    private SimpleComponentImpl(Object objectParam) {
+    SimpleComponentImpl(Object objectParam) {
       this.object = objectParam;
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest_testCreatorWithPrimitiveBindsInstance_compilerMode=DEFAULT_MODE, creatorKind=dagger.Component.Builder_test.DaggerSimpleComponent b/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest_testCreatorWithPrimitiveBindsInstance_compilerMode=DEFAULT_MODE, creatorKind=dagger.Component.Builder_test.DaggerSimpleComponent
index 133f1415e0f..b242b758868 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest_testCreatorWithPrimitiveBindsInstance_compilerMode=DEFAULT_MODE, creatorKind=dagger.Component.Builder_test.DaggerSimpleComponent	
+++ b/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest_testCreatorWithPrimitiveBindsInstance_compilerMode=DEFAULT_MODE, creatorKind=dagger.Component.Builder_test.DaggerSimpleComponent	
@@ -47,7 +47,7 @@ final class DaggerSimpleComponent {
 
     private final SimpleComponentImpl simpleComponentImpl = this;
 
-    private SimpleComponentImpl(Integer iParam) {
+    SimpleComponentImpl(Integer iParam) {
       this.i = iParam;
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest_testCreatorWithPrimitiveBindsInstance_compilerMode=DEFAULT_MODE, creatorKind=dagger.Component.Factory_test.DaggerSimpleComponent b/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest_testCreatorWithPrimitiveBindsInstance_compilerMode=DEFAULT_MODE, creatorKind=dagger.Component.Factory_test.DaggerSimpleComponent
index ebc41b71bec..f8bdbe09644 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest_testCreatorWithPrimitiveBindsInstance_compilerMode=DEFAULT_MODE, creatorKind=dagger.Component.Factory_test.DaggerSimpleComponent	
+++ b/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest_testCreatorWithPrimitiveBindsInstance_compilerMode=DEFAULT_MODE, creatorKind=dagger.Component.Factory_test.DaggerSimpleComponent	
@@ -39,7 +39,7 @@ final class DaggerSimpleComponent {
 
     private final SimpleComponentImpl simpleComponentImpl = this;
 
-    private SimpleComponentImpl(Integer iParam) {
+    SimpleComponentImpl(Integer iParam) {
       this.i = iParam;
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest_testCreatorWithPrimitiveBindsInstance_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Component.Builder_test.DaggerSimpleComponent b/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest_testCreatorWithPrimitiveBindsInstance_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Component.Builder_test.DaggerSimpleComponent
index 133f1415e0f..b242b758868 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest_testCreatorWithPrimitiveBindsInstance_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Component.Builder_test.DaggerSimpleComponent	
+++ b/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest_testCreatorWithPrimitiveBindsInstance_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Component.Builder_test.DaggerSimpleComponent	
@@ -47,7 +47,7 @@ final class DaggerSimpleComponent {
 
     private final SimpleComponentImpl simpleComponentImpl = this;
 
-    private SimpleComponentImpl(Integer iParam) {
+    SimpleComponentImpl(Integer iParam) {
       this.i = iParam;
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest_testCreatorWithPrimitiveBindsInstance_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Component.Factory_test.DaggerSimpleComponent b/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest_testCreatorWithPrimitiveBindsInstance_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Component.Factory_test.DaggerSimpleComponent
index ebc41b71bec..f8bdbe09644 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest_testCreatorWithPrimitiveBindsInstance_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Component.Factory_test.DaggerSimpleComponent	
+++ b/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest_testCreatorWithPrimitiveBindsInstance_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Component.Factory_test.DaggerSimpleComponent	
@@ -39,7 +39,7 @@ final class DaggerSimpleComponent {
 
     private final SimpleComponentImpl simpleComponentImpl = this;
 
-    private SimpleComponentImpl(Integer iParam) {
+    SimpleComponentImpl(Integer iParam) {
       this.i = iParam;
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest_testEmptyCreator_compilerMode=DEFAULT_MODE, creatorKind=dagger.Component.Builder_test.DaggerSimpleComponent b/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest_testEmptyCreator_compilerMode=DEFAULT_MODE, creatorKind=dagger.Component.Builder_test.DaggerSimpleComponent
index 325c1011f56..51506f51a17 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest_testEmptyCreator_compilerMode=DEFAULT_MODE, creatorKind=dagger.Component.Builder_test.DaggerSimpleComponent	
+++ b/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest_testEmptyCreator_compilerMode=DEFAULT_MODE, creatorKind=dagger.Component.Builder_test.DaggerSimpleComponent	
@@ -39,7 +39,7 @@ final class DaggerSimpleComponent {
   private static final class SimpleComponentImpl implements SimpleComponent {
     private final SimpleComponentImpl simpleComponentImpl = this;
 
-    private SimpleComponentImpl() {
+    SimpleComponentImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest_testEmptyCreator_compilerMode=DEFAULT_MODE, creatorKind=dagger.Component.Factory_test.DaggerSimpleComponent b/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest_testEmptyCreator_compilerMode=DEFAULT_MODE, creatorKind=dagger.Component.Factory_test.DaggerSimpleComponent
index 4910ba92763..30f8d04b425 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest_testEmptyCreator_compilerMode=DEFAULT_MODE, creatorKind=dagger.Component.Factory_test.DaggerSimpleComponent	
+++ b/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest_testEmptyCreator_compilerMode=DEFAULT_MODE, creatorKind=dagger.Component.Factory_test.DaggerSimpleComponent	
@@ -39,7 +39,7 @@ final class DaggerSimpleComponent {
   private static final class SimpleComponentImpl implements SimpleComponent {
     private final SimpleComponentImpl simpleComponentImpl = this;
 
-    private SimpleComponentImpl() {
+    SimpleComponentImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest_testEmptyCreator_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Component.Builder_test.DaggerSimpleComponent b/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest_testEmptyCreator_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Component.Builder_test.DaggerSimpleComponent
index 325c1011f56..51506f51a17 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest_testEmptyCreator_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Component.Builder_test.DaggerSimpleComponent	
+++ b/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest_testEmptyCreator_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Component.Builder_test.DaggerSimpleComponent	
@@ -39,7 +39,7 @@ final class DaggerSimpleComponent {
   private static final class SimpleComponentImpl implements SimpleComponent {
     private final SimpleComponentImpl simpleComponentImpl = this;
 
-    private SimpleComponentImpl() {
+    SimpleComponentImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest_testEmptyCreator_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Component.Factory_test.DaggerSimpleComponent b/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest_testEmptyCreator_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Component.Factory_test.DaggerSimpleComponent
index 4910ba92763..30f8d04b425 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest_testEmptyCreator_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Component.Factory_test.DaggerSimpleComponent	
+++ b/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest_testEmptyCreator_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Component.Factory_test.DaggerSimpleComponent	
@@ -39,7 +39,7 @@ final class DaggerSimpleComponent {
   private static final class SimpleComponentImpl implements SimpleComponent {
     private final SimpleComponentImpl simpleComponentImpl = this;
 
-    private SimpleComponentImpl() {
+    SimpleComponentImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentFactoryTest_testUsesParameterNames_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/ComponentFactoryTest_testUsesParameterNames_DEFAULT_MODE_test.DaggerTestComponent
index a0178c51b39..575737279cd 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentFactoryTest_testUsesParameterNames_DEFAULT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentFactoryTest_testUsesParameterNames_DEFAULT_MODE_test.DaggerTestComponent
@@ -39,7 +39,7 @@ final class DaggerTestComponent {
 
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl(TestModule testModuleParam) {
+    TestComponentImpl(TestModule testModuleParam) {
       this.testModule = testModuleParam;
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentFactoryTest_testUsesParameterNames_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/ComponentFactoryTest_testUsesParameterNames_FAST_INIT_MODE_test.DaggerTestComponent
index a0178c51b39..575737279cd 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentFactoryTest_testUsesParameterNames_FAST_INIT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentFactoryTest_testUsesParameterNames_FAST_INIT_MODE_test.DaggerTestComponent
@@ -39,7 +39,7 @@ final class DaggerTestComponent {
 
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl(TestModule testModuleParam) {
+    TestComponentImpl(TestModule testModuleParam) {
       this.testModule = testModuleParam;
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_arrayComponentDependency_DEFAULT_MODE_test.DaggerBComponent b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_arrayComponentDependency_DEFAULT_MODE_test.DaggerBComponent
index 59ce365da61..e2caeb908c2 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_arrayComponentDependency_DEFAULT_MODE_test.DaggerBComponent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_arrayComponentDependency_DEFAULT_MODE_test.DaggerBComponent
@@ -47,9 +47,9 @@ final class DaggerBComponent {
   private static final class BComponentImpl implements BComponent {
     private final BComponentImpl bComponentImpl = this;
 
-    private Provider<String[]> stringsProvider;
+    Provider<String[]> stringsProvider;
 
-    private BComponentImpl(ArrayComponent arrayComponentParam) {
+    BComponentImpl(ArrayComponent arrayComponentParam) {
 
       initialize(arrayComponentParam);
 
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_arrayComponentDependency_FAST_INIT_MODE_test.DaggerBComponent b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_arrayComponentDependency_FAST_INIT_MODE_test.DaggerBComponent
index 10beda6ffdb..734ae41d418 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_arrayComponentDependency_FAST_INIT_MODE_test.DaggerBComponent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_arrayComponentDependency_FAST_INIT_MODE_test.DaggerBComponent
@@ -49,9 +49,9 @@ final class DaggerBComponent {
 
     private final BComponentImpl bComponentImpl = this;
 
-    private Provider<String[]> stringsProvider;
+    Provider<String[]> stringsProvider;
 
-    private BComponentImpl(ArrayComponent arrayComponentParam) {
+    BComponentImpl(ArrayComponent arrayComponentParam) {
       this.arrayComponent = arrayComponentParam;
       initialize(arrayComponentParam);
 
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentDependency_DEFAULT_MODE_test.DaggerBComponent b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentDependency_DEFAULT_MODE_test.DaggerBComponent
index 19f49ac485b..dbd9eb4906e 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentDependency_DEFAULT_MODE_test.DaggerBComponent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentDependency_DEFAULT_MODE_test.DaggerBComponent
@@ -47,9 +47,9 @@ final class DaggerBComponent {
   private static final class BComponentImpl implements BComponent {
     private final BComponentImpl bComponentImpl = this;
 
-    private Provider<A> aProvider;
+    Provider<A> aProvider;
 
-    private BComponentImpl(AComponent aComponentParam) {
+    BComponentImpl(AComponent aComponentParam) {
 
       initialize(aComponentParam);
 
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentDependency_FAST_INIT_MODE_test.DaggerBComponent b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentDependency_FAST_INIT_MODE_test.DaggerBComponent
index 990d8ca0233..aff92b762d8 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentDependency_FAST_INIT_MODE_test.DaggerBComponent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentDependency_FAST_INIT_MODE_test.DaggerBComponent
@@ -49,9 +49,9 @@ final class DaggerBComponent {
 
     private final BComponentImpl bComponentImpl = this;
 
-    private Provider<A> aProvider;
+    Provider<A> aProvider;
 
-    private BComponentImpl(AComponent aComponentParam) {
+    BComponentImpl(AComponent aComponentParam) {
       this.aComponent = aComponentParam;
       initialize(aComponentParam);
 
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentInjection_DEFAULT_MODE_test.DaggerSimpleComponent b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentInjection_DEFAULT_MODE_test.DaggerSimpleComponent
index 95c87733f5b..598280b2b3a 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentInjection_DEFAULT_MODE_test.DaggerSimpleComponent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentInjection_DEFAULT_MODE_test.DaggerSimpleComponent
@@ -43,9 +43,9 @@ final class DaggerSimpleComponent {
   private static final class SimpleComponentImpl implements SimpleComponent {
     private final SimpleComponentImpl simpleComponentImpl = this;
 
-    private Provider<SimpleComponent> simpleComponentProvider;
+    Provider<SimpleComponent> simpleComponentProvider;
 
-    private SimpleComponentImpl() {
+    SimpleComponentImpl() {
 
       initialize();
 
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentInjection_FAST_INIT_MODE_test.DaggerSimpleComponent b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentInjection_FAST_INIT_MODE_test.DaggerSimpleComponent
index 23bf0061029..c51a2114c8f 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentInjection_FAST_INIT_MODE_test.DaggerSimpleComponent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentInjection_FAST_INIT_MODE_test.DaggerSimpleComponent
@@ -43,9 +43,9 @@ final class DaggerSimpleComponent {
   private static final class SimpleComponentImpl implements SimpleComponent {
     private final SimpleComponentImpl simpleComponentImpl = this;
 
-    private Provider<SimpleComponent> simpleComponentProvider;
+    Provider<SimpleComponent> simpleComponentProvider;
 
-    private SimpleComponentImpl() {
+    SimpleComponentImpl() {
 
       initialize();
 
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentMethodInChildCallsComponentMethodInParent_DEFAULT_MODE_test.DaggerParent b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentMethodInChildCallsComponentMethodInParent_DEFAULT_MODE_test.DaggerParent
index df9d53371ce..86ba77dac54 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentMethodInChildCallsComponentMethodInParent_DEFAULT_MODE_test.DaggerParent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentMethodInChildCallsComponentMethodInParent_DEFAULT_MODE_test.DaggerParent
@@ -45,7 +45,7 @@ final class DaggerParent {
 
     private final ChildImpl childImpl = this;
 
-    private ChildImpl(ParentImpl parentImpl) {
+    ChildImpl(ParentImpl parentImpl) {
       this.parentImpl = parentImpl;
 
 
@@ -60,9 +60,9 @@ final class DaggerParent {
   private static final class ParentImpl implements Parent {
     private final ParentImpl parentImpl = this;
 
-    private Provider<Number> numberProvider;
+    Provider<Number> numberProvider;
 
-    private ParentImpl() {
+    ParentImpl() {
 
       initialize();
 
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentMethodInChildCallsComponentMethodInParent_FAST_INIT_MODE_test.DaggerParent b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentMethodInChildCallsComponentMethodInParent_FAST_INIT_MODE_test.DaggerParent
index e38e8f33baf..8d757535ea6 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentMethodInChildCallsComponentMethodInParent_FAST_INIT_MODE_test.DaggerParent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentMethodInChildCallsComponentMethodInParent_FAST_INIT_MODE_test.DaggerParent
@@ -45,7 +45,7 @@ final class DaggerParent {
 
     private final ChildImpl childImpl = this;
 
-    private ChildImpl(ParentImpl parentImpl) {
+    ChildImpl(ParentImpl parentImpl) {
       this.parentImpl = parentImpl;
 
 
@@ -60,9 +60,9 @@ final class DaggerParent {
   private static final class ParentImpl implements Parent {
     private final ParentImpl parentImpl = this;
 
-    private Provider<Number> numberProvider;
+    Provider<Number> numberProvider;
 
-    private ParentImpl() {
+    ParentImpl() {
 
       initialize();
 
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentWithAbstractModule_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentWithAbstractModule_DEFAULT_MODE_test.DaggerTestComponent
index 70d58b2e6c4..21b6783e63f 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentWithAbstractModule_DEFAULT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentWithAbstractModule_DEFAULT_MODE_test.DaggerTestComponent
@@ -41,12 +41,12 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
 
     }
 
-    private B b() {
+    B b() {
       return TestModule_BFactory.b(new C());
     }
 
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentWithAbstractModule_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentWithAbstractModule_FAST_INIT_MODE_test.DaggerTestComponent
index 70d58b2e6c4..21b6783e63f 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentWithAbstractModule_FAST_INIT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentWithAbstractModule_FAST_INIT_MODE_test.DaggerTestComponent
@@ -41,12 +41,12 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
 
     }
 
-    private B b() {
+    B b() {
       return TestModule_BFactory.b(new C());
     }
 
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentWithModule_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentWithModule_DEFAULT_MODE_test.DaggerTestComponent
index 70c1303df77..d9bb787145f 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentWithModule_DEFAULT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentWithModule_DEFAULT_MODE_test.DaggerTestComponent
@@ -54,12 +54,12 @@ final class DaggerTestComponent {
 
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl(TestModule testModuleParam) {
+    TestComponentImpl(TestModule testModuleParam) {
       this.testModule = testModuleParam;
 
     }
 
-    private B b() {
+    B b() {
       return TestModule_BFactory.b(testModule, new C());
     }
 
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentWithModule_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentWithModule_FAST_INIT_MODE_test.DaggerTestComponent
index 70c1303df77..d9bb787145f 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentWithModule_FAST_INIT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentWithModule_FAST_INIT_MODE_test.DaggerTestComponent
@@ -54,12 +54,12 @@ final class DaggerTestComponent {
 
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl(TestModule testModuleParam) {
+    TestComponentImpl(TestModule testModuleParam) {
       this.testModule = testModuleParam;
 
     }
 
-    private B b() {
+    B b() {
       return TestModule_BFactory.b(testModule, new C());
     }
 
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentWithNullableDependency_DEFAULT_MODE_test.DaggerBComponent b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentWithNullableDependency_DEFAULT_MODE_test.DaggerBComponent
index bae78e1627a..e0f7d74889f 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentWithNullableDependency_DEFAULT_MODE_test.DaggerBComponent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentWithNullableDependency_DEFAULT_MODE_test.DaggerBComponent
@@ -47,9 +47,9 @@ final class DaggerBComponent {
   private static final class BComponentImpl implements BComponent {
     private final BComponentImpl bComponentImpl = this;
 
-    private Provider<String> nullableStringProvider;
+    Provider<String> nullableStringProvider;
 
-    private BComponentImpl(NullableStringComponent nullableStringComponentParam) {
+    BComponentImpl(NullableStringComponent nullableStringComponentParam) {
 
       initialize(nullableStringComponentParam);
 
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentWithNullableDependency_FAST_INIT_MODE_test.DaggerBComponent b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentWithNullableDependency_FAST_INIT_MODE_test.DaggerBComponent
index c9130b1bb3a..8bfa7ee5e6c 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentWithNullableDependency_FAST_INIT_MODE_test.DaggerBComponent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentWithNullableDependency_FAST_INIT_MODE_test.DaggerBComponent
@@ -49,9 +49,9 @@ final class DaggerBComponent {
 
     private final BComponentImpl bComponentImpl = this;
 
-    private Provider<String> nullableStringProvider;
+    Provider<String> nullableStringProvider;
 
-    private BComponentImpl(NullableStringComponent nullableStringComponentParam) {
+    BComponentImpl(NullableStringComponent nullableStringComponentParam) {
       this.nullableStringComponent = nullableStringComponentParam;
       initialize(nullableStringComponentParam);
 
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentWithScope_DEFAULT_MODE_test.DaggerSimpleComponent b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentWithScope_DEFAULT_MODE_test.DaggerSimpleComponent
index 97f27e46706..1f542a3312f 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentWithScope_DEFAULT_MODE_test.DaggerSimpleComponent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentWithScope_DEFAULT_MODE_test.DaggerSimpleComponent
@@ -44,9 +44,9 @@ final class DaggerSimpleComponent {
   private static final class SimpleComponentImpl implements SimpleComponent {
     private final SimpleComponentImpl simpleComponentImpl = this;
 
-    private Provider<SomeInjectableType> someInjectableTypeProvider;
+    Provider<SomeInjectableType> someInjectableTypeProvider;
 
-    private SimpleComponentImpl() {
+    SimpleComponentImpl() {
 
       initialize();
 
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentWithScope_FAST_INIT_MODE_test.DaggerSimpleComponent b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentWithScope_FAST_INIT_MODE_test.DaggerSimpleComponent
index f3255ca25e4..fc56d97ab4b 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentWithScope_FAST_INIT_MODE_test.DaggerSimpleComponent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentWithScope_FAST_INIT_MODE_test.DaggerSimpleComponent
@@ -44,9 +44,9 @@ final class DaggerSimpleComponent {
   private static final class SimpleComponentImpl implements SimpleComponent {
     private final SimpleComponentImpl simpleComponentImpl = this;
 
-    private Provider<SomeInjectableType> someInjectableTypeProvider;
+    Provider<SomeInjectableType> someInjectableTypeProvider;
 
-    private SimpleComponentImpl() {
+    SimpleComponentImpl() {
 
       initialize();
 
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentWithTypeUseNullableDependency_DEFAULT_MODE_test.DaggerBComponent b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentWithTypeUseNullableDependency_DEFAULT_MODE_test.DaggerBComponent
index 8e0fc633b5f..7c1c464ab6a 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentWithTypeUseNullableDependency_DEFAULT_MODE_test.DaggerBComponent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentWithTypeUseNullableDependency_DEFAULT_MODE_test.DaggerBComponent
@@ -47,9 +47,9 @@ final class DaggerBComponent {
   private static final class BComponentImpl implements BComponent {
     private final BComponentImpl bComponentImpl = this;
 
-    private Provider<@Nullable String> nullableStringProvider;
+    Provider<@Nullable String> nullableStringProvider;
 
-    private BComponentImpl(NullableStringComponent nullableStringComponentParam) {
+    BComponentImpl(NullableStringComponent nullableStringComponentParam) {
 
       initialize(nullableStringComponentParam);
 
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentWithTypeUseNullableDependency_FAST_INIT_MODE_test.DaggerBComponent b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentWithTypeUseNullableDependency_FAST_INIT_MODE_test.DaggerBComponent
index d6f63afdbe1..48d12b1a8d9 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentWithTypeUseNullableDependency_FAST_INIT_MODE_test.DaggerBComponent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentWithTypeUseNullableDependency_FAST_INIT_MODE_test.DaggerBComponent
@@ -49,9 +49,9 @@ final class DaggerBComponent {
 
     private final BComponentImpl bComponentImpl = this;
 
-    private Provider<@Nullable String> nullableStringProvider;
+    Provider<@Nullable String> nullableStringProvider;
 
-    private BComponentImpl(NullableStringComponent nullableStringComponentParam) {
+    BComponentImpl(NullableStringComponent nullableStringComponentParam) {
       this.nullableStringComponent = nullableStringComponentParam;
       initialize(nullableStringComponentParam);
 
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_dependencyNameCollision_DEFAULT_MODE_test.DaggerBComponent b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_dependencyNameCollision_DEFAULT_MODE_test.DaggerBComponent
index a983d5a4314..38dba9c6721 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_dependencyNameCollision_DEFAULT_MODE_test.DaggerBComponent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_dependencyNameCollision_DEFAULT_MODE_test.DaggerBComponent
@@ -57,11 +57,11 @@ final class DaggerBComponent {
   private static final class BComponentImpl implements BComponent {
     private final BComponentImpl bComponentImpl = this;
 
-    private Provider<A> aProvider;
+    Provider<A> aProvider;
 
-    private Provider<pkg2.A> aProvider2;
+    Provider<pkg2.A> aProvider2;
 
-    private BComponentImpl(AComponent aComponentParam, pkg2.AComponent aComponentParam2) {
+    BComponentImpl(AComponent aComponentParam, pkg2.AComponent aComponentParam2) {
 
       initialize(aComponentParam, aComponentParam2);
 
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_dependencyNameCollision_FAST_INIT_MODE_test.DaggerBComponent b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_dependencyNameCollision_FAST_INIT_MODE_test.DaggerBComponent
index a595a9833d1..d8829b24fda 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_dependencyNameCollision_FAST_INIT_MODE_test.DaggerBComponent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_dependencyNameCollision_FAST_INIT_MODE_test.DaggerBComponent
@@ -61,11 +61,11 @@ final class DaggerBComponent {
 
     private final BComponentImpl bComponentImpl = this;
 
-    private Provider<A> aProvider;
+    Provider<A> aProvider;
 
-    private Provider<pkg2.A> aProvider2;
+    Provider<pkg2.A> aProvider2;
 
-    private BComponentImpl(AComponent aComponentParam, pkg2.AComponent aComponentParam2) {
+    BComponentImpl(AComponent aComponentParam, pkg2.AComponent aComponentParam2) {
       this.aComponent = aComponentParam;
       this.aComponent2 = aComponentParam2;
       initialize(aComponentParam, aComponentParam2);
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_ignoresDependencyMethodsFromObject_DEFAULT_MODE_test.DaggerBComponent b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_ignoresDependencyMethodsFromObject_DEFAULT_MODE_test.DaggerBComponent
index 009e4e87dba..be31a6d5645 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_ignoresDependencyMethodsFromObject_DEFAULT_MODE_test.DaggerBComponent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_ignoresDependencyMethodsFromObject_DEFAULT_MODE_test.DaggerBComponent
@@ -48,7 +48,7 @@ final class DaggerBComponent {
 
     private final BComponentImpl bComponentImpl = this;
 
-    private BComponentImpl(AComponent aComponentParam) {
+    BComponentImpl(AComponent aComponentParam) {
       this.aComponent = aComponentParam;
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_ignoresDependencyMethodsFromObject_FAST_INIT_MODE_test.DaggerBComponent b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_ignoresDependencyMethodsFromObject_FAST_INIT_MODE_test.DaggerBComponent
index 009e4e87dba..be31a6d5645 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_ignoresDependencyMethodsFromObject_FAST_INIT_MODE_test.DaggerBComponent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_ignoresDependencyMethodsFromObject_FAST_INIT_MODE_test.DaggerBComponent
@@ -48,7 +48,7 @@ final class DaggerBComponent {
 
     private final BComponentImpl bComponentImpl = this;
 
-    private BComponentImpl(AComponent aComponentParam) {
+    BComponentImpl(AComponent aComponentParam) {
       this.aComponent = aComponentParam;
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_justInTimeAtInjectConstructor_hasGeneratedQualifier_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_justInTimeAtInjectConstructor_hasGeneratedQualifier_DEFAULT_MODE_test.DaggerTestComponent
index af5d9b1f071..1c24bbf6619 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_justInTimeAtInjectConstructor_hasGeneratedQualifier_DEFAULT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_justInTimeAtInjectConstructor_hasGeneratedQualifier_DEFAULT_MODE_test.DaggerTestComponent
@@ -41,7 +41,7 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_justInTimeAtInjectConstructor_hasGeneratedQualifier_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_justInTimeAtInjectConstructor_hasGeneratedQualifier_FAST_INIT_MODE_test.DaggerTestComponent
index af5d9b1f071..1c24bbf6619 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_justInTimeAtInjectConstructor_hasGeneratedQualifier_FAST_INIT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_justInTimeAtInjectConstructor_hasGeneratedQualifier_FAST_INIT_MODE_test.DaggerTestComponent
@@ -41,7 +41,7 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_membersInjection_DEFAULT_MODE_test.DaggerSimpleComponent b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_membersInjection_DEFAULT_MODE_test.DaggerSimpleComponent
index c0b1ee82e98..8e0acf8b881 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_membersInjection_DEFAULT_MODE_test.DaggerSimpleComponent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_membersInjection_DEFAULT_MODE_test.DaggerSimpleComponent
@@ -42,7 +42,7 @@ final class DaggerSimpleComponent {
   private static final class SimpleComponentImpl implements SimpleComponent {
     private final SimpleComponentImpl simpleComponentImpl = this;
 
-    private SimpleComponentImpl() {
+    SimpleComponentImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_membersInjection_FAST_INIT_MODE_test.DaggerSimpleComponent b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_membersInjection_FAST_INIT_MODE_test.DaggerSimpleComponent
index c0b1ee82e98..8e0acf8b881 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_membersInjection_FAST_INIT_MODE_test.DaggerSimpleComponent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_membersInjection_FAST_INIT_MODE_test.DaggerSimpleComponent
@@ -42,7 +42,7 @@ final class DaggerSimpleComponent {
   private static final class SimpleComponentImpl implements SimpleComponent {
     private final SimpleComponentImpl simpleComponentImpl = this;
 
-    private SimpleComponentImpl() {
+    SimpleComponentImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_moduleHasGeneratedQualifier_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_moduleHasGeneratedQualifier_DEFAULT_MODE_test.DaggerTestComponent
index 4ce5ae91d07..410fa12945a 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_moduleHasGeneratedQualifier_DEFAULT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_moduleHasGeneratedQualifier_DEFAULT_MODE_test.DaggerTestComponent
@@ -41,7 +41,7 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_moduleHasGeneratedQualifier_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_moduleHasGeneratedQualifier_FAST_INIT_MODE_test.DaggerTestComponent
index 4ce5ae91d07..410fa12945a 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_moduleHasGeneratedQualifier_FAST_INIT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_moduleHasGeneratedQualifier_FAST_INIT_MODE_test.DaggerTestComponent
@@ -41,7 +41,7 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_moduleNameCollision_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_moduleNameCollision_DEFAULT_MODE_test.DaggerTestComponent
index 8e94a54e0e8..21034faf22e 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_moduleNameCollision_DEFAULT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_moduleNameCollision_DEFAULT_MODE_test.DaggerTestComponent
@@ -66,7 +66,7 @@ final class DaggerTestComponent {
 
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl(TestModule testModuleParam, other.test.TestModule testModuleParam2) {
+    TestComponentImpl(TestModule testModuleParam, other.test.TestModule testModuleParam2) {
       this.testModule = testModuleParam;
       this.testModule2 = testModuleParam2;
 
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_moduleNameCollision_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_moduleNameCollision_FAST_INIT_MODE_test.DaggerTestComponent
index 8e94a54e0e8..21034faf22e 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_moduleNameCollision_FAST_INIT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_moduleNameCollision_FAST_INIT_MODE_test.DaggerTestComponent
@@ -66,7 +66,7 @@ final class DaggerTestComponent {
 
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl(TestModule testModuleParam, other.test.TestModule testModuleParam2) {
+    TestComponentImpl(TestModule testModuleParam, other.test.TestModule testModuleParam2) {
       this.testModule = testModuleParam;
       this.testModule2 = testModuleParam2;
 
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_nullCheckingIgnoredWhenProviderReturnsPrimitive_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_nullCheckingIgnoredWhenProviderReturnsPrimitive_DEFAULT_MODE_test.DaggerTestComponent
index 7cadd4d87c7..34e54071c18 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_nullCheckingIgnoredWhenProviderReturnsPrimitive_DEFAULT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_nullCheckingIgnoredWhenProviderReturnsPrimitive_DEFAULT_MODE_test.DaggerTestComponent
@@ -42,7 +42,7 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_nullCheckingIgnoredWhenProviderReturnsPrimitive_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_nullCheckingIgnoredWhenProviderReturnsPrimitive_FAST_INIT_MODE_test.DaggerTestComponent
index 7cadd4d87c7..34e54071c18 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_nullCheckingIgnoredWhenProviderReturnsPrimitive_FAST_INIT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_nullCheckingIgnoredWhenProviderReturnsPrimitive_FAST_INIT_MODE_test.DaggerTestComponent
@@ -42,7 +42,7 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_nullIncorrectlyReturnedFromNonNullableInlinedProvider_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_nullIncorrectlyReturnedFromNonNullableInlinedProvider_DEFAULT_MODE_test.DaggerTestComponent
index 553c4a229e8..bd4a7f89ab1 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_nullIncorrectlyReturnedFromNonNullableInlinedProvider_DEFAULT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_nullIncorrectlyReturnedFromNonNullableInlinedProvider_DEFAULT_MODE_test.DaggerTestComponent
@@ -42,7 +42,7 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_nullIncorrectlyReturnedFromNonNullableInlinedProvider_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_nullIncorrectlyReturnedFromNonNullableInlinedProvider_FAST_INIT_MODE_test.DaggerTestComponent
index 553c4a229e8..bd4a7f89ab1 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_nullIncorrectlyReturnedFromNonNullableInlinedProvider_FAST_INIT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_nullIncorrectlyReturnedFromNonNullableInlinedProvider_FAST_INIT_MODE_test.DaggerTestComponent
@@ -42,7 +42,7 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_primitiveComponentDependency_DEFAULT_MODE_test.DaggerBComponent b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_primitiveComponentDependency_DEFAULT_MODE_test.DaggerBComponent
index aedfabdb0d2..b526a77006a 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_primitiveComponentDependency_DEFAULT_MODE_test.DaggerBComponent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_primitiveComponentDependency_DEFAULT_MODE_test.DaggerBComponent
@@ -47,9 +47,9 @@ final class DaggerBComponent {
   private static final class BComponentImpl implements BComponent {
     private final BComponentImpl bComponentImpl = this;
 
-    private Provider<Integer> iProvider;
+    Provider<Integer> iProvider;
 
-    private BComponentImpl(IntComponent intComponentParam) {
+    BComponentImpl(IntComponent intComponentParam) {
 
       initialize(intComponentParam);
 
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_primitiveComponentDependency_FAST_INIT_MODE_test.DaggerBComponent b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_primitiveComponentDependency_FAST_INIT_MODE_test.DaggerBComponent
index 2f5673bae22..1d9ab2e5a6a 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_primitiveComponentDependency_FAST_INIT_MODE_test.DaggerBComponent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_primitiveComponentDependency_FAST_INIT_MODE_test.DaggerBComponent
@@ -49,9 +49,9 @@ final class DaggerBComponent {
 
     private final BComponentImpl bComponentImpl = this;
 
-    private Provider<Integer> iProvider;
+    Provider<Integer> iProvider;
 
-    private BComponentImpl(IntComponent intComponentParam) {
+    BComponentImpl(IntComponent intComponentParam) {
       this.intComponent = intComponentParam;
       initialize(intComponentParam);
 
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_privateMethodUsedOnlyInChildDoesNotUseQualifiedThis_DEFAULT_MODE_test.DaggerParent b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_privateMethodUsedOnlyInChildDoesNotUseQualifiedThis_DEFAULT_MODE_test.DaggerParent
index 489e55703f8..c3a98ecf43a 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_privateMethodUsedOnlyInChildDoesNotUseQualifiedThis_DEFAULT_MODE_test.DaggerParent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_privateMethodUsedOnlyInChildDoesNotUseQualifiedThis_DEFAULT_MODE_test.DaggerParent
@@ -45,7 +45,7 @@ final class DaggerParent {
 
     private final ChildImpl childImpl = this;
 
-    private ChildImpl(ParentImpl parentImpl) {
+    ChildImpl(ParentImpl parentImpl) {
       this.parentImpl = parentImpl;
 
 
@@ -60,15 +60,15 @@ final class DaggerParent {
   private static final class ParentImpl implements Parent {
     private final ParentImpl parentImpl = this;
 
-    private Provider<Number> numberProvider;
+    Provider<Number> numberProvider;
 
-    private ParentImpl() {
+    ParentImpl() {
 
       initialize();
 
     }
 
-    private String string() {
+    String string() {
       return TestModule_StringFactory.string(numberProvider.get());
     }
 
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_privateMethodUsedOnlyInChildDoesNotUseQualifiedThis_FAST_INIT_MODE_test.DaggerParent b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_privateMethodUsedOnlyInChildDoesNotUseQualifiedThis_FAST_INIT_MODE_test.DaggerParent
index 22f50bc912b..4a3ceddc0a3 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_privateMethodUsedOnlyInChildDoesNotUseQualifiedThis_FAST_INIT_MODE_test.DaggerParent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_privateMethodUsedOnlyInChildDoesNotUseQualifiedThis_FAST_INIT_MODE_test.DaggerParent
@@ -45,7 +45,7 @@ final class DaggerParent {
 
     private final ChildImpl childImpl = this;
 
-    private ChildImpl(ParentImpl parentImpl) {
+    ChildImpl(ParentImpl parentImpl) {
       this.parentImpl = parentImpl;
 
 
@@ -60,15 +60,15 @@ final class DaggerParent {
   private static final class ParentImpl implements Parent {
     private final ParentImpl parentImpl = this;
 
-    private Provider<Number> numberProvider;
+    Provider<Number> numberProvider;
 
-    private ParentImpl() {
+    ParentImpl() {
 
       initialize();
 
     }
 
-    private String string() {
+    String string() {
       return TestModule_StringFactory.string(numberProvider.get());
     }
 
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_providerComponentType_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_providerComponentType_DEFAULT_MODE_test.DaggerTestComponent
index 7654c52d85e..27b2a94f1dd 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_providerComponentType_DEFAULT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_providerComponentType_DEFAULT_MODE_test.DaggerTestComponent
@@ -42,15 +42,15 @@ public final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private Provider<Foo> fooProvider;
+    Provider<Foo> fooProvider;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
       initialize();
 
     }
 
-    private Foo foo() {
+    Foo foo() {
       return new Foo(new Bar());
     }
 
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_providerComponentType_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_providerComponentType_FAST_INIT_MODE_test.DaggerTestComponent
index c9ae9dd422e..5b4ccfacf5b 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_providerComponentType_FAST_INIT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_providerComponentType_FAST_INIT_MODE_test.DaggerTestComponent
@@ -42,9 +42,9 @@ public final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private Provider<Foo> fooProvider;
+    Provider<Foo> fooProvider;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
       initialize();
 
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_publicComponentType_DEFAULT_MODE_test.DaggerPublicComponent b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_publicComponentType_DEFAULT_MODE_test.DaggerPublicComponent
index 9237934f863..376b2e26b16 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_publicComponentType_DEFAULT_MODE_test.DaggerPublicComponent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_publicComponentType_DEFAULT_MODE_test.DaggerPublicComponent
@@ -41,7 +41,7 @@ public final class DaggerPublicComponent {
   private static final class PublicComponentImpl implements PublicComponent {
     private final PublicComponentImpl publicComponentImpl = this;
 
-    private PublicComponentImpl() {
+    PublicComponentImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_publicComponentType_FAST_INIT_MODE_test.DaggerPublicComponent b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_publicComponentType_FAST_INIT_MODE_test.DaggerPublicComponent
index 9237934f863..376b2e26b16 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_publicComponentType_FAST_INIT_MODE_test.DaggerPublicComponent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_publicComponentType_FAST_INIT_MODE_test.DaggerPublicComponent
@@ -41,7 +41,7 @@ public final class DaggerPublicComponent {
   private static final class PublicComponentImpl implements PublicComponent {
     private final PublicComponentImpl publicComponentImpl = this;
 
-    private PublicComponentImpl() {
+    PublicComponentImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_resolutionOrder_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_resolutionOrder_DEFAULT_MODE_test.DaggerTestComponent
index cdb0fa7823c..51e2961f2d9 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_resolutionOrder_DEFAULT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_resolutionOrder_DEFAULT_MODE_test.DaggerTestComponent
@@ -41,12 +41,12 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
 
     }
 
-    private B b() {
+    B b() {
       return new B(new C());
     }
 
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_resolutionOrder_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_resolutionOrder_FAST_INIT_MODE_test.DaggerTestComponent
index cdb0fa7823c..51e2961f2d9 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_resolutionOrder_FAST_INIT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_resolutionOrder_FAST_INIT_MODE_test.DaggerTestComponent
@@ -41,12 +41,12 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
 
     }
 
-    private B b() {
+    B b() {
       return new B(new C());
     }
 
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_simpleComponentWithNesting_DEFAULT_MODE_test.DaggerOuterType_SimpleComponent b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_simpleComponentWithNesting_DEFAULT_MODE_test.DaggerOuterType_SimpleComponent
index c107cecebc1..9a728956783 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_simpleComponentWithNesting_DEFAULT_MODE_test.DaggerOuterType_SimpleComponent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_simpleComponentWithNesting_DEFAULT_MODE_test.DaggerOuterType_SimpleComponent
@@ -42,7 +42,7 @@ final class DaggerOuterType_SimpleComponent {
   private static final class SimpleComponentImpl implements OuterType.SimpleComponent {
     private final SimpleComponentImpl simpleComponentImpl = this;
 
-    private SimpleComponentImpl() {
+    SimpleComponentImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_simpleComponentWithNesting_FAST_INIT_MODE_test.DaggerOuterType_SimpleComponent b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_simpleComponentWithNesting_FAST_INIT_MODE_test.DaggerOuterType_SimpleComponent
index c107cecebc1..9a728956783 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_simpleComponentWithNesting_FAST_INIT_MODE_test.DaggerOuterType_SimpleComponent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_simpleComponentWithNesting_FAST_INIT_MODE_test.DaggerOuterType_SimpleComponent
@@ -42,7 +42,7 @@ final class DaggerOuterType_SimpleComponent {
   private static final class SimpleComponentImpl implements OuterType.SimpleComponent {
     private final SimpleComponentImpl simpleComponentImpl = this;
 
-    private SimpleComponentImpl() {
+    SimpleComponentImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_simpleComponent_DEFAULT_MODE_test.DaggerSimpleComponent b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_simpleComponent_DEFAULT_MODE_test.DaggerSimpleComponent
index 7dee796d24f..3638df4c4e0 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_simpleComponent_DEFAULT_MODE_test.DaggerSimpleComponent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_simpleComponent_DEFAULT_MODE_test.DaggerSimpleComponent
@@ -44,7 +44,7 @@ final class DaggerSimpleComponent {
   private static final class SimpleComponentImpl implements SimpleComponent {
     private final SimpleComponentImpl simpleComponentImpl = this;
 
-    private SimpleComponentImpl() {
+    SimpleComponentImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_simpleComponent_FAST_INIT_MODE_test.DaggerSimpleComponent b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_simpleComponent_FAST_INIT_MODE_test.DaggerSimpleComponent
index c85bae03d5a..841846398cf 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_simpleComponent_FAST_INIT_MODE_test.DaggerSimpleComponent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_simpleComponent_FAST_INIT_MODE_test.DaggerSimpleComponent
@@ -44,9 +44,9 @@ final class DaggerSimpleComponent {
   private static final class SimpleComponentImpl implements SimpleComponent {
     private final SimpleComponentImpl simpleComponentImpl = this;
 
-    private Provider<SomeInjectableType> someInjectableTypeProvider;
+    Provider<SomeInjectableType> someInjectableTypeProvider;
 
-    private SimpleComponentImpl() {
+    SimpleComponentImpl() {
 
       initialize();
 
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_simpleComponent_inheritedComponentMethodDep_DEFAULT_MODE_test.DaggerSimpleComponent b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_simpleComponent_inheritedComponentMethodDep_DEFAULT_MODE_test.DaggerSimpleComponent
index 04c2ad5e274..012af4eff33 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_simpleComponent_inheritedComponentMethodDep_DEFAULT_MODE_test.DaggerSimpleComponent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_simpleComponent_inheritedComponentMethodDep_DEFAULT_MODE_test.DaggerSimpleComponent
@@ -41,7 +41,7 @@ final class DaggerSimpleComponent {
   private static final class SimpleComponentImpl implements SimpleComponent {
     private final SimpleComponentImpl simpleComponentImpl = this;
 
-    private SimpleComponentImpl() {
+    SimpleComponentImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_simpleComponent_inheritedComponentMethodDep_FAST_INIT_MODE_test.DaggerSimpleComponent b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_simpleComponent_inheritedComponentMethodDep_FAST_INIT_MODE_test.DaggerSimpleComponent
index 04c2ad5e274..012af4eff33 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_simpleComponent_inheritedComponentMethodDep_FAST_INIT_MODE_test.DaggerSimpleComponent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_simpleComponent_inheritedComponentMethodDep_FAST_INIT_MODE_test.DaggerSimpleComponent
@@ -41,7 +41,7 @@ final class DaggerSimpleComponent {
   private static final class SimpleComponentImpl implements SimpleComponent {
     private final SimpleComponentImpl simpleComponentImpl = this;
 
-    private SimpleComponentImpl() {
+    SimpleComponentImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_simpleComponent_redundantComponentMethod_DEFAULT_MODE_test.DaggerSimpleComponent b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_simpleComponent_redundantComponentMethod_DEFAULT_MODE_test.DaggerSimpleComponent
index 04c2ad5e274..012af4eff33 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_simpleComponent_redundantComponentMethod_DEFAULT_MODE_test.DaggerSimpleComponent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_simpleComponent_redundantComponentMethod_DEFAULT_MODE_test.DaggerSimpleComponent
@@ -41,7 +41,7 @@ final class DaggerSimpleComponent {
   private static final class SimpleComponentImpl implements SimpleComponent {
     private final SimpleComponentImpl simpleComponentImpl = this;
 
-    private SimpleComponentImpl() {
+    SimpleComponentImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_simpleComponent_redundantComponentMethod_FAST_INIT_MODE_test.DaggerSimpleComponent b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_simpleComponent_redundantComponentMethod_FAST_INIT_MODE_test.DaggerSimpleComponent
index 04c2ad5e274..012af4eff33 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_simpleComponent_redundantComponentMethod_FAST_INIT_MODE_test.DaggerSimpleComponent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_simpleComponent_redundantComponentMethod_FAST_INIT_MODE_test.DaggerSimpleComponent
@@ -41,7 +41,7 @@ final class DaggerSimpleComponent {
   private static final class SimpleComponentImpl implements SimpleComponent {
     private final SimpleComponentImpl simpleComponentImpl = this;
 
-    private SimpleComponentImpl() {
+    SimpleComponentImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_subcomponentNotGeneratedIfNotUsedInGraph_DEFAULT_MODE_test.DaggerParent b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_subcomponentNotGeneratedIfNotUsedInGraph_DEFAULT_MODE_test.DaggerParent
index 2fd99c471c0..d0b9ee1b34e 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_subcomponentNotGeneratedIfNotUsedInGraph_DEFAULT_MODE_test.DaggerParent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_subcomponentNotGeneratedIfNotUsedInGraph_DEFAULT_MODE_test.DaggerParent
@@ -41,7 +41,7 @@ final class DaggerParent {
   private static final class ParentImpl implements Parent {
     private final ParentImpl parentImpl = this;
 
-    private ParentImpl() {
+    ParentImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_subcomponentNotGeneratedIfNotUsedInGraph_FAST_INIT_MODE_test.DaggerParent b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_subcomponentNotGeneratedIfNotUsedInGraph_FAST_INIT_MODE_test.DaggerParent
index 2fd99c471c0..d0b9ee1b34e 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_subcomponentNotGeneratedIfNotUsedInGraph_FAST_INIT_MODE_test.DaggerParent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_subcomponentNotGeneratedIfNotUsedInGraph_FAST_INIT_MODE_test.DaggerParent
@@ -41,7 +41,7 @@ final class DaggerParent {
   private static final class ParentImpl implements Parent {
     private final ParentImpl parentImpl = this;
 
-    private ParentImpl() {
+    ParentImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_transitiveModuleDeps_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_transitiveModuleDeps_DEFAULT_MODE_test.DaggerTestComponent
index e21c5091164..ce968653f2a 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_transitiveModuleDeps_DEFAULT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_transitiveModuleDeps_DEFAULT_MODE_test.DaggerTestComponent
@@ -41,7 +41,7 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_transitiveModuleDeps_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_transitiveModuleDeps_FAST_INIT_MODE_test.DaggerTestComponent
index e21c5091164..ce968653f2a 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_transitiveModuleDeps_FAST_INIT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_transitiveModuleDeps_FAST_INIT_MODE_test.DaggerTestComponent
@@ -41,7 +41,7 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_unusedSubcomponents_dontResolveExtraBindingsInParentComponents_DEFAULT_MODE_test.DaggerParent b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_unusedSubcomponents_dontResolveExtraBindingsInParentComponents_DEFAULT_MODE_test.DaggerParent
index 7bc733ed488..82a602eaa6f 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_unusedSubcomponents_dontResolveExtraBindingsInParentComponents_DEFAULT_MODE_test.DaggerParent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_unusedSubcomponents_dontResolveExtraBindingsInParentComponents_DEFAULT_MODE_test.DaggerParent
@@ -41,7 +41,7 @@ final class DaggerParent {
   private static final class ParentImpl implements Parent {
     private final ParentImpl parentImpl = this;
 
-    private ParentImpl() {
+    ParentImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_unusedSubcomponents_dontResolveExtraBindingsInParentComponents_FAST_INIT_MODE_test.DaggerParent b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_unusedSubcomponents_dontResolveExtraBindingsInParentComponents_FAST_INIT_MODE_test.DaggerParent
index 7bc733ed488..82a602eaa6f 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_unusedSubcomponents_dontResolveExtraBindingsInParentComponents_FAST_INIT_MODE_test.DaggerParent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_unusedSubcomponents_dontResolveExtraBindingsInParentComponents_FAST_INIT_MODE_test.DaggerParent
@@ -41,7 +41,7 @@ final class DaggerParent {
   private static final class ParentImpl implements Parent {
     private final ParentImpl parentImpl = this;
 
-    private ParentImpl() {
+    ParentImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProtectedTypeTest_componentAccessesProtectedType_succeeds_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/ComponentProtectedTypeTest_componentAccessesProtectedType_succeeds_DEFAULT_MODE_test.DaggerTestComponent
index 7f85c85a181..32f63736c85 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentProtectedTypeTest_componentAccessesProtectedType_succeeds_DEFAULT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentProtectedTypeTest_componentAccessesProtectedType_succeeds_DEFAULT_MODE_test.DaggerTestComponent
@@ -46,9 +46,9 @@ public final class DaggerTestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
     @SuppressWarnings("rawtypes")
-    private Provider protectedTypeProvider;
+    Provider protectedTypeProvider;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
       initialize();
 
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProtectedTypeTest_componentAccessesProtectedType_succeeds_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/ComponentProtectedTypeTest_componentAccessesProtectedType_succeeds_FAST_INIT_MODE_test.DaggerTestComponent
index d7c83f62686..dd9bb5062dc 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentProtectedTypeTest_componentAccessesProtectedType_succeeds_FAST_INIT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentProtectedTypeTest_componentAccessesProtectedType_succeeds_FAST_INIT_MODE_test.DaggerTestComponent
@@ -46,9 +46,9 @@ public final class DaggerTestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
     @SuppressWarnings("rawtypes")
-    private Provider protectedTypeProvider;
+    Provider protectedTypeProvider;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
       initialize();
 
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest_bindsInstance_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest_bindsInstance_DEFAULT_MODE_test.DaggerTestComponent
index 1a677ba85b9..24283cf66a6 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest_bindsInstance_DEFAULT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest_bindsInstance_DEFAULT_MODE_test.DaggerTestComponent
@@ -59,7 +59,7 @@ final class DaggerTestComponent {
 
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl(Integer iParam, List<String> listParam) {
+    TestComponentImpl(Integer iParam, List<String> listParam) {
       this.i = iParam;
       this.list = listParam;
 
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest_bindsInstance_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest_bindsInstance_FAST_INIT_MODE_test.DaggerTestComponent
index 1a677ba85b9..24283cf66a6 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest_bindsInstance_FAST_INIT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest_bindsInstance_FAST_INIT_MODE_test.DaggerTestComponent
@@ -59,7 +59,7 @@ final class DaggerTestComponent {
 
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl(Integer iParam, List<String> listParam) {
+    TestComponentImpl(Integer iParam, List<String> listParam) {
       this.i = iParam;
       this.list = listParam;
 
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest_componentInstances_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest_componentInstances_DEFAULT_MODE_test.DaggerTestComponent
index fe34d7bdf0f..3eca2c97083 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest_componentInstances_DEFAULT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest_componentInstances_DEFAULT_MODE_test.DaggerTestComponent
@@ -48,7 +48,7 @@ final class DaggerTestComponent {
 
     private final TestSubcomponentImpl testSubcomponentImpl = this;
 
-    private TestSubcomponentImpl(TestComponentImpl testComponentImpl) {
+    TestSubcomponentImpl(TestComponentImpl testComponentImpl) {
       this.testComponentImpl = testComponentImpl;
 
 
@@ -70,7 +70,7 @@ final class DaggerTestComponent {
 
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl(Dep depParam) {
+    TestComponentImpl(Dep depParam) {
       this.dep = depParam;
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest_componentInstances_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest_componentInstances_FAST_INIT_MODE_test.DaggerTestComponent
index fe34d7bdf0f..3eca2c97083 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest_componentInstances_FAST_INIT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest_componentInstances_FAST_INIT_MODE_test.DaggerTestComponent
@@ -48,7 +48,7 @@ final class DaggerTestComponent {
 
     private final TestSubcomponentImpl testSubcomponentImpl = this;
 
-    private TestSubcomponentImpl(TestComponentImpl testComponentImpl) {
+    TestSubcomponentImpl(TestComponentImpl testComponentImpl) {
       this.testComponentImpl = testComponentImpl;
 
 
@@ -70,7 +70,7 @@ final class DaggerTestComponent {
 
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl(Dep depParam) {
+    TestComponentImpl(Dep depParam) {
       this.dep = depParam;
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest_componentRequirementNeededInFactoryCreationOfSubcomponent_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest_componentRequirementNeededInFactoryCreationOfSubcomponent_DEFAULT_MODE_test.DaggerTestComponent
index 353bc444684..fa917437870 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest_componentRequirementNeededInFactoryCreationOfSubcomponent_DEFAULT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest_componentRequirementNeededInFactoryCreationOfSubcomponent_DEFAULT_MODE_test.DaggerTestComponent
@@ -57,11 +57,11 @@ final class DaggerTestComponent {
 
     private final TestSubcomponentImpl testSubcomponentImpl = this;
 
-    private Provider<Set<Object>> setOfObjectProvider;
+    Provider<Set<Object>> setOfObjectProvider;
 
-    private Provider<Object> reliesOnMultibindingProvider;
+    Provider<Object> reliesOnMultibindingProvider;
 
-    private TestSubcomponentImpl(TestComponentImpl testComponentImpl) {
+    TestSubcomponentImpl(TestComponentImpl testComponentImpl) {
       this.testComponentImpl = testComponentImpl;
 
       initialize();
@@ -85,11 +85,11 @@ final class DaggerTestComponent {
 
     private final TestComponentImpl testComponentImpl = this;
 
-    private Provider<Set<Object>> setOfObjectProvider;
+    Provider<Set<Object>> setOfObjectProvider;
 
-    private Provider<Object> reliesOnMultibindingProvider;
+    Provider<Object> reliesOnMultibindingProvider;
 
-    private TestComponentImpl(ParentModule parentModuleParam) {
+    TestComponentImpl(ParentModule parentModuleParam) {
       this.parentModule = parentModuleParam;
       initialize(parentModuleParam);
 
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest_componentRequirementNeededInFactoryCreationOfSubcomponent_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest_componentRequirementNeededInFactoryCreationOfSubcomponent_FAST_INIT_MODE_test.DaggerTestComponent
index 7e278838246..b0bd2306f1c 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest_componentRequirementNeededInFactoryCreationOfSubcomponent_FAST_INIT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest_componentRequirementNeededInFactoryCreationOfSubcomponent_FAST_INIT_MODE_test.DaggerTestComponent
@@ -57,16 +57,16 @@ final class DaggerTestComponent {
 
     private final TestSubcomponentImpl testSubcomponentImpl = this;
 
-    private Provider<Object> reliesOnMultibindingProvider;
+    Provider<Object> reliesOnMultibindingProvider;
 
-    private TestSubcomponentImpl(TestComponentImpl testComponentImpl) {
+    TestSubcomponentImpl(TestComponentImpl testComponentImpl) {
       this.testComponentImpl = testComponentImpl;
 
       initialize();
 
     }
 
-    private Set<Object> setOfObject() {
+    Set<Object> setOfObject() {
       return ImmutableSet.<Object>of(ParentModule_ContributionFactory.contribution(), ChildModule_ContributionFactory.contribution());
     }
 
@@ -112,15 +112,15 @@ final class DaggerTestComponent {
 
     private final TestComponentImpl testComponentImpl = this;
 
-    private Provider<Object> reliesOnMultibindingProvider;
+    Provider<Object> reliesOnMultibindingProvider;
 
-    private TestComponentImpl(ParentModule parentModuleParam) {
+    TestComponentImpl(ParentModule parentModuleParam) {
       this.parentModule = parentModuleParam;
       initialize(parentModuleParam);
 
     }
 
-    private Set<Object> setOfObject() {
+    Set<Object> setOfObject() {
       return ImmutableSet.<Object>of(ParentModule_ContributionFactory.contribution());
     }
 
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest_instanceModuleMethod_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest_instanceModuleMethod_DEFAULT_MODE_test.DaggerTestComponent
index ef794e6002c..9643cf87dab 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest_instanceModuleMethod_DEFAULT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest_instanceModuleMethod_DEFAULT_MODE_test.DaggerTestComponent
@@ -68,8 +68,7 @@ final class DaggerTestComponent {
 
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl(ParentModule parentModuleParam,
-        OtherPackageModule otherPackageModuleParam) {
+    TestComponentImpl(ParentModule parentModuleParam, OtherPackageModule otherPackageModuleParam) {
       this.parentModule = parentModuleParam;
       this.otherPackageModule = otherPackageModuleParam;
 
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest_instanceModuleMethod_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest_instanceModuleMethod_FAST_INIT_MODE_test.DaggerTestComponent
index ef794e6002c..9643cf87dab 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest_instanceModuleMethod_FAST_INIT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest_instanceModuleMethod_FAST_INIT_MODE_test.DaggerTestComponent
@@ -68,8 +68,7 @@ final class DaggerTestComponent {
 
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl(ParentModule parentModuleParam,
-        OtherPackageModule otherPackageModuleParam) {
+    TestComponentImpl(ParentModule parentModuleParam, OtherPackageModule otherPackageModuleParam) {
       this.parentModule = parentModuleParam;
       this.otherPackageModule = otherPackageModuleParam;
 
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest_testBindsNullableInstance_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest_testBindsNullableInstance_DEFAULT_MODE_test.DaggerTestComponent
index e48486193b9..5235450a415 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest_testBindsNullableInstance_DEFAULT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest_testBindsNullableInstance_DEFAULT_MODE_test.DaggerTestComponent
@@ -35,9 +35,10 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl(@Nullable Bar argParam) {
+    TestComponentImpl(@Nullable Bar argParam) {
 
 
     }
   }
-}
\ No newline at end of file
+}
+
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest_testBindsNullableInstance_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest_testBindsNullableInstance_FAST_INIT_MODE_test.DaggerTestComponent
index 95c16687644..5235450a415 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest_testBindsNullableInstance_FAST_INIT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest_testBindsNullableInstance_FAST_INIT_MODE_test.DaggerTestComponent
@@ -35,9 +35,10 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl(@Nullable Bar argParam) {
+    TestComponentImpl(@Nullable Bar argParam) {
 
 
     }
   }
 }
+
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest_testBindsTypeUseNullableInstance_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest_testBindsTypeUseNullableInstance_DEFAULT_MODE_test.DaggerTestComponent
index 95c16687644..5235450a415 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest_testBindsTypeUseNullableInstance_DEFAULT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest_testBindsTypeUseNullableInstance_DEFAULT_MODE_test.DaggerTestComponent
@@ -35,9 +35,10 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl(@Nullable Bar argParam) {
+    TestComponentImpl(@Nullable Bar argParam) {
 
 
     }
   }
 }
+
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest_testBindsTypeUseNullableInstance_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest_testBindsTypeUseNullableInstance_FAST_INIT_MODE_test.DaggerTestComponent
index 95c16687644..5235450a415 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest_testBindsTypeUseNullableInstance_FAST_INIT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest_testBindsTypeUseNullableInstance_FAST_INIT_MODE_test.DaggerTestComponent
@@ -35,9 +35,10 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl(@Nullable Bar argParam) {
+    TestComponentImpl(@Nullable Bar argParam) {
 
 
     }
   }
 }
+
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentShardTest_testNewShardCreatedWithDependencies_DEFAULT_MODE_dagger.internal.codegen.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/ComponentShardTest_testNewShardCreatedWithDependencies_DEFAULT_MODE_dagger.internal.codegen.DaggerTestComponent
index c89184dcdc9..fe5206e1c2c 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentShardTest_testNewShardCreatedWithDependencies_DEFAULT_MODE_dagger.internal.codegen.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentShardTest_testNewShardCreatedWithDependencies_DEFAULT_MODE_dagger.internal.codegen.DaggerTestComponent
@@ -46,17 +46,17 @@ final class DaggerTestComponent {
   }
 
   private static final class TestComponentImpl implements TestComponent {
-    private TestComponentImplShard testComponentImplShard;
+    TestComponentImplShard testComponentImplShard;
 
     private final Dependency dependency;
 
     private final TestComponentImpl testComponentImpl = this;
 
-    private Provider<Binding1> binding1Provider;
+    Provider<Binding1> binding1Provider;
 
-    private Provider<Binding2> binding2Provider;
+    Provider<Binding2> binding2Provider;
 
-    private TestComponentImpl(Dependency dependencyParam) {
+    TestComponentImpl(Dependency dependencyParam) {
       this.dependency = dependencyParam;
       initialize(dependencyParam);
       testComponentImplShard = new TestComponentImplShard(testComponentImpl, dependencyParam);
@@ -115,10 +115,9 @@ final class DaggerTestComponent {
   private static final class TestComponentImplShard {
     private final TestComponentImpl testComponentImpl;
 
-    private Provider<Binding3> binding3Provider;
+    Provider<Binding3> binding3Provider;
 
-    private TestComponentImplShard(TestComponentImpl testComponentImpl,
-        Dependency dependencyParam) {
+    TestComponentImplShard(TestComponentImpl testComponentImpl, Dependency dependencyParam) {
       this.testComponentImpl = testComponentImpl;
       initialize(dependencyParam);
     }
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentShardTest_testNewShardCreatedWithDependencies_FAST_INIT_MODE_dagger.internal.codegen.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/ComponentShardTest_testNewShardCreatedWithDependencies_FAST_INIT_MODE_dagger.internal.codegen.DaggerTestComponent
index 8c5c484f5b6..8e0d3faf91d 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentShardTest_testNewShardCreatedWithDependencies_FAST_INIT_MODE_dagger.internal.codegen.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentShardTest_testNewShardCreatedWithDependencies_FAST_INIT_MODE_dagger.internal.codegen.DaggerTestComponent
@@ -46,17 +46,17 @@ final class DaggerTestComponent {
   }
 
   private static final class TestComponentImpl implements TestComponent {
-    private TestComponentImplShard testComponentImplShard;
+    TestComponentImplShard testComponentImplShard;
 
     private final Dependency dependency;
 
     private final TestComponentImpl testComponentImpl = this;
 
-    private Provider<Binding1> binding1Provider;
+    Provider<Binding1> binding1Provider;
 
-    private Provider<Binding2> binding2Provider;
+    Provider<Binding2> binding2Provider;
 
-    private TestComponentImpl(Dependency dependencyParam) {
+    TestComponentImpl(Dependency dependencyParam) {
       this.dependency = dependencyParam;
       initialize(dependencyParam);
       testComponentImplShard = new TestComponentImplShard(testComponentImpl, dependencyParam);
@@ -127,10 +127,9 @@ final class DaggerTestComponent {
   private static final class TestComponentImplShard {
     private final TestComponentImpl testComponentImpl;
 
-    private Provider<Binding3> binding3Provider;
+    Provider<Binding3> binding3Provider;
 
-    private TestComponentImplShard(TestComponentImpl testComponentImpl,
-        Dependency dependencyParam) {
+    TestComponentImplShard(TestComponentImpl testComponentImpl, Dependency dependencyParam) {
       this.testComponentImpl = testComponentImpl;
       initialize(dependencyParam);
     }
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentShardTest_testNewShardCreated_DEFAULT_MODE_dagger.internal.codegen.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/ComponentShardTest_testNewShardCreated_DEFAULT_MODE_dagger.internal.codegen.DaggerTestComponent
index 68ee495a706..e614c407626 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentShardTest_testNewShardCreated_DEFAULT_MODE_dagger.internal.codegen.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentShardTest_testNewShardCreated_DEFAULT_MODE_dagger.internal.codegen.DaggerTestComponent
@@ -42,17 +42,17 @@ final class DaggerTestComponent {
   }
 
   private static final class TestComponentImpl implements TestComponent {
-    private TestComponentImplShard testComponentImplShard;
+    TestComponentImplShard testComponentImplShard;
 
-    private TestComponentImplShard2 testComponentImplShard2;
+    TestComponentImplShard2 testComponentImplShard2;
 
     private final TestComponentImpl testComponentImpl = this;
 
-    private Provider<Binding7> binding7Provider;
+    Provider<Binding7> binding7Provider;
 
-    private Provider<Binding6> binding6Provider;
+    Provider<Binding6> binding6Provider;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
       initialize();
       testComponentImplShard = new TestComponentImplShard(testComponentImpl);
@@ -139,15 +139,15 @@ final class DaggerTestComponent {
   private static final class TestComponentImplShard {
     private final TestComponentImpl testComponentImpl;
 
-    private Provider<Binding5> binding5Provider;
+    Provider<Binding5> binding5Provider;
 
-    private Provider<Binding2> binding2Provider;
+    Provider<Binding2> binding2Provider;
 
-    private Provider<Binding4> binding4Provider;
+    Provider<Binding4> binding4Provider;
 
-    private Provider<Binding3> binding3Provider;
+    Provider<Binding3> binding3Provider;
 
-    private TestComponentImplShard(TestComponentImpl testComponentImpl) {
+    TestComponentImplShard(TestComponentImpl testComponentImpl) {
       this.testComponentImpl = testComponentImpl;
       initialize();
     }
@@ -165,9 +165,9 @@ final class DaggerTestComponent {
   private static final class TestComponentImplShard2 {
     private final TestComponentImpl testComponentImpl;
 
-    private Provider<Binding1> binding1Provider;
+    Provider<Binding1> binding1Provider;
 
-    private TestComponentImplShard2(TestComponentImpl testComponentImpl) {
+    TestComponentImplShard2(TestComponentImpl testComponentImpl) {
       this.testComponentImpl = testComponentImpl;
       initialize();
     }
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentShardTest_testNewShardCreated_FAST_INIT_MODE_dagger.internal.codegen.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/ComponentShardTest_testNewShardCreated_FAST_INIT_MODE_dagger.internal.codegen.DaggerTestComponent
index 7eabde2be6f..11b57a5b63d 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentShardTest_testNewShardCreated_FAST_INIT_MODE_dagger.internal.codegen.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentShardTest_testNewShardCreated_FAST_INIT_MODE_dagger.internal.codegen.DaggerTestComponent
@@ -42,17 +42,17 @@ final class DaggerTestComponent {
   }
 
   private static final class TestComponentImpl implements TestComponent {
-    private TestComponentImplShard testComponentImplShard;
+    TestComponentImplShard testComponentImplShard;
 
-    private TestComponentImplShard2 testComponentImplShard2;
+    TestComponentImplShard2 testComponentImplShard2;
 
     private final TestComponentImpl testComponentImpl = this;
 
-    private Provider<Binding7> binding7Provider;
+    Provider<Binding7> binding7Provider;
 
-    private Provider<Binding6> binding6Provider;
+    Provider<Binding6> binding6Provider;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
       initialize();
       testComponentImplShard = new TestComponentImplShard(testComponentImpl);
@@ -164,15 +164,15 @@ final class DaggerTestComponent {
   private static final class TestComponentImplShard {
     private final TestComponentImpl testComponentImpl;
 
-    private Provider<Binding5> binding5Provider;
+    Provider<Binding5> binding5Provider;
 
-    private Provider<Binding2> binding2Provider;
+    Provider<Binding2> binding2Provider;
 
-    private Provider<Binding4> binding4Provider;
+    Provider<Binding4> binding4Provider;
 
-    private Provider<Binding3> binding3Provider;
+    Provider<Binding3> binding3Provider;
 
-    private TestComponentImplShard(TestComponentImpl testComponentImpl) {
+    TestComponentImplShard(TestComponentImpl testComponentImpl) {
       this.testComponentImpl = testComponentImpl;
       initialize();
     }
@@ -221,9 +221,9 @@ final class DaggerTestComponent {
   private static final class TestComponentImplShard2 {
     private final TestComponentImpl testComponentImpl;
 
-    private Provider<Binding1> binding1Provider;
+    Provider<Binding1> binding1Provider;
 
-    private TestComponentImplShard2(TestComponentImpl testComponentImpl) {
+    TestComponentImplShard2(TestComponentImpl testComponentImpl) {
       this.testComponentImpl = testComponentImpl;
       initialize();
     }
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentShardTest_testNewShardSubcomponentCreated_DEFAULT_MODE_dagger.internal.codegen.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/ComponentShardTest_testNewShardSubcomponentCreated_DEFAULT_MODE_dagger.internal.codegen.DaggerTestComponent
index e71c32a6612..588e8dc3f32 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentShardTest_testNewShardSubcomponentCreated_DEFAULT_MODE_dagger.internal.codegen.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentShardTest_testNewShardSubcomponentCreated_DEFAULT_MODE_dagger.internal.codegen.DaggerTestComponent
@@ -41,17 +41,17 @@ final class DaggerTestComponent {
   }
 
   private static final class TestSubcomponentImpl implements TestSubcomponent {
-    private TestSubcomponentImplShard testSubcomponentImplShard;
+    TestSubcomponentImplShard testSubcomponentImplShard;
 
     private final TestComponentImpl testComponentImpl;
 
     private final TestSubcomponentImpl testSubcomponentImpl = this;
 
-    private Provider<Binding1> binding1Provider;
+    Provider<Binding1> binding1Provider;
 
-    private Provider<Binding2> binding2Provider;
+    Provider<Binding2> binding2Provider;
 
-    private TestSubcomponentImpl(TestComponentImpl testComponentImpl) {
+    TestSubcomponentImpl(TestComponentImpl testComponentImpl) {
       this.testComponentImpl = testComponentImpl;
 
       initialize();
@@ -98,7 +98,7 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
 
     }
@@ -114,9 +114,9 @@ final class DaggerTestComponent {
 
     private final TestSubcomponentImpl testSubcomponentImpl;
 
-    private Provider<Binding3> binding3Provider;
+    Provider<Binding3> binding3Provider;
 
-    private TestSubcomponentImplShard(TestComponentImpl testComponentImpl,
+    TestSubcomponentImplShard(TestComponentImpl testComponentImpl,
         TestSubcomponentImpl testSubcomponentImpl) {
       this.testComponentImpl = testComponentImpl;
       this.testSubcomponentImpl = testSubcomponentImpl;
diff --git a/javatests/dagger/internal/codegen/goldens/ComponentShardTest_testNewShardSubcomponentCreated_FAST_INIT_MODE_dagger.internal.codegen.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/ComponentShardTest_testNewShardSubcomponentCreated_FAST_INIT_MODE_dagger.internal.codegen.DaggerTestComponent
index effc67873ed..c48b9063ca2 100644
--- a/javatests/dagger/internal/codegen/goldens/ComponentShardTest_testNewShardSubcomponentCreated_FAST_INIT_MODE_dagger.internal.codegen.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/ComponentShardTest_testNewShardSubcomponentCreated_FAST_INIT_MODE_dagger.internal.codegen.DaggerTestComponent
@@ -41,17 +41,17 @@ final class DaggerTestComponent {
   }
 
   private static final class TestSubcomponentImpl implements TestSubcomponent {
-    private TestSubcomponentImplShard testSubcomponentImplShard;
+    TestSubcomponentImplShard testSubcomponentImplShard;
 
     private final TestComponentImpl testComponentImpl;
 
     private final TestSubcomponentImpl testSubcomponentImpl = this;
 
-    private Provider<Binding1> binding1Provider;
+    Provider<Binding1> binding1Provider;
 
-    private Provider<Binding2> binding2Provider;
+    Provider<Binding2> binding2Provider;
 
-    private TestSubcomponentImpl(TestComponentImpl testComponentImpl) {
+    TestSubcomponentImpl(TestComponentImpl testComponentImpl) {
       this.testComponentImpl = testComponentImpl;
 
       initialize();
@@ -127,7 +127,7 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
 
     }
@@ -143,9 +143,9 @@ final class DaggerTestComponent {
 
     private final TestSubcomponentImpl testSubcomponentImpl;
 
-    private Provider<Binding3> binding3Provider;
+    Provider<Binding3> binding3Provider;
 
-    private TestSubcomponentImplShard(TestComponentImpl testComponentImpl,
+    TestSubcomponentImplShard(TestComponentImpl testComponentImpl,
         TestSubcomponentImpl testSubcomponentImpl) {
       this.testComponentImpl = testComponentImpl;
       this.testSubcomponentImpl = testSubcomponentImpl;
diff --git a/javatests/dagger/internal/codegen/goldens/DaggerProcessingOptionsTest_testCmdLineOptionEnabledPrecedesAnnotationDisabled_test.DaggerSimpleComponent b/javatests/dagger/internal/codegen/goldens/DaggerProcessingOptionsTest_testCmdLineOptionEnabledPrecedesAnnotationDisabled_test.DaggerSimpleComponent
index c85bae03d5a..841846398cf 100644
--- a/javatests/dagger/internal/codegen/goldens/DaggerProcessingOptionsTest_testCmdLineOptionEnabledPrecedesAnnotationDisabled_test.DaggerSimpleComponent
+++ b/javatests/dagger/internal/codegen/goldens/DaggerProcessingOptionsTest_testCmdLineOptionEnabledPrecedesAnnotationDisabled_test.DaggerSimpleComponent
@@ -44,9 +44,9 @@ final class DaggerSimpleComponent {
   private static final class SimpleComponentImpl implements SimpleComponent {
     private final SimpleComponentImpl simpleComponentImpl = this;
 
-    private Provider<SomeInjectableType> someInjectableTypeProvider;
+    Provider<SomeInjectableType> someInjectableTypeProvider;
 
-    private SimpleComponentImpl() {
+    SimpleComponentImpl() {
 
       initialize();
 
diff --git a/javatests/dagger/internal/codegen/goldens/DaggerProcessingOptionsTest_testFastInitEnabledFromAnnotationSucceeded_test.DaggerSimpleComponent b/javatests/dagger/internal/codegen/goldens/DaggerProcessingOptionsTest_testFastInitEnabledFromAnnotationSucceeded_test.DaggerSimpleComponent
index c85bae03d5a..841846398cf 100644
--- a/javatests/dagger/internal/codegen/goldens/DaggerProcessingOptionsTest_testFastInitEnabledFromAnnotationSucceeded_test.DaggerSimpleComponent
+++ b/javatests/dagger/internal/codegen/goldens/DaggerProcessingOptionsTest_testFastInitEnabledFromAnnotationSucceeded_test.DaggerSimpleComponent
@@ -44,9 +44,9 @@ final class DaggerSimpleComponent {
   private static final class SimpleComponentImpl implements SimpleComponent {
     private final SimpleComponentImpl simpleComponentImpl = this;
 
-    private Provider<SomeInjectableType> someInjectableTypeProvider;
+    Provider<SomeInjectableType> someInjectableTypeProvider;
 
-    private SimpleComponentImpl() {
+    SimpleComponentImpl() {
 
       initialize();
 
diff --git a/javatests/dagger/internal/codegen/goldens/DaggerProcessingOptionsTest_testFastInitaDisabledFromAnnotationSucceeded_test.DaggerSimpleComponent b/javatests/dagger/internal/codegen/goldens/DaggerProcessingOptionsTest_testFastInitaDisabledFromAnnotationSucceeded_test.DaggerSimpleComponent
index 7dee796d24f..3638df4c4e0 100644
--- a/javatests/dagger/internal/codegen/goldens/DaggerProcessingOptionsTest_testFastInitaDisabledFromAnnotationSucceeded_test.DaggerSimpleComponent
+++ b/javatests/dagger/internal/codegen/goldens/DaggerProcessingOptionsTest_testFastInitaDisabledFromAnnotationSucceeded_test.DaggerSimpleComponent
@@ -44,7 +44,7 @@ final class DaggerSimpleComponent {
   private static final class SimpleComponentImpl implements SimpleComponent {
     private final SimpleComponentImpl simpleComponentImpl = this;
 
-    private SimpleComponentImpl() {
+    SimpleComponentImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_castNeeded_rawTypes_Provider_get_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_castNeeded_rawTypes_Provider_get_DEFAULT_MODE_test.DaggerTestComponent
index 8b138de593d..6b0381faab4 100644
--- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_castNeeded_rawTypes_Provider_get_DEFAULT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_castNeeded_rawTypes_Provider_get_DEFAULT_MODE_test.DaggerTestComponent
@@ -46,9 +46,9 @@ final class DaggerTestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
     @SuppressWarnings("rawtypes")
-    private Provider subtypeProvider;
+    Provider subtypeProvider;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
       initialize();
 
diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_castNeeded_rawTypes_Provider_get_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_castNeeded_rawTypes_Provider_get_FAST_INIT_MODE_test.DaggerTestComponent
index 8a86532ae65..32b0c345c6a 100644
--- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_castNeeded_rawTypes_Provider_get_FAST_INIT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_castNeeded_rawTypes_Provider_get_FAST_INIT_MODE_test.DaggerTestComponent
@@ -46,9 +46,9 @@ final class DaggerTestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
     @SuppressWarnings("rawtypes")
-    private Provider subtypeProvider;
+    Provider subtypeProvider;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
       initialize();
 
diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_castedToRawType_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_castedToRawType_DEFAULT_MODE_test.DaggerTestComponent
index cab6003b6c5..064fcdaf585 100644
--- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_castedToRawType_DEFAULT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_castedToRawType_DEFAULT_MODE_test.DaggerTestComponent
@@ -42,7 +42,7 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_castedToRawType_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_castedToRawType_FAST_INIT_MODE_test.DaggerTestComponent
index 800a764e0b1..9dbf18be9dd 100644
--- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_castedToRawType_FAST_INIT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_castedToRawType_FAST_INIT_MODE_test.DaggerTestComponent
@@ -42,9 +42,9 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private Provider<String> provideStringProvider;
+    Provider<String> provideStringProvider;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
       initialize();
 
diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_doubleBinds_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_doubleBinds_DEFAULT_MODE_test.DaggerTestComponent
index 8eaaaede90a..dd60ee9a1de 100644
--- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_doubleBinds_DEFAULT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_doubleBinds_DEFAULT_MODE_test.DaggerTestComponent
@@ -42,7 +42,7 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_doubleBinds_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_doubleBinds_FAST_INIT_MODE_test.DaggerTestComponent
index 8abc7f8cd6c..7ad8d5a4116 100644
--- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_doubleBinds_FAST_INIT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_doubleBinds_FAST_INIT_MODE_test.DaggerTestComponent
@@ -42,9 +42,9 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private Provider<String> provideStringProvider;
+    Provider<String> provideStringProvider;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
       initialize();
 
diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_inlineFactoryOfInacessibleType_DEFAULT_MODE_test.DaggerRequestsSubtypeAsProvider b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_inlineFactoryOfInacessibleType_DEFAULT_MODE_test.DaggerRequestsSubtypeAsProvider
index 92b7b3281d9..3bcac0cc20d 100644
--- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_inlineFactoryOfInacessibleType_DEFAULT_MODE_test.DaggerRequestsSubtypeAsProvider
+++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_inlineFactoryOfInacessibleType_DEFAULT_MODE_test.DaggerRequestsSubtypeAsProvider
@@ -44,7 +44,7 @@ final class DaggerRequestsSubtypeAsProvider {
   private static final class RequestsSubtypeAsProviderImpl implements RequestsSubtypeAsProvider {
     private final RequestsSubtypeAsProviderImpl requestsSubtypeAsProviderImpl = this;
 
-    private RequestsSubtypeAsProviderImpl() {
+    RequestsSubtypeAsProviderImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_inlineFactoryOfInacessibleType_FAST_INIT_MODE_test.DaggerRequestsSubtypeAsProvider b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_inlineFactoryOfInacessibleType_FAST_INIT_MODE_test.DaggerRequestsSubtypeAsProvider
index 474db4f7f0c..91cf00bd5e4 100644
--- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_inlineFactoryOfInacessibleType_FAST_INIT_MODE_test.DaggerRequestsSubtypeAsProvider
+++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_inlineFactoryOfInacessibleType_FAST_INIT_MODE_test.DaggerRequestsSubtypeAsProvider
@@ -45,9 +45,9 @@ final class DaggerRequestsSubtypeAsProvider {
     private final RequestsSubtypeAsProviderImpl requestsSubtypeAsProviderImpl = this;
 
     @SuppressWarnings("rawtypes")
-    private Provider subtypeProvider;
+    Provider subtypeProvider;
 
-    private RequestsSubtypeAsProviderImpl() {
+    RequestsSubtypeAsProviderImpl() {
 
       initialize();
 
diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_noCast_rawTypes_Provider_get_toInaccessibleType_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_noCast_rawTypes_Provider_get_toInaccessibleType_DEFAULT_MODE_test.DaggerTestComponent
index 683231ab41b..173c16ee91a 100644
--- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_noCast_rawTypes_Provider_get_toInaccessibleType_DEFAULT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_noCast_rawTypes_Provider_get_toInaccessibleType_DEFAULT_MODE_test.DaggerTestComponent
@@ -47,9 +47,9 @@ final class DaggerTestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
     @SuppressWarnings("rawtypes")
-    private Provider subtypeProvider;
+    Provider subtypeProvider;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
       initialize();
 
diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_noCast_rawTypes_Provider_get_toInaccessibleType_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_noCast_rawTypes_Provider_get_toInaccessibleType_FAST_INIT_MODE_test.DaggerTestComponent
index 258ed430501..68d04933a2b 100644
--- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_noCast_rawTypes_Provider_get_toInaccessibleType_FAST_INIT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_noCast_rawTypes_Provider_get_toInaccessibleType_FAST_INIT_MODE_test.DaggerTestComponent
@@ -47,9 +47,9 @@ final class DaggerTestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
     @SuppressWarnings("rawtypes")
-    private Provider subtypeProvider;
+    Provider subtypeProvider;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
       initialize();
 
diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_providerWhenBindsScopeGreaterThanDependencyScope_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_providerWhenBindsScopeGreaterThanDependencyScope_DEFAULT_MODE_test.DaggerTestComponent
index 6ab95489222..5edcf82edd3 100644
--- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_providerWhenBindsScopeGreaterThanDependencyScope_DEFAULT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_providerWhenBindsScopeGreaterThanDependencyScope_DEFAULT_MODE_test.DaggerTestComponent
@@ -44,11 +44,11 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private Provider<String> provideStringProvider;
+    Provider<String> provideStringProvider;
 
-    private Provider<Object> bindStringProvider;
+    Provider<Object> bindStringProvider;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
       initialize();
 
diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_providerWhenBindsScopeGreaterThanDependencyScope_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_providerWhenBindsScopeGreaterThanDependencyScope_FAST_INIT_MODE_test.DaggerTestComponent
index 2ba405b5b96..0c80d357f02 100644
--- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_providerWhenBindsScopeGreaterThanDependencyScope_FAST_INIT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_providerWhenBindsScopeGreaterThanDependencyScope_FAST_INIT_MODE_test.DaggerTestComponent
@@ -44,11 +44,11 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private Provider<String> provideStringProvider;
+    Provider<String> provideStringProvider;
 
-    private Provider<Object> bindStringProvider;
+    Provider<Object> bindStringProvider;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
       initialize();
 
diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_toDoubleCheck_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_toDoubleCheck_DEFAULT_MODE_test.DaggerTestComponent
index fe9cfaf913c..47ad96a444c 100644
--- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_toDoubleCheck_DEFAULT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_toDoubleCheck_DEFAULT_MODE_test.DaggerTestComponent
@@ -44,15 +44,15 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private Provider<RegularScoped> regularScopedProvider;
+    Provider<RegularScoped> regularScopedProvider;
 
-    private Provider<ReusableScoped> reusableScopedProvider;
+    Provider<ReusableScoped> reusableScopedProvider;
 
-    private Provider<Object> reusableProvider;
+    Provider<Object> reusableProvider;
 
-    private Provider<Object> unscopedProvider;
+    Provider<Object> unscopedProvider;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
       initialize();
 
diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_toDoubleCheck_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_toDoubleCheck_FAST_INIT_MODE_test.DaggerTestComponent
index c67cc9e77cd..8f60e82b5de 100644
--- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_toDoubleCheck_FAST_INIT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_toDoubleCheck_FAST_INIT_MODE_test.DaggerTestComponent
@@ -44,17 +44,17 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private Provider<RegularScoped> regularScopedProvider;
+    Provider<RegularScoped> regularScopedProvider;
 
-    private Provider<ReusableScoped> reusableScopedProvider;
+    Provider<ReusableScoped> reusableScopedProvider;
 
-    private Provider<Object> reusableProvider;
+    Provider<Object> reusableProvider;
 
-    private Provider<Unscoped> unscopedProvider;
+    Provider<Unscoped> unscopedProvider;
 
-    private Provider<Object> unscopedProvider2;
+    Provider<Object> unscopedProvider2;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
       initialize();
 
diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_toSingleCheck_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_toSingleCheck_DEFAULT_MODE_test.DaggerTestComponent
index 28b0f8f40ed..987386a6b01 100644
--- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_toSingleCheck_DEFAULT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_toSingleCheck_DEFAULT_MODE_test.DaggerTestComponent
@@ -44,13 +44,13 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private Provider<RegularScoped> regularScopedProvider;
+    Provider<RegularScoped> regularScopedProvider;
 
-    private Provider<ReusableScoped> reusableScopedProvider;
+    Provider<ReusableScoped> reusableScopedProvider;
 
-    private Provider<Object> unscopedProvider;
+    Provider<Object> unscopedProvider;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
       initialize();
 
diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_toSingleCheck_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_toSingleCheck_FAST_INIT_MODE_test.DaggerTestComponent
index 30d42c81dad..c7e90e4afb7 100644
--- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_toSingleCheck_FAST_INIT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_toSingleCheck_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<RegularScoped> regularScopedProvider;
+    Provider<RegularScoped> regularScopedProvider;
 
-    private Provider<ReusableScoped> reusableScopedProvider;
+    Provider<ReusableScoped> reusableScopedProvider;
 
-    private Provider<Unscoped> unscopedProvider;
+    Provider<Unscoped> unscopedProvider;
 
-    private Provider<Object> unscopedProvider2;
+    Provider<Object> unscopedProvider2;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
       initialize();
 
diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_toUnscoped_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_toUnscoped_DEFAULT_MODE_test.DaggerTestComponent
index 8cfcdeecdf8..e4ec7d400de 100644
--- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_toUnscoped_DEFAULT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_toUnscoped_DEFAULT_MODE_test.DaggerTestComponent
@@ -44,11 +44,11 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private Provider<RegularScoped> regularScopedProvider;
+    Provider<RegularScoped> regularScopedProvider;
 
-    private Provider<ReusableScoped> reusableScopedProvider;
+    Provider<ReusableScoped> reusableScopedProvider;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
       initialize();
 
diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_toUnscoped_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_toUnscoped_FAST_INIT_MODE_test.DaggerTestComponent
index 8d0d51e3c9f..331ffaf0f83 100644
--- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_toUnscoped_FAST_INIT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_toUnscoped_FAST_INIT_MODE_test.DaggerTestComponent
@@ -44,11 +44,11 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private Provider<RegularScoped> regularScopedProvider;
+    Provider<RegularScoped> regularScopedProvider;
 
-    private Provider<ReusableScoped> reusableScopedProvider;
+    Provider<ReusableScoped> reusableScopedProvider;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
       initialize();
 
diff --git a/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest_scopedBinding_onlyUsedInSubcomponent_DEFAULT_MODE_test.DaggerSimpleComponent b/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest_scopedBinding_onlyUsedInSubcomponent_DEFAULT_MODE_test.DaggerSimpleComponent
index 5f66fd20d1b..1bc82c8d812 100644
--- a/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest_scopedBinding_onlyUsedInSubcomponent_DEFAULT_MODE_test.DaggerSimpleComponent
+++ b/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest_scopedBinding_onlyUsedInSubcomponent_DEFAULT_MODE_test.DaggerSimpleComponent
@@ -45,7 +45,7 @@ final class DaggerSimpleComponent {
 
     private final SubImpl subImpl = this;
 
-    private SubImpl(SimpleComponentImpl simpleComponentImpl) {
+    SubImpl(SimpleComponentImpl simpleComponentImpl) {
       this.simpleComponentImpl = simpleComponentImpl;
 
 
@@ -60,9 +60,9 @@ final class DaggerSimpleComponent {
   private static final class SimpleComponentImpl implements SimpleComponent {
     private final SimpleComponentImpl simpleComponentImpl = this;
 
-    private Provider<ScopedType> scopedTypeProvider;
+    Provider<ScopedType> scopedTypeProvider;
 
-    private SimpleComponentImpl() {
+    SimpleComponentImpl() {
 
       initialize();
 
diff --git a/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest_scopedBinding_onlyUsedInSubcomponent_FAST_INIT_MODE_test.DaggerSimpleComponent b/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest_scopedBinding_onlyUsedInSubcomponent_FAST_INIT_MODE_test.DaggerSimpleComponent
index 3ec2b3bca86..1b9fa3b2333 100644
--- a/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest_scopedBinding_onlyUsedInSubcomponent_FAST_INIT_MODE_test.DaggerSimpleComponent
+++ b/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest_scopedBinding_onlyUsedInSubcomponent_FAST_INIT_MODE_test.DaggerSimpleComponent
@@ -45,7 +45,7 @@ final class DaggerSimpleComponent {
 
     private final SubImpl subImpl = this;
 
-    private SubImpl(SimpleComponentImpl simpleComponentImpl) {
+    SubImpl(SimpleComponentImpl simpleComponentImpl) {
       this.simpleComponentImpl = simpleComponentImpl;
 
 
@@ -60,9 +60,9 @@ final class DaggerSimpleComponent {
   private static final class SimpleComponentImpl implements SimpleComponent {
     private final SimpleComponentImpl simpleComponentImpl = this;
 
-    private Provider<ScopedType> scopedTypeProvider;
+    Provider<ScopedType> scopedTypeProvider;
 
-    private SimpleComponentImpl() {
+    SimpleComponentImpl() {
 
       initialize();
 
diff --git a/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest_simpleComponent_DEFAULT_MODE_test.DaggerSimpleComponent b/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest_simpleComponent_DEFAULT_MODE_test.DaggerSimpleComponent
index a8b4832f4ba..984525840d0 100644
--- a/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest_simpleComponent_DEFAULT_MODE_test.DaggerSimpleComponent
+++ b/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest_simpleComponent_DEFAULT_MODE_test.DaggerSimpleComponent
@@ -41,7 +41,7 @@ final class DaggerSimpleComponent {
   private static final class SimpleComponentImpl implements SimpleComponent {
     private final SimpleComponentImpl simpleComponentImpl = this;
 
-    private SimpleComponentImpl() {
+    SimpleComponentImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest_simpleComponent_FAST_INIT_MODE_test.DaggerSimpleComponent b/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest_simpleComponent_FAST_INIT_MODE_test.DaggerSimpleComponent
index a8b4832f4ba..984525840d0 100644
--- a/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest_simpleComponent_FAST_INIT_MODE_test.DaggerSimpleComponent
+++ b/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest_simpleComponent_FAST_INIT_MODE_test.DaggerSimpleComponent
@@ -41,7 +41,7 @@ final class DaggerSimpleComponent {
   private static final class SimpleComponentImpl implements SimpleComponent {
     private final SimpleComponentImpl simpleComponentImpl = this;
 
-    private SimpleComponentImpl() {
+    SimpleComponentImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest_simpleComponent_injectsProviderOf_dependsOnScoped_DEFAULT_MODE_test.DaggerSimpleComponent b/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest_simpleComponent_injectsProviderOf_dependsOnScoped_DEFAULT_MODE_test.DaggerSimpleComponent
index 730f7efcd08..b70abf0e72f 100644
--- a/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest_simpleComponent_injectsProviderOf_dependsOnScoped_DEFAULT_MODE_test.DaggerSimpleComponent
+++ b/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest_simpleComponent_injectsProviderOf_dependsOnScoped_DEFAULT_MODE_test.DaggerSimpleComponent
@@ -43,11 +43,11 @@ final class DaggerSimpleComponent {
   private static final class SimpleComponentImpl implements SimpleComponent {
     private final SimpleComponentImpl simpleComponentImpl = this;
 
-    private Provider<ScopedType> scopedTypeProvider;
+    Provider<ScopedType> scopedTypeProvider;
 
-    private Provider<DependsOnScoped> dependsOnScopedProvider;
+    Provider<DependsOnScoped> dependsOnScopedProvider;
 
-    private SimpleComponentImpl() {
+    SimpleComponentImpl() {
 
       initialize();
 
diff --git a/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest_simpleComponent_injectsProviderOf_dependsOnScoped_FAST_INIT_MODE_test.DaggerSimpleComponent b/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest_simpleComponent_injectsProviderOf_dependsOnScoped_FAST_INIT_MODE_test.DaggerSimpleComponent
index 40aeab20b38..6e3352f401e 100644
--- a/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest_simpleComponent_injectsProviderOf_dependsOnScoped_FAST_INIT_MODE_test.DaggerSimpleComponent
+++ b/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest_simpleComponent_injectsProviderOf_dependsOnScoped_FAST_INIT_MODE_test.DaggerSimpleComponent
@@ -43,11 +43,11 @@ final class DaggerSimpleComponent {
   private static final class SimpleComponentImpl implements SimpleComponent {
     private final SimpleComponentImpl simpleComponentImpl = this;
 
-    private Provider<ScopedType> scopedTypeProvider;
+    Provider<ScopedType> scopedTypeProvider;
 
-    private Provider<DependsOnScoped> dependsOnScopedProvider;
+    Provider<DependsOnScoped> dependsOnScopedProvider;
 
-    private SimpleComponentImpl() {
+    SimpleComponentImpl() {
 
       initialize();
 
diff --git a/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest_inaccessibleTypeBoundInALoopScoped_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest_inaccessibleTypeBoundInALoopScoped_DEFAULT_MODE_test.DaggerTestComponent
index ab10526be06..0ff512f3c9b 100644
--- a/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest_inaccessibleTypeBoundInALoopScoped_DEFAULT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest_inaccessibleTypeBoundInALoopScoped_DEFAULT_MODE_test.DaggerTestComponent
@@ -47,18 +47,18 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private Provider<Foo> bindProvider;
+    Provider<Foo> bindProvider;
 
     @SuppressWarnings("rawtypes")
-    private Provider fooImplProvider;
+    Provider fooImplProvider;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
       initialize();
 
     }
 
-    private Object fooImpl() {
+    Object fooImpl() {
       return FooImpl_Factory.newInstance(bindProvider);
     }
 
diff --git a/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest_inaccessibleTypeBoundInALoopScoped_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest_inaccessibleTypeBoundInALoopScoped_FAST_INIT_MODE_test.DaggerTestComponent
index 90c0f4fbc78..d60299ffdfa 100644
--- a/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest_inaccessibleTypeBoundInALoopScoped_FAST_INIT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest_inaccessibleTypeBoundInALoopScoped_FAST_INIT_MODE_test.DaggerTestComponent
@@ -47,18 +47,18 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private Provider<Foo> bindProvider;
+    Provider<Foo> bindProvider;
 
     @SuppressWarnings("rawtypes")
-    private Provider fooImplProvider;
+    Provider fooImplProvider;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
       initialize();
 
     }
 
-    private Object fooImpl() {
+    Object fooImpl() {
       return FooImpl_Factory.newInstance(bindProvider);
     }
 
diff --git a/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest_inaccessibleTypeBoundInALoop_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest_inaccessibleTypeBoundInALoop_DEFAULT_MODE_test.DaggerTestComponent
index 048e7ee05b3..d5cb1dc6ac2 100644
--- a/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest_inaccessibleTypeBoundInALoop_DEFAULT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest_inaccessibleTypeBoundInALoop_DEFAULT_MODE_test.DaggerTestComponent
@@ -47,15 +47,15 @@ final class DaggerTestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
     @SuppressWarnings("rawtypes")
-    private Provider fooImplProvider;
+    Provider fooImplProvider;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
       initialize();
 
     }
 
-    private Object fooImpl() {
+    Object fooImpl() {
       return FooImpl_Factory.newInstance(fooImplProvider);
     }
 
diff --git a/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest_inaccessibleTypeBoundInALoop_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest_inaccessibleTypeBoundInALoop_FAST_INIT_MODE_test.DaggerTestComponent
index d004f1b6664..68dcb8ac3b6 100644
--- a/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest_inaccessibleTypeBoundInALoop_FAST_INIT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest_inaccessibleTypeBoundInALoop_FAST_INIT_MODE_test.DaggerTestComponent
@@ -47,15 +47,15 @@ final class DaggerTestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
     @SuppressWarnings("rawtypes")
-    private Provider fooImplProvider;
+    Provider fooImplProvider;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
       initialize();
 
     }
 
-    private Object fooImpl() {
+    Object fooImpl() {
       return FooImpl_Factory.newInstance(fooImplProvider);
     }
 
diff --git a/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest_scopedInaccessibleTypeBound_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest_scopedInaccessibleTypeBound_DEFAULT_MODE_test.DaggerTestComponent
index b45151a1913..ed6a667bebc 100644
--- a/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest_scopedInaccessibleTypeBound_DEFAULT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest_scopedInaccessibleTypeBound_DEFAULT_MODE_test.DaggerTestComponent
@@ -44,9 +44,9 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private Provider<Foo> bindProvider;
+    Provider<Foo> bindProvider;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
       initialize();
 
diff --git a/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest_scopedInaccessibleTypeBound_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest_scopedInaccessibleTypeBound_FAST_INIT_MODE_test.DaggerTestComponent
index 8709d08719c..b595bbc569d 100644
--- a/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest_scopedInaccessibleTypeBound_FAST_INIT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest_scopedInaccessibleTypeBound_FAST_INIT_MODE_test.DaggerTestComponent
@@ -45,11 +45,11 @@ final class DaggerTestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
     @SuppressWarnings("rawtypes")
-    private Provider fooImplProvider;
+    Provider fooImplProvider;
 
-    private Provider<Foo> bindProvider;
+    Provider<Foo> bindProvider;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
       initialize();
 
diff --git a/javatests/dagger/internal/codegen/goldens/LazyClassKeyMapBindingComponentProcessorTest_lazyClassKeySimilarQualifiedName_doesNotConflict_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/LazyClassKeyMapBindingComponentProcessorTest_lazyClassKeySimilarQualifiedName_doesNotConflict_DEFAULT_MODE_test.DaggerTestComponent
index 7cbc139ad8f..4c45c4bed8d 100644
--- a/javatests/dagger/internal/codegen/goldens/LazyClassKeyMapBindingComponentProcessorTest_lazyClassKeySimilarQualifiedName_doesNotConflict_DEFAULT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/LazyClassKeyMapBindingComponentProcessorTest_lazyClassKeySimilarQualifiedName_doesNotConflict_DEFAULT_MODE_test.DaggerTestComponent
@@ -44,7 +44,7 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/LazyClassKeyMapBindingComponentProcessorTest_lazyClassKeySimilarQualifiedName_doesNotConflict_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/LazyClassKeyMapBindingComponentProcessorTest_lazyClassKeySimilarQualifiedName_doesNotConflict_FAST_INIT_MODE_test.DaggerTestComponent
index 7cbc139ad8f..4c45c4bed8d 100644
--- a/javatests/dagger/internal/codegen/goldens/LazyClassKeyMapBindingComponentProcessorTest_lazyClassKeySimilarQualifiedName_doesNotConflict_FAST_INIT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/LazyClassKeyMapBindingComponentProcessorTest_lazyClassKeySimilarQualifiedName_doesNotConflict_FAST_INIT_MODE_test.DaggerTestComponent
@@ -44,7 +44,7 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/LazyClassKeyMapBindingComponentProcessorTest_mapBindingsWithInaccessibleKeys_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/LazyClassKeyMapBindingComponentProcessorTest_mapBindingsWithInaccessibleKeys_DEFAULT_MODE_test.DaggerTestComponent
index 44f00450d4f..0cad6317020 100644
--- a/javatests/dagger/internal/codegen/goldens/LazyClassKeyMapBindingComponentProcessorTest_mapBindingsWithInaccessibleKeys_DEFAULT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/LazyClassKeyMapBindingComponentProcessorTest_mapBindingsWithInaccessibleKeys_DEFAULT_MODE_test.DaggerTestComponent
@@ -56,11 +56,11 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private Provider<Map<Class<?>, Integer>> mapOfClassOfAndIntegerProvider;
+    Provider<Map<Class<?>, Integer>> mapOfClassOfAndIntegerProvider;
 
-    private Provider<Map<MapKeys.ComplexKey, Integer>> mapOfComplexKeyAndIntegerProvider;
+    Provider<Map<MapKeys.ComplexKey, Integer>> mapOfComplexKeyAndIntegerProvider;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
       initialize();
 
diff --git a/javatests/dagger/internal/codegen/goldens/LazyClassKeyMapBindingComponentProcessorTest_mapBindingsWithInaccessibleKeys_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/LazyClassKeyMapBindingComponentProcessorTest_mapBindingsWithInaccessibleKeys_FAST_INIT_MODE_test.DaggerTestComponent
index 363be5779e7..b4456e94881 100644
--- a/javatests/dagger/internal/codegen/goldens/LazyClassKeyMapBindingComponentProcessorTest_mapBindingsWithInaccessibleKeys_FAST_INIT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/LazyClassKeyMapBindingComponentProcessorTest_mapBindingsWithInaccessibleKeys_FAST_INIT_MODE_test.DaggerTestComponent
@@ -51,11 +51,11 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private Provider<Map<Class<?>, Integer>> mapOfClassOfAndIntegerProvider;
+    Provider<Map<Class<?>, Integer>> mapOfClassOfAndIntegerProvider;
 
-    private Provider<Map<MapKeys.ComplexKey, Integer>> mapOfComplexKeyAndIntegerProvider;
+    Provider<Map<MapKeys.ComplexKey, Integer>> mapOfComplexKeyAndIntegerProvider;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
       initialize();
 
diff --git a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_injectMapWithoutMapBinding_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_injectMapWithoutMapBinding_DEFAULT_MODE_test.DaggerTestComponent
index 602ccffa19f..b06b68025f8 100644
--- a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_injectMapWithoutMapBinding_DEFAULT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_injectMapWithoutMapBinding_DEFAULT_MODE_test.DaggerTestComponent
@@ -55,7 +55,7 @@ final class DaggerTestComponent {
 
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl(MapModule mapModuleParam) {
+    TestComponentImpl(MapModule mapModuleParam) {
       this.mapModule = mapModuleParam;
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_injectMapWithoutMapBinding_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_injectMapWithoutMapBinding_FAST_INIT_MODE_test.DaggerTestComponent
index 602ccffa19f..b06b68025f8 100644
--- a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_injectMapWithoutMapBinding_FAST_INIT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_injectMapWithoutMapBinding_FAST_INIT_MODE_test.DaggerTestComponent
@@ -55,7 +55,7 @@ final class DaggerTestComponent {
 
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl(MapModule mapModuleParam) {
+    TestComponentImpl(MapModule mapModuleParam) {
       this.mapModule = mapModuleParam;
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithEnumKey_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithEnumKey_DEFAULT_MODE_test.DaggerTestComponent
index 6370b0298d4..b600e107163 100644
--- a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithEnumKey_DEFAULT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithEnumKey_DEFAULT_MODE_test.DaggerTestComponent
@@ -65,13 +65,13 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private Provider<Handler> provideAdminHandlerProvider;
+    Provider<Handler> provideAdminHandlerProvider;
 
-    private Provider<Handler> provideLoginHandlerProvider;
+    Provider<Handler> provideLoginHandlerProvider;
 
-    private Provider mapOfPathEnumAndProviderOfHandlerProvider;
+    Provider mapOfPathEnumAndProviderOfHandlerProvider;
 
-    private TestComponentImpl(MapModuleOne mapModuleOneParam, MapModuleTwo mapModuleTwoParam) {
+    TestComponentImpl(MapModuleOne mapModuleOneParam, MapModuleTwo mapModuleTwoParam) {
 
       initialize(mapModuleOneParam, mapModuleTwoParam);
 
diff --git a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithEnumKey_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithEnumKey_FAST_INIT_MODE_test.DaggerTestComponent
index ec0efd9f3a7..b5071ba41d0 100644
--- a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithEnumKey_FAST_INIT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithEnumKey_FAST_INIT_MODE_test.DaggerTestComponent
@@ -69,13 +69,13 @@ final class DaggerTestComponent {
 
     private final TestComponentImpl testComponentImpl = this;
 
-    private Provider<Handler> provideAdminHandlerProvider;
+    Provider<Handler> provideAdminHandlerProvider;
 
-    private Provider<Handler> provideLoginHandlerProvider;
+    Provider<Handler> provideLoginHandlerProvider;
 
-    private Provider mapOfPathEnumAndProviderOfHandlerProvider;
+    Provider mapOfPathEnumAndProviderOfHandlerProvider;
 
-    private TestComponentImpl(MapModuleOne mapModuleOneParam, MapModuleTwo mapModuleTwoParam) {
+    TestComponentImpl(MapModuleOne mapModuleOneParam, MapModuleTwo mapModuleTwoParam) {
       this.mapModuleOne = mapModuleOneParam;
       this.mapModuleTwo = mapModuleTwoParam;
       initialize(mapModuleOneParam, mapModuleTwoParam);
diff --git a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithInaccessibleKeys_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithInaccessibleKeys_DEFAULT_MODE_test.DaggerTestComponent
index fd01938d1ff..439617bf7d5 100644
--- a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithInaccessibleKeys_DEFAULT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithInaccessibleKeys_DEFAULT_MODE_test.DaggerTestComponent
@@ -57,20 +57,20 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private Provider<Map<Class<?>, Integer>> mapOfClassOfAndIntegerProvider;
+    Provider<Map<Class<?>, Integer>> mapOfClassOfAndIntegerProvider;
 
     @SuppressWarnings("rawtypes")
-    private Provider mapOfPackagePrivateEnumAndIntegerProvider;
+    Provider mapOfPackagePrivateEnumAndIntegerProvider;
 
-    private Provider<Map<MapKeys.ComplexKey, Integer>> mapOfComplexKeyAndIntegerProvider;
+    Provider<Map<MapKeys.ComplexKey, Integer>> mapOfComplexKeyAndIntegerProvider;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
       initialize();
 
     }
 
-    private Map mapOfPackagePrivateEnumAndInteger() {
+    Map mapOfPackagePrivateEnumAndInteger() {
       return ImmutableMap.of(MapModule_EnumKeyMapKey.create(), MapModule.enumKey());
     }
 
diff --git a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithInaccessibleKeys_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithInaccessibleKeys_FAST_INIT_MODE_test.DaggerTestComponent
index fd01938d1ff..439617bf7d5 100644
--- a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithInaccessibleKeys_FAST_INIT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithInaccessibleKeys_FAST_INIT_MODE_test.DaggerTestComponent
@@ -57,20 +57,20 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private Provider<Map<Class<?>, Integer>> mapOfClassOfAndIntegerProvider;
+    Provider<Map<Class<?>, Integer>> mapOfClassOfAndIntegerProvider;
 
     @SuppressWarnings("rawtypes")
-    private Provider mapOfPackagePrivateEnumAndIntegerProvider;
+    Provider mapOfPackagePrivateEnumAndIntegerProvider;
 
-    private Provider<Map<MapKeys.ComplexKey, Integer>> mapOfComplexKeyAndIntegerProvider;
+    Provider<Map<MapKeys.ComplexKey, Integer>> mapOfComplexKeyAndIntegerProvider;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
       initialize();
 
     }
 
-    private Map mapOfPackagePrivateEnumAndInteger() {
+    Map mapOfPackagePrivateEnumAndInteger() {
       return ImmutableMap.of(MapModule_EnumKeyMapKey.create(), MapModule.enumKey());
     }
 
diff --git a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithNonProviderValue_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithNonProviderValue_DEFAULT_MODE_test.DaggerTestComponent
index 70573d2c314..8ad8772d187 100644
--- a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithNonProviderValue_DEFAULT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithNonProviderValue_DEFAULT_MODE_test.DaggerTestComponent
@@ -65,13 +65,13 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private Provider<Handler> provideAdminHandlerProvider;
+    Provider<Handler> provideAdminHandlerProvider;
 
-    private Provider<Handler> provideLoginHandlerProvider;
+    Provider<Handler> provideLoginHandlerProvider;
 
-    private Provider<Map<PathEnum, Handler>> mapOfPathEnumAndHandlerProvider;
+    Provider<Map<PathEnum, Handler>> mapOfPathEnumAndHandlerProvider;
 
-    private TestComponentImpl(MapModuleOne mapModuleOneParam, MapModuleTwo mapModuleTwoParam) {
+    TestComponentImpl(MapModuleOne mapModuleOneParam, MapModuleTwo mapModuleTwoParam) {
 
       initialize(mapModuleOneParam, mapModuleTwoParam);
 
diff --git a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithNonProviderValue_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithNonProviderValue_FAST_INIT_MODE_test.DaggerTestComponent
index 21caca83920..7ea51de8afd 100644
--- a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithNonProviderValue_FAST_INIT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithNonProviderValue_FAST_INIT_MODE_test.DaggerTestComponent
@@ -69,9 +69,9 @@ final class DaggerTestComponent {
 
     private final TestComponentImpl testComponentImpl = this;
 
-    private Provider<Map<PathEnum, Handler>> mapOfPathEnumAndHandlerProvider;
+    Provider<Map<PathEnum, Handler>> mapOfPathEnumAndHandlerProvider;
 
-    private TestComponentImpl(MapModuleOne mapModuleOneParam, MapModuleTwo mapModuleTwoParam) {
+    TestComponentImpl(MapModuleOne mapModuleOneParam, MapModuleTwo mapModuleTwoParam) {
       this.mapModuleOne = mapModuleOneParam;
       this.mapModuleTwo = mapModuleTwoParam;
       initialize(mapModuleOneParam, mapModuleTwoParam);
diff --git a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithStringKey_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithStringKey_DEFAULT_MODE_test.DaggerTestComponent
index c8d2b0184f9..38d237dd53d 100644
--- a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithStringKey_DEFAULT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithStringKey_DEFAULT_MODE_test.DaggerTestComponent
@@ -65,13 +65,13 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private Provider<Handler> provideAdminHandlerProvider;
+    Provider<Handler> provideAdminHandlerProvider;
 
-    private Provider<Handler> provideLoginHandlerProvider;
+    Provider<Handler> provideLoginHandlerProvider;
 
-    private Provider mapOfStringAndProviderOfHandlerProvider;
+    Provider mapOfStringAndProviderOfHandlerProvider;
 
-    private TestComponentImpl(MapModuleOne mapModuleOneParam, MapModuleTwo mapModuleTwoParam) {
+    TestComponentImpl(MapModuleOne mapModuleOneParam, MapModuleTwo mapModuleTwoParam) {
 
       initialize(mapModuleOneParam, mapModuleTwoParam);
 
diff --git a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithStringKey_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithStringKey_FAST_INIT_MODE_test.DaggerTestComponent
index e497c98a07b..72009b7e306 100644
--- a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithStringKey_FAST_INIT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithStringKey_FAST_INIT_MODE_test.DaggerTestComponent
@@ -69,13 +69,13 @@ final class DaggerTestComponent {
 
     private final TestComponentImpl testComponentImpl = this;
 
-    private Provider<Handler> provideAdminHandlerProvider;
+    Provider<Handler> provideAdminHandlerProvider;
 
-    private Provider<Handler> provideLoginHandlerProvider;
+    Provider<Handler> provideLoginHandlerProvider;
 
-    private Provider mapOfStringAndProviderOfHandlerProvider;
+    Provider mapOfStringAndProviderOfHandlerProvider;
 
-    private TestComponentImpl(MapModuleOne mapModuleOneParam, MapModuleTwo mapModuleTwoParam) {
+    TestComponentImpl(MapModuleOne mapModuleOneParam, MapModuleTwo mapModuleTwoParam) {
       this.mapModuleOne = mapModuleOneParam;
       this.mapModuleTwo = mapModuleTwoParam;
       initialize(mapModuleOneParam, mapModuleTwoParam);
diff --git a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithWrappedKey_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithWrappedKey_DEFAULT_MODE_test.DaggerTestComponent
index 9674b0b03e3..32f2fdf78cd 100644
--- a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithWrappedKey_DEFAULT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithWrappedKey_DEFAULT_MODE_test.DaggerTestComponent
@@ -65,13 +65,13 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private Provider<Handler> provideAdminHandlerProvider;
+    Provider<Handler> provideAdminHandlerProvider;
 
-    private Provider<Handler> provideLoginHandlerProvider;
+    Provider<Handler> provideLoginHandlerProvider;
 
-    private Provider mapOfWrappedClassKeyAndProviderOfHandlerProvider;
+    Provider mapOfWrappedClassKeyAndProviderOfHandlerProvider;
 
-    private TestComponentImpl(MapModuleOne mapModuleOneParam, MapModuleTwo mapModuleTwoParam) {
+    TestComponentImpl(MapModuleOne mapModuleOneParam, MapModuleTwo mapModuleTwoParam) {
 
       initialize(mapModuleOneParam, mapModuleTwoParam);
 
diff --git a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithWrappedKey_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithWrappedKey_FAST_INIT_MODE_test.DaggerTestComponent
index 89a4c43b59b..a0a1073bad3 100644
--- a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithWrappedKey_FAST_INIT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithWrappedKey_FAST_INIT_MODE_test.DaggerTestComponent
@@ -69,13 +69,13 @@ final class DaggerTestComponent {
 
     private final TestComponentImpl testComponentImpl = this;
 
-    private Provider<Handler> provideAdminHandlerProvider;
+    Provider<Handler> provideAdminHandlerProvider;
 
-    private Provider<Handler> provideLoginHandlerProvider;
+    Provider<Handler> provideLoginHandlerProvider;
 
-    private Provider mapOfWrappedClassKeyAndProviderOfHandlerProvider;
+    Provider mapOfWrappedClassKeyAndProviderOfHandlerProvider;
 
-    private TestComponentImpl(MapModuleOne mapModuleOneParam, MapModuleTwo mapModuleTwoParam) {
+    TestComponentImpl(MapModuleOne mapModuleOneParam, MapModuleTwo mapModuleTwoParam) {
       this.mapModuleOne = mapModuleOneParam;
       this.mapModuleTwo = mapModuleTwoParam;
       initialize(mapModuleOneParam, mapModuleTwoParam);
@@ -110,13 +110,13 @@ final class DaggerTestComponent {
       @Override
       public T get() {
         switch (id) {
-          case 0: // java.util.Map<test.WrappedClassKey,javax.inject.Provider<test.Handler>> 
+          case 0: // java.util.Map<test.WrappedClassKey,javax.inject.Provider<test.Handler>>
           return (T) ImmutableMap.<WrappedClassKey, javax.inject.Provider<Handler>>of(WrappedClassKeyCreator.createWrappedClassKey(Integer.class), testComponentImpl.provideAdminHandlerProvider, WrappedClassKeyCreator.createWrappedClassKey(Long.class), testComponentImpl.provideLoginHandlerProvider);
 
-          case 1: // java.util.Map<test.WrappedClassKey,javax.inject.Provider<test.Handler>> test.MapModuleOne#provideAdminHandler 
+          case 1: // java.util.Map<test.WrappedClassKey,test.Handler> test.MapModuleOne#provideAdminHandler
           return (T) MapModuleOne_ProvideAdminHandlerFactory.provideAdminHandler(testComponentImpl.mapModuleOne);
 
-          case 2: // java.util.Map<test.WrappedClassKey,javax.inject.Provider<test.Handler>> test.MapModuleTwo#provideLoginHandler 
+          case 2: // java.util.Map<test.WrappedClassKey,test.Handler> test.MapModuleTwo#provideLoginHandler
           return (T) MapModuleTwo_ProvideLoginHandlerFactory.provideLoginHandler(testComponentImpl.mapModuleTwo);
 
           default: throw new AssertionError(id);
diff --git a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationTest_inaccessible_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationTest_inaccessible_DEFAULT_MODE_test.DaggerTestComponent
index 175cd3926a0..00f08df9922 100644
--- a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationTest_inaccessible_DEFAULT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationTest_inaccessible_DEFAULT_MODE_test.DaggerTestComponent
@@ -45,7 +45,7 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationTest_inaccessible_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationTest_inaccessible_FAST_INIT_MODE_test.DaggerTestComponent
index 175cd3926a0..00f08df9922 100644
--- a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationTest_inaccessible_FAST_INIT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationTest_inaccessible_FAST_INIT_MODE_test.DaggerTestComponent
@@ -45,7 +45,7 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationTest_mapBindings_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationTest_mapBindings_DEFAULT_MODE_test.DaggerTestComponent
index dc4158c8444..c5177011b1c 100644
--- a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationTest_mapBindings_DEFAULT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationTest_mapBindings_DEFAULT_MODE_test.DaggerTestComponent
@@ -45,7 +45,7 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationTest_mapBindings_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationTest_mapBindings_FAST_INIT_MODE_test.DaggerTestComponent
index d24c78b9cbb..265f0ebdb59 100644
--- a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationTest_mapBindings_FAST_INIT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationTest_mapBindings_FAST_INIT_MODE_test.DaggerTestComponent
@@ -45,15 +45,15 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private Provider<Integer> provideIntProvider;
+    Provider<Integer> provideIntProvider;
 
-    private Provider<Long> provideLong0Provider;
+    Provider<Long> provideLong0Provider;
 
-    private Provider<Long> provideLong1Provider;
+    Provider<Long> provideLong1Provider;
 
-    private Provider<Long> provideLong2Provider;
+    Provider<Long> provideLong2Provider;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
       initialize();
 
diff --git a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationTest_productionComponents_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationTest_productionComponents_DEFAULT_MODE_test.DaggerTestComponent
index 0c598e47100..1584979a1ed 100644
--- a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationTest_productionComponents_DEFAULT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationTest_productionComponents_DEFAULT_MODE_test.DaggerTestComponent
@@ -46,12 +46,12 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent, CancellationListener {
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
 
     }
 
-    private Map<Integer, String> mapOfIntegerAndString() {
+    Map<Integer, String> mapOfIntegerAndString() {
       return Collections.<Integer, String>singletonMap(1, TestModule_Value1Factory.value1());
     }
 
diff --git a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationTest_productionComponents_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationTest_productionComponents_FAST_INIT_MODE_test.DaggerTestComponent
index 0c598e47100..1584979a1ed 100644
--- a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationTest_productionComponents_FAST_INIT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationTest_productionComponents_FAST_INIT_MODE_test.DaggerTestComponent
@@ -46,12 +46,12 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent, CancellationListener {
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
 
     }
 
-    private Map<Integer, String> mapOfIntegerAndString() {
+    Map<Integer, String> mapOfIntegerAndString() {
       return Collections.<Integer, String>singletonMap(1, TestModule_Value1Factory.value1());
     }
 
diff --git a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationTest_subcomponentOmitsInheritedBindings_DEFAULT_MODE_test.DaggerParent b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationTest_subcomponentOmitsInheritedBindings_DEFAULT_MODE_test.DaggerParent
index 13f98908055..0cb2a4201e8 100644
--- a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationTest_subcomponentOmitsInheritedBindings_DEFAULT_MODE_test.DaggerParent
+++ b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationTest_subcomponentOmitsInheritedBindings_DEFAULT_MODE_test.DaggerParent
@@ -56,7 +56,7 @@ final class DaggerParent {
 
     private final ChildImpl childImpl = this;
 
-    private ChildImpl(ParentImpl parentImpl) {
+    ChildImpl(ParentImpl parentImpl) {
       this.parentImpl = parentImpl;
 
 
@@ -73,7 +73,7 @@ final class DaggerParent {
 
     private final ParentImpl parentImpl = this;
 
-    private ParentImpl(ParentModule parentModuleParam) {
+    ParentImpl(ParentModule parentModuleParam) {
       this.parentModule = parentModuleParam;
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationTest_subcomponentOmitsInheritedBindings_FAST_INIT_MODE_test.DaggerParent b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationTest_subcomponentOmitsInheritedBindings_FAST_INIT_MODE_test.DaggerParent
index 13f98908055..0cb2a4201e8 100644
--- a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationTest_subcomponentOmitsInheritedBindings_FAST_INIT_MODE_test.DaggerParent
+++ b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationTest_subcomponentOmitsInheritedBindings_FAST_INIT_MODE_test.DaggerParent
@@ -56,7 +56,7 @@ final class DaggerParent {
 
     private final ChildImpl childImpl = this;
 
-    private ChildImpl(ParentImpl parentImpl) {
+    ChildImpl(ParentImpl parentImpl) {
       this.parentImpl = parentImpl;
 
 
@@ -73,7 +73,7 @@ final class DaggerParent {
 
     private final ParentImpl parentImpl = this;
 
-    private ParentImpl(ParentModule parentModuleParam) {
+    ParentImpl(ParentModule parentModuleParam) {
       this.parentModule = parentModuleParam;
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest_inaccessible_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest_inaccessible_DEFAULT_MODE_test.DaggerTestComponent
index 3f40b317f3c..f75f9e588a8 100644
--- a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest_inaccessible_DEFAULT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest_inaccessible_DEFAULT_MODE_test.DaggerTestComponent
@@ -45,7 +45,7 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest_inaccessible_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest_inaccessible_FAST_INIT_MODE_test.DaggerTestComponent
index 3f40b317f3c..f75f9e588a8 100644
--- a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest_inaccessible_FAST_INIT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest_inaccessible_FAST_INIT_MODE_test.DaggerTestComponent
@@ -45,7 +45,7 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest_mapBindings_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest_mapBindings_DEFAULT_MODE_test.DaggerTestComponent
index e00a7faa354..04fd3351623 100644
--- a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest_mapBindings_DEFAULT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest_mapBindings_DEFAULT_MODE_test.DaggerTestComponent
@@ -46,7 +46,7 @@ final class DaggerTestComponent {
 
     private final SubImpl subImpl = this;
 
-    private SubImpl(TestComponentImpl testComponentImpl) {
+    SubImpl(TestComponentImpl testComponentImpl) {
       this.testComponentImpl = testComponentImpl;
 
 
@@ -66,7 +66,7 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest_mapBindings_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest_mapBindings_FAST_INIT_MODE_test.DaggerTestComponent
index ffa16465673..6fd81fe6ea2 100644
--- a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest_mapBindings_FAST_INIT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest_mapBindings_FAST_INIT_MODE_test.DaggerTestComponent
@@ -46,13 +46,13 @@ final class DaggerTestComponent {
 
     private final SubImpl subImpl = this;
 
-    private Provider<Long> provideLong3Provider;
+    Provider<Long> provideLong3Provider;
 
-    private Provider<Long> provideLong4Provider;
+    Provider<Long> provideLong4Provider;
 
-    private Provider<Long> provideLong5Provider;
+    Provider<Long> provideLong5Provider;
 
-    private SubImpl(TestComponentImpl testComponentImpl) {
+    SubImpl(TestComponentImpl testComponentImpl) {
       this.testComponentImpl = testComponentImpl;
 
       initialize();
@@ -111,15 +111,15 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private Provider<Integer> provideIntProvider;
+    Provider<Integer> provideIntProvider;
 
-    private Provider<Long> provideLong0Provider;
+    Provider<Long> provideLong0Provider;
 
-    private Provider<Long> provideLong1Provider;
+    Provider<Long> provideLong1Provider;
 
-    private Provider<Long> provideLong2Provider;
+    Provider<Long> provideLong2Provider;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
       initialize();
 
diff --git a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest_productionComponents_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest_productionComponents_DEFAULT_MODE_test.DaggerTestComponent
index 7d54ce0ff73..f1d46b2eae5 100644
--- a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest_productionComponents_DEFAULT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest_productionComponents_DEFAULT_MODE_test.DaggerTestComponent
@@ -46,7 +46,7 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent, CancellationListener {
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest_productionComponents_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest_productionComponents_FAST_INIT_MODE_test.DaggerTestComponent
index 7d54ce0ff73..f1d46b2eae5 100644
--- a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest_productionComponents_FAST_INIT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest_productionComponents_FAST_INIT_MODE_test.DaggerTestComponent
@@ -46,7 +46,7 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent, CancellationListener {
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest_subcomponentOmitsInheritedBindings_DEFAULT_MODE_test.DaggerParent b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest_subcomponentOmitsInheritedBindings_DEFAULT_MODE_test.DaggerParent
index aad298b96e0..126c6b75c45 100644
--- a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest_subcomponentOmitsInheritedBindings_DEFAULT_MODE_test.DaggerParent
+++ b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest_subcomponentOmitsInheritedBindings_DEFAULT_MODE_test.DaggerParent
@@ -56,7 +56,7 @@ final class DaggerParent {
 
     private final ChildImpl childImpl = this;
 
-    private ChildImpl(ParentImpl parentImpl) {
+    ChildImpl(ParentImpl parentImpl) {
       this.parentImpl = parentImpl;
 
 
@@ -73,7 +73,7 @@ final class DaggerParent {
 
     private final ParentImpl parentImpl = this;
 
-    private ParentImpl(ParentModule parentModuleParam) {
+    ParentImpl(ParentModule parentModuleParam) {
       this.parentModule = parentModuleParam;
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest_subcomponentOmitsInheritedBindings_FAST_INIT_MODE_test.DaggerParent b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest_subcomponentOmitsInheritedBindings_FAST_INIT_MODE_test.DaggerParent
index aad298b96e0..126c6b75c45 100644
--- a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest_subcomponentOmitsInheritedBindings_FAST_INIT_MODE_test.DaggerParent
+++ b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest_subcomponentOmitsInheritedBindings_FAST_INIT_MODE_test.DaggerParent
@@ -56,7 +56,7 @@ final class DaggerParent {
 
     private final ChildImpl childImpl = this;
 
-    private ChildImpl(ParentImpl parentImpl) {
+    ChildImpl(ParentImpl parentImpl) {
       this.parentImpl = parentImpl;
 
 
@@ -73,7 +73,7 @@ final class DaggerParent {
 
     private final ParentImpl parentImpl = this;
 
-    private ParentImpl(ParentModule parentModuleParam) {
+    ParentImpl(ParentModule parentModuleParam) {
       this.parentModule = parentModuleParam;
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest_accessibility_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest_accessibility_DEFAULT_MODE_test.DaggerTestComponent
index 63a1650d9b6..c2854dcdbdc 100644
--- a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest_accessibility_DEFAULT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest_accessibility_DEFAULT_MODE_test.DaggerTestComponent
@@ -47,12 +47,12 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
 
     }
 
-    private Object inaccessible() {
+    Object inaccessible() {
       return injectInaccessible(Inaccessible_Factory.newInstance());
     }
 
diff --git a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest_accessibility_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest_accessibility_FAST_INIT_MODE_test.DaggerTestComponent
index 63a1650d9b6..c2854dcdbdc 100644
--- a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest_accessibility_FAST_INIT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest_accessibility_FAST_INIT_MODE_test.DaggerTestComponent
@@ -47,12 +47,12 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
 
     }
 
-    private Object inaccessible() {
+    Object inaccessible() {
       return injectInaccessible(Inaccessible_Factory.newInstance());
     }
 
diff --git a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest_accessibleRawType_ofInaccessibleType_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest_accessibleRawType_ofInaccessibleType_DEFAULT_MODE_test.DaggerTestComponent
index 7a20d149555..7cbf0f0b6f4 100644
--- a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest_accessibleRawType_ofInaccessibleType_DEFAULT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest_accessibleRawType_ofInaccessibleType_DEFAULT_MODE_test.DaggerTestComponent
@@ -50,9 +50,9 @@ final class DaggerTestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
     @SuppressWarnings("rawtypes")
-    private Provider inaccessiblesProvider;
+    Provider inaccessiblesProvider;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
       initialize();
 
diff --git a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest_accessibleRawType_ofInaccessibleType_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest_accessibleRawType_ofInaccessibleType_FAST_INIT_MODE_test.DaggerTestComponent
index bc1ffbee03f..c67f5fc174a 100644
--- a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest_accessibleRawType_ofInaccessibleType_FAST_INIT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest_accessibleRawType_ofInaccessibleType_FAST_INIT_MODE_test.DaggerTestComponent
@@ -50,9 +50,9 @@ final class DaggerTestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
     @SuppressWarnings("rawtypes")
-    private Provider inaccessiblesProvider;
+    Provider inaccessiblesProvider;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
       initialize();
 
diff --git a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest_parentClass_injectedMembersInSupertype_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest_parentClass_injectedMembersInSupertype_DEFAULT_MODE_test.DaggerTestComponent
index c957ad723a6..1331a043cd8 100644
--- a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest_parentClass_injectedMembersInSupertype_DEFAULT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest_parentClass_injectedMembersInSupertype_DEFAULT_MODE_test.DaggerTestComponent
@@ -42,7 +42,7 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest_parentClass_injectedMembersInSupertype_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest_parentClass_injectedMembersInSupertype_FAST_INIT_MODE_test.DaggerTestComponent
index c957ad723a6..1331a043cd8 100644
--- a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest_parentClass_injectedMembersInSupertype_FAST_INIT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest_parentClass_injectedMembersInSupertype_FAST_INIT_MODE_test.DaggerTestComponent
@@ -42,7 +42,7 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest_parentClass_noInjectedMembers_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest_parentClass_noInjectedMembers_DEFAULT_MODE_test.DaggerTestComponent
index b2fc405cfe4..1e0db606322 100644
--- a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest_parentClass_noInjectedMembers_DEFAULT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest_parentClass_noInjectedMembers_DEFAULT_MODE_test.DaggerTestComponent
@@ -41,7 +41,7 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest_parentClass_noInjectedMembers_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest_parentClass_noInjectedMembers_FAST_INIT_MODE_test.DaggerTestComponent
index b2fc405cfe4..1e0db606322 100644
--- a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest_parentClass_noInjectedMembers_FAST_INIT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest_parentClass_noInjectedMembers_FAST_INIT_MODE_test.DaggerTestComponent
@@ -41,7 +41,7 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest_publicSupertypeHiddenSubtype_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest_publicSupertypeHiddenSubtype_DEFAULT_MODE_test.DaggerTestComponent
index 8b5855edc8c..013573cbd01 100644
--- a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest_publicSupertypeHiddenSubtype_DEFAULT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest_publicSupertypeHiddenSubtype_DEFAULT_MODE_test.DaggerTestComponent
@@ -48,12 +48,12 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
 
     }
 
-    private Object subtype() {
+    Object subtype() {
       return injectSubtype(Subtype_Factory.newInstance());
     }
 
diff --git a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest_publicSupertypeHiddenSubtype_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest_publicSupertypeHiddenSubtype_FAST_INIT_MODE_test.DaggerTestComponent
index 8b5855edc8c..013573cbd01 100644
--- a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest_publicSupertypeHiddenSubtype_FAST_INIT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest_publicSupertypeHiddenSubtype_FAST_INIT_MODE_test.DaggerTestComponent
@@ -48,12 +48,12 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
 
     }
 
-    private Object subtype() {
+    Object subtype() {
       return injectSubtype(Subtype_Factory.newInstance());
     }
 
diff --git a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest_testMembersInjectionBindingExistsInParentComponent_DEFAULT_MODE_test.DaggerMyComponent b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest_testMembersInjectionBindingExistsInParentComponent_DEFAULT_MODE_test.DaggerMyComponent
index 12767bad8d0..dde9a7022f8 100644
--- a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest_testMembersInjectionBindingExistsInParentComponent_DEFAULT_MODE_test.DaggerMyComponent
+++ b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest_testMembersInjectionBindingExistsInParentComponent_DEFAULT_MODE_test.DaggerMyComponent
@@ -46,17 +46,17 @@ public final class DaggerMyComponent {
 
     private final MySubcomponentImpl mySubcomponentImpl = this;
 
-    private MySubcomponentImpl(MyComponentImpl myComponentImpl) {
+    MySubcomponentImpl(MyComponentImpl myComponentImpl) {
       this.myComponentImpl = myComponentImpl;
 
 
     }
 
-    private Set<String> setOfString() {
+    Set<String> setOfString() {
       return ImmutableSet.<String>of(MyComponentModule_ProvideStringFactory.provideString(), MySubcomponentModule_ProvideStringFactory.provideString());
     }
 
-    private Bar bar() {
+    Bar bar() {
       return injectBar(Bar_Factory.newInstance());
     }
 
@@ -75,12 +75,12 @@ public final class DaggerMyComponent {
   private static final class MyComponentImpl implements MyComponent {
     private final MyComponentImpl myComponentImpl = this;
 
-    private MyComponentImpl() {
+    MyComponentImpl() {
 
 
     }
 
-    private Set<String> setOfString() {
+    Set<String> setOfString() {
       return ImmutableSet.<String>of(MyComponentModule_ProvideStringFactory.provideString());
     }
 
diff --git a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest_testMembersInjectionBindingExistsInParentComponent_FAST_INIT_MODE_test.DaggerMyComponent b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest_testMembersInjectionBindingExistsInParentComponent_FAST_INIT_MODE_test.DaggerMyComponent
index 12767bad8d0..dde9a7022f8 100644
--- a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest_testMembersInjectionBindingExistsInParentComponent_FAST_INIT_MODE_test.DaggerMyComponent
+++ b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest_testMembersInjectionBindingExistsInParentComponent_FAST_INIT_MODE_test.DaggerMyComponent
@@ -46,17 +46,17 @@ public final class DaggerMyComponent {
 
     private final MySubcomponentImpl mySubcomponentImpl = this;
 
-    private MySubcomponentImpl(MyComponentImpl myComponentImpl) {
+    MySubcomponentImpl(MyComponentImpl myComponentImpl) {
       this.myComponentImpl = myComponentImpl;
 
 
     }
 
-    private Set<String> setOfString() {
+    Set<String> setOfString() {
       return ImmutableSet.<String>of(MyComponentModule_ProvideStringFactory.provideString(), MySubcomponentModule_ProvideStringFactory.provideString());
     }
 
-    private Bar bar() {
+    Bar bar() {
       return injectBar(Bar_Factory.newInstance());
     }
 
@@ -75,12 +75,12 @@ public final class DaggerMyComponent {
   private static final class MyComponentImpl implements MyComponent {
     private final MyComponentImpl myComponentImpl = this;
 
-    private MyComponentImpl() {
+    MyComponentImpl() {
 
 
     }
 
-    private Set<String> setOfString() {
+    Set<String> setOfString() {
       return ImmutableSet.<String>of(MyComponentModule_ProvideStringFactory.provideString());
     }
 
diff --git a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest_testMembersInjectionBindingSharesInjectMethodsWithProvisionBinding_DEFAULT_MODE_test.DaggerMyComponent b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest_testMembersInjectionBindingSharesInjectMethodsWithProvisionBinding_DEFAULT_MODE_test.DaggerMyComponent
index ee7248797a5..7c9289d87ee 100644
--- a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest_testMembersInjectionBindingSharesInjectMethodsWithProvisionBinding_DEFAULT_MODE_test.DaggerMyComponent
+++ b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest_testMembersInjectionBindingSharesInjectMethodsWithProvisionBinding_DEFAULT_MODE_test.DaggerMyComponent
@@ -42,7 +42,7 @@ public final class DaggerMyComponent {
   private static final class MyComponentImpl implements MyComponent {
     private final MyComponentImpl myComponentImpl = this;
 
-    private MyComponentImpl() {
+    MyComponentImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest_testMembersInjectionBindingSharesInjectMethodsWithProvisionBinding_FAST_INIT_MODE_test.DaggerMyComponent b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest_testMembersInjectionBindingSharesInjectMethodsWithProvisionBinding_FAST_INIT_MODE_test.DaggerMyComponent
index ee7248797a5..7c9289d87ee 100644
--- a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest_testMembersInjectionBindingSharesInjectMethodsWithProvisionBinding_FAST_INIT_MODE_test.DaggerMyComponent
+++ b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest_testMembersInjectionBindingSharesInjectMethodsWithProvisionBinding_FAST_INIT_MODE_test.DaggerMyComponent
@@ -42,7 +42,7 @@ public final class DaggerMyComponent {
   private static final class MyComponentImpl implements MyComponent {
     private final MyComponentImpl myComponentImpl = this;
 
-    private MyComponentImpl() {
+    MyComponentImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest_testMembersInjectionBindingWithNoInjectionSites_DEFAULT_MODE_test.DaggerMyComponent b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest_testMembersInjectionBindingWithNoInjectionSites_DEFAULT_MODE_test.DaggerMyComponent
index 90ad9fe0d43..29ebde298eb 100644
--- a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest_testMembersInjectionBindingWithNoInjectionSites_DEFAULT_MODE_test.DaggerMyComponent
+++ b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest_testMembersInjectionBindingWithNoInjectionSites_DEFAULT_MODE_test.DaggerMyComponent
@@ -41,7 +41,7 @@ public final class DaggerMyComponent {
   private static final class MyComponentImpl implements MyComponent {
     private final MyComponentImpl myComponentImpl = this;
 
-    private MyComponentImpl() {
+    MyComponentImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest_testMembersInjectionBindingWithNoInjectionSites_FAST_INIT_MODE_test.DaggerMyComponent b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest_testMembersInjectionBindingWithNoInjectionSites_FAST_INIT_MODE_test.DaggerMyComponent
index 90ad9fe0d43..29ebde298eb 100644
--- a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest_testMembersInjectionBindingWithNoInjectionSites_FAST_INIT_MODE_test.DaggerMyComponent
+++ b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest_testMembersInjectionBindingWithNoInjectionSites_FAST_INIT_MODE_test.DaggerMyComponent
@@ -41,7 +41,7 @@ public final class DaggerMyComponent {
   private static final class MyComponentImpl implements MyComponent {
     private final MyComponentImpl myComponentImpl = this;
 
-    private MyComponentImpl() {
+    MyComponentImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/OptionalBindingRequestFulfillmentTest_inlinedOptionalBindings_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/OptionalBindingRequestFulfillmentTest_inlinedOptionalBindings_DEFAULT_MODE_test.DaggerTestComponent
index 02c758a6f62..74cdde597c6 100644
--- a/javatests/dagger/internal/codegen/goldens/OptionalBindingRequestFulfillmentTest_inlinedOptionalBindings_DEFAULT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/OptionalBindingRequestFulfillmentTest_inlinedOptionalBindings_DEFAULT_MODE_test.DaggerTestComponent
@@ -48,7 +48,7 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/OptionalBindingRequestFulfillmentTest_inlinedOptionalBindings_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/OptionalBindingRequestFulfillmentTest_inlinedOptionalBindings_FAST_INIT_MODE_test.DaggerTestComponent
index c92f61f9a15..c70457261eb 100644
--- a/javatests/dagger/internal/codegen/goldens/OptionalBindingRequestFulfillmentTest_inlinedOptionalBindings_FAST_INIT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/OptionalBindingRequestFulfillmentTest_inlinedOptionalBindings_FAST_INIT_MODE_test.DaggerTestComponent
@@ -48,9 +48,9 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private Provider<Maybe> provideMaybeProvider;
+    Provider<Maybe> provideMaybeProvider;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
       initialize();
 
diff --git a/javatests/dagger/internal/codegen/goldens/OptionalBindingRequestFulfillmentTest_requestForFuture_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/OptionalBindingRequestFulfillmentTest_requestForFuture_DEFAULT_MODE_test.DaggerTestComponent
index 3dc568f1ca7..00b8f3649b5 100644
--- a/javatests/dagger/internal/codegen/goldens/OptionalBindingRequestFulfillmentTest_requestForFuture_DEFAULT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/OptionalBindingRequestFulfillmentTest_requestForFuture_DEFAULT_MODE_test.DaggerTestComponent
@@ -48,7 +48,7 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent, CancellationListener {
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/OptionalBindingRequestFulfillmentTest_requestForFuture_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/OptionalBindingRequestFulfillmentTest_requestForFuture_FAST_INIT_MODE_test.DaggerTestComponent
index 3dc568f1ca7..00b8f3649b5 100644
--- a/javatests/dagger/internal/codegen/goldens/OptionalBindingRequestFulfillmentTest_requestForFuture_FAST_INIT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/OptionalBindingRequestFulfillmentTest_requestForFuture_FAST_INIT_MODE_test.DaggerTestComponent
@@ -48,7 +48,7 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent, CancellationListener {
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/ProductionComponentProcessorTest_productionScope_injectConstructor_DEFAULT_MODE_test.DaggerParent b/javatests/dagger/internal/codegen/goldens/ProductionComponentProcessorTest_productionScope_injectConstructor_DEFAULT_MODE_test.DaggerParent
index 16c191648a5..e8e035a487d 100644
--- a/javatests/dagger/internal/codegen/goldens/ProductionComponentProcessorTest_productionScope_injectConstructor_DEFAULT_MODE_test.DaggerParent
+++ b/javatests/dagger/internal/codegen/goldens/ProductionComponentProcessorTest_productionScope_injectConstructor_DEFAULT_MODE_test.DaggerParent
@@ -46,7 +46,7 @@ final class DaggerParent {
 
     private final ChildImpl childImpl = this;
 
-    private ChildImpl(ParentImpl parentImpl) {
+    ChildImpl(ParentImpl parentImpl) {
       this.parentImpl = parentImpl;
 
 
@@ -67,9 +67,9 @@ final class DaggerParent {
   private static final class ParentImpl implements Parent, CancellationListener {
     private final ParentImpl parentImpl = this;
 
-    private Provider<ProductionScoped> productionScopedProvider;
+    Provider<ProductionScoped> productionScopedProvider;
 
-    private ParentImpl() {
+    ParentImpl() {
 
       initialize();
 
diff --git a/javatests/dagger/internal/codegen/goldens/ProductionComponentProcessorTest_productionScope_injectConstructor_FAST_INIT_MODE_test.DaggerParent b/javatests/dagger/internal/codegen/goldens/ProductionComponentProcessorTest_productionScope_injectConstructor_FAST_INIT_MODE_test.DaggerParent
index 60be60178f7..13e168b97e7 100644
--- a/javatests/dagger/internal/codegen/goldens/ProductionComponentProcessorTest_productionScope_injectConstructor_FAST_INIT_MODE_test.DaggerParent
+++ b/javatests/dagger/internal/codegen/goldens/ProductionComponentProcessorTest_productionScope_injectConstructor_FAST_INIT_MODE_test.DaggerParent
@@ -46,7 +46,7 @@ final class DaggerParent {
 
     private final ChildImpl childImpl = this;
 
-    private ChildImpl(ParentImpl parentImpl) {
+    ChildImpl(ParentImpl parentImpl) {
       this.parentImpl = parentImpl;
 
 
@@ -67,9 +67,9 @@ final class DaggerParent {
   private static final class ParentImpl implements Parent, CancellationListener {
     private final ParentImpl parentImpl = this;
 
-    private Provider<ProductionScoped> productionScopedProvider;
+    Provider<ProductionScoped> productionScopedProvider;
 
-    private ParentImpl() {
+    ParentImpl() {
 
       initialize();
 
diff --git a/javatests/dagger/internal/codegen/goldens/ProductionComponentProcessorTest_simpleComponent_DEFAULT_MODE_test.DaggerTestClass_SimpleComponent b/javatests/dagger/internal/codegen/goldens/ProductionComponentProcessorTest_simpleComponent_DEFAULT_MODE_test.DaggerTestClass_SimpleComponent
index e1b2656347a..7c3fd7927af 100644
--- a/javatests/dagger/internal/codegen/goldens/ProductionComponentProcessorTest_simpleComponent_DEFAULT_MODE_test.DaggerTestClass_SimpleComponent
+++ b/javatests/dagger/internal/codegen/goldens/ProductionComponentProcessorTest_simpleComponent_DEFAULT_MODE_test.DaggerTestClass_SimpleComponent
@@ -74,21 +74,21 @@ final class DaggerTestClass_SimpleComponent {
 
     private Producer<TestClass.A> aEntryPoint;
 
-    private Provider<Executor> executorProvider;
+    Provider<Executor> executorProvider;
 
-    private Provider<Executor> productionImplementationExecutorProvider;
+    Provider<Executor> productionImplementationExecutorProvider;
 
-    private Provider<TestClass.SimpleComponent> simpleComponentProvider;
+    Provider<TestClass.SimpleComponent> simpleComponentProvider;
 
-    private Provider<ProductionComponentMonitor> monitorProvider;
+    Provider<ProductionComponentMonitor> monitorProvider;
 
-    private Provider<TestClass.B> bProvider;
+    Provider<TestClass.B> bProvider;
 
-    private Producer<TestClass.B> bProducer;
+    Producer<TestClass.B> bProducer;
 
-    private Producer<TestClass.A> aProducer;
+    Producer<TestClass.A> aProducer;
 
-    private SimpleComponentImpl(TestClass.AModule aModuleParam, TestClass.BModule bModuleParam) {
+    SimpleComponentImpl(TestClass.AModule aModuleParam, TestClass.BModule bModuleParam) {
 
       initialize(aModuleParam, bModuleParam);
 
diff --git a/javatests/dagger/internal/codegen/goldens/ProductionComponentProcessorTest_simpleComponent_FAST_INIT_MODE_test.DaggerTestClass_SimpleComponent b/javatests/dagger/internal/codegen/goldens/ProductionComponentProcessorTest_simpleComponent_FAST_INIT_MODE_test.DaggerTestClass_SimpleComponent
index f7f665bb650..33fdab80323 100644
--- a/javatests/dagger/internal/codegen/goldens/ProductionComponentProcessorTest_simpleComponent_FAST_INIT_MODE_test.DaggerTestClass_SimpleComponent
+++ b/javatests/dagger/internal/codegen/goldens/ProductionComponentProcessorTest_simpleComponent_FAST_INIT_MODE_test.DaggerTestClass_SimpleComponent
@@ -76,21 +76,21 @@ final class DaggerTestClass_SimpleComponent {
 
     private Producer<TestClass.A> aEntryPoint;
 
-    private Provider<Executor> executorProvider;
+    Provider<Executor> executorProvider;
 
-    private Provider<Executor> productionImplementationExecutorProvider;
+    Provider<Executor> productionImplementationExecutorProvider;
 
-    private Provider<TestClass.SimpleComponent> simpleComponentProvider;
+    Provider<TestClass.SimpleComponent> simpleComponentProvider;
 
-    private Provider<ProductionComponentMonitor> monitorProvider;
+    Provider<ProductionComponentMonitor> monitorProvider;
 
-    private Provider<TestClass.B> bProvider;
+    Provider<TestClass.B> bProvider;
 
-    private Producer<TestClass.B> bProducer;
+    Producer<TestClass.B> bProducer;
 
-    private Producer<TestClass.A> aProducer;
+    Producer<TestClass.A> aProducer;
 
-    private SimpleComponentImpl(TestClass.AModule aModuleParam, TestClass.BModule bModuleParam) {
+    SimpleComponentImpl(TestClass.AModule aModuleParam, TestClass.BModule bModuleParam) {
       this.bModule = bModuleParam;
       initialize(aModuleParam, bModuleParam);
 
diff --git a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentTest_inaccessible_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentTest_inaccessible_DEFAULT_MODE_test.DaggerTestComponent
index eacd5844de8..ad7f6c3b395 100644
--- a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentTest_inaccessible_DEFAULT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentTest_inaccessible_DEFAULT_MODE_test.DaggerTestComponent
@@ -47,12 +47,12 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
 
     }
 
-    private Set setOfInaccessible2() {
+    Set setOfInaccessible2() {
       return SetBuilder.newSetBuilder(1).addAll(TestModule_EmptySetFactory.emptySet()).build();
     }
 
diff --git a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentTest_inaccessible_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentTest_inaccessible_FAST_INIT_MODE_test.DaggerTestComponent
index eacd5844de8..ad7f6c3b395 100644
--- a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentTest_inaccessible_FAST_INIT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentTest_inaccessible_FAST_INIT_MODE_test.DaggerTestComponent
@@ -47,12 +47,12 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
 
     }
 
-    private Set setOfInaccessible2() {
+    Set setOfInaccessible2() {
       return SetBuilder.newSetBuilder(1).addAll(TestModule_EmptySetFactory.emptySet()).build();
     }
 
diff --git a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentTest_productionComponents_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentTest_productionComponents_DEFAULT_MODE_test.DaggerTestComponent
index 94ee40b8355..34f3ed32660 100644
--- a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentTest_productionComponents_DEFAULT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentTest_productionComponents_DEFAULT_MODE_test.DaggerTestComponent
@@ -46,12 +46,12 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent, CancellationListener {
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
 
     }
 
-    private Set<String> setOfString() {
+    Set<String> setOfString() {
       return SetBuilder.<String>newSetBuilder(1).addAll(EmptySetModule_EmptySetFactory.emptySet()).build();
     }
 
diff --git a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentTest_productionComponents_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentTest_productionComponents_FAST_INIT_MODE_test.DaggerTestComponent
index 94ee40b8355..34f3ed32660 100644
--- a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentTest_productionComponents_FAST_INIT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentTest_productionComponents_FAST_INIT_MODE_test.DaggerTestComponent
@@ -46,12 +46,12 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent, CancellationListener {
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
 
     }
 
-    private Set<String> setOfString() {
+    Set<String> setOfString() {
       return SetBuilder.<String>newSetBuilder(1).addAll(EmptySetModule_EmptySetFactory.emptySet()).build();
     }
 
diff --git a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentTest_setBindings_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentTest_setBindings_DEFAULT_MODE_test.DaggerTestComponent
index 8ffdd232456..55c00826452 100644
--- a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentTest_setBindings_DEFAULT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentTest_setBindings_DEFAULT_MODE_test.DaggerTestComponent
@@ -44,7 +44,7 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentTest_setBindings_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentTest_setBindings_FAST_INIT_MODE_test.DaggerTestComponent
index 8ffdd232456..55c00826452 100644
--- a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentTest_setBindings_FAST_INIT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentTest_setBindings_FAST_INIT_MODE_test.DaggerTestComponent
@@ -44,7 +44,7 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentTest_subcomponentOmitsInheritedBindings_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentTest_subcomponentOmitsInheritedBindings_DEFAULT_MODE_test.DaggerTestComponent
index 301a2ad706b..50fc9f45523 100644
--- a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentTest_subcomponentOmitsInheritedBindings_DEFAULT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentTest_subcomponentOmitsInheritedBindings_DEFAULT_MODE_test.DaggerTestComponent
@@ -45,7 +45,7 @@ final class DaggerParent {
 
     private final ChildImpl childImpl = this;
 
-    private ChildImpl(ParentImpl parentImpl) {
+    ChildImpl(ParentImpl parentImpl) {
       this.parentImpl = parentImpl;
 
 
@@ -60,7 +60,7 @@ final class DaggerParent {
   private static final class ParentImpl implements Parent {
     private final ParentImpl parentImpl = this;
 
-    private ParentImpl() {
+    ParentImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentTest_subcomponentOmitsInheritedBindings_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentTest_subcomponentOmitsInheritedBindings_FAST_INIT_MODE_test.DaggerTestComponent
index 301a2ad706b..50fc9f45523 100644
--- a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentTest_subcomponentOmitsInheritedBindings_FAST_INIT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentTest_subcomponentOmitsInheritedBindings_FAST_INIT_MODE_test.DaggerTestComponent
@@ -45,7 +45,7 @@ final class DaggerParent {
 
     private final ChildImpl childImpl = this;
 
-    private ChildImpl(ParentImpl parentImpl) {
+    ChildImpl(ParentImpl parentImpl) {
       this.parentImpl = parentImpl;
 
 
@@ -60,7 +60,7 @@ final class DaggerParent {
   private static final class ParentImpl implements Parent {
     private final ParentImpl parentImpl = this;
 
-    private ParentImpl() {
+    ParentImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest_inaccessible_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest_inaccessible_DEFAULT_MODE_test.DaggerTestComponent
index 043ea3fdb03..2ed9f223aee 100644
--- a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest_inaccessible_DEFAULT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest_inaccessible_DEFAULT_MODE_test.DaggerTestComponent
@@ -46,12 +46,12 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
 
     }
 
-    private Set setOfInaccessible2() {
+    Set setOfInaccessible2() {
       return ImmutableSet.copyOf(TestModule_EmptySetFactory.emptySet());
     }
 
diff --git a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest_inaccessible_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest_inaccessible_FAST_INIT_MODE_test.DaggerTestComponent
index 043ea3fdb03..2ed9f223aee 100644
--- a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest_inaccessible_FAST_INIT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest_inaccessible_FAST_INIT_MODE_test.DaggerTestComponent
@@ -46,12 +46,12 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
 
     }
 
-    private Set setOfInaccessible2() {
+    Set setOfInaccessible2() {
       return ImmutableSet.copyOf(TestModule_EmptySetFactory.emptySet());
     }
 
diff --git a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest_productionComponents_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest_productionComponents_DEFAULT_MODE_test.DaggerTestComponent
index ceaaa81a4b7..6f8e4be9ba3 100644
--- a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest_productionComponents_DEFAULT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest_productionComponents_DEFAULT_MODE_test.DaggerTestComponent
@@ -46,12 +46,12 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent, CancellationListener {
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
 
     }
 
-    private Set<String> setOfString() {
+    Set<String> setOfString() {
       return ImmutableSet.<String>copyOf(EmptySetModule_EmptySetFactory.emptySet());
     }
 
diff --git a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest_productionComponents_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest_productionComponents_FAST_INIT_MODE_test.DaggerTestComponent
index ceaaa81a4b7..6f8e4be9ba3 100644
--- a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest_productionComponents_FAST_INIT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest_productionComponents_FAST_INIT_MODE_test.DaggerTestComponent
@@ -46,12 +46,12 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent, CancellationListener {
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
 
     }
 
-    private Set<String> setOfString() {
+    Set<String> setOfString() {
       return ImmutableSet.<String>copyOf(EmptySetModule_EmptySetFactory.emptySet());
     }
 
diff --git a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest_setBindings_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest_setBindings_DEFAULT_MODE_test.DaggerTestComponent
index 2f5fdb99764..eb0a4f33de7 100644
--- a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest_setBindings_DEFAULT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest_setBindings_DEFAULT_MODE_test.DaggerTestComponent
@@ -43,7 +43,7 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest_setBindings_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest_setBindings_FAST_INIT_MODE_test.DaggerTestComponent
index 2f5fdb99764..eb0a4f33de7 100644
--- a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest_setBindings_FAST_INIT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest_setBindings_FAST_INIT_MODE_test.DaggerTestComponent
@@ -43,7 +43,7 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest_subcomponentOmitsInheritedBindings_DEFAULT_MODE_test.DaggerParent b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest_subcomponentOmitsInheritedBindings_DEFAULT_MODE_test.DaggerParent
index 8f07d5b86d6..8dd2e49bd60 100644
--- a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest_subcomponentOmitsInheritedBindings_DEFAULT_MODE_test.DaggerParent
+++ b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest_subcomponentOmitsInheritedBindings_DEFAULT_MODE_test.DaggerParent
@@ -45,7 +45,7 @@ final class DaggerParent {
 
     private final ChildImpl childImpl = this;
 
-    private ChildImpl(ParentImpl parentImpl) {
+    ChildImpl(ParentImpl parentImpl) {
       this.parentImpl = parentImpl;
 
 
@@ -60,7 +60,7 @@ final class DaggerParent {
   private static final class ParentImpl implements Parent {
     private final ParentImpl parentImpl = this;
 
-    private ParentImpl() {
+    ParentImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest_subcomponentOmitsInheritedBindings_FAST_INIT_MODE_test.DaggerParent b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest_subcomponentOmitsInheritedBindings_FAST_INIT_MODE_test.DaggerParent
index 8f07d5b86d6..8dd2e49bd60 100644
--- a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest_subcomponentOmitsInheritedBindings_FAST_INIT_MODE_test.DaggerParent
+++ b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest_subcomponentOmitsInheritedBindings_FAST_INIT_MODE_test.DaggerParent
@@ -45,7 +45,7 @@ final class DaggerParent {
 
     private final ChildImpl childImpl = this;
 
-    private ChildImpl(ParentImpl parentImpl) {
+    ChildImpl(ParentImpl parentImpl) {
       this.parentImpl = parentImpl;
 
 
@@ -60,7 +60,7 @@ final class DaggerParent {
   private static final class ParentImpl implements Parent {
     private final ParentImpl parentImpl = this;
 
-    private ParentImpl() {
+    ParentImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/SubcomponentCreatorRequestFulfillmentTest_testInlinedSubcomponentCreators_componentMethod_compilerMode=DEFAULT_MODE, creatorKind=dagger.Subcomponent.Builder_test.DaggerC b/javatests/dagger/internal/codegen/goldens/SubcomponentCreatorRequestFulfillmentTest_testInlinedSubcomponentCreators_componentMethod_compilerMode=DEFAULT_MODE, creatorKind=dagger.Subcomponent.Builder_test.DaggerC
index dc1cbbd48eb..30ae0902121 100644
--- a/javatests/dagger/internal/codegen/goldens/SubcomponentCreatorRequestFulfillmentTest_testInlinedSubcomponentCreators_componentMethod_compilerMode=DEFAULT_MODE, creatorKind=dagger.Subcomponent.Builder_test.DaggerC	
+++ b/javatests/dagger/internal/codegen/goldens/SubcomponentCreatorRequestFulfillmentTest_testInlinedSubcomponentCreators_componentMethod_compilerMode=DEFAULT_MODE, creatorKind=dagger.Subcomponent.Builder_test.DaggerC	
@@ -56,7 +56,7 @@ final class DaggerC {
 
     private final SubImpl subImpl = this;
 
-    private SubImpl(CImpl cImpl) {
+    SubImpl(CImpl cImpl) {
       this.cImpl = cImpl;
 
 
@@ -66,7 +66,7 @@ final class DaggerC {
   private static final class CImpl implements C {
     private final CImpl cImpl = this;
 
-    private CImpl() {
+    CImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/SubcomponentCreatorRequestFulfillmentTest_testInlinedSubcomponentCreators_componentMethod_compilerMode=DEFAULT_MODE, creatorKind=dagger.Subcomponent.Factory_test.DaggerC b/javatests/dagger/internal/codegen/goldens/SubcomponentCreatorRequestFulfillmentTest_testInlinedSubcomponentCreators_componentMethod_compilerMode=DEFAULT_MODE, creatorKind=dagger.Subcomponent.Factory_test.DaggerC
index 0d73ecb3c04..a9c7409056c 100644
--- a/javatests/dagger/internal/codegen/goldens/SubcomponentCreatorRequestFulfillmentTest_testInlinedSubcomponentCreators_componentMethod_compilerMode=DEFAULT_MODE, creatorKind=dagger.Subcomponent.Factory_test.DaggerC	
+++ b/javatests/dagger/internal/codegen/goldens/SubcomponentCreatorRequestFulfillmentTest_testInlinedSubcomponentCreators_componentMethod_compilerMode=DEFAULT_MODE, creatorKind=dagger.Subcomponent.Factory_test.DaggerC	
@@ -56,7 +56,7 @@ final class DaggerC {
 
     private final SubImpl subImpl = this;
 
-    private SubImpl(CImpl cImpl) {
+    SubImpl(CImpl cImpl) {
       this.cImpl = cImpl;
 
 
@@ -66,7 +66,7 @@ final class DaggerC {
   private static final class CImpl implements C {
     private final CImpl cImpl = this;
 
-    private CImpl() {
+    CImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/SubcomponentCreatorRequestFulfillmentTest_testInlinedSubcomponentCreators_componentMethod_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Subcomponent.Builder_test.DaggerC b/javatests/dagger/internal/codegen/goldens/SubcomponentCreatorRequestFulfillmentTest_testInlinedSubcomponentCreators_componentMethod_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Subcomponent.Builder_test.DaggerC
index dc1cbbd48eb..30ae0902121 100644
--- a/javatests/dagger/internal/codegen/goldens/SubcomponentCreatorRequestFulfillmentTest_testInlinedSubcomponentCreators_componentMethod_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Subcomponent.Builder_test.DaggerC	
+++ b/javatests/dagger/internal/codegen/goldens/SubcomponentCreatorRequestFulfillmentTest_testInlinedSubcomponentCreators_componentMethod_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Subcomponent.Builder_test.DaggerC	
@@ -56,7 +56,7 @@ final class DaggerC {
 
     private final SubImpl subImpl = this;
 
-    private SubImpl(CImpl cImpl) {
+    SubImpl(CImpl cImpl) {
       this.cImpl = cImpl;
 
 
@@ -66,7 +66,7 @@ final class DaggerC {
   private static final class CImpl implements C {
     private final CImpl cImpl = this;
 
-    private CImpl() {
+    CImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/SubcomponentCreatorRequestFulfillmentTest_testInlinedSubcomponentCreators_componentMethod_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Subcomponent.Factory_test.DaggerC b/javatests/dagger/internal/codegen/goldens/SubcomponentCreatorRequestFulfillmentTest_testInlinedSubcomponentCreators_componentMethod_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Subcomponent.Factory_test.DaggerC
index 0d73ecb3c04..a9c7409056c 100644
--- a/javatests/dagger/internal/codegen/goldens/SubcomponentCreatorRequestFulfillmentTest_testInlinedSubcomponentCreators_componentMethod_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Subcomponent.Factory_test.DaggerC	
+++ b/javatests/dagger/internal/codegen/goldens/SubcomponentCreatorRequestFulfillmentTest_testInlinedSubcomponentCreators_componentMethod_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Subcomponent.Factory_test.DaggerC	
@@ -56,7 +56,7 @@ final class DaggerC {
 
     private final SubImpl subImpl = this;
 
-    private SubImpl(CImpl cImpl) {
+    SubImpl(CImpl cImpl) {
       this.cImpl = cImpl;
 
 
@@ -66,7 +66,7 @@ final class DaggerC {
   private static final class CImpl implements C {
     private final CImpl cImpl = this;
 
-    private CImpl() {
+    CImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest_delegateFactoryNotCreatedForSubcomponentWhenProviderExistsInParent_DEFAULT_MODE_test.DaggerParentComponent b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest_delegateFactoryNotCreatedForSubcomponentWhenProviderExistsInParent_DEFAULT_MODE_test.DaggerParentComponent
index be66b6a8b17..494f66a8738 100644
--- a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest_delegateFactoryNotCreatedForSubcomponentWhenProviderExistsInParent_DEFAULT_MODE_test.DaggerParentComponent
+++ b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest_delegateFactoryNotCreatedForSubcomponentWhenProviderExistsInParent_DEFAULT_MODE_test.DaggerParentComponent
@@ -48,17 +48,17 @@ final class DaggerParentComponent {
 
     private final ChildComponentImpl childComponentImpl = this;
 
-    private ChildComponentImpl(ParentComponentImpl parentComponentImpl) {
+    ChildComponentImpl(ParentComponentImpl parentComponentImpl) {
       this.parentComponentImpl = parentComponentImpl;
       this.childModule = new ChildModule();
 
     }
 
-    private NeedsDep1 needsDep1() {
+    NeedsDep1 needsDep1() {
       return new NeedsDep1(parentComponentImpl.dep1Provider.get());
     }
 
-    private A a() {
+    A a() {
       return injectA(A_Factory.newInstance(needsDep1(), parentComponentImpl.dep1Provider.get(), parentComponentImpl.dep2Provider.get()));
     }
 
@@ -77,11 +77,11 @@ final class DaggerParentComponent {
   private static final class ParentComponentImpl implements ParentComponent {
     private final ParentComponentImpl parentComponentImpl = this;
 
-    private Provider<Dep1> dep1Provider;
+    Provider<Dep1> dep1Provider;
 
-    private Provider<Dep2> dep2Provider;
+    Provider<Dep2> dep2Provider;
 
-    private ParentComponentImpl() {
+    ParentComponentImpl() {
 
       initialize();
 
diff --git a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest_delegateFactoryNotCreatedForSubcomponentWhenProviderExistsInParent_FAST_INIT_MODE_test.DaggerParentComponent b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest_delegateFactoryNotCreatedForSubcomponentWhenProviderExistsInParent_FAST_INIT_MODE_test.DaggerParentComponent
index 4f15c1362ea..767eafc2b72 100644
--- a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest_delegateFactoryNotCreatedForSubcomponentWhenProviderExistsInParent_FAST_INIT_MODE_test.DaggerParentComponent
+++ b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest_delegateFactoryNotCreatedForSubcomponentWhenProviderExistsInParent_FAST_INIT_MODE_test.DaggerParentComponent
@@ -48,17 +48,17 @@ final class DaggerParentComponent {
 
     private final ChildComponentImpl childComponentImpl = this;
 
-    private ChildComponentImpl(ParentComponentImpl parentComponentImpl) {
+    ChildComponentImpl(ParentComponentImpl parentComponentImpl) {
       this.parentComponentImpl = parentComponentImpl;
       this.childModule = new ChildModule();
 
     }
 
-    private NeedsDep1 needsDep1() {
+    NeedsDep1 needsDep1() {
       return new NeedsDep1(parentComponentImpl.dep1Provider.get());
     }
 
-    private A a() {
+    A a() {
       return injectA(A_Factory.newInstance(needsDep1(), parentComponentImpl.dep1Provider.get(), parentComponentImpl.dep2Provider.get()));
     }
 
@@ -77,11 +77,11 @@ final class DaggerParentComponent {
   private static final class ParentComponentImpl implements ParentComponent {
     private final ParentComponentImpl parentComponentImpl = this;
 
-    private Provider<Dep1> dep1Provider;
+    Provider<Dep1> dep1Provider;
 
-    private Provider<Dep2> dep2Provider;
+    Provider<Dep2> dep2Provider;
 
-    private ParentComponentImpl() {
+    ParentComponentImpl() {
 
       initialize();
 
diff --git a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest_multipleSubcomponentsWithSameSimpleNamesCanExistInSameComponent_DEFAULT_MODE_test.DaggerParentComponent b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest_multipleSubcomponentsWithSameSimpleNamesCanExistInSameComponent_DEFAULT_MODE_test.DaggerParentComponent
index 8984fcd0a6b..80acf6a9e67 100644
--- a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest_multipleSubcomponentsWithSameSimpleNamesCanExistInSameComponent_DEFAULT_MODE_test.DaggerParentComponent
+++ b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest_multipleSubcomponentsWithSameSimpleNamesCanExistInSameComponent_DEFAULT_MODE_test.DaggerParentComponent
@@ -48,8 +48,7 @@ final class DaggerParentComponent {
 
     private final ts_SubImpl _ts_SubImpl = this;
 
-    private ts_SubImpl(ParentComponentImpl parentComponentImpl, F_SubImpl f_SubImpl,
-        B_SubImpl b_SubImpl) {
+    ts_SubImpl(ParentComponentImpl parentComponentImpl, F_SubImpl f_SubImpl, B_SubImpl b_SubImpl) {
       this.parentComponentImpl = parentComponentImpl;
       this.f_SubImpl = f_SubImpl;
       this.b_SubImpl = b_SubImpl;
@@ -65,7 +64,7 @@ final class DaggerParentComponent {
 
     private final B_SubImpl b_SubImpl = this;
 
-    private B_SubImpl(ParentComponentImpl parentComponentImpl, F_SubImpl f_SubImpl) {
+    B_SubImpl(ParentComponentImpl parentComponentImpl, F_SubImpl f_SubImpl) {
       this.parentComponentImpl = parentComponentImpl;
       this.f_SubImpl = f_SubImpl;
 
@@ -83,7 +82,7 @@ final class DaggerParentComponent {
 
     private final F_SubImpl f_SubImpl = this;
 
-    private F_SubImpl(ParentComponentImpl parentComponentImpl) {
+    F_SubImpl(ParentComponentImpl parentComponentImpl) {
       this.parentComponentImpl = parentComponentImpl;
 
 
@@ -100,7 +99,7 @@ final class DaggerParentComponent {
 
     private final NoConflictImpl noConflictImpl = this;
 
-    private NoConflictImpl(ParentComponentImpl parentComponentImpl) {
+    NoConflictImpl(ParentComponentImpl parentComponentImpl) {
       this.parentComponentImpl = parentComponentImpl;
 
 
@@ -110,7 +109,7 @@ final class DaggerParentComponent {
   private static final class ParentComponentImpl implements ParentComponent {
     private final ParentComponentImpl parentComponentImpl = this;
 
-    private ParentComponentImpl() {
+    ParentComponentImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest_multipleSubcomponentsWithSameSimpleNamesCanExistInSameComponent_FAST_INIT_MODE_test.DaggerParentComponent b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest_multipleSubcomponentsWithSameSimpleNamesCanExistInSameComponent_FAST_INIT_MODE_test.DaggerParentComponent
index 8984fcd0a6b..80acf6a9e67 100644
--- a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest_multipleSubcomponentsWithSameSimpleNamesCanExistInSameComponent_FAST_INIT_MODE_test.DaggerParentComponent
+++ b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest_multipleSubcomponentsWithSameSimpleNamesCanExistInSameComponent_FAST_INIT_MODE_test.DaggerParentComponent
@@ -48,8 +48,7 @@ final class DaggerParentComponent {
 
     private final ts_SubImpl _ts_SubImpl = this;
 
-    private ts_SubImpl(ParentComponentImpl parentComponentImpl, F_SubImpl f_SubImpl,
-        B_SubImpl b_SubImpl) {
+    ts_SubImpl(ParentComponentImpl parentComponentImpl, F_SubImpl f_SubImpl, B_SubImpl b_SubImpl) {
       this.parentComponentImpl = parentComponentImpl;
       this.f_SubImpl = f_SubImpl;
       this.b_SubImpl = b_SubImpl;
@@ -65,7 +64,7 @@ final class DaggerParentComponent {
 
     private final B_SubImpl b_SubImpl = this;
 
-    private B_SubImpl(ParentComponentImpl parentComponentImpl, F_SubImpl f_SubImpl) {
+    B_SubImpl(ParentComponentImpl parentComponentImpl, F_SubImpl f_SubImpl) {
       this.parentComponentImpl = parentComponentImpl;
       this.f_SubImpl = f_SubImpl;
 
@@ -83,7 +82,7 @@ final class DaggerParentComponent {
 
     private final F_SubImpl f_SubImpl = this;
 
-    private F_SubImpl(ParentComponentImpl parentComponentImpl) {
+    F_SubImpl(ParentComponentImpl parentComponentImpl) {
       this.parentComponentImpl = parentComponentImpl;
 
 
@@ -100,7 +99,7 @@ final class DaggerParentComponent {
 
     private final NoConflictImpl noConflictImpl = this;
 
-    private NoConflictImpl(ParentComponentImpl parentComponentImpl) {
+    NoConflictImpl(ParentComponentImpl parentComponentImpl) {
       this.parentComponentImpl = parentComponentImpl;
 
 
@@ -110,7 +109,7 @@ final class DaggerParentComponent {
   private static final class ParentComponentImpl implements ParentComponent {
     private final ParentComponentImpl parentComponentImpl = this;
 
-    private ParentComponentImpl() {
+    ParentComponentImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest_subcomponentBuilderNamesShouldNotConflict_DEFAULT_MODE_test.DaggerC b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest_subcomponentBuilderNamesShouldNotConflict_DEFAULT_MODE_test.DaggerC
index b07408cc244..9c4b6318e76 100644
--- a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest_subcomponentBuilderNamesShouldNotConflict_DEFAULT_MODE_test.DaggerC
+++ b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest_subcomponentBuilderNamesShouldNotConflict_DEFAULT_MODE_test.DaggerC
@@ -69,7 +69,7 @@ final class DaggerC {
 
     private final F_SubImpl f_SubImpl = this;
 
-    private F_SubImpl(CImpl cImpl) {
+    F_SubImpl(CImpl cImpl) {
       this.cImpl = cImpl;
 
 
@@ -81,7 +81,7 @@ final class DaggerC {
 
     private final B_SubImpl b_SubImpl = this;
 
-    private B_SubImpl(CImpl cImpl) {
+    B_SubImpl(CImpl cImpl) {
       this.cImpl = cImpl;
 
 
@@ -91,7 +91,7 @@ final class DaggerC {
   private static final class CImpl implements C {
     private final CImpl cImpl = this;
 
-    private CImpl() {
+    CImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest_subcomponentBuilderNamesShouldNotConflict_FAST_INIT_MODE_test.DaggerC b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest_subcomponentBuilderNamesShouldNotConflict_FAST_INIT_MODE_test.DaggerC
index b07408cc244..9c4b6318e76 100644
--- a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest_subcomponentBuilderNamesShouldNotConflict_FAST_INIT_MODE_test.DaggerC
+++ b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest_subcomponentBuilderNamesShouldNotConflict_FAST_INIT_MODE_test.DaggerC
@@ -69,7 +69,7 @@ final class DaggerC {
 
     private final F_SubImpl f_SubImpl = this;
 
-    private F_SubImpl(CImpl cImpl) {
+    F_SubImpl(CImpl cImpl) {
       this.cImpl = cImpl;
 
 
@@ -81,7 +81,7 @@ final class DaggerC {
 
     private final B_SubImpl b_SubImpl = this;
 
-    private B_SubImpl(CImpl cImpl) {
+    B_SubImpl(CImpl cImpl) {
       this.cImpl = cImpl;
 
 
@@ -91,7 +91,7 @@ final class DaggerC {
   private static final class CImpl implements C {
     private final CImpl cImpl = this;
 
-    private CImpl() {
+    CImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest_subcomponentImplNameUsesFullyQualifiedClassNameIfNecessary_DEFAULT_MODE_test.DaggerParentComponent b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest_subcomponentImplNameUsesFullyQualifiedClassNameIfNecessary_DEFAULT_MODE_test.DaggerParentComponent
index e104079fced..fbc4fb48586 100644
--- a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest_subcomponentImplNameUsesFullyQualifiedClassNameIfNecessary_DEFAULT_MODE_test.DaggerParentComponent
+++ b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest_subcomponentImplNameUsesFullyQualifiedClassNameIfNecessary_DEFAULT_MODE_test.DaggerParentComponent
@@ -44,7 +44,7 @@ final class DaggerParentComponent {
 
     private final F_SubImpl f_SubImpl = this;
 
-    private F_SubImpl(ParentComponentImpl parentComponentImpl) {
+    F_SubImpl(ParentComponentImpl parentComponentImpl) {
       this.parentComponentImpl = parentComponentImpl;
 
 
@@ -56,7 +56,7 @@ final class DaggerParentComponent {
 
     private final F2_SubImpl f2_SubImpl = this;
 
-    private F2_SubImpl(ParentComponentImpl parentComponentImpl) {
+    F2_SubImpl(ParentComponentImpl parentComponentImpl) {
       this.parentComponentImpl = parentComponentImpl;
 
 
@@ -66,7 +66,7 @@ final class DaggerParentComponent {
   private static final class ParentComponentImpl implements ParentComponent {
     private final ParentComponentImpl parentComponentImpl = this;
 
-    private ParentComponentImpl() {
+    ParentComponentImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest_subcomponentImplNameUsesFullyQualifiedClassNameIfNecessary_FAST_INIT_MODE_test.DaggerParentComponent b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest_subcomponentImplNameUsesFullyQualifiedClassNameIfNecessary_FAST_INIT_MODE_test.DaggerParentComponent
index e104079fced..fbc4fb48586 100644
--- a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest_subcomponentImplNameUsesFullyQualifiedClassNameIfNecessary_FAST_INIT_MODE_test.DaggerParentComponent
+++ b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest_subcomponentImplNameUsesFullyQualifiedClassNameIfNecessary_FAST_INIT_MODE_test.DaggerParentComponent
@@ -44,7 +44,7 @@ final class DaggerParentComponent {
 
     private final F_SubImpl f_SubImpl = this;
 
-    private F_SubImpl(ParentComponentImpl parentComponentImpl) {
+    F_SubImpl(ParentComponentImpl parentComponentImpl) {
       this.parentComponentImpl = parentComponentImpl;
 
 
@@ -56,7 +56,7 @@ final class DaggerParentComponent {
 
     private final F2_SubImpl f2_SubImpl = this;
 
-    private F2_SubImpl(ParentComponentImpl parentComponentImpl) {
+    F2_SubImpl(ParentComponentImpl parentComponentImpl) {
       this.parentComponentImpl = parentComponentImpl;
 
 
@@ -66,7 +66,7 @@ final class DaggerParentComponent {
   private static final class ParentComponentImpl implements ParentComponent {
     private final ParentComponentImpl parentComponentImpl = this;
 
-    private ParentComponentImpl() {
+    ParentComponentImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest_subcomponentNamesShouldNotConflictWithParent_DEFAULT_MODE_test.DaggerC b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest_subcomponentNamesShouldNotConflictWithParent_DEFAULT_MODE_test.DaggerC
index 72e4ca329a3..3e8fdd8ef23 100644
--- a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest_subcomponentNamesShouldNotConflictWithParent_DEFAULT_MODE_test.DaggerC
+++ b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest_subcomponentNamesShouldNotConflictWithParent_DEFAULT_MODE_test.DaggerC
@@ -43,7 +43,7 @@ final class DaggerC {
 
     private final F_CImpl f_CImpl = this;
 
-    private F_CImpl(t_CImpl _t_CImpl) {
+    F_CImpl(t_CImpl _t_CImpl) {
       this._t_CImpl = _t_CImpl;
 
 
@@ -53,7 +53,7 @@ final class DaggerC {
   private static final class t_CImpl implements C {
     private final t_CImpl _t_CImpl = this;
 
-    private t_CImpl() {
+    t_CImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest_subcomponentNamesShouldNotConflictWithParent_FAST_INIT_MODE_test.DaggerC b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest_subcomponentNamesShouldNotConflictWithParent_FAST_INIT_MODE_test.DaggerC
index 72e4ca329a3..3e8fdd8ef23 100644
--- a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest_subcomponentNamesShouldNotConflictWithParent_FAST_INIT_MODE_test.DaggerC
+++ b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest_subcomponentNamesShouldNotConflictWithParent_FAST_INIT_MODE_test.DaggerC
@@ -43,7 +43,7 @@ final class DaggerC {
 
     private final F_CImpl f_CImpl = this;
 
-    private F_CImpl(t_CImpl _t_CImpl) {
+    F_CImpl(t_CImpl _t_CImpl) {
       this._t_CImpl = _t_CImpl;
 
 
@@ -53,7 +53,7 @@ final class DaggerC {
   private static final class t_CImpl implements C {
     private final t_CImpl _t_CImpl = this;
 
-    private t_CImpl() {
+    t_CImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest_subcomponentSimpleNamesDisambiguatedInRoot_DEFAULT_MODE_DaggerParentComponent b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest_subcomponentSimpleNamesDisambiguatedInRoot_DEFAULT_MODE_DaggerParentComponent
index 248f63bf676..7750423f033 100644
--- a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest_subcomponentSimpleNamesDisambiguatedInRoot_DEFAULT_MODE_DaggerParentComponent
+++ b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest_subcomponentSimpleNamesDisambiguatedInRoot_DEFAULT_MODE_DaggerParentComponent
@@ -43,7 +43,7 @@ final class DaggerParentComponent {
 
     private final tdmltmt_SubImpl _tdmltmt_SubImpl = this;
 
-    private tdmltmt_SubImpl(ParentComponentImpl parentComponentImpl, $_SubImpl _$_SubImpl) {
+    tdmltmt_SubImpl(ParentComponentImpl parentComponentImpl, $_SubImpl _$_SubImpl) {
       this.parentComponentImpl = parentComponentImpl;
       this._$_SubImpl = _$_SubImpl;
 
@@ -56,7 +56,7 @@ final class DaggerParentComponent {
 
     private final $_SubImpl _$_SubImpl = this;
 
-    private $_SubImpl(ParentComponentImpl parentComponentImpl) {
+    $_SubImpl(ParentComponentImpl parentComponentImpl) {
       this.parentComponentImpl = parentComponentImpl;
 
 
@@ -71,7 +71,7 @@ final class DaggerParentComponent {
   private static final class ParentComponentImpl implements ParentComponent {
     private final ParentComponentImpl parentComponentImpl = this;
 
-    private ParentComponentImpl() {
+    ParentComponentImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest_subcomponentSimpleNamesDisambiguatedInRoot_FAST_INIT_MODE_DaggerParentComponent b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest_subcomponentSimpleNamesDisambiguatedInRoot_FAST_INIT_MODE_DaggerParentComponent
index 248f63bf676..7750423f033 100644
--- a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest_subcomponentSimpleNamesDisambiguatedInRoot_FAST_INIT_MODE_DaggerParentComponent
+++ b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest_subcomponentSimpleNamesDisambiguatedInRoot_FAST_INIT_MODE_DaggerParentComponent
@@ -43,7 +43,7 @@ final class DaggerParentComponent {
 
     private final tdmltmt_SubImpl _tdmltmt_SubImpl = this;
 
-    private tdmltmt_SubImpl(ParentComponentImpl parentComponentImpl, $_SubImpl _$_SubImpl) {
+    tdmltmt_SubImpl(ParentComponentImpl parentComponentImpl, $_SubImpl _$_SubImpl) {
       this.parentComponentImpl = parentComponentImpl;
       this._$_SubImpl = _$_SubImpl;
 
@@ -56,7 +56,7 @@ final class DaggerParentComponent {
 
     private final $_SubImpl _$_SubImpl = this;
 
-    private $_SubImpl(ParentComponentImpl parentComponentImpl) {
+    $_SubImpl(ParentComponentImpl parentComponentImpl) {
       this.parentComponentImpl = parentComponentImpl;
 
 
@@ -71,7 +71,7 @@ final class DaggerParentComponent {
   private static final class ParentComponentImpl implements ParentComponent {
     private final ParentComponentImpl parentComponentImpl = this;
 
-    private ParentComponentImpl() {
+    ParentComponentImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest_subcomponentSimpleNamesDisambiguated_DEFAULT_MODE_test.DaggerParentComponent b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest_subcomponentSimpleNamesDisambiguated_DEFAULT_MODE_test.DaggerParentComponent
index 80a1c2051ab..934caeb42c6 100644
--- a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest_subcomponentSimpleNamesDisambiguated_DEFAULT_MODE_test.DaggerParentComponent
+++ b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest_subcomponentSimpleNamesDisambiguated_DEFAULT_MODE_test.DaggerParentComponent
@@ -45,7 +45,7 @@ final class DaggerParentComponent {
 
     private final tdmltmt_SubImpl _tdmltmt_SubImpl = this;
 
-    private tdmltmt_SubImpl(ParentComponentImpl parentComponentImpl, t_SubImpl _t_SubImpl) {
+    tdmltmt_SubImpl(ParentComponentImpl parentComponentImpl, t_SubImpl _t_SubImpl) {
       this.parentComponentImpl = parentComponentImpl;
       this._t_SubImpl = _t_SubImpl;
 
@@ -58,7 +58,7 @@ final class DaggerParentComponent {
 
     private final t_SubImpl _t_SubImpl = this;
 
-    private t_SubImpl(ParentComponentImpl parentComponentImpl) {
+    t_SubImpl(ParentComponentImpl parentComponentImpl) {
       this.parentComponentImpl = parentComponentImpl;
 
 
@@ -73,7 +73,7 @@ final class DaggerParentComponent {
   private static final class ParentComponentImpl implements ParentComponent {
     private final ParentComponentImpl parentComponentImpl = this;
 
-    private ParentComponentImpl() {
+    ParentComponentImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest_subcomponentSimpleNamesDisambiguated_FAST_INIT_MODE_test.DaggerParentComponent b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest_subcomponentSimpleNamesDisambiguated_FAST_INIT_MODE_test.DaggerParentComponent
index 80a1c2051ab..934caeb42c6 100644
--- a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest_subcomponentSimpleNamesDisambiguated_FAST_INIT_MODE_test.DaggerParentComponent
+++ b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest_subcomponentSimpleNamesDisambiguated_FAST_INIT_MODE_test.DaggerParentComponent
@@ -45,7 +45,7 @@ final class DaggerParentComponent {
 
     private final tdmltmt_SubImpl _tdmltmt_SubImpl = this;
 
-    private tdmltmt_SubImpl(ParentComponentImpl parentComponentImpl, t_SubImpl _t_SubImpl) {
+    tdmltmt_SubImpl(ParentComponentImpl parentComponentImpl, t_SubImpl _t_SubImpl) {
       this.parentComponentImpl = parentComponentImpl;
       this._t_SubImpl = _t_SubImpl;
 
@@ -58,7 +58,7 @@ final class DaggerParentComponent {
 
     private final t_SubImpl _t_SubImpl = this;
 
-    private t_SubImpl(ParentComponentImpl parentComponentImpl) {
+    t_SubImpl(ParentComponentImpl parentComponentImpl) {
       this.parentComponentImpl = parentComponentImpl;
 
 
@@ -73,7 +73,7 @@ final class DaggerParentComponent {
   private static final class ParentComponentImpl implements ParentComponent {
     private final ParentComponentImpl parentComponentImpl = this;
 
-    private ParentComponentImpl() {
+    ParentComponentImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_emptyMultibindings_avoidSwitchProviders_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_emptyMultibindings_avoidSwitchProviders_DEFAULT_MODE_test.DaggerTestComponent
index 63269bd02b2..f13494f9cca 100644
--- a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_emptyMultibindings_avoidSwitchProviders_DEFAULT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_emptyMultibindings_avoidSwitchProviders_DEFAULT_MODE_test.DaggerTestComponent
@@ -46,7 +46,7 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_emptyMultibindings_avoidSwitchProviders_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_emptyMultibindings_avoidSwitchProviders_FAST_INIT_MODE_test.DaggerTestComponent
index 63269bd02b2..f13494f9cca 100644
--- a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_emptyMultibindings_avoidSwitchProviders_FAST_INIT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_emptyMultibindings_avoidSwitchProviders_FAST_INIT_MODE_test.DaggerTestComponent
@@ -46,7 +46,7 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_memberInjectors_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_memberInjectors_DEFAULT_MODE_test.DaggerTestComponent
index b03b718f2bc..1585ac744e8 100644
--- a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_memberInjectors_DEFAULT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_memberInjectors_DEFAULT_MODE_test.DaggerTestComponent
@@ -45,9 +45,9 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private Provider<MembersInjector<Foo>> fooMembersInjectorProvider;
+    Provider<MembersInjector<Foo>> fooMembersInjectorProvider;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
       initialize();
 
diff --git a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_memberInjectors_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_memberInjectors_FAST_INIT_MODE_test.DaggerTestComponent
index b03b718f2bc..1585ac744e8 100644
--- a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_memberInjectors_FAST_INIT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_memberInjectors_FAST_INIT_MODE_test.DaggerTestComponent
@@ -45,9 +45,9 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private Provider<MembersInjector<Foo>> fooMembersInjectorProvider;
+    Provider<MembersInjector<Foo>> fooMembersInjectorProvider;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
       initialize();
 
diff --git a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_optionals_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_optionals_DEFAULT_MODE_test.DaggerTestComponent
index 6adde95f6c7..0dcc4a2a4a8 100644
--- a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_optionals_DEFAULT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_optionals_DEFAULT_MODE_test.DaggerTestComponent
@@ -80,11 +80,11 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private Provider<Optional<Present>> optionalOfPresentProvider;
+    Provider<Optional<Present>> optionalOfPresentProvider;
 
-    private Provider<Optional<Absent>> optionalOfAbsentProvider;
+    Provider<Optional<Absent>> optionalOfAbsentProvider;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
       initialize();
 
diff --git a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_optionals_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_optionals_FAST_INIT_MODE_test.DaggerTestComponent
index 9998715242a..8564b362b5d 100644
--- a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_optionals_FAST_INIT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_optionals_FAST_INIT_MODE_test.DaggerTestComponent
@@ -59,11 +59,11 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private Provider<Optional<Present>> optionalOfPresentProvider;
+    Provider<Optional<Present>> optionalOfPresentProvider;
 
-    private Provider<Optional<Absent>> optionalOfAbsentProvider;
+    Provider<Optional<Absent>> optionalOfAbsentProvider;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
       initialize();
 
diff --git a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_scopedBinds_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_scopedBinds_DEFAULT_MODE_test.DaggerTestComponent
index 9c4c84121f4..21e5fd9fe49 100644
--- a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_scopedBinds_DEFAULT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_scopedBinds_DEFAULT_MODE_test.DaggerTestComponent
@@ -43,9 +43,9 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private Provider<CharSequence> cProvider;
+    Provider<CharSequence> cProvider;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
       initialize();
 
diff --git a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_scopedBinds_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_scopedBinds_FAST_INIT_MODE_test.DaggerTestComponent
index 18ccb9c938c..9a2c6100725 100644
--- a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_scopedBinds_FAST_INIT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_scopedBinds_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<String> sProvider;
+    Provider<String> sProvider;
 
-    private Provider<CharSequence> cProvider;
+    Provider<CharSequence> cProvider;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
       initialize();
 
diff --git a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_switchingProviderTest_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_switchingProviderTest_DEFAULT_MODE_test.DaggerTestComponent
index 48520b46e0d..d97fe08cd7b 100644
--- a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_switchingProviderTest_DEFAULT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_switchingProviderTest_DEFAULT_MODE_test.DaggerTestComponent
@@ -42,7 +42,7 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_switchingProviderTest_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_switchingProviderTest_FAST_INIT_MODE_test.DaggerTestComponent
index 70d0364a61e..a51ea7c8a6a 100644
--- a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_switchingProviderTest_FAST_INIT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_switchingProviderTest_FAST_INIT_MODE_test.DaggerTestComponent
@@ -42,209 +42,209 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private Provider<Binding0> binding0Provider;
+    Provider<Binding0> binding0Provider;
 
-    private Provider<Binding1> binding1Provider;
+    Provider<Binding1> binding1Provider;
 
-    private Provider<Binding2> binding2Provider;
+    Provider<Binding2> binding2Provider;
 
-    private Provider<Binding3> binding3Provider;
+    Provider<Binding3> binding3Provider;
 
-    private Provider<Binding4> binding4Provider;
+    Provider<Binding4> binding4Provider;
 
-    private Provider<Binding5> binding5Provider;
+    Provider<Binding5> binding5Provider;
 
-    private Provider<Binding6> binding6Provider;
+    Provider<Binding6> binding6Provider;
 
-    private Provider<Binding7> binding7Provider;
+    Provider<Binding7> binding7Provider;
 
-    private Provider<Binding8> binding8Provider;
+    Provider<Binding8> binding8Provider;
 
-    private Provider<Binding9> binding9Provider;
+    Provider<Binding9> binding9Provider;
 
-    private Provider<Binding10> binding10Provider;
+    Provider<Binding10> binding10Provider;
 
-    private Provider<Binding11> binding11Provider;
+    Provider<Binding11> binding11Provider;
 
-    private Provider<Binding12> binding12Provider;
+    Provider<Binding12> binding12Provider;
 
-    private Provider<Binding13> binding13Provider;
+    Provider<Binding13> binding13Provider;
 
-    private Provider<Binding14> binding14Provider;
+    Provider<Binding14> binding14Provider;
 
-    private Provider<Binding15> binding15Provider;
+    Provider<Binding15> binding15Provider;
 
-    private Provider<Binding16> binding16Provider;
+    Provider<Binding16> binding16Provider;
 
-    private Provider<Binding17> binding17Provider;
+    Provider<Binding17> binding17Provider;
 
-    private Provider<Binding18> binding18Provider;
+    Provider<Binding18> binding18Provider;
 
-    private Provider<Binding19> binding19Provider;
+    Provider<Binding19> binding19Provider;
 
-    private Provider<Binding20> binding20Provider;
+    Provider<Binding20> binding20Provider;
 
-    private Provider<Binding21> binding21Provider;
+    Provider<Binding21> binding21Provider;
 
-    private Provider<Binding22> binding22Provider;
+    Provider<Binding22> binding22Provider;
 
-    private Provider<Binding23> binding23Provider;
+    Provider<Binding23> binding23Provider;
 
-    private Provider<Binding24> binding24Provider;
+    Provider<Binding24> binding24Provider;
 
-    private Provider<Binding25> binding25Provider;
+    Provider<Binding25> binding25Provider;
 
-    private Provider<Binding26> binding26Provider;
+    Provider<Binding26> binding26Provider;
 
-    private Provider<Binding27> binding27Provider;
+    Provider<Binding27> binding27Provider;
 
-    private Provider<Binding28> binding28Provider;
+    Provider<Binding28> binding28Provider;
 
-    private Provider<Binding29> binding29Provider;
+    Provider<Binding29> binding29Provider;
 
-    private Provider<Binding30> binding30Provider;
+    Provider<Binding30> binding30Provider;
 
-    private Provider<Binding31> binding31Provider;
+    Provider<Binding31> binding31Provider;
 
-    private Provider<Binding32> binding32Provider;
+    Provider<Binding32> binding32Provider;
 
-    private Provider<Binding33> binding33Provider;
+    Provider<Binding33> binding33Provider;
 
-    private Provider<Binding34> binding34Provider;
+    Provider<Binding34> binding34Provider;
 
-    private Provider<Binding35> binding35Provider;
+    Provider<Binding35> binding35Provider;
 
-    private Provider<Binding36> binding36Provider;
+    Provider<Binding36> binding36Provider;
 
-    private Provider<Binding37> binding37Provider;
+    Provider<Binding37> binding37Provider;
 
-    private Provider<Binding38> binding38Provider;
+    Provider<Binding38> binding38Provider;
 
-    private Provider<Binding39> binding39Provider;
+    Provider<Binding39> binding39Provider;
 
-    private Provider<Binding40> binding40Provider;
+    Provider<Binding40> binding40Provider;
 
-    private Provider<Binding41> binding41Provider;
+    Provider<Binding41> binding41Provider;
 
-    private Provider<Binding42> binding42Provider;
+    Provider<Binding42> binding42Provider;
 
-    private Provider<Binding43> binding43Provider;
+    Provider<Binding43> binding43Provider;
 
-    private Provider<Binding44> binding44Provider;
+    Provider<Binding44> binding44Provider;
 
-    private Provider<Binding45> binding45Provider;
+    Provider<Binding45> binding45Provider;
 
-    private Provider<Binding46> binding46Provider;
+    Provider<Binding46> binding46Provider;
 
-    private Provider<Binding47> binding47Provider;
+    Provider<Binding47> binding47Provider;
 
-    private Provider<Binding48> binding48Provider;
+    Provider<Binding48> binding48Provider;
 
-    private Provider<Binding49> binding49Provider;
+    Provider<Binding49> binding49Provider;
 
-    private Provider<Binding50> binding50Provider;
+    Provider<Binding50> binding50Provider;
 
-    private Provider<Binding51> binding51Provider;
+    Provider<Binding51> binding51Provider;
 
-    private Provider<Binding52> binding52Provider;
+    Provider<Binding52> binding52Provider;
 
-    private Provider<Binding53> binding53Provider;
+    Provider<Binding53> binding53Provider;
 
-    private Provider<Binding54> binding54Provider;
+    Provider<Binding54> binding54Provider;
 
-    private Provider<Binding55> binding55Provider;
+    Provider<Binding55> binding55Provider;
 
-    private Provider<Binding56> binding56Provider;
+    Provider<Binding56> binding56Provider;
 
-    private Provider<Binding57> binding57Provider;
+    Provider<Binding57> binding57Provider;
 
-    private Provider<Binding58> binding58Provider;
+    Provider<Binding58> binding58Provider;
 
-    private Provider<Binding59> binding59Provider;
+    Provider<Binding59> binding59Provider;
 
-    private Provider<Binding60> binding60Provider;
+    Provider<Binding60> binding60Provider;
 
-    private Provider<Binding61> binding61Provider;
+    Provider<Binding61> binding61Provider;
 
-    private Provider<Binding62> binding62Provider;
+    Provider<Binding62> binding62Provider;
 
-    private Provider<Binding63> binding63Provider;
+    Provider<Binding63> binding63Provider;
 
-    private Provider<Binding64> binding64Provider;
+    Provider<Binding64> binding64Provider;
 
-    private Provider<Binding65> binding65Provider;
+    Provider<Binding65> binding65Provider;
 
-    private Provider<Binding66> binding66Provider;
+    Provider<Binding66> binding66Provider;
 
-    private Provider<Binding67> binding67Provider;
+    Provider<Binding67> binding67Provider;
 
-    private Provider<Binding68> binding68Provider;
+    Provider<Binding68> binding68Provider;
 
-    private Provider<Binding69> binding69Provider;
+    Provider<Binding69> binding69Provider;
 
-    private Provider<Binding70> binding70Provider;
+    Provider<Binding70> binding70Provider;
 
-    private Provider<Binding71> binding71Provider;
+    Provider<Binding71> binding71Provider;
 
-    private Provider<Binding72> binding72Provider;
+    Provider<Binding72> binding72Provider;
 
-    private Provider<Binding73> binding73Provider;
+    Provider<Binding73> binding73Provider;
 
-    private Provider<Binding74> binding74Provider;
+    Provider<Binding74> binding74Provider;
 
-    private Provider<Binding75> binding75Provider;
+    Provider<Binding75> binding75Provider;
 
-    private Provider<Binding76> binding76Provider;
+    Provider<Binding76> binding76Provider;
 
-    private Provider<Binding77> binding77Provider;
+    Provider<Binding77> binding77Provider;
 
-    private Provider<Binding78> binding78Provider;
+    Provider<Binding78> binding78Provider;
 
-    private Provider<Binding79> binding79Provider;
+    Provider<Binding79> binding79Provider;
 
-    private Provider<Binding80> binding80Provider;
+    Provider<Binding80> binding80Provider;
 
-    private Provider<Binding81> binding81Provider;
+    Provider<Binding81> binding81Provider;
 
-    private Provider<Binding82> binding82Provider;
+    Provider<Binding82> binding82Provider;
 
-    private Provider<Binding83> binding83Provider;
+    Provider<Binding83> binding83Provider;
 
-    private Provider<Binding84> binding84Provider;
+    Provider<Binding84> binding84Provider;
 
-    private Provider<Binding85> binding85Provider;
+    Provider<Binding85> binding85Provider;
 
-    private Provider<Binding86> binding86Provider;
+    Provider<Binding86> binding86Provider;
 
-    private Provider<Binding87> binding87Provider;
+    Provider<Binding87> binding87Provider;
 
-    private Provider<Binding88> binding88Provider;
+    Provider<Binding88> binding88Provider;
 
-    private Provider<Binding89> binding89Provider;
+    Provider<Binding89> binding89Provider;
 
-    private Provider<Binding90> binding90Provider;
+    Provider<Binding90> binding90Provider;
 
-    private Provider<Binding91> binding91Provider;
+    Provider<Binding91> binding91Provider;
 
-    private Provider<Binding92> binding92Provider;
+    Provider<Binding92> binding92Provider;
 
-    private Provider<Binding93> binding93Provider;
+    Provider<Binding93> binding93Provider;
 
-    private Provider<Binding94> binding94Provider;
+    Provider<Binding94> binding94Provider;
 
-    private Provider<Binding95> binding95Provider;
+    Provider<Binding95> binding95Provider;
 
-    private Provider<Binding96> binding96Provider;
+    Provider<Binding96> binding96Provider;
 
-    private Provider<Binding97> binding97Provider;
+    Provider<Binding97> binding97Provider;
 
-    private Provider<Binding98> binding98Provider;
+    Provider<Binding98> binding98Provider;
 
-    private Provider<Binding99> binding99Provider;
+    Provider<Binding99> binding99Provider;
 
-    private Provider<Binding100> binding100Provider;
+    Provider<Binding100> binding100Provider;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
       initialize();
       initialize2();
diff --git a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_unscopedBinds_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_unscopedBinds_DEFAULT_MODE_test.DaggerTestComponent
index 8566133b60e..533dfa36244 100644
--- a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_unscopedBinds_DEFAULT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_unscopedBinds_DEFAULT_MODE_test.DaggerTestComponent
@@ -42,7 +42,7 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
 
     }
diff --git a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_unscopedBinds_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_unscopedBinds_FAST_INIT_MODE_test.DaggerTestComponent
index 4980ee351b6..c5b89659a02 100644
--- a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_unscopedBinds_FAST_INIT_MODE_test.DaggerTestComponent
+++ b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_unscopedBinds_FAST_INIT_MODE_test.DaggerTestComponent
@@ -42,9 +42,9 @@ final class DaggerTestComponent {
   private static final class TestComponentImpl implements TestComponent {
     private final TestComponentImpl testComponentImpl = this;
 
-    private Provider<String> sProvider;
+    Provider<String> sProvider;
 
-    private TestComponentImpl() {
+    TestComponentImpl() {
 
       initialize();
 
diff --git a/javatests/dagger/internal/codegen/kotlin/KspComponentProcessorTest.java b/javatests/dagger/internal/codegen/kotlin/KspComponentProcessorTest.java
index 9cf99cf957e..4a2ede4cd00 100644
--- a/javatests/dagger/internal/codegen/kotlin/KspComponentProcessorTest.java
+++ b/javatests/dagger/internal/codegen/kotlin/KspComponentProcessorTest.java
@@ -86,7 +86,7 @@ public void emptyComponentTest() throws Exception {
                       "  private static final class MyComponentImpl implements MyComponent {",
                       "    private final MyComponentImpl myComponentImpl = this;",
                       "",
-                      "    private MyComponentImpl() {",
+                      "    MyComponentImpl() {",
                       "",
                       "",
                       "    }",
@@ -192,7 +192,7 @@ public void injectBindingComponentTest() throws Exception {
                       "  private static final class MyComponentImpl implements MyComponent {",
                       "    private final MyComponentImpl myComponentImpl = this;",
                       "",
-                      "    private MyComponentImpl() {",
+                      "    MyComponentImpl() {",
                       "",
                       "",
                       "    }",
@@ -277,9 +277,9 @@ public void injectBindingWithProvidersComponentTest() throws Exception {
                       "  private static final class MyComponentImpl implements MyComponent {",
                       "    private final MyComponentImpl myComponentImpl = this;",
                       "",
-                      "    private Provider<Foo> fooProvider;",
+                      "    Provider<Foo> fooProvider;",
                       "",
-                      "    private MyComponentImpl() {",
+                      "    MyComponentImpl() {",
                       "",
                       "      initialize();",
                       "",
@@ -392,7 +392,7 @@ public void moduleProvidesBindingTest() throws Exception {
                       "",
                       "    private final MyComponentImpl myComponentImpl = this;",
                       "",
-                      "    private MyComponentImpl(MyModule myModuleParam) {",
+                      "    MyComponentImpl(MyModule myModuleParam) {",
                       "      this.myModule = myModuleParam;",
                       "",
                       "    }",
@@ -501,7 +501,7 @@ public void membersInjectionMethodTest() throws Exception {
                       "",
                       "    private final MyComponentImpl myComponentImpl = this;",
                       "",
-                      "    private MyComponentImpl(MyModule myModuleParam) {",
+                      "    MyComponentImpl(MyModule myModuleParam) {",
                       "      this.myModule = myModuleParam;",
                       "",
                       "    }",
@@ -616,7 +616,7 @@ public void membersInjectionTest() throws Exception {
                       "",
                       "    private final MyComponentImpl myComponentImpl = this;",
                       "",
-                      "    private MyComponentImpl(MyModule myModuleParam) {",
+                      "    MyComponentImpl(MyModule myModuleParam) {",
                       "      this.myModule = myModuleParam;",
                       "",
                       "    }",