From ad02b458fb2bae8edd8d39ed2a514994af17058a Mon Sep 17 00:00:00 2001 From: Emmanuel Jimenez Date: Fri, 18 Sep 2026 07:56:04 -0700 Subject: [PATCH] Internal change RELNOTES=n/a PiperOrigin-RevId: 983863717 --- .../codegen/writing/ComponentNames.java | 8 +- .../functional/cycle/LongCycleTest.java | 3 +- .../kotlinsrc/cycle/LongCycleTest.kt | 1 - .../hilt/android/MultiTestRoot1Test.java | 2 +- .../hilt/android/MultiTestRoot2Test.java | 2 +- .../hilt/android/UsesComponentHelper.java | 6 +- .../test.DaggerTestComponent_DEFAULT_MODE | 8 +- .../test.DaggerTestComponent_FAST_INIT_MODE | 22 +- .../test.DaggerTestComponent_KT_DEFAULT_MODE | 8 +- ...test.DaggerTestComponent_KT_FAST_INIT_MODE | 22 +- .../test.DaggerTestComponent_DEFAULT_MODE | 8 +- .../test.DaggerTestComponent_FAST_INIT_MODE | 16 +- .../test.DaggerTestComponent_KT_DEFAULT_MODE | 8 +- ...test.DaggerTestComponent_KT_FAST_INIT_MODE | 16 +- .../test.DaggerTestComponent_DEFAULT_MODE | 8 +- .../test.DaggerTestComponent_FAST_INIT_MODE | 18 +- .../test.DaggerTestComponent_KT_DEFAULT_MODE | 8 +- ...test.DaggerTestComponent_KT_FAST_INIT_MODE | 18 +- .../test.DaggerTestComponent_DEFAULT_MODE | 8 +- .../test.DaggerTestComponent_FAST_INIT_MODE | 16 +- .../test.DaggerTestComponent_KT_DEFAULT_MODE | 8 +- ...test.DaggerTestComponent_KT_FAST_INIT_MODE | 16 +- .../test.DaggerMyComponent_DEFAULT_MODE | 16 +- .../test.DaggerMyComponent_FAST_INIT_MODE | 33 ++- .../test.DaggerMyComponent_KT_DEFAULT_MODE | 16 +- .../test.DaggerMyComponent_KT_FAST_INIT_MODE | 33 ++- .../test.DaggerTestComponent_DEFAULT_MODE | 8 +- .../test.DaggerTestComponent_FAST_INIT_MODE | 16 +- .../test.DaggerTestComponent_KT_DEFAULT_MODE | 8 +- ...test.DaggerTestComponent_KT_FAST_INIT_MODE | 16 +- .../test.DaggerUnscopedComponent_DEFAULT_MODE | 10 +- ...est.DaggerUnscopedComponent_FAST_INIT_MODE | 8 +- ...st.DaggerUnscopedComponent_KT_DEFAULT_MODE | 8 +- ....DaggerUnscopedComponent_KT_FAST_INIT_MODE | 8 +- .../test.DaggerTestComponent_DEFAULT_MODE | 11 +- .../test.DaggerTestComponent_FAST_INIT_MODE | 9 +- .../test.DaggerTestComponent_KT_DEFAULT_MODE | 9 +- ...test.DaggerTestComponent_KT_FAST_INIT_MODE | 9 +- .../test.DaggerTestComponent_DEFAULT_MODE | 8 +- .../test.DaggerTestComponent_FAST_INIT_MODE | 8 +- .../test.DaggerTestComponent_KT_DEFAULT_MODE | 8 +- ...test.DaggerTestComponent_KT_FAST_INIT_MODE | 8 +- ...MODE, creatorKind=dagger.Component.Builder | 8 +- ...MODE, creatorKind=dagger.Component.Factory | 8 +- ...MODE, creatorKind=dagger.Component.Builder | 8 +- ...MODE, creatorKind=dagger.Component.Factory | 8 +- ...MODE, creatorKind=dagger.Component.Builder | 8 +- ...MODE, creatorKind=dagger.Component.Factory | 8 +- ...MODE, creatorKind=dagger.Component.Builder | 8 +- ...MODE, creatorKind=dagger.Component.Factory | 8 +- ...MODE, creatorKind=dagger.Component.Builder | 8 +- ...MODE, creatorKind=dagger.Component.Factory | 8 +- ...MODE, creatorKind=dagger.Component.Builder | 8 +- ...MODE, creatorKind=dagger.Component.Factory | 8 +- ...MODE, creatorKind=dagger.Component.Builder | 8 +- ...MODE, creatorKind=dagger.Component.Factory | 8 +- ...MODE, creatorKind=dagger.Component.Builder | 8 +- ...MODE, creatorKind=dagger.Component.Factory | 8 +- .../test.DaggerTestComponent_DEFAULT_MODE | 8 +- .../test.DaggerTestComponent_FAST_INIT_MODE | 8 +- .../test.DaggerTestComponent_KT_DEFAULT_MODE | 8 +- ...test.DaggerTestComponent_KT_FAST_INIT_MODE | 8 +- .../test.DaggerBComponent_DEFAULT_MODE | 8 +- .../test.DaggerBComponent_FAST_INIT_MODE | 18 +- .../test.DaggerBComponent_KT_DEFAULT_MODE | 8 +- .../test.DaggerBComponent_KT_FAST_INIT_MODE | 18 +- .../test.DaggerBComponent_DEFAULT_MODE | 8 +- .../test.DaggerBComponent_FAST_INIT_MODE | 18 +- .../test.DaggerBComponent_KT_DEFAULT_MODE | 8 +- .../test.DaggerBComponent_KT_FAST_INIT_MODE | 18 +- .../test.DaggerSimpleComponent_DEFAULT_MODE | 10 +- .../test.DaggerSimpleComponent_FAST_INIT_MODE | 10 +- ...test.DaggerSimpleComponent_KT_DEFAULT_MODE | 10 +- ...st.DaggerSimpleComponent_KT_FAST_INIT_MODE | 10 +- .../test.DaggerParent_DEFAULT_MODE | 18 +- .../test.DaggerParent_FAST_INIT_MODE | 26 +-- .../test.DaggerParent_KT_DEFAULT_MODE | 18 +- .../test.DaggerParent_KT_FAST_INIT_MODE | 26 +-- .../test.DaggerTestComponent_DEFAULT_MODE | 8 +- .../test.DaggerTestComponent_FAST_INIT_MODE | 8 +- .../test.DaggerTestComponent_KT_DEFAULT_MODE | 8 +- ...test.DaggerTestComponent_KT_FAST_INIT_MODE | 8 +- .../test.DaggerTestComponent_DEFAULT_MODE | 8 +- .../test.DaggerTestComponent_FAST_INIT_MODE | 8 +- .../test.DaggerTestComponent_KT_DEFAULT_MODE | 8 +- ...test.DaggerTestComponent_KT_FAST_INIT_MODE | 8 +- .../test.DaggerBComponent_DEFAULT_MODE | 8 +- .../test.DaggerBComponent_FAST_INIT_MODE | 18 +- .../test.DaggerBComponent_KT_DEFAULT_MODE | 8 +- .../test.DaggerBComponent_KT_FAST_INIT_MODE | 18 +- .../test.DaggerSimpleComponent_DEFAULT_MODE | 8 +- .../test.DaggerSimpleComponent_FAST_INIT_MODE | 16 +- ...test.DaggerSimpleComponent_KT_DEFAULT_MODE | 8 +- ...st.DaggerSimpleComponent_KT_FAST_INIT_MODE | 16 +- .../test.DaggerBComponent_DEFAULT_MODE | 8 +- .../test.DaggerBComponent_FAST_INIT_MODE | 22 +- .../test.DaggerBComponent_KT_DEFAULT_MODE | 8 +- .../test.DaggerBComponent_KT_FAST_INIT_MODE | 22 +- .../test.DaggerBComponent_DEFAULT_MODE | 8 +- .../test.DaggerBComponent_FAST_INIT_MODE | 8 +- .../test.DaggerBComponent_KT_DEFAULT_MODE | 8 +- .../test.DaggerBComponent_KT_FAST_INIT_MODE | 8 +- .../test.DaggerTestComponent_DEFAULT_MODE | 8 +- .../test.DaggerTestComponent_FAST_INIT_MODE | 8 +- .../test.DaggerTestComponent_KT_DEFAULT_MODE | 8 +- ...test.DaggerTestComponent_KT_FAST_INIT_MODE | 8 +- .../test.DaggerSimpleComponent_DEFAULT_MODE | 8 +- .../test.DaggerSimpleComponent_FAST_INIT_MODE | 8 +- ...test.DaggerSimpleComponent_KT_DEFAULT_MODE | 8 +- ...st.DaggerSimpleComponent_KT_FAST_INIT_MODE | 8 +- .../test.DaggerTestComponent_DEFAULT_MODE | 8 +- .../test.DaggerTestComponent_FAST_INIT_MODE | 8 +- .../test.DaggerTestComponent_KT_DEFAULT_MODE | 8 +- ...test.DaggerTestComponent_KT_FAST_INIT_MODE | 8 +- .../test.DaggerTestComponent_DEFAULT_MODE | 8 +- .../test.DaggerTestComponent_FAST_INIT_MODE | 8 +- .../test.DaggerTestComponent_KT_DEFAULT_MODE | 8 +- ...test.DaggerTestComponent_KT_FAST_INIT_MODE | 8 +- .../test.DaggerTestComponent_DEFAULT_MODE | 8 +- .../test.DaggerTestComponent_FAST_INIT_MODE | 8 +- .../test.DaggerTestComponent_KT_DEFAULT_MODE | 8 +- ...test.DaggerTestComponent_KT_FAST_INIT_MODE | 8 +- .../test.DaggerTestComponent_DEFAULT_MODE | 8 +- .../test.DaggerTestComponent_FAST_INIT_MODE | 8 +- .../test.DaggerTestComponent_KT_DEFAULT_MODE | 8 +- ...test.DaggerTestComponent_KT_FAST_INIT_MODE | 8 +- .../test.DaggerBComponent_DEFAULT_MODE | 8 +- .../test.DaggerBComponent_FAST_INIT_MODE | 18 +- .../test.DaggerBComponent_KT_DEFAULT_MODE | 8 +- .../test.DaggerBComponent_KT_FAST_INIT_MODE | 18 +- .../test.DaggerParent_DEFAULT_MODE | 18 +- .../test.DaggerParent_FAST_INIT_MODE | 26 +-- .../test.DaggerParent_KT_DEFAULT_MODE | 18 +- .../test.DaggerParent_KT_FAST_INIT_MODE | 26 +-- .../test.DaggerTestComponent_DEFAULT_MODE | 8 +- .../test.DaggerTestComponent_FAST_INIT_MODE | 16 +- .../test.DaggerTestComponent_KT_DEFAULT_MODE | 12 +- ...test.DaggerTestComponent_KT_FAST_INIT_MODE | 16 +- .../test.DaggerPublicComponent_DEFAULT_MODE | 8 +- .../test.DaggerPublicComponent_FAST_INIT_MODE | 8 +- ...test.DaggerPublicComponent_KT_DEFAULT_MODE | 8 +- ...st.DaggerPublicComponent_KT_FAST_INIT_MODE | 8 +- .../test.DaggerTestComponent_DEFAULT_MODE | 8 +- .../test.DaggerTestComponent_FAST_INIT_MODE | 8 +- .../test.DaggerTestComponent_KT_DEFAULT_MODE | 8 +- ...test.DaggerTestComponent_KT_FAST_INIT_MODE | 8 +- .../test.DaggerSimpleComponent_DEFAULT_MODE | 8 +- .../test.DaggerSimpleComponent_FAST_INIT_MODE | 16 +- ...test.DaggerSimpleComponent_KT_DEFAULT_MODE | 8 +- ...st.DaggerSimpleComponent_KT_FAST_INIT_MODE | 16 +- ...ggerOuterType_SimpleComponent_DEFAULT_MODE | 8 +- ...erOuterType_SimpleComponent_FAST_INIT_MODE | 8 +- ...rOuterType_SimpleComponent_KT_DEFAULT_MODE | 8 +- ...uterType_SimpleComponent_KT_FAST_INIT_MODE | 8 +- .../test.DaggerSimpleComponent_DEFAULT_MODE | 8 +- .../test.DaggerSimpleComponent_FAST_INIT_MODE | 8 +- ...test.DaggerSimpleComponent_KT_DEFAULT_MODE | 8 +- ...st.DaggerSimpleComponent_KT_FAST_INIT_MODE | 8 +- .../test.DaggerSimpleComponent_DEFAULT_MODE | 8 +- .../test.DaggerSimpleComponent_FAST_INIT_MODE | 8 +- ...test.DaggerSimpleComponent_KT_DEFAULT_MODE | 8 +- ...st.DaggerSimpleComponent_KT_FAST_INIT_MODE | 8 +- .../test.DaggerParent_DEFAULT_MODE | 8 +- .../test.DaggerParent_FAST_INIT_MODE | 8 +- .../test.DaggerParent_KT_DEFAULT_MODE | 8 +- .../test.DaggerParent_KT_FAST_INIT_MODE | 8 +- .../test.DaggerTestComponent_DEFAULT_MODE | 8 +- .../test.DaggerTestComponent_FAST_INIT_MODE | 8 +- .../test.DaggerTestComponent_KT_DEFAULT_MODE | 8 +- ...test.DaggerTestComponent_KT_FAST_INIT_MODE | 8 +- .../test.DaggerParent_DEFAULT_MODE | 8 +- .../test.DaggerParent_FAST_INIT_MODE | 8 +- .../test.DaggerParent_KT_DEFAULT_MODE | 8 +- .../test.DaggerParent_KT_FAST_INIT_MODE | 8 +- .../test.DaggerTestComponent_DEFAULT_MODE | 8 +- .../test.DaggerTestComponent_FAST_INIT_MODE | 16 +- .../test.DaggerTestComponent_KT_DEFAULT_MODE | 8 +- ...test.DaggerTestComponent_KT_FAST_INIT_MODE | 16 +- .../test.DaggerTestComponent_DEFAULT_MODE | 8 +- .../test.DaggerTestComponent_FAST_INIT_MODE | 8 +- .../test.DaggerTestComponent_KT_DEFAULT_MODE | 8 +- ...test.DaggerTestComponent_KT_FAST_INIT_MODE | 8 +- .../test.DaggerTestComponent_DEFAULT_MODE | 20 +- .../test.DaggerTestComponent_FAST_INIT_MODE | 20 +- .../test.DaggerTestComponent_KT_DEFAULT_MODE | 20 +- ...test.DaggerTestComponent_KT_FAST_INIT_MODE | 20 +- .../test.DaggerTestComponent_DEFAULT_MODE | 18 +- .../test.DaggerTestComponent_FAST_INIT_MODE | 37 ++- .../test.DaggerTestComponent_KT_DEFAULT_MODE | 18 +- ...test.DaggerTestComponent_KT_FAST_INIT_MODE | 37 ++- .../test.DaggerTestComponent_DEFAULT_MODE | 8 +- .../test.DaggerTestComponent_FAST_INIT_MODE | 8 +- .../test.DaggerTestComponent_KT_DEFAULT_MODE | 8 +- ...test.DaggerTestComponent_KT_FAST_INIT_MODE | 8 +- .../test.DaggerTestComponent_DEFAULT_MODE | 8 +- .../test.DaggerTestComponent_FAST_INIT_MODE | 8 +- .../test.DaggerTestComponent_KT_DEFAULT_MODE | 8 +- ...test.DaggerTestComponent_KT_FAST_INIT_MODE | 8 +- ...l.codegen.DaggerTestComponent_DEFAULT_MODE | 56 ++--- ...codegen.DaggerTestComponent_FAST_INIT_MODE | 96 ++++---- ...odegen.DaggerTestComponent_KT_DEFAULT_MODE | 56 ++--- ...egen.DaggerTestComponent_KT_FAST_INIT_MODE | 96 ++++---- ...l.codegen.DaggerTestComponent_DEFAULT_MODE | 24 +- ...codegen.DaggerTestComponent_FAST_INIT_MODE | 44 ++-- ...odegen.DaggerTestComponent_KT_DEFAULT_MODE | 24 +- ...egen.DaggerTestComponent_KT_FAST_INIT_MODE | 44 ++-- ...l.codegen.DaggerTestComponent_DEFAULT_MODE | 25 +- ...codegen.DaggerTestComponent_FAST_INIT_MODE | 45 ++-- ...odegen.DaggerTestComponent_KT_DEFAULT_MODE | 25 +- ...egen.DaggerTestComponent_KT_FAST_INIT_MODE | 45 ++-- .../test.DaggerSimpleComponent | 16 +- .../test.DaggerSimpleComponent | 16 +- .../test.DaggerSimpleComponent | 8 +- .../test.DaggerTestComponent_DEFAULT_MODE | 8 +- .../test.DaggerTestComponent_FAST_INIT_MODE | 16 +- .../test.DaggerTestComponent_KT_DEFAULT_MODE | 8 +- ...test.DaggerTestComponent_KT_FAST_INIT_MODE | 16 +- .../test.DaggerTestComponent_DEFAULT_MODE | 8 +- .../test.DaggerTestComponent_FAST_INIT_MODE | 16 +- .../test.DaggerTestComponent_KT_DEFAULT_MODE | 8 +- ...test.DaggerTestComponent_KT_FAST_INIT_MODE | 16 +- .../test.DaggerTestComponent_DEFAULT_MODE | 8 +- .../test.DaggerTestComponent_FAST_INIT_MODE | 16 +- .../test.DaggerTestComponent_KT_DEFAULT_MODE | 8 +- ...test.DaggerTestComponent_KT_FAST_INIT_MODE | 16 +- .../test.DaggerTestComponent_DEFAULT_MODE | 8 +- .../test.DaggerTestComponent_FAST_INIT_MODE | 16 +- .../test.DaggerTestComponent_KT_DEFAULT_MODE | 12 +- ...test.DaggerTestComponent_KT_FAST_INIT_MODE | 20 +- .../test.DaggerTestComponent_DEFAULT_MODE | 8 +- .../test.DaggerTestComponent_FAST_INIT_MODE | 16 +- .../test.DaggerTestComponent_KT_DEFAULT_MODE | 16 +- ...test.DaggerTestComponent_KT_FAST_INIT_MODE | 24 +- ...ggerRequestsSubtypeAsProvider_DEFAULT_MODE | 8 +- ...erRequestsSubtypeAsProvider_FAST_INIT_MODE | 16 +- ...rRequestsSubtypeAsProvider_KT_DEFAULT_MODE | 8 +- ...equestsSubtypeAsProvider_KT_FAST_INIT_MODE | 16 +- .../test.DaggerTestComponent_DEFAULT_MODE | 8 +- .../test.DaggerTestComponent_FAST_INIT_MODE | 16 +- .../test.DaggerTestComponent_KT_DEFAULT_MODE | 8 +- ...test.DaggerTestComponent_KT_FAST_INIT_MODE | 16 +- .../test.DaggerTestComponent_DEFAULT_MODE | 8 +- .../test.DaggerTestComponent_FAST_INIT_MODE | 16 +- .../test.DaggerTestComponent_KT_DEFAULT_MODE | 8 +- ...test.DaggerTestComponent_KT_FAST_INIT_MODE | 16 +- .../test.DaggerTestComponent_DEFAULT_MODE | 8 +- .../test.DaggerTestComponent_FAST_INIT_MODE | 20 +- .../test.DaggerTestComponent_KT_DEFAULT_MODE | 8 +- ...test.DaggerTestComponent_KT_FAST_INIT_MODE | 20 +- .../test.DaggerTestComponent_DEFAULT_MODE | 8 +- .../test.DaggerTestComponent_FAST_INIT_MODE | 20 +- .../test.DaggerTestComponent_KT_DEFAULT_MODE | 8 +- ...test.DaggerTestComponent_KT_FAST_INIT_MODE | 20 +- .../test.DaggerTestComponent_DEFAULT_MODE | 8 +- .../test.DaggerTestComponent_FAST_INIT_MODE | 18 +- .../test.DaggerTestComponent_KT_DEFAULT_MODE | 8 +- ...test.DaggerTestComponent_KT_FAST_INIT_MODE | 18 +- .../test.DaggerSimpleComponent_DEFAULT_MODE | 18 +- .../test.DaggerSimpleComponent_FAST_INIT_MODE | 26 +-- ...test.DaggerSimpleComponent_KT_DEFAULT_MODE | 18 +- ...st.DaggerSimpleComponent_KT_FAST_INIT_MODE | 26 +-- .../test.DaggerSimpleComponent_DEFAULT_MODE | 8 +- .../test.DaggerSimpleComponent_FAST_INIT_MODE | 8 +- ...test.DaggerSimpleComponent_KT_DEFAULT_MODE | 8 +- ...st.DaggerSimpleComponent_KT_FAST_INIT_MODE | 8 +- .../test.DaggerSimpleComponent_DEFAULT_MODE | 8 +- .../test.DaggerSimpleComponent_FAST_INIT_MODE | 20 +- ...test.DaggerSimpleComponent_KT_DEFAULT_MODE | 8 +- ...st.DaggerSimpleComponent_KT_FAST_INIT_MODE | 20 +- .../test.DaggerTestComponent_DEFAULT_MODE | 8 +- .../test.DaggerTestComponent_FAST_INIT_MODE | 18 +- .../test.DaggerTestComponent_KT_DEFAULT_MODE | 8 +- ...test.DaggerTestComponent_KT_FAST_INIT_MODE | 18 +- .../test.DaggerTestComponent_DEFAULT_MODE | 8 +- .../test.DaggerTestComponent_FAST_INIT_MODE | 18 +- .../test.DaggerTestComponent_KT_DEFAULT_MODE | 8 +- ...test.DaggerTestComponent_KT_FAST_INIT_MODE | 18 +- .../test.DaggerTestComponent_DEFAULT_MODE | 8 +- .../test.DaggerTestComponent_FAST_INIT_MODE | 16 +- .../test.DaggerTestComponent_KT_DEFAULT_MODE | 8 +- ...test.DaggerTestComponent_KT_FAST_INIT_MODE | 16 +- .../other.DaggerMyComponent_DEFAULT_MODE | 8 +- .../other.DaggerMyComponent_FAST_INIT_MODE | 8 +- .../other.DaggerMyComponent_KT_DEFAULT_MODE | 8 +- .../other.DaggerMyComponent_KT_FAST_INIT_MODE | 8 +- .../other.DaggerMyComponent_DEFAULT_MODE | 8 +- .../other.DaggerMyComponent_FAST_INIT_MODE | 8 +- .../other.DaggerMyComponent_KT_DEFAULT_MODE | 8 +- .../other.DaggerMyComponent_KT_FAST_INIT_MODE | 8 +- .../other.DaggerMyComponent_DEFAULT_MODE | 8 +- .../other.DaggerMyComponent_FAST_INIT_MODE | 8 +- .../test.DaggerMyComponent | 8 +- .../test.DaggerTestComponent_DEFAULT_MODE | 8 +- .../test.DaggerTestComponent_FAST_INIT_MODE | 8 +- .../test.DaggerTestComponent_KT_DEFAULT_MODE | 8 +- ...test.DaggerTestComponent_KT_FAST_INIT_MODE | 8 +- .../test.DaggerTestComponent_DEFAULT_MODE | 8 +- .../test.DaggerTestComponent_FAST_INIT_MODE | 18 +- .../test.DaggerTestComponent_DEFAULT_MODE | 8 +- .../test.DaggerTestComponent_FAST_INIT_MODE | 8 +- .../test.DaggerTestComponent_KT_DEFAULT_MODE | 8 +- ...test.DaggerTestComponent_KT_FAST_INIT_MODE | 8 +- .../test.DaggerTestComponent_DEFAULT_MODE | 8 +- .../test.DaggerTestComponent_FAST_INIT_MODE | 26 +-- .../test.DaggerTestComponent_KT_DEFAULT_MODE | 8 +- ...test.DaggerTestComponent_KT_FAST_INIT_MODE | 26 +-- .../test.DaggerTestComponent_DEFAULT_MODE | 8 +- .../test.DaggerTestComponent_FAST_INIT_MODE | 20 +- .../test.DaggerTestComponent_DEFAULT_MODE | 8 +- .../test.DaggerTestComponent_FAST_INIT_MODE | 18 +- .../test.DaggerTestComponent_KT_DEFAULT_MODE | 8 +- ...test.DaggerTestComponent_KT_FAST_INIT_MODE | 18 +- .../test.DaggerTestComponent_DEFAULT_MODE | 8 +- .../test.DaggerTestComponent_FAST_INIT_MODE | 26 +-- .../test.DaggerTestComponent_KT_DEFAULT_MODE | 8 +- ...test.DaggerTestComponent_KT_FAST_INIT_MODE | 26 +-- .../test.DaggerTestComponent_DEFAULT_MODE | 8 +- .../test.DaggerTestComponent_FAST_INIT_MODE | 26 +-- .../test.DaggerTestComponent_DEFAULT_MODE | 8 +- .../test.DaggerTestComponent_FAST_INIT_MODE | 8 +- .../test.DaggerTestComponent_DEFAULT_MODE | 8 +- .../test.DaggerTestComponent_FAST_INIT_MODE | 40 ++-- .../test.DaggerTestComponent_DEFAULT_MODE | 8 +- .../test.DaggerTestComponent_FAST_INIT_MODE | 22 +- .../test.DaggerTestComponent_DEFAULT_MODE | 8 +- .../test.DaggerTestComponent_FAST_INIT_MODE | 8 +- .../test.DaggerParent_DEFAULT_MODE | 18 +- .../test.DaggerParent_FAST_INIT_MODE | 18 +- .../test.DaggerTestComponent_DEFAULT_MODE | 8 +- .../test.DaggerTestComponent_FAST_INIT_MODE | 8 +- .../test.DaggerTestComponent_KT_DEFAULT_MODE | 8 +- ...test.DaggerTestComponent_KT_FAST_INIT_MODE | 8 +- .../test.DaggerTestComponent_DEFAULT_MODE | 8 +- .../test.DaggerTestComponent_FAST_INIT_MODE | 36 +-- .../test.DaggerTestComponent_KT_DEFAULT_MODE | 36 +-- ...test.DaggerTestComponent_KT_FAST_INIT_MODE | 60 ++--- .../test.DaggerTestComponent_DEFAULT_MODE | 16 +- .../test.DaggerTestComponent_FAST_INIT_MODE | 54 ++--- .../test.DaggerTestComponent_KT_DEFAULT_MODE | 16 +- ...test.DaggerTestComponent_KT_FAST_INIT_MODE | 54 ++--- .../test.DaggerTestComponent_DEFAULT_MODE | 8 +- .../test.DaggerTestComponent_FAST_INIT_MODE | 8 +- .../test.DaggerTestComponent_KT_DEFAULT_MODE | 8 +- ...test.DaggerTestComponent_KT_FAST_INIT_MODE | 8 +- .../test.DaggerTestComponent_DEFAULT_MODE | 16 +- .../test.DaggerTestComponent_FAST_INIT_MODE | 16 +- .../test.DaggerTestComponent_KT_DEFAULT_MODE | 16 +- ...test.DaggerTestComponent_KT_FAST_INIT_MODE | 16 +- .../test.DaggerParent_DEFAULT_MODE | 18 +- .../test.DaggerParent_FAST_INIT_MODE | 18 +- .../test.DaggerParent_KT_DEFAULT_MODE | 18 +- .../test.DaggerParent_KT_FAST_INIT_MODE | 18 +- .../test.DaggerTestComponent_DEFAULT_MODE | 8 +- .../test.DaggerTestComponent_FAST_INIT_MODE | 8 +- .../test.DaggerTestComponent_KT_DEFAULT_MODE | 8 +- ...test.DaggerTestComponent_KT_FAST_INIT_MODE | 8 +- .../test.DaggerTestComponent_DEFAULT_MODE | 8 +- .../test.DaggerTestComponent_FAST_INIT_MODE | 16 +- .../test.DaggerTestComponent_KT_DEFAULT_MODE | 8 +- ...test.DaggerTestComponent_KT_FAST_INIT_MODE | 16 +- .../test.DaggerTestComponent_DEFAULT_MODE | 8 +- .../test.DaggerTestComponent_FAST_INIT_MODE | 8 +- .../test.DaggerTestComponent_KT_DEFAULT_MODE | 8 +- ...test.DaggerTestComponent_KT_FAST_INIT_MODE | 8 +- .../test.DaggerTestComponent_DEFAULT_MODE | 8 +- .../test.DaggerTestComponent_FAST_INIT_MODE | 8 +- .../test.DaggerTestComponent_KT_DEFAULT_MODE | 8 +- ...test.DaggerTestComponent_KT_FAST_INIT_MODE | 8 +- .../test.DaggerTestComponent_DEFAULT_MODE | 8 +- .../test.DaggerTestComponent_FAST_INIT_MODE | 8 +- .../test.DaggerTestComponent_KT_DEFAULT_MODE | 8 +- ...test.DaggerTestComponent_KT_FAST_INIT_MODE | 8 +- .../test.DaggerMyComponent_DEFAULT_MODE | 16 +- .../test.DaggerMyComponent_FAST_INIT_MODE | 16 +- .../test.DaggerMyComponent_KT_DEFAULT_MODE | 16 +- .../test.DaggerMyComponent_KT_FAST_INIT_MODE | 16 +- .../test.DaggerMyComponent_DEFAULT_MODE | 8 +- .../test.DaggerMyComponent_FAST_INIT_MODE | 8 +- .../test.DaggerMyComponent_KT_DEFAULT_MODE | 8 +- .../test.DaggerMyComponent_KT_FAST_INIT_MODE | 8 +- .../test.DaggerMyComponent_DEFAULT_MODE | 8 +- .../test.DaggerMyComponent_FAST_INIT_MODE | 8 +- .../test.DaggerMyComponent_KT_DEFAULT_MODE | 8 +- .../test.DaggerMyComponent_KT_FAST_INIT_MODE | 8 +- .../other.DaggerMyComponent_DEFAULT_MODE | 8 +- .../other.DaggerMyComponent_FAST_INIT_MODE | 8 +- .../other.DaggerMyComponent_KT_DEFAULT_MODE | 8 +- .../other.DaggerMyComponent_KT_FAST_INIT_MODE | 8 +- .../other.DaggerMyComponent_DEFAULT_MODE | 8 +- .../other.DaggerMyComponent_FAST_INIT_MODE | 8 +- .../other.DaggerMyComponent_KT_DEFAULT_MODE | 8 +- .../other.DaggerMyComponent_KT_FAST_INIT_MODE | 8 +- .../other.DaggerMyComponent_DEFAULT_MODE | 8 +- .../other.DaggerMyComponent_FAST_INIT_MODE | 8 +- .../test.DaggerTestComponent_DEFAULT_MODE | 8 +- .../test.DaggerTestComponent_FAST_INIT_MODE | 16 +- .../test.DaggerTestComponent_KT_DEFAULT_MODE | 8 +- ...test.DaggerTestComponent_KT_FAST_INIT_MODE | 16 +- .../test.DaggerTestComponent_DEFAULT_MODE | 8 +- .../test.DaggerTestComponent_FAST_INIT_MODE | 8 +- .../test.DaggerTestComponent_KT_DEFAULT_MODE | 8 +- ...test.DaggerTestComponent_KT_FAST_INIT_MODE | 8 +- .../test.DaggerParent_DEFAULT_MODE | 18 +- .../test.DaggerParent_FAST_INIT_MODE | 26 +-- .../test.DaggerParent_KT_DEFAULT_MODE | 18 +- .../test.DaggerParent_KT_FAST_INIT_MODE | 26 +-- ...ggerTestClass_SimpleComponent_DEFAULT_MODE | 10 +- ...erTestClass_SimpleComponent_FAST_INIT_MODE | 28 +-- ...rTestClass_SimpleComponent_KT_DEFAULT_MODE | 10 +- ...estClass_SimpleComponent_KT_FAST_INIT_MODE | 28 +-- .../test.DaggerTestComponent_DEFAULT_MODE | 8 +- .../test.DaggerTestComponent_FAST_INIT_MODE | 8 +- .../test.DaggerTestComponent_DEFAULT_MODE | 8 +- .../test.DaggerTestComponent_FAST_INIT_MODE | 8 +- .../test.DaggerTestComponent_DEFAULT_MODE | 8 +- .../test.DaggerTestComponent_FAST_INIT_MODE | 8 +- .../test.DaggerTestComponent_DEFAULT_MODE | 16 +- .../test.DaggerTestComponent_FAST_INIT_MODE | 16 +- .../test.DaggerTestComponent_DEFAULT_MODE | 8 +- .../test.DaggerTestComponent_FAST_INIT_MODE | 8 +- .../test.DaggerTestComponent_KT_DEFAULT_MODE | 8 +- ...test.DaggerTestComponent_KT_FAST_INIT_MODE | 8 +- .../test.DaggerTestComponent_DEFAULT_MODE | 8 +- .../test.DaggerTestComponent_FAST_INIT_MODE | 8 +- .../test.DaggerTestComponent_KT_DEFAULT_MODE | 8 +- ...test.DaggerTestComponent_KT_FAST_INIT_MODE | 8 +- .../test.DaggerTestComponent_DEFAULT_MODE | 8 +- .../test.DaggerTestComponent_FAST_INIT_MODE | 8 +- .../test.DaggerTestComponent_KT_DEFAULT_MODE | 8 +- ...test.DaggerTestComponent_KT_FAST_INIT_MODE | 8 +- .../test.DaggerParent_DEFAULT_MODE | 16 +- .../test.DaggerParent_FAST_INIT_MODE | 16 +- .../test.DaggerParent_KT_DEFAULT_MODE | 16 +- .../test.DaggerParent_KT_FAST_INIT_MODE | 16 +- ...E, creatorKind=dagger.Subcomponent.Builder | 26 +-- ...E, creatorKind=dagger.Subcomponent.Factory | 26 +-- ...E, creatorKind=dagger.Subcomponent.Builder | 26 +-- ...E, creatorKind=dagger.Subcomponent.Factory | 26 +-- .../test.DaggerParentComponent_DEFAULT_MODE | 20 +- .../test.DaggerParentComponent_FAST_INIT_MODE | 34 +-- ...test.DaggerParentComponent_KT_DEFAULT_MODE | 20 +- ...st.DaggerParentComponent_KT_FAST_INIT_MODE | 34 +-- .../test.DaggerParentComponent_DEFAULT_MODE | 40 ++-- .../test.DaggerParentComponent_FAST_INIT_MODE | 40 ++-- ...test.DaggerParentComponent_KT_DEFAULT_MODE | 40 ++-- ...st.DaggerParentComponent_KT_FAST_INIT_MODE | 40 ++-- .../test.DaggerC_DEFAULT_MODE | 40 ++-- .../test.DaggerC_FAST_INIT_MODE | 40 ++-- .../test.DaggerC_KT_DEFAULT_MODE | 40 ++-- .../test.DaggerC_KT_FAST_INIT_MODE | 40 ++-- .../test.DaggerParentComponent_DEFAULT_MODE | 24 +- .../test.DaggerParentComponent_FAST_INIT_MODE | 24 +- ...test.DaggerParentComponent_KT_DEFAULT_MODE | 24 +- ...st.DaggerParentComponent_KT_FAST_INIT_MODE | 24 +- .../test.DaggerC_DEFAULT_MODE | 20 +- .../test.DaggerC_FAST_INIT_MODE | 20 +- .../test.DaggerC_KT_DEFAULT_MODE | 20 +- .../test.DaggerC_KT_FAST_INIT_MODE | 20 +- .../test.DaggerParentComponent_DEFAULT_MODE | 24 +- .../test.DaggerParentComponent_FAST_INIT_MODE | 24 +- ...test.DaggerParentComponent_KT_DEFAULT_MODE | 24 +- ...st.DaggerParentComponent_KT_FAST_INIT_MODE | 24 +- .../DaggerParentComponent_DEFAULT_MODE | 24 +- .../DaggerParentComponent_FAST_INIT_MODE | 24 +- .../DaggerParentComponent_KT_DEFAULT_MODE | 24 +- .../DaggerParentComponent_KT_FAST_INIT_MODE | 24 +- .../test.DaggerTestComponent_DEFAULT_MODE | 8 +- .../test.DaggerTestComponent_FAST_INIT_MODE | 8 +- .../test.DaggerTestComponent_KT_DEFAULT_MODE | 8 +- ...test.DaggerTestComponent_KT_FAST_INIT_MODE | 8 +- .../test.DaggerTestComponent_DEFAULT_MODE | 8 +- .../test.DaggerTestComponent_FAST_INIT_MODE | 8 +- .../test.DaggerTestComponent_KT_DEFAULT_MODE | 8 +- ...test.DaggerTestComponent_KT_FAST_INIT_MODE | 8 +- .../test.DaggerTestComponent_DEFAULT_MODE | 8 +- .../test.DaggerTestComponent_FAST_INIT_MODE | 16 +- .../test.DaggerTestComponent_KT_DEFAULT_MODE | 8 +- ...test.DaggerTestComponent_KT_FAST_INIT_MODE | 16 +- .../test.DaggerTestComponent_DEFAULT_MODE | 8 +- .../test.DaggerTestComponent_FAST_INIT_MODE | 16 +- .../test.DaggerTestComponent_KT_DEFAULT_MODE | 8 +- ...test.DaggerTestComponent_KT_FAST_INIT_MODE | 16 +- .../test.DaggerTestComponent_DEFAULT_MODE | 8 +- .../test.DaggerTestComponent_FAST_INIT_MODE | 216 +++++++++--------- .../test.DaggerTestComponent_KT_DEFAULT_MODE | 8 +- ...test.DaggerTestComponent_KT_FAST_INIT_MODE | 216 +++++++++--------- .../test.DaggerTestComponent_DEFAULT_MODE | 8 +- .../test.DaggerTestComponent_FAST_INIT_MODE | 16 +- .../test.DaggerTestComponent_KT_DEFAULT_MODE | 8 +- ...test.DaggerTestComponent_KT_FAST_INIT_MODE | 16 +- ...ent_DEFAULT_MODE_typeUseNullables_DISABLED | 8 +- ...nent_DEFAULT_MODE_typeUseNullables_ENABLED | 8 +- ...t_FAST_INIT_MODE_typeUseNullables_DISABLED | 18 +- ...nt_FAST_INIT_MODE_typeUseNullables_ENABLED | 18 +- ...ent_DEFAULT_MODE_typeUseNullables_DISABLED | 8 +- ...nent_DEFAULT_MODE_typeUseNullables_ENABLED | 8 +- ...t_FAST_INIT_MODE_typeUseNullables_DISABLED | 8 +- ...nt_FAST_INIT_MODE_typeUseNullables_ENABLED | 8 +- ...ent_DEFAULT_MODE_typeUseNullables_DISABLED | 8 +- ...nent_DEFAULT_MODE_typeUseNullables_ENABLED | 8 +- ...t_FAST_INIT_MODE_typeUseNullables_DISABLED | 8 +- ...nt_FAST_INIT_MODE_typeUseNullables_ENABLED | 8 +- .../kotlin/KspComponentProcessorTest.java | 48 ++-- 503 files changed, 3650 insertions(+), 3662 deletions(-) diff --git a/dagger-compiler/main/java/dagger/internal/codegen/writing/ComponentNames.java b/dagger-compiler/main/java/dagger/internal/codegen/writing/ComponentNames.java index d44b8c02bd7..c7aa827c9a4 100644 --- a/dagger-compiler/main/java/dagger/internal/codegen/writing/ComponentNames.java +++ b/dagger-compiler/main/java/dagger/internal/codegen/writing/ComponentNames.java @@ -172,6 +172,10 @@ private static ImmutableMap disambiguateConflictingSimple UniqueNameSet nameSet = new UniqueNameSet(); ImmutableMap.Builder uniqueNames = ImmutableMap.builder(); for (ComponentPath componentPath : componentsWithConflictingNames) { + if (componentPath.atRoot()) { + uniqueNames.put(componentPath, simpleName(componentPath)); + continue; + } String simpleName = simpleName(componentPath); String basePrefix = uniquingPrefix(componentPath); uniqueNames.put( @@ -181,7 +185,9 @@ private static ImmutableMap disambiguateConflictingSimple } private static String simpleName(ComponentPath componentPath) { - return getSimpleName(componentPath.currentComponent().xprocessing()); + return componentPath.atRoot() + ? "" + : getSimpleName(componentPath.currentComponent().xprocessing()); } /** Returns a prefix that could make the component's simple name more unique. */ diff --git a/javatests/dagger/functional/cycle/LongCycleTest.java b/javatests/dagger/functional/cycle/LongCycleTest.java index 5a0a5546d1a..199877f913d 100644 --- a/javatests/dagger/functional/cycle/LongCycleTest.java +++ b/javatests/dagger/functional/cycle/LongCycleTest.java @@ -51,8 +51,7 @@ public void longCycleHasMoreThanOneInitializeMethod() throws Exception { ClassName componentImpl = System.getProperty("dagger.mode").contains("ExtendsComponent") ? ClassName.get(DaggerLongCycle_LongCycleComponent.class) - : ClassName.get(DaggerLongCycle_LongCycleComponent.class) - .nestedClass("LongCycleComponentImpl"); + : ClassName.get(DaggerLongCycle_LongCycleComponent.class).nestedClass("Impl"); boolean hasInitialize2 = stream( DaggerLongCycle_LongCycleComponent.class diff --git a/javatests/dagger/functional/kotlinsrc/cycle/LongCycleTest.kt b/javatests/dagger/functional/kotlinsrc/cycle/LongCycleTest.kt index cd3c3115beb..9a773f1bb48 100644 --- a/javatests/dagger/functional/kotlinsrc/cycle/LongCycleTest.kt +++ b/javatests/dagger/functional/kotlinsrc/cycle/LongCycleTest.kt @@ -20,7 +20,6 @@ import com.google.common.truth.Truth.assertThat import com.google.common.truth.TruthJUnit.assume import com.squareup.javapoet.ClassName import java.lang.reflect.Method -import java.util.Arrays import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.JUnit4 diff --git a/javatests/dagger/hilt/android/MultiTestRoot1Test.java b/javatests/dagger/hilt/android/MultiTestRoot1Test.java index 82be03e6e06..2e6b44dae55 100644 --- a/javatests/dagger/hilt/android/MultiTestRoot1Test.java +++ b/javatests/dagger/hilt/android/MultiTestRoot1Test.java @@ -282,7 +282,7 @@ public void testMissingMultiTestRoot2EntryPoint() throws Exception { .hasMessageThat() .isEqualTo( "Cannot cast dagger.hilt.android.internal.testing.root." - + "DaggerMultiTestRoot1Test_HiltComponents_SingletonC$SingletonCImpl" + + "DaggerMultiTestRoot1Test_HiltComponents_SingletonC$Impl" + " to dagger.hilt.android.MultiTestRoot2Test$BarEntryPoint"); } diff --git a/javatests/dagger/hilt/android/MultiTestRoot2Test.java b/javatests/dagger/hilt/android/MultiTestRoot2Test.java index a8beb88df94..8c2057521b0 100644 --- a/javatests/dagger/hilt/android/MultiTestRoot2Test.java +++ b/javatests/dagger/hilt/android/MultiTestRoot2Test.java @@ -260,7 +260,7 @@ public void testMissingMultiTestRoot1EntryPoint() throws Exception { .hasMessageThat() .isEqualTo( "Cannot cast dagger.hilt.android.internal.testing.root." - + "DaggerMultiTestRoot2Test_HiltComponents_SingletonC$SingletonCImpl" + + "DaggerMultiTestRoot2Test_HiltComponents_SingletonC$Impl" + " to dagger.hilt.android.MultiTestRoot1Test$BarEntryPoint"); } diff --git a/javatests/dagger/hilt/android/UsesComponentHelper.java b/javatests/dagger/hilt/android/UsesComponentHelper.java index df70a942543..e1696771770 100644 --- a/javatests/dagger/hilt/android/UsesComponentHelper.java +++ b/javatests/dagger/hilt/android/UsesComponentHelper.java @@ -23,7 +23,7 @@ public abstract class UsesComponentHelper { public static String defaultComponentName() { return "dagger.hilt.android.internal.testing.root." - + "DaggerDefault_HiltComponents_SingletonC$SingletonCImpl"; + + "DaggerDefault_HiltComponents_SingletonC$Impl"; } /** @@ -33,7 +33,7 @@ public static String defaultComponentName() { public static String perTestComponentName(Object testInstance) { return "dagger.hilt.android.internal.testing.root.Dagger" + testInstance.getClass().getSimpleName() - + "_HiltComponents_SingletonC$SingletonCImpl"; + + "_HiltComponents_SingletonC$Impl"; } /** @@ -45,7 +45,7 @@ public static String perTestComponentNameWithDedupePrefix( return "dagger.hilt.android.internal.testing.root.Dagger" + expectedPrefix + testInstance.getClass().getSimpleName() - + "_HiltComponents_SingletonC$SingletonCImpl"; + + "_HiltComponents_SingletonC$Impl"; } private UsesComponentHelper() {} diff --git a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/assistedParamConflictsWithComponentFieldName_successfulyDeduped/test.DaggerTestComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/assistedParamConflictsWithComponentFieldName_successfulyDeduped/test.DaggerTestComponent_DEFAULT_MODE index 39cde1e9130..0a8e5499b8c 100644 --- a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/assistedParamConflictsWithComponentFieldName_successfulyDeduped/test.DaggerTestComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/assistedParamConflictsWithComponentFieldName_successfulyDeduped/test.DaggerTestComponent_DEFAULT_MODE @@ -35,18 +35,18 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; Foo_Factory fooProvider; Provider fooFactoryProvider; - TestComponentImpl() { + Impl() { initialize(); diff --git a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/assistedParamConflictsWithComponentFieldName_successfulyDeduped/test.DaggerTestComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/assistedParamConflictsWithComponentFieldName_successfulyDeduped/test.DaggerTestComponent_FAST_INIT_MODE index 0d2bd0c3b73..47eaebe4efc 100644 --- a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/assistedParamConflictsWithComponentFieldName_successfulyDeduped/test.DaggerTestComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/assistedParamConflictsWithComponentFieldName_successfulyDeduped/test.DaggerTestComponent_FAST_INIT_MODE @@ -36,18 +36,18 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; Provider barProvider; Provider fooFactoryProvider; - TestComponentImpl() { + Impl() { initialize(); @@ -55,8 +55,8 @@ final class DaggerTestComponent { @SuppressWarnings("unchecked") private void initialize() { - this.barProvider = new SwitchingProvider<>(testComponentImpl, 1); - this.fooFactoryProvider = SingleCheck.provider(new SwitchingProvider(testComponentImpl, 0)); + this.barProvider = new SwitchingProvider<>(impl, 1); + this.fooFactoryProvider = SingleCheck.provider(new SwitchingProvider(impl, 0)); } @Override @@ -65,12 +65,12 @@ final class DaggerTestComponent { } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } @@ -81,8 +81,8 @@ final class DaggerTestComponent { case 0: // test.FooFactory return (T) new FooFactory() { @Override - public Foo create(String testComponentImpl2) { - return new Foo(testComponentImpl2, testComponentImpl.barProvider); + public Foo create(String testComponentImpl) { + return new Foo(testComponentImpl, impl.barProvider); } }; diff --git a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/assistedParamConflictsWithComponentFieldName_successfulyDeduped/test.DaggerTestComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/assistedParamConflictsWithComponentFieldName_successfulyDeduped/test.DaggerTestComponent_KT_DEFAULT_MODE index 2e16b7a0d03..6934ecaa61d 100644 --- a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/assistedParamConflictsWithComponentFieldName_successfulyDeduped/test.DaggerTestComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/assistedParamConflictsWithComponentFieldName_successfulyDeduped/test.DaggerTestComponent_KT_DEFAULT_MODE @@ -35,12 +35,12 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; Foo_Factory fooProvider; @@ -49,7 +49,7 @@ final class DaggerTestComponent { */ Provider fooFactoryProvider; - TestComponentImpl() { + Impl() { initialize(); diff --git a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/assistedParamConflictsWithComponentFieldName_successfulyDeduped/test.DaggerTestComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/assistedParamConflictsWithComponentFieldName_successfulyDeduped/test.DaggerTestComponent_KT_FAST_INIT_MODE index cc3daa5cca0..c8d6d7fa1a1 100644 --- a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/assistedParamConflictsWithComponentFieldName_successfulyDeduped/test.DaggerTestComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/assistedParamConflictsWithComponentFieldName_successfulyDeduped/test.DaggerTestComponent_KT_FAST_INIT_MODE @@ -36,12 +36,12 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; /** * {@code Provider} @@ -53,7 +53,7 @@ final class DaggerTestComponent { */ Provider fooFactoryProvider; - TestComponentImpl() { + Impl() { initialize(); @@ -61,8 +61,8 @@ final class DaggerTestComponent { @SuppressWarnings("unchecked") private void initialize() { - this.barProvider = new SwitchingProvider<>(testComponentImpl, 1); - this.fooFactoryProvider = SingleCheck.provider(new SwitchingProvider<>(testComponentImpl, 0)); + this.barProvider = new SwitchingProvider<>(impl, 1); + this.fooFactoryProvider = SingleCheck.provider(new SwitchingProvider<>(impl, 0)); } @Override @@ -71,12 +71,12 @@ final class DaggerTestComponent { } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } @@ -87,8 +87,8 @@ final class DaggerTestComponent { case 0: // test.FooFactory return (T) new FooFactory() { @Override - public Foo create(String testComponentImpl2) { - return (Foo) (Foo_Factory.newInstance(testComponentImpl2, testComponentImpl.barProvider)); + public Foo create(String testComponentImpl) { + return (Foo) (Foo_Factory.newInstance(testComponentImpl, impl.barProvider)); } }; diff --git a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testAssistedFactory/test.DaggerTestComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testAssistedFactory/test.DaggerTestComponent_DEFAULT_MODE index 39cde1e9130..0a8e5499b8c 100644 --- a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testAssistedFactory/test.DaggerTestComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testAssistedFactory/test.DaggerTestComponent_DEFAULT_MODE @@ -35,18 +35,18 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; Foo_Factory fooProvider; Provider fooFactoryProvider; - TestComponentImpl() { + Impl() { initialize(); diff --git a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testAssistedFactory/test.DaggerTestComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testAssistedFactory/test.DaggerTestComponent_FAST_INIT_MODE index 28bd946a7a0..43db0af122e 100644 --- a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testAssistedFactory/test.DaggerTestComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testAssistedFactory/test.DaggerTestComponent_FAST_INIT_MODE @@ -36,16 +36,16 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; Provider fooFactoryProvider; - TestComponentImpl() { + Impl() { initialize(); @@ -53,7 +53,7 @@ final class DaggerTestComponent { @SuppressWarnings("unchecked") private void initialize() { - this.fooFactoryProvider = SingleCheck.provider(new SwitchingProvider(testComponentImpl, 0)); + this.fooFactoryProvider = SingleCheck.provider(new SwitchingProvider(impl, 0)); } @Override @@ -62,12 +62,12 @@ final class DaggerTestComponent { } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } diff --git a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testAssistedFactory/test.DaggerTestComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testAssistedFactory/test.DaggerTestComponent_KT_DEFAULT_MODE index 2e16b7a0d03..6934ecaa61d 100644 --- a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testAssistedFactory/test.DaggerTestComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testAssistedFactory/test.DaggerTestComponent_KT_DEFAULT_MODE @@ -35,12 +35,12 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; Foo_Factory fooProvider; @@ -49,7 +49,7 @@ final class DaggerTestComponent { */ Provider fooFactoryProvider; - TestComponentImpl() { + Impl() { initialize(); diff --git a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testAssistedFactory/test.DaggerTestComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testAssistedFactory/test.DaggerTestComponent_KT_FAST_INIT_MODE index 40cc96eb755..924df33f92b 100644 --- a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testAssistedFactory/test.DaggerTestComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testAssistedFactory/test.DaggerTestComponent_KT_FAST_INIT_MODE @@ -36,19 +36,19 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; /** * {@code Provider} */ Provider fooFactoryProvider; - TestComponentImpl() { + Impl() { initialize(); @@ -56,7 +56,7 @@ final class DaggerTestComponent { @SuppressWarnings("unchecked") private void initialize() { - this.fooFactoryProvider = SingleCheck.provider(new SwitchingProvider<>(testComponentImpl, 0)); + this.fooFactoryProvider = SingleCheck.provider(new SwitchingProvider<>(impl, 0)); } @Override @@ -65,12 +65,12 @@ final class DaggerTestComponent { } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } diff --git a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testAssistedFactoryCycle/test.DaggerTestComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testAssistedFactoryCycle/test.DaggerTestComponent_DEFAULT_MODE index 392a0008103..47fab20df4c 100644 --- a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testAssistedFactoryCycle/test.DaggerTestComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testAssistedFactoryCycle/test.DaggerTestComponent_DEFAULT_MODE @@ -36,12 +36,12 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; Provider fooFactoryProvider; @@ -49,7 +49,7 @@ final class DaggerTestComponent { Foo_Factory fooProvider; - TestComponentImpl() { + Impl() { initialize(); diff --git a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testAssistedFactoryCycle/test.DaggerTestComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testAssistedFactoryCycle/test.DaggerTestComponent_FAST_INIT_MODE index a895a9a777b..26e2e14767f 100644 --- a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testAssistedFactoryCycle/test.DaggerTestComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testAssistedFactoryCycle/test.DaggerTestComponent_FAST_INIT_MODE @@ -37,16 +37,16 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; Provider fooFactoryProvider; - TestComponentImpl() { + Impl() { initialize(); @@ -59,7 +59,7 @@ final class DaggerTestComponent { @SuppressWarnings("unchecked") private void initialize() { this.fooFactoryProvider = new DelegateFactory<>(); - DelegateFactory.setDelegate(fooFactoryProvider, SingleCheck.provider(new SwitchingProvider(testComponentImpl, 0))); + DelegateFactory.setDelegate(fooFactoryProvider, SingleCheck.provider(new SwitchingProvider(impl, 0))); } @Override @@ -68,12 +68,12 @@ final class DaggerTestComponent { } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } @@ -85,7 +85,7 @@ final class DaggerTestComponent { return (T) new FooFactory() { @Override public Foo create(String str) { - return new Foo(str, testComponentImpl.bar()); + return new Foo(str, impl.bar()); } }; diff --git a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testAssistedFactoryCycle/test.DaggerTestComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testAssistedFactoryCycle/test.DaggerTestComponent_KT_DEFAULT_MODE index 4276954d48e..da6bc57fff4 100644 --- a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testAssistedFactoryCycle/test.DaggerTestComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testAssistedFactoryCycle/test.DaggerTestComponent_KT_DEFAULT_MODE @@ -36,12 +36,12 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; /** * {@code Provider} @@ -55,7 +55,7 @@ final class DaggerTestComponent { Foo_Factory fooProvider; - TestComponentImpl() { + Impl() { initialize(); diff --git a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testAssistedFactoryCycle/test.DaggerTestComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testAssistedFactoryCycle/test.DaggerTestComponent_KT_FAST_INIT_MODE index c484e7718f5..915c18c212d 100644 --- a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testAssistedFactoryCycle/test.DaggerTestComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testAssistedFactoryCycle/test.DaggerTestComponent_KT_FAST_INIT_MODE @@ -37,19 +37,19 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; /** * {@code Provider} */ Provider fooFactoryProvider; - TestComponentImpl() { + Impl() { initialize(); @@ -62,7 +62,7 @@ final class DaggerTestComponent { @SuppressWarnings("unchecked") private void initialize() { this.fooFactoryProvider = new DelegateFactory<>(); - DelegateFactory.setDelegate((Provider) (fooFactoryProvider), (Provider) (SingleCheck.provider(new SwitchingProvider<>(testComponentImpl, 0)))); + DelegateFactory.setDelegate((Provider) (fooFactoryProvider), (Provider) (SingleCheck.provider(new SwitchingProvider<>(impl, 0)))); } @Override @@ -71,12 +71,12 @@ final class DaggerTestComponent { } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } @@ -88,7 +88,7 @@ final class DaggerTestComponent { return (T) new FooFactory() { @Override public Foo create(String str) { - return (Foo) (Foo_Factory.newInstance(str, testComponentImpl.bar())); + return (Foo) (Foo_Factory.newInstance(str, impl.bar())); } }; diff --git a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testAssistedFactory_nullableAssistedParam/test.DaggerTestComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testAssistedFactory_nullableAssistedParam/test.DaggerTestComponent_DEFAULT_MODE index 213d6d04149..1a5f34e9d06 100644 --- a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testAssistedFactory_nullableAssistedParam/test.DaggerTestComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testAssistedFactory_nullableAssistedParam/test.DaggerTestComponent_DEFAULT_MODE @@ -35,18 +35,18 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; Foo_Factory fooProvider; Provider fooFactoryProvider; - TestComponentImpl() { + Impl() { initialize(); diff --git a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testAssistedFactory_nullableAssistedParam/test.DaggerTestComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testAssistedFactory_nullableAssistedParam/test.DaggerTestComponent_FAST_INIT_MODE index 612f98fb768..ca8393b00b7 100644 --- a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testAssistedFactory_nullableAssistedParam/test.DaggerTestComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testAssistedFactory_nullableAssistedParam/test.DaggerTestComponent_FAST_INIT_MODE @@ -37,16 +37,16 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; Provider fooFactoryProvider; - TestComponentImpl() { + Impl() { initialize(); @@ -54,7 +54,7 @@ final class DaggerTestComponent { @SuppressWarnings("unchecked") private void initialize() { - this.fooFactoryProvider = SingleCheck.provider(new SwitchingProvider(testComponentImpl, 0)); + this.fooFactoryProvider = SingleCheck.provider(new SwitchingProvider(impl, 0)); } @Override @@ -63,12 +63,12 @@ final class DaggerTestComponent { } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } diff --git a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testAssistedFactory_nullableAssistedParam/test.DaggerTestComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testAssistedFactory_nullableAssistedParam/test.DaggerTestComponent_KT_DEFAULT_MODE index d062c3e7b20..814abe65ddc 100644 --- a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testAssistedFactory_nullableAssistedParam/test.DaggerTestComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testAssistedFactory_nullableAssistedParam/test.DaggerTestComponent_KT_DEFAULT_MODE @@ -35,12 +35,12 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; Foo_Factory fooProvider; @@ -49,7 +49,7 @@ final class DaggerTestComponent { */ Provider fooFactoryProvider; - TestComponentImpl() { + Impl() { initialize(); diff --git a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testAssistedFactory_nullableAssistedParam/test.DaggerTestComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testAssistedFactory_nullableAssistedParam/test.DaggerTestComponent_KT_FAST_INIT_MODE index 19564f3e33b..e7d8cff6b96 100644 --- a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testAssistedFactory_nullableAssistedParam/test.DaggerTestComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testAssistedFactory_nullableAssistedParam/test.DaggerTestComponent_KT_FAST_INIT_MODE @@ -37,19 +37,19 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; /** * {@code Provider} */ Provider fooFactoryProvider; - TestComponentImpl() { + Impl() { initialize(); @@ -57,7 +57,7 @@ final class DaggerTestComponent { @SuppressWarnings("unchecked") private void initialize() { - this.fooFactoryProvider = SingleCheck.provider(new SwitchingProvider<>(testComponentImpl, 0)); + this.fooFactoryProvider = SingleCheck.provider(new SwitchingProvider<>(impl, 0)); } @Override @@ -66,12 +66,12 @@ final class DaggerTestComponent { } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } diff --git a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testMultipleAssistedFactoryInDifferentComponents/test.DaggerMyComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testMultipleAssistedFactoryInDifferentComponents/test.DaggerMyComponent_DEFAULT_MODE index 8d3c962d3bc..7714f42be61 100644 --- a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testMultipleAssistedFactoryInDifferentComponents/test.DaggerMyComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testMultipleAssistedFactoryInDifferentComponents/test.DaggerMyComponent_DEFAULT_MODE @@ -35,12 +35,12 @@ final class DaggerMyComponent { } public MyComponent build() { - return new MyComponentImpl(); + return new Impl(); } } private static final class MySubcomponentImpl implements MySubcomponent { - private final MyComponentImpl myComponentImpl; + private final Impl impl; private final MySubcomponentImpl mySubcomponentImpl = this; @@ -48,8 +48,8 @@ final class DaggerMyComponent { Provider mySubcomponentAssistedFactoryProvider; - MySubcomponentImpl(MyComponentImpl myComponentImpl) { - this.myComponentImpl = myComponentImpl; + MySubcomponentImpl(Impl impl) { + this.impl = impl; initialize(); @@ -67,14 +67,14 @@ final class DaggerMyComponent { } } - private static final class MyComponentImpl implements MyComponent { - private final MyComponentImpl myComponentImpl = this; + private static final class Impl implements MyComponent { + private final Impl impl = this; MyAssistedClass_Factory myAssistedClassProvider; Provider myComponentAssistedFactoryProvider; - MyComponentImpl() { + Impl() { initialize(); @@ -93,7 +93,7 @@ final class DaggerMyComponent { @Override public MySubcomponent mySubcomponent() { - return new MySubcomponentImpl(myComponentImpl); + return new MySubcomponentImpl(impl); } } } diff --git a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testMultipleAssistedFactoryInDifferentComponents/test.DaggerMyComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testMultipleAssistedFactoryInDifferentComponents/test.DaggerMyComponent_FAST_INIT_MODE index 1c11e828b14..0d64a5f32fd 100644 --- a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testMultipleAssistedFactoryInDifferentComponents/test.DaggerMyComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testMultipleAssistedFactoryInDifferentComponents/test.DaggerMyComponent_FAST_INIT_MODE @@ -36,19 +36,19 @@ final class DaggerMyComponent { } public MyComponent build() { - return new MyComponentImpl(); + return new Impl(); } } private static final class MySubcomponentImpl implements MySubcomponent { - private final MyComponentImpl myComponentImpl; + private final Impl impl; private final MySubcomponentImpl mySubcomponentImpl = this; Provider mySubcomponentAssistedFactoryProvider; - MySubcomponentImpl(MyComponentImpl myComponentImpl) { - this.myComponentImpl = myComponentImpl; + MySubcomponentImpl(Impl impl) { + this.impl = impl; initialize(); @@ -56,7 +56,7 @@ final class DaggerMyComponent { @SuppressWarnings("unchecked") private void initialize() { - this.mySubcomponentAssistedFactoryProvider = SingleCheck.provider(new SwitchingProvider(myComponentImpl, mySubcomponentImpl, 0)); + this.mySubcomponentAssistedFactoryProvider = SingleCheck.provider(new SwitchingProvider(impl, mySubcomponentImpl, 0)); } @Override @@ -65,15 +65,14 @@ final class DaggerMyComponent { } private static final class SwitchingProvider implements Provider { - private final MyComponentImpl myComponentImpl; + private final Impl impl; private final MySubcomponentImpl mySubcomponentImpl; private final int id; - SwitchingProvider(MyComponentImpl myComponentImpl, MySubcomponentImpl mySubcomponentImpl, - int id) { - this.myComponentImpl = myComponentImpl; + SwitchingProvider(Impl impl, MySubcomponentImpl mySubcomponentImpl, int id) { + this.impl = impl; this.mySubcomponentImpl = mySubcomponentImpl; this.id = id; } @@ -96,12 +95,12 @@ final class DaggerMyComponent { } } - private static final class MyComponentImpl implements MyComponent { - private final MyComponentImpl myComponentImpl = this; + private static final class Impl implements MyComponent { + private final Impl impl = this; Provider myComponentAssistedFactoryProvider; - MyComponentImpl() { + Impl() { initialize(); @@ -109,7 +108,7 @@ final class DaggerMyComponent { @SuppressWarnings("unchecked") private void initialize() { - this.myComponentAssistedFactoryProvider = SingleCheck.provider(new SwitchingProvider(myComponentImpl, 0)); + this.myComponentAssistedFactoryProvider = SingleCheck.provider(new SwitchingProvider(impl, 0)); } @Override @@ -119,16 +118,16 @@ final class DaggerMyComponent { @Override public MySubcomponent mySubcomponent() { - return new MySubcomponentImpl(myComponentImpl); + return new MySubcomponentImpl(impl); } private static final class SwitchingProvider implements Provider { - private final MyComponentImpl myComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(MyComponentImpl myComponentImpl, int id) { - this.myComponentImpl = myComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } diff --git a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testMultipleAssistedFactoryInDifferentComponents/test.DaggerMyComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testMultipleAssistedFactoryInDifferentComponents/test.DaggerMyComponent_KT_DEFAULT_MODE index 21139520b30..3cfd5e1cdea 100644 --- a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testMultipleAssistedFactoryInDifferentComponents/test.DaggerMyComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testMultipleAssistedFactoryInDifferentComponents/test.DaggerMyComponent_KT_DEFAULT_MODE @@ -35,12 +35,12 @@ final class DaggerMyComponent { } public MyComponent build() { - return new MyComponentImpl(); + return new Impl(); } } private static final class MySubcomponentImpl implements MySubcomponent { - private final MyComponentImpl myComponentImpl; + private final Impl impl; private final MySubcomponentImpl mySubcomponentImpl = this; @@ -51,8 +51,8 @@ final class DaggerMyComponent { */ Provider mySubcomponentAssistedFactoryProvider; - MySubcomponentImpl(MyComponentImpl myComponentImpl) { - this.myComponentImpl = myComponentImpl; + MySubcomponentImpl(Impl impl) { + this.impl = impl; initialize(); @@ -70,8 +70,8 @@ final class DaggerMyComponent { } } - private static final class MyComponentImpl implements MyComponent { - private final MyComponentImpl myComponentImpl = this; + private static final class Impl implements MyComponent { + private final Impl impl = this; MyAssistedClass_Factory myAssistedClassProvider; @@ -80,7 +80,7 @@ final class DaggerMyComponent { */ Provider myComponentAssistedFactoryProvider; - MyComponentImpl() { + Impl() { initialize(); @@ -99,7 +99,7 @@ final class DaggerMyComponent { @Override public MySubcomponent mySubcomponent() { - return new MySubcomponentImpl(myComponentImpl); + return new MySubcomponentImpl(impl); } } } diff --git a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testMultipleAssistedFactoryInDifferentComponents/test.DaggerMyComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testMultipleAssistedFactoryInDifferentComponents/test.DaggerMyComponent_KT_FAST_INIT_MODE index 2c74d0b8214..09a09124436 100644 --- a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testMultipleAssistedFactoryInDifferentComponents/test.DaggerMyComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testMultipleAssistedFactoryInDifferentComponents/test.DaggerMyComponent_KT_FAST_INIT_MODE @@ -36,12 +36,12 @@ final class DaggerMyComponent { } public MyComponent build() { - return new MyComponentImpl(); + return new Impl(); } } private static final class MySubcomponentImpl implements MySubcomponent { - private final MyComponentImpl myComponentImpl; + private final Impl impl; private final MySubcomponentImpl mySubcomponentImpl = this; @@ -50,8 +50,8 @@ final class DaggerMyComponent { */ Provider mySubcomponentAssistedFactoryProvider; - MySubcomponentImpl(MyComponentImpl myComponentImpl) { - this.myComponentImpl = myComponentImpl; + MySubcomponentImpl(Impl impl) { + this.impl = impl; initialize(); @@ -59,7 +59,7 @@ final class DaggerMyComponent { @SuppressWarnings("unchecked") private void initialize() { - this.mySubcomponentAssistedFactoryProvider = SingleCheck.provider(new SwitchingProvider<>(myComponentImpl, mySubcomponentImpl, 0)); + this.mySubcomponentAssistedFactoryProvider = SingleCheck.provider(new SwitchingProvider<>(impl, mySubcomponentImpl, 0)); } @Override @@ -68,15 +68,14 @@ final class DaggerMyComponent { } private static final class SwitchingProvider implements Provider { - private final MyComponentImpl myComponentImpl; + private final Impl impl; private final MySubcomponentImpl mySubcomponentImpl; private final int id; - SwitchingProvider(MyComponentImpl myComponentImpl, MySubcomponentImpl mySubcomponentImpl, - int id) { - this.myComponentImpl = myComponentImpl; + SwitchingProvider(Impl impl, MySubcomponentImpl mySubcomponentImpl, int id) { + this.impl = impl; this.mySubcomponentImpl = mySubcomponentImpl; this.id = id; } @@ -99,15 +98,15 @@ final class DaggerMyComponent { } } - private static final class MyComponentImpl implements MyComponent { - private final MyComponentImpl myComponentImpl = this; + private static final class Impl implements MyComponent { + private final Impl impl = this; /** * {@code Provider} */ Provider myComponentAssistedFactoryProvider; - MyComponentImpl() { + Impl() { initialize(); @@ -115,7 +114,7 @@ final class DaggerMyComponent { @SuppressWarnings("unchecked") private void initialize() { - this.myComponentAssistedFactoryProvider = SingleCheck.provider(new SwitchingProvider<>(myComponentImpl, 0)); + this.myComponentAssistedFactoryProvider = SingleCheck.provider(new SwitchingProvider<>(impl, 0)); } @Override @@ -125,16 +124,16 @@ final class DaggerMyComponent { @Override public MySubcomponent mySubcomponent() { - return new MySubcomponentImpl(myComponentImpl); + return new MySubcomponentImpl(impl); } private static final class SwitchingProvider implements Provider { - private final MyComponentImpl myComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(MyComponentImpl myComponentImpl, int id) { - this.myComponentImpl = myComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } diff --git a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testParameterizedAssistParam/test.DaggerTestComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testParameterizedAssistParam/test.DaggerTestComponent_DEFAULT_MODE index c079c6e73ba..6c1f606c82c 100644 --- a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testParameterizedAssistParam/test.DaggerTestComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testParameterizedAssistParam/test.DaggerTestComponent_DEFAULT_MODE @@ -35,18 +35,18 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; Foo_Factory fooProvider; Provider> fooFactoryProvider; - TestComponentImpl() { + Impl() { initialize(); diff --git a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testParameterizedAssistParam/test.DaggerTestComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testParameterizedAssistParam/test.DaggerTestComponent_FAST_INIT_MODE index c5888f067f2..11fb8a612be 100644 --- a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testParameterizedAssistParam/test.DaggerTestComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testParameterizedAssistParam/test.DaggerTestComponent_FAST_INIT_MODE @@ -36,16 +36,16 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; Provider> fooFactoryProvider; - TestComponentImpl() { + Impl() { initialize(); @@ -53,7 +53,7 @@ final class DaggerTestComponent { @SuppressWarnings("unchecked") private void initialize() { - this.fooFactoryProvider = SingleCheck.provider(new SwitchingProvider>(testComponentImpl, 0)); + this.fooFactoryProvider = SingleCheck.provider(new SwitchingProvider>(impl, 0)); } @Override @@ -62,12 +62,12 @@ final class DaggerTestComponent { } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } diff --git a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testParameterizedAssistParam/test.DaggerTestComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testParameterizedAssistParam/test.DaggerTestComponent_KT_DEFAULT_MODE index dffa019b9a9..8ea75e24519 100644 --- a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testParameterizedAssistParam/test.DaggerTestComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testParameterizedAssistParam/test.DaggerTestComponent_KT_DEFAULT_MODE @@ -35,12 +35,12 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; Foo_Factory fooProvider; @@ -49,7 +49,7 @@ final class DaggerTestComponent { */ Provider fooFactoryProvider; - TestComponentImpl() { + Impl() { initialize(); diff --git a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testParameterizedAssistParam/test.DaggerTestComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testParameterizedAssistParam/test.DaggerTestComponent_KT_FAST_INIT_MODE index c7f033a8715..408ae535b8a 100644 --- a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testParameterizedAssistParam/test.DaggerTestComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest/testParameterizedAssistParam/test.DaggerTestComponent_KT_FAST_INIT_MODE @@ -36,19 +36,19 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; /** * {@code Provider>} */ Provider fooFactoryProvider; - TestComponentImpl() { + Impl() { initialize(); @@ -56,7 +56,7 @@ final class DaggerTestComponent { @SuppressWarnings("unchecked") private void initialize() { - this.fooFactoryProvider = SingleCheck.provider(new SwitchingProvider<>(testComponentImpl, 0)); + this.fooFactoryProvider = SingleCheck.provider(new SwitchingProvider<>(impl, 0)); } @Override @@ -65,12 +65,12 @@ final class DaggerTestComponent { } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } diff --git a/javatests/dagger/internal/codegen/goldens/BindsExplicitForInjectTest/testUnscopedBinds_succeeds/test.DaggerUnscopedComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/BindsExplicitForInjectTest/testUnscopedBinds_succeeds/test.DaggerUnscopedComponent_DEFAULT_MODE index c50021989b9..17ce3b08d27 100644 --- a/javatests/dagger/internal/codegen/goldens/BindsExplicitForInjectTest/testUnscopedBinds_succeeds/test.DaggerUnscopedComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/BindsExplicitForInjectTest/testUnscopedBinds_succeeds/test.DaggerUnscopedComponent_DEFAULT_MODE @@ -34,14 +34,14 @@ final class DaggerUnscopedComponent { } public UnscopedComponent build() { - return new UnscopedComponentImpl(); + return new Impl(); } } - private static final class UnscopedComponentImpl implements UnscopedComponent { - private final UnscopedComponentImpl unscopedComponentImpl = this; + private static final class Impl implements UnscopedComponent { + private final Impl impl = this; - UnscopedComponentImpl() { + Impl() { } @@ -51,4 +51,4 @@ final class DaggerUnscopedComponent { return new Bar(); } } -} \ No newline at end of file +} diff --git a/javatests/dagger/internal/codegen/goldens/BindsExplicitForInjectTest/testUnscopedBinds_succeeds/test.DaggerUnscopedComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/BindsExplicitForInjectTest/testUnscopedBinds_succeeds/test.DaggerUnscopedComponent_FAST_INIT_MODE index 74ae1455606..17ce3b08d27 100644 --- a/javatests/dagger/internal/codegen/goldens/BindsExplicitForInjectTest/testUnscopedBinds_succeeds/test.DaggerUnscopedComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/BindsExplicitForInjectTest/testUnscopedBinds_succeeds/test.DaggerUnscopedComponent_FAST_INIT_MODE @@ -34,14 +34,14 @@ final class DaggerUnscopedComponent { } public UnscopedComponent build() { - return new UnscopedComponentImpl(); + return new Impl(); } } - private static final class UnscopedComponentImpl implements UnscopedComponent { - private final UnscopedComponentImpl unscopedComponentImpl = this; + private static final class Impl implements UnscopedComponent { + private final Impl impl = this; - UnscopedComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/BindsExplicitForInjectTest/testUnscopedBinds_succeeds/test.DaggerUnscopedComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/BindsExplicitForInjectTest/testUnscopedBinds_succeeds/test.DaggerUnscopedComponent_KT_DEFAULT_MODE index 90d3d819b05..2a475ca6d5c 100644 --- a/javatests/dagger/internal/codegen/goldens/BindsExplicitForInjectTest/testUnscopedBinds_succeeds/test.DaggerUnscopedComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/BindsExplicitForInjectTest/testUnscopedBinds_succeeds/test.DaggerUnscopedComponent_KT_DEFAULT_MODE @@ -34,14 +34,14 @@ final class DaggerUnscopedComponent { } public UnscopedComponent build() { - return new UnscopedComponentImpl(); + return new Impl(); } } - private static final class UnscopedComponentImpl implements UnscopedComponent { - private final UnscopedComponentImpl unscopedComponentImpl = this; + private static final class Impl implements UnscopedComponent { + private final Impl impl = this; - UnscopedComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/BindsExplicitForInjectTest/testUnscopedBinds_succeeds/test.DaggerUnscopedComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/BindsExplicitForInjectTest/testUnscopedBinds_succeeds/test.DaggerUnscopedComponent_KT_FAST_INIT_MODE index 90d3d819b05..2a475ca6d5c 100644 --- a/javatests/dagger/internal/codegen/goldens/BindsExplicitForInjectTest/testUnscopedBinds_succeeds/test.DaggerUnscopedComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/BindsExplicitForInjectTest/testUnscopedBinds_succeeds/test.DaggerUnscopedComponent_KT_FAST_INIT_MODE @@ -34,14 +34,14 @@ final class DaggerUnscopedComponent { } public UnscopedComponent build() { - return new UnscopedComponentImpl(); + return new Impl(); } } - private static final class UnscopedComponentImpl implements UnscopedComponent { - private final UnscopedComponentImpl unscopedComponentImpl = this; + private static final class Impl implements UnscopedComponent { + private final Impl impl = this; - UnscopedComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentBuilderTest/testNullableAnnotationsInGeneratedCode/test.DaggerTestComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentBuilderTest/testNullableAnnotationsInGeneratedCode/test.DaggerTestComponent_DEFAULT_MODE index 599b7d95558..21f4ca3b20f 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentBuilderTest/testNullableAnnotationsInGeneratedCode/test.DaggerTestComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentBuilderTest/testNullableAnnotationsInGeneratedCode/test.DaggerTestComponent_DEFAULT_MODE @@ -57,17 +57,16 @@ final class DaggerTestComponent { Preconditions.checkBuilderRequirement(setBoxedPrimitive, Boolean.class); Preconditions.checkBuilderRequirement(setUnboxed, String.class); Preconditions.checkBuilderRequirement(setUnboxedPrimitive, Boolean.class); - return new TestComponentImpl(setBoxedPrimitive, setUnboxed, setUnboxedPrimitive); + return new Impl(setBoxedPrimitive, setUnboxed, setUnboxedPrimitive); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl(Boolean setBoxedPrimitiveParam, String setUnboxedParam, - Boolean setUnboxedPrimitiveParam) { + Impl(Boolean setBoxedPrimitiveParam, String setUnboxedParam, Boolean setUnboxedPrimitiveParam) { } } -} \ No newline at end of file +} diff --git a/javatests/dagger/internal/codegen/goldens/ComponentBuilderTest/testNullableAnnotationsInGeneratedCode/test.DaggerTestComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentBuilderTest/testNullableAnnotationsInGeneratedCode/test.DaggerTestComponent_FAST_INIT_MODE index 9904a1e9a15..21f4ca3b20f 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentBuilderTest/testNullableAnnotationsInGeneratedCode/test.DaggerTestComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentBuilderTest/testNullableAnnotationsInGeneratedCode/test.DaggerTestComponent_FAST_INIT_MODE @@ -57,15 +57,14 @@ final class DaggerTestComponent { Preconditions.checkBuilderRequirement(setBoxedPrimitive, Boolean.class); Preconditions.checkBuilderRequirement(setUnboxed, String.class); Preconditions.checkBuilderRequirement(setUnboxedPrimitive, Boolean.class); - return new TestComponentImpl(setBoxedPrimitive, setUnboxed, setUnboxedPrimitive); + return new Impl(setBoxedPrimitive, setUnboxed, setUnboxedPrimitive); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl(Boolean setBoxedPrimitiveParam, String setUnboxedParam, - Boolean setUnboxedPrimitiveParam) { + Impl(Boolean setBoxedPrimitiveParam, String setUnboxedParam, Boolean setUnboxedPrimitiveParam) { } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentBuilderTest/testNullableAnnotationsInGeneratedCode/test.DaggerTestComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentBuilderTest/testNullableAnnotationsInGeneratedCode/test.DaggerTestComponent_KT_DEFAULT_MODE index 9904a1e9a15..21f4ca3b20f 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentBuilderTest/testNullableAnnotationsInGeneratedCode/test.DaggerTestComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentBuilderTest/testNullableAnnotationsInGeneratedCode/test.DaggerTestComponent_KT_DEFAULT_MODE @@ -57,15 +57,14 @@ final class DaggerTestComponent { Preconditions.checkBuilderRequirement(setBoxedPrimitive, Boolean.class); Preconditions.checkBuilderRequirement(setUnboxed, String.class); Preconditions.checkBuilderRequirement(setUnboxedPrimitive, Boolean.class); - return new TestComponentImpl(setBoxedPrimitive, setUnboxed, setUnboxedPrimitive); + return new Impl(setBoxedPrimitive, setUnboxed, setUnboxedPrimitive); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl(Boolean setBoxedPrimitiveParam, String setUnboxedParam, - Boolean setUnboxedPrimitiveParam) { + Impl(Boolean setBoxedPrimitiveParam, String setUnboxedParam, Boolean setUnboxedPrimitiveParam) { } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentBuilderTest/testNullableAnnotationsInGeneratedCode/test.DaggerTestComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentBuilderTest/testNullableAnnotationsInGeneratedCode/test.DaggerTestComponent_KT_FAST_INIT_MODE index 9904a1e9a15..21f4ca3b20f 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentBuilderTest/testNullableAnnotationsInGeneratedCode/test.DaggerTestComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentBuilderTest/testNullableAnnotationsInGeneratedCode/test.DaggerTestComponent_KT_FAST_INIT_MODE @@ -57,15 +57,14 @@ final class DaggerTestComponent { Preconditions.checkBuilderRequirement(setBoxedPrimitive, Boolean.class); Preconditions.checkBuilderRequirement(setUnboxed, String.class); Preconditions.checkBuilderRequirement(setUnboxedPrimitive, Boolean.class); - return new TestComponentImpl(setBoxedPrimitive, setUnboxed, setUnboxedPrimitive); + return new Impl(setBoxedPrimitive, setUnboxed, setUnboxedPrimitive); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl(Boolean setBoxedPrimitiveParam, String setUnboxedParam, - Boolean setUnboxedPrimitiveParam) { + Impl(Boolean setBoxedPrimitiveParam, String setUnboxedParam, Boolean setUnboxedPrimitiveParam) { } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentBuilderTest/testUsesBuildAndSetterNames/test.DaggerTestComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentBuilderTest/testUsesBuildAndSetterNames/test.DaggerTestComponent_DEFAULT_MODE index e1690242d86..1899cff275b 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentBuilderTest/testUsesBuildAndSetterNames/test.DaggerTestComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentBuilderTest/testUsesBuildAndSetterNames/test.DaggerTestComponent_DEFAULT_MODE @@ -44,16 +44,16 @@ final class DaggerTestComponent { if (testModule == null) { this.testModule = new TestModule(); } - return new TestComponentImpl(testModule); + return new Impl(testModule); } } - private static final class TestComponentImpl implements TestComponent { + private static final class Impl implements TestComponent { private final TestModule testModule; - private final TestComponentImpl testComponentImpl = this; + private final Impl impl = this; - TestComponentImpl(TestModule testModuleParam) { + Impl(TestModule testModuleParam) { this.testModule = testModuleParam; } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentBuilderTest/testUsesBuildAndSetterNames/test.DaggerTestComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentBuilderTest/testUsesBuildAndSetterNames/test.DaggerTestComponent_FAST_INIT_MODE index e1690242d86..1899cff275b 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentBuilderTest/testUsesBuildAndSetterNames/test.DaggerTestComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentBuilderTest/testUsesBuildAndSetterNames/test.DaggerTestComponent_FAST_INIT_MODE @@ -44,16 +44,16 @@ final class DaggerTestComponent { if (testModule == null) { this.testModule = new TestModule(); } - return new TestComponentImpl(testModule); + return new Impl(testModule); } } - private static final class TestComponentImpl implements TestComponent { + private static final class Impl implements TestComponent { private final TestModule testModule; - private final TestComponentImpl testComponentImpl = this; + private final Impl impl = this; - TestComponentImpl(TestModule testModuleParam) { + Impl(TestModule testModuleParam) { this.testModule = testModuleParam; } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentBuilderTest/testUsesBuildAndSetterNames/test.DaggerTestComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentBuilderTest/testUsesBuildAndSetterNames/test.DaggerTestComponent_KT_DEFAULT_MODE index a0b047e1eb5..826d14cfc6b 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentBuilderTest/testUsesBuildAndSetterNames/test.DaggerTestComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentBuilderTest/testUsesBuildAndSetterNames/test.DaggerTestComponent_KT_DEFAULT_MODE @@ -44,16 +44,16 @@ final class DaggerTestComponent { if (testModule == null) { this.testModule = new TestModule(); } - return new TestComponentImpl(testModule); + return new Impl(testModule); } } - private static final class TestComponentImpl implements TestComponent { + private static final class Impl implements TestComponent { private final TestModule testModule; - private final TestComponentImpl testComponentImpl = this; + private final Impl impl = this; - TestComponentImpl(TestModule testModuleParam) { + Impl(TestModule testModuleParam) { this.testModule = testModuleParam; } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentBuilderTest/testUsesBuildAndSetterNames/test.DaggerTestComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentBuilderTest/testUsesBuildAndSetterNames/test.DaggerTestComponent_KT_FAST_INIT_MODE index a0b047e1eb5..826d14cfc6b 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentBuilderTest/testUsesBuildAndSetterNames/test.DaggerTestComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentBuilderTest/testUsesBuildAndSetterNames/test.DaggerTestComponent_KT_FAST_INIT_MODE @@ -44,16 +44,16 @@ final class DaggerTestComponent { if (testModule == null) { this.testModule = new TestModule(); } - return new TestComponentImpl(testModule); + return new Impl(testModule); } } - private static final class TestComponentImpl implements TestComponent { + private static final class Impl implements TestComponent { private final TestModule testModule; - private final TestComponentImpl testComponentImpl = this; + private final Impl impl = this; - TestComponentImpl(TestModule testModuleParam) { + Impl(TestModule testModuleParam) { this.testModule = testModuleParam; } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest/testCanInstantiateModulesUserCannotSet/test.DaggerTestComponent_compilerMode=DEFAULT_MODE, creatorKind=dagger.Component.Builder b/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest/testCanInstantiateModulesUserCannotSet/test.DaggerTestComponent_compilerMode=DEFAULT_MODE, creatorKind=dagger.Component.Builder index 2b870bbc2f6..286eeb49bbc 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest/testCanInstantiateModulesUserCannotSet/test.DaggerTestComponent_compilerMode=DEFAULT_MODE, creatorKind=dagger.Component.Builder +++ b/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest/testCanInstantiateModulesUserCannotSet/test.DaggerTestComponent_compilerMode=DEFAULT_MODE, creatorKind=dagger.Component.Builder @@ -32,16 +32,16 @@ final class DaggerTestComponent { private static final class Builder implements TestComponent.Builder { @Override public TestComponent build() { - return new TestComponentImpl(new TestModule()); + return new Impl(new TestModule()); } } - private static final class TestComponentImpl implements TestComponent { + private static final class Impl implements TestComponent { private final TestModule testModule; - private final TestComponentImpl testComponentImpl = this; + private final Impl impl = this; - TestComponentImpl(TestModule testModuleParam) { + Impl(TestModule testModuleParam) { this.testModule = testModuleParam; } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest/testCanInstantiateModulesUserCannotSet/test.DaggerTestComponent_compilerMode=DEFAULT_MODE, creatorKind=dagger.Component.Factory b/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest/testCanInstantiateModulesUserCannotSet/test.DaggerTestComponent_compilerMode=DEFAULT_MODE, creatorKind=dagger.Component.Factory index b3496fefd2d..f2722272b34 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest/testCanInstantiateModulesUserCannotSet/test.DaggerTestComponent_compilerMode=DEFAULT_MODE, creatorKind=dagger.Component.Factory +++ b/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest/testCanInstantiateModulesUserCannotSet/test.DaggerTestComponent_compilerMode=DEFAULT_MODE, creatorKind=dagger.Component.Factory @@ -32,16 +32,16 @@ final class DaggerTestComponent { private static final class Factory implements TestComponent.Factory { @Override public TestComponent createComponent() { - return new TestComponentImpl(new TestModule()); + return new Impl(new TestModule()); } } - private static final class TestComponentImpl implements TestComponent { + private static final class Impl implements TestComponent { private final TestModule testModule; - private final TestComponentImpl testComponentImpl = this; + private final Impl impl = this; - TestComponentImpl(TestModule testModuleParam) { + Impl(TestModule testModuleParam) { this.testModule = testModuleParam; } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest/testCanInstantiateModulesUserCannotSet/test.DaggerTestComponent_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Component.Builder b/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest/testCanInstantiateModulesUserCannotSet/test.DaggerTestComponent_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Component.Builder index 2b870bbc2f6..286eeb49bbc 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest/testCanInstantiateModulesUserCannotSet/test.DaggerTestComponent_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Component.Builder +++ b/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest/testCanInstantiateModulesUserCannotSet/test.DaggerTestComponent_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Component.Builder @@ -32,16 +32,16 @@ final class DaggerTestComponent { private static final class Builder implements TestComponent.Builder { @Override public TestComponent build() { - return new TestComponentImpl(new TestModule()); + return new Impl(new TestModule()); } } - private static final class TestComponentImpl implements TestComponent { + private static final class Impl implements TestComponent { private final TestModule testModule; - private final TestComponentImpl testComponentImpl = this; + private final Impl impl = this; - TestComponentImpl(TestModule testModuleParam) { + Impl(TestModule testModuleParam) { this.testModule = testModuleParam; } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest/testCanInstantiateModulesUserCannotSet/test.DaggerTestComponent_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Component.Factory b/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest/testCanInstantiateModulesUserCannotSet/test.DaggerTestComponent_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Component.Factory index b3496fefd2d..f2722272b34 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest/testCanInstantiateModulesUserCannotSet/test.DaggerTestComponent_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Component.Factory +++ b/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest/testCanInstantiateModulesUserCannotSet/test.DaggerTestComponent_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Component.Factory @@ -32,16 +32,16 @@ final class DaggerTestComponent { private static final class Factory implements TestComponent.Factory { @Override public TestComponent createComponent() { - return new TestComponentImpl(new TestModule()); + return new Impl(new TestModule()); } } - private static final class TestComponentImpl implements TestComponent { + private static final class Impl implements TestComponent { private final TestModule testModule; - private final TestComponentImpl testComponentImpl = this; + private final Impl impl = this; - TestComponentImpl(TestModule testModuleParam) { + Impl(TestModule testModuleParam) { this.testModule = testModuleParam; } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest/testCreatorWithBindsInstanceNoStaticCreateGenerated/test.DaggerSimpleComponent_compilerMode=DEFAULT_MODE, creatorKind=dagger.Component.Builder b/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest/testCreatorWithBindsInstanceNoStaticCreateGenerated/test.DaggerSimpleComponent_compilerMode=DEFAULT_MODE, creatorKind=dagger.Component.Builder index 7873a957968..5a163dc6e2c 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest/testCreatorWithBindsInstanceNoStaticCreateGenerated/test.DaggerSimpleComponent_compilerMode=DEFAULT_MODE, creatorKind=dagger.Component.Builder +++ b/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest/testCreatorWithBindsInstanceNoStaticCreateGenerated/test.DaggerSimpleComponent_compilerMode=DEFAULT_MODE, creatorKind=dagger.Component.Builder @@ -38,16 +38,16 @@ final class DaggerSimpleComponent { @Override public SimpleComponent build() { Preconditions.checkBuilderRequirement(object, Object.class); - return new SimpleComponentImpl(object); + return new Impl(object); } } - private static final class SimpleComponentImpl implements SimpleComponent { + private static final class Impl implements SimpleComponent { private final Object object; - private final SimpleComponentImpl simpleComponentImpl = this; + private final Impl impl = this; - SimpleComponentImpl(Object objectParam) { + Impl(Object objectParam) { this.object = objectParam; } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest/testCreatorWithBindsInstanceNoStaticCreateGenerated/test.DaggerSimpleComponent_compilerMode=DEFAULT_MODE, creatorKind=dagger.Component.Factory b/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest/testCreatorWithBindsInstanceNoStaticCreateGenerated/test.DaggerSimpleComponent_compilerMode=DEFAULT_MODE, creatorKind=dagger.Component.Factory index d2ebda5b098..de745d3a003 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest/testCreatorWithBindsInstanceNoStaticCreateGenerated/test.DaggerSimpleComponent_compilerMode=DEFAULT_MODE, creatorKind=dagger.Component.Factory +++ b/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest/testCreatorWithBindsInstanceNoStaticCreateGenerated/test.DaggerSimpleComponent_compilerMode=DEFAULT_MODE, creatorKind=dagger.Component.Factory @@ -30,16 +30,16 @@ final class DaggerSimpleComponent { @Override public SimpleComponent create(Object object) { Preconditions.checkNotNull(object); - return new SimpleComponentImpl(object); + return new Impl(object); } } - private static final class SimpleComponentImpl implements SimpleComponent { + private static final class Impl implements SimpleComponent { private final Object object; - private final SimpleComponentImpl simpleComponentImpl = this; + private final Impl impl = this; - SimpleComponentImpl(Object objectParam) { + Impl(Object objectParam) { this.object = objectParam; } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest/testCreatorWithBindsInstanceNoStaticCreateGenerated/test.DaggerSimpleComponent_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Component.Builder b/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest/testCreatorWithBindsInstanceNoStaticCreateGenerated/test.DaggerSimpleComponent_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Component.Builder index 7873a957968..5a163dc6e2c 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest/testCreatorWithBindsInstanceNoStaticCreateGenerated/test.DaggerSimpleComponent_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Component.Builder +++ b/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest/testCreatorWithBindsInstanceNoStaticCreateGenerated/test.DaggerSimpleComponent_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Component.Builder @@ -38,16 +38,16 @@ final class DaggerSimpleComponent { @Override public SimpleComponent build() { Preconditions.checkBuilderRequirement(object, Object.class); - return new SimpleComponentImpl(object); + return new Impl(object); } } - private static final class SimpleComponentImpl implements SimpleComponent { + private static final class Impl implements SimpleComponent { private final Object object; - private final SimpleComponentImpl simpleComponentImpl = this; + private final Impl impl = this; - SimpleComponentImpl(Object objectParam) { + Impl(Object objectParam) { this.object = objectParam; } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest/testCreatorWithBindsInstanceNoStaticCreateGenerated/test.DaggerSimpleComponent_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Component.Factory b/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest/testCreatorWithBindsInstanceNoStaticCreateGenerated/test.DaggerSimpleComponent_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Component.Factory index d2ebda5b098..de745d3a003 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest/testCreatorWithBindsInstanceNoStaticCreateGenerated/test.DaggerSimpleComponent_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Component.Factory +++ b/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest/testCreatorWithBindsInstanceNoStaticCreateGenerated/test.DaggerSimpleComponent_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Component.Factory @@ -30,16 +30,16 @@ final class DaggerSimpleComponent { @Override public SimpleComponent create(Object object) { Preconditions.checkNotNull(object); - return new SimpleComponentImpl(object); + return new Impl(object); } } - private static final class SimpleComponentImpl implements SimpleComponent { + private static final class Impl implements SimpleComponent { private final Object object; - private final SimpleComponentImpl simpleComponentImpl = this; + private final Impl impl = this; - SimpleComponentImpl(Object objectParam) { + Impl(Object objectParam) { this.object = objectParam; } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest/testCreatorWithPrimitiveBindsInstance/test.DaggerSimpleComponent_compilerMode=DEFAULT_MODE, creatorKind=dagger.Component.Builder b/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest/testCreatorWithPrimitiveBindsInstance/test.DaggerSimpleComponent_compilerMode=DEFAULT_MODE, creatorKind=dagger.Component.Builder index f42c740c004..deb0ba4e610 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest/testCreatorWithPrimitiveBindsInstance/test.DaggerSimpleComponent_compilerMode=DEFAULT_MODE, creatorKind=dagger.Component.Builder +++ b/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest/testCreatorWithPrimitiveBindsInstance/test.DaggerSimpleComponent_compilerMode=DEFAULT_MODE, creatorKind=dagger.Component.Builder @@ -38,16 +38,16 @@ final class DaggerSimpleComponent { @Override public SimpleComponent build() { Preconditions.checkBuilderRequirement(i, Integer.class); - return new SimpleComponentImpl(i); + return new Impl(i); } } - private static final class SimpleComponentImpl implements SimpleComponent { + private static final class Impl implements SimpleComponent { private final Integer i; - private final SimpleComponentImpl simpleComponentImpl = this; + private final Impl impl = this; - SimpleComponentImpl(Integer iParam) { + Impl(Integer iParam) { this.i = iParam; } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest/testCreatorWithPrimitiveBindsInstance/test.DaggerSimpleComponent_compilerMode=DEFAULT_MODE, creatorKind=dagger.Component.Factory b/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest/testCreatorWithPrimitiveBindsInstance/test.DaggerSimpleComponent_compilerMode=DEFAULT_MODE, creatorKind=dagger.Component.Factory index 7ee94ef585b..b58b9badd82 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest/testCreatorWithPrimitiveBindsInstance/test.DaggerSimpleComponent_compilerMode=DEFAULT_MODE, creatorKind=dagger.Component.Factory +++ b/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest/testCreatorWithPrimitiveBindsInstance/test.DaggerSimpleComponent_compilerMode=DEFAULT_MODE, creatorKind=dagger.Component.Factory @@ -30,16 +30,16 @@ final class DaggerSimpleComponent { @Override public SimpleComponent create(int i) { Preconditions.checkNotNull(i); - return new SimpleComponentImpl(i); + return new Impl(i); } } - private static final class SimpleComponentImpl implements SimpleComponent { + private static final class Impl implements SimpleComponent { private final Integer i; - private final SimpleComponentImpl simpleComponentImpl = this; + private final Impl impl = this; - SimpleComponentImpl(Integer iParam) { + Impl(Integer iParam) { this.i = iParam; } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest/testCreatorWithPrimitiveBindsInstance/test.DaggerSimpleComponent_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Component.Builder b/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest/testCreatorWithPrimitiveBindsInstance/test.DaggerSimpleComponent_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Component.Builder index f42c740c004..deb0ba4e610 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest/testCreatorWithPrimitiveBindsInstance/test.DaggerSimpleComponent_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Component.Builder +++ b/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest/testCreatorWithPrimitiveBindsInstance/test.DaggerSimpleComponent_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Component.Builder @@ -38,16 +38,16 @@ final class DaggerSimpleComponent { @Override public SimpleComponent build() { Preconditions.checkBuilderRequirement(i, Integer.class); - return new SimpleComponentImpl(i); + return new Impl(i); } } - private static final class SimpleComponentImpl implements SimpleComponent { + private static final class Impl implements SimpleComponent { private final Integer i; - private final SimpleComponentImpl simpleComponentImpl = this; + private final Impl impl = this; - SimpleComponentImpl(Integer iParam) { + Impl(Integer iParam) { this.i = iParam; } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest/testCreatorWithPrimitiveBindsInstance/test.DaggerSimpleComponent_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Component.Factory b/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest/testCreatorWithPrimitiveBindsInstance/test.DaggerSimpleComponent_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Component.Factory index 7ee94ef585b..b58b9badd82 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest/testCreatorWithPrimitiveBindsInstance/test.DaggerSimpleComponent_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Component.Factory +++ b/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest/testCreatorWithPrimitiveBindsInstance/test.DaggerSimpleComponent_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Component.Factory @@ -30,16 +30,16 @@ final class DaggerSimpleComponent { @Override public SimpleComponent create(int i) { Preconditions.checkNotNull(i); - return new SimpleComponentImpl(i); + return new Impl(i); } } - private static final class SimpleComponentImpl implements SimpleComponent { + private static final class Impl implements SimpleComponent { private final Integer i; - private final SimpleComponentImpl simpleComponentImpl = this; + private final Impl impl = this; - SimpleComponentImpl(Integer iParam) { + Impl(Integer iParam) { this.i = iParam; } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest/testEmptyCreator/test.DaggerSimpleComponent_compilerMode=DEFAULT_MODE, creatorKind=dagger.Component.Builder b/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest/testEmptyCreator/test.DaggerSimpleComponent_compilerMode=DEFAULT_MODE, creatorKind=dagger.Component.Builder index 0bdba90796a..c3d31df0f9a 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest/testEmptyCreator/test.DaggerSimpleComponent_compilerMode=DEFAULT_MODE, creatorKind=dagger.Component.Builder +++ b/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest/testEmptyCreator/test.DaggerSimpleComponent_compilerMode=DEFAULT_MODE, creatorKind=dagger.Component.Builder @@ -32,14 +32,14 @@ final class DaggerSimpleComponent { private static final class Builder implements SimpleComponent.Builder { @Override public SimpleComponent build() { - return new SimpleComponentImpl(); + return new Impl(); } } - private static final class SimpleComponentImpl implements SimpleComponent { - private final SimpleComponentImpl simpleComponentImpl = this; + private static final class Impl implements SimpleComponent { + private final Impl impl = this; - SimpleComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest/testEmptyCreator/test.DaggerSimpleComponent_compilerMode=DEFAULT_MODE, creatorKind=dagger.Component.Factory b/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest/testEmptyCreator/test.DaggerSimpleComponent_compilerMode=DEFAULT_MODE, creatorKind=dagger.Component.Factory index 1a1d92fe48d..32293c1d9b1 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest/testEmptyCreator/test.DaggerSimpleComponent_compilerMode=DEFAULT_MODE, creatorKind=dagger.Component.Factory +++ b/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest/testEmptyCreator/test.DaggerSimpleComponent_compilerMode=DEFAULT_MODE, creatorKind=dagger.Component.Factory @@ -32,14 +32,14 @@ final class DaggerSimpleComponent { private static final class Factory implements SimpleComponent.Factory { @Override public SimpleComponent createComponent() { - return new SimpleComponentImpl(); + return new Impl(); } } - private static final class SimpleComponentImpl implements SimpleComponent { - private final SimpleComponentImpl simpleComponentImpl = this; + private static final class Impl implements SimpleComponent { + private final Impl impl = this; - SimpleComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest/testEmptyCreator/test.DaggerSimpleComponent_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Component.Builder b/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest/testEmptyCreator/test.DaggerSimpleComponent_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Component.Builder index 0bdba90796a..c3d31df0f9a 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest/testEmptyCreator/test.DaggerSimpleComponent_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Component.Builder +++ b/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest/testEmptyCreator/test.DaggerSimpleComponent_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Component.Builder @@ -32,14 +32,14 @@ final class DaggerSimpleComponent { private static final class Builder implements SimpleComponent.Builder { @Override public SimpleComponent build() { - return new SimpleComponentImpl(); + return new Impl(); } } - private static final class SimpleComponentImpl implements SimpleComponent { - private final SimpleComponentImpl simpleComponentImpl = this; + private static final class Impl implements SimpleComponent { + private final Impl impl = this; - SimpleComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest/testEmptyCreator/test.DaggerSimpleComponent_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Component.Factory b/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest/testEmptyCreator/test.DaggerSimpleComponent_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Component.Factory index 1a1d92fe48d..32293c1d9b1 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest/testEmptyCreator/test.DaggerSimpleComponent_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Component.Factory +++ b/javatests/dagger/internal/codegen/goldens/ComponentCreatorTest/testEmptyCreator/test.DaggerSimpleComponent_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Component.Factory @@ -32,14 +32,14 @@ final class DaggerSimpleComponent { private static final class Factory implements SimpleComponent.Factory { @Override public SimpleComponent createComponent() { - return new SimpleComponentImpl(); + return new Impl(); } } - private static final class SimpleComponentImpl implements SimpleComponent { - private final SimpleComponentImpl simpleComponentImpl = this; + private static final class Impl implements SimpleComponent { + private final Impl impl = this; - SimpleComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentFactoryTest/testUsesParameterNames/test.DaggerTestComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentFactoryTest/testUsesParameterNames/test.DaggerTestComponent_DEFAULT_MODE index 440a43d6349..966fe3259e6 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentFactoryTest/testUsesParameterNames/test.DaggerTestComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentFactoryTest/testUsesParameterNames/test.DaggerTestComponent_DEFAULT_MODE @@ -30,16 +30,16 @@ final class DaggerTestComponent { @Override public TestComponent newTestComponent(TestModule mod) { Preconditions.checkNotNull(mod); - return new TestComponentImpl(mod); + return new Impl(mod); } } - private static final class TestComponentImpl implements TestComponent { + private static final class Impl implements TestComponent { private final TestModule testModule; - private final TestComponentImpl testComponentImpl = this; + private final Impl impl = this; - TestComponentImpl(TestModule testModuleParam) { + Impl(TestModule testModuleParam) { this.testModule = testModuleParam; } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentFactoryTest/testUsesParameterNames/test.DaggerTestComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentFactoryTest/testUsesParameterNames/test.DaggerTestComponent_FAST_INIT_MODE index 440a43d6349..966fe3259e6 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentFactoryTest/testUsesParameterNames/test.DaggerTestComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentFactoryTest/testUsesParameterNames/test.DaggerTestComponent_FAST_INIT_MODE @@ -30,16 +30,16 @@ final class DaggerTestComponent { @Override public TestComponent newTestComponent(TestModule mod) { Preconditions.checkNotNull(mod); - return new TestComponentImpl(mod); + return new Impl(mod); } } - private static final class TestComponentImpl implements TestComponent { + private static final class Impl implements TestComponent { private final TestModule testModule; - private final TestComponentImpl testComponentImpl = this; + private final Impl impl = this; - TestComponentImpl(TestModule testModuleParam) { + Impl(TestModule testModuleParam) { this.testModule = testModuleParam; } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentFactoryTest/testUsesParameterNames/test.DaggerTestComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentFactoryTest/testUsesParameterNames/test.DaggerTestComponent_KT_DEFAULT_MODE index 228bb5309a3..32866264c49 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentFactoryTest/testUsesParameterNames/test.DaggerTestComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentFactoryTest/testUsesParameterNames/test.DaggerTestComponent_KT_DEFAULT_MODE @@ -30,16 +30,16 @@ final class DaggerTestComponent { @Override public TestComponent newTestComponent(TestModule mod) { Preconditions.checkNotNull(mod); - return new TestComponentImpl(mod); + return new Impl(mod); } } - private static final class TestComponentImpl implements TestComponent { + private static final class Impl implements TestComponent { private final TestModule testModule; - private final TestComponentImpl testComponentImpl = this; + private final Impl impl = this; - TestComponentImpl(TestModule testModuleParam) { + Impl(TestModule testModuleParam) { this.testModule = testModuleParam; } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentFactoryTest/testUsesParameterNames/test.DaggerTestComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentFactoryTest/testUsesParameterNames/test.DaggerTestComponent_KT_FAST_INIT_MODE index 228bb5309a3..32866264c49 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentFactoryTest/testUsesParameterNames/test.DaggerTestComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentFactoryTest/testUsesParameterNames/test.DaggerTestComponent_KT_FAST_INIT_MODE @@ -30,16 +30,16 @@ final class DaggerTestComponent { @Override public TestComponent newTestComponent(TestModule mod) { Preconditions.checkNotNull(mod); - return new TestComponentImpl(mod); + return new Impl(mod); } } - private static final class TestComponentImpl implements TestComponent { + private static final class Impl implements TestComponent { private final TestModule testModule; - private final TestComponentImpl testComponentImpl = this; + private final Impl impl = this; - TestComponentImpl(TestModule testModuleParam) { + Impl(TestModule testModuleParam) { this.testModule = testModuleParam; } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/arrayComponentDependency/test.DaggerBComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/arrayComponentDependency/test.DaggerBComponent_DEFAULT_MODE index 2bad2546ff6..0fc672f72b4 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/arrayComponentDependency/test.DaggerBComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/arrayComponentDependency/test.DaggerBComponent_DEFAULT_MODE @@ -40,16 +40,16 @@ final class DaggerBComponent { public BComponent build() { Preconditions.checkBuilderRequirement(arrayComponent, ArrayComponent.class); - return new BComponentImpl(arrayComponent); + return new Impl(arrayComponent); } } - private static final class BComponentImpl implements BComponent { - private final BComponentImpl bComponentImpl = this; + private static final class Impl implements BComponent { + private final Impl impl = this; Provider stringsProvider; - BComponentImpl(ArrayComponent arrayComponentParam) { + Impl(ArrayComponent arrayComponentParam) { initialize(arrayComponentParam); diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/arrayComponentDependency/test.DaggerBComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/arrayComponentDependency/test.DaggerBComponent_FAST_INIT_MODE index c94e037b013..de0c5415a95 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/arrayComponentDependency/test.DaggerBComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/arrayComponentDependency/test.DaggerBComponent_FAST_INIT_MODE @@ -40,18 +40,18 @@ final class DaggerBComponent { public BComponent build() { Preconditions.checkBuilderRequirement(arrayComponent, ArrayComponent.class); - return new BComponentImpl(arrayComponent); + return new Impl(arrayComponent); } } - private static final class BComponentImpl implements BComponent { + private static final class Impl implements BComponent { private final ArrayComponent arrayComponent; - private final BComponentImpl bComponentImpl = this; + private final Impl impl = this; Provider stringsProvider; - BComponentImpl(ArrayComponent arrayComponentParam) { + Impl(ArrayComponent arrayComponentParam) { this.arrayComponent = arrayComponentParam; initialize(arrayComponentParam); @@ -59,7 +59,7 @@ final class DaggerBComponent { @SuppressWarnings("unchecked") private void initialize(final ArrayComponent arrayComponentParam) { - this.stringsProvider = new SwitchingProvider<>(bComponentImpl, 0); + this.stringsProvider = new SwitchingProvider<>(impl, 0); } @Override @@ -68,12 +68,12 @@ final class DaggerBComponent { } private static final class SwitchingProvider implements Provider { - private final BComponentImpl bComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(BComponentImpl bComponentImpl, int id) { - this.bComponentImpl = bComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } @@ -82,7 +82,7 @@ final class DaggerBComponent { public T get() { switch (id) { case 0: // java.lang.String[] - return (T) Preconditions.checkNotNullFromComponent(bComponentImpl.arrayComponent.strings()); + return (T) Preconditions.checkNotNullFromComponent(impl.arrayComponent.strings()); default: throw new AssertionError(id); } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/arrayComponentDependency/test.DaggerBComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/arrayComponentDependency/test.DaggerBComponent_KT_DEFAULT_MODE index 5d9fdcb72f2..d074be798ef 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/arrayComponentDependency/test.DaggerBComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/arrayComponentDependency/test.DaggerBComponent_KT_DEFAULT_MODE @@ -40,19 +40,19 @@ final class DaggerBComponent { public BComponent build() { Preconditions.checkBuilderRequirement(arrayComponent, ArrayComponent.class); - return new BComponentImpl(arrayComponent); + return new Impl(arrayComponent); } } - private static final class BComponentImpl implements BComponent { - private final BComponentImpl bComponentImpl = this; + private static final class Impl implements BComponent { + private final Impl impl = this; /** * {@code Provider} */ Provider stringsProvider; - BComponentImpl(ArrayComponent arrayComponentParam) { + Impl(ArrayComponent arrayComponentParam) { initialize(arrayComponentParam); diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/arrayComponentDependency/test.DaggerBComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/arrayComponentDependency/test.DaggerBComponent_KT_FAST_INIT_MODE index a4692c57f7e..c3d8c1c8a3f 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/arrayComponentDependency/test.DaggerBComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/arrayComponentDependency/test.DaggerBComponent_KT_FAST_INIT_MODE @@ -40,21 +40,21 @@ final class DaggerBComponent { public BComponent build() { Preconditions.checkBuilderRequirement(arrayComponent, ArrayComponent.class); - return new BComponentImpl(arrayComponent); + return new Impl(arrayComponent); } } - private static final class BComponentImpl implements BComponent { + private static final class Impl implements BComponent { private final ArrayComponent arrayComponent; - private final BComponentImpl bComponentImpl = this; + private final Impl impl = this; /** * {@code Provider} */ Provider stringsProvider; - BComponentImpl(ArrayComponent arrayComponentParam) { + Impl(ArrayComponent arrayComponentParam) { this.arrayComponent = arrayComponentParam; initialize(arrayComponentParam); @@ -62,7 +62,7 @@ final class DaggerBComponent { @SuppressWarnings("unchecked") private void initialize(final ArrayComponent arrayComponentParam) { - this.stringsProvider = new SwitchingProvider<>(bComponentImpl, 0); + this.stringsProvider = new SwitchingProvider<>(impl, 0); } @Override @@ -71,12 +71,12 @@ final class DaggerBComponent { } private static final class SwitchingProvider implements Provider { - private final BComponentImpl bComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(BComponentImpl bComponentImpl, int id) { - this.bComponentImpl = bComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } @@ -85,7 +85,7 @@ final class DaggerBComponent { public T get() { switch (id) { case 0: // java.lang.String[] - return (T) Preconditions.checkNotNullFromComponent(bComponentImpl.arrayComponent.strings()); + return (T) Preconditions.checkNotNullFromComponent(impl.arrayComponent.strings()); default: throw new AssertionError(id); } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentDependency/test.DaggerBComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentDependency/test.DaggerBComponent_DEFAULT_MODE index e418440cc7d..e9364fb78ad 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentDependency/test.DaggerBComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentDependency/test.DaggerBComponent_DEFAULT_MODE @@ -40,16 +40,16 @@ final class DaggerBComponent { public BComponent build() { Preconditions.checkBuilderRequirement(aComponent, AComponent.class); - return new BComponentImpl(aComponent); + return new Impl(aComponent); } } - private static final class BComponentImpl implements BComponent { - private final BComponentImpl bComponentImpl = this; + private static final class Impl implements BComponent { + private final Impl impl = this; Provider aProvider; - BComponentImpl(AComponent aComponentParam) { + Impl(AComponent aComponentParam) { initialize(aComponentParam); diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentDependency/test.DaggerBComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentDependency/test.DaggerBComponent_FAST_INIT_MODE index 967d35e52b3..9de08932218 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentDependency/test.DaggerBComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentDependency/test.DaggerBComponent_FAST_INIT_MODE @@ -40,18 +40,18 @@ final class DaggerBComponent { public BComponent build() { Preconditions.checkBuilderRequirement(aComponent, AComponent.class); - return new BComponentImpl(aComponent); + return new Impl(aComponent); } } - private static final class BComponentImpl implements BComponent { + private static final class Impl implements BComponent { private final AComponent aComponent; - private final BComponentImpl bComponentImpl = this; + private final Impl impl = this; Provider aProvider; - BComponentImpl(AComponent aComponentParam) { + Impl(AComponent aComponentParam) { this.aComponent = aComponentParam; initialize(aComponentParam); @@ -59,7 +59,7 @@ final class DaggerBComponent { @SuppressWarnings("unchecked") private void initialize(final AComponent aComponentParam) { - this.aProvider = new SwitchingProvider<>(bComponentImpl, 0); + this.aProvider = new SwitchingProvider<>(impl, 0); } @Override @@ -68,12 +68,12 @@ final class DaggerBComponent { } private static final class SwitchingProvider implements Provider { - private final BComponentImpl bComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(BComponentImpl bComponentImpl, int id) { - this.bComponentImpl = bComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } @@ -82,7 +82,7 @@ final class DaggerBComponent { public T get() { switch (id) { case 0: // test.A - return (T) Preconditions.checkNotNullFromComponent(bComponentImpl.aComponent.a()); + return (T) Preconditions.checkNotNullFromComponent(impl.aComponent.a()); default: throw new AssertionError(id); } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentDependency/test.DaggerBComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentDependency/test.DaggerBComponent_KT_DEFAULT_MODE index e5f8bd4c532..a83e78fd936 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentDependency/test.DaggerBComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentDependency/test.DaggerBComponent_KT_DEFAULT_MODE @@ -40,19 +40,19 @@ final class DaggerBComponent { public BComponent build() { Preconditions.checkBuilderRequirement(aComponent, AComponent.class); - return new BComponentImpl(aComponent); + return new Impl(aComponent); } } - private static final class BComponentImpl implements BComponent { - private final BComponentImpl bComponentImpl = this; + private static final class Impl implements BComponent { + private final Impl impl = this; /** * {@code Provider} */ Provider aProvider; - BComponentImpl(AComponent aComponentParam) { + Impl(AComponent aComponentParam) { initialize(aComponentParam); diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentDependency/test.DaggerBComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentDependency/test.DaggerBComponent_KT_FAST_INIT_MODE index e1513570fe0..63a5da38dee 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentDependency/test.DaggerBComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentDependency/test.DaggerBComponent_KT_FAST_INIT_MODE @@ -40,21 +40,21 @@ final class DaggerBComponent { public BComponent build() { Preconditions.checkBuilderRequirement(aComponent, AComponent.class); - return new BComponentImpl(aComponent); + return new Impl(aComponent); } } - private static final class BComponentImpl implements BComponent { + private static final class Impl implements BComponent { private final AComponent aComponent; - private final BComponentImpl bComponentImpl = this; + private final Impl impl = this; /** * {@code Provider} */ Provider aProvider; - BComponentImpl(AComponent aComponentParam) { + Impl(AComponent aComponentParam) { this.aComponent = aComponentParam; initialize(aComponentParam); @@ -62,7 +62,7 @@ final class DaggerBComponent { @SuppressWarnings("unchecked") private void initialize(final AComponent aComponentParam) { - this.aProvider = new SwitchingProvider<>(bComponentImpl, 0); + this.aProvider = new SwitchingProvider<>(impl, 0); } @Override @@ -71,12 +71,12 @@ final class DaggerBComponent { } private static final class SwitchingProvider implements Provider { - private final BComponentImpl bComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(BComponentImpl bComponentImpl, int id) { - this.bComponentImpl = bComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } @@ -85,7 +85,7 @@ final class DaggerBComponent { public T get() { switch (id) { case 0: // test.A - return (T) Preconditions.checkNotNullFromComponent(bComponentImpl.aComponent.a()); + return (T) Preconditions.checkNotNullFromComponent(impl.aComponent.a()); default: throw new AssertionError(id); } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentInjection/test.DaggerSimpleComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentInjection/test.DaggerSimpleComponent_DEFAULT_MODE index ade4c4c56cf..0a4a95fb778 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentInjection/test.DaggerSimpleComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentInjection/test.DaggerSimpleComponent_DEFAULT_MODE @@ -36,16 +36,16 @@ final class DaggerSimpleComponent { } public SimpleComponent build() { - return new SimpleComponentImpl(); + return new Impl(); } } - private static final class SimpleComponentImpl implements SimpleComponent { - private final SimpleComponentImpl simpleComponentImpl = this; + private static final class Impl implements SimpleComponent { + private final Impl impl = this; Provider simpleComponentProvider; - SimpleComponentImpl() { + Impl() { initialize(); @@ -53,7 +53,7 @@ final class DaggerSimpleComponent { @SuppressWarnings("unchecked") private void initialize() { - this.simpleComponentProvider = InstanceFactory.create((SimpleComponent) (simpleComponentImpl)); + this.simpleComponentProvider = InstanceFactory.create((SimpleComponent) (impl)); } @Override diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentInjection/test.DaggerSimpleComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentInjection/test.DaggerSimpleComponent_FAST_INIT_MODE index 41bbc773583..8850384e1f4 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentInjection/test.DaggerSimpleComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentInjection/test.DaggerSimpleComponent_FAST_INIT_MODE @@ -36,16 +36,16 @@ final class DaggerSimpleComponent { } public SimpleComponent build() { - return new SimpleComponentImpl(); + return new Impl(); } } - private static final class SimpleComponentImpl implements SimpleComponent { - private final SimpleComponentImpl simpleComponentImpl = this; + private static final class Impl implements SimpleComponent { + private final Impl impl = this; Provider simpleComponentProvider; - SimpleComponentImpl() { + Impl() { initialize(); @@ -53,7 +53,7 @@ final class DaggerSimpleComponent { @SuppressWarnings("unchecked") private void initialize() { - this.simpleComponentProvider = InstanceFactory.create((SimpleComponent) (simpleComponentImpl)); + this.simpleComponentProvider = InstanceFactory.create((SimpleComponent) (impl)); } @Override diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentInjection/test.DaggerSimpleComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentInjection/test.DaggerSimpleComponent_KT_DEFAULT_MODE index e57420e9e18..1281061bdb5 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentInjection/test.DaggerSimpleComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentInjection/test.DaggerSimpleComponent_KT_DEFAULT_MODE @@ -36,19 +36,19 @@ final class DaggerSimpleComponent { } public SimpleComponent build() { - return new SimpleComponentImpl(); + return new Impl(); } } - private static final class SimpleComponentImpl implements SimpleComponent { - private final SimpleComponentImpl simpleComponentImpl = this; + private static final class Impl implements SimpleComponent { + private final Impl impl = this; /** * {@code Provider} */ Provider simpleComponentProvider; - SimpleComponentImpl() { + Impl() { initialize(); @@ -56,7 +56,7 @@ final class DaggerSimpleComponent { @SuppressWarnings("unchecked") private void initialize() { - this.simpleComponentProvider = InstanceFactory.create((SimpleComponent) (simpleComponentImpl)); + this.simpleComponentProvider = InstanceFactory.create((SimpleComponent) (impl)); } @Override diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentInjection/test.DaggerSimpleComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentInjection/test.DaggerSimpleComponent_KT_FAST_INIT_MODE index 27fe45c47dc..15ee90f3d38 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentInjection/test.DaggerSimpleComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentInjection/test.DaggerSimpleComponent_KT_FAST_INIT_MODE @@ -36,19 +36,19 @@ final class DaggerSimpleComponent { } public SimpleComponent build() { - return new SimpleComponentImpl(); + return new Impl(); } } - private static final class SimpleComponentImpl implements SimpleComponent { - private final SimpleComponentImpl simpleComponentImpl = this; + private static final class Impl implements SimpleComponent { + private final Impl impl = this; /** * {@code Provider} */ Provider simpleComponentProvider; - SimpleComponentImpl() { + Impl() { initialize(); @@ -56,7 +56,7 @@ final class DaggerSimpleComponent { @SuppressWarnings("unchecked") private void initialize() { - this.simpleComponentProvider = InstanceFactory.create((SimpleComponent) (simpleComponentImpl)); + this.simpleComponentProvider = InstanceFactory.create((SimpleComponent) (impl)); } @Override diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentMethodInChildCallsComponentMethodInParent/test.DaggerParent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentMethodInChildCallsComponentMethodInParent/test.DaggerParent_DEFAULT_MODE index 0f597976f43..fd404c77408 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentMethodInChildCallsComponentMethodInParent/test.DaggerParent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentMethodInChildCallsComponentMethodInParent/test.DaggerParent_DEFAULT_MODE @@ -36,33 +36,33 @@ final class DaggerParent { } public Parent build() { - return new ParentImpl(); + return new Impl(); } } private static final class ChildImpl implements Child { - private final ParentImpl parentImpl; + private final Impl impl; private final ChildImpl childImpl = this; - ChildImpl(ParentImpl parentImpl) { - this.parentImpl = parentImpl; + ChildImpl(Impl impl) { + this.impl = impl; } @Override public String string() { - return parentImpl.string(); + return impl.string(); } } - private static final class ParentImpl implements Parent { - private final ParentImpl parentImpl = this; + private static final class Impl implements Parent { + private final Impl impl = this; Provider numberProvider; - ParentImpl() { + Impl() { initialize(); @@ -80,7 +80,7 @@ final class DaggerParent { @Override public Child child() { - return new ChildImpl(parentImpl); + return new ChildImpl(impl); } } } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentMethodInChildCallsComponentMethodInParent/test.DaggerParent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentMethodInChildCallsComponentMethodInParent/test.DaggerParent_FAST_INIT_MODE index c10bfcdfdc4..ee12870f3c6 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentMethodInChildCallsComponentMethodInParent/test.DaggerParent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentMethodInChildCallsComponentMethodInParent/test.DaggerParent_FAST_INIT_MODE @@ -36,33 +36,33 @@ final class DaggerParent { } public Parent build() { - return new ParentImpl(); + return new Impl(); } } private static final class ChildImpl implements Child { - private final ParentImpl parentImpl; + private final Impl impl; private final ChildImpl childImpl = this; - ChildImpl(ParentImpl parentImpl) { - this.parentImpl = parentImpl; + ChildImpl(Impl impl) { + this.impl = impl; } @Override public String string() { - return parentImpl.string(); + return impl.string(); } } - private static final class ParentImpl implements Parent { - private final ParentImpl parentImpl = this; + private static final class Impl implements Parent { + private final Impl impl = this; Provider numberProvider; - ParentImpl() { + Impl() { initialize(); @@ -70,7 +70,7 @@ final class DaggerParent { @SuppressWarnings("unchecked") private void initialize() { - this.numberProvider = DoubleCheck.provider(new SwitchingProvider(parentImpl, 0)); + this.numberProvider = DoubleCheck.provider(new SwitchingProvider(impl, 0)); } @Override @@ -80,16 +80,16 @@ final class DaggerParent { @Override public Child child() { - return new ChildImpl(parentImpl); + return new ChildImpl(impl); } private static final class SwitchingProvider implements Provider { - private final ParentImpl parentImpl; + private final Impl impl; private final int id; - SwitchingProvider(ParentImpl parentImpl, int id) { - this.parentImpl = parentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentMethodInChildCallsComponentMethodInParent/test.DaggerParent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentMethodInChildCallsComponentMethodInParent/test.DaggerParent_KT_DEFAULT_MODE index 643071300b7..c965d501f49 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentMethodInChildCallsComponentMethodInParent/test.DaggerParent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentMethodInChildCallsComponentMethodInParent/test.DaggerParent_KT_DEFAULT_MODE @@ -36,36 +36,36 @@ final class DaggerParent { } public Parent build() { - return new ParentImpl(); + return new Impl(); } } private static final class ChildImpl implements Child { - private final ParentImpl parentImpl; + private final Impl impl; private final ChildImpl childImpl = this; - ChildImpl(ParentImpl parentImpl) { - this.parentImpl = parentImpl; + ChildImpl(Impl impl) { + this.impl = impl; } @Override public String string() { - return (String) ((Object) (parentImpl.string())); + return (String) ((Object) (impl.string())); } } - private static final class ParentImpl implements Parent { - private final ParentImpl parentImpl = this; + private static final class Impl implements Parent { + private final Impl impl = this; /** * {@code Provider} */ Provider numberProvider; - ParentImpl() { + Impl() { initialize(); @@ -83,7 +83,7 @@ final class DaggerParent { @Override public Child child() { - return new ChildImpl(parentImpl); + return new ChildImpl(impl); } } } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentMethodInChildCallsComponentMethodInParent/test.DaggerParent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentMethodInChildCallsComponentMethodInParent/test.DaggerParent_KT_FAST_INIT_MODE index e58880d5443..67184743c5f 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentMethodInChildCallsComponentMethodInParent/test.DaggerParent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentMethodInChildCallsComponentMethodInParent/test.DaggerParent_KT_FAST_INIT_MODE @@ -36,36 +36,36 @@ final class DaggerParent { } public Parent build() { - return new ParentImpl(); + return new Impl(); } } private static final class ChildImpl implements Child { - private final ParentImpl parentImpl; + private final Impl impl; private final ChildImpl childImpl = this; - ChildImpl(ParentImpl parentImpl) { - this.parentImpl = parentImpl; + ChildImpl(Impl impl) { + this.impl = impl; } @Override public String string() { - return (String) ((Object) (parentImpl.string())); + return (String) ((Object) (impl.string())); } } - private static final class ParentImpl implements Parent { - private final ParentImpl parentImpl = this; + private static final class Impl implements Parent { + private final Impl impl = this; /** * {@code Provider} */ Provider numberProvider; - ParentImpl() { + Impl() { initialize(); @@ -73,7 +73,7 @@ final class DaggerParent { @SuppressWarnings("unchecked") private void initialize() { - this.numberProvider = DoubleCheck.provider(new SwitchingProvider<>(parentImpl, 0)); + this.numberProvider = DoubleCheck.provider(new SwitchingProvider<>(impl, 0)); } @Override @@ -83,16 +83,16 @@ final class DaggerParent { @Override public Child child() { - return new ChildImpl(parentImpl); + return new ChildImpl(impl); } private static final class SwitchingProvider implements Provider { - private final ParentImpl parentImpl; + private final Impl impl; private final int id; - SwitchingProvider(ParentImpl parentImpl, int id) { - this.parentImpl = parentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentWithAbstractModule/test.DaggerTestComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentWithAbstractModule/test.DaggerTestComponent_DEFAULT_MODE index bcf0b9801cf..ae71e6c768e 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentWithAbstractModule/test.DaggerTestComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentWithAbstractModule/test.DaggerTestComponent_DEFAULT_MODE @@ -34,14 +34,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentWithAbstractModule/test.DaggerTestComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentWithAbstractModule/test.DaggerTestComponent_FAST_INIT_MODE index bcf0b9801cf..ae71e6c768e 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentWithAbstractModule/test.DaggerTestComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentWithAbstractModule/test.DaggerTestComponent_FAST_INIT_MODE @@ -34,14 +34,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentWithAbstractModule/test.DaggerTestComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentWithAbstractModule/test.DaggerTestComponent_KT_DEFAULT_MODE index cc1db7d032c..5f3859f4af6 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentWithAbstractModule/test.DaggerTestComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentWithAbstractModule/test.DaggerTestComponent_KT_DEFAULT_MODE @@ -34,14 +34,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentWithAbstractModule/test.DaggerTestComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentWithAbstractModule/test.DaggerTestComponent_KT_FAST_INIT_MODE index cc1db7d032c..5f3859f4af6 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentWithAbstractModule/test.DaggerTestComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentWithAbstractModule/test.DaggerTestComponent_KT_FAST_INIT_MODE @@ -34,14 +34,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentWithModule/test.DaggerTestComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentWithModule/test.DaggerTestComponent_DEFAULT_MODE index 36027c066d5..1948c8aa557 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentWithModule/test.DaggerTestComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentWithModule/test.DaggerTestComponent_DEFAULT_MODE @@ -45,16 +45,16 @@ final class DaggerTestComponent { if (testModule == null) { this.testModule = new TestModule(); } - return new TestComponentImpl(testModule); + return new Impl(testModule); } } - private static final class TestComponentImpl implements TestComponent { + private static final class Impl implements TestComponent { private final TestModule testModule; - private final TestComponentImpl testComponentImpl = this; + private final Impl impl = this; - TestComponentImpl(TestModule testModuleParam) { + Impl(TestModule testModuleParam) { this.testModule = testModuleParam; } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentWithModule/test.DaggerTestComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentWithModule/test.DaggerTestComponent_FAST_INIT_MODE index 36027c066d5..1948c8aa557 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentWithModule/test.DaggerTestComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentWithModule/test.DaggerTestComponent_FAST_INIT_MODE @@ -45,16 +45,16 @@ final class DaggerTestComponent { if (testModule == null) { this.testModule = new TestModule(); } - return new TestComponentImpl(testModule); + return new Impl(testModule); } } - private static final class TestComponentImpl implements TestComponent { + private static final class Impl implements TestComponent { private final TestModule testModule; - private final TestComponentImpl testComponentImpl = this; + private final Impl impl = this; - TestComponentImpl(TestModule testModuleParam) { + Impl(TestModule testModuleParam) { this.testModule = testModuleParam; } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentWithModule/test.DaggerTestComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentWithModule/test.DaggerTestComponent_KT_DEFAULT_MODE index ca2b1a38e9b..20ea59acaaf 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentWithModule/test.DaggerTestComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentWithModule/test.DaggerTestComponent_KT_DEFAULT_MODE @@ -45,16 +45,16 @@ final class DaggerTestComponent { if (testModule == null) { this.testModule = new TestModule(); } - return new TestComponentImpl(testModule); + return new Impl(testModule); } } - private static final class TestComponentImpl implements TestComponent { + private static final class Impl implements TestComponent { private final TestModule testModule; - private final TestComponentImpl testComponentImpl = this; + private final Impl impl = this; - TestComponentImpl(TestModule testModuleParam) { + Impl(TestModule testModuleParam) { this.testModule = testModuleParam; } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentWithModule/test.DaggerTestComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentWithModule/test.DaggerTestComponent_KT_FAST_INIT_MODE index ca2b1a38e9b..20ea59acaaf 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentWithModule/test.DaggerTestComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentWithModule/test.DaggerTestComponent_KT_FAST_INIT_MODE @@ -45,16 +45,16 @@ final class DaggerTestComponent { if (testModule == null) { this.testModule = new TestModule(); } - return new TestComponentImpl(testModule); + return new Impl(testModule); } } - private static final class TestComponentImpl implements TestComponent { + private static final class Impl implements TestComponent { private final TestModule testModule; - private final TestComponentImpl testComponentImpl = this; + private final Impl impl = this; - TestComponentImpl(TestModule testModuleParam) { + Impl(TestModule testModuleParam) { this.testModule = testModuleParam; } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentWithNullableDependency/test.DaggerBComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentWithNullableDependency/test.DaggerBComponent_DEFAULT_MODE index 984130d39c0..24403cddd7e 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentWithNullableDependency/test.DaggerBComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentWithNullableDependency/test.DaggerBComponent_DEFAULT_MODE @@ -40,16 +40,16 @@ final class DaggerBComponent { public BComponent build() { Preconditions.checkBuilderRequirement(nullableStringComponent, NullableStringComponent.class); - return new BComponentImpl(nullableStringComponent); + return new Impl(nullableStringComponent); } } - private static final class BComponentImpl implements BComponent { - private final BComponentImpl bComponentImpl = this; + private static final class Impl implements BComponent { + private final Impl impl = this; Provider nullableStringProvider; - BComponentImpl(NullableStringComponent nullableStringComponentParam) { + Impl(NullableStringComponent nullableStringComponentParam) { initialize(nullableStringComponentParam); diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentWithNullableDependency/test.DaggerBComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentWithNullableDependency/test.DaggerBComponent_FAST_INIT_MODE index 5293a376913..bef703648c3 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentWithNullableDependency/test.DaggerBComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentWithNullableDependency/test.DaggerBComponent_FAST_INIT_MODE @@ -40,18 +40,18 @@ final class DaggerBComponent { public BComponent build() { Preconditions.checkBuilderRequirement(nullableStringComponent, NullableStringComponent.class); - return new BComponentImpl(nullableStringComponent); + return new Impl(nullableStringComponent); } } - private static final class BComponentImpl implements BComponent { + private static final class Impl implements BComponent { private final NullableStringComponent nullableStringComponent; - private final BComponentImpl bComponentImpl = this; + private final Impl impl = this; Provider nullableStringProvider; - BComponentImpl(NullableStringComponent nullableStringComponentParam) { + Impl(NullableStringComponent nullableStringComponentParam) { this.nullableStringComponent = nullableStringComponentParam; initialize(nullableStringComponentParam); @@ -59,7 +59,7 @@ final class DaggerBComponent { @SuppressWarnings("unchecked") private void initialize(final NullableStringComponent nullableStringComponentParam) { - this.nullableStringProvider = new SwitchingProvider<>(bComponentImpl, 0); + this.nullableStringProvider = new SwitchingProvider<>(impl, 0); } @Override @@ -68,12 +68,12 @@ final class DaggerBComponent { } private static final class SwitchingProvider implements Provider { - private final BComponentImpl bComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(BComponentImpl bComponentImpl, int id) { - this.bComponentImpl = bComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } @@ -82,7 +82,7 @@ final class DaggerBComponent { public T get() { switch (id) { case 0: // java.lang.String - return (T) bComponentImpl.nullableStringComponent.nullableString(); + return (T) impl.nullableStringComponent.nullableString(); default: throw new AssertionError(id); } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentWithNullableDependency/test.DaggerBComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentWithNullableDependency/test.DaggerBComponent_KT_DEFAULT_MODE index c6d464431b2..cfbc36cda5b 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentWithNullableDependency/test.DaggerBComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentWithNullableDependency/test.DaggerBComponent_KT_DEFAULT_MODE @@ -40,19 +40,19 @@ final class DaggerBComponent { public BComponent build() { Preconditions.checkBuilderRequirement(nullableStringComponent, NullableStringComponent.class); - return new BComponentImpl(nullableStringComponent); + return new Impl(nullableStringComponent); } } - private static final class BComponentImpl implements BComponent { - private final BComponentImpl bComponentImpl = this; + private static final class Impl implements BComponent { + private final Impl impl = this; /** * {@code Provider} */ Provider nullableStringProvider; - BComponentImpl(NullableStringComponent nullableStringComponentParam) { + Impl(NullableStringComponent nullableStringComponentParam) { initialize(nullableStringComponentParam); diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentWithNullableDependency/test.DaggerBComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentWithNullableDependency/test.DaggerBComponent_KT_FAST_INIT_MODE index 419f4e05f00..1cbaca43d46 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentWithNullableDependency/test.DaggerBComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentWithNullableDependency/test.DaggerBComponent_KT_FAST_INIT_MODE @@ -40,21 +40,21 @@ final class DaggerBComponent { public BComponent build() { Preconditions.checkBuilderRequirement(nullableStringComponent, NullableStringComponent.class); - return new BComponentImpl(nullableStringComponent); + return new Impl(nullableStringComponent); } } - private static final class BComponentImpl implements BComponent { + private static final class Impl implements BComponent { private final NullableStringComponent nullableStringComponent; - private final BComponentImpl bComponentImpl = this; + private final Impl impl = this; /** * {@code Provider} */ Provider nullableStringProvider; - BComponentImpl(NullableStringComponent nullableStringComponentParam) { + Impl(NullableStringComponent nullableStringComponentParam) { this.nullableStringComponent = nullableStringComponentParam; initialize(nullableStringComponentParam); @@ -62,7 +62,7 @@ final class DaggerBComponent { @SuppressWarnings("unchecked") private void initialize(final NullableStringComponent nullableStringComponentParam) { - this.nullableStringProvider = new SwitchingProvider<>(bComponentImpl, 0); + this.nullableStringProvider = new SwitchingProvider<>(impl, 0); } @Override @@ -71,12 +71,12 @@ final class DaggerBComponent { } private static final class SwitchingProvider implements Provider { - private final BComponentImpl bComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(BComponentImpl bComponentImpl, int id) { - this.bComponentImpl = bComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } @@ -85,7 +85,7 @@ final class DaggerBComponent { public T get() { switch (id) { case 0: // java.lang.String - return (T) bComponentImpl.nullableStringComponent.nullableString(); + return (T) impl.nullableStringComponent.nullableString(); default: throw new AssertionError(id); } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentWithScope/test.DaggerSimpleComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentWithScope/test.DaggerSimpleComponent_DEFAULT_MODE index cf89f50845a..2e0683d4925 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentWithScope/test.DaggerSimpleComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentWithScope/test.DaggerSimpleComponent_DEFAULT_MODE @@ -37,16 +37,16 @@ final class DaggerSimpleComponent { } public SimpleComponent build() { - return new SimpleComponentImpl(); + return new Impl(); } } - private static final class SimpleComponentImpl implements SimpleComponent { - private final SimpleComponentImpl simpleComponentImpl = this; + private static final class Impl implements SimpleComponent { + private final Impl impl = this; Provider someInjectableTypeProvider; - SimpleComponentImpl() { + Impl() { initialize(); diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentWithScope/test.DaggerSimpleComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentWithScope/test.DaggerSimpleComponent_FAST_INIT_MODE index 85706808d45..cb4d8a60f0b 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentWithScope/test.DaggerSimpleComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentWithScope/test.DaggerSimpleComponent_FAST_INIT_MODE @@ -37,16 +37,16 @@ final class DaggerSimpleComponent { } public SimpleComponent build() { - return new SimpleComponentImpl(); + return new Impl(); } } - private static final class SimpleComponentImpl implements SimpleComponent { - private final SimpleComponentImpl simpleComponentImpl = this; + private static final class Impl implements SimpleComponent { + private final Impl impl = this; Provider someInjectableTypeProvider; - SimpleComponentImpl() { + Impl() { initialize(); @@ -54,7 +54,7 @@ final class DaggerSimpleComponent { @SuppressWarnings("unchecked") private void initialize() { - this.someInjectableTypeProvider = DoubleCheck.provider(new SwitchingProvider(simpleComponentImpl, 0)); + this.someInjectableTypeProvider = DoubleCheck.provider(new SwitchingProvider(impl, 0)); } @Override @@ -73,12 +73,12 @@ final class DaggerSimpleComponent { } private static final class SwitchingProvider implements Provider { - private final SimpleComponentImpl simpleComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(SimpleComponentImpl simpleComponentImpl, int id) { - this.simpleComponentImpl = simpleComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentWithScope/test.DaggerSimpleComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentWithScope/test.DaggerSimpleComponent_KT_DEFAULT_MODE index e4a8d2f8d62..c7436c7ed17 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentWithScope/test.DaggerSimpleComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentWithScope/test.DaggerSimpleComponent_KT_DEFAULT_MODE @@ -37,19 +37,19 @@ final class DaggerSimpleComponent { } public SimpleComponent build() { - return new SimpleComponentImpl(); + return new Impl(); } } - private static final class SimpleComponentImpl implements SimpleComponent { - private final SimpleComponentImpl simpleComponentImpl = this; + private static final class Impl implements SimpleComponent { + private final Impl impl = this; /** * {@code Provider} */ Provider someInjectableTypeProvider; - SimpleComponentImpl() { + Impl() { initialize(); diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentWithScope/test.DaggerSimpleComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentWithScope/test.DaggerSimpleComponent_KT_FAST_INIT_MODE index 4bdd830cd3f..5c1d46a5a03 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentWithScope/test.DaggerSimpleComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/componentWithScope/test.DaggerSimpleComponent_KT_FAST_INIT_MODE @@ -37,19 +37,19 @@ final class DaggerSimpleComponent { } public SimpleComponent build() { - return new SimpleComponentImpl(); + return new Impl(); } } - private static final class SimpleComponentImpl implements SimpleComponent { - private final SimpleComponentImpl simpleComponentImpl = this; + private static final class Impl implements SimpleComponent { + private final Impl impl = this; /** * {@code Provider} */ Provider someInjectableTypeProvider; - SimpleComponentImpl() { + Impl() { initialize(); @@ -57,7 +57,7 @@ final class DaggerSimpleComponent { @SuppressWarnings("unchecked") private void initialize() { - this.someInjectableTypeProvider = DoubleCheck.provider(new SwitchingProvider<>(simpleComponentImpl, 0)); + this.someInjectableTypeProvider = DoubleCheck.provider(new SwitchingProvider<>(impl, 0)); } @Override @@ -76,12 +76,12 @@ final class DaggerSimpleComponent { } private static final class SwitchingProvider implements Provider { - private final SimpleComponentImpl simpleComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(SimpleComponentImpl simpleComponentImpl, int id) { - this.simpleComponentImpl = simpleComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/dependencyNameCollision/test.DaggerBComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/dependencyNameCollision/test.DaggerBComponent_DEFAULT_MODE index 30946024879..6447151f9a7 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/dependencyNameCollision/test.DaggerBComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/dependencyNameCollision/test.DaggerBComponent_DEFAULT_MODE @@ -50,18 +50,18 @@ final class DaggerBComponent { public BComponent build() { Preconditions.checkBuilderRequirement(aComponent, AComponent.class); Preconditions.checkBuilderRequirement(aComponent2, pkg2.AComponent.class); - return new BComponentImpl(aComponent, aComponent2); + return new Impl(aComponent, aComponent2); } } - private static final class BComponentImpl implements BComponent { - private final BComponentImpl bComponentImpl = this; + private static final class Impl implements BComponent { + private final Impl impl = this; Provider aProvider; Provider aProvider2; - BComponentImpl(AComponent aComponentParam, pkg2.AComponent aComponentParam2) { + Impl(AComponent aComponentParam, pkg2.AComponent aComponentParam2) { initialize(aComponentParam, aComponentParam2); diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/dependencyNameCollision/test.DaggerBComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/dependencyNameCollision/test.DaggerBComponent_FAST_INIT_MODE index b39cbb2d833..dd1aad88618 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/dependencyNameCollision/test.DaggerBComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/dependencyNameCollision/test.DaggerBComponent_FAST_INIT_MODE @@ -50,22 +50,22 @@ final class DaggerBComponent { public BComponent build() { Preconditions.checkBuilderRequirement(aComponent, AComponent.class); Preconditions.checkBuilderRequirement(aComponent2, pkg2.AComponent.class); - return new BComponentImpl(aComponent, aComponent2); + return new Impl(aComponent, aComponent2); } } - private static final class BComponentImpl implements BComponent { + private static final class Impl implements BComponent { private final AComponent aComponent; private final pkg2.AComponent aComponent2; - private final BComponentImpl bComponentImpl = this; + private final Impl impl = this; Provider aProvider; Provider aProvider2; - BComponentImpl(AComponent aComponentParam, pkg2.AComponent aComponentParam2) { + Impl(AComponent aComponentParam, pkg2.AComponent aComponentParam2) { this.aComponent = aComponentParam; this.aComponent2 = aComponentParam2; initialize(aComponentParam, aComponentParam2); @@ -75,8 +75,8 @@ final class DaggerBComponent { @SuppressWarnings("unchecked") private void initialize(final AComponent aComponentParam, final pkg2.AComponent aComponentParam2) { - this.aProvider = new SwitchingProvider<>(bComponentImpl, 0); - this.aProvider2 = new SwitchingProvider<>(bComponentImpl, 1); + this.aProvider = new SwitchingProvider<>(impl, 0); + this.aProvider2 = new SwitchingProvider<>(impl, 1); } @Override @@ -85,12 +85,12 @@ final class DaggerBComponent { } private static final class SwitchingProvider implements Provider { - private final BComponentImpl bComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(BComponentImpl bComponentImpl, int id) { - this.bComponentImpl = bComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } @@ -99,10 +99,10 @@ final class DaggerBComponent { public T get() { switch (id) { case 0: // pkg1.A - return (T) Preconditions.checkNotNullFromComponent(bComponentImpl.aComponent.a()); + return (T) Preconditions.checkNotNullFromComponent(impl.aComponent.a()); case 1: // pkg2.A - return (T) Preconditions.checkNotNullFromComponent(bComponentImpl.aComponent2.a()); + return (T) Preconditions.checkNotNullFromComponent(impl.aComponent2.a()); default: throw new AssertionError(id); } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/dependencyNameCollision/test.DaggerBComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/dependencyNameCollision/test.DaggerBComponent_KT_DEFAULT_MODE index f472cf65f72..d6deb54e510 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/dependencyNameCollision/test.DaggerBComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/dependencyNameCollision/test.DaggerBComponent_KT_DEFAULT_MODE @@ -50,12 +50,12 @@ final class DaggerBComponent { public BComponent build() { Preconditions.checkBuilderRequirement(aComponent, AComponent.class); Preconditions.checkBuilderRequirement(aComponent2, pkg2.AComponent.class); - return new BComponentImpl(aComponent, aComponent2); + return new Impl(aComponent, aComponent2); } } - private static final class BComponentImpl implements BComponent { - private final BComponentImpl bComponentImpl = this; + private static final class Impl implements BComponent { + private final Impl impl = this; /** * {@code Provider} @@ -67,7 +67,7 @@ final class DaggerBComponent { */ Provider aProvider2; - BComponentImpl(AComponent aComponentParam, pkg2.AComponent aComponentParam2) { + Impl(AComponent aComponentParam, pkg2.AComponent aComponentParam2) { initialize(aComponentParam, aComponentParam2); diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/dependencyNameCollision/test.DaggerBComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/dependencyNameCollision/test.DaggerBComponent_KT_FAST_INIT_MODE index 6d9c360e9bd..cb30f99f9b6 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/dependencyNameCollision/test.DaggerBComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/dependencyNameCollision/test.DaggerBComponent_KT_FAST_INIT_MODE @@ -49,16 +49,16 @@ final class DaggerBComponent { public BComponent build() { Preconditions.checkBuilderRequirement(aComponent, AComponent.class); Preconditions.checkBuilderRequirement(aComponent2, pkg2.AComponent.class); - return new BComponentImpl(aComponent, aComponent2); + return new Impl(aComponent, aComponent2); } } - private static final class BComponentImpl implements BComponent { + private static final class Impl implements BComponent { private final AComponent aComponent; private final pkg2.AComponent aComponent2; - private final BComponentImpl bComponentImpl = this; + private final Impl impl = this; /** * {@code Provider} @@ -70,7 +70,7 @@ final class DaggerBComponent { */ Provider aProvider2; - BComponentImpl(AComponent aComponentParam, pkg2.AComponent aComponentParam2) { + Impl(AComponent aComponentParam, pkg2.AComponent aComponentParam2) { this.aComponent = aComponentParam; this.aComponent2 = aComponentParam2; initialize(aComponentParam, aComponentParam2); @@ -80,8 +80,8 @@ final class DaggerBComponent { @SuppressWarnings("unchecked") private void initialize(final AComponent aComponentParam, final pkg2.AComponent aComponentParam2) { - this.aProvider = new SwitchingProvider<>(bComponentImpl, 0); - this.aProvider2 = new SwitchingProvider<>(bComponentImpl, 1); + this.aProvider = new SwitchingProvider<>(impl, 0); + this.aProvider2 = new SwitchingProvider<>(impl, 1); } @Override @@ -90,12 +90,12 @@ final class DaggerBComponent { } private static final class SwitchingProvider implements Provider { - private final BComponentImpl bComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(BComponentImpl bComponentImpl, int id) { - this.bComponentImpl = bComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } @@ -104,10 +104,10 @@ final class DaggerBComponent { public T get() { switch (id) { case 0: // pkg1.A - return (T) Preconditions.checkNotNullFromComponent(bComponentImpl.aComponent.a()); + return (T) Preconditions.checkNotNullFromComponent(impl.aComponent.a()); case 1: // pkg2.A - return (T) Preconditions.checkNotNullFromComponent(bComponentImpl.aComponent2.a()); + return (T) Preconditions.checkNotNullFromComponent(impl.aComponent2.a()); default: throw new AssertionError(id); } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/ignoresDependencyMethodsFromObject/test.DaggerBComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/ignoresDependencyMethodsFromObject/test.DaggerBComponent_DEFAULT_MODE index a5e64792380..5a562121a21 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/ignoresDependencyMethodsFromObject/test.DaggerBComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/ignoresDependencyMethodsFromObject/test.DaggerBComponent_DEFAULT_MODE @@ -39,16 +39,16 @@ final class DaggerBComponent { public BComponent build() { Preconditions.checkBuilderRequirement(aComponent, AComponent.class); - return new BComponentImpl(aComponent); + return new Impl(aComponent); } } - private static final class BComponentImpl implements BComponent { + private static final class Impl implements BComponent { private final AComponent aComponent; - private final BComponentImpl bComponentImpl = this; + private final Impl impl = this; - BComponentImpl(AComponent aComponentParam) { + Impl(AComponent aComponentParam) { this.aComponent = aComponentParam; } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/ignoresDependencyMethodsFromObject/test.DaggerBComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/ignoresDependencyMethodsFromObject/test.DaggerBComponent_FAST_INIT_MODE index a5e64792380..5a562121a21 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/ignoresDependencyMethodsFromObject/test.DaggerBComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/ignoresDependencyMethodsFromObject/test.DaggerBComponent_FAST_INIT_MODE @@ -39,16 +39,16 @@ final class DaggerBComponent { public BComponent build() { Preconditions.checkBuilderRequirement(aComponent, AComponent.class); - return new BComponentImpl(aComponent); + return new Impl(aComponent); } } - private static final class BComponentImpl implements BComponent { + private static final class Impl implements BComponent { private final AComponent aComponent; - private final BComponentImpl bComponentImpl = this; + private final Impl impl = this; - BComponentImpl(AComponent aComponentParam) { + Impl(AComponent aComponentParam) { this.aComponent = aComponentParam; } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/ignoresDependencyMethodsFromObject/test.DaggerBComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/ignoresDependencyMethodsFromObject/test.DaggerBComponent_KT_DEFAULT_MODE index a8a1b2c5210..906624a75ec 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/ignoresDependencyMethodsFromObject/test.DaggerBComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/ignoresDependencyMethodsFromObject/test.DaggerBComponent_KT_DEFAULT_MODE @@ -39,16 +39,16 @@ final class DaggerBComponent { public BComponent build() { Preconditions.checkBuilderRequirement(aComponent, AComponent.class); - return new BComponentImpl(aComponent); + return new Impl(aComponent); } } - private static final class BComponentImpl implements BComponent { + private static final class Impl implements BComponent { private final AComponent aComponent; - private final BComponentImpl bComponentImpl = this; + private final Impl impl = this; - BComponentImpl(AComponent aComponentParam) { + Impl(AComponent aComponentParam) { this.aComponent = aComponentParam; } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/ignoresDependencyMethodsFromObject/test.DaggerBComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/ignoresDependencyMethodsFromObject/test.DaggerBComponent_KT_FAST_INIT_MODE index a8a1b2c5210..906624a75ec 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/ignoresDependencyMethodsFromObject/test.DaggerBComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/ignoresDependencyMethodsFromObject/test.DaggerBComponent_KT_FAST_INIT_MODE @@ -39,16 +39,16 @@ final class DaggerBComponent { public BComponent build() { Preconditions.checkBuilderRequirement(aComponent, AComponent.class); - return new BComponentImpl(aComponent); + return new Impl(aComponent); } } - private static final class BComponentImpl implements BComponent { + private static final class Impl implements BComponent { private final AComponent aComponent; - private final BComponentImpl bComponentImpl = this; + private final Impl impl = this; - BComponentImpl(AComponent aComponentParam) { + Impl(AComponent aComponentParam) { this.aComponent = aComponentParam; } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/justInTimeAtInjectConstructor_hasGeneratedQualifier/test.DaggerTestComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/justInTimeAtInjectConstructor_hasGeneratedQualifier/test.DaggerTestComponent_DEFAULT_MODE index 2e6c53e8d8e..8c98fb458d8 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/justInTimeAtInjectConstructor_hasGeneratedQualifier/test.DaggerTestComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/justInTimeAtInjectConstructor_hasGeneratedQualifier/test.DaggerTestComponent_DEFAULT_MODE @@ -34,14 +34,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/justInTimeAtInjectConstructor_hasGeneratedQualifier/test.DaggerTestComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/justInTimeAtInjectConstructor_hasGeneratedQualifier/test.DaggerTestComponent_FAST_INIT_MODE index 2e6c53e8d8e..8c98fb458d8 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/justInTimeAtInjectConstructor_hasGeneratedQualifier/test.DaggerTestComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/justInTimeAtInjectConstructor_hasGeneratedQualifier/test.DaggerTestComponent_FAST_INIT_MODE @@ -34,14 +34,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/justInTimeAtInjectConstructor_hasGeneratedQualifier/test.DaggerTestComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/justInTimeAtInjectConstructor_hasGeneratedQualifier/test.DaggerTestComponent_KT_DEFAULT_MODE index bc37d782824..6e16deeb05a 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/justInTimeAtInjectConstructor_hasGeneratedQualifier/test.DaggerTestComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/justInTimeAtInjectConstructor_hasGeneratedQualifier/test.DaggerTestComponent_KT_DEFAULT_MODE @@ -34,14 +34,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/justInTimeAtInjectConstructor_hasGeneratedQualifier/test.DaggerTestComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/justInTimeAtInjectConstructor_hasGeneratedQualifier/test.DaggerTestComponent_KT_FAST_INIT_MODE index bc37d782824..6e16deeb05a 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/justInTimeAtInjectConstructor_hasGeneratedQualifier/test.DaggerTestComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/justInTimeAtInjectConstructor_hasGeneratedQualifier/test.DaggerTestComponent_KT_FAST_INIT_MODE @@ -34,14 +34,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/membersInjection/test.DaggerSimpleComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/membersInjection/test.DaggerSimpleComponent_DEFAULT_MODE index 7573c894e51..47dac6922c4 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/membersInjection/test.DaggerSimpleComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/membersInjection/test.DaggerSimpleComponent_DEFAULT_MODE @@ -35,14 +35,14 @@ final class DaggerSimpleComponent { } public SimpleComponent build() { - return new SimpleComponentImpl(); + return new Impl(); } } - private static final class SimpleComponentImpl implements SimpleComponent { - private final SimpleComponentImpl simpleComponentImpl = this; + private static final class Impl implements SimpleComponent { + private final Impl impl = this; - SimpleComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/membersInjection/test.DaggerSimpleComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/membersInjection/test.DaggerSimpleComponent_FAST_INIT_MODE index 7573c894e51..47dac6922c4 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/membersInjection/test.DaggerSimpleComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/membersInjection/test.DaggerSimpleComponent_FAST_INIT_MODE @@ -35,14 +35,14 @@ final class DaggerSimpleComponent { } public SimpleComponent build() { - return new SimpleComponentImpl(); + return new Impl(); } } - private static final class SimpleComponentImpl implements SimpleComponent { - private final SimpleComponentImpl simpleComponentImpl = this; + private static final class Impl implements SimpleComponent { + private final Impl impl = this; - SimpleComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/membersInjection/test.DaggerSimpleComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/membersInjection/test.DaggerSimpleComponent_KT_DEFAULT_MODE index db371e0c830..e5b47ba9b4d 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/membersInjection/test.DaggerSimpleComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/membersInjection/test.DaggerSimpleComponent_KT_DEFAULT_MODE @@ -35,14 +35,14 @@ final class DaggerSimpleComponent { } public SimpleComponent build() { - return new SimpleComponentImpl(); + return new Impl(); } } - private static final class SimpleComponentImpl implements SimpleComponent { - private final SimpleComponentImpl simpleComponentImpl = this; + private static final class Impl implements SimpleComponent { + private final Impl impl = this; - SimpleComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/membersInjection/test.DaggerSimpleComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/membersInjection/test.DaggerSimpleComponent_KT_FAST_INIT_MODE index db371e0c830..e5b47ba9b4d 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/membersInjection/test.DaggerSimpleComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/membersInjection/test.DaggerSimpleComponent_KT_FAST_INIT_MODE @@ -35,14 +35,14 @@ final class DaggerSimpleComponent { } public SimpleComponent build() { - return new SimpleComponentImpl(); + return new Impl(); } } - private static final class SimpleComponentImpl implements SimpleComponent { - private final SimpleComponentImpl simpleComponentImpl = this; + private static final class Impl implements SimpleComponent { + private final Impl impl = this; - SimpleComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/moduleHasGeneratedQualifier/test.DaggerTestComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/moduleHasGeneratedQualifier/test.DaggerTestComponent_DEFAULT_MODE index b881e329735..0a0dec9a314 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/moduleHasGeneratedQualifier/test.DaggerTestComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/moduleHasGeneratedQualifier/test.DaggerTestComponent_DEFAULT_MODE @@ -34,14 +34,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/moduleHasGeneratedQualifier/test.DaggerTestComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/moduleHasGeneratedQualifier/test.DaggerTestComponent_FAST_INIT_MODE index b881e329735..0a0dec9a314 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/moduleHasGeneratedQualifier/test.DaggerTestComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/moduleHasGeneratedQualifier/test.DaggerTestComponent_FAST_INIT_MODE @@ -34,14 +34,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/moduleHasGeneratedQualifier/test.DaggerTestComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/moduleHasGeneratedQualifier/test.DaggerTestComponent_KT_DEFAULT_MODE index b9dd5b10fd3..0e8ee0a6f24 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/moduleHasGeneratedQualifier/test.DaggerTestComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/moduleHasGeneratedQualifier/test.DaggerTestComponent_KT_DEFAULT_MODE @@ -34,14 +34,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/moduleHasGeneratedQualifier/test.DaggerTestComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/moduleHasGeneratedQualifier/test.DaggerTestComponent_KT_FAST_INIT_MODE index b9dd5b10fd3..0e8ee0a6f24 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/moduleHasGeneratedQualifier/test.DaggerTestComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/moduleHasGeneratedQualifier/test.DaggerTestComponent_KT_FAST_INIT_MODE @@ -34,14 +34,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/moduleNameCollision/test.DaggerTestComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/moduleNameCollision/test.DaggerTestComponent_DEFAULT_MODE index 66ffbda3f24..477b04967ae 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/moduleNameCollision/test.DaggerTestComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/moduleNameCollision/test.DaggerTestComponent_DEFAULT_MODE @@ -55,18 +55,18 @@ final class DaggerTestComponent { if (testModule2 == null) { this.testModule2 = new other.test.TestModule(); } - return new TestComponentImpl(testModule, testModule2); + return new Impl(testModule, testModule2); } } - private static final class TestComponentImpl implements TestComponent { + private static final class Impl implements TestComponent { private final TestModule testModule; private final other.test.TestModule testModule2; - private final TestComponentImpl testComponentImpl = this; + private final Impl impl = this; - TestComponentImpl(TestModule testModuleParam, other.test.TestModule testModuleParam2) { + Impl(TestModule testModuleParam, other.test.TestModule testModuleParam2) { this.testModule = testModuleParam; this.testModule2 = testModuleParam2; diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/moduleNameCollision/test.DaggerTestComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/moduleNameCollision/test.DaggerTestComponent_FAST_INIT_MODE index 66ffbda3f24..477b04967ae 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/moduleNameCollision/test.DaggerTestComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/moduleNameCollision/test.DaggerTestComponent_FAST_INIT_MODE @@ -55,18 +55,18 @@ final class DaggerTestComponent { if (testModule2 == null) { this.testModule2 = new other.test.TestModule(); } - return new TestComponentImpl(testModule, testModule2); + return new Impl(testModule, testModule2); } } - private static final class TestComponentImpl implements TestComponent { + private static final class Impl implements TestComponent { private final TestModule testModule; private final other.test.TestModule testModule2; - private final TestComponentImpl testComponentImpl = this; + private final Impl impl = this; - TestComponentImpl(TestModule testModuleParam, other.test.TestModule testModuleParam2) { + Impl(TestModule testModuleParam, other.test.TestModule testModuleParam2) { this.testModule = testModuleParam; this.testModule2 = testModuleParam2; diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/moduleNameCollision/test.DaggerTestComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/moduleNameCollision/test.DaggerTestComponent_KT_DEFAULT_MODE index b6bcfe99231..f177e829fce 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/moduleNameCollision/test.DaggerTestComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/moduleNameCollision/test.DaggerTestComponent_KT_DEFAULT_MODE @@ -55,18 +55,18 @@ final class DaggerTestComponent { if (testModule2 == null) { this.testModule2 = new other.test.TestModule(); } - return new TestComponentImpl(testModule, testModule2); + return new Impl(testModule, testModule2); } } - private static final class TestComponentImpl implements TestComponent { + private static final class Impl implements TestComponent { private final TestModule testModule; private final other.test.TestModule testModule2; - private final TestComponentImpl testComponentImpl = this; + private final Impl impl = this; - TestComponentImpl(TestModule testModuleParam, other.test.TestModule testModuleParam2) { + Impl(TestModule testModuleParam, other.test.TestModule testModuleParam2) { this.testModule = testModuleParam; this.testModule2 = testModuleParam2; diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/moduleNameCollision/test.DaggerTestComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/moduleNameCollision/test.DaggerTestComponent_KT_FAST_INIT_MODE index b6bcfe99231..f177e829fce 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/moduleNameCollision/test.DaggerTestComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/moduleNameCollision/test.DaggerTestComponent_KT_FAST_INIT_MODE @@ -55,18 +55,18 @@ final class DaggerTestComponent { if (testModule2 == null) { this.testModule2 = new other.test.TestModule(); } - return new TestComponentImpl(testModule, testModule2); + return new Impl(testModule, testModule2); } } - private static final class TestComponentImpl implements TestComponent { + private static final class Impl implements TestComponent { private final TestModule testModule; private final other.test.TestModule testModule2; - private final TestComponentImpl testComponentImpl = this; + private final Impl impl = this; - TestComponentImpl(TestModule testModuleParam, other.test.TestModule testModuleParam2) { + Impl(TestModule testModuleParam, other.test.TestModule testModuleParam2) { this.testModule = testModuleParam; this.testModule2 = testModuleParam2; diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/nullCheckingIgnoredWhenProviderReturnsPrimitive/test.DaggerTestComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/nullCheckingIgnoredWhenProviderReturnsPrimitive/test.DaggerTestComponent_DEFAULT_MODE index c2057c24fe9..aede4efc763 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/nullCheckingIgnoredWhenProviderReturnsPrimitive/test.DaggerTestComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/nullCheckingIgnoredWhenProviderReturnsPrimitive/test.DaggerTestComponent_DEFAULT_MODE @@ -35,14 +35,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/nullCheckingIgnoredWhenProviderReturnsPrimitive/test.DaggerTestComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/nullCheckingIgnoredWhenProviderReturnsPrimitive/test.DaggerTestComponent_FAST_INIT_MODE index c2057c24fe9..aede4efc763 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/nullCheckingIgnoredWhenProviderReturnsPrimitive/test.DaggerTestComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/nullCheckingIgnoredWhenProviderReturnsPrimitive/test.DaggerTestComponent_FAST_INIT_MODE @@ -35,14 +35,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/nullCheckingIgnoredWhenProviderReturnsPrimitive/test.DaggerTestComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/nullCheckingIgnoredWhenProviderReturnsPrimitive/test.DaggerTestComponent_KT_DEFAULT_MODE index 16ac0ee7e9e..ca7d9d519bc 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/nullCheckingIgnoredWhenProviderReturnsPrimitive/test.DaggerTestComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/nullCheckingIgnoredWhenProviderReturnsPrimitive/test.DaggerTestComponent_KT_DEFAULT_MODE @@ -35,14 +35,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/nullCheckingIgnoredWhenProviderReturnsPrimitive/test.DaggerTestComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/nullCheckingIgnoredWhenProviderReturnsPrimitive/test.DaggerTestComponent_KT_FAST_INIT_MODE index 16ac0ee7e9e..ca7d9d519bc 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/nullCheckingIgnoredWhenProviderReturnsPrimitive/test.DaggerTestComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/nullCheckingIgnoredWhenProviderReturnsPrimitive/test.DaggerTestComponent_KT_FAST_INIT_MODE @@ -35,14 +35,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/nullIncorrectlyReturnedFromNonNullableInlinedProvider/test.DaggerTestComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/nullIncorrectlyReturnedFromNonNullableInlinedProvider/test.DaggerTestComponent_DEFAULT_MODE index 99828bd7237..39a7775d3b2 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/nullIncorrectlyReturnedFromNonNullableInlinedProvider/test.DaggerTestComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/nullIncorrectlyReturnedFromNonNullableInlinedProvider/test.DaggerTestComponent_DEFAULT_MODE @@ -35,14 +35,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/nullIncorrectlyReturnedFromNonNullableInlinedProvider/test.DaggerTestComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/nullIncorrectlyReturnedFromNonNullableInlinedProvider/test.DaggerTestComponent_FAST_INIT_MODE index 99828bd7237..39a7775d3b2 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/nullIncorrectlyReturnedFromNonNullableInlinedProvider/test.DaggerTestComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/nullIncorrectlyReturnedFromNonNullableInlinedProvider/test.DaggerTestComponent_FAST_INIT_MODE @@ -35,14 +35,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/nullIncorrectlyReturnedFromNonNullableInlinedProvider/test.DaggerTestComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/nullIncorrectlyReturnedFromNonNullableInlinedProvider/test.DaggerTestComponent_KT_DEFAULT_MODE index 0053b31e73e..aa81c441c8b 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/nullIncorrectlyReturnedFromNonNullableInlinedProvider/test.DaggerTestComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/nullIncorrectlyReturnedFromNonNullableInlinedProvider/test.DaggerTestComponent_KT_DEFAULT_MODE @@ -35,14 +35,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/nullIncorrectlyReturnedFromNonNullableInlinedProvider/test.DaggerTestComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/nullIncorrectlyReturnedFromNonNullableInlinedProvider/test.DaggerTestComponent_KT_FAST_INIT_MODE index 0053b31e73e..aa81c441c8b 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/nullIncorrectlyReturnedFromNonNullableInlinedProvider/test.DaggerTestComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/nullIncorrectlyReturnedFromNonNullableInlinedProvider/test.DaggerTestComponent_KT_FAST_INIT_MODE @@ -35,14 +35,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/primitiveComponentDependency/test.DaggerBComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/primitiveComponentDependency/test.DaggerBComponent_DEFAULT_MODE index e67d3d7203c..294593e40a7 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/primitiveComponentDependency/test.DaggerBComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/primitiveComponentDependency/test.DaggerBComponent_DEFAULT_MODE @@ -40,16 +40,16 @@ final class DaggerBComponent { public BComponent build() { Preconditions.checkBuilderRequirement(intComponent, IntComponent.class); - return new BComponentImpl(intComponent); + return new Impl(intComponent); } } - private static final class BComponentImpl implements BComponent { - private final BComponentImpl bComponentImpl = this; + private static final class Impl implements BComponent { + private final Impl impl = this; Provider iProvider; - BComponentImpl(IntComponent intComponentParam) { + Impl(IntComponent intComponentParam) { initialize(intComponentParam); diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/primitiveComponentDependency/test.DaggerBComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/primitiveComponentDependency/test.DaggerBComponent_FAST_INIT_MODE index c2ad0e98b28..5f3ccfcb69c 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/primitiveComponentDependency/test.DaggerBComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/primitiveComponentDependency/test.DaggerBComponent_FAST_INIT_MODE @@ -40,18 +40,18 @@ final class DaggerBComponent { public BComponent build() { Preconditions.checkBuilderRequirement(intComponent, IntComponent.class); - return new BComponentImpl(intComponent); + return new Impl(intComponent); } } - private static final class BComponentImpl implements BComponent { + private static final class Impl implements BComponent { private final IntComponent intComponent; - private final BComponentImpl bComponentImpl = this; + private final Impl impl = this; Provider iProvider; - BComponentImpl(IntComponent intComponentParam) { + Impl(IntComponent intComponentParam) { this.intComponent = intComponentParam; initialize(intComponentParam); @@ -59,7 +59,7 @@ final class DaggerBComponent { @SuppressWarnings("unchecked") private void initialize(final IntComponent intComponentParam) { - this.iProvider = new SwitchingProvider<>(bComponentImpl, 0); + this.iProvider = new SwitchingProvider<>(impl, 0); } @Override @@ -68,12 +68,12 @@ final class DaggerBComponent { } private static final class SwitchingProvider implements Provider { - private final BComponentImpl bComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(BComponentImpl bComponentImpl, int id) { - this.bComponentImpl = bComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } @@ -82,7 +82,7 @@ final class DaggerBComponent { public T get() { switch (id) { case 0: // java.lang.Integer - return (T) (Integer) (bComponentImpl.intComponent.i()); + return (T) (Integer) (impl.intComponent.i()); default: throw new AssertionError(id); } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/primitiveComponentDependency/test.DaggerBComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/primitiveComponentDependency/test.DaggerBComponent_KT_DEFAULT_MODE index 71da868a42c..b1ec18e92b1 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/primitiveComponentDependency/test.DaggerBComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/primitiveComponentDependency/test.DaggerBComponent_KT_DEFAULT_MODE @@ -40,19 +40,19 @@ final class DaggerBComponent { public BComponent build() { Preconditions.checkBuilderRequirement(intComponent, IntComponent.class); - return new BComponentImpl(intComponent); + return new Impl(intComponent); } } - private static final class BComponentImpl implements BComponent { - private final BComponentImpl bComponentImpl = this; + private static final class Impl implements BComponent { + private final Impl impl = this; /** * {@code Provider} */ Provider iProvider; - BComponentImpl(IntComponent intComponentParam) { + Impl(IntComponent intComponentParam) { initialize(intComponentParam); diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/primitiveComponentDependency/test.DaggerBComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/primitiveComponentDependency/test.DaggerBComponent_KT_FAST_INIT_MODE index 352784dc033..05793fe69d2 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/primitiveComponentDependency/test.DaggerBComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/primitiveComponentDependency/test.DaggerBComponent_KT_FAST_INIT_MODE @@ -40,21 +40,21 @@ final class DaggerBComponent { public BComponent build() { Preconditions.checkBuilderRequirement(intComponent, IntComponent.class); - return new BComponentImpl(intComponent); + return new Impl(intComponent); } } - private static final class BComponentImpl implements BComponent { + private static final class Impl implements BComponent { private final IntComponent intComponent; - private final BComponentImpl bComponentImpl = this; + private final Impl impl = this; /** * {@code Provider} */ Provider iProvider; - BComponentImpl(IntComponent intComponentParam) { + Impl(IntComponent intComponentParam) { this.intComponent = intComponentParam; initialize(intComponentParam); @@ -62,7 +62,7 @@ final class DaggerBComponent { @SuppressWarnings("unchecked") private void initialize(final IntComponent intComponentParam) { - this.iProvider = new SwitchingProvider<>(bComponentImpl, 0); + this.iProvider = new SwitchingProvider<>(impl, 0); } @Override @@ -71,12 +71,12 @@ final class DaggerBComponent { } private static final class SwitchingProvider implements Provider { - private final BComponentImpl bComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(BComponentImpl bComponentImpl, int id) { - this.bComponentImpl = bComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } @@ -85,7 +85,7 @@ final class DaggerBComponent { public T get() { switch (id) { case 0: // java.lang.Integer - return (T) (Integer) (bComponentImpl.intComponent.i()); + return (T) (Integer) (impl.intComponent.i()); default: throw new AssertionError(id); } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/privateMethodUsedOnlyInChildDoesNotUseQualifiedThis/test.DaggerParent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/privateMethodUsedOnlyInChildDoesNotUseQualifiedThis/test.DaggerParent_DEFAULT_MODE index d00effa1947..80e2c9a9be3 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/privateMethodUsedOnlyInChildDoesNotUseQualifiedThis/test.DaggerParent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/privateMethodUsedOnlyInChildDoesNotUseQualifiedThis/test.DaggerParent_DEFAULT_MODE @@ -36,33 +36,33 @@ final class DaggerParent { } public Parent build() { - return new ParentImpl(); + return new Impl(); } } private static final class ChildImpl implements Child { - private final ParentImpl parentImpl; + private final Impl impl; private final ChildImpl childImpl = this; - ChildImpl(ParentImpl parentImpl) { - this.parentImpl = parentImpl; + ChildImpl(Impl impl) { + this.impl = impl; } @Override public String string() { - return parentImpl.string(); + return impl.string(); } } - private static final class ParentImpl implements Parent { - private final ParentImpl parentImpl = this; + private static final class Impl implements Parent { + private final Impl impl = this; Provider numberProvider; - ParentImpl() { + Impl() { initialize(); @@ -79,7 +79,7 @@ final class DaggerParent { @Override public Child child() { - return new ChildImpl(parentImpl); + return new ChildImpl(impl); } } } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/privateMethodUsedOnlyInChildDoesNotUseQualifiedThis/test.DaggerParent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/privateMethodUsedOnlyInChildDoesNotUseQualifiedThis/test.DaggerParent_FAST_INIT_MODE index 94b08bc7343..2fa69a4dca6 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/privateMethodUsedOnlyInChildDoesNotUseQualifiedThis/test.DaggerParent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/privateMethodUsedOnlyInChildDoesNotUseQualifiedThis/test.DaggerParent_FAST_INIT_MODE @@ -36,33 +36,33 @@ final class DaggerParent { } public Parent build() { - return new ParentImpl(); + return new Impl(); } } private static final class ChildImpl implements Child { - private final ParentImpl parentImpl; + private final Impl impl; private final ChildImpl childImpl = this; - ChildImpl(ParentImpl parentImpl) { - this.parentImpl = parentImpl; + ChildImpl(Impl impl) { + this.impl = impl; } @Override public String string() { - return parentImpl.string(); + return impl.string(); } } - private static final class ParentImpl implements Parent { - private final ParentImpl parentImpl = this; + private static final class Impl implements Parent { + private final Impl impl = this; Provider numberProvider; - ParentImpl() { + Impl() { initialize(); @@ -74,21 +74,21 @@ final class DaggerParent { @SuppressWarnings("unchecked") private void initialize() { - this.numberProvider = DoubleCheck.provider(new SwitchingProvider(parentImpl, 0)); + this.numberProvider = DoubleCheck.provider(new SwitchingProvider(impl, 0)); } @Override public Child child() { - return new ChildImpl(parentImpl); + return new ChildImpl(impl); } private static final class SwitchingProvider implements Provider { - private final ParentImpl parentImpl; + private final Impl impl; private final int id; - SwitchingProvider(ParentImpl parentImpl, int id) { - this.parentImpl = parentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/privateMethodUsedOnlyInChildDoesNotUseQualifiedThis/test.DaggerParent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/privateMethodUsedOnlyInChildDoesNotUseQualifiedThis/test.DaggerParent_KT_DEFAULT_MODE index 8db0f834ce8..dad3deab9da 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/privateMethodUsedOnlyInChildDoesNotUseQualifiedThis/test.DaggerParent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/privateMethodUsedOnlyInChildDoesNotUseQualifiedThis/test.DaggerParent_KT_DEFAULT_MODE @@ -36,36 +36,36 @@ final class DaggerParent { } public Parent build() { - return new ParentImpl(); + return new Impl(); } } private static final class ChildImpl implements Child { - private final ParentImpl parentImpl; + private final Impl impl; private final ChildImpl childImpl = this; - ChildImpl(ParentImpl parentImpl) { - this.parentImpl = parentImpl; + ChildImpl(Impl impl) { + this.impl = impl; } @Override public String string() { - return (String) ((Object) (parentImpl.string())); + return (String) ((Object) (impl.string())); } } - private static final class ParentImpl implements Parent { - private final ParentImpl parentImpl = this; + private static final class Impl implements Parent { + private final Impl impl = this; /** * {@code Provider} */ Provider numberProvider; - ParentImpl() { + Impl() { initialize(); @@ -82,7 +82,7 @@ final class DaggerParent { @Override public Child child() { - return new ChildImpl(parentImpl); + return new ChildImpl(impl); } } } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/privateMethodUsedOnlyInChildDoesNotUseQualifiedThis/test.DaggerParent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/privateMethodUsedOnlyInChildDoesNotUseQualifiedThis/test.DaggerParent_KT_FAST_INIT_MODE index 1654c2bdc22..f039dc7a4e3 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/privateMethodUsedOnlyInChildDoesNotUseQualifiedThis/test.DaggerParent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/privateMethodUsedOnlyInChildDoesNotUseQualifiedThis/test.DaggerParent_KT_FAST_INIT_MODE @@ -36,36 +36,36 @@ final class DaggerParent { } public Parent build() { - return new ParentImpl(); + return new Impl(); } } private static final class ChildImpl implements Child { - private final ParentImpl parentImpl; + private final Impl impl; private final ChildImpl childImpl = this; - ChildImpl(ParentImpl parentImpl) { - this.parentImpl = parentImpl; + ChildImpl(Impl impl) { + this.impl = impl; } @Override public String string() { - return (String) ((Object) (parentImpl.string())); + return (String) ((Object) (impl.string())); } } - private static final class ParentImpl implements Parent { - private final ParentImpl parentImpl = this; + private static final class Impl implements Parent { + private final Impl impl = this; /** * {@code Provider} */ Provider numberProvider; - ParentImpl() { + Impl() { initialize(); @@ -77,21 +77,21 @@ final class DaggerParent { @SuppressWarnings("unchecked") private void initialize() { - this.numberProvider = DoubleCheck.provider(new SwitchingProvider<>(parentImpl, 0)); + this.numberProvider = DoubleCheck.provider(new SwitchingProvider<>(impl, 0)); } @Override public Child child() { - return new ChildImpl(parentImpl); + return new ChildImpl(impl); } private static final class SwitchingProvider implements Provider { - private final ParentImpl parentImpl; + private final Impl impl; private final int id; - SwitchingProvider(ParentImpl parentImpl, int id) { - this.parentImpl = parentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/providerComponentType/test.DaggerTestComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/providerComponentType/test.DaggerTestComponent_DEFAULT_MODE index 8b87e6daab3..2ebd1936e52 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/providerComponentType/test.DaggerTestComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/providerComponentType/test.DaggerTestComponent_DEFAULT_MODE @@ -35,16 +35,16 @@ public final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; Provider fooProvider; - TestComponentImpl() { + Impl() { initialize(); diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/providerComponentType/test.DaggerTestComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/providerComponentType/test.DaggerTestComponent_FAST_INIT_MODE index 14d24824635..0e8eb61db72 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/providerComponentType/test.DaggerTestComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/providerComponentType/test.DaggerTestComponent_FAST_INIT_MODE @@ -35,16 +35,16 @@ public final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; Provider fooProvider; - TestComponentImpl() { + Impl() { initialize(); @@ -52,7 +52,7 @@ public final class DaggerTestComponent { @SuppressWarnings("unchecked") private void initialize() { - this.fooProvider = new SwitchingProvider<>(testComponentImpl, 0); + this.fooProvider = new SwitchingProvider<>(impl, 0); } @Override @@ -61,12 +61,12 @@ public final class DaggerTestComponent { } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/providerComponentType/test.DaggerTestComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/providerComponentType/test.DaggerTestComponent_KT_DEFAULT_MODE index 1968e001b1e..81672294c18 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/providerComponentType/test.DaggerTestComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/providerComponentType/test.DaggerTestComponent_KT_DEFAULT_MODE @@ -35,19 +35,19 @@ public final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; /** - * {@code Provider} - */ + * {@code Provider} + */ Provider fooProvider; - TestComponentImpl() { + Impl() { initialize(); diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/providerComponentType/test.DaggerTestComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/providerComponentType/test.DaggerTestComponent_KT_FAST_INIT_MODE index b343dfb9556..c4257eb5983 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/providerComponentType/test.DaggerTestComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/providerComponentType/test.DaggerTestComponent_KT_FAST_INIT_MODE @@ -35,19 +35,19 @@ public final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; /** * {@code Provider} */ Provider fooProvider; - TestComponentImpl() { + Impl() { initialize(); @@ -55,7 +55,7 @@ public final class DaggerTestComponent { @SuppressWarnings("unchecked") private void initialize() { - this.fooProvider = new SwitchingProvider<>(testComponentImpl, 0); + this.fooProvider = new SwitchingProvider<>(impl, 0); } @Override @@ -64,12 +64,12 @@ public final class DaggerTestComponent { } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/publicComponentType/test.DaggerPublicComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/publicComponentType/test.DaggerPublicComponent_DEFAULT_MODE index b3fd884b081..ab322acc024 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/publicComponentType/test.DaggerPublicComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/publicComponentType/test.DaggerPublicComponent_DEFAULT_MODE @@ -34,14 +34,14 @@ public final class DaggerPublicComponent { } public PublicComponent build() { - return new PublicComponentImpl(); + return new Impl(); } } - private static final class PublicComponentImpl implements PublicComponent { - private final PublicComponentImpl publicComponentImpl = this; + private static final class Impl implements PublicComponent { + private final Impl impl = this; - PublicComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/publicComponentType/test.DaggerPublicComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/publicComponentType/test.DaggerPublicComponent_FAST_INIT_MODE index b3fd884b081..ab322acc024 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/publicComponentType/test.DaggerPublicComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/publicComponentType/test.DaggerPublicComponent_FAST_INIT_MODE @@ -34,14 +34,14 @@ public final class DaggerPublicComponent { } public PublicComponent build() { - return new PublicComponentImpl(); + return new Impl(); } } - private static final class PublicComponentImpl implements PublicComponent { - private final PublicComponentImpl publicComponentImpl = this; + private static final class Impl implements PublicComponent { + private final Impl impl = this; - PublicComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/publicComponentType/test.DaggerPublicComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/publicComponentType/test.DaggerPublicComponent_KT_DEFAULT_MODE index b3fd884b081..ab322acc024 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/publicComponentType/test.DaggerPublicComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/publicComponentType/test.DaggerPublicComponent_KT_DEFAULT_MODE @@ -34,14 +34,14 @@ public final class DaggerPublicComponent { } public PublicComponent build() { - return new PublicComponentImpl(); + return new Impl(); } } - private static final class PublicComponentImpl implements PublicComponent { - private final PublicComponentImpl publicComponentImpl = this; + private static final class Impl implements PublicComponent { + private final Impl impl = this; - PublicComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/publicComponentType/test.DaggerPublicComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/publicComponentType/test.DaggerPublicComponent_KT_FAST_INIT_MODE index b3fd884b081..ab322acc024 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/publicComponentType/test.DaggerPublicComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/publicComponentType/test.DaggerPublicComponent_KT_FAST_INIT_MODE @@ -34,14 +34,14 @@ public final class DaggerPublicComponent { } public PublicComponent build() { - return new PublicComponentImpl(); + return new Impl(); } } - private static final class PublicComponentImpl implements PublicComponent { - private final PublicComponentImpl publicComponentImpl = this; + private static final class Impl implements PublicComponent { + private final Impl impl = this; - PublicComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/resolutionOrder/test.DaggerTestComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/resolutionOrder/test.DaggerTestComponent_DEFAULT_MODE index cbeca9a6de1..8f23cbe6a78 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/resolutionOrder/test.DaggerTestComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/resolutionOrder/test.DaggerTestComponent_DEFAULT_MODE @@ -34,14 +34,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/resolutionOrder/test.DaggerTestComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/resolutionOrder/test.DaggerTestComponent_FAST_INIT_MODE index cbeca9a6de1..8f23cbe6a78 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/resolutionOrder/test.DaggerTestComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/resolutionOrder/test.DaggerTestComponent_FAST_INIT_MODE @@ -34,14 +34,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/resolutionOrder/test.DaggerTestComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/resolutionOrder/test.DaggerTestComponent_KT_DEFAULT_MODE index eaadad3e4c0..72d340d1d64 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/resolutionOrder/test.DaggerTestComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/resolutionOrder/test.DaggerTestComponent_KT_DEFAULT_MODE @@ -34,14 +34,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/resolutionOrder/test.DaggerTestComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/resolutionOrder/test.DaggerTestComponent_KT_FAST_INIT_MODE index eaadad3e4c0..72d340d1d64 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/resolutionOrder/test.DaggerTestComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/resolutionOrder/test.DaggerTestComponent_KT_FAST_INIT_MODE @@ -34,14 +34,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/simpleComponent/test.DaggerSimpleComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/simpleComponent/test.DaggerSimpleComponent_DEFAULT_MODE index abb01cca440..c64a116400a 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/simpleComponent/test.DaggerSimpleComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/simpleComponent/test.DaggerSimpleComponent_DEFAULT_MODE @@ -37,14 +37,14 @@ final class DaggerSimpleComponent { } public SimpleComponent build() { - return new SimpleComponentImpl(); + return new Impl(); } } - private static final class SimpleComponentImpl implements SimpleComponent { - private final SimpleComponentImpl simpleComponentImpl = this; + private static final class Impl implements SimpleComponent { + private final Impl impl = this; - SimpleComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/simpleComponent/test.DaggerSimpleComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/simpleComponent/test.DaggerSimpleComponent_FAST_INIT_MODE index 4d0b31483f2..9ccf4534c55 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/simpleComponent/test.DaggerSimpleComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/simpleComponent/test.DaggerSimpleComponent_FAST_INIT_MODE @@ -37,16 +37,16 @@ final class DaggerSimpleComponent { } public SimpleComponent build() { - return new SimpleComponentImpl(); + return new Impl(); } } - private static final class SimpleComponentImpl implements SimpleComponent { - private final SimpleComponentImpl simpleComponentImpl = this; + private static final class Impl implements SimpleComponent { + private final Impl impl = this; Provider someInjectableTypeProvider; - SimpleComponentImpl() { + Impl() { initialize(); @@ -54,7 +54,7 @@ final class DaggerSimpleComponent { @SuppressWarnings("unchecked") private void initialize() { - this.someInjectableTypeProvider = new SwitchingProvider<>(simpleComponentImpl, 0); + this.someInjectableTypeProvider = new SwitchingProvider<>(impl, 0); } @Override @@ -73,12 +73,12 @@ final class DaggerSimpleComponent { } private static final class SwitchingProvider implements Provider { - private final SimpleComponentImpl simpleComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(SimpleComponentImpl simpleComponentImpl, int id) { - this.simpleComponentImpl = simpleComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/simpleComponent/test.DaggerSimpleComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/simpleComponent/test.DaggerSimpleComponent_KT_DEFAULT_MODE index 22f5089650e..625e97de452 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/simpleComponent/test.DaggerSimpleComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/simpleComponent/test.DaggerSimpleComponent_KT_DEFAULT_MODE @@ -37,14 +37,14 @@ final class DaggerSimpleComponent { } public SimpleComponent build() { - return new SimpleComponentImpl(); + return new Impl(); } } - private static final class SimpleComponentImpl implements SimpleComponent { - private final SimpleComponentImpl simpleComponentImpl = this; + private static final class Impl implements SimpleComponent { + private final Impl impl = this; - SimpleComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/simpleComponent/test.DaggerSimpleComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/simpleComponent/test.DaggerSimpleComponent_KT_FAST_INIT_MODE index 47302a5d9f4..f4bce1443fe 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/simpleComponent/test.DaggerSimpleComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/simpleComponent/test.DaggerSimpleComponent_KT_FAST_INIT_MODE @@ -37,19 +37,19 @@ final class DaggerSimpleComponent { } public SimpleComponent build() { - return new SimpleComponentImpl(); + return new Impl(); } } - private static final class SimpleComponentImpl implements SimpleComponent { - private final SimpleComponentImpl simpleComponentImpl = this; + private static final class Impl implements SimpleComponent { + private final Impl impl = this; /** * {@code Provider} */ Provider someInjectableTypeProvider; - SimpleComponentImpl() { + Impl() { initialize(); @@ -57,7 +57,7 @@ final class DaggerSimpleComponent { @SuppressWarnings("unchecked") private void initialize() { - this.someInjectableTypeProvider = new SwitchingProvider<>(simpleComponentImpl, 0); + this.someInjectableTypeProvider = new SwitchingProvider<>(impl, 0); } @Override @@ -76,12 +76,12 @@ final class DaggerSimpleComponent { } private static final class SwitchingProvider implements Provider { - private final SimpleComponentImpl simpleComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(SimpleComponentImpl simpleComponentImpl, int id) { - this.simpleComponentImpl = simpleComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/simpleComponentWithNesting/test.DaggerOuterType_SimpleComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/simpleComponentWithNesting/test.DaggerOuterType_SimpleComponent_DEFAULT_MODE index aefde4312f7..90b4f53169a 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/simpleComponentWithNesting/test.DaggerOuterType_SimpleComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/simpleComponentWithNesting/test.DaggerOuterType_SimpleComponent_DEFAULT_MODE @@ -35,14 +35,14 @@ final class DaggerOuterType_SimpleComponent { } public OuterType.SimpleComponent build() { - return new SimpleComponentImpl(); + return new Impl(); } } - private static final class SimpleComponentImpl implements OuterType.SimpleComponent { - private final SimpleComponentImpl simpleComponentImpl = this; + private static final class Impl implements OuterType.SimpleComponent { + private final Impl impl = this; - SimpleComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/simpleComponentWithNesting/test.DaggerOuterType_SimpleComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/simpleComponentWithNesting/test.DaggerOuterType_SimpleComponent_FAST_INIT_MODE index aefde4312f7..90b4f53169a 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/simpleComponentWithNesting/test.DaggerOuterType_SimpleComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/simpleComponentWithNesting/test.DaggerOuterType_SimpleComponent_FAST_INIT_MODE @@ -35,14 +35,14 @@ final class DaggerOuterType_SimpleComponent { } public OuterType.SimpleComponent build() { - return new SimpleComponentImpl(); + return new Impl(); } } - private static final class SimpleComponentImpl implements OuterType.SimpleComponent { - private final SimpleComponentImpl simpleComponentImpl = this; + private static final class Impl implements OuterType.SimpleComponent { + private final Impl impl = this; - SimpleComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/simpleComponentWithNesting/test.DaggerOuterType_SimpleComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/simpleComponentWithNesting/test.DaggerOuterType_SimpleComponent_KT_DEFAULT_MODE index cb27937355c..01286ca287a 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/simpleComponentWithNesting/test.DaggerOuterType_SimpleComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/simpleComponentWithNesting/test.DaggerOuterType_SimpleComponent_KT_DEFAULT_MODE @@ -35,14 +35,14 @@ final class DaggerOuterType_SimpleComponent { } public OuterType.SimpleComponent build() { - return new SimpleComponentImpl(); + return new Impl(); } } - private static final class SimpleComponentImpl implements OuterType.SimpleComponent { - private final SimpleComponentImpl simpleComponentImpl = this; + private static final class Impl implements OuterType.SimpleComponent { + private final Impl impl = this; - SimpleComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/simpleComponentWithNesting/test.DaggerOuterType_SimpleComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/simpleComponentWithNesting/test.DaggerOuterType_SimpleComponent_KT_FAST_INIT_MODE index cb27937355c..01286ca287a 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/simpleComponentWithNesting/test.DaggerOuterType_SimpleComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/simpleComponentWithNesting/test.DaggerOuterType_SimpleComponent_KT_FAST_INIT_MODE @@ -35,14 +35,14 @@ final class DaggerOuterType_SimpleComponent { } public OuterType.SimpleComponent build() { - return new SimpleComponentImpl(); + return new Impl(); } } - private static final class SimpleComponentImpl implements OuterType.SimpleComponent { - private final SimpleComponentImpl simpleComponentImpl = this; + private static final class Impl implements OuterType.SimpleComponent { + private final Impl impl = this; - SimpleComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/simpleComponent_inheritedComponentMethodDep/test.DaggerSimpleComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/simpleComponent_inheritedComponentMethodDep/test.DaggerSimpleComponent_DEFAULT_MODE index 6cea6ee4a9c..63a968bca8c 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/simpleComponent_inheritedComponentMethodDep/test.DaggerSimpleComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/simpleComponent_inheritedComponentMethodDep/test.DaggerSimpleComponent_DEFAULT_MODE @@ -34,14 +34,14 @@ final class DaggerSimpleComponent { } public SimpleComponent build() { - return new SimpleComponentImpl(); + return new Impl(); } } - private static final class SimpleComponentImpl implements SimpleComponent { - private final SimpleComponentImpl simpleComponentImpl = this; + private static final class Impl implements SimpleComponent { + private final Impl impl = this; - SimpleComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/simpleComponent_inheritedComponentMethodDep/test.DaggerSimpleComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/simpleComponent_inheritedComponentMethodDep/test.DaggerSimpleComponent_FAST_INIT_MODE index 6cea6ee4a9c..63a968bca8c 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/simpleComponent_inheritedComponentMethodDep/test.DaggerSimpleComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/simpleComponent_inheritedComponentMethodDep/test.DaggerSimpleComponent_FAST_INIT_MODE @@ -34,14 +34,14 @@ final class DaggerSimpleComponent { } public SimpleComponent build() { - return new SimpleComponentImpl(); + return new Impl(); } } - private static final class SimpleComponentImpl implements SimpleComponent { - private final SimpleComponentImpl simpleComponentImpl = this; + private static final class Impl implements SimpleComponent { + private final Impl impl = this; - SimpleComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/simpleComponent_inheritedComponentMethodDep/test.DaggerSimpleComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/simpleComponent_inheritedComponentMethodDep/test.DaggerSimpleComponent_KT_DEFAULT_MODE index 550ebf01409..7158a5a0f93 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/simpleComponent_inheritedComponentMethodDep/test.DaggerSimpleComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/simpleComponent_inheritedComponentMethodDep/test.DaggerSimpleComponent_KT_DEFAULT_MODE @@ -34,14 +34,14 @@ final class DaggerSimpleComponent { } public SimpleComponent build() { - return new SimpleComponentImpl(); + return new Impl(); } } - private static final class SimpleComponentImpl implements SimpleComponent { - private final SimpleComponentImpl simpleComponentImpl = this; + private static final class Impl implements SimpleComponent { + private final Impl impl = this; - SimpleComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/simpleComponent_inheritedComponentMethodDep/test.DaggerSimpleComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/simpleComponent_inheritedComponentMethodDep/test.DaggerSimpleComponent_KT_FAST_INIT_MODE index 550ebf01409..7158a5a0f93 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/simpleComponent_inheritedComponentMethodDep/test.DaggerSimpleComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/simpleComponent_inheritedComponentMethodDep/test.DaggerSimpleComponent_KT_FAST_INIT_MODE @@ -34,14 +34,14 @@ final class DaggerSimpleComponent { } public SimpleComponent build() { - return new SimpleComponentImpl(); + return new Impl(); } } - private static final class SimpleComponentImpl implements SimpleComponent { - private final SimpleComponentImpl simpleComponentImpl = this; + private static final class Impl implements SimpleComponent { + private final Impl impl = this; - SimpleComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/simpleComponent_redundantComponentMethod/test.DaggerSimpleComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/simpleComponent_redundantComponentMethod/test.DaggerSimpleComponent_DEFAULT_MODE index 6cea6ee4a9c..63a968bca8c 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/simpleComponent_redundantComponentMethod/test.DaggerSimpleComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/simpleComponent_redundantComponentMethod/test.DaggerSimpleComponent_DEFAULT_MODE @@ -34,14 +34,14 @@ final class DaggerSimpleComponent { } public SimpleComponent build() { - return new SimpleComponentImpl(); + return new Impl(); } } - private static final class SimpleComponentImpl implements SimpleComponent { - private final SimpleComponentImpl simpleComponentImpl = this; + private static final class Impl implements SimpleComponent { + private final Impl impl = this; - SimpleComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/simpleComponent_redundantComponentMethod/test.DaggerSimpleComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/simpleComponent_redundantComponentMethod/test.DaggerSimpleComponent_FAST_INIT_MODE index 6cea6ee4a9c..63a968bca8c 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/simpleComponent_redundantComponentMethod/test.DaggerSimpleComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/simpleComponent_redundantComponentMethod/test.DaggerSimpleComponent_FAST_INIT_MODE @@ -34,14 +34,14 @@ final class DaggerSimpleComponent { } public SimpleComponent build() { - return new SimpleComponentImpl(); + return new Impl(); } } - private static final class SimpleComponentImpl implements SimpleComponent { - private final SimpleComponentImpl simpleComponentImpl = this; + private static final class Impl implements SimpleComponent { + private final Impl impl = this; - SimpleComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/simpleComponent_redundantComponentMethod/test.DaggerSimpleComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/simpleComponent_redundantComponentMethod/test.DaggerSimpleComponent_KT_DEFAULT_MODE index 550ebf01409..7158a5a0f93 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/simpleComponent_redundantComponentMethod/test.DaggerSimpleComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/simpleComponent_redundantComponentMethod/test.DaggerSimpleComponent_KT_DEFAULT_MODE @@ -34,14 +34,14 @@ final class DaggerSimpleComponent { } public SimpleComponent build() { - return new SimpleComponentImpl(); + return new Impl(); } } - private static final class SimpleComponentImpl implements SimpleComponent { - private final SimpleComponentImpl simpleComponentImpl = this; + private static final class Impl implements SimpleComponent { + private final Impl impl = this; - SimpleComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/simpleComponent_redundantComponentMethod/test.DaggerSimpleComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/simpleComponent_redundantComponentMethod/test.DaggerSimpleComponent_KT_FAST_INIT_MODE index 550ebf01409..7158a5a0f93 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/simpleComponent_redundantComponentMethod/test.DaggerSimpleComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/simpleComponent_redundantComponentMethod/test.DaggerSimpleComponent_KT_FAST_INIT_MODE @@ -34,14 +34,14 @@ final class DaggerSimpleComponent { } public SimpleComponent build() { - return new SimpleComponentImpl(); + return new Impl(); } } - private static final class SimpleComponentImpl implements SimpleComponent { - private final SimpleComponentImpl simpleComponentImpl = this; + private static final class Impl implements SimpleComponent { + private final Impl impl = this; - SimpleComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/subcomponentNotGeneratedIfNotUsedInGraph/test.DaggerParent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/subcomponentNotGeneratedIfNotUsedInGraph/test.DaggerParent_DEFAULT_MODE index 22f465ea852..368c7e4f15b 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/subcomponentNotGeneratedIfNotUsedInGraph/test.DaggerParent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/subcomponentNotGeneratedIfNotUsedInGraph/test.DaggerParent_DEFAULT_MODE @@ -34,14 +34,14 @@ final class DaggerParent { } public Parent build() { - return new ParentImpl(); + return new Impl(); } } - private static final class ParentImpl implements Parent { - private final ParentImpl parentImpl = this; + private static final class Impl implements Parent { + private final Impl impl = this; - ParentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/subcomponentNotGeneratedIfNotUsedInGraph/test.DaggerParent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/subcomponentNotGeneratedIfNotUsedInGraph/test.DaggerParent_FAST_INIT_MODE index 22f465ea852..368c7e4f15b 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/subcomponentNotGeneratedIfNotUsedInGraph/test.DaggerParent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/subcomponentNotGeneratedIfNotUsedInGraph/test.DaggerParent_FAST_INIT_MODE @@ -34,14 +34,14 @@ final class DaggerParent { } public Parent build() { - return new ParentImpl(); + return new Impl(); } } - private static final class ParentImpl implements Parent { - private final ParentImpl parentImpl = this; + private static final class Impl implements Parent { + private final Impl impl = this; - ParentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/subcomponentNotGeneratedIfNotUsedInGraph/test.DaggerParent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/subcomponentNotGeneratedIfNotUsedInGraph/test.DaggerParent_KT_DEFAULT_MODE index 8f172618207..c68699362c2 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/subcomponentNotGeneratedIfNotUsedInGraph/test.DaggerParent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/subcomponentNotGeneratedIfNotUsedInGraph/test.DaggerParent_KT_DEFAULT_MODE @@ -34,14 +34,14 @@ final class DaggerParent { } public Parent build() { - return new ParentImpl(); + return new Impl(); } } - private static final class ParentImpl implements Parent { - private final ParentImpl parentImpl = this; + private static final class Impl implements Parent { + private final Impl impl = this; - ParentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/subcomponentNotGeneratedIfNotUsedInGraph/test.DaggerParent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/subcomponentNotGeneratedIfNotUsedInGraph/test.DaggerParent_KT_FAST_INIT_MODE index 8f172618207..c68699362c2 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/subcomponentNotGeneratedIfNotUsedInGraph/test.DaggerParent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/subcomponentNotGeneratedIfNotUsedInGraph/test.DaggerParent_KT_FAST_INIT_MODE @@ -34,14 +34,14 @@ final class DaggerParent { } public Parent build() { - return new ParentImpl(); + return new Impl(); } } - private static final class ParentImpl implements Parent { - private final ParentImpl parentImpl = this; + private static final class Impl implements Parent { + private final Impl impl = this; - ParentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/transitiveModuleDeps/test.DaggerTestComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/transitiveModuleDeps/test.DaggerTestComponent_DEFAULT_MODE index f8dd2b9556c..5d19c0a7a8d 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/transitiveModuleDeps/test.DaggerTestComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/transitiveModuleDeps/test.DaggerTestComponent_DEFAULT_MODE @@ -34,14 +34,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/transitiveModuleDeps/test.DaggerTestComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/transitiveModuleDeps/test.DaggerTestComponent_FAST_INIT_MODE index f8dd2b9556c..5d19c0a7a8d 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/transitiveModuleDeps/test.DaggerTestComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/transitiveModuleDeps/test.DaggerTestComponent_FAST_INIT_MODE @@ -34,14 +34,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/transitiveModuleDeps/test.DaggerTestComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/transitiveModuleDeps/test.DaggerTestComponent_KT_DEFAULT_MODE index f8dd2b9556c..5d19c0a7a8d 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/transitiveModuleDeps/test.DaggerTestComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/transitiveModuleDeps/test.DaggerTestComponent_KT_DEFAULT_MODE @@ -34,14 +34,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/transitiveModuleDeps/test.DaggerTestComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/transitiveModuleDeps/test.DaggerTestComponent_KT_FAST_INIT_MODE index f8dd2b9556c..5d19c0a7a8d 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/transitiveModuleDeps/test.DaggerTestComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/transitiveModuleDeps/test.DaggerTestComponent_KT_FAST_INIT_MODE @@ -34,14 +34,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/unusedSubcomponents_dontResolveExtraBindingsInParentComponents/test.DaggerParent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/unusedSubcomponents_dontResolveExtraBindingsInParentComponents/test.DaggerParent_DEFAULT_MODE index 832529e1755..3b71eb63a56 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/unusedSubcomponents_dontResolveExtraBindingsInParentComponents/test.DaggerParent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/unusedSubcomponents_dontResolveExtraBindingsInParentComponents/test.DaggerParent_DEFAULT_MODE @@ -34,14 +34,14 @@ final class DaggerParent { } public Parent build() { - return new ParentImpl(); + return new Impl(); } } - private static final class ParentImpl implements Parent { - private final ParentImpl parentImpl = this; + private static final class Impl implements Parent { + private final Impl impl = this; - ParentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/unusedSubcomponents_dontResolveExtraBindingsInParentComponents/test.DaggerParent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/unusedSubcomponents_dontResolveExtraBindingsInParentComponents/test.DaggerParent_FAST_INIT_MODE index 832529e1755..3b71eb63a56 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/unusedSubcomponents_dontResolveExtraBindingsInParentComponents/test.DaggerParent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/unusedSubcomponents_dontResolveExtraBindingsInParentComponents/test.DaggerParent_FAST_INIT_MODE @@ -34,14 +34,14 @@ final class DaggerParent { } public Parent build() { - return new ParentImpl(); + return new Impl(); } } - private static final class ParentImpl implements Parent { - private final ParentImpl parentImpl = this; + private static final class Impl implements Parent { + private final Impl impl = this; - ParentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/unusedSubcomponents_dontResolveExtraBindingsInParentComponents/test.DaggerParent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/unusedSubcomponents_dontResolveExtraBindingsInParentComponents/test.DaggerParent_KT_DEFAULT_MODE index 832529e1755..3b71eb63a56 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/unusedSubcomponents_dontResolveExtraBindingsInParentComponents/test.DaggerParent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/unusedSubcomponents_dontResolveExtraBindingsInParentComponents/test.DaggerParent_KT_DEFAULT_MODE @@ -34,14 +34,14 @@ final class DaggerParent { } public Parent build() { - return new ParentImpl(); + return new Impl(); } } - private static final class ParentImpl implements Parent { - private final ParentImpl parentImpl = this; + private static final class Impl implements Parent { + private final Impl impl = this; - ParentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/unusedSubcomponents_dontResolveExtraBindingsInParentComponents/test.DaggerParent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/unusedSubcomponents_dontResolveExtraBindingsInParentComponents/test.DaggerParent_KT_FAST_INIT_MODE index 832529e1755..3b71eb63a56 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/unusedSubcomponents_dontResolveExtraBindingsInParentComponents/test.DaggerParent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest/unusedSubcomponents_dontResolveExtraBindingsInParentComponents/test.DaggerParent_KT_FAST_INIT_MODE @@ -34,14 +34,14 @@ final class DaggerParent { } public Parent build() { - return new ParentImpl(); + return new Impl(); } } - private static final class ParentImpl implements Parent { - private final ParentImpl parentImpl = this; + private static final class Impl implements Parent { + private final Impl impl = this; - ParentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProtectedTypeTest/componentAccessesProtectedType_succeeds/test.DaggerTestComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProtectedTypeTest/componentAccessesProtectedType_succeeds/test.DaggerTestComponent_DEFAULT_MODE index 4784cf30a9b..f39f5dd16ae 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProtectedTypeTest/componentAccessesProtectedType_succeeds/test.DaggerTestComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProtectedTypeTest/componentAccessesProtectedType_succeeds/test.DaggerTestComponent_DEFAULT_MODE @@ -38,17 +38,17 @@ public final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl extends TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl extends TestComponent { + private final Impl impl = this; @SuppressWarnings("rawtypes") Provider protectedTypeProvider; - TestComponentImpl() { + Impl() { initialize(); diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProtectedTypeTest/componentAccessesProtectedType_succeeds/test.DaggerTestComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProtectedTypeTest/componentAccessesProtectedType_succeeds/test.DaggerTestComponent_FAST_INIT_MODE index b97f61b1103..1da1c188796 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProtectedTypeTest/componentAccessesProtectedType_succeeds/test.DaggerTestComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProtectedTypeTest/componentAccessesProtectedType_succeeds/test.DaggerTestComponent_FAST_INIT_MODE @@ -38,17 +38,17 @@ public final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl extends TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl extends TestComponent { + private final Impl impl = this; @SuppressWarnings("rawtypes") Provider protectedTypeProvider; - TestComponentImpl() { + Impl() { initialize(); @@ -56,7 +56,7 @@ public final class DaggerTestComponent { @SuppressWarnings("unchecked") private void initialize() { - this.protectedTypeProvider = DoubleCheck.provider(new SwitchingProvider(testComponentImpl, 0)); + this.protectedTypeProvider = DoubleCheck.provider(new SwitchingProvider(impl, 0)); } @Override @@ -65,12 +65,12 @@ public final class DaggerTestComponent { } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProtectedTypeTest/componentAccessesProtectedType_succeeds/test.DaggerTestComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProtectedTypeTest/componentAccessesProtectedType_succeeds/test.DaggerTestComponent_KT_DEFAULT_MODE index af0a76d2430..37ef96ff324 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProtectedTypeTest/componentAccessesProtectedType_succeeds/test.DaggerTestComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProtectedTypeTest/componentAccessesProtectedType_succeeds/test.DaggerTestComponent_KT_DEFAULT_MODE @@ -38,19 +38,19 @@ public final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl extends TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl extends TestComponent { + private final Impl impl = this; /** * {@code Provider} */ Provider protectedTypeProvider; - TestComponentImpl() { + Impl() { initialize(); diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProtectedTypeTest/componentAccessesProtectedType_succeeds/test.DaggerTestComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentProtectedTypeTest/componentAccessesProtectedType_succeeds/test.DaggerTestComponent_KT_FAST_INIT_MODE index 9f894ad5206..0acc19576f7 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProtectedTypeTest/componentAccessesProtectedType_succeeds/test.DaggerTestComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentProtectedTypeTest/componentAccessesProtectedType_succeeds/test.DaggerTestComponent_KT_FAST_INIT_MODE @@ -38,19 +38,19 @@ public final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl extends TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl extends TestComponent { + private final Impl impl = this; /** * {@code Provider} */ Provider protectedTypeProvider; - TestComponentImpl() { + Impl() { initialize(); @@ -58,7 +58,7 @@ public final class DaggerTestComponent { @SuppressWarnings("unchecked") private void initialize() { - this.protectedTypeProvider = DoubleCheck.provider(new SwitchingProvider<>(testComponentImpl, 0)); + this.protectedTypeProvider = DoubleCheck.provider(new SwitchingProvider<>(impl, 0)); } @Override @@ -67,12 +67,12 @@ public final class DaggerTestComponent { } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/bindsInstance/test.DaggerTestComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/bindsInstance/test.DaggerTestComponent_DEFAULT_MODE index da349f78605..c0667781709 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/bindsInstance/test.DaggerTestComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/bindsInstance/test.DaggerTestComponent_DEFAULT_MODE @@ -48,18 +48,18 @@ final class DaggerTestComponent { public TestComponent build() { Preconditions.checkBuilderRequirement(i, Integer.class); Preconditions.checkBuilderRequirement(list, List.class); - return new TestComponentImpl(i, list); + return new Impl(i, list); } } - private static final class TestComponentImpl implements TestComponent { + private static final class Impl implements TestComponent { private final Integer i; private final List list; - private final TestComponentImpl testComponentImpl = this; + private final Impl impl = this; - TestComponentImpl(Integer iParam, List listParam) { + Impl(Integer iParam, List listParam) { this.i = iParam; this.list = listParam; diff --git a/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/bindsInstance/test.DaggerTestComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/bindsInstance/test.DaggerTestComponent_FAST_INIT_MODE index da349f78605..c0667781709 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/bindsInstance/test.DaggerTestComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/bindsInstance/test.DaggerTestComponent_FAST_INIT_MODE @@ -48,18 +48,18 @@ final class DaggerTestComponent { public TestComponent build() { Preconditions.checkBuilderRequirement(i, Integer.class); Preconditions.checkBuilderRequirement(list, List.class); - return new TestComponentImpl(i, list); + return new Impl(i, list); } } - private static final class TestComponentImpl implements TestComponent { + private static final class Impl implements TestComponent { private final Integer i; private final List list; - private final TestComponentImpl testComponentImpl = this; + private final Impl impl = this; - TestComponentImpl(Integer iParam, List listParam) { + Impl(Integer iParam, List listParam) { this.i = iParam; this.list = listParam; diff --git a/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/bindsInstance/test.DaggerTestComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/bindsInstance/test.DaggerTestComponent_KT_DEFAULT_MODE index 475bda8da2a..81c9a690752 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/bindsInstance/test.DaggerTestComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/bindsInstance/test.DaggerTestComponent_KT_DEFAULT_MODE @@ -48,18 +48,18 @@ final class DaggerTestComponent { public TestComponent build() { Preconditions.checkBuilderRequirement(i, Integer.class); Preconditions.checkBuilderRequirement(list, List.class); - return new TestComponentImpl(i, list); + return new Impl(i, list); } } - private static final class TestComponentImpl implements TestComponent { + private static final class Impl implements TestComponent { private final Integer i; private final List list; - private final TestComponentImpl testComponentImpl = this; + private final Impl impl = this; - TestComponentImpl(Integer iParam, List listParam) { + Impl(Integer iParam, List listParam) { this.i = iParam; this.list = listParam; diff --git a/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/bindsInstance/test.DaggerTestComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/bindsInstance/test.DaggerTestComponent_KT_FAST_INIT_MODE index 475bda8da2a..81c9a690752 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/bindsInstance/test.DaggerTestComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/bindsInstance/test.DaggerTestComponent_KT_FAST_INIT_MODE @@ -48,18 +48,18 @@ final class DaggerTestComponent { public TestComponent build() { Preconditions.checkBuilderRequirement(i, Integer.class); Preconditions.checkBuilderRequirement(list, List.class); - return new TestComponentImpl(i, list); + return new Impl(i, list); } } - private static final class TestComponentImpl implements TestComponent { + private static final class Impl implements TestComponent { private final Integer i; private final List list; - private final TestComponentImpl testComponentImpl = this; + private final Impl impl = this; - TestComponentImpl(Integer iParam, List listParam) { + Impl(Integer iParam, List listParam) { this.i = iParam; this.list = listParam; diff --git a/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/componentInstances/test.DaggerTestComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/componentInstances/test.DaggerTestComponent_DEFAULT_MODE index ce1d1e3df47..d4b9643a80a 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/componentInstances/test.DaggerTestComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/componentInstances/test.DaggerTestComponent_DEFAULT_MODE @@ -39,38 +39,38 @@ final class DaggerTestComponent { public TestComponent build() { Preconditions.checkBuilderRequirement(dep, Dep.class); - return new TestComponentImpl(dep); + return new Impl(dep); } } private static final class TestSubcomponentImpl implements TestSubcomponent { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final TestSubcomponentImpl testSubcomponentImpl = this; - TestSubcomponentImpl(TestComponentImpl testComponentImpl) { - this.testComponentImpl = testComponentImpl; + TestSubcomponentImpl(Impl impl) { + this.impl = impl; } @Override public TestComponent parent() { - return testComponentImpl; + return impl; } @Override public Dep depFromSubcomponent() { - return testComponentImpl.dep; + return impl.dep; } } - private static final class TestComponentImpl implements TestComponent { + private static final class Impl implements TestComponent { private final Dep dep; - private final TestComponentImpl testComponentImpl = this; + private final Impl impl = this; - TestComponentImpl(Dep depParam) { + Impl(Dep depParam) { this.dep = depParam; } @@ -97,7 +97,7 @@ final class DaggerTestComponent { @Override public TestSubcomponent subcomponent() { - return new TestSubcomponentImpl(testComponentImpl); + return new TestSubcomponentImpl(impl); } } } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/componentInstances/test.DaggerTestComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/componentInstances/test.DaggerTestComponent_FAST_INIT_MODE index ce1d1e3df47..d4b9643a80a 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/componentInstances/test.DaggerTestComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/componentInstances/test.DaggerTestComponent_FAST_INIT_MODE @@ -39,38 +39,38 @@ final class DaggerTestComponent { public TestComponent build() { Preconditions.checkBuilderRequirement(dep, Dep.class); - return new TestComponentImpl(dep); + return new Impl(dep); } } private static final class TestSubcomponentImpl implements TestSubcomponent { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final TestSubcomponentImpl testSubcomponentImpl = this; - TestSubcomponentImpl(TestComponentImpl testComponentImpl) { - this.testComponentImpl = testComponentImpl; + TestSubcomponentImpl(Impl impl) { + this.impl = impl; } @Override public TestComponent parent() { - return testComponentImpl; + return impl; } @Override public Dep depFromSubcomponent() { - return testComponentImpl.dep; + return impl.dep; } } - private static final class TestComponentImpl implements TestComponent { + private static final class Impl implements TestComponent { private final Dep dep; - private final TestComponentImpl testComponentImpl = this; + private final Impl impl = this; - TestComponentImpl(Dep depParam) { + Impl(Dep depParam) { this.dep = depParam; } @@ -97,7 +97,7 @@ final class DaggerTestComponent { @Override public TestSubcomponent subcomponent() { - return new TestSubcomponentImpl(testComponentImpl); + return new TestSubcomponentImpl(impl); } } } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/componentInstances/test.DaggerTestComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/componentInstances/test.DaggerTestComponent_KT_DEFAULT_MODE index faa176fe739..582d6bb3f24 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/componentInstances/test.DaggerTestComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/componentInstances/test.DaggerTestComponent_KT_DEFAULT_MODE @@ -39,38 +39,38 @@ final class DaggerTestComponent { public TestComponent build() { Preconditions.checkBuilderRequirement(dep, Dep.class); - return new TestComponentImpl(dep); + return new Impl(dep); } } private static final class TestSubcomponentImpl implements TestSubcomponent { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final TestSubcomponentImpl testSubcomponentImpl = this; - TestSubcomponentImpl(TestComponentImpl testComponentImpl) { - this.testComponentImpl = testComponentImpl; + TestSubcomponentImpl(Impl impl) { + this.impl = impl; } @Override public TestComponent parent() { - return (TestComponent) ((Object) (testComponentImpl)); + return (TestComponent) ((Object) (impl)); } @Override public Dep depFromSubcomponent() { - return (Dep) ((Object) (testComponentImpl.dep)); + return (Dep) ((Object) (impl.dep)); } } - private static final class TestComponentImpl implements TestComponent { + private static final class Impl implements TestComponent { private final Dep dep; - private final TestComponentImpl testComponentImpl = this; + private final Impl impl = this; - TestComponentImpl(Dep depParam) { + Impl(Dep depParam) { this.dep = depParam; } @@ -97,7 +97,7 @@ final class DaggerTestComponent { @Override public TestSubcomponent subcomponent() { - return new TestSubcomponentImpl(testComponentImpl); + return new TestSubcomponentImpl(impl); } } } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/componentInstances/test.DaggerTestComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/componentInstances/test.DaggerTestComponent_KT_FAST_INIT_MODE index faa176fe739..582d6bb3f24 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/componentInstances/test.DaggerTestComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/componentInstances/test.DaggerTestComponent_KT_FAST_INIT_MODE @@ -39,38 +39,38 @@ final class DaggerTestComponent { public TestComponent build() { Preconditions.checkBuilderRequirement(dep, Dep.class); - return new TestComponentImpl(dep); + return new Impl(dep); } } private static final class TestSubcomponentImpl implements TestSubcomponent { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final TestSubcomponentImpl testSubcomponentImpl = this; - TestSubcomponentImpl(TestComponentImpl testComponentImpl) { - this.testComponentImpl = testComponentImpl; + TestSubcomponentImpl(Impl impl) { + this.impl = impl; } @Override public TestComponent parent() { - return (TestComponent) ((Object) (testComponentImpl)); + return (TestComponent) ((Object) (impl)); } @Override public Dep depFromSubcomponent() { - return (Dep) ((Object) (testComponentImpl.dep)); + return (Dep) ((Object) (impl.dep)); } } - private static final class TestComponentImpl implements TestComponent { + private static final class Impl implements TestComponent { private final Dep dep; - private final TestComponentImpl testComponentImpl = this; + private final Impl impl = this; - TestComponentImpl(Dep depParam) { + Impl(Dep depParam) { this.dep = depParam; } @@ -97,7 +97,7 @@ final class DaggerTestComponent { @Override public TestSubcomponent subcomponent() { - return new TestSubcomponentImpl(testComponentImpl); + return new TestSubcomponentImpl(impl); } } } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/componentRequirementNeededInFactoryCreationOfSubcomponent/test.DaggerTestComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/componentRequirementNeededInFactoryCreationOfSubcomponent/test.DaggerTestComponent_DEFAULT_MODE index 5e7dca98d35..4389b76e8aa 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/componentRequirementNeededInFactoryCreationOfSubcomponent/test.DaggerTestComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/componentRequirementNeededInFactoryCreationOfSubcomponent/test.DaggerTestComponent_DEFAULT_MODE @@ -48,12 +48,12 @@ final class DaggerTestComponent { if (parentModule == null) { this.parentModule = new ParentModule(); } - return new TestComponentImpl(parentModule); + return new Impl(parentModule); } } private static final class TestSubcomponentImpl implements TestSubcomponent { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final TestSubcomponentImpl testSubcomponentImpl = this; @@ -61,8 +61,8 @@ final class DaggerTestComponent { Provider reliesOnMultibindingProvider; - TestSubcomponentImpl(TestComponentImpl testComponentImpl) { - this.testComponentImpl = testComponentImpl; + TestSubcomponentImpl(Impl impl) { + this.impl = impl; initialize(); @@ -71,7 +71,7 @@ final class DaggerTestComponent { @SuppressWarnings("unchecked") private void initialize() { this.setOfObjectProvider = setOfObjectBuilder(); - this.reliesOnMultibindingProvider = ParentModule_ReliesOnMultibindingFactory.create(testComponentImpl.parentModule, setOfObjectProvider); + this.reliesOnMultibindingProvider = ParentModule_ReliesOnMultibindingFactory.create(impl.parentModule, setOfObjectProvider); } SetFactory setOfObjectBuilder() { @@ -87,16 +87,16 @@ final class DaggerTestComponent { } } - private static final class TestComponentImpl implements TestComponent { + private static final class Impl implements TestComponent { private final ParentModule parentModule; - private final TestComponentImpl testComponentImpl = this; + private final Impl impl = this; Provider> setOfObjectProvider; Provider reliesOnMultibindingProvider; - TestComponentImpl(ParentModule parentModuleParam) { + Impl(ParentModule parentModuleParam) { this.parentModule = parentModuleParam; initialize(parentModuleParam); @@ -121,7 +121,7 @@ final class DaggerTestComponent { @Override public TestSubcomponent subcomponent() { - return new TestSubcomponentImpl(testComponentImpl); + return new TestSubcomponentImpl(impl); } } } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/componentRequirementNeededInFactoryCreationOfSubcomponent/test.DaggerTestComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/componentRequirementNeededInFactoryCreationOfSubcomponent/test.DaggerTestComponent_FAST_INIT_MODE index d7967c047c9..52b54b6edbd 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/componentRequirementNeededInFactoryCreationOfSubcomponent/test.DaggerTestComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/componentRequirementNeededInFactoryCreationOfSubcomponent/test.DaggerTestComponent_FAST_INIT_MODE @@ -48,19 +48,19 @@ final class DaggerTestComponent { if (parentModule == null) { this.parentModule = new ParentModule(); } - return new TestComponentImpl(parentModule); + return new Impl(parentModule); } } private static final class TestSubcomponentImpl implements TestSubcomponent { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final TestSubcomponentImpl testSubcomponentImpl = this; Provider reliesOnMultibindingProvider; - TestSubcomponentImpl(TestComponentImpl testComponentImpl) { - this.testComponentImpl = testComponentImpl; + TestSubcomponentImpl(Impl impl) { + this.impl = impl; initialize(); @@ -72,7 +72,7 @@ final class DaggerTestComponent { @SuppressWarnings("unchecked") private void initialize() { - this.reliesOnMultibindingProvider = new SwitchingProvider<>(testComponentImpl, testSubcomponentImpl, 0); + this.reliesOnMultibindingProvider = new SwitchingProvider<>(impl, testSubcomponentImpl, 0); } @Override @@ -81,15 +81,14 @@ final class DaggerTestComponent { } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final TestSubcomponentImpl testSubcomponentImpl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, - TestSubcomponentImpl testSubcomponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, TestSubcomponentImpl testSubcomponentImpl, int id) { + this.impl = impl; this.testSubcomponentImpl = testSubcomponentImpl; this.id = id; } @@ -99,7 +98,7 @@ final class DaggerTestComponent { public T get() { switch (id) { case 0: // java.lang.Object - return (T) ParentModule_ReliesOnMultibindingFactory.reliesOnMultibinding(testComponentImpl.parentModule, testSubcomponentImpl.setOfObject()); + return (T) ParentModule_ReliesOnMultibindingFactory.reliesOnMultibinding(impl.parentModule, testSubcomponentImpl.setOfObject()); default: throw new AssertionError(id); } @@ -107,14 +106,14 @@ final class DaggerTestComponent { } } - private static final class TestComponentImpl implements TestComponent { + private static final class Impl implements TestComponent { private final ParentModule parentModule; - private final TestComponentImpl testComponentImpl = this; + private final Impl impl = this; Provider reliesOnMultibindingProvider; - TestComponentImpl(ParentModule parentModuleParam) { + Impl(ParentModule parentModuleParam) { this.parentModule = parentModuleParam; initialize(parentModuleParam); @@ -126,7 +125,7 @@ final class DaggerTestComponent { @SuppressWarnings("unchecked") private void initialize(final ParentModule parentModuleParam) { - this.reliesOnMultibindingProvider = new SwitchingProvider<>(testComponentImpl, 0); + this.reliesOnMultibindingProvider = new SwitchingProvider<>(impl, 0); } @Override @@ -136,16 +135,16 @@ final class DaggerTestComponent { @Override public TestSubcomponent subcomponent() { - return new TestSubcomponentImpl(testComponentImpl); + return new TestSubcomponentImpl(impl); } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } @@ -154,7 +153,7 @@ final class DaggerTestComponent { public T get() { switch (id) { case 0: // java.lang.Object - return (T) ParentModule_ReliesOnMultibindingFactory.reliesOnMultibinding(testComponentImpl.parentModule, testComponentImpl.setOfObject()); + return (T) ParentModule_ReliesOnMultibindingFactory.reliesOnMultibinding(impl.parentModule, impl.setOfObject()); default: throw new AssertionError(id); } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/componentRequirementNeededInFactoryCreationOfSubcomponent/test.DaggerTestComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/componentRequirementNeededInFactoryCreationOfSubcomponent/test.DaggerTestComponent_KT_DEFAULT_MODE index 3b6b4aba210..c79cd2fa657 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/componentRequirementNeededInFactoryCreationOfSubcomponent/test.DaggerTestComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/componentRequirementNeededInFactoryCreationOfSubcomponent/test.DaggerTestComponent_KT_DEFAULT_MODE @@ -47,12 +47,12 @@ final class DaggerTestComponent { if (parentModule == null) { this.parentModule = new ParentModule(); } - return new TestComponentImpl(parentModule); + return new Impl(parentModule); } } private static final class TestSubcomponentImpl implements TestSubcomponent { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final TestSubcomponentImpl testSubcomponentImpl = this; @@ -66,8 +66,8 @@ final class DaggerTestComponent { */ Provider reliesOnMultibindingProvider; - TestSubcomponentImpl(TestComponentImpl testComponentImpl) { - this.testComponentImpl = testComponentImpl; + TestSubcomponentImpl(Impl impl) { + this.impl = impl; initialize(); @@ -76,7 +76,7 @@ final class DaggerTestComponent { @SuppressWarnings("unchecked") private void initialize() { this.setOfObjectProvider = setOfObjectBuilder(); - this.reliesOnMultibindingProvider = ParentModule_ReliesOnMultibindingFactory.create(testComponentImpl.parentModule, setOfObjectProvider); + this.reliesOnMultibindingProvider = ParentModule_ReliesOnMultibindingFactory.create(impl.parentModule, setOfObjectProvider); } SetFactory setOfObjectBuilder() { @@ -92,10 +92,10 @@ final class DaggerTestComponent { } } - private static final class TestComponentImpl implements TestComponent { + private static final class Impl implements TestComponent { private final ParentModule parentModule; - private final TestComponentImpl testComponentImpl = this; + private final Impl impl = this; /** * {@code Provider>} @@ -107,7 +107,7 @@ final class DaggerTestComponent { */ Provider reliesOnMultibindingProvider; - TestComponentImpl(ParentModule parentModuleParam) { + Impl(ParentModule parentModuleParam) { this.parentModule = parentModuleParam; initialize(parentModuleParam); @@ -132,7 +132,7 @@ final class DaggerTestComponent { @Override public TestSubcomponent subcomponent() { - return new TestSubcomponentImpl(testComponentImpl); + return new TestSubcomponentImpl(impl); } } } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/componentRequirementNeededInFactoryCreationOfSubcomponent/test.DaggerTestComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/componentRequirementNeededInFactoryCreationOfSubcomponent/test.DaggerTestComponent_KT_FAST_INIT_MODE index 5d9f1e96c8a..2401b519063 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/componentRequirementNeededInFactoryCreationOfSubcomponent/test.DaggerTestComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/componentRequirementNeededInFactoryCreationOfSubcomponent/test.DaggerTestComponent_KT_FAST_INIT_MODE @@ -47,12 +47,12 @@ final class DaggerTestComponent { if (parentModule == null) { this.parentModule = new ParentModule(); } - return new TestComponentImpl(parentModule); + return new Impl(parentModule); } } private static final class TestSubcomponentImpl implements TestSubcomponent { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final TestSubcomponentImpl testSubcomponentImpl = this; @@ -61,8 +61,8 @@ final class DaggerTestComponent { */ Provider reliesOnMultibindingProvider; - TestSubcomponentImpl(TestComponentImpl testComponentImpl) { - this.testComponentImpl = testComponentImpl; + TestSubcomponentImpl(Impl impl) { + this.impl = impl; initialize(); @@ -74,7 +74,7 @@ final class DaggerTestComponent { @SuppressWarnings("unchecked") private void initialize() { - this.reliesOnMultibindingProvider = new SwitchingProvider<>(testComponentImpl, testSubcomponentImpl, 0); + this.reliesOnMultibindingProvider = new SwitchingProvider<>(impl, testSubcomponentImpl, 0); } @Override @@ -83,15 +83,14 @@ final class DaggerTestComponent { } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final TestSubcomponentImpl testSubcomponentImpl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, - TestSubcomponentImpl testSubcomponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, TestSubcomponentImpl testSubcomponentImpl, int id) { + this.impl = impl; this.testSubcomponentImpl = testSubcomponentImpl; this.id = id; } @@ -101,7 +100,7 @@ final class DaggerTestComponent { public T get() { switch (id) { case 0: // java.lang.Object - return (T) ParentModule_ReliesOnMultibindingFactory.reliesOnMultibinding(testComponentImpl.parentModule, testSubcomponentImpl.setOfObject()); + return (T) ParentModule_ReliesOnMultibindingFactory.reliesOnMultibinding(impl.parentModule, testSubcomponentImpl.setOfObject()); default: throw new AssertionError(id); } @@ -109,17 +108,17 @@ final class DaggerTestComponent { } } - private static final class TestComponentImpl implements TestComponent { + private static final class Impl implements TestComponent { private final ParentModule parentModule; - private final TestComponentImpl testComponentImpl = this; + private final Impl impl = this; /** * {@code Provider} */ Provider reliesOnMultibindingProvider; - TestComponentImpl(ParentModule parentModuleParam) { + Impl(ParentModule parentModuleParam) { this.parentModule = parentModuleParam; initialize(parentModuleParam); @@ -131,7 +130,7 @@ final class DaggerTestComponent { @SuppressWarnings("unchecked") private void initialize(final ParentModule parentModuleParam) { - this.reliesOnMultibindingProvider = new SwitchingProvider<>(testComponentImpl, 0); + this.reliesOnMultibindingProvider = new SwitchingProvider<>(impl, 0); } @Override @@ -141,16 +140,16 @@ final class DaggerTestComponent { @Override public TestSubcomponent subcomponent() { - return new TestSubcomponentImpl(testComponentImpl); + return new TestSubcomponentImpl(impl); } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } @@ -159,7 +158,7 @@ final class DaggerTestComponent { public T get() { switch (id) { case 0: // java.lang.Object - return (T) ParentModule_ReliesOnMultibindingFactory.reliesOnMultibinding(testComponentImpl.parentModule, testComponentImpl.setOfObject()); + return (T) ParentModule_ReliesOnMultibindingFactory.reliesOnMultibinding(impl.parentModule, impl.setOfObject()); default: throw new AssertionError(id); } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/instanceModuleMethod/test.DaggerTestComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/instanceModuleMethod/test.DaggerTestComponent_DEFAULT_MODE index cac2ddc34cc..7f029807160 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/instanceModuleMethod/test.DaggerTestComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/instanceModuleMethod/test.DaggerTestComponent_DEFAULT_MODE @@ -57,18 +57,18 @@ final class DaggerTestComponent { if (otherPackageModule == null) { this.otherPackageModule = new OtherPackageModule(); } - return new TestComponentImpl(parentModule, otherPackageModule); + return new Impl(parentModule, otherPackageModule); } } - private static final class TestComponentImpl implements TestComponent { + private static final class Impl implements TestComponent { private final ParentModule parentModule; private final OtherPackageModule otherPackageModule; - private final TestComponentImpl testComponentImpl = this; + private final Impl impl = this; - TestComponentImpl(ParentModule parentModuleParam, OtherPackageModule otherPackageModuleParam) { + Impl(ParentModule parentModuleParam, OtherPackageModule otherPackageModuleParam) { this.parentModule = parentModuleParam; this.otherPackageModule = otherPackageModuleParam; diff --git a/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/instanceModuleMethod/test.DaggerTestComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/instanceModuleMethod/test.DaggerTestComponent_FAST_INIT_MODE index cac2ddc34cc..7f029807160 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/instanceModuleMethod/test.DaggerTestComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/instanceModuleMethod/test.DaggerTestComponent_FAST_INIT_MODE @@ -57,18 +57,18 @@ final class DaggerTestComponent { if (otherPackageModule == null) { this.otherPackageModule = new OtherPackageModule(); } - return new TestComponentImpl(parentModule, otherPackageModule); + return new Impl(parentModule, otherPackageModule); } } - private static final class TestComponentImpl implements TestComponent { + private static final class Impl implements TestComponent { private final ParentModule parentModule; private final OtherPackageModule otherPackageModule; - private final TestComponentImpl testComponentImpl = this; + private final Impl impl = this; - TestComponentImpl(ParentModule parentModuleParam, OtherPackageModule otherPackageModuleParam) { + Impl(ParentModule parentModuleParam, OtherPackageModule otherPackageModuleParam) { this.parentModule = parentModuleParam; this.otherPackageModule = otherPackageModuleParam; diff --git a/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/instanceModuleMethod/test.DaggerTestComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/instanceModuleMethod/test.DaggerTestComponent_KT_DEFAULT_MODE index 8ff2a47066b..ef8e7d08c55 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/instanceModuleMethod/test.DaggerTestComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/instanceModuleMethod/test.DaggerTestComponent_KT_DEFAULT_MODE @@ -57,18 +57,18 @@ final class DaggerTestComponent { if (otherPackageModule == null) { this.otherPackageModule = new OtherPackageModule(); } - return new TestComponentImpl(parentModule, otherPackageModule); + return new Impl(parentModule, otherPackageModule); } } - private static final class TestComponentImpl implements TestComponent { + private static final class Impl implements TestComponent { private final ParentModule parentModule; private final OtherPackageModule otherPackageModule; - private final TestComponentImpl testComponentImpl = this; + private final Impl impl = this; - TestComponentImpl(ParentModule parentModuleParam, OtherPackageModule otherPackageModuleParam) { + Impl(ParentModule parentModuleParam, OtherPackageModule otherPackageModuleParam) { this.parentModule = parentModuleParam; this.otherPackageModule = otherPackageModuleParam; diff --git a/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/instanceModuleMethod/test.DaggerTestComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/instanceModuleMethod/test.DaggerTestComponent_KT_FAST_INIT_MODE index 8ff2a47066b..ef8e7d08c55 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/instanceModuleMethod/test.DaggerTestComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/instanceModuleMethod/test.DaggerTestComponent_KT_FAST_INIT_MODE @@ -57,18 +57,18 @@ final class DaggerTestComponent { if (otherPackageModule == null) { this.otherPackageModule = new OtherPackageModule(); } - return new TestComponentImpl(parentModule, otherPackageModule); + return new Impl(parentModule, otherPackageModule); } } - private static final class TestComponentImpl implements TestComponent { + private static final class Impl implements TestComponent { private final ParentModule parentModule; private final OtherPackageModule otherPackageModule; - private final TestComponentImpl testComponentImpl = this; + private final Impl impl = this; - TestComponentImpl(ParentModule parentModuleParam, OtherPackageModule otherPackageModuleParam) { + Impl(ParentModule parentModuleParam, OtherPackageModule otherPackageModuleParam) { this.parentModule = parentModuleParam; this.otherPackageModule = otherPackageModuleParam; diff --git a/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/testBindsNullableInstance/test.DaggerTestComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/testBindsNullableInstance/test.DaggerTestComponent_DEFAULT_MODE index b77c3fec0fb..35edc10a6fc 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/testBindsNullableInstance/test.DaggerTestComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/testBindsNullableInstance/test.DaggerTestComponent_DEFAULT_MODE @@ -28,14 +28,14 @@ final class DaggerTestComponent { private static final class Factory implements TestComponent.Factory { @Override public TestComponent create(@Nullable Bar arg) { - return new TestComponentImpl(arg); + return new Impl(arg); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl(@Nullable Bar argParam) { + Impl(@Nullable Bar argParam) { } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/testBindsNullableInstance/test.DaggerTestComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/testBindsNullableInstance/test.DaggerTestComponent_FAST_INIT_MODE index b77c3fec0fb..35edc10a6fc 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/testBindsNullableInstance/test.DaggerTestComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/testBindsNullableInstance/test.DaggerTestComponent_FAST_INIT_MODE @@ -28,14 +28,14 @@ final class DaggerTestComponent { private static final class Factory implements TestComponent.Factory { @Override public TestComponent create(@Nullable Bar arg) { - return new TestComponentImpl(arg); + return new Impl(arg); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl(@Nullable Bar argParam) { + Impl(@Nullable Bar argParam) { } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/testBindsNullableInstance/test.DaggerTestComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/testBindsNullableInstance/test.DaggerTestComponent_KT_DEFAULT_MODE index b77c3fec0fb..35edc10a6fc 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/testBindsNullableInstance/test.DaggerTestComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/testBindsNullableInstance/test.DaggerTestComponent_KT_DEFAULT_MODE @@ -28,14 +28,14 @@ final class DaggerTestComponent { private static final class Factory implements TestComponent.Factory { @Override public TestComponent create(@Nullable Bar arg) { - return new TestComponentImpl(arg); + return new Impl(arg); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl(@Nullable Bar argParam) { + Impl(@Nullable Bar argParam) { } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/testBindsNullableInstance/test.DaggerTestComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/testBindsNullableInstance/test.DaggerTestComponent_KT_FAST_INIT_MODE index b77c3fec0fb..35edc10a6fc 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/testBindsNullableInstance/test.DaggerTestComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest/testBindsNullableInstance/test.DaggerTestComponent_KT_FAST_INIT_MODE @@ -28,14 +28,14 @@ final class DaggerTestComponent { private static final class Factory implements TestComponent.Factory { @Override public TestComponent create(@Nullable Bar arg) { - return new TestComponentImpl(arg); + return new Impl(arg); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl(@Nullable Bar argParam) { + Impl(@Nullable Bar argParam) { } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentShardTest/testNewShardCreated/dagger.internal.codegen.DaggerTestComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentShardTest/testNewShardCreated/dagger.internal.codegen.DaggerTestComponent_DEFAULT_MODE index 9f13b756887..f1f37235884 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentShardTest/testNewShardCreated/dagger.internal.codegen.DaggerTestComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentShardTest/testNewShardCreated/dagger.internal.codegen.DaggerTestComponent_DEFAULT_MODE @@ -37,26 +37,26 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - TestComponentImplShard testComponentImplShard; + private static final class Impl implements TestComponent { + ImplShard implShard; - TestComponentImplShard2 testComponentImplShard2; + ImplShard2 implShard2; - private final TestComponentImpl testComponentImpl = this; + private final Impl impl = this; Provider binding7Provider; Provider binding6Provider; - TestComponentImpl() { + Impl() { initialize(); - testComponentImplShard = new TestComponentImplShard(testComponentImpl); - testComponentImplShard2 = new TestComponentImplShard2(testComponentImpl); + implShard = new ImplShard(impl); + implShard2 = new ImplShard2(impl); } @SuppressWarnings("unchecked") @@ -67,27 +67,27 @@ final class DaggerTestComponent { @Override public Binding1 binding1() { - return testComponentImpl.testComponentImplShard2.binding1Provider.get(); + return impl.implShard2.binding1Provider.get(); } @Override public Binding2 binding2() { - return testComponentImpl.testComponentImplShard.binding2Provider.get(); + return impl.implShard.binding2Provider.get(); } @Override public Binding3 binding3() { - return testComponentImpl.testComponentImplShard.binding3Provider.get(); + return impl.implShard.binding3Provider.get(); } @Override public Binding4 binding4() { - return testComponentImpl.testComponentImplShard.binding4Provider.get(); + return impl.implShard.binding4Provider.get(); } @Override public Binding5 binding5() { - return testComponentImpl.testComponentImplShard.binding5Provider.get(); + return impl.implShard.binding5Provider.get(); } @Override @@ -102,27 +102,27 @@ final class DaggerTestComponent { @Override public javax.inject.Provider providerBinding1() { - return testComponentImpl.testComponentImplShard2.binding1Provider; + return impl.implShard2.binding1Provider; } @Override public javax.inject.Provider providerBinding2() { - return testComponentImpl.testComponentImplShard.binding2Provider; + return impl.implShard.binding2Provider; } @Override public javax.inject.Provider providerBinding3() { - return testComponentImpl.testComponentImplShard.binding3Provider; + return impl.implShard.binding3Provider; } @Override public javax.inject.Provider providerBinding4() { - return testComponentImpl.testComponentImplShard.binding4Provider; + return impl.implShard.binding4Provider; } @Override public javax.inject.Provider providerBinding5() { - return testComponentImpl.testComponentImplShard.binding5Provider; + return impl.implShard.binding5Provider; } @Override @@ -136,8 +136,8 @@ final class DaggerTestComponent { } } - private static final class TestComponentImplShard { - private final TestComponentImpl testComponentImpl; + private static final class ImplShard { + private final Impl impl; Provider binding5Provider; @@ -147,14 +147,14 @@ final class DaggerTestComponent { Provider binding3Provider; - TestComponentImplShard(TestComponentImpl testComponentImpl) { - this.testComponentImpl = testComponentImpl; + ImplShard(Impl impl) { + this.impl = impl; initialize(); } @SuppressWarnings("unchecked") private void initialize() { - this.binding5Provider = DoubleCheck.provider(Binding5_Factory.create(testComponentImpl.binding6Provider)); + this.binding5Provider = DoubleCheck.provider(Binding5_Factory.create(impl.binding6Provider)); this.binding2Provider = new DelegateFactory<>(); this.binding4Provider = DoubleCheck.provider(Binding4_Factory.create(binding5Provider, binding2Provider)); this.binding3Provider = DoubleCheck.provider(Binding3_Factory.create(binding4Provider)); @@ -162,19 +162,19 @@ final class DaggerTestComponent { } } - private static final class TestComponentImplShard2 { - private final TestComponentImpl testComponentImpl; + private static final class ImplShard2 { + private final Impl impl; Provider binding1Provider; - TestComponentImplShard2(TestComponentImpl testComponentImpl) { - this.testComponentImpl = testComponentImpl; + ImplShard2(Impl impl) { + this.impl = impl; initialize(); } @SuppressWarnings("unchecked") private void initialize() { - this.binding1Provider = DoubleCheck.provider(Binding1_Factory.create(testComponentImpl.testComponentImplShard.binding2Provider)); + this.binding1Provider = DoubleCheck.provider(Binding1_Factory.create(impl.implShard.binding2Provider)); } } } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentShardTest/testNewShardCreated/dagger.internal.codegen.DaggerTestComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentShardTest/testNewShardCreated/dagger.internal.codegen.DaggerTestComponent_FAST_INIT_MODE index 5d913df5eed..0a3f0dcea78 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentShardTest/testNewShardCreated/dagger.internal.codegen.DaggerTestComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentShardTest/testNewShardCreated/dagger.internal.codegen.DaggerTestComponent_FAST_INIT_MODE @@ -37,57 +37,57 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - TestComponentImplShard testComponentImplShard; + private static final class Impl implements TestComponent { + ImplShard implShard; - TestComponentImplShard2 testComponentImplShard2; + ImplShard2 implShard2; - private final TestComponentImpl testComponentImpl = this; + private final Impl impl = this; Provider binding7Provider; Provider binding6Provider; - TestComponentImpl() { + Impl() { initialize(); - testComponentImplShard = new TestComponentImplShard(testComponentImpl); - testComponentImplShard2 = new TestComponentImplShard2(testComponentImpl); + implShard = new ImplShard(impl); + implShard2 = new ImplShard2(impl); } @SuppressWarnings("unchecked") private void initialize() { - this.binding7Provider = DoubleCheck.provider(new SwitchingProvider(testComponentImpl, 1)); - this.binding6Provider = DoubleCheck.provider(new SwitchingProvider(testComponentImpl, 0)); + this.binding7Provider = DoubleCheck.provider(new SwitchingProvider(impl, 1)); + this.binding6Provider = DoubleCheck.provider(new SwitchingProvider(impl, 0)); } @Override public Binding1 binding1() { - return testComponentImpl.testComponentImplShard2.binding1Provider.get(); + return impl.implShard2.binding1Provider.get(); } @Override public Binding2 binding2() { - return testComponentImpl.testComponentImplShard.binding2Provider.get(); + return impl.implShard.binding2Provider.get(); } @Override public Binding3 binding3() { - return testComponentImpl.testComponentImplShard.binding3Provider.get(); + return impl.implShard.binding3Provider.get(); } @Override public Binding4 binding4() { - return testComponentImpl.testComponentImplShard.binding4Provider.get(); + return impl.implShard.binding4Provider.get(); } @Override public Binding5 binding5() { - return testComponentImpl.testComponentImplShard.binding5Provider.get(); + return impl.implShard.binding5Provider.get(); } @Override @@ -102,27 +102,27 @@ final class DaggerTestComponent { @Override public javax.inject.Provider providerBinding1() { - return testComponentImpl.testComponentImplShard2.binding1Provider; + return impl.implShard2.binding1Provider; } @Override public javax.inject.Provider providerBinding2() { - return testComponentImpl.testComponentImplShard.binding2Provider; + return impl.implShard.binding2Provider; } @Override public javax.inject.Provider providerBinding3() { - return testComponentImpl.testComponentImplShard.binding3Provider; + return impl.implShard.binding3Provider; } @Override public javax.inject.Provider providerBinding4() { - return testComponentImpl.testComponentImplShard.binding4Provider; + return impl.implShard.binding4Provider; } @Override public javax.inject.Provider providerBinding5() { - return testComponentImpl.testComponentImplShard.binding5Provider; + return impl.implShard.binding5Provider; } @Override @@ -136,12 +136,12 @@ final class DaggerTestComponent { } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } @@ -150,7 +150,7 @@ final class DaggerTestComponent { public T get() { switch (id) { case 0: // dagger.internal.codegen.Binding6 - return (T) new Binding6(testComponentImpl.binding7Provider.get()); + return (T) new Binding6(impl.binding7Provider.get()); case 1: // dagger.internal.codegen.Binding7 return (T) new Binding7(); @@ -161,8 +161,8 @@ final class DaggerTestComponent { } } - private static final class TestComponentImplShard { - private final TestComponentImpl testComponentImpl; + private static final class ImplShard { + private final Impl impl; Provider binding5Provider; @@ -172,27 +172,27 @@ final class DaggerTestComponent { Provider binding3Provider; - TestComponentImplShard(TestComponentImpl testComponentImpl) { - this.testComponentImpl = testComponentImpl; + ImplShard(Impl impl) { + this.impl = impl; initialize(); } @SuppressWarnings("unchecked") private void initialize() { - this.binding5Provider = DoubleCheck.provider(new SwitchingProvider(testComponentImpl, 3)); + this.binding5Provider = DoubleCheck.provider(new SwitchingProvider(impl, 3)); this.binding2Provider = new DelegateFactory<>(); - this.binding4Provider = DoubleCheck.provider(new SwitchingProvider(testComponentImpl, 2)); - this.binding3Provider = DoubleCheck.provider(new SwitchingProvider(testComponentImpl, 1)); - DelegateFactory.setDelegate(binding2Provider, DoubleCheck.provider(new SwitchingProvider(testComponentImpl, 0))); + this.binding4Provider = DoubleCheck.provider(new SwitchingProvider(impl, 2)); + this.binding3Provider = DoubleCheck.provider(new SwitchingProvider(impl, 1)); + DelegateFactory.setDelegate(binding2Provider, DoubleCheck.provider(new SwitchingProvider(impl, 0))); } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } @@ -201,16 +201,16 @@ final class DaggerTestComponent { public T get() { switch (id) { case 0: // dagger.internal.codegen.Binding2 - return (T) new Binding2(testComponentImpl.testComponentImplShard.binding3Provider.get()); + return (T) new Binding2(impl.implShard.binding3Provider.get()); case 1: // dagger.internal.codegen.Binding3 - return (T) new Binding3(testComponentImpl.testComponentImplShard.binding4Provider.get()); + return (T) new Binding3(impl.implShard.binding4Provider.get()); case 2: // dagger.internal.codegen.Binding4 - return (T) new Binding4(testComponentImpl.testComponentImplShard.binding5Provider.get(), testComponentImpl.testComponentImplShard.binding2Provider); + return (T) new Binding4(impl.implShard.binding5Provider.get(), impl.implShard.binding2Provider); case 3: // dagger.internal.codegen.Binding5 - return (T) new Binding5(testComponentImpl.binding6Provider.get()); + return (T) new Binding5(impl.binding6Provider.get()); default: throw new AssertionError(id); } @@ -218,28 +218,28 @@ final class DaggerTestComponent { } } - private static final class TestComponentImplShard2 { - private final TestComponentImpl testComponentImpl; + private static final class ImplShard2 { + private final Impl impl; Provider binding1Provider; - TestComponentImplShard2(TestComponentImpl testComponentImpl) { - this.testComponentImpl = testComponentImpl; + ImplShard2(Impl impl) { + this.impl = impl; initialize(); } @SuppressWarnings("unchecked") private void initialize() { - this.binding1Provider = DoubleCheck.provider(new SwitchingProvider(testComponentImpl, 0)); + this.binding1Provider = DoubleCheck.provider(new SwitchingProvider(impl, 0)); } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } @@ -248,7 +248,7 @@ final class DaggerTestComponent { public T get() { switch (id) { case 0: // dagger.internal.codegen.Binding1 - return (T) new Binding1(testComponentImpl.testComponentImplShard.binding2Provider.get()); + return (T) new Binding1(impl.implShard.binding2Provider.get()); default: throw new AssertionError(id); } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentShardTest/testNewShardCreated/dagger.internal.codegen.DaggerTestComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentShardTest/testNewShardCreated/dagger.internal.codegen.DaggerTestComponent_KT_DEFAULT_MODE index e0af216707f..3b362783b08 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentShardTest/testNewShardCreated/dagger.internal.codegen.DaggerTestComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentShardTest/testNewShardCreated/dagger.internal.codegen.DaggerTestComponent_KT_DEFAULT_MODE @@ -37,16 +37,16 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - TestComponentImplShard testComponentImplShard; + private static final class Impl implements TestComponent { + ImplShard implShard; - TestComponentImplShard2 testComponentImplShard2; + ImplShard2 implShard2; - private final TestComponentImpl testComponentImpl = this; + private final Impl impl = this; /** * {@code Provider} @@ -58,11 +58,11 @@ final class DaggerTestComponent { */ Provider binding6Provider; - TestComponentImpl() { + Impl() { initialize(); - testComponentImplShard = new TestComponentImplShard(testComponentImpl); - testComponentImplShard2 = new TestComponentImplShard2(testComponentImpl); + implShard = new ImplShard(impl); + implShard2 = new ImplShard2(impl); } @SuppressWarnings("unchecked") @@ -73,27 +73,27 @@ final class DaggerTestComponent { @Override public Binding1 binding1() { - return (Binding1) ((Object) (testComponentImpl.testComponentImplShard2.binding1Provider.get())); + return (Binding1) ((Object) (impl.implShard2.binding1Provider.get())); } @Override public Binding2 binding2() { - return (Binding2) ((Object) (testComponentImpl.testComponentImplShard.binding2Provider.get())); + return (Binding2) ((Object) (impl.implShard.binding2Provider.get())); } @Override public Binding3 binding3() { - return (Binding3) ((Object) (testComponentImpl.testComponentImplShard.binding3Provider.get())); + return (Binding3) ((Object) (impl.implShard.binding3Provider.get())); } @Override public Binding4 binding4() { - return (Binding4) ((Object) (testComponentImpl.testComponentImplShard.binding4Provider.get())); + return (Binding4) ((Object) (impl.implShard.binding4Provider.get())); } @Override public Binding5 binding5() { - return (Binding5) ((Object) (testComponentImpl.testComponentImplShard.binding5Provider.get())); + return (Binding5) ((Object) (impl.implShard.binding5Provider.get())); } @Override @@ -108,27 +108,27 @@ final class DaggerTestComponent { @Override public javax.inject.Provider providerBinding1() { - return (javax.inject.Provider) ((Object) (testComponentImpl.testComponentImplShard2.binding1Provider)); + return (javax.inject.Provider) ((Object) (impl.implShard2.binding1Provider)); } @Override public javax.inject.Provider providerBinding2() { - return (javax.inject.Provider) ((Object) (testComponentImpl.testComponentImplShard.binding2Provider)); + return (javax.inject.Provider) ((Object) (impl.implShard.binding2Provider)); } @Override public javax.inject.Provider providerBinding3() { - return (javax.inject.Provider) ((Object) (testComponentImpl.testComponentImplShard.binding3Provider)); + return (javax.inject.Provider) ((Object) (impl.implShard.binding3Provider)); } @Override public javax.inject.Provider providerBinding4() { - return (javax.inject.Provider) ((Object) (testComponentImpl.testComponentImplShard.binding4Provider)); + return (javax.inject.Provider) ((Object) (impl.implShard.binding4Provider)); } @Override public javax.inject.Provider providerBinding5() { - return (javax.inject.Provider) ((Object) (testComponentImpl.testComponentImplShard.binding5Provider)); + return (javax.inject.Provider) ((Object) (impl.implShard.binding5Provider)); } @Override @@ -142,8 +142,8 @@ final class DaggerTestComponent { } } - private static final class TestComponentImplShard { - private final TestComponentImpl testComponentImpl; + private static final class ImplShard { + private final Impl impl; /** * {@code Provider} @@ -165,14 +165,14 @@ final class DaggerTestComponent { */ Provider binding3Provider; - TestComponentImplShard(TestComponentImpl testComponentImpl) { - this.testComponentImpl = testComponentImpl; + ImplShard(Impl impl) { + this.impl = impl; initialize(); } @SuppressWarnings("unchecked") private void initialize() { - this.binding5Provider = DoubleCheck.provider(Binding5_Factory.create(testComponentImpl.binding6Provider)); + this.binding5Provider = DoubleCheck.provider(Binding5_Factory.create(impl.binding6Provider)); this.binding2Provider = new DelegateFactory<>(); this.binding4Provider = DoubleCheck.provider(Binding4_Factory.create(binding5Provider, binding2Provider)); this.binding3Provider = DoubleCheck.provider(Binding3_Factory.create(binding4Provider)); @@ -180,22 +180,22 @@ final class DaggerTestComponent { } } - private static final class TestComponentImplShard2 { - private final TestComponentImpl testComponentImpl; + private static final class ImplShard2 { + private final Impl impl; /** * {@code Provider} */ Provider binding1Provider; - TestComponentImplShard2(TestComponentImpl testComponentImpl) { - this.testComponentImpl = testComponentImpl; + ImplShard2(Impl impl) { + this.impl = impl; initialize(); } @SuppressWarnings("unchecked") private void initialize() { - this.binding1Provider = DoubleCheck.provider(Binding1_Factory.create(testComponentImpl.testComponentImplShard.binding2Provider)); + this.binding1Provider = DoubleCheck.provider(Binding1_Factory.create(impl.implShard.binding2Provider)); } } } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentShardTest/testNewShardCreated/dagger.internal.codegen.DaggerTestComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentShardTest/testNewShardCreated/dagger.internal.codegen.DaggerTestComponent_KT_FAST_INIT_MODE index 31051e29a1a..94f1fe8ea7b 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentShardTest/testNewShardCreated/dagger.internal.codegen.DaggerTestComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentShardTest/testNewShardCreated/dagger.internal.codegen.DaggerTestComponent_KT_FAST_INIT_MODE @@ -37,16 +37,16 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - TestComponentImplShard testComponentImplShard; + private static final class Impl implements TestComponent { + ImplShard implShard; - TestComponentImplShard2 testComponentImplShard2; + ImplShard2 implShard2; - private final TestComponentImpl testComponentImpl = this; + private final Impl impl = this; /** * {@code Provider} @@ -58,42 +58,42 @@ final class DaggerTestComponent { */ Provider binding6Provider; - TestComponentImpl() { + Impl() { initialize(); - testComponentImplShard = new TestComponentImplShard(testComponentImpl); - testComponentImplShard2 = new TestComponentImplShard2(testComponentImpl); + implShard = new ImplShard(impl); + implShard2 = new ImplShard2(impl); } @SuppressWarnings("unchecked") private void initialize() { - this.binding7Provider = DoubleCheck.provider(new SwitchingProvider<>(testComponentImpl, 1)); - this.binding6Provider = DoubleCheck.provider(new SwitchingProvider<>(testComponentImpl, 0)); + this.binding7Provider = DoubleCheck.provider(new SwitchingProvider<>(impl, 1)); + this.binding6Provider = DoubleCheck.provider(new SwitchingProvider<>(impl, 0)); } @Override public Binding1 binding1() { - return (Binding1) ((Object) (testComponentImpl.testComponentImplShard2.binding1Provider.get())); + return (Binding1) ((Object) (impl.implShard2.binding1Provider.get())); } @Override public Binding2 binding2() { - return (Binding2) ((Object) (testComponentImpl.testComponentImplShard.binding2Provider.get())); + return (Binding2) ((Object) (impl.implShard.binding2Provider.get())); } @Override public Binding3 binding3() { - return (Binding3) ((Object) (testComponentImpl.testComponentImplShard.binding3Provider.get())); + return (Binding3) ((Object) (impl.implShard.binding3Provider.get())); } @Override public Binding4 binding4() { - return (Binding4) ((Object) (testComponentImpl.testComponentImplShard.binding4Provider.get())); + return (Binding4) ((Object) (impl.implShard.binding4Provider.get())); } @Override public Binding5 binding5() { - return (Binding5) ((Object) (testComponentImpl.testComponentImplShard.binding5Provider.get())); + return (Binding5) ((Object) (impl.implShard.binding5Provider.get())); } @Override @@ -108,27 +108,27 @@ final class DaggerTestComponent { @Override public javax.inject.Provider providerBinding1() { - return (javax.inject.Provider) ((Object) (testComponentImpl.testComponentImplShard2.binding1Provider)); + return (javax.inject.Provider) ((Object) (impl.implShard2.binding1Provider)); } @Override public javax.inject.Provider providerBinding2() { - return (javax.inject.Provider) ((Object) (testComponentImpl.testComponentImplShard.binding2Provider)); + return (javax.inject.Provider) ((Object) (impl.implShard.binding2Provider)); } @Override public javax.inject.Provider providerBinding3() { - return (javax.inject.Provider) ((Object) (testComponentImpl.testComponentImplShard.binding3Provider)); + return (javax.inject.Provider) ((Object) (impl.implShard.binding3Provider)); } @Override public javax.inject.Provider providerBinding4() { - return (javax.inject.Provider) ((Object) (testComponentImpl.testComponentImplShard.binding4Provider)); + return (javax.inject.Provider) ((Object) (impl.implShard.binding4Provider)); } @Override public javax.inject.Provider providerBinding5() { - return (javax.inject.Provider) ((Object) (testComponentImpl.testComponentImplShard.binding5Provider)); + return (javax.inject.Provider) ((Object) (impl.implShard.binding5Provider)); } @Override @@ -142,12 +142,12 @@ final class DaggerTestComponent { } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } @@ -156,7 +156,7 @@ final class DaggerTestComponent { public T get() { switch (id) { case 0: // dagger.internal.codegen.Binding6 - return (T) Binding6_Factory.newInstance(testComponentImpl.binding7Provider.get()); + return (T) Binding6_Factory.newInstance(impl.binding7Provider.get()); case 1: // dagger.internal.codegen.Binding7 return (T) Binding7_Factory.newInstance(); @@ -167,8 +167,8 @@ final class DaggerTestComponent { } } - private static final class TestComponentImplShard { - private final TestComponentImpl testComponentImpl; + private static final class ImplShard { + private final Impl impl; /** * {@code Provider} @@ -190,27 +190,27 @@ final class DaggerTestComponent { */ Provider binding3Provider; - TestComponentImplShard(TestComponentImpl testComponentImpl) { - this.testComponentImpl = testComponentImpl; + ImplShard(Impl impl) { + this.impl = impl; initialize(); } @SuppressWarnings("unchecked") private void initialize() { - this.binding5Provider = DoubleCheck.provider(new SwitchingProvider<>(testComponentImpl, 3)); + this.binding5Provider = DoubleCheck.provider(new SwitchingProvider<>(impl, 3)); this.binding2Provider = new DelegateFactory<>(); - this.binding4Provider = DoubleCheck.provider(new SwitchingProvider<>(testComponentImpl, 2)); - this.binding3Provider = DoubleCheck.provider(new SwitchingProvider<>(testComponentImpl, 1)); - DelegateFactory.setDelegate((Provider) (binding2Provider), (Provider) (DoubleCheck.provider(new SwitchingProvider<>(testComponentImpl, 0)))); + this.binding4Provider = DoubleCheck.provider(new SwitchingProvider<>(impl, 2)); + this.binding3Provider = DoubleCheck.provider(new SwitchingProvider<>(impl, 1)); + DelegateFactory.setDelegate((Provider) (binding2Provider), (Provider) (DoubleCheck.provider(new SwitchingProvider<>(impl, 0)))); } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } @@ -219,16 +219,16 @@ final class DaggerTestComponent { public T get() { switch (id) { case 0: // dagger.internal.codegen.Binding2 - return (T) Binding2_Factory.newInstance(testComponentImpl.testComponentImplShard.binding3Provider.get()); + return (T) Binding2_Factory.newInstance(impl.implShard.binding3Provider.get()); case 1: // dagger.internal.codegen.Binding3 - return (T) Binding3_Factory.newInstance(testComponentImpl.testComponentImplShard.binding4Provider.get()); + return (T) Binding3_Factory.newInstance(impl.implShard.binding4Provider.get()); case 2: // dagger.internal.codegen.Binding4 - return (T) Binding4_Factory.newInstance(testComponentImpl.testComponentImplShard.binding5Provider.get(), testComponentImpl.testComponentImplShard.binding2Provider); + return (T) Binding4_Factory.newInstance(impl.implShard.binding5Provider.get(), impl.implShard.binding2Provider); case 3: // dagger.internal.codegen.Binding5 - return (T) Binding5_Factory.newInstance(testComponentImpl.binding6Provider.get()); + return (T) Binding5_Factory.newInstance(impl.binding6Provider.get()); default: throw new AssertionError(id); } @@ -236,31 +236,31 @@ final class DaggerTestComponent { } } - private static final class TestComponentImplShard2 { - private final TestComponentImpl testComponentImpl; + private static final class ImplShard2 { + private final Impl impl; /** * {@code Provider} */ Provider binding1Provider; - TestComponentImplShard2(TestComponentImpl testComponentImpl) { - this.testComponentImpl = testComponentImpl; + ImplShard2(Impl impl) { + this.impl = impl; initialize(); } @SuppressWarnings("unchecked") private void initialize() { - this.binding1Provider = DoubleCheck.provider(new SwitchingProvider<>(testComponentImpl, 0)); + this.binding1Provider = DoubleCheck.provider(new SwitchingProvider<>(impl, 0)); } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } @@ -269,7 +269,7 @@ final class DaggerTestComponent { public T get() { switch (id) { case 0: // dagger.internal.codegen.Binding1 - return (T) Binding1_Factory.newInstance(testComponentImpl.testComponentImplShard.binding2Provider.get()); + return (T) Binding1_Factory.newInstance(impl.implShard.binding2Provider.get()); default: throw new AssertionError(id); } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentShardTest/testNewShardCreatedWithDependencies/dagger.internal.codegen.DaggerTestComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentShardTest/testNewShardCreatedWithDependencies/dagger.internal.codegen.DaggerTestComponent_DEFAULT_MODE index 70374c2eeca..e77112a00ee 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentShardTest/testNewShardCreatedWithDependencies/dagger.internal.codegen.DaggerTestComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentShardTest/testNewShardCreatedWithDependencies/dagger.internal.codegen.DaggerTestComponent_DEFAULT_MODE @@ -41,25 +41,25 @@ final class DaggerTestComponent { public TestComponent build() { Preconditions.checkBuilderRequirement(dependency, Dependency.class); - return new TestComponentImpl(dependency); + return new Impl(dependency); } } - private static final class TestComponentImpl implements TestComponent { - TestComponentImplShard testComponentImplShard; + private static final class Impl implements TestComponent { + ImplShard implShard; private final Dependency dependency; - private final TestComponentImpl testComponentImpl = this; + private final Impl impl = this; Provider binding1Provider; Provider binding2Provider; - TestComponentImpl(Dependency dependencyParam) { + Impl(Dependency dependencyParam) { this.dependency = dependencyParam; initialize(dependencyParam); - testComponentImplShard = new TestComponentImplShard(testComponentImpl, dependencyParam); + implShard = new ImplShard(impl, dependencyParam); } @SuppressWarnings("unchecked") @@ -95,7 +95,7 @@ final class DaggerTestComponent { @Override public javax.inject.Provider providerBinding3() { - return testComponentImpl.testComponentImplShard.binding3Provider; + return impl.implShard.binding3Provider; } private static final class Binding3Provider implements Provider { @@ -112,19 +112,19 @@ final class DaggerTestComponent { } } - private static final class TestComponentImplShard { - private final TestComponentImpl testComponentImpl; + private static final class ImplShard { + private final Impl impl; Provider binding3Provider; - TestComponentImplShard(TestComponentImpl testComponentImpl, Dependency dependencyParam) { - this.testComponentImpl = testComponentImpl; + ImplShard(Impl impl, Dependency dependencyParam) { + this.impl = impl; initialize(dependencyParam); } @SuppressWarnings("unchecked") private void initialize(final Dependency dependencyParam) { - this.binding3Provider = new TestComponentImpl.Binding3Provider(testComponentImpl.dependency); + this.binding3Provider = new Impl.Binding3Provider(impl.dependency); } } } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentShardTest/testNewShardCreatedWithDependencies/dagger.internal.codegen.DaggerTestComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentShardTest/testNewShardCreatedWithDependencies/dagger.internal.codegen.DaggerTestComponent_FAST_INIT_MODE index 8665695d545..de29bfe8e7e 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentShardTest/testNewShardCreatedWithDependencies/dagger.internal.codegen.DaggerTestComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentShardTest/testNewShardCreatedWithDependencies/dagger.internal.codegen.DaggerTestComponent_FAST_INIT_MODE @@ -41,31 +41,31 @@ final class DaggerTestComponent { public TestComponent build() { Preconditions.checkBuilderRequirement(dependency, Dependency.class); - return new TestComponentImpl(dependency); + return new Impl(dependency); } } - private static final class TestComponentImpl implements TestComponent { - TestComponentImplShard testComponentImplShard; + private static final class Impl implements TestComponent { + ImplShard implShard; private final Dependency dependency; - private final TestComponentImpl testComponentImpl = this; + private final Impl impl = this; Provider binding1Provider; Provider binding2Provider; - TestComponentImpl(Dependency dependencyParam) { + Impl(Dependency dependencyParam) { this.dependency = dependencyParam; initialize(dependencyParam); - testComponentImplShard = new TestComponentImplShard(testComponentImpl, dependencyParam); + implShard = new ImplShard(impl, dependencyParam); } @SuppressWarnings("unchecked") private void initialize(final Dependency dependencyParam) { - this.binding1Provider = DoubleCheck.provider(new SwitchingProvider(testComponentImpl, 0)); - this.binding2Provider = DoubleCheck.provider(new SwitchingProvider(testComponentImpl, 1)); + this.binding1Provider = DoubleCheck.provider(new SwitchingProvider(impl, 0)); + this.binding2Provider = DoubleCheck.provider(new SwitchingProvider(impl, 1)); } @Override @@ -80,7 +80,7 @@ final class DaggerTestComponent { @Override public Binding3 binding3() { - return testComponentImpl.testComponentImplShard.binding3Provider.get(); + return impl.implShard.binding3Provider.get(); } @Override @@ -95,16 +95,16 @@ final class DaggerTestComponent { @Override public javax.inject.Provider providerBinding3() { - return testComponentImpl.testComponentImplShard.binding3Provider; + return impl.implShard.binding3Provider; } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } @@ -124,28 +124,28 @@ final class DaggerTestComponent { } } - private static final class TestComponentImplShard { - private final TestComponentImpl testComponentImpl; + private static final class ImplShard { + private final Impl impl; Provider binding3Provider; - TestComponentImplShard(TestComponentImpl testComponentImpl, Dependency dependencyParam) { - this.testComponentImpl = testComponentImpl; + ImplShard(Impl impl, Dependency dependencyParam) { + this.impl = impl; initialize(dependencyParam); } @SuppressWarnings("unchecked") private void initialize(final Dependency dependencyParam) { - this.binding3Provider = new SwitchingProvider<>(testComponentImpl, 0); + this.binding3Provider = new SwitchingProvider<>(impl, 0); } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } @@ -154,7 +154,7 @@ final class DaggerTestComponent { public T get() { switch (id) { case 0: // dagger.internal.codegen.Binding3 - return (T) Preconditions.checkNotNullFromComponent(testComponentImpl.dependency.binding3()); + return (T) Preconditions.checkNotNullFromComponent(impl.dependency.binding3()); default: throw new AssertionError(id); } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentShardTest/testNewShardCreatedWithDependencies/dagger.internal.codegen.DaggerTestComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentShardTest/testNewShardCreatedWithDependencies/dagger.internal.codegen.DaggerTestComponent_KT_DEFAULT_MODE index 0bd4ca63f50..2eec4a832ed 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentShardTest/testNewShardCreatedWithDependencies/dagger.internal.codegen.DaggerTestComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentShardTest/testNewShardCreatedWithDependencies/dagger.internal.codegen.DaggerTestComponent_KT_DEFAULT_MODE @@ -41,16 +41,16 @@ final class DaggerTestComponent { public TestComponent build() { Preconditions.checkBuilderRequirement(dependency, Dependency.class); - return new TestComponentImpl(dependency); + return new Impl(dependency); } } - private static final class TestComponentImpl implements TestComponent { - TestComponentImplShard testComponentImplShard; + private static final class Impl implements TestComponent { + ImplShard implShard; private final Dependency dependency; - private final TestComponentImpl testComponentImpl = this; + private final Impl impl = this; /** * {@code Provider} @@ -62,10 +62,10 @@ final class DaggerTestComponent { */ Provider binding2Provider; - TestComponentImpl(Dependency dependencyParam) { + Impl(Dependency dependencyParam) { this.dependency = dependencyParam; initialize(dependencyParam); - testComponentImplShard = new TestComponentImplShard(testComponentImpl, dependencyParam); + implShard = new ImplShard(impl, dependencyParam); } @SuppressWarnings("unchecked") @@ -101,7 +101,7 @@ final class DaggerTestComponent { @Override public javax.inject.Provider providerBinding3() { - return (javax.inject.Provider) ((Object) (testComponentImpl.testComponentImplShard.binding3Provider)); + return (javax.inject.Provider) ((Object) (impl.implShard.binding3Provider)); } private static final class Binding3Provider implements Provider { @@ -118,22 +118,22 @@ final class DaggerTestComponent { } } - private static final class TestComponentImplShard { - private final TestComponentImpl testComponentImpl; + private static final class ImplShard { + private final Impl impl; /** * {@code Provider} */ Provider binding3Provider; - TestComponentImplShard(TestComponentImpl testComponentImpl, Dependency dependencyParam) { - this.testComponentImpl = testComponentImpl; + ImplShard(Impl impl, Dependency dependencyParam) { + this.impl = impl; initialize(dependencyParam); } @SuppressWarnings("unchecked") private void initialize(final Dependency dependencyParam) { - this.binding3Provider = new TestComponentImpl.Binding3Provider(testComponentImpl.dependency); + this.binding3Provider = new Impl.Binding3Provider(impl.dependency); } } } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentShardTest/testNewShardCreatedWithDependencies/dagger.internal.codegen.DaggerTestComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentShardTest/testNewShardCreatedWithDependencies/dagger.internal.codegen.DaggerTestComponent_KT_FAST_INIT_MODE index 316b39c5285..eb9b103bf98 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentShardTest/testNewShardCreatedWithDependencies/dagger.internal.codegen.DaggerTestComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentShardTest/testNewShardCreatedWithDependencies/dagger.internal.codegen.DaggerTestComponent_KT_FAST_INIT_MODE @@ -41,16 +41,16 @@ final class DaggerTestComponent { public TestComponent build() { Preconditions.checkBuilderRequirement(dependency, Dependency.class); - return new TestComponentImpl(dependency); + return new Impl(dependency); } } - private static final class TestComponentImpl implements TestComponent { - TestComponentImplShard testComponentImplShard; + private static final class Impl implements TestComponent { + ImplShard implShard; private final Dependency dependency; - private final TestComponentImpl testComponentImpl = this; + private final Impl impl = this; /** * {@code Provider} @@ -62,16 +62,16 @@ final class DaggerTestComponent { */ Provider binding2Provider; - TestComponentImpl(Dependency dependencyParam) { + Impl(Dependency dependencyParam) { this.dependency = dependencyParam; initialize(dependencyParam); - testComponentImplShard = new TestComponentImplShard(testComponentImpl, dependencyParam); + implShard = new ImplShard(impl, dependencyParam); } @SuppressWarnings("unchecked") private void initialize(final Dependency dependencyParam) { - this.binding1Provider = DoubleCheck.provider(new SwitchingProvider<>(testComponentImpl, 0)); - this.binding2Provider = DoubleCheck.provider(new SwitchingProvider<>(testComponentImpl, 1)); + this.binding1Provider = DoubleCheck.provider(new SwitchingProvider<>(impl, 0)); + this.binding2Provider = DoubleCheck.provider(new SwitchingProvider<>(impl, 1)); } @Override @@ -86,7 +86,7 @@ final class DaggerTestComponent { @Override public Binding3 binding3() { - return (Binding3) ((Object) (testComponentImpl.testComponentImplShard.binding3Provider.get())); + return (Binding3) ((Object) (impl.implShard.binding3Provider.get())); } @Override @@ -101,16 +101,16 @@ final class DaggerTestComponent { @Override public javax.inject.Provider providerBinding3() { - return (javax.inject.Provider) ((Object) (testComponentImpl.testComponentImplShard.binding3Provider)); + return (javax.inject.Provider) ((Object) (impl.implShard.binding3Provider)); } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } @@ -130,31 +130,31 @@ final class DaggerTestComponent { } } - private static final class TestComponentImplShard { - private final TestComponentImpl testComponentImpl; + private static final class ImplShard { + private final Impl impl; /** * {@code Provider} */ Provider binding3Provider; - TestComponentImplShard(TestComponentImpl testComponentImpl, Dependency dependencyParam) { - this.testComponentImpl = testComponentImpl; + ImplShard(Impl impl, Dependency dependencyParam) { + this.impl = impl; initialize(dependencyParam); } @SuppressWarnings("unchecked") private void initialize(final Dependency dependencyParam) { - this.binding3Provider = new SwitchingProvider<>(testComponentImpl, 0); + this.binding3Provider = new SwitchingProvider<>(impl, 0); } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } @@ -163,7 +163,7 @@ final class DaggerTestComponent { public T get() { switch (id) { case 0: // dagger.internal.codegen.Binding3 - return (T) Preconditions.checkNotNullFromComponent(testComponentImpl.dependency.binding3()); + return (T) Preconditions.checkNotNullFromComponent(impl.dependency.binding3()); default: throw new AssertionError(id); } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentShardTest/testNewShardSubcomponentCreated/dagger.internal.codegen.DaggerTestComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentShardTest/testNewShardSubcomponentCreated/dagger.internal.codegen.DaggerTestComponent_DEFAULT_MODE index 8ed3d02d6d5..a57cd416bf2 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentShardTest/testNewShardSubcomponentCreated/dagger.internal.codegen.DaggerTestComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentShardTest/testNewShardSubcomponentCreated/dagger.internal.codegen.DaggerTestComponent_DEFAULT_MODE @@ -36,14 +36,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } private static final class TestSubcomponentImpl implements TestSubcomponent { TestSubcomponentImplShard testSubcomponentImplShard; - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final TestSubcomponentImpl testSubcomponentImpl = this; @@ -51,11 +51,11 @@ final class DaggerTestComponent { Provider binding2Provider; - TestSubcomponentImpl(TestComponentImpl testComponentImpl) { - this.testComponentImpl = testComponentImpl; + TestSubcomponentImpl(Impl impl) { + this.impl = impl; initialize(); - testSubcomponentImplShard = new TestSubcomponentImplShard(testComponentImpl, testSubcomponentImpl); + testSubcomponentImplShard = new TestSubcomponentImplShard(impl, testSubcomponentImpl); } @SuppressWarnings("unchecked") @@ -95,30 +95,29 @@ final class DaggerTestComponent { } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } @Override public TestSubcomponent subcomponent() { - return new TestSubcomponentImpl(testComponentImpl); + return new TestSubcomponentImpl(impl); } } private static final class TestSubcomponentImplShard { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final TestSubcomponentImpl testSubcomponentImpl; Provider binding3Provider; - TestSubcomponentImplShard(TestComponentImpl testComponentImpl, - TestSubcomponentImpl testSubcomponentImpl) { - this.testComponentImpl = testComponentImpl; + TestSubcomponentImplShard(Impl impl, TestSubcomponentImpl testSubcomponentImpl) { + this.impl = impl; this.testSubcomponentImpl = testSubcomponentImpl; initialize(); } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentShardTest/testNewShardSubcomponentCreated/dagger.internal.codegen.DaggerTestComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentShardTest/testNewShardSubcomponentCreated/dagger.internal.codegen.DaggerTestComponent_FAST_INIT_MODE index 1caaae2f806..dd3387f9f16 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentShardTest/testNewShardSubcomponentCreated/dagger.internal.codegen.DaggerTestComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentShardTest/testNewShardSubcomponentCreated/dagger.internal.codegen.DaggerTestComponent_FAST_INIT_MODE @@ -36,14 +36,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } private static final class TestSubcomponentImpl implements TestSubcomponent { TestSubcomponentImplShard testSubcomponentImplShard; - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final TestSubcomponentImpl testSubcomponentImpl = this; @@ -51,17 +51,17 @@ final class DaggerTestComponent { Provider binding2Provider; - TestSubcomponentImpl(TestComponentImpl testComponentImpl) { - this.testComponentImpl = testComponentImpl; + TestSubcomponentImpl(Impl impl) { + this.impl = impl; initialize(); - testSubcomponentImplShard = new TestSubcomponentImplShard(testComponentImpl, testSubcomponentImpl); + testSubcomponentImplShard = new TestSubcomponentImplShard(impl, testSubcomponentImpl); } @SuppressWarnings("unchecked") private void initialize() { - this.binding1Provider = DoubleCheck.provider(new SwitchingProvider(testComponentImpl, testSubcomponentImpl, 0)); - this.binding2Provider = DoubleCheck.provider(new SwitchingProvider(testComponentImpl, testSubcomponentImpl, 1)); + this.binding1Provider = DoubleCheck.provider(new SwitchingProvider(impl, testSubcomponentImpl, 0)); + this.binding2Provider = DoubleCheck.provider(new SwitchingProvider(impl, testSubcomponentImpl, 1)); } @Override @@ -95,15 +95,14 @@ final class DaggerTestComponent { } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final TestSubcomponentImpl testSubcomponentImpl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, - TestSubcomponentImpl testSubcomponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, TestSubcomponentImpl testSubcomponentImpl, int id) { + this.impl = impl; this.testSubcomponentImpl = testSubcomponentImpl; this.id = id; } @@ -124,49 +123,47 @@ final class DaggerTestComponent { } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } @Override public TestSubcomponent subcomponent() { - return new TestSubcomponentImpl(testComponentImpl); + return new TestSubcomponentImpl(impl); } } private static final class TestSubcomponentImplShard { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final TestSubcomponentImpl testSubcomponentImpl; Provider binding3Provider; - TestSubcomponentImplShard(TestComponentImpl testComponentImpl, - TestSubcomponentImpl testSubcomponentImpl) { - this.testComponentImpl = testComponentImpl; + TestSubcomponentImplShard(Impl impl, TestSubcomponentImpl testSubcomponentImpl) { + this.impl = impl; this.testSubcomponentImpl = testSubcomponentImpl; initialize(); } @SuppressWarnings("unchecked") private void initialize() { - this.binding3Provider = DoubleCheck.provider(new SwitchingProvider(testComponentImpl, testSubcomponentImpl, 0)); + this.binding3Provider = DoubleCheck.provider(new SwitchingProvider(impl, testSubcomponentImpl, 0)); } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final TestSubcomponentImpl testSubcomponentImpl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, - TestSubcomponentImpl testSubcomponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, TestSubcomponentImpl testSubcomponentImpl, int id) { + this.impl = impl; this.testSubcomponentImpl = testSubcomponentImpl; this.id = id; } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentShardTest/testNewShardSubcomponentCreated/dagger.internal.codegen.DaggerTestComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentShardTest/testNewShardSubcomponentCreated/dagger.internal.codegen.DaggerTestComponent_KT_DEFAULT_MODE index 17947180b89..1423ac3eb44 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentShardTest/testNewShardSubcomponentCreated/dagger.internal.codegen.DaggerTestComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentShardTest/testNewShardSubcomponentCreated/dagger.internal.codegen.DaggerTestComponent_KT_DEFAULT_MODE @@ -36,14 +36,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } private static final class TestSubcomponentImpl implements TestSubcomponent { TestSubcomponentImplShard testSubcomponentImplShard; - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final TestSubcomponentImpl testSubcomponentImpl = this; @@ -57,11 +57,11 @@ final class DaggerTestComponent { */ Provider binding2Provider; - TestSubcomponentImpl(TestComponentImpl testComponentImpl) { - this.testComponentImpl = testComponentImpl; + TestSubcomponentImpl(Impl impl) { + this.impl = impl; initialize(); - testSubcomponentImplShard = new TestSubcomponentImplShard(testComponentImpl, testSubcomponentImpl); + testSubcomponentImplShard = new TestSubcomponentImplShard(impl, testSubcomponentImpl); } @SuppressWarnings("unchecked") @@ -101,22 +101,22 @@ final class DaggerTestComponent { } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } @Override public TestSubcomponent subcomponent() { - return new TestSubcomponentImpl(testComponentImpl); + return new TestSubcomponentImpl(impl); } } private static final class TestSubcomponentImplShard { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final TestSubcomponentImpl testSubcomponentImpl; @@ -125,9 +125,8 @@ final class DaggerTestComponent { */ Provider binding3Provider; - TestSubcomponentImplShard(TestComponentImpl testComponentImpl, - TestSubcomponentImpl testSubcomponentImpl) { - this.testComponentImpl = testComponentImpl; + TestSubcomponentImplShard(Impl impl, TestSubcomponentImpl testSubcomponentImpl) { + this.impl = impl; this.testSubcomponentImpl = testSubcomponentImpl; initialize(); } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentShardTest/testNewShardSubcomponentCreated/dagger.internal.codegen.DaggerTestComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ComponentShardTest/testNewShardSubcomponentCreated/dagger.internal.codegen.DaggerTestComponent_KT_FAST_INIT_MODE index 339e74f7947..158fe3fa5f6 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentShardTest/testNewShardSubcomponentCreated/dagger.internal.codegen.DaggerTestComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ComponentShardTest/testNewShardSubcomponentCreated/dagger.internal.codegen.DaggerTestComponent_KT_FAST_INIT_MODE @@ -36,14 +36,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } private static final class TestSubcomponentImpl implements TestSubcomponent { TestSubcomponentImplShard testSubcomponentImplShard; - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final TestSubcomponentImpl testSubcomponentImpl = this; @@ -57,17 +57,17 @@ final class DaggerTestComponent { */ Provider binding2Provider; - TestSubcomponentImpl(TestComponentImpl testComponentImpl) { - this.testComponentImpl = testComponentImpl; + TestSubcomponentImpl(Impl impl) { + this.impl = impl; initialize(); - testSubcomponentImplShard = new TestSubcomponentImplShard(testComponentImpl, testSubcomponentImpl); + testSubcomponentImplShard = new TestSubcomponentImplShard(impl, testSubcomponentImpl); } @SuppressWarnings("unchecked") private void initialize() { - this.binding1Provider = DoubleCheck.provider(new SwitchingProvider<>(testComponentImpl, testSubcomponentImpl, 0)); - this.binding2Provider = DoubleCheck.provider(new SwitchingProvider<>(testComponentImpl, testSubcomponentImpl, 1)); + this.binding1Provider = DoubleCheck.provider(new SwitchingProvider<>(impl, testSubcomponentImpl, 0)); + this.binding2Provider = DoubleCheck.provider(new SwitchingProvider<>(impl, testSubcomponentImpl, 1)); } @Override @@ -101,15 +101,14 @@ final class DaggerTestComponent { } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final TestSubcomponentImpl testSubcomponentImpl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, - TestSubcomponentImpl testSubcomponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, TestSubcomponentImpl testSubcomponentImpl, int id) { + this.impl = impl; this.testSubcomponentImpl = testSubcomponentImpl; this.id = id; } @@ -130,22 +129,22 @@ final class DaggerTestComponent { } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } @Override public TestSubcomponent subcomponent() { - return new TestSubcomponentImpl(testComponentImpl); + return new TestSubcomponentImpl(impl); } } private static final class TestSubcomponentImplShard { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final TestSubcomponentImpl testSubcomponentImpl; @@ -154,28 +153,26 @@ final class DaggerTestComponent { */ Provider binding3Provider; - TestSubcomponentImplShard(TestComponentImpl testComponentImpl, - TestSubcomponentImpl testSubcomponentImpl) { - this.testComponentImpl = testComponentImpl; + TestSubcomponentImplShard(Impl impl, TestSubcomponentImpl testSubcomponentImpl) { + this.impl = impl; this.testSubcomponentImpl = testSubcomponentImpl; initialize(); } @SuppressWarnings("unchecked") private void initialize() { - this.binding3Provider = DoubleCheck.provider(new SwitchingProvider<>(testComponentImpl, testSubcomponentImpl, 0)); + this.binding3Provider = DoubleCheck.provider(new SwitchingProvider<>(impl, testSubcomponentImpl, 0)); } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final TestSubcomponentImpl testSubcomponentImpl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, - TestSubcomponentImpl testSubcomponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, TestSubcomponentImpl testSubcomponentImpl, int id) { + this.impl = impl; this.testSubcomponentImpl = testSubcomponentImpl; this.id = id; } diff --git a/javatests/dagger/internal/codegen/goldens/DaggerProcessingOptionsTest/testCmdLineOptionEnabledPrecedesAnnotationDisabled/test.DaggerSimpleComponent b/javatests/dagger/internal/codegen/goldens/DaggerProcessingOptionsTest/testCmdLineOptionEnabledPrecedesAnnotationDisabled/test.DaggerSimpleComponent index 4d0b31483f2..9ccf4534c55 100644 --- a/javatests/dagger/internal/codegen/goldens/DaggerProcessingOptionsTest/testCmdLineOptionEnabledPrecedesAnnotationDisabled/test.DaggerSimpleComponent +++ b/javatests/dagger/internal/codegen/goldens/DaggerProcessingOptionsTest/testCmdLineOptionEnabledPrecedesAnnotationDisabled/test.DaggerSimpleComponent @@ -37,16 +37,16 @@ final class DaggerSimpleComponent { } public SimpleComponent build() { - return new SimpleComponentImpl(); + return new Impl(); } } - private static final class SimpleComponentImpl implements SimpleComponent { - private final SimpleComponentImpl simpleComponentImpl = this; + private static final class Impl implements SimpleComponent { + private final Impl impl = this; Provider someInjectableTypeProvider; - SimpleComponentImpl() { + Impl() { initialize(); @@ -54,7 +54,7 @@ final class DaggerSimpleComponent { @SuppressWarnings("unchecked") private void initialize() { - this.someInjectableTypeProvider = new SwitchingProvider<>(simpleComponentImpl, 0); + this.someInjectableTypeProvider = new SwitchingProvider<>(impl, 0); } @Override @@ -73,12 +73,12 @@ final class DaggerSimpleComponent { } private static final class SwitchingProvider implements Provider { - private final SimpleComponentImpl simpleComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(SimpleComponentImpl simpleComponentImpl, int id) { - this.simpleComponentImpl = simpleComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } diff --git a/javatests/dagger/internal/codegen/goldens/DaggerProcessingOptionsTest/testFastInitEnabledFromAnnotationSucceeded/test.DaggerSimpleComponent b/javatests/dagger/internal/codegen/goldens/DaggerProcessingOptionsTest/testFastInitEnabledFromAnnotationSucceeded/test.DaggerSimpleComponent index 4d0b31483f2..9ccf4534c55 100644 --- a/javatests/dagger/internal/codegen/goldens/DaggerProcessingOptionsTest/testFastInitEnabledFromAnnotationSucceeded/test.DaggerSimpleComponent +++ b/javatests/dagger/internal/codegen/goldens/DaggerProcessingOptionsTest/testFastInitEnabledFromAnnotationSucceeded/test.DaggerSimpleComponent @@ -37,16 +37,16 @@ final class DaggerSimpleComponent { } public SimpleComponent build() { - return new SimpleComponentImpl(); + return new Impl(); } } - private static final class SimpleComponentImpl implements SimpleComponent { - private final SimpleComponentImpl simpleComponentImpl = this; + private static final class Impl implements SimpleComponent { + private final Impl impl = this; Provider someInjectableTypeProvider; - SimpleComponentImpl() { + Impl() { initialize(); @@ -54,7 +54,7 @@ final class DaggerSimpleComponent { @SuppressWarnings("unchecked") private void initialize() { - this.someInjectableTypeProvider = new SwitchingProvider<>(simpleComponentImpl, 0); + this.someInjectableTypeProvider = new SwitchingProvider<>(impl, 0); } @Override @@ -73,12 +73,12 @@ final class DaggerSimpleComponent { } private static final class SwitchingProvider implements Provider { - private final SimpleComponentImpl simpleComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(SimpleComponentImpl simpleComponentImpl, int id) { - this.simpleComponentImpl = simpleComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } diff --git a/javatests/dagger/internal/codegen/goldens/DaggerProcessingOptionsTest/testFastInitaDisabledFromAnnotationSucceeded/test.DaggerSimpleComponent b/javatests/dagger/internal/codegen/goldens/DaggerProcessingOptionsTest/testFastInitaDisabledFromAnnotationSucceeded/test.DaggerSimpleComponent index abb01cca440..c64a116400a 100644 --- a/javatests/dagger/internal/codegen/goldens/DaggerProcessingOptionsTest/testFastInitaDisabledFromAnnotationSucceeded/test.DaggerSimpleComponent +++ b/javatests/dagger/internal/codegen/goldens/DaggerProcessingOptionsTest/testFastInitaDisabledFromAnnotationSucceeded/test.DaggerSimpleComponent @@ -37,14 +37,14 @@ final class DaggerSimpleComponent { } public SimpleComponent build() { - return new SimpleComponentImpl(); + return new Impl(); } } - private static final class SimpleComponentImpl implements SimpleComponent { - private final SimpleComponentImpl simpleComponentImpl = this; + private static final class Impl implements SimpleComponent { + private final Impl impl = this; - SimpleComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/castNeeded_rawTypes_Provider_get/test.DaggerTestComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/castNeeded_rawTypes_Provider_get/test.DaggerTestComponent_DEFAULT_MODE index 56ea688813f..18aed2b73e1 100644 --- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/castNeeded_rawTypes_Provider_get/test.DaggerTestComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/castNeeded_rawTypes_Provider_get/test.DaggerTestComponent_DEFAULT_MODE @@ -38,17 +38,17 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; @SuppressWarnings("rawtypes") Provider subtypeProvider; - TestComponentImpl() { + Impl() { initialize(); diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/castNeeded_rawTypes_Provider_get/test.DaggerTestComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/castNeeded_rawTypes_Provider_get/test.DaggerTestComponent_FAST_INIT_MODE index 8051c6dda19..4cc64646f13 100644 --- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/castNeeded_rawTypes_Provider_get/test.DaggerTestComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/castNeeded_rawTypes_Provider_get/test.DaggerTestComponent_FAST_INIT_MODE @@ -38,17 +38,17 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; @SuppressWarnings("rawtypes") Provider subtypeProvider; - TestComponentImpl() { + Impl() { initialize(); @@ -56,7 +56,7 @@ final class DaggerTestComponent { @SuppressWarnings("unchecked") private void initialize() { - this.subtypeProvider = DoubleCheck.provider(new SwitchingProvider(testComponentImpl, 0)); + this.subtypeProvider = DoubleCheck.provider(new SwitchingProvider(impl, 0)); } @Override @@ -65,12 +65,12 @@ final class DaggerTestComponent { } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/castNeeded_rawTypes_Provider_get/test.DaggerTestComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/castNeeded_rawTypes_Provider_get/test.DaggerTestComponent_KT_DEFAULT_MODE index dd246ce6268..56c4f3339fe 100644 --- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/castNeeded_rawTypes_Provider_get/test.DaggerTestComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/castNeeded_rawTypes_Provider_get/test.DaggerTestComponent_KT_DEFAULT_MODE @@ -38,19 +38,19 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; /** * {@code Provider} */ Provider subtypeProvider; - TestComponentImpl() { + Impl() { initialize(); diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/castNeeded_rawTypes_Provider_get/test.DaggerTestComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/castNeeded_rawTypes_Provider_get/test.DaggerTestComponent_KT_FAST_INIT_MODE index 3371223c26d..8f9255f8b4a 100644 --- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/castNeeded_rawTypes_Provider_get/test.DaggerTestComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/castNeeded_rawTypes_Provider_get/test.DaggerTestComponent_KT_FAST_INIT_MODE @@ -38,19 +38,19 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; /** * {@code Provider} */ Provider subtypeProvider; - TestComponentImpl() { + Impl() { initialize(); @@ -58,7 +58,7 @@ final class DaggerTestComponent { @SuppressWarnings("unchecked") private void initialize() { - this.subtypeProvider = DoubleCheck.provider(new SwitchingProvider<>(testComponentImpl, 0)); + this.subtypeProvider = DoubleCheck.provider(new SwitchingProvider<>(impl, 0)); } @Override @@ -67,12 +67,12 @@ final class DaggerTestComponent { } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/castedToRawType/test.DaggerTestComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/castedToRawType/test.DaggerTestComponent_DEFAULT_MODE index 94d2a02c9cd..c5f46223072 100644 --- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/castedToRawType/test.DaggerTestComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/castedToRawType/test.DaggerTestComponent_DEFAULT_MODE @@ -35,14 +35,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/castedToRawType/test.DaggerTestComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/castedToRawType/test.DaggerTestComponent_FAST_INIT_MODE index f8351f6ea1b..f1f7f0308d5 100644 --- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/castedToRawType/test.DaggerTestComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/castedToRawType/test.DaggerTestComponent_FAST_INIT_MODE @@ -35,16 +35,16 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; Provider provideStringProvider; - TestComponentImpl() { + Impl() { initialize(); @@ -52,7 +52,7 @@ final class DaggerTestComponent { @SuppressWarnings("unchecked") private void initialize() { - this.provideStringProvider = new SwitchingProvider<>(testComponentImpl, 0); + this.provideStringProvider = new SwitchingProvider<>(impl, 0); } @Override @@ -71,12 +71,12 @@ final class DaggerTestComponent { } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/castedToRawType/test.DaggerTestComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/castedToRawType/test.DaggerTestComponent_KT_DEFAULT_MODE index 2ffa8878456..5a94c7397ea 100644 --- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/castedToRawType/test.DaggerTestComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/castedToRawType/test.DaggerTestComponent_KT_DEFAULT_MODE @@ -35,14 +35,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/castedToRawType/test.DaggerTestComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/castedToRawType/test.DaggerTestComponent_KT_FAST_INIT_MODE index b9278e58f26..b46054ebc2c 100644 --- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/castedToRawType/test.DaggerTestComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/castedToRawType/test.DaggerTestComponent_KT_FAST_INIT_MODE @@ -35,19 +35,19 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; /** * {@code Provider} */ Provider provideStringProvider; - TestComponentImpl() { + Impl() { initialize(); @@ -55,7 +55,7 @@ final class DaggerTestComponent { @SuppressWarnings("unchecked") private void initialize() { - this.provideStringProvider = new SwitchingProvider<>(testComponentImpl, 0); + this.provideStringProvider = new SwitchingProvider<>(impl, 0); } @Override @@ -74,12 +74,12 @@ final class DaggerTestComponent { } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/doubleBinds/test.DaggerTestComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/doubleBinds/test.DaggerTestComponent_DEFAULT_MODE index fbdb1c3b1de..7648d3bc9ce 100644 --- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/doubleBinds/test.DaggerTestComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/doubleBinds/test.DaggerTestComponent_DEFAULT_MODE @@ -35,14 +35,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/doubleBinds/test.DaggerTestComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/doubleBinds/test.DaggerTestComponent_FAST_INIT_MODE index afb4c88add3..fa9243f66c3 100644 --- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/doubleBinds/test.DaggerTestComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/doubleBinds/test.DaggerTestComponent_FAST_INIT_MODE @@ -35,16 +35,16 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; Provider provideStringProvider; - TestComponentImpl() { + Impl() { initialize(); @@ -52,7 +52,7 @@ final class DaggerTestComponent { @SuppressWarnings("unchecked") private void initialize() { - this.provideStringProvider = new SwitchingProvider<>(testComponentImpl, 0); + this.provideStringProvider = new SwitchingProvider<>(impl, 0); } @Override @@ -66,12 +66,12 @@ final class DaggerTestComponent { } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/doubleBinds/test.DaggerTestComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/doubleBinds/test.DaggerTestComponent_KT_DEFAULT_MODE index 04410e20a27..54dd3775886 100644 --- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/doubleBinds/test.DaggerTestComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/doubleBinds/test.DaggerTestComponent_KT_DEFAULT_MODE @@ -35,14 +35,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/doubleBinds/test.DaggerTestComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/doubleBinds/test.DaggerTestComponent_KT_FAST_INIT_MODE index 9f49533f315..161e29c9793 100644 --- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/doubleBinds/test.DaggerTestComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/doubleBinds/test.DaggerTestComponent_KT_FAST_INIT_MODE @@ -35,19 +35,19 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; /** * {@code Provider} */ Provider provideStringProvider; - TestComponentImpl() { + Impl() { initialize(); @@ -55,7 +55,7 @@ final class DaggerTestComponent { @SuppressWarnings("unchecked") private void initialize() { - this.provideStringProvider = new SwitchingProvider<>(testComponentImpl, 0); + this.provideStringProvider = new SwitchingProvider<>(impl, 0); } @Override @@ -69,12 +69,12 @@ final class DaggerTestComponent { } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/frameworkRequestOnDelegate/test.DaggerTestComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/frameworkRequestOnDelegate/test.DaggerTestComponent_DEFAULT_MODE index ed8f0bf7303..9f7f6e30bfc 100644 --- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/frameworkRequestOnDelegate/test.DaggerTestComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/frameworkRequestOnDelegate/test.DaggerTestComponent_DEFAULT_MODE @@ -35,16 +35,16 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; Provider provideStringProvider; - TestComponentImpl() { + Impl() { initialize(); diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/frameworkRequestOnDelegate/test.DaggerTestComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/frameworkRequestOnDelegate/test.DaggerTestComponent_FAST_INIT_MODE index 448a01e48d4..41c26773d3b 100644 --- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/frameworkRequestOnDelegate/test.DaggerTestComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/frameworkRequestOnDelegate/test.DaggerTestComponent_FAST_INIT_MODE @@ -35,16 +35,16 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; Provider provideStringProvider; - TestComponentImpl() { + Impl() { initialize(); @@ -52,7 +52,7 @@ final class DaggerTestComponent { @SuppressWarnings("unchecked") private void initialize() { - this.provideStringProvider = new SwitchingProvider<>(testComponentImpl, 0); + this.provideStringProvider = new SwitchingProvider<>(impl, 0); } @Override @@ -71,12 +71,12 @@ final class DaggerTestComponent { } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/frameworkRequestOnDelegate/test.DaggerTestComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/frameworkRequestOnDelegate/test.DaggerTestComponent_KT_DEFAULT_MODE index c37ce92731e..238cbc82dd6 100644 --- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/frameworkRequestOnDelegate/test.DaggerTestComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/frameworkRequestOnDelegate/test.DaggerTestComponent_KT_DEFAULT_MODE @@ -35,19 +35,19 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; /** - * {@code Provider} - */ + * {@code Provider} + */ Provider provideStringProvider; - TestComponentImpl() { + Impl() { initialize(); diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/frameworkRequestOnDelegate/test.DaggerTestComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/frameworkRequestOnDelegate/test.DaggerTestComponent_KT_FAST_INIT_MODE index a9ac8e30614..164367849fe 100644 --- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/frameworkRequestOnDelegate/test.DaggerTestComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/frameworkRequestOnDelegate/test.DaggerTestComponent_KT_FAST_INIT_MODE @@ -35,19 +35,19 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; /** - * {@code Provider} - */ + * {@code Provider} + */ Provider provideStringProvider; - TestComponentImpl() { + Impl() { initialize(); @@ -55,7 +55,7 @@ final class DaggerTestComponent { @SuppressWarnings("unchecked") private void initialize() { - this.provideStringProvider = new SwitchingProvider<>(testComponentImpl, 0); + this.provideStringProvider = new SwitchingProvider<>(impl, 0); } @Override @@ -74,12 +74,12 @@ final class DaggerTestComponent { } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/frameworkRequestOnDelegateWithMixedScopes/test.DaggerTestComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/frameworkRequestOnDelegateWithMixedScopes/test.DaggerTestComponent_DEFAULT_MODE index 8d280166ecd..c5ee7961b59 100644 --- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/frameworkRequestOnDelegateWithMixedScopes/test.DaggerTestComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/frameworkRequestOnDelegateWithMixedScopes/test.DaggerTestComponent_DEFAULT_MODE @@ -36,18 +36,18 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; Provider provideStringProvider; Provider charSequenceProvider; - TestComponentImpl() { + Impl() { initialize(); diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/frameworkRequestOnDelegateWithMixedScopes/test.DaggerTestComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/frameworkRequestOnDelegateWithMixedScopes/test.DaggerTestComponent_FAST_INIT_MODE index 99374f26b01..0314059a2a0 100644 --- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/frameworkRequestOnDelegateWithMixedScopes/test.DaggerTestComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/frameworkRequestOnDelegateWithMixedScopes/test.DaggerTestComponent_FAST_INIT_MODE @@ -36,18 +36,18 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; Provider provideStringProvider; Provider charSequenceProvider; - TestComponentImpl() { + Impl() { initialize(); @@ -55,7 +55,7 @@ final class DaggerTestComponent { @SuppressWarnings("unchecked") private void initialize() { - this.provideStringProvider = new SwitchingProvider<>(testComponentImpl, 0); + this.provideStringProvider = new SwitchingProvider<>(impl, 0); this.charSequenceProvider = DoubleCheck.provider((Provider) (provideStringProvider)); } @@ -75,12 +75,12 @@ final class DaggerTestComponent { } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/frameworkRequestOnDelegateWithMixedScopes/test.DaggerTestComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/frameworkRequestOnDelegateWithMixedScopes/test.DaggerTestComponent_KT_DEFAULT_MODE index d78e981df35..b99681a6f2f 100644 --- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/frameworkRequestOnDelegateWithMixedScopes/test.DaggerTestComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/frameworkRequestOnDelegateWithMixedScopes/test.DaggerTestComponent_KT_DEFAULT_MODE @@ -36,24 +36,24 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; /** - * {@code Provider} - */ + * {@code Provider} + */ Provider provideStringProvider; /** - * {@code Provider} - */ + * {@code Provider} + */ Provider charSequenceProvider; - TestComponentImpl() { + Impl() { initialize(); diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/frameworkRequestOnDelegateWithMixedScopes/test.DaggerTestComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/frameworkRequestOnDelegateWithMixedScopes/test.DaggerTestComponent_KT_FAST_INIT_MODE index 1d3fe0556d8..79202319e03 100644 --- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/frameworkRequestOnDelegateWithMixedScopes/test.DaggerTestComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/frameworkRequestOnDelegateWithMixedScopes/test.DaggerTestComponent_KT_FAST_INIT_MODE @@ -36,24 +36,24 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; /** - * {@code Provider} - */ + * {@code Provider} + */ Provider provideStringProvider; /** - * {@code Provider} - */ + * {@code Provider} + */ Provider charSequenceProvider; - TestComponentImpl() { + Impl() { initialize(); @@ -61,7 +61,7 @@ final class DaggerTestComponent { @SuppressWarnings("unchecked") private void initialize() { - this.provideStringProvider = new SwitchingProvider<>(testComponentImpl, 0); + this.provideStringProvider = new SwitchingProvider<>(impl, 0); this.charSequenceProvider = DoubleCheck.provider((Provider) (provideStringProvider)); } @@ -81,12 +81,12 @@ final class DaggerTestComponent { } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/inlineFactoryOfInacessibleType/test.DaggerRequestsSubtypeAsProvider_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/inlineFactoryOfInacessibleType/test.DaggerRequestsSubtypeAsProvider_DEFAULT_MODE index d9254cd094e..0449b23a36b 100644 --- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/inlineFactoryOfInacessibleType/test.DaggerRequestsSubtypeAsProvider_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/inlineFactoryOfInacessibleType/test.DaggerRequestsSubtypeAsProvider_DEFAULT_MODE @@ -37,14 +37,14 @@ final class DaggerRequestsSubtypeAsProvider { } public RequestsSubtypeAsProvider build() { - return new RequestsSubtypeAsProviderImpl(); + return new Impl(); } } - private static final class RequestsSubtypeAsProviderImpl implements RequestsSubtypeAsProvider { - private final RequestsSubtypeAsProviderImpl requestsSubtypeAsProviderImpl = this; + private static final class Impl implements RequestsSubtypeAsProvider { + private final Impl impl = this; - RequestsSubtypeAsProviderImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/inlineFactoryOfInacessibleType/test.DaggerRequestsSubtypeAsProvider_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/inlineFactoryOfInacessibleType/test.DaggerRequestsSubtypeAsProvider_FAST_INIT_MODE index 0fa5351a1c0..bf4d7953a59 100644 --- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/inlineFactoryOfInacessibleType/test.DaggerRequestsSubtypeAsProvider_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/inlineFactoryOfInacessibleType/test.DaggerRequestsSubtypeAsProvider_FAST_INIT_MODE @@ -37,17 +37,17 @@ final class DaggerRequestsSubtypeAsProvider { } public RequestsSubtypeAsProvider build() { - return new RequestsSubtypeAsProviderImpl(); + return new Impl(); } } - private static final class RequestsSubtypeAsProviderImpl implements RequestsSubtypeAsProvider { - private final RequestsSubtypeAsProviderImpl requestsSubtypeAsProviderImpl = this; + private static final class Impl implements RequestsSubtypeAsProvider { + private final Impl impl = this; @SuppressWarnings("rawtypes") Provider subtypeProvider; - RequestsSubtypeAsProviderImpl() { + Impl() { initialize(); @@ -55,7 +55,7 @@ final class DaggerRequestsSubtypeAsProvider { @SuppressWarnings("unchecked") private void initialize() { - this.subtypeProvider = new SwitchingProvider<>(requestsSubtypeAsProviderImpl, 0); + this.subtypeProvider = new SwitchingProvider<>(impl, 0); } @Override @@ -64,12 +64,12 @@ final class DaggerRequestsSubtypeAsProvider { } private static final class SwitchingProvider implements Provider { - private final RequestsSubtypeAsProviderImpl requestsSubtypeAsProviderImpl; + private final Impl impl; private final int id; - SwitchingProvider(RequestsSubtypeAsProviderImpl requestsSubtypeAsProviderImpl, int id) { - this.requestsSubtypeAsProviderImpl = requestsSubtypeAsProviderImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/inlineFactoryOfInacessibleType/test.DaggerRequestsSubtypeAsProvider_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/inlineFactoryOfInacessibleType/test.DaggerRequestsSubtypeAsProvider_KT_DEFAULT_MODE index fdafbcfabc6..b046e1f3156 100644 --- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/inlineFactoryOfInacessibleType/test.DaggerRequestsSubtypeAsProvider_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/inlineFactoryOfInacessibleType/test.DaggerRequestsSubtypeAsProvider_KT_DEFAULT_MODE @@ -37,14 +37,14 @@ final class DaggerRequestsSubtypeAsProvider { } public RequestsSubtypeAsProvider build() { - return new RequestsSubtypeAsProviderImpl(); + return new Impl(); } } - private static final class RequestsSubtypeAsProviderImpl implements RequestsSubtypeAsProvider { - private final RequestsSubtypeAsProviderImpl requestsSubtypeAsProviderImpl = this; + private static final class Impl implements RequestsSubtypeAsProvider { + private final Impl impl = this; - RequestsSubtypeAsProviderImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/inlineFactoryOfInacessibleType/test.DaggerRequestsSubtypeAsProvider_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/inlineFactoryOfInacessibleType/test.DaggerRequestsSubtypeAsProvider_KT_FAST_INIT_MODE index 22093ab6c27..c59fb89e4e5 100644 --- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/inlineFactoryOfInacessibleType/test.DaggerRequestsSubtypeAsProvider_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/inlineFactoryOfInacessibleType/test.DaggerRequestsSubtypeAsProvider_KT_FAST_INIT_MODE @@ -37,19 +37,19 @@ final class DaggerRequestsSubtypeAsProvider { } public RequestsSubtypeAsProvider build() { - return new RequestsSubtypeAsProviderImpl(); + return new Impl(); } } - private static final class RequestsSubtypeAsProviderImpl implements RequestsSubtypeAsProvider { - private final RequestsSubtypeAsProviderImpl requestsSubtypeAsProviderImpl = this; + private static final class Impl implements RequestsSubtypeAsProvider { + private final Impl impl = this; /** * {@code Provider} */ Provider subtypeProvider; - RequestsSubtypeAsProviderImpl() { + Impl() { initialize(); @@ -57,7 +57,7 @@ final class DaggerRequestsSubtypeAsProvider { @SuppressWarnings("unchecked") private void initialize() { - this.subtypeProvider = new SwitchingProvider<>(requestsSubtypeAsProviderImpl, 0); + this.subtypeProvider = new SwitchingProvider<>(impl, 0); } @Override @@ -66,12 +66,12 @@ final class DaggerRequestsSubtypeAsProvider { } private static final class SwitchingProvider implements Provider { - private final RequestsSubtypeAsProviderImpl requestsSubtypeAsProviderImpl; + private final Impl impl; private final int id; - SwitchingProvider(RequestsSubtypeAsProviderImpl requestsSubtypeAsProviderImpl, int id) { - this.requestsSubtypeAsProviderImpl = requestsSubtypeAsProviderImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/noCast_rawTypes_Provider_get_toInaccessibleType/test.DaggerTestComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/noCast_rawTypes_Provider_get_toInaccessibleType/test.DaggerTestComponent_DEFAULT_MODE index 0788689f4eb..a1f79e087c6 100644 --- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/noCast_rawTypes_Provider_get_toInaccessibleType/test.DaggerTestComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/noCast_rawTypes_Provider_get_toInaccessibleType/test.DaggerTestComponent_DEFAULT_MODE @@ -39,17 +39,17 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; @SuppressWarnings("rawtypes") Provider subtypeProvider; - TestComponentImpl() { + Impl() { initialize(); diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/noCast_rawTypes_Provider_get_toInaccessibleType/test.DaggerTestComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/noCast_rawTypes_Provider_get_toInaccessibleType/test.DaggerTestComponent_FAST_INIT_MODE index 0bf85b1aeea..48f2748a3ba 100644 --- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/noCast_rawTypes_Provider_get_toInaccessibleType/test.DaggerTestComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/noCast_rawTypes_Provider_get_toInaccessibleType/test.DaggerTestComponent_FAST_INIT_MODE @@ -39,17 +39,17 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; @SuppressWarnings("rawtypes") Provider subtypeProvider; - TestComponentImpl() { + Impl() { initialize(); @@ -57,7 +57,7 @@ final class DaggerTestComponent { @SuppressWarnings("unchecked") private void initialize() { - this.subtypeProvider = DoubleCheck.provider(new SwitchingProvider(testComponentImpl, 0)); + this.subtypeProvider = DoubleCheck.provider(new SwitchingProvider(impl, 0)); } @Override @@ -66,12 +66,12 @@ final class DaggerTestComponent { } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/noCast_rawTypes_Provider_get_toInaccessibleType/test.DaggerTestComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/noCast_rawTypes_Provider_get_toInaccessibleType/test.DaggerTestComponent_KT_DEFAULT_MODE index 9fd7f471ceb..04aa72192e5 100644 --- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/noCast_rawTypes_Provider_get_toInaccessibleType/test.DaggerTestComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/noCast_rawTypes_Provider_get_toInaccessibleType/test.DaggerTestComponent_KT_DEFAULT_MODE @@ -39,19 +39,19 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; /** * {@code Provider} */ Provider subtypeProvider; - TestComponentImpl() { + Impl() { initialize(); diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/noCast_rawTypes_Provider_get_toInaccessibleType/test.DaggerTestComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/noCast_rawTypes_Provider_get_toInaccessibleType/test.DaggerTestComponent_KT_FAST_INIT_MODE index 12cc9166f03..3df83150751 100644 --- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/noCast_rawTypes_Provider_get_toInaccessibleType/test.DaggerTestComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/noCast_rawTypes_Provider_get_toInaccessibleType/test.DaggerTestComponent_KT_FAST_INIT_MODE @@ -39,19 +39,19 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; /** * {@code Provider} */ Provider subtypeProvider; - TestComponentImpl() { + Impl() { initialize(); @@ -59,7 +59,7 @@ final class DaggerTestComponent { @SuppressWarnings("unchecked") private void initialize() { - this.subtypeProvider = DoubleCheck.provider(new SwitchingProvider<>(testComponentImpl, 0)); + this.subtypeProvider = DoubleCheck.provider(new SwitchingProvider<>(impl, 0)); } @Override @@ -68,12 +68,12 @@ final class DaggerTestComponent { } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/providerWhenBindsScopeGreaterThanDependencyScope/test.DaggerTestComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/providerWhenBindsScopeGreaterThanDependencyScope/test.DaggerTestComponent_DEFAULT_MODE index 624dedfb2a5..50e533586e9 100644 --- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/providerWhenBindsScopeGreaterThanDependencyScope/test.DaggerTestComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/providerWhenBindsScopeGreaterThanDependencyScope/test.DaggerTestComponent_DEFAULT_MODE @@ -37,18 +37,18 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; Provider provideStringProvider; Provider bindStringProvider; - TestComponentImpl() { + Impl() { initialize(); diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/providerWhenBindsScopeGreaterThanDependencyScope/test.DaggerTestComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/providerWhenBindsScopeGreaterThanDependencyScope/test.DaggerTestComponent_FAST_INIT_MODE index 30303d4a396..88e1fed3af2 100644 --- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/providerWhenBindsScopeGreaterThanDependencyScope/test.DaggerTestComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/providerWhenBindsScopeGreaterThanDependencyScope/test.DaggerTestComponent_FAST_INIT_MODE @@ -37,18 +37,18 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; Provider provideStringProvider; Provider bindStringProvider; - TestComponentImpl() { + Impl() { initialize(); @@ -56,7 +56,7 @@ final class DaggerTestComponent { @SuppressWarnings("unchecked") private void initialize() { - this.provideStringProvider = SingleCheck.provider(new SwitchingProvider(testComponentImpl, 0)); + this.provideStringProvider = SingleCheck.provider(new SwitchingProvider(impl, 0)); this.bindStringProvider = DoubleCheck.provider((Provider) (provideStringProvider)); } @@ -66,12 +66,12 @@ final class DaggerTestComponent { } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/providerWhenBindsScopeGreaterThanDependencyScope/test.DaggerTestComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/providerWhenBindsScopeGreaterThanDependencyScope/test.DaggerTestComponent_KT_DEFAULT_MODE index e4acb45e098..5d2d62fb94d 100644 --- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/providerWhenBindsScopeGreaterThanDependencyScope/test.DaggerTestComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/providerWhenBindsScopeGreaterThanDependencyScope/test.DaggerTestComponent_KT_DEFAULT_MODE @@ -37,12 +37,12 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; /** * {@code Provider} @@ -54,7 +54,7 @@ final class DaggerTestComponent { */ Provider bindStringProvider; - TestComponentImpl() { + Impl() { initialize(); diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/providerWhenBindsScopeGreaterThanDependencyScope/test.DaggerTestComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/providerWhenBindsScopeGreaterThanDependencyScope/test.DaggerTestComponent_KT_FAST_INIT_MODE index 504fd7d9528..a8bdf415745 100644 --- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/providerWhenBindsScopeGreaterThanDependencyScope/test.DaggerTestComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/providerWhenBindsScopeGreaterThanDependencyScope/test.DaggerTestComponent_KT_FAST_INIT_MODE @@ -37,12 +37,12 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; /** * {@code Provider} @@ -54,7 +54,7 @@ final class DaggerTestComponent { */ Provider bindStringProvider; - TestComponentImpl() { + Impl() { initialize(); @@ -62,7 +62,7 @@ final class DaggerTestComponent { @SuppressWarnings("unchecked") private void initialize() { - this.provideStringProvider = SingleCheck.provider(new SwitchingProvider<>(testComponentImpl, 0)); + this.provideStringProvider = SingleCheck.provider(new SwitchingProvider<>(impl, 0)); this.bindStringProvider = DoubleCheck.provider((Provider) (provideStringProvider)); } @@ -72,12 +72,12 @@ final class DaggerTestComponent { } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/toDoubleCheck/test.DaggerTestComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/toDoubleCheck/test.DaggerTestComponent_DEFAULT_MODE index 181cb144e17..c9aa5b4f07e 100644 --- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/toDoubleCheck/test.DaggerTestComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/toDoubleCheck/test.DaggerTestComponent_DEFAULT_MODE @@ -37,12 +37,12 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; Provider regularScopedProvider; @@ -52,7 +52,7 @@ final class DaggerTestComponent { Provider unscopedProvider; - TestComponentImpl() { + Impl() { initialize(); diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/toDoubleCheck/test.DaggerTestComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/toDoubleCheck/test.DaggerTestComponent_FAST_INIT_MODE index ffa05f99491..4324468542a 100644 --- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/toDoubleCheck/test.DaggerTestComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/toDoubleCheck/test.DaggerTestComponent_FAST_INIT_MODE @@ -37,12 +37,12 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; Provider regularScopedProvider; @@ -54,7 +54,7 @@ final class DaggerTestComponent { Provider unscopedProvider2; - TestComponentImpl() { + Impl() { initialize(); @@ -62,10 +62,10 @@ final class DaggerTestComponent { @SuppressWarnings("unchecked") private void initialize() { - this.regularScopedProvider = DoubleCheck.provider(new SwitchingProvider(testComponentImpl, 0)); - this.reusableScopedProvider = SingleCheck.provider(new SwitchingProvider(testComponentImpl, 1)); + this.regularScopedProvider = DoubleCheck.provider(new SwitchingProvider(impl, 0)); + this.reusableScopedProvider = SingleCheck.provider(new SwitchingProvider(impl, 1)); this.reusableProvider = DoubleCheck.provider((Provider) (reusableScopedProvider)); - this.unscopedProvider = new SwitchingProvider<>(testComponentImpl, 2); + this.unscopedProvider = new SwitchingProvider<>(impl, 2); this.unscopedProvider2 = DoubleCheck.provider((Provider) (unscopedProvider)); } @@ -85,12 +85,12 @@ final class DaggerTestComponent { } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/toDoubleCheck/test.DaggerTestComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/toDoubleCheck/test.DaggerTestComponent_KT_DEFAULT_MODE index 1259ef5e4f7..0a8083c020d 100644 --- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/toDoubleCheck/test.DaggerTestComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/toDoubleCheck/test.DaggerTestComponent_KT_DEFAULT_MODE @@ -37,12 +37,12 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; /** * {@code Provider} @@ -64,7 +64,7 @@ final class DaggerTestComponent { */ Provider unscopedProvider; - TestComponentImpl() { + Impl() { initialize(); diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/toDoubleCheck/test.DaggerTestComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/toDoubleCheck/test.DaggerTestComponent_KT_FAST_INIT_MODE index 77c04d9d651..02723064ce0 100644 --- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/toDoubleCheck/test.DaggerTestComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/toDoubleCheck/test.DaggerTestComponent_KT_FAST_INIT_MODE @@ -37,12 +37,12 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; /** * {@code Provider} @@ -69,7 +69,7 @@ final class DaggerTestComponent { */ Provider unscopedProvider2; - TestComponentImpl() { + Impl() { initialize(); @@ -77,10 +77,10 @@ final class DaggerTestComponent { @SuppressWarnings("unchecked") private void initialize() { - this.regularScopedProvider = DoubleCheck.provider(new SwitchingProvider<>(testComponentImpl, 0)); - this.reusableScopedProvider = SingleCheck.provider(new SwitchingProvider<>(testComponentImpl, 1)); + this.regularScopedProvider = DoubleCheck.provider(new SwitchingProvider<>(impl, 0)); + this.reusableScopedProvider = SingleCheck.provider(new SwitchingProvider<>(impl, 1)); this.reusableProvider = DoubleCheck.provider((Provider) (reusableScopedProvider)); - this.unscopedProvider = new SwitchingProvider<>(testComponentImpl, 2); + this.unscopedProvider = new SwitchingProvider<>(impl, 2); this.unscopedProvider2 = DoubleCheck.provider((Provider) (unscopedProvider)); } @@ -100,12 +100,12 @@ final class DaggerTestComponent { } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/toSingleCheck/test.DaggerTestComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/toSingleCheck/test.DaggerTestComponent_DEFAULT_MODE index dfd22e36efd..b39827c4e0f 100644 --- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/toSingleCheck/test.DaggerTestComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/toSingleCheck/test.DaggerTestComponent_DEFAULT_MODE @@ -37,12 +37,12 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; Provider regularScopedProvider; @@ -50,7 +50,7 @@ final class DaggerTestComponent { Provider unscopedProvider; - TestComponentImpl() { + Impl() { initialize(); diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/toSingleCheck/test.DaggerTestComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/toSingleCheck/test.DaggerTestComponent_FAST_INIT_MODE index 3758c597385..172cc9c7047 100644 --- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/toSingleCheck/test.DaggerTestComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/toSingleCheck/test.DaggerTestComponent_FAST_INIT_MODE @@ -37,12 +37,12 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; Provider regularScopedProvider; @@ -52,7 +52,7 @@ final class DaggerTestComponent { Provider unscopedProvider2; - TestComponentImpl() { + Impl() { initialize(); @@ -60,9 +60,9 @@ final class DaggerTestComponent { @SuppressWarnings("unchecked") private void initialize() { - this.regularScopedProvider = DoubleCheck.provider(new SwitchingProvider(testComponentImpl, 0)); - this.reusableScopedProvider = SingleCheck.provider(new SwitchingProvider(testComponentImpl, 1)); - this.unscopedProvider = new SwitchingProvider<>(testComponentImpl, 2); + this.regularScopedProvider = DoubleCheck.provider(new SwitchingProvider(impl, 0)); + this.reusableScopedProvider = SingleCheck.provider(new SwitchingProvider(impl, 1)); + this.unscopedProvider = new SwitchingProvider<>(impl, 2); this.unscopedProvider2 = SingleCheck.provider((Provider) (unscopedProvider)); } @@ -82,12 +82,12 @@ final class DaggerTestComponent { } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/toSingleCheck/test.DaggerTestComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/toSingleCheck/test.DaggerTestComponent_KT_DEFAULT_MODE index 77ae5d14c3c..318023fd418 100644 --- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/toSingleCheck/test.DaggerTestComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/toSingleCheck/test.DaggerTestComponent_KT_DEFAULT_MODE @@ -37,12 +37,12 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; /** * {@code Provider} @@ -59,7 +59,7 @@ final class DaggerTestComponent { */ Provider unscopedProvider; - TestComponentImpl() { + Impl() { initialize(); diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/toSingleCheck/test.DaggerTestComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/toSingleCheck/test.DaggerTestComponent_KT_FAST_INIT_MODE index 59b9baf385e..1e7ce6a4984 100644 --- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/toSingleCheck/test.DaggerTestComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/toSingleCheck/test.DaggerTestComponent_KT_FAST_INIT_MODE @@ -37,12 +37,12 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; /** * {@code Provider} @@ -64,7 +64,7 @@ final class DaggerTestComponent { */ Provider unscopedProvider2; - TestComponentImpl() { + Impl() { initialize(); @@ -72,9 +72,9 @@ final class DaggerTestComponent { @SuppressWarnings("unchecked") private void initialize() { - this.regularScopedProvider = DoubleCheck.provider(new SwitchingProvider<>(testComponentImpl, 0)); - this.reusableScopedProvider = SingleCheck.provider(new SwitchingProvider<>(testComponentImpl, 1)); - this.unscopedProvider = new SwitchingProvider<>(testComponentImpl, 2); + this.regularScopedProvider = DoubleCheck.provider(new SwitchingProvider<>(impl, 0)); + this.reusableScopedProvider = SingleCheck.provider(new SwitchingProvider<>(impl, 1)); + this.unscopedProvider = new SwitchingProvider<>(impl, 2); this.unscopedProvider2 = SingleCheck.provider((Provider) (unscopedProvider)); } @@ -94,12 +94,12 @@ final class DaggerTestComponent { } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/toUnscoped/test.DaggerTestComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/toUnscoped/test.DaggerTestComponent_DEFAULT_MODE index eb31626557c..6c3bf2fb935 100644 --- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/toUnscoped/test.DaggerTestComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/toUnscoped/test.DaggerTestComponent_DEFAULT_MODE @@ -37,18 +37,18 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; Provider regularScopedProvider; Provider reusableScopedProvider; - TestComponentImpl() { + Impl() { initialize(); diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/toUnscoped/test.DaggerTestComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/toUnscoped/test.DaggerTestComponent_FAST_INIT_MODE index baddc7b393a..d3104371420 100644 --- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/toUnscoped/test.DaggerTestComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/toUnscoped/test.DaggerTestComponent_FAST_INIT_MODE @@ -37,18 +37,18 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; Provider regularScopedProvider; Provider reusableScopedProvider; - TestComponentImpl() { + Impl() { initialize(); @@ -56,8 +56,8 @@ final class DaggerTestComponent { @SuppressWarnings("unchecked") private void initialize() { - this.regularScopedProvider = DoubleCheck.provider(new SwitchingProvider(testComponentImpl, 0)); - this.reusableScopedProvider = SingleCheck.provider(new SwitchingProvider(testComponentImpl, 1)); + this.regularScopedProvider = DoubleCheck.provider(new SwitchingProvider(impl, 0)); + this.reusableScopedProvider = SingleCheck.provider(new SwitchingProvider(impl, 1)); } @Override @@ -76,12 +76,12 @@ final class DaggerTestComponent { } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/toUnscoped/test.DaggerTestComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/toUnscoped/test.DaggerTestComponent_KT_DEFAULT_MODE index d88cbf8a0d1..54f19de1d33 100644 --- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/toUnscoped/test.DaggerTestComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/toUnscoped/test.DaggerTestComponent_KT_DEFAULT_MODE @@ -37,12 +37,12 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; /** * {@code Provider} @@ -54,7 +54,7 @@ final class DaggerTestComponent { */ Provider reusableScopedProvider; - TestComponentImpl() { + Impl() { initialize(); diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/toUnscoped/test.DaggerTestComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/toUnscoped/test.DaggerTestComponent_KT_FAST_INIT_MODE index 58731a2f4a3..30aa1364667 100644 --- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/toUnscoped/test.DaggerTestComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest/toUnscoped/test.DaggerTestComponent_KT_FAST_INIT_MODE @@ -37,12 +37,12 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; /** * {@code Provider} @@ -54,7 +54,7 @@ final class DaggerTestComponent { */ Provider reusableScopedProvider; - TestComponentImpl() { + Impl() { initialize(); @@ -62,8 +62,8 @@ final class DaggerTestComponent { @SuppressWarnings("unchecked") private void initialize() { - this.regularScopedProvider = DoubleCheck.provider(new SwitchingProvider<>(testComponentImpl, 0)); - this.reusableScopedProvider = SingleCheck.provider(new SwitchingProvider<>(testComponentImpl, 1)); + this.regularScopedProvider = DoubleCheck.provider(new SwitchingProvider<>(impl, 0)); + this.reusableScopedProvider = SingleCheck.provider(new SwitchingProvider<>(impl, 1)); } @Override @@ -82,12 +82,12 @@ final class DaggerTestComponent { } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } diff --git a/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest/scopedBinding_onlyUsedInSubcomponent/test.DaggerSimpleComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest/scopedBinding_onlyUsedInSubcomponent/test.DaggerSimpleComponent_DEFAULT_MODE index 92c4f42919c..3b688aca88b 100644 --- a/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest/scopedBinding_onlyUsedInSubcomponent/test.DaggerSimpleComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest/scopedBinding_onlyUsedInSubcomponent/test.DaggerSimpleComponent_DEFAULT_MODE @@ -36,33 +36,33 @@ final class DaggerSimpleComponent { } public SimpleComponent build() { - return new SimpleComponentImpl(); + return new Impl(); } } private static final class SubImpl implements Sub { - private final SimpleComponentImpl simpleComponentImpl; + private final Impl impl; private final SubImpl subImpl = this; - SubImpl(SimpleComponentImpl simpleComponentImpl) { - this.simpleComponentImpl = simpleComponentImpl; + SubImpl(Impl impl) { + this.impl = impl; } @Override public DependsOnScoped dependsOnScoped() { - return new DependsOnScoped(simpleComponentImpl.scopedTypeProvider.get()); + return new DependsOnScoped(impl.scopedTypeProvider.get()); } } - private static final class SimpleComponentImpl implements SimpleComponent { - private final SimpleComponentImpl simpleComponentImpl = this; + private static final class Impl implements SimpleComponent { + private final Impl impl = this; Provider scopedTypeProvider; - SimpleComponentImpl() { + Impl() { initialize(); @@ -75,7 +75,7 @@ final class DaggerSimpleComponent { @Override public Sub sub() { - return new SubImpl(simpleComponentImpl); + return new SubImpl(impl); } } } diff --git a/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest/scopedBinding_onlyUsedInSubcomponent/test.DaggerSimpleComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest/scopedBinding_onlyUsedInSubcomponent/test.DaggerSimpleComponent_FAST_INIT_MODE index d5563ad33a1..2a5fd489289 100644 --- a/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest/scopedBinding_onlyUsedInSubcomponent/test.DaggerSimpleComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest/scopedBinding_onlyUsedInSubcomponent/test.DaggerSimpleComponent_FAST_INIT_MODE @@ -36,33 +36,33 @@ final class DaggerSimpleComponent { } public SimpleComponent build() { - return new SimpleComponentImpl(); + return new Impl(); } } private static final class SubImpl implements Sub { - private final SimpleComponentImpl simpleComponentImpl; + private final Impl impl; private final SubImpl subImpl = this; - SubImpl(SimpleComponentImpl simpleComponentImpl) { - this.simpleComponentImpl = simpleComponentImpl; + SubImpl(Impl impl) { + this.impl = impl; } @Override public DependsOnScoped dependsOnScoped() { - return new DependsOnScoped(simpleComponentImpl.scopedTypeProvider.get()); + return new DependsOnScoped(impl.scopedTypeProvider.get()); } } - private static final class SimpleComponentImpl implements SimpleComponent { - private final SimpleComponentImpl simpleComponentImpl = this; + private static final class Impl implements SimpleComponent { + private final Impl impl = this; Provider scopedTypeProvider; - SimpleComponentImpl() { + Impl() { initialize(); @@ -70,21 +70,21 @@ final class DaggerSimpleComponent { @SuppressWarnings("unchecked") private void initialize() { - this.scopedTypeProvider = DoubleCheck.provider(new SwitchingProvider(simpleComponentImpl, 0)); + this.scopedTypeProvider = DoubleCheck.provider(new SwitchingProvider(impl, 0)); } @Override public Sub sub() { - return new SubImpl(simpleComponentImpl); + return new SubImpl(impl); } private static final class SwitchingProvider implements Provider { - private final SimpleComponentImpl simpleComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(SimpleComponentImpl simpleComponentImpl, int id) { - this.simpleComponentImpl = simpleComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } diff --git a/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest/scopedBinding_onlyUsedInSubcomponent/test.DaggerSimpleComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest/scopedBinding_onlyUsedInSubcomponent/test.DaggerSimpleComponent_KT_DEFAULT_MODE index 8b561f30eae..854f62ffa2e 100644 --- a/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest/scopedBinding_onlyUsedInSubcomponent/test.DaggerSimpleComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest/scopedBinding_onlyUsedInSubcomponent/test.DaggerSimpleComponent_KT_DEFAULT_MODE @@ -36,36 +36,36 @@ final class DaggerSimpleComponent { } public SimpleComponent build() { - return new SimpleComponentImpl(); + return new Impl(); } } private static final class SubImpl implements Sub { - private final SimpleComponentImpl simpleComponentImpl; + private final Impl impl; private final SubImpl subImpl = this; - SubImpl(SimpleComponentImpl simpleComponentImpl) { - this.simpleComponentImpl = simpleComponentImpl; + SubImpl(Impl impl) { + this.impl = impl; } @Override public DependsOnScoped dependsOnScoped() { - return (DependsOnScoped) ((Object) (DependsOnScoped_Factory.newInstance(simpleComponentImpl.scopedTypeProvider.get()))); + return (DependsOnScoped) ((Object) (DependsOnScoped_Factory.newInstance(impl.scopedTypeProvider.get()))); } } - private static final class SimpleComponentImpl implements SimpleComponent { - private final SimpleComponentImpl simpleComponentImpl = this; + private static final class Impl implements SimpleComponent { + private final Impl impl = this; /** * {@code Provider} */ Provider scopedTypeProvider; - SimpleComponentImpl() { + Impl() { initialize(); @@ -78,7 +78,7 @@ final class DaggerSimpleComponent { @Override public Sub sub() { - return new SubImpl(simpleComponentImpl); + return new SubImpl(impl); } } } diff --git a/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest/scopedBinding_onlyUsedInSubcomponent/test.DaggerSimpleComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest/scopedBinding_onlyUsedInSubcomponent/test.DaggerSimpleComponent_KT_FAST_INIT_MODE index 533e97eeb05..a506520e40c 100644 --- a/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest/scopedBinding_onlyUsedInSubcomponent/test.DaggerSimpleComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest/scopedBinding_onlyUsedInSubcomponent/test.DaggerSimpleComponent_KT_FAST_INIT_MODE @@ -36,36 +36,36 @@ final class DaggerSimpleComponent { } public SimpleComponent build() { - return new SimpleComponentImpl(); + return new Impl(); } } private static final class SubImpl implements Sub { - private final SimpleComponentImpl simpleComponentImpl; + private final Impl impl; private final SubImpl subImpl = this; - SubImpl(SimpleComponentImpl simpleComponentImpl) { - this.simpleComponentImpl = simpleComponentImpl; + SubImpl(Impl impl) { + this.impl = impl; } @Override public DependsOnScoped dependsOnScoped() { - return (DependsOnScoped) ((Object) (DependsOnScoped_Factory.newInstance(simpleComponentImpl.scopedTypeProvider.get()))); + return (DependsOnScoped) ((Object) (DependsOnScoped_Factory.newInstance(impl.scopedTypeProvider.get()))); } } - private static final class SimpleComponentImpl implements SimpleComponent { - private final SimpleComponentImpl simpleComponentImpl = this; + private static final class Impl implements SimpleComponent { + private final Impl impl = this; /** * {@code Provider} */ Provider scopedTypeProvider; - SimpleComponentImpl() { + Impl() { initialize(); @@ -73,21 +73,21 @@ final class DaggerSimpleComponent { @SuppressWarnings("unchecked") private void initialize() { - this.scopedTypeProvider = DoubleCheck.provider(new SwitchingProvider<>(simpleComponentImpl, 0)); + this.scopedTypeProvider = DoubleCheck.provider(new SwitchingProvider<>(impl, 0)); } @Override public Sub sub() { - return new SubImpl(simpleComponentImpl); + return new SubImpl(impl); } private static final class SwitchingProvider implements Provider { - private final SimpleComponentImpl simpleComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(SimpleComponentImpl simpleComponentImpl, int id) { - this.simpleComponentImpl = simpleComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } diff --git a/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest/simpleComponent/test.DaggerSimpleComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest/simpleComponent/test.DaggerSimpleComponent_DEFAULT_MODE index 570ded7c1ce..c35c267ad5a 100644 --- a/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest/simpleComponent/test.DaggerSimpleComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest/simpleComponent/test.DaggerSimpleComponent_DEFAULT_MODE @@ -34,14 +34,14 @@ final class DaggerSimpleComponent { } public SimpleComponent build() { - return new SimpleComponentImpl(); + return new Impl(); } } - private static final class SimpleComponentImpl implements SimpleComponent { - private final SimpleComponentImpl simpleComponentImpl = this; + private static final class Impl implements SimpleComponent { + private final Impl impl = this; - SimpleComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest/simpleComponent/test.DaggerSimpleComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest/simpleComponent/test.DaggerSimpleComponent_FAST_INIT_MODE index 570ded7c1ce..c35c267ad5a 100644 --- a/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest/simpleComponent/test.DaggerSimpleComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest/simpleComponent/test.DaggerSimpleComponent_FAST_INIT_MODE @@ -34,14 +34,14 @@ final class DaggerSimpleComponent { } public SimpleComponent build() { - return new SimpleComponentImpl(); + return new Impl(); } } - private static final class SimpleComponentImpl implements SimpleComponent { - private final SimpleComponentImpl simpleComponentImpl = this; + private static final class Impl implements SimpleComponent { + private final Impl impl = this; - SimpleComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest/simpleComponent/test.DaggerSimpleComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest/simpleComponent/test.DaggerSimpleComponent_KT_DEFAULT_MODE index cabe4615dfa..de062ea5630 100644 --- a/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest/simpleComponent/test.DaggerSimpleComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest/simpleComponent/test.DaggerSimpleComponent_KT_DEFAULT_MODE @@ -34,14 +34,14 @@ final class DaggerSimpleComponent { } public SimpleComponent build() { - return new SimpleComponentImpl(); + return new Impl(); } } - private static final class SimpleComponentImpl implements SimpleComponent { - private final SimpleComponentImpl simpleComponentImpl = this; + private static final class Impl implements SimpleComponent { + private final Impl impl = this; - SimpleComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest/simpleComponent/test.DaggerSimpleComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest/simpleComponent/test.DaggerSimpleComponent_KT_FAST_INIT_MODE index cabe4615dfa..de062ea5630 100644 --- a/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest/simpleComponent/test.DaggerSimpleComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest/simpleComponent/test.DaggerSimpleComponent_KT_FAST_INIT_MODE @@ -34,14 +34,14 @@ final class DaggerSimpleComponent { } public SimpleComponent build() { - return new SimpleComponentImpl(); + return new Impl(); } } - private static final class SimpleComponentImpl implements SimpleComponent { - private final SimpleComponentImpl simpleComponentImpl = this; + private static final class Impl implements SimpleComponent { + private final Impl impl = this; - SimpleComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest/simpleComponent_injectsProviderOf_dependsOnScoped/test.DaggerSimpleComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest/simpleComponent_injectsProviderOf_dependsOnScoped/test.DaggerSimpleComponent_DEFAULT_MODE index 2a62a7f013e..f7d96836948 100644 --- a/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest/simpleComponent_injectsProviderOf_dependsOnScoped/test.DaggerSimpleComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest/simpleComponent_injectsProviderOf_dependsOnScoped/test.DaggerSimpleComponent_DEFAULT_MODE @@ -36,18 +36,18 @@ final class DaggerSimpleComponent { } public SimpleComponent build() { - return new SimpleComponentImpl(); + return new Impl(); } } - private static final class SimpleComponentImpl implements SimpleComponent { - private final SimpleComponentImpl simpleComponentImpl = this; + private static final class Impl implements SimpleComponent { + private final Impl impl = this; Provider scopedTypeProvider; Provider dependsOnScopedProvider; - SimpleComponentImpl() { + Impl() { initialize(); diff --git a/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest/simpleComponent_injectsProviderOf_dependsOnScoped/test.DaggerSimpleComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest/simpleComponent_injectsProviderOf_dependsOnScoped/test.DaggerSimpleComponent_FAST_INIT_MODE index 12a0859a225..80724abec8a 100644 --- a/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest/simpleComponent_injectsProviderOf_dependsOnScoped/test.DaggerSimpleComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest/simpleComponent_injectsProviderOf_dependsOnScoped/test.DaggerSimpleComponent_FAST_INIT_MODE @@ -36,18 +36,18 @@ final class DaggerSimpleComponent { } public SimpleComponent build() { - return new SimpleComponentImpl(); + return new Impl(); } } - private static final class SimpleComponentImpl implements SimpleComponent { - private final SimpleComponentImpl simpleComponentImpl = this; + private static final class Impl implements SimpleComponent { + private final Impl impl = this; Provider scopedTypeProvider; Provider dependsOnScopedProvider; - SimpleComponentImpl() { + Impl() { initialize(); @@ -55,8 +55,8 @@ final class DaggerSimpleComponent { @SuppressWarnings("unchecked") private void initialize() { - this.scopedTypeProvider = DoubleCheck.provider(new SwitchingProvider(simpleComponentImpl, 1)); - this.dependsOnScopedProvider = new SwitchingProvider<>(simpleComponentImpl, 0); + this.scopedTypeProvider = DoubleCheck.provider(new SwitchingProvider(impl, 1)); + this.dependsOnScopedProvider = new SwitchingProvider<>(impl, 0); } @Override @@ -65,12 +65,12 @@ final class DaggerSimpleComponent { } private static final class SwitchingProvider implements Provider { - private final SimpleComponentImpl simpleComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(SimpleComponentImpl simpleComponentImpl, int id) { - this.simpleComponentImpl = simpleComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } @@ -79,7 +79,7 @@ final class DaggerSimpleComponent { public T get() { switch (id) { case 0: // test.DependsOnScoped - return (T) new DependsOnScoped(simpleComponentImpl.scopedTypeProvider.get()); + return (T) new DependsOnScoped(impl.scopedTypeProvider.get()); case 1: // test.ScopedType return (T) new ScopedType(); diff --git a/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest/simpleComponent_injectsProviderOf_dependsOnScoped/test.DaggerSimpleComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest/simpleComponent_injectsProviderOf_dependsOnScoped/test.DaggerSimpleComponent_KT_DEFAULT_MODE index 6546eea15f9..39e40907787 100644 --- a/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest/simpleComponent_injectsProviderOf_dependsOnScoped/test.DaggerSimpleComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest/simpleComponent_injectsProviderOf_dependsOnScoped/test.DaggerSimpleComponent_KT_DEFAULT_MODE @@ -36,12 +36,12 @@ final class DaggerSimpleComponent { } public SimpleComponent build() { - return new SimpleComponentImpl(); + return new Impl(); } } - private static final class SimpleComponentImpl implements SimpleComponent { - private final SimpleComponentImpl simpleComponentImpl = this; + private static final class Impl implements SimpleComponent { + private final Impl impl = this; /** * {@code Provider} @@ -53,7 +53,7 @@ final class DaggerSimpleComponent { */ Provider dependsOnScopedProvider; - SimpleComponentImpl() { + Impl() { initialize(); diff --git a/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest/simpleComponent_injectsProviderOf_dependsOnScoped/test.DaggerSimpleComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest/simpleComponent_injectsProviderOf_dependsOnScoped/test.DaggerSimpleComponent_KT_FAST_INIT_MODE index 9966a5093d6..acad83beb54 100644 --- a/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest/simpleComponent_injectsProviderOf_dependsOnScoped/test.DaggerSimpleComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest/simpleComponent_injectsProviderOf_dependsOnScoped/test.DaggerSimpleComponent_KT_FAST_INIT_MODE @@ -36,12 +36,12 @@ final class DaggerSimpleComponent { } public SimpleComponent build() { - return new SimpleComponentImpl(); + return new Impl(); } } - private static final class SimpleComponentImpl implements SimpleComponent { - private final SimpleComponentImpl simpleComponentImpl = this; + private static final class Impl implements SimpleComponent { + private final Impl impl = this; /** * {@code Provider} @@ -53,7 +53,7 @@ final class DaggerSimpleComponent { */ Provider dependsOnScopedProvider; - SimpleComponentImpl() { + Impl() { initialize(); @@ -61,8 +61,8 @@ final class DaggerSimpleComponent { @SuppressWarnings("unchecked") private void initialize() { - this.scopedTypeProvider = DoubleCheck.provider(new SwitchingProvider<>(simpleComponentImpl, 1)); - this.dependsOnScopedProvider = new SwitchingProvider<>(simpleComponentImpl, 0); + this.scopedTypeProvider = DoubleCheck.provider(new SwitchingProvider<>(impl, 1)); + this.dependsOnScopedProvider = new SwitchingProvider<>(impl, 0); } @Override @@ -71,12 +71,12 @@ final class DaggerSimpleComponent { } private static final class SwitchingProvider implements Provider { - private final SimpleComponentImpl simpleComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(SimpleComponentImpl simpleComponentImpl, int id) { - this.simpleComponentImpl = simpleComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } @@ -85,7 +85,7 @@ final class DaggerSimpleComponent { public T get() { switch (id) { case 0: // test.DependsOnScoped - return (T) DependsOnScoped_Factory.newInstance(simpleComponentImpl.scopedTypeProvider.get()); + return (T) DependsOnScoped_Factory.newInstance(impl.scopedTypeProvider.get()); case 1: // test.ScopedType return (T) ScopedType_Factory.newInstance(); diff --git a/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest/inaccessibleTypeBoundInALoop/test.DaggerTestComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest/inaccessibleTypeBoundInALoop/test.DaggerTestComponent_DEFAULT_MODE index 5ced9cb3cd8..af967f2cc4c 100644 --- a/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest/inaccessibleTypeBoundInALoop/test.DaggerTestComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest/inaccessibleTypeBoundInALoop/test.DaggerTestComponent_DEFAULT_MODE @@ -39,17 +39,17 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; @SuppressWarnings("rawtypes") Provider fooImplProvider; - TestComponentImpl() { + Impl() { initialize(); diff --git a/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest/inaccessibleTypeBoundInALoop/test.DaggerTestComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest/inaccessibleTypeBoundInALoop/test.DaggerTestComponent_FAST_INIT_MODE index 6e7c14949c4..37ca4c2d493 100644 --- a/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest/inaccessibleTypeBoundInALoop/test.DaggerTestComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest/inaccessibleTypeBoundInALoop/test.DaggerTestComponent_FAST_INIT_MODE @@ -39,17 +39,17 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; @SuppressWarnings("rawtypes") Provider fooImplProvider; - TestComponentImpl() { + Impl() { initialize(); @@ -62,7 +62,7 @@ final class DaggerTestComponent { @SuppressWarnings("unchecked") private void initialize() { this.fooImplProvider = new DelegateFactory<>(); - DelegateFactory.setDelegate(fooImplProvider, new SwitchingProvider<>(testComponentImpl, 0)); + DelegateFactory.setDelegate(fooImplProvider, new SwitchingProvider<>(impl, 0)); } @Override @@ -71,12 +71,12 @@ final class DaggerTestComponent { } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } @@ -85,7 +85,7 @@ final class DaggerTestComponent { public T get() { switch (id) { case 0: // other.FooImpl - return (T) FooImpl_Factory.newInstance(testComponentImpl.fooImplProvider); + return (T) FooImpl_Factory.newInstance(impl.fooImplProvider); default: throw new AssertionError(id); } diff --git a/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest/inaccessibleTypeBoundInALoop/test.DaggerTestComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest/inaccessibleTypeBoundInALoop/test.DaggerTestComponent_KT_DEFAULT_MODE index 1d23545c744..eac511c7146 100644 --- a/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest/inaccessibleTypeBoundInALoop/test.DaggerTestComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest/inaccessibleTypeBoundInALoop/test.DaggerTestComponent_KT_DEFAULT_MODE @@ -39,19 +39,19 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; /** * {@code Provider} */ Provider fooImplProvider; - TestComponentImpl() { + Impl() { initialize(); diff --git a/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest/inaccessibleTypeBoundInALoop/test.DaggerTestComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest/inaccessibleTypeBoundInALoop/test.DaggerTestComponent_KT_FAST_INIT_MODE index a17d32f32e9..bf97feeae48 100644 --- a/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest/inaccessibleTypeBoundInALoop/test.DaggerTestComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest/inaccessibleTypeBoundInALoop/test.DaggerTestComponent_KT_FAST_INIT_MODE @@ -39,19 +39,19 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; /** * {@code Provider} */ Provider fooImplProvider; - TestComponentImpl() { + Impl() { initialize(); @@ -64,7 +64,7 @@ final class DaggerTestComponent { @SuppressWarnings("unchecked") private void initialize() { this.fooImplProvider = new DelegateFactory<>(); - DelegateFactory.setDelegate((Provider) (fooImplProvider), (Provider) (new SwitchingProvider<>(testComponentImpl, 0))); + DelegateFactory.setDelegate((Provider) (fooImplProvider), (Provider) (new SwitchingProvider<>(impl, 0))); } @Override @@ -73,12 +73,12 @@ final class DaggerTestComponent { } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } @@ -87,7 +87,7 @@ final class DaggerTestComponent { public T get() { switch (id) { case 0: // other.FooImpl - return (T) FooImpl_Factory.newInstance(testComponentImpl.fooImplProvider); + return (T) FooImpl_Factory.newInstance(impl.fooImplProvider); default: throw new AssertionError(id); } diff --git a/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest/inaccessibleTypeBoundInALoopScoped/test.DaggerTestComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest/inaccessibleTypeBoundInALoopScoped/test.DaggerTestComponent_DEFAULT_MODE index 9484d892f79..9421e7b7598 100644 --- a/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest/inaccessibleTypeBoundInALoopScoped/test.DaggerTestComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest/inaccessibleTypeBoundInALoopScoped/test.DaggerTestComponent_DEFAULT_MODE @@ -40,19 +40,19 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; Provider bindProvider; @SuppressWarnings("rawtypes") Provider fooImplProvider; - TestComponentImpl() { + Impl() { initialize(); diff --git a/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest/inaccessibleTypeBoundInALoopScoped/test.DaggerTestComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest/inaccessibleTypeBoundInALoopScoped/test.DaggerTestComponent_FAST_INIT_MODE index fc1a8ef6df9..115bc39a5ca 100644 --- a/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest/inaccessibleTypeBoundInALoopScoped/test.DaggerTestComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest/inaccessibleTypeBoundInALoopScoped/test.DaggerTestComponent_FAST_INIT_MODE @@ -40,19 +40,19 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; Provider bindProvider; @SuppressWarnings("rawtypes") Provider fooImplProvider; - TestComponentImpl() { + Impl() { initialize(); @@ -65,7 +65,7 @@ final class DaggerTestComponent { @SuppressWarnings("unchecked") private void initialize() { this.bindProvider = new DelegateFactory<>(); - this.fooImplProvider = new SwitchingProvider<>(testComponentImpl, 0); + this.fooImplProvider = new SwitchingProvider<>(impl, 0); DelegateFactory.setDelegate(bindProvider, DoubleCheck.provider((Provider) (fooImplProvider))); } @@ -75,12 +75,12 @@ final class DaggerTestComponent { } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } @@ -89,7 +89,7 @@ final class DaggerTestComponent { public T get() { switch (id) { case 0: // other.FooImpl - return (T) FooImpl_Factory.newInstance(testComponentImpl.bindProvider); + return (T) FooImpl_Factory.newInstance(impl.bindProvider); default: throw new AssertionError(id); } diff --git a/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest/inaccessibleTypeBoundInALoopScoped/test.DaggerTestComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest/inaccessibleTypeBoundInALoopScoped/test.DaggerTestComponent_KT_DEFAULT_MODE index a37403f96c8..211c4862d00 100644 --- a/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest/inaccessibleTypeBoundInALoopScoped/test.DaggerTestComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest/inaccessibleTypeBoundInALoopScoped/test.DaggerTestComponent_KT_DEFAULT_MODE @@ -40,12 +40,12 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; /** * {@code Provider} @@ -57,7 +57,7 @@ final class DaggerTestComponent { */ Provider fooImplProvider; - TestComponentImpl() { + Impl() { initialize(); diff --git a/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest/inaccessibleTypeBoundInALoopScoped/test.DaggerTestComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest/inaccessibleTypeBoundInALoopScoped/test.DaggerTestComponent_KT_FAST_INIT_MODE index cdaff0264c3..dac2e7edcf7 100644 --- a/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest/inaccessibleTypeBoundInALoopScoped/test.DaggerTestComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest/inaccessibleTypeBoundInALoopScoped/test.DaggerTestComponent_KT_FAST_INIT_MODE @@ -40,12 +40,12 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; /** * {@code Provider} @@ -57,7 +57,7 @@ final class DaggerTestComponent { */ Provider fooImplProvider; - TestComponentImpl() { + Impl() { initialize(); @@ -70,7 +70,7 @@ final class DaggerTestComponent { @SuppressWarnings("unchecked") private void initialize() { this.bindProvider = new DelegateFactory<>(); - this.fooImplProvider = new SwitchingProvider<>(testComponentImpl, 0); + this.fooImplProvider = new SwitchingProvider<>(impl, 0); DelegateFactory.setDelegate((Provider) (bindProvider), (Provider) (DoubleCheck.provider((Provider) (fooImplProvider)))); } @@ -80,12 +80,12 @@ final class DaggerTestComponent { } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } @@ -94,7 +94,7 @@ final class DaggerTestComponent { public T get() { switch (id) { case 0: // other.FooImpl - return (T) FooImpl_Factory.newInstance(testComponentImpl.bindProvider); + return (T) FooImpl_Factory.newInstance(impl.bindProvider); default: throw new AssertionError(id); } diff --git a/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest/scopedInaccessibleTypeBound/test.DaggerTestComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest/scopedInaccessibleTypeBound/test.DaggerTestComponent_DEFAULT_MODE index 53c857ba70c..4607dc577d6 100644 --- a/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest/scopedInaccessibleTypeBound/test.DaggerTestComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest/scopedInaccessibleTypeBound/test.DaggerTestComponent_DEFAULT_MODE @@ -37,16 +37,16 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; Provider bindProvider; - TestComponentImpl() { + Impl() { initialize(); diff --git a/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest/scopedInaccessibleTypeBound/test.DaggerTestComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest/scopedInaccessibleTypeBound/test.DaggerTestComponent_FAST_INIT_MODE index 5614d814dbc..b5c462afe5c 100644 --- a/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest/scopedInaccessibleTypeBound/test.DaggerTestComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest/scopedInaccessibleTypeBound/test.DaggerTestComponent_FAST_INIT_MODE @@ -37,19 +37,19 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; @SuppressWarnings("rawtypes") Provider fooImplProvider; Provider bindProvider; - TestComponentImpl() { + Impl() { initialize(); @@ -57,7 +57,7 @@ final class DaggerTestComponent { @SuppressWarnings("unchecked") private void initialize() { - this.fooImplProvider = new SwitchingProvider<>(testComponentImpl, 0); + this.fooImplProvider = new SwitchingProvider<>(impl, 0); this.bindProvider = DoubleCheck.provider((Provider) (fooImplProvider)); } @@ -67,12 +67,12 @@ final class DaggerTestComponent { } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } diff --git a/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest/scopedInaccessibleTypeBound/test.DaggerTestComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest/scopedInaccessibleTypeBound/test.DaggerTestComponent_KT_DEFAULT_MODE index 390ee344f44..515ed109039 100644 --- a/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest/scopedInaccessibleTypeBound/test.DaggerTestComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest/scopedInaccessibleTypeBound/test.DaggerTestComponent_KT_DEFAULT_MODE @@ -37,19 +37,19 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; /** * {@code Provider} */ Provider bindProvider; - TestComponentImpl() { + Impl() { initialize(); diff --git a/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest/scopedInaccessibleTypeBound/test.DaggerTestComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest/scopedInaccessibleTypeBound/test.DaggerTestComponent_KT_FAST_INIT_MODE index 07217e30433..8c83d6b3809 100644 --- a/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest/scopedInaccessibleTypeBound/test.DaggerTestComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest/scopedInaccessibleTypeBound/test.DaggerTestComponent_KT_FAST_INIT_MODE @@ -37,12 +37,12 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; /** * {@code Provider} @@ -54,7 +54,7 @@ final class DaggerTestComponent { */ Provider bindProvider; - TestComponentImpl() { + Impl() { initialize(); @@ -62,7 +62,7 @@ final class DaggerTestComponent { @SuppressWarnings("unchecked") private void initialize() { - this.fooImplProvider = new SwitchingProvider<>(testComponentImpl, 0); + this.fooImplProvider = new SwitchingProvider<>(impl, 0); this.bindProvider = DoubleCheck.provider((Provider) (fooImplProvider)); } @@ -72,12 +72,12 @@ final class DaggerTestComponent { } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } diff --git a/javatests/dagger/internal/codegen/goldens/InjectConstructorFactoryGeneratorTest/boundedGenerics_withPackagePrivateTypeArgumentAndNonCyclicRecursiveBounds/other.DaggerMyComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/InjectConstructorFactoryGeneratorTest/boundedGenerics_withPackagePrivateTypeArgumentAndNonCyclicRecursiveBounds/other.DaggerMyComponent_DEFAULT_MODE index 86abfd4662e..9b049dc13b4 100644 --- a/javatests/dagger/internal/codegen/goldens/InjectConstructorFactoryGeneratorTest/boundedGenerics_withPackagePrivateTypeArgumentAndNonCyclicRecursiveBounds/other.DaggerMyComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/InjectConstructorFactoryGeneratorTest/boundedGenerics_withPackagePrivateTypeArgumentAndNonCyclicRecursiveBounds/other.DaggerMyComponent_DEFAULT_MODE @@ -40,14 +40,14 @@ final class DaggerMyComponent { } public MyComponent build() { - return new MyComponentImpl(); + return new Impl(); } } - private static final class MyComponentImpl implements MyComponent { - private final MyComponentImpl myComponentImpl = this; + private static final class Impl implements MyComponent { + private final Impl impl = this; - MyComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/InjectConstructorFactoryGeneratorTest/boundedGenerics_withPackagePrivateTypeArgumentAndNonCyclicRecursiveBounds/other.DaggerMyComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/InjectConstructorFactoryGeneratorTest/boundedGenerics_withPackagePrivateTypeArgumentAndNonCyclicRecursiveBounds/other.DaggerMyComponent_FAST_INIT_MODE index 86abfd4662e..9b049dc13b4 100644 --- a/javatests/dagger/internal/codegen/goldens/InjectConstructorFactoryGeneratorTest/boundedGenerics_withPackagePrivateTypeArgumentAndNonCyclicRecursiveBounds/other.DaggerMyComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/InjectConstructorFactoryGeneratorTest/boundedGenerics_withPackagePrivateTypeArgumentAndNonCyclicRecursiveBounds/other.DaggerMyComponent_FAST_INIT_MODE @@ -40,14 +40,14 @@ final class DaggerMyComponent { } public MyComponent build() { - return new MyComponentImpl(); + return new Impl(); } } - private static final class MyComponentImpl implements MyComponent { - private final MyComponentImpl myComponentImpl = this; + private static final class Impl implements MyComponent { + private final Impl impl = this; - MyComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/InjectConstructorFactoryGeneratorTest/boundedGenerics_withPackagePrivateTypeArgumentAndNonCyclicRecursiveBounds/other.DaggerMyComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/InjectConstructorFactoryGeneratorTest/boundedGenerics_withPackagePrivateTypeArgumentAndNonCyclicRecursiveBounds/other.DaggerMyComponent_KT_DEFAULT_MODE index d2c154640aa..fe576380f70 100644 --- a/javatests/dagger/internal/codegen/goldens/InjectConstructorFactoryGeneratorTest/boundedGenerics_withPackagePrivateTypeArgumentAndNonCyclicRecursiveBounds/other.DaggerMyComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/InjectConstructorFactoryGeneratorTest/boundedGenerics_withPackagePrivateTypeArgumentAndNonCyclicRecursiveBounds/other.DaggerMyComponent_KT_DEFAULT_MODE @@ -40,14 +40,14 @@ final class DaggerMyComponent { } public MyComponent build() { - return new MyComponentImpl(); + return new Impl(); } } - private static final class MyComponentImpl implements MyComponent { - private final MyComponentImpl myComponentImpl = this; + private static final class Impl implements MyComponent { + private final Impl impl = this; - MyComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/InjectConstructorFactoryGeneratorTest/boundedGenerics_withPackagePrivateTypeArgumentAndNonCyclicRecursiveBounds/other.DaggerMyComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/InjectConstructorFactoryGeneratorTest/boundedGenerics_withPackagePrivateTypeArgumentAndNonCyclicRecursiveBounds/other.DaggerMyComponent_KT_FAST_INIT_MODE index d2c154640aa..fe576380f70 100644 --- a/javatests/dagger/internal/codegen/goldens/InjectConstructorFactoryGeneratorTest/boundedGenerics_withPackagePrivateTypeArgumentAndNonCyclicRecursiveBounds/other.DaggerMyComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/InjectConstructorFactoryGeneratorTest/boundedGenerics_withPackagePrivateTypeArgumentAndNonCyclicRecursiveBounds/other.DaggerMyComponent_KT_FAST_INIT_MODE @@ -40,14 +40,14 @@ final class DaggerMyComponent { } public MyComponent build() { - return new MyComponentImpl(); + return new Impl(); } } - private static final class MyComponentImpl implements MyComponent { - private final MyComponentImpl myComponentImpl = this; + private static final class Impl implements MyComponent { + private final Impl impl = this; - MyComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/InjectConstructorFactoryGeneratorTest/boundedGenerics_withPackagePrivateTypeArgumentAndPublicBounds/other.DaggerMyComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/InjectConstructorFactoryGeneratorTest/boundedGenerics_withPackagePrivateTypeArgumentAndPublicBounds/other.DaggerMyComponent_DEFAULT_MODE index 67f7862e28b..c3fa266dfeb 100644 --- a/javatests/dagger/internal/codegen/goldens/InjectConstructorFactoryGeneratorTest/boundedGenerics_withPackagePrivateTypeArgumentAndPublicBounds/other.DaggerMyComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/InjectConstructorFactoryGeneratorTest/boundedGenerics_withPackagePrivateTypeArgumentAndPublicBounds/other.DaggerMyComponent_DEFAULT_MODE @@ -38,14 +38,14 @@ final class DaggerMyComponent { } public MyComponent build() { - return new MyComponentImpl(); + return new Impl(); } } - private static final class MyComponentImpl implements MyComponent { - private final MyComponentImpl myComponentImpl = this; + private static final class Impl implements MyComponent { + private final Impl impl = this; - MyComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/InjectConstructorFactoryGeneratorTest/boundedGenerics_withPackagePrivateTypeArgumentAndPublicBounds/other.DaggerMyComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/InjectConstructorFactoryGeneratorTest/boundedGenerics_withPackagePrivateTypeArgumentAndPublicBounds/other.DaggerMyComponent_FAST_INIT_MODE index 67f7862e28b..c3fa266dfeb 100644 --- a/javatests/dagger/internal/codegen/goldens/InjectConstructorFactoryGeneratorTest/boundedGenerics_withPackagePrivateTypeArgumentAndPublicBounds/other.DaggerMyComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/InjectConstructorFactoryGeneratorTest/boundedGenerics_withPackagePrivateTypeArgumentAndPublicBounds/other.DaggerMyComponent_FAST_INIT_MODE @@ -38,14 +38,14 @@ final class DaggerMyComponent { } public MyComponent build() { - return new MyComponentImpl(); + return new Impl(); } } - private static final class MyComponentImpl implements MyComponent { - private final MyComponentImpl myComponentImpl = this; + private static final class Impl implements MyComponent { + private final Impl impl = this; - MyComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/InjectConstructorFactoryGeneratorTest/boundedGenerics_withPackagePrivateTypeArgumentAndPublicBounds/other.DaggerMyComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/InjectConstructorFactoryGeneratorTest/boundedGenerics_withPackagePrivateTypeArgumentAndPublicBounds/other.DaggerMyComponent_KT_DEFAULT_MODE index 2e2544c1354..19be6b94bd6 100644 --- a/javatests/dagger/internal/codegen/goldens/InjectConstructorFactoryGeneratorTest/boundedGenerics_withPackagePrivateTypeArgumentAndPublicBounds/other.DaggerMyComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/InjectConstructorFactoryGeneratorTest/boundedGenerics_withPackagePrivateTypeArgumentAndPublicBounds/other.DaggerMyComponent_KT_DEFAULT_MODE @@ -39,14 +39,14 @@ final class DaggerMyComponent { } public MyComponent build() { - return new MyComponentImpl(); + return new Impl(); } } - private static final class MyComponentImpl implements MyComponent { - private final MyComponentImpl myComponentImpl = this; + private static final class Impl implements MyComponent { + private final Impl impl = this; - MyComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/InjectConstructorFactoryGeneratorTest/boundedGenerics_withPackagePrivateTypeArgumentAndPublicBounds/other.DaggerMyComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/InjectConstructorFactoryGeneratorTest/boundedGenerics_withPackagePrivateTypeArgumentAndPublicBounds/other.DaggerMyComponent_KT_FAST_INIT_MODE index 2e2544c1354..19be6b94bd6 100644 --- a/javatests/dagger/internal/codegen/goldens/InjectConstructorFactoryGeneratorTest/boundedGenerics_withPackagePrivateTypeArgumentAndPublicBounds/other.DaggerMyComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/InjectConstructorFactoryGeneratorTest/boundedGenerics_withPackagePrivateTypeArgumentAndPublicBounds/other.DaggerMyComponent_KT_FAST_INIT_MODE @@ -39,14 +39,14 @@ final class DaggerMyComponent { } public MyComponent build() { - return new MyComponentImpl(); + return new Impl(); } } - private static final class MyComponentImpl implements MyComponent { - private final MyComponentImpl myComponentImpl = this; + private static final class Impl implements MyComponent { + private final Impl impl = this; - MyComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/InjectConstructorFactoryGeneratorTest/boundedGenerics_withPublicTypeArgumentAndPackagePrivateBounds/other.DaggerMyComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/InjectConstructorFactoryGeneratorTest/boundedGenerics_withPublicTypeArgumentAndPackagePrivateBounds/other.DaggerMyComponent_DEFAULT_MODE index 67f7862e28b..c3fa266dfeb 100644 --- a/javatests/dagger/internal/codegen/goldens/InjectConstructorFactoryGeneratorTest/boundedGenerics_withPublicTypeArgumentAndPackagePrivateBounds/other.DaggerMyComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/InjectConstructorFactoryGeneratorTest/boundedGenerics_withPublicTypeArgumentAndPackagePrivateBounds/other.DaggerMyComponent_DEFAULT_MODE @@ -38,14 +38,14 @@ final class DaggerMyComponent { } public MyComponent build() { - return new MyComponentImpl(); + return new Impl(); } } - private static final class MyComponentImpl implements MyComponent { - private final MyComponentImpl myComponentImpl = this; + private static final class Impl implements MyComponent { + private final Impl impl = this; - MyComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/InjectConstructorFactoryGeneratorTest/boundedGenerics_withPublicTypeArgumentAndPackagePrivateBounds/other.DaggerMyComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/InjectConstructorFactoryGeneratorTest/boundedGenerics_withPublicTypeArgumentAndPackagePrivateBounds/other.DaggerMyComponent_FAST_INIT_MODE index 67f7862e28b..c3fa266dfeb 100644 --- a/javatests/dagger/internal/codegen/goldens/InjectConstructorFactoryGeneratorTest/boundedGenerics_withPublicTypeArgumentAndPackagePrivateBounds/other.DaggerMyComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/InjectConstructorFactoryGeneratorTest/boundedGenerics_withPublicTypeArgumentAndPackagePrivateBounds/other.DaggerMyComponent_FAST_INIT_MODE @@ -38,14 +38,14 @@ final class DaggerMyComponent { } public MyComponent build() { - return new MyComponentImpl(); + return new Impl(); } } - private static final class MyComponentImpl implements MyComponent { - private final MyComponentImpl myComponentImpl = this; + private static final class Impl implements MyComponent { + private final Impl impl = this; - MyComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/J2ObjCTest/componentWithNestedNullableDependency_typeUseNullable/test.DaggerMyComponent b/javatests/dagger/internal/codegen/goldens/J2ObjCTest/componentWithNestedNullableDependency_typeUseNullable/test.DaggerMyComponent index 2a82e432f72..e6407cb64cc 100644 --- a/javatests/dagger/internal/codegen/goldens/J2ObjCTest/componentWithNestedNullableDependency_typeUseNullable/test.DaggerMyComponent +++ b/javatests/dagger/internal/codegen/goldens/J2ObjCTest/componentWithNestedNullableDependency_typeUseNullable/test.DaggerMyComponent @@ -34,15 +34,15 @@ final class DaggerMyComponent { } public MyComponent build() { - return new MyComponentImpl(); + return new ComponentImpl(); } } - private static final class MyComponentImpl implements MyComponent { + private static final class ComponentImpl implements MyComponent { @Weak - private final MyComponentImpl myComponentImpl = this; + private final ComponentImpl componentImpl = this; - MyComponentImpl() { + ComponentImpl() { } diff --git a/javatests/dagger/internal/codegen/goldens/LazyClassKeyMapBindingComponentProcessorTest/lazyClassKeySimilarQualifiedName_doesNotConflict/test.DaggerTestComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/LazyClassKeyMapBindingComponentProcessorTest/lazyClassKeySimilarQualifiedName_doesNotConflict/test.DaggerTestComponent_DEFAULT_MODE index 1fb75d7a242..e508138a77e 100644 --- a/javatests/dagger/internal/codegen/goldens/LazyClassKeyMapBindingComponentProcessorTest/lazyClassKeySimilarQualifiedName_doesNotConflict/test.DaggerTestComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/LazyClassKeyMapBindingComponentProcessorTest/lazyClassKeySimilarQualifiedName_doesNotConflict/test.DaggerTestComponent_DEFAULT_MODE @@ -37,14 +37,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/LazyClassKeyMapBindingComponentProcessorTest/lazyClassKeySimilarQualifiedName_doesNotConflict/test.DaggerTestComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/LazyClassKeyMapBindingComponentProcessorTest/lazyClassKeySimilarQualifiedName_doesNotConflict/test.DaggerTestComponent_FAST_INIT_MODE index 1fb75d7a242..e508138a77e 100644 --- a/javatests/dagger/internal/codegen/goldens/LazyClassKeyMapBindingComponentProcessorTest/lazyClassKeySimilarQualifiedName_doesNotConflict/test.DaggerTestComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/LazyClassKeyMapBindingComponentProcessorTest/lazyClassKeySimilarQualifiedName_doesNotConflict/test.DaggerTestComponent_FAST_INIT_MODE @@ -37,14 +37,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/LazyClassKeyMapBindingComponentProcessorTest/lazyClassKeySimilarQualifiedName_doesNotConflict/test.DaggerTestComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/LazyClassKeyMapBindingComponentProcessorTest/lazyClassKeySimilarQualifiedName_doesNotConflict/test.DaggerTestComponent_KT_DEFAULT_MODE index 652446b16f4..fb740cb313d 100644 --- a/javatests/dagger/internal/codegen/goldens/LazyClassKeyMapBindingComponentProcessorTest/lazyClassKeySimilarQualifiedName_doesNotConflict/test.DaggerTestComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/LazyClassKeyMapBindingComponentProcessorTest/lazyClassKeySimilarQualifiedName_doesNotConflict/test.DaggerTestComponent_KT_DEFAULT_MODE @@ -37,14 +37,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/LazyClassKeyMapBindingComponentProcessorTest/lazyClassKeySimilarQualifiedName_doesNotConflict/test.DaggerTestComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/LazyClassKeyMapBindingComponentProcessorTest/lazyClassKeySimilarQualifiedName_doesNotConflict/test.DaggerTestComponent_KT_FAST_INIT_MODE index 652446b16f4..fb740cb313d 100644 --- a/javatests/dagger/internal/codegen/goldens/LazyClassKeyMapBindingComponentProcessorTest/lazyClassKeySimilarQualifiedName_doesNotConflict/test.DaggerTestComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/LazyClassKeyMapBindingComponentProcessorTest/lazyClassKeySimilarQualifiedName_doesNotConflict/test.DaggerTestComponent_KT_FAST_INIT_MODE @@ -37,14 +37,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/LazyClassKeyMapBindingComponentProcessorTest/mapBindingsWithInaccessibleKeys/test.DaggerTestComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/LazyClassKeyMapBindingComponentProcessorTest/mapBindingsWithInaccessibleKeys/test.DaggerTestComponent_DEFAULT_MODE index 6ff496d362e..f49d50bc8dc 100644 --- a/javatests/dagger/internal/codegen/goldens/LazyClassKeyMapBindingComponentProcessorTest/mapBindingsWithInaccessibleKeys/test.DaggerTestComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/LazyClassKeyMapBindingComponentProcessorTest/mapBindingsWithInaccessibleKeys/test.DaggerTestComponent_DEFAULT_MODE @@ -47,18 +47,18 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; Provider, Integer>> mapOfClassOfObjectAndIntegerProvider; Provider> mapOfComplexKeyAndIntegerProvider; - TestComponentImpl() { + Impl() { initialize(); diff --git a/javatests/dagger/internal/codegen/goldens/LazyClassKeyMapBindingComponentProcessorTest/mapBindingsWithInaccessibleKeys/test.DaggerTestComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/LazyClassKeyMapBindingComponentProcessorTest/mapBindingsWithInaccessibleKeys/test.DaggerTestComponent_FAST_INIT_MODE index ff98e5fe042..fb2373338a4 100644 --- a/javatests/dagger/internal/codegen/goldens/LazyClassKeyMapBindingComponentProcessorTest/mapBindingsWithInaccessibleKeys/test.DaggerTestComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/LazyClassKeyMapBindingComponentProcessorTest/mapBindingsWithInaccessibleKeys/test.DaggerTestComponent_FAST_INIT_MODE @@ -44,18 +44,18 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; Provider, Integer>> mapOfClassOfObjectAndIntegerProvider; Provider> mapOfComplexKeyAndIntegerProvider; - TestComponentImpl() { + Impl() { initialize(); @@ -63,8 +63,8 @@ final class DaggerTestComponent { @SuppressWarnings("unchecked") private void initialize() { - this.mapOfClassOfObjectAndIntegerProvider = new SwitchingProvider<>(testComponentImpl, 0); - this.mapOfComplexKeyAndIntegerProvider = new SwitchingProvider<>(testComponentImpl, 1); + this.mapOfClassOfObjectAndIntegerProvider = new SwitchingProvider<>(impl, 0); + this.mapOfComplexKeyAndIntegerProvider = new SwitchingProvider<>(impl, 1); } @Override @@ -88,12 +88,12 @@ final class DaggerTestComponent { } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } diff --git a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/injectMapWithoutMapBinding/test.DaggerTestComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/injectMapWithoutMapBinding/test.DaggerTestComponent_DEFAULT_MODE index e78f69750b2..7c9e964ec76 100644 --- a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/injectMapWithoutMapBinding/test.DaggerTestComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/injectMapWithoutMapBinding/test.DaggerTestComponent_DEFAULT_MODE @@ -46,16 +46,16 @@ final class DaggerTestComponent { if (mapModule == null) { this.mapModule = new MapModule(); } - return new TestComponentImpl(mapModule); + return new Impl(mapModule); } } - private static final class TestComponentImpl implements TestComponent { + private static final class Impl implements TestComponent { private final MapModule mapModule; - private final TestComponentImpl testComponentImpl = this; + private final Impl impl = this; - TestComponentImpl(MapModule mapModuleParam) { + Impl(MapModule mapModuleParam) { this.mapModule = mapModuleParam; } diff --git a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/injectMapWithoutMapBinding/test.DaggerTestComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/injectMapWithoutMapBinding/test.DaggerTestComponent_FAST_INIT_MODE index e78f69750b2..7c9e964ec76 100644 --- a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/injectMapWithoutMapBinding/test.DaggerTestComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/injectMapWithoutMapBinding/test.DaggerTestComponent_FAST_INIT_MODE @@ -46,16 +46,16 @@ final class DaggerTestComponent { if (mapModule == null) { this.mapModule = new MapModule(); } - return new TestComponentImpl(mapModule); + return new Impl(mapModule); } } - private static final class TestComponentImpl implements TestComponent { + private static final class Impl implements TestComponent { private final MapModule mapModule; - private final TestComponentImpl testComponentImpl = this; + private final Impl impl = this; - TestComponentImpl(MapModule mapModuleParam) { + Impl(MapModule mapModuleParam) { this.mapModule = mapModuleParam; } diff --git a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/injectMapWithoutMapBinding/test.DaggerTestComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/injectMapWithoutMapBinding/test.DaggerTestComponent_KT_DEFAULT_MODE index 4ecd051662c..17077bffd49 100644 --- a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/injectMapWithoutMapBinding/test.DaggerTestComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/injectMapWithoutMapBinding/test.DaggerTestComponent_KT_DEFAULT_MODE @@ -46,16 +46,16 @@ final class DaggerTestComponent { if (mapModule == null) { this.mapModule = new MapModule(); } - return new TestComponentImpl(mapModule); + return new Impl(mapModule); } } - private static final class TestComponentImpl implements TestComponent { + private static final class Impl implements TestComponent { private final MapModule mapModule; - private final TestComponentImpl testComponentImpl = this; + private final Impl impl = this; - TestComponentImpl(MapModule mapModuleParam) { + Impl(MapModule mapModuleParam) { this.mapModule = mapModuleParam; } diff --git a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/injectMapWithoutMapBinding/test.DaggerTestComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/injectMapWithoutMapBinding/test.DaggerTestComponent_KT_FAST_INIT_MODE index 4ecd051662c..17077bffd49 100644 --- a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/injectMapWithoutMapBinding/test.DaggerTestComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/injectMapWithoutMapBinding/test.DaggerTestComponent_KT_FAST_INIT_MODE @@ -46,16 +46,16 @@ final class DaggerTestComponent { if (mapModule == null) { this.mapModule = new MapModule(); } - return new TestComponentImpl(mapModule); + return new Impl(mapModule); } } - private static final class TestComponentImpl implements TestComponent { + private static final class Impl implements TestComponent { private final MapModule mapModule; - private final TestComponentImpl testComponentImpl = this; + private final Impl impl = this; - TestComponentImpl(MapModule mapModuleParam) { + Impl(MapModule mapModuleParam) { this.mapModule = mapModuleParam; } diff --git a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/mapBindingsWithEnumKey/test.DaggerTestComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/mapBindingsWithEnumKey/test.DaggerTestComponent_DEFAULT_MODE index 5c1c36741e1..450f75b7284 100644 --- a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/mapBindingsWithEnumKey/test.DaggerTestComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/mapBindingsWithEnumKey/test.DaggerTestComponent_DEFAULT_MODE @@ -58,12 +58,12 @@ final class DaggerTestComponent { if (mapModuleTwo == null) { this.mapModuleTwo = new MapModuleTwo(); } - return new TestComponentImpl(mapModuleOne, mapModuleTwo); + return new Impl(mapModuleOne, mapModuleTwo); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; Provider provideAdminHandlerProvider; @@ -71,7 +71,7 @@ final class DaggerTestComponent { Provider mapOfPathEnumAndProviderOfHandlerProvider; - TestComponentImpl(MapModuleOne mapModuleOneParam, MapModuleTwo mapModuleTwoParam) { + Impl(MapModuleOne mapModuleOneParam, MapModuleTwo mapModuleTwoParam) { initialize(mapModuleOneParam, mapModuleTwoParam); diff --git a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/mapBindingsWithEnumKey/test.DaggerTestComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/mapBindingsWithEnumKey/test.DaggerTestComponent_FAST_INIT_MODE index bc526504402..1f2bbadd86e 100644 --- a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/mapBindingsWithEnumKey/test.DaggerTestComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/mapBindingsWithEnumKey/test.DaggerTestComponent_FAST_INIT_MODE @@ -58,16 +58,16 @@ final class DaggerTestComponent { if (mapModuleTwo == null) { this.mapModuleTwo = new MapModuleTwo(); } - return new TestComponentImpl(mapModuleOne, mapModuleTwo); + return new Impl(mapModuleOne, mapModuleTwo); } } - private static final class TestComponentImpl implements TestComponent { + private static final class Impl implements TestComponent { private final MapModuleOne mapModuleOne; private final MapModuleTwo mapModuleTwo; - private final TestComponentImpl testComponentImpl = this; + private final Impl impl = this; Provider provideAdminHandlerProvider; @@ -75,7 +75,7 @@ final class DaggerTestComponent { Provider mapOfPathEnumAndProviderOfHandlerProvider; - TestComponentImpl(MapModuleOne mapModuleOneParam, MapModuleTwo mapModuleTwoParam) { + Impl(MapModuleOne mapModuleOneParam, MapModuleTwo mapModuleTwoParam) { this.mapModuleOne = mapModuleOneParam; this.mapModuleTwo = mapModuleTwoParam; initialize(mapModuleOneParam, mapModuleTwoParam); @@ -85,9 +85,9 @@ final class DaggerTestComponent { @SuppressWarnings("unchecked") private void initialize(final MapModuleOne mapModuleOneParam, final MapModuleTwo mapModuleTwoParam) { - this.provideAdminHandlerProvider = new SwitchingProvider<>(testComponentImpl, 1); - this.provideLoginHandlerProvider = new SwitchingProvider<>(testComponentImpl, 2); - this.mapOfPathEnumAndProviderOfHandlerProvider = new SwitchingProvider<>(testComponentImpl, 0); + this.provideAdminHandlerProvider = new SwitchingProvider<>(impl, 1); + this.provideLoginHandlerProvider = new SwitchingProvider<>(impl, 2); + this.mapOfPathEnumAndProviderOfHandlerProvider = new SwitchingProvider<>(impl, 0); } @Override @@ -96,12 +96,12 @@ final class DaggerTestComponent { } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } @@ -110,13 +110,13 @@ final class DaggerTestComponent { public T get() { switch (id) { case 0: // java.util.Map> - return (T) ImmutableMap.>of(PathEnum.ADMIN, testComponentImpl.provideAdminHandlerProvider, PathEnum.LOGIN, testComponentImpl.provideLoginHandlerProvider); + return (T) ImmutableMap.>of(PathEnum.ADMIN, impl.provideAdminHandlerProvider, PathEnum.LOGIN, impl.provideLoginHandlerProvider); case 1: // java.util.Map test.MapModuleOne#provideAdminHandler - return (T) MapModuleOne_ProvideAdminHandlerFactory.provideAdminHandler(testComponentImpl.mapModuleOne); + return (T) MapModuleOne_ProvideAdminHandlerFactory.provideAdminHandler(impl.mapModuleOne); case 2: // java.util.Map test.MapModuleTwo#provideLoginHandler - return (T) MapModuleTwo_ProvideLoginHandlerFactory.provideLoginHandler(testComponentImpl.mapModuleTwo); + return (T) MapModuleTwo_ProvideLoginHandlerFactory.provideLoginHandler(impl.mapModuleTwo); default: throw new AssertionError(id); } diff --git a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/mapBindingsWithEnumKey/test.DaggerTestComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/mapBindingsWithEnumKey/test.DaggerTestComponent_KT_DEFAULT_MODE index 7570e8e6a95..8a637b38a34 100644 --- a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/mapBindingsWithEnumKey/test.DaggerTestComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/mapBindingsWithEnumKey/test.DaggerTestComponent_KT_DEFAULT_MODE @@ -58,12 +58,12 @@ final class DaggerTestComponent { if (mapModuleTwo == null) { this.mapModuleTwo = new MapModuleTwo(); } - return new TestComponentImpl(mapModuleOne, mapModuleTwo); + return new Impl(mapModuleOne, mapModuleTwo); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; /** * {@code Provider} @@ -80,7 +80,7 @@ final class DaggerTestComponent { */ Provider mapOfPathEnumAndProviderOfHandlerProvider; - TestComponentImpl(MapModuleOne mapModuleOneParam, MapModuleTwo mapModuleTwoParam) { + Impl(MapModuleOne mapModuleOneParam, MapModuleTwo mapModuleTwoParam) { initialize(mapModuleOneParam, mapModuleTwoParam); diff --git a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/mapBindingsWithEnumKey/test.DaggerTestComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/mapBindingsWithEnumKey/test.DaggerTestComponent_KT_FAST_INIT_MODE index 6fccae26ea9..b148569edc4 100644 --- a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/mapBindingsWithEnumKey/test.DaggerTestComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/mapBindingsWithEnumKey/test.DaggerTestComponent_KT_FAST_INIT_MODE @@ -58,16 +58,16 @@ final class DaggerTestComponent { if (mapModuleTwo == null) { this.mapModuleTwo = new MapModuleTwo(); } - return new TestComponentImpl(mapModuleOne, mapModuleTwo); + return new Impl(mapModuleOne, mapModuleTwo); } } - private static final class TestComponentImpl implements TestComponent { + private static final class Impl implements TestComponent { private final MapModuleOne mapModuleOne; private final MapModuleTwo mapModuleTwo; - private final TestComponentImpl testComponentImpl = this; + private final Impl impl = this; /** * {@code Provider} @@ -84,7 +84,7 @@ final class DaggerTestComponent { */ Provider mapOfPathEnumAndProviderOfHandlerProvider; - TestComponentImpl(MapModuleOne mapModuleOneParam, MapModuleTwo mapModuleTwoParam) { + Impl(MapModuleOne mapModuleOneParam, MapModuleTwo mapModuleTwoParam) { this.mapModuleOne = mapModuleOneParam; this.mapModuleTwo = mapModuleTwoParam; initialize(mapModuleOneParam, mapModuleTwoParam); @@ -94,9 +94,9 @@ final class DaggerTestComponent { @SuppressWarnings("unchecked") private void initialize(final MapModuleOne mapModuleOneParam, final MapModuleTwo mapModuleTwoParam) { - this.provideAdminHandlerProvider = new SwitchingProvider<>(testComponentImpl, 1); - this.provideLoginHandlerProvider = new SwitchingProvider<>(testComponentImpl, 2); - this.mapOfPathEnumAndProviderOfHandlerProvider = new SwitchingProvider<>(testComponentImpl, 0); + this.provideAdminHandlerProvider = new SwitchingProvider<>(impl, 1); + this.provideLoginHandlerProvider = new SwitchingProvider<>(impl, 2); + this.mapOfPathEnumAndProviderOfHandlerProvider = new SwitchingProvider<>(impl, 0); } @Override @@ -105,12 +105,12 @@ final class DaggerTestComponent { } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } @@ -119,13 +119,13 @@ final class DaggerTestComponent { public T get() { switch (id) { case 0: // java.util.Map> - return (T) ImmutableMap.of(PathEnum.ADMIN, testComponentImpl.provideAdminHandlerProvider, PathEnum.LOGIN, testComponentImpl.provideLoginHandlerProvider); + return (T) ImmutableMap.of(PathEnum.ADMIN, impl.provideAdminHandlerProvider, PathEnum.LOGIN, impl.provideLoginHandlerProvider); case 1: // java.util.Map test.MapModuleOne#provideAdminHandler - return (T) MapModuleOne_ProvideAdminHandlerFactory.provideAdminHandler(testComponentImpl.mapModuleOne); + return (T) MapModuleOne_ProvideAdminHandlerFactory.provideAdminHandler(impl.mapModuleOne); case 2: // java.util.Map test.MapModuleTwo#provideLoginHandler - return (T) MapModuleTwo_ProvideLoginHandlerFactory.provideLoginHandler(testComponentImpl.mapModuleTwo); + return (T) MapModuleTwo_ProvideLoginHandlerFactory.provideLoginHandler(impl.mapModuleTwo); default: throw new AssertionError(id); } diff --git a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/mapBindingsWithInaccessibleKeys/test.DaggerTestComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/mapBindingsWithInaccessibleKeys/test.DaggerTestComponent_DEFAULT_MODE index d6dab00cdfc..581cc065bb1 100644 --- a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/mapBindingsWithInaccessibleKeys/test.DaggerTestComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/mapBindingsWithInaccessibleKeys/test.DaggerTestComponent_DEFAULT_MODE @@ -48,12 +48,12 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; Provider, Integer>> mapOfClassOfObjectAndIntegerProvider; @@ -62,7 +62,7 @@ final class DaggerTestComponent { Provider> mapOfComplexKeyAndIntegerProvider; - TestComponentImpl() { + Impl() { initialize(); diff --git a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/mapBindingsWithInaccessibleKeys/test.DaggerTestComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/mapBindingsWithInaccessibleKeys/test.DaggerTestComponent_FAST_INIT_MODE index 15d49cb41da..5edd2fb67db 100644 --- a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/mapBindingsWithInaccessibleKeys/test.DaggerTestComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/mapBindingsWithInaccessibleKeys/test.DaggerTestComponent_FAST_INIT_MODE @@ -44,12 +44,12 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; Provider, Integer>> mapOfClassOfObjectAndIntegerProvider; @@ -58,7 +58,7 @@ final class DaggerTestComponent { Provider> mapOfComplexKeyAndIntegerProvider; - TestComponentImpl() { + Impl() { initialize(); @@ -66,9 +66,9 @@ final class DaggerTestComponent { @SuppressWarnings("unchecked") private void initialize() { - this.mapOfClassOfObjectAndIntegerProvider = new SwitchingProvider<>(testComponentImpl, 0); - this.mapOfPackagePrivateEnumAndIntegerProvider = new SwitchingProvider<>(testComponentImpl, 1); - this.mapOfComplexKeyAndIntegerProvider = new SwitchingProvider<>(testComponentImpl, 2); + this.mapOfClassOfObjectAndIntegerProvider = new SwitchingProvider<>(impl, 0); + this.mapOfPackagePrivateEnumAndIntegerProvider = new SwitchingProvider<>(impl, 1); + this.mapOfComplexKeyAndIntegerProvider = new SwitchingProvider<>(impl, 2); } @Override @@ -102,12 +102,12 @@ final class DaggerTestComponent { } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } diff --git a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/mapBindingsWithNonProviderValue/test.DaggerTestComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/mapBindingsWithNonProviderValue/test.DaggerTestComponent_DEFAULT_MODE index c98b7689abc..203b5748084 100644 --- a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/mapBindingsWithNonProviderValue/test.DaggerTestComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/mapBindingsWithNonProviderValue/test.DaggerTestComponent_DEFAULT_MODE @@ -58,12 +58,12 @@ final class DaggerTestComponent { if (mapModuleTwo == null) { this.mapModuleTwo = new MapModuleTwo(); } - return new TestComponentImpl(mapModuleOne, mapModuleTwo); + return new Impl(mapModuleOne, mapModuleTwo); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; Provider provideAdminHandlerProvider; @@ -71,7 +71,7 @@ final class DaggerTestComponent { Provider> mapOfPathEnumAndHandlerProvider; - TestComponentImpl(MapModuleOne mapModuleOneParam, MapModuleTwo mapModuleTwoParam) { + Impl(MapModuleOne mapModuleOneParam, MapModuleTwo mapModuleTwoParam) { initialize(mapModuleOneParam, mapModuleTwoParam); diff --git a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/mapBindingsWithNonProviderValue/test.DaggerTestComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/mapBindingsWithNonProviderValue/test.DaggerTestComponent_FAST_INIT_MODE index 52b9fd52cf3..575a2322ea5 100644 --- a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/mapBindingsWithNonProviderValue/test.DaggerTestComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/mapBindingsWithNonProviderValue/test.DaggerTestComponent_FAST_INIT_MODE @@ -58,20 +58,20 @@ final class DaggerTestComponent { if (mapModuleTwo == null) { this.mapModuleTwo = new MapModuleTwo(); } - return new TestComponentImpl(mapModuleOne, mapModuleTwo); + return new Impl(mapModuleOne, mapModuleTwo); } } - private static final class TestComponentImpl implements TestComponent { + private static final class Impl implements TestComponent { private final MapModuleOne mapModuleOne; private final MapModuleTwo mapModuleTwo; - private final TestComponentImpl testComponentImpl = this; + private final Impl impl = this; Provider> mapOfPathEnumAndHandlerProvider; - TestComponentImpl(MapModuleOne mapModuleOneParam, MapModuleTwo mapModuleTwoParam) { + Impl(MapModuleOne mapModuleOneParam, MapModuleTwo mapModuleTwoParam) { this.mapModuleOne = mapModuleOneParam; this.mapModuleTwo = mapModuleTwoParam; initialize(mapModuleOneParam, mapModuleTwoParam); @@ -81,7 +81,7 @@ final class DaggerTestComponent { @SuppressWarnings("unchecked") private void initialize(final MapModuleOne mapModuleOneParam, final MapModuleTwo mapModuleTwoParam) { - this.mapOfPathEnumAndHandlerProvider = new SwitchingProvider<>(testComponentImpl, 0); + this.mapOfPathEnumAndHandlerProvider = new SwitchingProvider<>(impl, 0); } @Override @@ -90,12 +90,12 @@ final class DaggerTestComponent { } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } @@ -104,7 +104,7 @@ final class DaggerTestComponent { public T get() { switch (id) { case 0: // java.util.Map - return (T) ImmutableMap.of(PathEnum.ADMIN, MapModuleOne_ProvideAdminHandlerFactory.provideAdminHandler(testComponentImpl.mapModuleOne), PathEnum.LOGIN, MapModuleTwo_ProvideLoginHandlerFactory.provideLoginHandler(testComponentImpl.mapModuleTwo)); + return (T) ImmutableMap.of(PathEnum.ADMIN, MapModuleOne_ProvideAdminHandlerFactory.provideAdminHandler(impl.mapModuleOne), PathEnum.LOGIN, MapModuleTwo_ProvideLoginHandlerFactory.provideLoginHandler(impl.mapModuleTwo)); default: throw new AssertionError(id); } diff --git a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/mapBindingsWithNonProviderValue/test.DaggerTestComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/mapBindingsWithNonProviderValue/test.DaggerTestComponent_KT_DEFAULT_MODE index 9be65ca8105..11c93a53e7d 100644 --- a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/mapBindingsWithNonProviderValue/test.DaggerTestComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/mapBindingsWithNonProviderValue/test.DaggerTestComponent_KT_DEFAULT_MODE @@ -58,12 +58,12 @@ final class DaggerTestComponent { if (mapModuleTwo == null) { this.mapModuleTwo = new MapModuleTwo(); } - return new TestComponentImpl(mapModuleOne, mapModuleTwo); + return new Impl(mapModuleOne, mapModuleTwo); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; /** * {@code Provider} @@ -80,7 +80,7 @@ final class DaggerTestComponent { */ Provider mapOfPathEnumAndHandlerProvider; - TestComponentImpl(MapModuleOne mapModuleOneParam, MapModuleTwo mapModuleTwoParam) { + Impl(MapModuleOne mapModuleOneParam, MapModuleTwo mapModuleTwoParam) { initialize(mapModuleOneParam, mapModuleTwoParam); diff --git a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/mapBindingsWithNonProviderValue/test.DaggerTestComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/mapBindingsWithNonProviderValue/test.DaggerTestComponent_KT_FAST_INIT_MODE index 7d21aa2dab8..c77c9b61e34 100644 --- a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/mapBindingsWithNonProviderValue/test.DaggerTestComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/mapBindingsWithNonProviderValue/test.DaggerTestComponent_KT_FAST_INIT_MODE @@ -58,23 +58,23 @@ final class DaggerTestComponent { if (mapModuleTwo == null) { this.mapModuleTwo = new MapModuleTwo(); } - return new TestComponentImpl(mapModuleOne, mapModuleTwo); + return new Impl(mapModuleOne, mapModuleTwo); } } - private static final class TestComponentImpl implements TestComponent { + private static final class Impl implements TestComponent { private final MapModuleOne mapModuleOne; private final MapModuleTwo mapModuleTwo; - private final TestComponentImpl testComponentImpl = this; + private final Impl impl = this; /** * {@code Provider>} */ Provider mapOfPathEnumAndHandlerProvider; - TestComponentImpl(MapModuleOne mapModuleOneParam, MapModuleTwo mapModuleTwoParam) { + Impl(MapModuleOne mapModuleOneParam, MapModuleTwo mapModuleTwoParam) { this.mapModuleOne = mapModuleOneParam; this.mapModuleTwo = mapModuleTwoParam; initialize(mapModuleOneParam, mapModuleTwoParam); @@ -84,7 +84,7 @@ final class DaggerTestComponent { @SuppressWarnings("unchecked") private void initialize(final MapModuleOne mapModuleOneParam, final MapModuleTwo mapModuleTwoParam) { - this.mapOfPathEnumAndHandlerProvider = new SwitchingProvider<>(testComponentImpl, 0); + this.mapOfPathEnumAndHandlerProvider = new SwitchingProvider<>(impl, 0); } @Override @@ -93,12 +93,12 @@ final class DaggerTestComponent { } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } @@ -107,7 +107,7 @@ final class DaggerTestComponent { public T get() { switch (id) { case 0: // java.util.Map - return (T) ImmutableMap.of(PathEnum.ADMIN, MapModuleOne_ProvideAdminHandlerFactory.provideAdminHandler(testComponentImpl.mapModuleOne), PathEnum.LOGIN, MapModuleTwo_ProvideLoginHandlerFactory.provideLoginHandler(testComponentImpl.mapModuleTwo)); + return (T) ImmutableMap.of(PathEnum.ADMIN, MapModuleOne_ProvideAdminHandlerFactory.provideAdminHandler(impl.mapModuleOne), PathEnum.LOGIN, MapModuleTwo_ProvideLoginHandlerFactory.provideLoginHandler(impl.mapModuleTwo)); default: throw new AssertionError(id); } diff --git a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/mapBindingsWithStringKey/test.DaggerTestComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/mapBindingsWithStringKey/test.DaggerTestComponent_DEFAULT_MODE index 3b318d68d81..8eb565167de 100644 --- a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/mapBindingsWithStringKey/test.DaggerTestComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/mapBindingsWithStringKey/test.DaggerTestComponent_DEFAULT_MODE @@ -58,12 +58,12 @@ final class DaggerTestComponent { if (mapModuleTwo == null) { this.mapModuleTwo = new MapModuleTwo(); } - return new TestComponentImpl(mapModuleOne, mapModuleTwo); + return new Impl(mapModuleOne, mapModuleTwo); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; Provider provideAdminHandlerProvider; @@ -71,7 +71,7 @@ final class DaggerTestComponent { Provider mapOfStringAndProviderOfHandlerProvider; - TestComponentImpl(MapModuleOne mapModuleOneParam, MapModuleTwo mapModuleTwoParam) { + Impl(MapModuleOne mapModuleOneParam, MapModuleTwo mapModuleTwoParam) { initialize(mapModuleOneParam, mapModuleTwoParam); diff --git a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/mapBindingsWithStringKey/test.DaggerTestComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/mapBindingsWithStringKey/test.DaggerTestComponent_FAST_INIT_MODE index 1f26da99e7b..78131f6a18a 100644 --- a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/mapBindingsWithStringKey/test.DaggerTestComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/mapBindingsWithStringKey/test.DaggerTestComponent_FAST_INIT_MODE @@ -58,16 +58,16 @@ final class DaggerTestComponent { if (mapModuleTwo == null) { this.mapModuleTwo = new MapModuleTwo(); } - return new TestComponentImpl(mapModuleOne, mapModuleTwo); + return new Impl(mapModuleOne, mapModuleTwo); } } - private static final class TestComponentImpl implements TestComponent { + private static final class Impl implements TestComponent { private final MapModuleOne mapModuleOne; private final MapModuleTwo mapModuleTwo; - private final TestComponentImpl testComponentImpl = this; + private final Impl impl = this; Provider provideAdminHandlerProvider; @@ -75,7 +75,7 @@ final class DaggerTestComponent { Provider mapOfStringAndProviderOfHandlerProvider; - TestComponentImpl(MapModuleOne mapModuleOneParam, MapModuleTwo mapModuleTwoParam) { + Impl(MapModuleOne mapModuleOneParam, MapModuleTwo mapModuleTwoParam) { this.mapModuleOne = mapModuleOneParam; this.mapModuleTwo = mapModuleTwoParam; initialize(mapModuleOneParam, mapModuleTwoParam); @@ -85,9 +85,9 @@ final class DaggerTestComponent { @SuppressWarnings("unchecked") private void initialize(final MapModuleOne mapModuleOneParam, final MapModuleTwo mapModuleTwoParam) { - this.provideAdminHandlerProvider = new SwitchingProvider<>(testComponentImpl, 1); - this.provideLoginHandlerProvider = new SwitchingProvider<>(testComponentImpl, 2); - this.mapOfStringAndProviderOfHandlerProvider = new SwitchingProvider<>(testComponentImpl, 0); + this.provideAdminHandlerProvider = new SwitchingProvider<>(impl, 1); + this.provideLoginHandlerProvider = new SwitchingProvider<>(impl, 2); + this.mapOfStringAndProviderOfHandlerProvider = new SwitchingProvider<>(impl, 0); } @Override @@ -96,12 +96,12 @@ final class DaggerTestComponent { } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } @@ -110,13 +110,13 @@ final class DaggerTestComponent { public T get() { switch (id) { case 0: // java.util.Map> - return (T) ImmutableMap.>of("Admin", testComponentImpl.provideAdminHandlerProvider, "Login", testComponentImpl.provideLoginHandlerProvider); + return (T) ImmutableMap.>of("Admin", impl.provideAdminHandlerProvider, "Login", impl.provideLoginHandlerProvider); case 1: // java.util.Map test.MapModuleOne#provideAdminHandler - return (T) MapModuleOne_ProvideAdminHandlerFactory.provideAdminHandler(testComponentImpl.mapModuleOne); + return (T) MapModuleOne_ProvideAdminHandlerFactory.provideAdminHandler(impl.mapModuleOne); case 2: // java.util.Map test.MapModuleTwo#provideLoginHandler - return (T) MapModuleTwo_ProvideLoginHandlerFactory.provideLoginHandler(testComponentImpl.mapModuleTwo); + return (T) MapModuleTwo_ProvideLoginHandlerFactory.provideLoginHandler(impl.mapModuleTwo); default: throw new AssertionError(id); } diff --git a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/mapBindingsWithStringKey/test.DaggerTestComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/mapBindingsWithStringKey/test.DaggerTestComponent_KT_DEFAULT_MODE index 65a3b0be152..e9cdafb9ea5 100644 --- a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/mapBindingsWithStringKey/test.DaggerTestComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/mapBindingsWithStringKey/test.DaggerTestComponent_KT_DEFAULT_MODE @@ -58,12 +58,12 @@ final class DaggerTestComponent { if (mapModuleTwo == null) { this.mapModuleTwo = new MapModuleTwo(); } - return new TestComponentImpl(mapModuleOne, mapModuleTwo); + return new Impl(mapModuleOne, mapModuleTwo); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; /** * {@code Provider} @@ -80,7 +80,7 @@ final class DaggerTestComponent { */ Provider mapOfStringAndProviderOfHandlerProvider; - TestComponentImpl(MapModuleOne mapModuleOneParam, MapModuleTwo mapModuleTwoParam) { + Impl(MapModuleOne mapModuleOneParam, MapModuleTwo mapModuleTwoParam) { initialize(mapModuleOneParam, mapModuleTwoParam); diff --git a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/mapBindingsWithStringKey/test.DaggerTestComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/mapBindingsWithStringKey/test.DaggerTestComponent_KT_FAST_INIT_MODE index 2c61de98789..35f9beab4d7 100644 --- a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/mapBindingsWithStringKey/test.DaggerTestComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/mapBindingsWithStringKey/test.DaggerTestComponent_KT_FAST_INIT_MODE @@ -58,16 +58,16 @@ final class DaggerTestComponent { if (mapModuleTwo == null) { this.mapModuleTwo = new MapModuleTwo(); } - return new TestComponentImpl(mapModuleOne, mapModuleTwo); + return new Impl(mapModuleOne, mapModuleTwo); } } - private static final class TestComponentImpl implements TestComponent { + private static final class Impl implements TestComponent { private final MapModuleOne mapModuleOne; private final MapModuleTwo mapModuleTwo; - private final TestComponentImpl testComponentImpl = this; + private final Impl impl = this; /** * {@code Provider} @@ -84,7 +84,7 @@ final class DaggerTestComponent { */ Provider mapOfStringAndProviderOfHandlerProvider; - TestComponentImpl(MapModuleOne mapModuleOneParam, MapModuleTwo mapModuleTwoParam) { + Impl(MapModuleOne mapModuleOneParam, MapModuleTwo mapModuleTwoParam) { this.mapModuleOne = mapModuleOneParam; this.mapModuleTwo = mapModuleTwoParam; initialize(mapModuleOneParam, mapModuleTwoParam); @@ -94,9 +94,9 @@ final class DaggerTestComponent { @SuppressWarnings("unchecked") private void initialize(final MapModuleOne mapModuleOneParam, final MapModuleTwo mapModuleTwoParam) { - this.provideAdminHandlerProvider = new SwitchingProvider<>(testComponentImpl, 1); - this.provideLoginHandlerProvider = new SwitchingProvider<>(testComponentImpl, 2); - this.mapOfStringAndProviderOfHandlerProvider = new SwitchingProvider<>(testComponentImpl, 0); + this.provideAdminHandlerProvider = new SwitchingProvider<>(impl, 1); + this.provideLoginHandlerProvider = new SwitchingProvider<>(impl, 2); + this.mapOfStringAndProviderOfHandlerProvider = new SwitchingProvider<>(impl, 0); } @Override @@ -105,12 +105,12 @@ final class DaggerTestComponent { } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } @@ -119,13 +119,13 @@ final class DaggerTestComponent { public T get() { switch (id) { case 0: // java.util.Map> - return (T) ImmutableMap.of("Admin", testComponentImpl.provideAdminHandlerProvider, "Login", testComponentImpl.provideLoginHandlerProvider); + return (T) ImmutableMap.of("Admin", impl.provideAdminHandlerProvider, "Login", impl.provideLoginHandlerProvider); case 1: // java.util.Map test.MapModuleOne#provideAdminHandler - return (T) MapModuleOne_ProvideAdminHandlerFactory.provideAdminHandler(testComponentImpl.mapModuleOne); + return (T) MapModuleOne_ProvideAdminHandlerFactory.provideAdminHandler(impl.mapModuleOne); case 2: // java.util.Map test.MapModuleTwo#provideLoginHandler - return (T) MapModuleTwo_ProvideLoginHandlerFactory.provideLoginHandler(testComponentImpl.mapModuleTwo); + return (T) MapModuleTwo_ProvideLoginHandlerFactory.provideLoginHandler(impl.mapModuleTwo); default: throw new AssertionError(id); } diff --git a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/mapBindingsWithWrappedKey/test.DaggerTestComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/mapBindingsWithWrappedKey/test.DaggerTestComponent_DEFAULT_MODE index 224f527712b..0cd4319b325 100644 --- a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/mapBindingsWithWrappedKey/test.DaggerTestComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/mapBindingsWithWrappedKey/test.DaggerTestComponent_DEFAULT_MODE @@ -58,12 +58,12 @@ final class DaggerTestComponent { if (mapModuleTwo == null) { this.mapModuleTwo = new MapModuleTwo(); } - return new TestComponentImpl(mapModuleOne, mapModuleTwo); + return new Impl(mapModuleOne, mapModuleTwo); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; Provider provideAdminHandlerProvider; @@ -71,7 +71,7 @@ final class DaggerTestComponent { Provider mapOfWrappedClassKeyAndProviderOfHandlerProvider; - TestComponentImpl(MapModuleOne mapModuleOneParam, MapModuleTwo mapModuleTwoParam) { + Impl(MapModuleOne mapModuleOneParam, MapModuleTwo mapModuleTwoParam) { initialize(mapModuleOneParam, mapModuleTwoParam); diff --git a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/mapBindingsWithWrappedKey/test.DaggerTestComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/mapBindingsWithWrappedKey/test.DaggerTestComponent_FAST_INIT_MODE index 76c9e2887a0..ded5a53e720 100644 --- a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/mapBindingsWithWrappedKey/test.DaggerTestComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest/mapBindingsWithWrappedKey/test.DaggerTestComponent_FAST_INIT_MODE @@ -58,16 +58,16 @@ final class DaggerTestComponent { if (mapModuleTwo == null) { this.mapModuleTwo = new MapModuleTwo(); } - return new TestComponentImpl(mapModuleOne, mapModuleTwo); + return new Impl(mapModuleOne, mapModuleTwo); } } - private static final class TestComponentImpl implements TestComponent { + private static final class Impl implements TestComponent { private final MapModuleOne mapModuleOne; private final MapModuleTwo mapModuleTwo; - private final TestComponentImpl testComponentImpl = this; + private final Impl impl = this; Provider provideAdminHandlerProvider; @@ -75,7 +75,7 @@ final class DaggerTestComponent { Provider mapOfWrappedClassKeyAndProviderOfHandlerProvider; - TestComponentImpl(MapModuleOne mapModuleOneParam, MapModuleTwo mapModuleTwoParam) { + Impl(MapModuleOne mapModuleOneParam, MapModuleTwo mapModuleTwoParam) { this.mapModuleOne = mapModuleOneParam; this.mapModuleTwo = mapModuleTwoParam; initialize(mapModuleOneParam, mapModuleTwoParam); @@ -85,9 +85,9 @@ final class DaggerTestComponent { @SuppressWarnings("unchecked") private void initialize(final MapModuleOne mapModuleOneParam, final MapModuleTwo mapModuleTwoParam) { - this.provideAdminHandlerProvider = new SwitchingProvider<>(testComponentImpl, 1); - this.provideLoginHandlerProvider = new SwitchingProvider<>(testComponentImpl, 2); - this.mapOfWrappedClassKeyAndProviderOfHandlerProvider = new SwitchingProvider<>(testComponentImpl, 0); + this.provideAdminHandlerProvider = new SwitchingProvider<>(impl, 1); + this.provideLoginHandlerProvider = new SwitchingProvider<>(impl, 2); + this.mapOfWrappedClassKeyAndProviderOfHandlerProvider = new SwitchingProvider<>(impl, 0); } @Override @@ -97,12 +97,12 @@ final class DaggerTestComponent { } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } @@ -111,13 +111,13 @@ final class DaggerTestComponent { public T get() { switch (id) { case 0: // java.util.Map> - return (T) ImmutableMap.>of(WrappedClassKeyCreator.createWrappedClassKey(Integer.class), testComponentImpl.provideAdminHandlerProvider, WrappedClassKeyCreator.createWrappedClassKey(Long.class), testComponentImpl.provideLoginHandlerProvider); + return (T) ImmutableMap.>of(WrappedClassKeyCreator.createWrappedClassKey(Integer.class), impl.provideAdminHandlerProvider, WrappedClassKeyCreator.createWrappedClassKey(Long.class), impl.provideLoginHandlerProvider); case 1: // java.util.Map test.MapModuleOne#provideAdminHandler - return (T) MapModuleOne_ProvideAdminHandlerFactory.provideAdminHandler(testComponentImpl.mapModuleOne); + return (T) MapModuleOne_ProvideAdminHandlerFactory.provideAdminHandler(impl.mapModuleOne); case 2: // java.util.Map test.MapModuleTwo#provideLoginHandler - return (T) MapModuleTwo_ProvideLoginHandlerFactory.provideLoginHandler(testComponentImpl.mapModuleTwo); + return (T) MapModuleTwo_ProvideLoginHandlerFactory.provideLoginHandler(impl.mapModuleTwo); default: throw new AssertionError(id); } diff --git a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationTest/inaccessible/test.DaggerTestComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationTest/inaccessible/test.DaggerTestComponent_DEFAULT_MODE index f839e5dd144..cc0837d1285 100644 --- a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationTest/inaccessible/test.DaggerTestComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationTest/inaccessible/test.DaggerTestComponent_DEFAULT_MODE @@ -38,14 +38,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationTest/inaccessible/test.DaggerTestComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationTest/inaccessible/test.DaggerTestComponent_FAST_INIT_MODE index f839e5dd144..cc0837d1285 100644 --- a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationTest/inaccessible/test.DaggerTestComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationTest/inaccessible/test.DaggerTestComponent_FAST_INIT_MODE @@ -38,14 +38,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationTest/lazyMaps/test.DaggerTestComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationTest/lazyMaps/test.DaggerTestComponent_DEFAULT_MODE index df4c586b9fa..309ff3deeb4 100644 --- a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationTest/lazyMaps/test.DaggerTestComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationTest/lazyMaps/test.DaggerTestComponent_DEFAULT_MODE @@ -39,18 +39,18 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; Provider>> mapOfStringAndLazyOfIntegerProvider; Provider mapOfStringAndProviderOfLazyOfIntegerProvider; - TestComponentImpl() { + Impl() { initialize(); diff --git a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationTest/lazyMaps/test.DaggerTestComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationTest/lazyMaps/test.DaggerTestComponent_FAST_INIT_MODE index 3d61014f260..e212c96fc85 100644 --- a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationTest/lazyMaps/test.DaggerTestComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationTest/lazyMaps/test.DaggerTestComponent_FAST_INIT_MODE @@ -40,12 +40,12 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; Provider int0Provider; @@ -57,7 +57,7 @@ final class DaggerTestComponent { Provider mapOfStringAndProviderOfLazyOfIntegerProvider; - TestComponentImpl() { + Impl() { initialize(); @@ -65,27 +65,27 @@ final class DaggerTestComponent { Map mapOfStringAndLazyOfIntegerBuilder() { MapBuilder mapBuilder = MapBuilder.>newMapBuilder(3); - mapBuilder.put("key0", DoubleCheck.lazy(testComponentImpl.int0Provider)); - mapBuilder.put("key1", DoubleCheck.lazy(testComponentImpl.int1Provider)); - mapBuilder.put("key2", DoubleCheck.lazy(testComponentImpl.int2Provider)); + mapBuilder.put("key0", DoubleCheck.lazy(impl.int0Provider)); + mapBuilder.put("key1", DoubleCheck.lazy(impl.int1Provider)); + mapBuilder.put("key2", DoubleCheck.lazy(impl.int2Provider)); return mapBuilder.build(); } Map mapOfStringAndProviderOfLazyOfIntegerBuilder() { MapBuilder mapBuilder = MapBuilder.>>newMapBuilder(3); - mapBuilder.put("key0", ProviderOfLazy.create(testComponentImpl.int0Provider)); - mapBuilder.put("key1", ProviderOfLazy.create(testComponentImpl.int1Provider)); - mapBuilder.put("key2", ProviderOfLazy.create(testComponentImpl.int2Provider)); + mapBuilder.put("key0", ProviderOfLazy.create(impl.int0Provider)); + mapBuilder.put("key1", ProviderOfLazy.create(impl.int1Provider)); + mapBuilder.put("key2", ProviderOfLazy.create(impl.int2Provider)); return mapBuilder.build(); } @SuppressWarnings("unchecked") private void initialize() { - this.int0Provider = new SwitchingProvider<>(testComponentImpl, 1); - this.int1Provider = new SwitchingProvider<>(testComponentImpl, 2); - this.int2Provider = new SwitchingProvider<>(testComponentImpl, 3); - this.mapOfStringAndLazyOfIntegerProvider = new SwitchingProvider<>(testComponentImpl, 0); - this.mapOfStringAndProviderOfLazyOfIntegerProvider = new SwitchingProvider<>(testComponentImpl, 4); + this.int0Provider = new SwitchingProvider<>(impl, 1); + this.int1Provider = new SwitchingProvider<>(impl, 2); + this.int2Provider = new SwitchingProvider<>(impl, 3); + this.mapOfStringAndLazyOfIntegerProvider = new SwitchingProvider<>(impl, 0); + this.mapOfStringAndProviderOfLazyOfIntegerProvider = new SwitchingProvider<>(impl, 4); } @Override @@ -110,12 +110,12 @@ final class DaggerTestComponent { } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } @@ -124,7 +124,7 @@ final class DaggerTestComponent { public T get() { switch (id) { case 0: // java.util.Map> - return (T) testComponentImpl.mapOfStringAndLazyOfIntegerBuilder(); + return (T) impl.mapOfStringAndLazyOfIntegerBuilder(); case 1: // java.util.Map test.LazyMaps.TestModule#int0 return (T) LazyMaps_TestModule_Int0Factory.int0(); @@ -136,7 +136,7 @@ final class DaggerTestComponent { return (T) LazyMaps_TestModule_Int2Factory.int2(); case 4: // java.util.Map>> - return (T) testComponentImpl.mapOfStringAndProviderOfLazyOfIntegerBuilder(); + return (T) impl.mapOfStringAndProviderOfLazyOfIntegerBuilder(); default: throw new AssertionError(id); } diff --git a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationTest/mapBindings/test.DaggerTestComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationTest/mapBindings/test.DaggerTestComponent_DEFAULT_MODE index 90390513d9e..05b16a5b2dd 100644 --- a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationTest/mapBindings/test.DaggerTestComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationTest/mapBindings/test.DaggerTestComponent_DEFAULT_MODE @@ -38,14 +38,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationTest/mapBindings/test.DaggerTestComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationTest/mapBindings/test.DaggerTestComponent_FAST_INIT_MODE index 16d388e0969..a6d693a5e26 100644 --- a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationTest/mapBindings/test.DaggerTestComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationTest/mapBindings/test.DaggerTestComponent_FAST_INIT_MODE @@ -38,12 +38,12 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; Provider provideIntProvider; @@ -53,7 +53,7 @@ final class DaggerTestComponent { Provider provideLong2Provider; - TestComponentImpl() { + Impl() { initialize(); @@ -77,10 +77,10 @@ final class DaggerTestComponent { @SuppressWarnings("unchecked") private void initialize() { - this.provideIntProvider = new SwitchingProvider<>(testComponentImpl, 0); - this.provideLong0Provider = new SwitchingProvider<>(testComponentImpl, 1); - this.provideLong1Provider = new SwitchingProvider<>(testComponentImpl, 2); - this.provideLong2Provider = new SwitchingProvider<>(testComponentImpl, 3); + this.provideIntProvider = new SwitchingProvider<>(impl, 0); + this.provideLong0Provider = new SwitchingProvider<>(impl, 1); + this.provideLong1Provider = new SwitchingProvider<>(impl, 2); + this.provideLong2Provider = new SwitchingProvider<>(impl, 3); } @Override @@ -114,12 +114,12 @@ final class DaggerTestComponent { } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } diff --git a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationTest/productionComponents/test.DaggerTestComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationTest/productionComponents/test.DaggerTestComponent_DEFAULT_MODE index 98dc06d8b6e..917b9b447d3 100644 --- a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationTest/productionComponents/test.DaggerTestComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationTest/productionComponents/test.DaggerTestComponent_DEFAULT_MODE @@ -39,14 +39,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent, CancellationListener { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent, CancellationListener { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationTest/productionComponents/test.DaggerTestComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationTest/productionComponents/test.DaggerTestComponent_FAST_INIT_MODE index 98dc06d8b6e..917b9b447d3 100644 --- a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationTest/productionComponents/test.DaggerTestComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationTest/productionComponents/test.DaggerTestComponent_FAST_INIT_MODE @@ -39,14 +39,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent, CancellationListener { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent, CancellationListener { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationTest/subcomponentOmitsInheritedBindings/test.DaggerParent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationTest/subcomponentOmitsInheritedBindings/test.DaggerParent_DEFAULT_MODE index 7d820ea67dd..a1c40cfeb7e 100644 --- a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationTest/subcomponentOmitsInheritedBindings/test.DaggerParent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationTest/subcomponentOmitsInheritedBindings/test.DaggerParent_DEFAULT_MODE @@ -47,40 +47,40 @@ final class DaggerParent { if (parentModule == null) { this.parentModule = new ParentModule(); } - return new ParentImpl(parentModule); + return new Impl(parentModule); } } private static final class ChildImpl implements Child { - private final ParentImpl parentImpl; + private final Impl impl; private final ChildImpl childImpl = this; - ChildImpl(ParentImpl parentImpl) { - this.parentImpl = parentImpl; + ChildImpl(Impl impl) { + this.impl = impl; } @Override public Map objectMap() { - return Collections.singletonMap("parent key", ParentModule_ParentKeyObjectFactory.parentKeyObject(parentImpl.parentModule)); + return Collections.singletonMap("parent key", ParentModule_ParentKeyObjectFactory.parentKeyObject(impl.parentModule)); } } - private static final class ParentImpl implements Parent { + private static final class Impl implements Parent { private final ParentModule parentModule; - private final ParentImpl parentImpl = this; + private final Impl impl = this; - ParentImpl(ParentModule parentModuleParam) { + Impl(ParentModule parentModuleParam) { this.parentModule = parentModuleParam; } @Override public Child child() { - return new ChildImpl(parentImpl); + return new ChildImpl(impl); } } } diff --git a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationTest/subcomponentOmitsInheritedBindings/test.DaggerParent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationTest/subcomponentOmitsInheritedBindings/test.DaggerParent_FAST_INIT_MODE index 7d820ea67dd..a1c40cfeb7e 100644 --- a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationTest/subcomponentOmitsInheritedBindings/test.DaggerParent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationTest/subcomponentOmitsInheritedBindings/test.DaggerParent_FAST_INIT_MODE @@ -47,40 +47,40 @@ final class DaggerParent { if (parentModule == null) { this.parentModule = new ParentModule(); } - return new ParentImpl(parentModule); + return new Impl(parentModule); } } private static final class ChildImpl implements Child { - private final ParentImpl parentImpl; + private final Impl impl; private final ChildImpl childImpl = this; - ChildImpl(ParentImpl parentImpl) { - this.parentImpl = parentImpl; + ChildImpl(Impl impl) { + this.impl = impl; } @Override public Map objectMap() { - return Collections.singletonMap("parent key", ParentModule_ParentKeyObjectFactory.parentKeyObject(parentImpl.parentModule)); + return Collections.singletonMap("parent key", ParentModule_ParentKeyObjectFactory.parentKeyObject(impl.parentModule)); } } - private static final class ParentImpl implements Parent { + private static final class Impl implements Parent { private final ParentModule parentModule; - private final ParentImpl parentImpl = this; + private final Impl impl = this; - ParentImpl(ParentModule parentModuleParam) { + Impl(ParentModule parentModuleParam) { this.parentModule = parentModuleParam; } @Override public Child child() { - return new ChildImpl(parentImpl); + return new ChildImpl(impl); } } } diff --git a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/inaccessible/test.DaggerTestComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/inaccessible/test.DaggerTestComponent_DEFAULT_MODE index 37219944256..80ffebf899f 100644 --- a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/inaccessible/test.DaggerTestComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/inaccessible/test.DaggerTestComponent_DEFAULT_MODE @@ -38,14 +38,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/inaccessible/test.DaggerTestComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/inaccessible/test.DaggerTestComponent_FAST_INIT_MODE index 37219944256..80ffebf899f 100644 --- a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/inaccessible/test.DaggerTestComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/inaccessible/test.DaggerTestComponent_FAST_INIT_MODE @@ -38,14 +38,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/inaccessible/test.DaggerTestComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/inaccessible/test.DaggerTestComponent_KT_DEFAULT_MODE index 423633f0817..7b22683a11e 100644 --- a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/inaccessible/test.DaggerTestComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/inaccessible/test.DaggerTestComponent_KT_DEFAULT_MODE @@ -37,14 +37,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/inaccessible/test.DaggerTestComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/inaccessible/test.DaggerTestComponent_KT_FAST_INIT_MODE index 423633f0817..7b22683a11e 100644 --- a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/inaccessible/test.DaggerTestComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/inaccessible/test.DaggerTestComponent_KT_FAST_INIT_MODE @@ -37,14 +37,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/lazyMaps/test.DaggerTestComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/lazyMaps/test.DaggerTestComponent_DEFAULT_MODE index cebfcbec991..7ed6070a4f2 100644 --- a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/lazyMaps/test.DaggerTestComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/lazyMaps/test.DaggerTestComponent_DEFAULT_MODE @@ -42,12 +42,12 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; Provider provideAtomicIntegerProvider; @@ -63,7 +63,7 @@ final class DaggerTestComponent { Provider mapOfStringAndProviderOfLazyOfStringProvider; - TestComponentImpl() { + Impl() { initialize(); diff --git a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/lazyMaps/test.DaggerTestComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/lazyMaps/test.DaggerTestComponent_FAST_INIT_MODE index b31051202a0..b8cedc4ef9e 100644 --- a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/lazyMaps/test.DaggerTestComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/lazyMaps/test.DaggerTestComponent_FAST_INIT_MODE @@ -41,12 +41,12 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; Provider provideAtomicIntegerProvider; @@ -60,7 +60,7 @@ final class DaggerTestComponent { Provider mapOfStringAndProviderOfLazyOfStringProvider; - TestComponentImpl() { + Impl() { initialize(); @@ -72,12 +72,12 @@ final class DaggerTestComponent { @SuppressWarnings("unchecked") private void initialize() { - this.provideAtomicIntegerProvider = DoubleCheck.provider(new SwitchingProvider(testComponentImpl, 1)); - this.string0Provider = new SwitchingProvider<>(testComponentImpl, 0); - this.string1Provider = new SwitchingProvider<>(testComponentImpl, 2); - this.string2Provider = new SwitchingProvider<>(testComponentImpl, 3); - this.mapOfStringAndLazyOfStringProvider = new SwitchingProvider<>(testComponentImpl, 4); - this.mapOfStringAndProviderOfLazyOfStringProvider = new SwitchingProvider<>(testComponentImpl, 5); + this.provideAtomicIntegerProvider = DoubleCheck.provider(new SwitchingProvider(impl, 1)); + this.string0Provider = new SwitchingProvider<>(impl, 0); + this.string1Provider = new SwitchingProvider<>(impl, 2); + this.string2Provider = new SwitchingProvider<>(impl, 3); + this.mapOfStringAndLazyOfStringProvider = new SwitchingProvider<>(impl, 4); + this.mapOfStringAndProviderOfLazyOfStringProvider = new SwitchingProvider<>(impl, 5); } @Override @@ -107,12 +107,12 @@ final class DaggerTestComponent { } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } @@ -121,22 +121,22 @@ final class DaggerTestComponent { public T get() { switch (id) { case 0: // java.util.Map test.LazyMaps.TestModule#string0 - return (T) LazyMaps_TestModule_String0Factory.string0(testComponentImpl.string()); + return (T) LazyMaps_TestModule_String0Factory.string0(impl.string()); case 1: // java.util.concurrent.atomic.AtomicInteger return (T) LazyMaps_TestModule_ProvideAtomicIntegerFactory.provideAtomicInteger(); case 2: // java.util.Map test.LazyMaps.TestModule#string1 - return (T) LazyMaps_TestModule_String1Factory.string1(testComponentImpl.string()); + return (T) LazyMaps_TestModule_String1Factory.string1(impl.string()); case 3: // java.util.Map test.LazyMaps.TestModule#string2 - return (T) LazyMaps_TestModule_String2Factory.string2(testComponentImpl.string()); + return (T) LazyMaps_TestModule_String2Factory.string2(impl.string()); case 4: // java.util.Map> - return (T) ImmutableMap.>of("key0", DoubleCheck.lazy(testComponentImpl.string0Provider), "key1", DoubleCheck.lazy(testComponentImpl.string1Provider), "key2", DoubleCheck.lazy(testComponentImpl.string2Provider)); + return (T) ImmutableMap.>of("key0", DoubleCheck.lazy(impl.string0Provider), "key1", DoubleCheck.lazy(impl.string1Provider), "key2", DoubleCheck.lazy(impl.string2Provider)); case 5: // java.util.Map>> - return (T) ImmutableMap.>>of("key0", ProviderOfLazy.create(testComponentImpl.string0Provider), "key1", ProviderOfLazy.create(testComponentImpl.string1Provider), "key2", ProviderOfLazy.create(testComponentImpl.string2Provider)); + return (T) ImmutableMap.>>of("key0", ProviderOfLazy.create(impl.string0Provider), "key1", ProviderOfLazy.create(impl.string1Provider), "key2", ProviderOfLazy.create(impl.string2Provider)); default: throw new AssertionError(id); } diff --git a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/lazyMaps/test.DaggerTestComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/lazyMaps/test.DaggerTestComponent_KT_DEFAULT_MODE index 8c87d73be33..2cc506326cc 100644 --- a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/lazyMaps/test.DaggerTestComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/lazyMaps/test.DaggerTestComponent_KT_DEFAULT_MODE @@ -41,49 +41,49 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; /** - * {@code Provider} - */ + * {@code Provider} + */ Provider provideAtomicIntegerProvider; /** - * {@code Provider} - */ + * {@code Provider} + */ Provider provideStringProvider; /** - * {@code Provider} - */ + * {@code Provider} + */ Provider string0Provider; /** - * {@code Provider} - */ + * {@code Provider} + */ Provider string1Provider; /** - * {@code Provider} - */ + * {@code Provider} + */ Provider string2Provider; /** - * {@code Provider>>} - */ + * {@code Provider>>} + */ Provider mapOfStringAndLazyOfStringProvider; /** - * {@code Provider} - */ + * {@code Provider} + */ Provider mapOfStringAndProviderOfLazyOfStringProvider; - TestComponentImpl() { + Impl() { initialize(); diff --git a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/lazyMaps/test.DaggerTestComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/lazyMaps/test.DaggerTestComponent_KT_FAST_INIT_MODE index 9632ae28f11..a66e7c59cac 100644 --- a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/lazyMaps/test.DaggerTestComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/lazyMaps/test.DaggerTestComponent_KT_FAST_INIT_MODE @@ -40,44 +40,44 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; /** - * {@code Provider} - */ + * {@code Provider} + */ Provider provideAtomicIntegerProvider; /** - * {@code Provider} - */ + * {@code Provider} + */ Provider string0Provider; /** - * {@code Provider} - */ + * {@code Provider} + */ Provider string1Provider; /** - * {@code Provider} - */ + * {@code Provider} + */ Provider string2Provider; /** - * {@code Provider>>} - */ + * {@code Provider>>} + */ Provider mapOfStringAndLazyOfStringProvider; /** - * {@code Provider} - */ + * {@code Provider} + */ Provider mapOfStringAndProviderOfLazyOfStringProvider; - TestComponentImpl() { + Impl() { initialize(); @@ -89,12 +89,12 @@ final class DaggerTestComponent { @SuppressWarnings("unchecked") private void initialize() { - this.provideAtomicIntegerProvider = DoubleCheck.provider(new SwitchingProvider<>(testComponentImpl, 1)); - this.string0Provider = new SwitchingProvider<>(testComponentImpl, 0); - this.string1Provider = new SwitchingProvider<>(testComponentImpl, 2); - this.string2Provider = new SwitchingProvider<>(testComponentImpl, 3); - this.mapOfStringAndLazyOfStringProvider = new SwitchingProvider<>(testComponentImpl, 4); - this.mapOfStringAndProviderOfLazyOfStringProvider = new SwitchingProvider<>(testComponentImpl, 5); + this.provideAtomicIntegerProvider = DoubleCheck.provider(new SwitchingProvider<>(impl, 1)); + this.string0Provider = new SwitchingProvider<>(impl, 0); + this.string1Provider = new SwitchingProvider<>(impl, 2); + this.string2Provider = new SwitchingProvider<>(impl, 3); + this.mapOfStringAndLazyOfStringProvider = new SwitchingProvider<>(impl, 4); + this.mapOfStringAndProviderOfLazyOfStringProvider = new SwitchingProvider<>(impl, 5); } @Override @@ -124,12 +124,12 @@ final class DaggerTestComponent { } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } @@ -138,22 +138,22 @@ final class DaggerTestComponent { public T get() { switch (id) { case 0: // java.util.Map test.LazyMaps.TestModule#string0 - return (T) LazyMaps_TestModule_String0Factory.string0(testComponentImpl.string()); + return (T) LazyMaps_TestModule_String0Factory.string0(impl.string()); case 1: // java.util.concurrent.atomic.AtomicInteger return (T) LazyMaps_TestModule_ProvideAtomicIntegerFactory.provideAtomicInteger(); case 2: // java.util.Map test.LazyMaps.TestModule#string1 - return (T) LazyMaps_TestModule_String1Factory.string1(testComponentImpl.string()); + return (T) LazyMaps_TestModule_String1Factory.string1(impl.string()); case 3: // java.util.Map test.LazyMaps.TestModule#string2 - return (T) LazyMaps_TestModule_String2Factory.string2(testComponentImpl.string()); + return (T) LazyMaps_TestModule_String2Factory.string2(impl.string()); case 4: // java.util.Map> - return (T) ImmutableMap.of("key0", DoubleCheck.lazy(testComponentImpl.string0Provider), "key1", DoubleCheck.lazy(testComponentImpl.string1Provider), "key2", DoubleCheck.lazy(testComponentImpl.string2Provider)); + return (T) ImmutableMap.of("key0", DoubleCheck.lazy(impl.string0Provider), "key1", DoubleCheck.lazy(impl.string1Provider), "key2", DoubleCheck.lazy(impl.string2Provider)); case 5: // java.util.Map>> - return (T) ImmutableMap.of("key0", ProviderOfLazy.create(testComponentImpl.string0Provider), "key1", ProviderOfLazy.create(testComponentImpl.string1Provider), "key2", ProviderOfLazy.create(testComponentImpl.string2Provider)); + return (T) ImmutableMap.of("key0", ProviderOfLazy.create(impl.string0Provider), "key1", ProviderOfLazy.create(impl.string1Provider), "key2", ProviderOfLazy.create(impl.string2Provider)); default: throw new AssertionError(id); } diff --git a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/mapBindings/test.DaggerTestComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/mapBindings/test.DaggerTestComponent_DEFAULT_MODE index 4ebf28d5981..997bf7beb92 100644 --- a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/mapBindings/test.DaggerTestComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/mapBindings/test.DaggerTestComponent_DEFAULT_MODE @@ -37,17 +37,17 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } private static final class SubImpl implements Sub { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final SubImpl subImpl = this; - SubImpl(TestComponentImpl testComponentImpl) { - this.testComponentImpl = testComponentImpl; + SubImpl(Impl impl) { + this.impl = impl; } @@ -85,10 +85,10 @@ final class DaggerTestComponent { } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } @@ -125,7 +125,7 @@ final class DaggerTestComponent { @Override public Sub sub() { - return new SubImpl(testComponentImpl); + return new SubImpl(impl); } } } diff --git a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/mapBindings/test.DaggerTestComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/mapBindings/test.DaggerTestComponent_FAST_INIT_MODE index 51151db5d38..247f5f16287 100644 --- a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/mapBindings/test.DaggerTestComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/mapBindings/test.DaggerTestComponent_FAST_INIT_MODE @@ -37,12 +37,12 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } private static final class SubImpl implements Sub { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final SubImpl subImpl = this; @@ -52,8 +52,8 @@ final class DaggerTestComponent { Provider provideLong5Provider; - SubImpl(TestComponentImpl testComponentImpl) { - this.testComponentImpl = testComponentImpl; + SubImpl(Impl impl) { + this.impl = impl; initialize(); @@ -61,9 +61,9 @@ final class DaggerTestComponent { ImmutableMap mapOfLongAndLongBuilder() { ImmutableMap.Builder mapBuilder = ImmutableMap.builderWithExpectedSize(6); - mapBuilder.put(0L, testComponentImpl.provideLong0Provider.get()); - mapBuilder.put(1L, testComponentImpl.provideLong1Provider.get()); - mapBuilder.put(2L, testComponentImpl.provideLong2Provider.get()); + mapBuilder.put(0L, impl.provideLong0Provider.get()); + mapBuilder.put(1L, impl.provideLong1Provider.get()); + mapBuilder.put(2L, impl.provideLong2Provider.get()); mapBuilder.put(3L, provideLong3Provider.get()); mapBuilder.put(4L, provideLong4Provider.get()); mapBuilder.put(5L, provideLong5Provider.get()); @@ -72,9 +72,9 @@ final class DaggerTestComponent { ImmutableMap mapOfLongAndProviderOfLongBuilder() { ImmutableMap.Builder mapBuilder = ImmutableMap.>builderWithExpectedSize(6); - mapBuilder.put(0L, testComponentImpl.provideLong0Provider); - mapBuilder.put(1L, testComponentImpl.provideLong1Provider); - mapBuilder.put(2L, testComponentImpl.provideLong2Provider); + mapBuilder.put(0L, impl.provideLong0Provider); + mapBuilder.put(1L, impl.provideLong1Provider); + mapBuilder.put(2L, impl.provideLong2Provider); mapBuilder.put(3L, provideLong3Provider); mapBuilder.put(4L, provideLong4Provider); mapBuilder.put(5L, provideLong5Provider); @@ -83,9 +83,9 @@ final class DaggerTestComponent { @SuppressWarnings("unchecked") private void initialize() { - this.provideLong3Provider = new SwitchingProvider<>(testComponentImpl, subImpl, 0); - this.provideLong4Provider = new SwitchingProvider<>(testComponentImpl, subImpl, 1); - this.provideLong5Provider = new SwitchingProvider<>(testComponentImpl, subImpl, 2); + this.provideLong3Provider = new SwitchingProvider<>(impl, subImpl, 0); + this.provideLong4Provider = new SwitchingProvider<>(impl, subImpl, 1); + this.provideLong5Provider = new SwitchingProvider<>(impl, subImpl, 2); } @Override @@ -99,14 +99,14 @@ final class DaggerTestComponent { } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final SubImpl subImpl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, SubImpl subImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, SubImpl subImpl, int id) { + this.impl = impl; this.subImpl = subImpl; this.id = id; } @@ -130,8 +130,8 @@ final class DaggerTestComponent { } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; Provider provideIntProvider; @@ -141,7 +141,7 @@ final class DaggerTestComponent { Provider provideLong2Provider; - TestComponentImpl() { + Impl() { initialize(); @@ -149,10 +149,10 @@ final class DaggerTestComponent { @SuppressWarnings("unchecked") private void initialize() { - this.provideIntProvider = new SwitchingProvider<>(testComponentImpl, 0); - this.provideLong0Provider = new SwitchingProvider<>(testComponentImpl, 1); - this.provideLong1Provider = new SwitchingProvider<>(testComponentImpl, 2); - this.provideLong2Provider = new SwitchingProvider<>(testComponentImpl, 3); + this.provideIntProvider = new SwitchingProvider<>(impl, 0); + this.provideLong0Provider = new SwitchingProvider<>(impl, 1); + this.provideLong1Provider = new SwitchingProvider<>(impl, 2); + this.provideLong2Provider = new SwitchingProvider<>(impl, 3); } @Override @@ -187,16 +187,16 @@ final class DaggerTestComponent { @Override public Sub sub() { - return new SubImpl(testComponentImpl); + return new SubImpl(impl); } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } diff --git a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/mapBindings/test.DaggerTestComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/mapBindings/test.DaggerTestComponent_KT_DEFAULT_MODE index 8d8ce371bf4..29f2c0e3c57 100644 --- a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/mapBindings/test.DaggerTestComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/mapBindings/test.DaggerTestComponent_KT_DEFAULT_MODE @@ -37,17 +37,17 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } private static final class SubImpl implements Sub { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final SubImpl subImpl = this; - SubImpl(TestComponentImpl testComponentImpl) { - this.testComponentImpl = testComponentImpl; + SubImpl(Impl impl) { + this.impl = impl; } @@ -85,10 +85,10 @@ final class DaggerTestComponent { } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } @@ -125,7 +125,7 @@ final class DaggerTestComponent { @Override public Sub sub() { - return new SubImpl(testComponentImpl); + return new SubImpl(impl); } } } diff --git a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/mapBindings/test.DaggerTestComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/mapBindings/test.DaggerTestComponent_KT_FAST_INIT_MODE index 367e34d304f..588940c52fe 100644 --- a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/mapBindings/test.DaggerTestComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/mapBindings/test.DaggerTestComponent_KT_FAST_INIT_MODE @@ -37,12 +37,12 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } private static final class SubImpl implements Sub { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final SubImpl subImpl = this; @@ -61,8 +61,8 @@ final class DaggerTestComponent { */ Provider provideLong5Provider; - SubImpl(TestComponentImpl testComponentImpl) { - this.testComponentImpl = testComponentImpl; + SubImpl(Impl impl) { + this.impl = impl; initialize(); @@ -70,9 +70,9 @@ final class DaggerTestComponent { ImmutableMap mapOfLongAndLongBuilder() { ImmutableMap.Builder mapBuilder = ImmutableMap.builderWithExpectedSize(6); - mapBuilder.put(0L, testComponentImpl.provideLong0Provider.get()); - mapBuilder.put(1L, testComponentImpl.provideLong1Provider.get()); - mapBuilder.put(2L, testComponentImpl.provideLong2Provider.get()); + mapBuilder.put(0L, impl.provideLong0Provider.get()); + mapBuilder.put(1L, impl.provideLong1Provider.get()); + mapBuilder.put(2L, impl.provideLong2Provider.get()); mapBuilder.put(3L, provideLong3Provider.get()); mapBuilder.put(4L, provideLong4Provider.get()); mapBuilder.put(5L, provideLong5Provider.get()); @@ -81,9 +81,9 @@ final class DaggerTestComponent { ImmutableMap mapOfLongAndProviderOfLongBuilder() { ImmutableMap.Builder mapBuilder = ImmutableMap.builderWithExpectedSize(6); - mapBuilder.put(0L, testComponentImpl.provideLong0Provider); - mapBuilder.put(1L, testComponentImpl.provideLong1Provider); - mapBuilder.put(2L, testComponentImpl.provideLong2Provider); + mapBuilder.put(0L, impl.provideLong0Provider); + mapBuilder.put(1L, impl.provideLong1Provider); + mapBuilder.put(2L, impl.provideLong2Provider); mapBuilder.put(3L, provideLong3Provider); mapBuilder.put(4L, provideLong4Provider); mapBuilder.put(5L, provideLong5Provider); @@ -92,9 +92,9 @@ final class DaggerTestComponent { @SuppressWarnings("unchecked") private void initialize() { - this.provideLong3Provider = new SwitchingProvider<>(testComponentImpl, subImpl, 0); - this.provideLong4Provider = new SwitchingProvider<>(testComponentImpl, subImpl, 1); - this.provideLong5Provider = new SwitchingProvider<>(testComponentImpl, subImpl, 2); + this.provideLong3Provider = new SwitchingProvider<>(impl, subImpl, 0); + this.provideLong4Provider = new SwitchingProvider<>(impl, subImpl, 1); + this.provideLong5Provider = new SwitchingProvider<>(impl, subImpl, 2); } @Override @@ -108,14 +108,14 @@ final class DaggerTestComponent { } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final SubImpl subImpl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, SubImpl subImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, SubImpl subImpl, int id) { + this.impl = impl; this.subImpl = subImpl; this.id = id; } @@ -139,8 +139,8 @@ final class DaggerTestComponent { } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; /** * {@code Provider} @@ -162,7 +162,7 @@ final class DaggerTestComponent { */ Provider provideLong2Provider; - TestComponentImpl() { + Impl() { initialize(); @@ -170,10 +170,10 @@ final class DaggerTestComponent { @SuppressWarnings("unchecked") private void initialize() { - this.provideIntProvider = new SwitchingProvider<>(testComponentImpl, 0); - this.provideLong0Provider = new SwitchingProvider<>(testComponentImpl, 1); - this.provideLong1Provider = new SwitchingProvider<>(testComponentImpl, 2); - this.provideLong2Provider = new SwitchingProvider<>(testComponentImpl, 3); + this.provideIntProvider = new SwitchingProvider<>(impl, 0); + this.provideLong0Provider = new SwitchingProvider<>(impl, 1); + this.provideLong1Provider = new SwitchingProvider<>(impl, 2); + this.provideLong2Provider = new SwitchingProvider<>(impl, 3); } @Override @@ -208,16 +208,16 @@ final class DaggerTestComponent { @Override public Sub sub() { - return new SubImpl(testComponentImpl); + return new SubImpl(impl); } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } diff --git a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/productionComponents/test.DaggerTestComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/productionComponents/test.DaggerTestComponent_DEFAULT_MODE index 71ee78a3172..f8492ea09b4 100644 --- a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/productionComponents/test.DaggerTestComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/productionComponents/test.DaggerTestComponent_DEFAULT_MODE @@ -39,14 +39,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent, CancellationListener { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent, CancellationListener { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/productionComponents/test.DaggerTestComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/productionComponents/test.DaggerTestComponent_FAST_INIT_MODE index 71ee78a3172..f8492ea09b4 100644 --- a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/productionComponents/test.DaggerTestComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/productionComponents/test.DaggerTestComponent_FAST_INIT_MODE @@ -39,14 +39,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent, CancellationListener { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent, CancellationListener { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/productionComponents/test.DaggerTestComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/productionComponents/test.DaggerTestComponent_KT_DEFAULT_MODE index 8b006d15b21..4cbb6641702 100644 --- a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/productionComponents/test.DaggerTestComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/productionComponents/test.DaggerTestComponent_KT_DEFAULT_MODE @@ -39,14 +39,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent, CancellationListener { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent, CancellationListener { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/productionComponents/test.DaggerTestComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/productionComponents/test.DaggerTestComponent_KT_FAST_INIT_MODE index 8b006d15b21..4cbb6641702 100644 --- a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/productionComponents/test.DaggerTestComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/productionComponents/test.DaggerTestComponent_KT_FAST_INIT_MODE @@ -39,14 +39,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent, CancellationListener { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent, CancellationListener { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/setAndMapBindings/test.DaggerTestComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/setAndMapBindings/test.DaggerTestComponent_DEFAULT_MODE index ddf25908e1a..3ab1efb19c9 100644 --- a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/setAndMapBindings/test.DaggerTestComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/setAndMapBindings/test.DaggerTestComponent_DEFAULT_MODE @@ -38,17 +38,17 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } private static final class TestSubcomponentImpl implements TestSubcomponent { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final TestSubcomponentImpl testSubcomponentImpl = this; - TestSubcomponentImpl(TestComponentImpl testComponentImpl) { - this.testComponentImpl = testComponentImpl; + TestSubcomponentImpl(Impl impl) { + this.impl = impl; } @@ -75,10 +75,10 @@ final class DaggerTestComponent { } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } @@ -95,7 +95,7 @@ final class DaggerTestComponent { @Override public TestSubcomponent testSubcomponent() { - return new TestSubcomponentImpl(testComponentImpl); + return new TestSubcomponentImpl(impl); } } } diff --git a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/setAndMapBindings/test.DaggerTestComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/setAndMapBindings/test.DaggerTestComponent_FAST_INIT_MODE index ddf25908e1a..3ab1efb19c9 100644 --- a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/setAndMapBindings/test.DaggerTestComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/setAndMapBindings/test.DaggerTestComponent_FAST_INIT_MODE @@ -38,17 +38,17 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } private static final class TestSubcomponentImpl implements TestSubcomponent { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final TestSubcomponentImpl testSubcomponentImpl = this; - TestSubcomponentImpl(TestComponentImpl testComponentImpl) { - this.testComponentImpl = testComponentImpl; + TestSubcomponentImpl(Impl impl) { + this.impl = impl; } @@ -75,10 +75,10 @@ final class DaggerTestComponent { } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } @@ -95,7 +95,7 @@ final class DaggerTestComponent { @Override public TestSubcomponent testSubcomponent() { - return new TestSubcomponentImpl(testComponentImpl); + return new TestSubcomponentImpl(impl); } } } diff --git a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/setAndMapBindings/test.DaggerTestComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/setAndMapBindings/test.DaggerTestComponent_KT_DEFAULT_MODE index 405940efae3..47b69845487 100644 --- a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/setAndMapBindings/test.DaggerTestComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/setAndMapBindings/test.DaggerTestComponent_KT_DEFAULT_MODE @@ -38,17 +38,17 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } private static final class TestSubcomponentImpl implements TestSubcomponent { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final TestSubcomponentImpl testSubcomponentImpl = this; - TestSubcomponentImpl(TestComponentImpl testComponentImpl) { - this.testComponentImpl = testComponentImpl; + TestSubcomponentImpl(Impl impl) { + this.impl = impl; } @@ -75,10 +75,10 @@ final class DaggerTestComponent { } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } @@ -95,7 +95,7 @@ final class DaggerTestComponent { @Override public TestSubcomponent testSubcomponent() { - return new TestSubcomponentImpl(testComponentImpl); + return new TestSubcomponentImpl(impl); } } } diff --git a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/setAndMapBindings/test.DaggerTestComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/setAndMapBindings/test.DaggerTestComponent_KT_FAST_INIT_MODE index 405940efae3..47b69845487 100644 --- a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/setAndMapBindings/test.DaggerTestComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/setAndMapBindings/test.DaggerTestComponent_KT_FAST_INIT_MODE @@ -38,17 +38,17 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } private static final class TestSubcomponentImpl implements TestSubcomponent { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final TestSubcomponentImpl testSubcomponentImpl = this; - TestSubcomponentImpl(TestComponentImpl testComponentImpl) { - this.testComponentImpl = testComponentImpl; + TestSubcomponentImpl(Impl impl) { + this.impl = impl; } @@ -75,10 +75,10 @@ final class DaggerTestComponent { } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } @@ -95,7 +95,7 @@ final class DaggerTestComponent { @Override public TestSubcomponent testSubcomponent() { - return new TestSubcomponentImpl(testComponentImpl); + return new TestSubcomponentImpl(impl); } } } diff --git a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/subcomponentOmitsInheritedBindings/test.DaggerParent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/subcomponentOmitsInheritedBindings/test.DaggerParent_DEFAULT_MODE index f0e3732bad2..ce7a0965b13 100644 --- a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/subcomponentOmitsInheritedBindings/test.DaggerParent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/subcomponentOmitsInheritedBindings/test.DaggerParent_DEFAULT_MODE @@ -47,40 +47,40 @@ final class DaggerParent { if (parentModule == null) { this.parentModule = new ParentModule(); } - return new ParentImpl(parentModule); + return new Impl(parentModule); } } private static final class ChildImpl implements Child { - private final ParentImpl parentImpl; + private final Impl impl; private final ChildImpl childImpl = this; - ChildImpl(ParentImpl parentImpl) { - this.parentImpl = parentImpl; + ChildImpl(Impl impl) { + this.impl = impl; } @Override public Map objectMap() { - return ImmutableMap.of("parent key", ParentModule_ParentKeyObjectFactory.parentKeyObject(parentImpl.parentModule)); + return ImmutableMap.of("parent key", ParentModule_ParentKeyObjectFactory.parentKeyObject(impl.parentModule)); } } - private static final class ParentImpl implements Parent { + private static final class Impl implements Parent { private final ParentModule parentModule; - private final ParentImpl parentImpl = this; + private final Impl impl = this; - ParentImpl(ParentModule parentModuleParam) { + Impl(ParentModule parentModuleParam) { this.parentModule = parentModuleParam; } @Override public Child child() { - return new ChildImpl(parentImpl); + return new ChildImpl(impl); } } } diff --git a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/subcomponentOmitsInheritedBindings/test.DaggerParent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/subcomponentOmitsInheritedBindings/test.DaggerParent_FAST_INIT_MODE index f0e3732bad2..ce7a0965b13 100644 --- a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/subcomponentOmitsInheritedBindings/test.DaggerParent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/subcomponentOmitsInheritedBindings/test.DaggerParent_FAST_INIT_MODE @@ -47,40 +47,40 @@ final class DaggerParent { if (parentModule == null) { this.parentModule = new ParentModule(); } - return new ParentImpl(parentModule); + return new Impl(parentModule); } } private static final class ChildImpl implements Child { - private final ParentImpl parentImpl; + private final Impl impl; private final ChildImpl childImpl = this; - ChildImpl(ParentImpl parentImpl) { - this.parentImpl = parentImpl; + ChildImpl(Impl impl) { + this.impl = impl; } @Override public Map objectMap() { - return ImmutableMap.of("parent key", ParentModule_ParentKeyObjectFactory.parentKeyObject(parentImpl.parentModule)); + return ImmutableMap.of("parent key", ParentModule_ParentKeyObjectFactory.parentKeyObject(impl.parentModule)); } } - private static final class ParentImpl implements Parent { + private static final class Impl implements Parent { private final ParentModule parentModule; - private final ParentImpl parentImpl = this; + private final Impl impl = this; - ParentImpl(ParentModule parentModuleParam) { + Impl(ParentModule parentModuleParam) { this.parentModule = parentModuleParam; } @Override public Child child() { - return new ChildImpl(parentImpl); + return new ChildImpl(impl); } } } diff --git a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/subcomponentOmitsInheritedBindings/test.DaggerParent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/subcomponentOmitsInheritedBindings/test.DaggerParent_KT_DEFAULT_MODE index 6afd7ca6fcc..76c37793d82 100644 --- a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/subcomponentOmitsInheritedBindings/test.DaggerParent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/subcomponentOmitsInheritedBindings/test.DaggerParent_KT_DEFAULT_MODE @@ -47,40 +47,40 @@ final class DaggerParent { if (parentModule == null) { this.parentModule = new ParentModule(); } - return new ParentImpl(parentModule); + return new Impl(parentModule); } } private static final class ChildImpl implements Child { - private final ParentImpl parentImpl; + private final Impl impl; private final ChildImpl childImpl = this; - ChildImpl(ParentImpl parentImpl) { - this.parentImpl = parentImpl; + ChildImpl(Impl impl) { + this.impl = impl; } @Override public Map objectMap() { - return (Map) ((Object) (ImmutableMap.of("parent key", ParentModule_ParentKeyObjectFactory.parentKeyObject(parentImpl.parentModule)))); + return (Map) ((Object) (ImmutableMap.of("parent key", ParentModule_ParentKeyObjectFactory.parentKeyObject(impl.parentModule)))); } } - private static final class ParentImpl implements Parent { + private static final class Impl implements Parent { private final ParentModule parentModule; - private final ParentImpl parentImpl = this; + private final Impl impl = this; - ParentImpl(ParentModule parentModuleParam) { + Impl(ParentModule parentModuleParam) { this.parentModule = parentModuleParam; } @Override public Child child() { - return new ChildImpl(parentImpl); + return new ChildImpl(impl); } } } diff --git a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/subcomponentOmitsInheritedBindings/test.DaggerParent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/subcomponentOmitsInheritedBindings/test.DaggerParent_KT_FAST_INIT_MODE index 6afd7ca6fcc..76c37793d82 100644 --- a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/subcomponentOmitsInheritedBindings/test.DaggerParent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest/subcomponentOmitsInheritedBindings/test.DaggerParent_KT_FAST_INIT_MODE @@ -47,40 +47,40 @@ final class DaggerParent { if (parentModule == null) { this.parentModule = new ParentModule(); } - return new ParentImpl(parentModule); + return new Impl(parentModule); } } private static final class ChildImpl implements Child { - private final ParentImpl parentImpl; + private final Impl impl; private final ChildImpl childImpl = this; - ChildImpl(ParentImpl parentImpl) { - this.parentImpl = parentImpl; + ChildImpl(Impl impl) { + this.impl = impl; } @Override public Map objectMap() { - return (Map) ((Object) (ImmutableMap.of("parent key", ParentModule_ParentKeyObjectFactory.parentKeyObject(parentImpl.parentModule)))); + return (Map) ((Object) (ImmutableMap.of("parent key", ParentModule_ParentKeyObjectFactory.parentKeyObject(impl.parentModule)))); } } - private static final class ParentImpl implements Parent { + private static final class Impl implements Parent { private final ParentModule parentModule; - private final ParentImpl parentImpl = this; + private final Impl impl = this; - ParentImpl(ParentModule parentModuleParam) { + Impl(ParentModule parentModuleParam) { this.parentModule = parentModuleParam; } @Override public Child child() { - return new ChildImpl(parentImpl); + return new ChildImpl(impl); } } } diff --git a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/accessibility/test.DaggerTestComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/accessibility/test.DaggerTestComponent_DEFAULT_MODE index e10bb3bb106..4a69565fc8e 100644 --- a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/accessibility/test.DaggerTestComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/accessibility/test.DaggerTestComponent_DEFAULT_MODE @@ -40,14 +40,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/accessibility/test.DaggerTestComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/accessibility/test.DaggerTestComponent_FAST_INIT_MODE index e10bb3bb106..4a69565fc8e 100644 --- a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/accessibility/test.DaggerTestComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/accessibility/test.DaggerTestComponent_FAST_INIT_MODE @@ -40,14 +40,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/accessibility/test.DaggerTestComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/accessibility/test.DaggerTestComponent_KT_DEFAULT_MODE index bb6968ae0c7..146bbcbfcef 100644 --- a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/accessibility/test.DaggerTestComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/accessibility/test.DaggerTestComponent_KT_DEFAULT_MODE @@ -40,14 +40,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/accessibility/test.DaggerTestComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/accessibility/test.DaggerTestComponent_KT_FAST_INIT_MODE index bb6968ae0c7..146bbcbfcef 100644 --- a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/accessibility/test.DaggerTestComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/accessibility/test.DaggerTestComponent_KT_FAST_INIT_MODE @@ -40,14 +40,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/accessibleRawType_ofInaccessibleType/test.DaggerTestComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/accessibleRawType_ofInaccessibleType/test.DaggerTestComponent_DEFAULT_MODE index be3062008ad..9c00e06597f 100644 --- a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/accessibleRawType_ofInaccessibleType/test.DaggerTestComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/accessibleRawType_ofInaccessibleType/test.DaggerTestComponent_DEFAULT_MODE @@ -42,17 +42,17 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; @SuppressWarnings("rawtypes") Provider inaccessiblesProvider; - TestComponentImpl() { + Impl() { initialize(); diff --git a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/accessibleRawType_ofInaccessibleType/test.DaggerTestComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/accessibleRawType_ofInaccessibleType/test.DaggerTestComponent_FAST_INIT_MODE index 77fdc1931f9..885c1273faf 100644 --- a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/accessibleRawType_ofInaccessibleType/test.DaggerTestComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/accessibleRawType_ofInaccessibleType/test.DaggerTestComponent_FAST_INIT_MODE @@ -42,17 +42,17 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; @SuppressWarnings("rawtypes") Provider inaccessiblesProvider; - TestComponentImpl() { + Impl() { initialize(); @@ -60,7 +60,7 @@ final class DaggerTestComponent { @SuppressWarnings("unchecked") private void initialize() { - this.inaccessiblesProvider = DoubleCheck.provider(new SwitchingProvider(testComponentImpl, 0)); + this.inaccessiblesProvider = DoubleCheck.provider(new SwitchingProvider(impl, 0)); } @Override @@ -75,12 +75,12 @@ final class DaggerTestComponent { } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } diff --git a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/accessibleRawType_ofInaccessibleType/test.DaggerTestComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/accessibleRawType_ofInaccessibleType/test.DaggerTestComponent_KT_DEFAULT_MODE index b1fdeb12493..2d6d0dc50ad 100644 --- a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/accessibleRawType_ofInaccessibleType/test.DaggerTestComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/accessibleRawType_ofInaccessibleType/test.DaggerTestComponent_KT_DEFAULT_MODE @@ -41,19 +41,19 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; /** * {@code Provider>} */ Provider inaccessiblesProvider; - TestComponentImpl() { + Impl() { initialize(); diff --git a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/accessibleRawType_ofInaccessibleType/test.DaggerTestComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/accessibleRawType_ofInaccessibleType/test.DaggerTestComponent_KT_FAST_INIT_MODE index bcf148db281..9a3dd878b11 100644 --- a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/accessibleRawType_ofInaccessibleType/test.DaggerTestComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/accessibleRawType_ofInaccessibleType/test.DaggerTestComponent_KT_FAST_INIT_MODE @@ -41,19 +41,19 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; /** * {@code Provider>} */ Provider inaccessiblesProvider; - TestComponentImpl() { + Impl() { initialize(); @@ -61,7 +61,7 @@ final class DaggerTestComponent { @SuppressWarnings("unchecked") private void initialize() { - this.inaccessiblesProvider = DoubleCheck.provider(new SwitchingProvider<>(testComponentImpl, 0)); + this.inaccessiblesProvider = DoubleCheck.provider(new SwitchingProvider<>(impl, 0)); } @Override @@ -76,12 +76,12 @@ final class DaggerTestComponent { } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } diff --git a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/parentClass_injectedMembersInSupertype/test.DaggerTestComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/parentClass_injectedMembersInSupertype/test.DaggerTestComponent_DEFAULT_MODE index 7c38d9f6341..ced9d5c9fd8 100644 --- a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/parentClass_injectedMembersInSupertype/test.DaggerTestComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/parentClass_injectedMembersInSupertype/test.DaggerTestComponent_DEFAULT_MODE @@ -35,14 +35,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/parentClass_injectedMembersInSupertype/test.DaggerTestComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/parentClass_injectedMembersInSupertype/test.DaggerTestComponent_FAST_INIT_MODE index 7c38d9f6341..ced9d5c9fd8 100644 --- a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/parentClass_injectedMembersInSupertype/test.DaggerTestComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/parentClass_injectedMembersInSupertype/test.DaggerTestComponent_FAST_INIT_MODE @@ -35,14 +35,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/parentClass_injectedMembersInSupertype/test.DaggerTestComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/parentClass_injectedMembersInSupertype/test.DaggerTestComponent_KT_DEFAULT_MODE index dd63c158aac..f2e3cbc23e0 100644 --- a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/parentClass_injectedMembersInSupertype/test.DaggerTestComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/parentClass_injectedMembersInSupertype/test.DaggerTestComponent_KT_DEFAULT_MODE @@ -35,14 +35,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/parentClass_injectedMembersInSupertype/test.DaggerTestComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/parentClass_injectedMembersInSupertype/test.DaggerTestComponent_KT_FAST_INIT_MODE index dd63c158aac..f2e3cbc23e0 100644 --- a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/parentClass_injectedMembersInSupertype/test.DaggerTestComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/parentClass_injectedMembersInSupertype/test.DaggerTestComponent_KT_FAST_INIT_MODE @@ -35,14 +35,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/parentClass_noInjectedMembers/test.DaggerTestComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/parentClass_noInjectedMembers/test.DaggerTestComponent_DEFAULT_MODE index 72685f19678..c72e375b8a9 100644 --- a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/parentClass_noInjectedMembers/test.DaggerTestComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/parentClass_noInjectedMembers/test.DaggerTestComponent_DEFAULT_MODE @@ -34,14 +34,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/parentClass_noInjectedMembers/test.DaggerTestComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/parentClass_noInjectedMembers/test.DaggerTestComponent_FAST_INIT_MODE index 72685f19678..c72e375b8a9 100644 --- a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/parentClass_noInjectedMembers/test.DaggerTestComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/parentClass_noInjectedMembers/test.DaggerTestComponent_FAST_INIT_MODE @@ -34,14 +34,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/parentClass_noInjectedMembers/test.DaggerTestComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/parentClass_noInjectedMembers/test.DaggerTestComponent_KT_DEFAULT_MODE index b787b1d20ca..00e65d5f9e4 100644 --- a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/parentClass_noInjectedMembers/test.DaggerTestComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/parentClass_noInjectedMembers/test.DaggerTestComponent_KT_DEFAULT_MODE @@ -34,14 +34,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/parentClass_noInjectedMembers/test.DaggerTestComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/parentClass_noInjectedMembers/test.DaggerTestComponent_KT_FAST_INIT_MODE index b787b1d20ca..00e65d5f9e4 100644 --- a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/parentClass_noInjectedMembers/test.DaggerTestComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/parentClass_noInjectedMembers/test.DaggerTestComponent_KT_FAST_INIT_MODE @@ -34,14 +34,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/publicSupertypeHiddenSubtype/test.DaggerTestComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/publicSupertypeHiddenSubtype/test.DaggerTestComponent_DEFAULT_MODE index 3a6892cd2b9..df4322860c1 100644 --- a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/publicSupertypeHiddenSubtype/test.DaggerTestComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/publicSupertypeHiddenSubtype/test.DaggerTestComponent_DEFAULT_MODE @@ -41,14 +41,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/publicSupertypeHiddenSubtype/test.DaggerTestComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/publicSupertypeHiddenSubtype/test.DaggerTestComponent_FAST_INIT_MODE index 3a6892cd2b9..df4322860c1 100644 --- a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/publicSupertypeHiddenSubtype/test.DaggerTestComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/publicSupertypeHiddenSubtype/test.DaggerTestComponent_FAST_INIT_MODE @@ -41,14 +41,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/publicSupertypeHiddenSubtype/test.DaggerTestComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/publicSupertypeHiddenSubtype/test.DaggerTestComponent_KT_DEFAULT_MODE index a903bfa8f3d..938f5dca52b 100644 --- a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/publicSupertypeHiddenSubtype/test.DaggerTestComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/publicSupertypeHiddenSubtype/test.DaggerTestComponent_KT_DEFAULT_MODE @@ -41,14 +41,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/publicSupertypeHiddenSubtype/test.DaggerTestComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/publicSupertypeHiddenSubtype/test.DaggerTestComponent_KT_FAST_INIT_MODE index a903bfa8f3d..938f5dca52b 100644 --- a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/publicSupertypeHiddenSubtype/test.DaggerTestComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/publicSupertypeHiddenSubtype/test.DaggerTestComponent_KT_FAST_INIT_MODE @@ -41,14 +41,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/testMembersInjectionBindingExistsInParentComponent/test.DaggerMyComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/testMembersInjectionBindingExistsInParentComponent/test.DaggerMyComponent_DEFAULT_MODE index 10f53216bc9..2ac4a841384 100644 --- a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/testMembersInjectionBindingExistsInParentComponent/test.DaggerMyComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/testMembersInjectionBindingExistsInParentComponent/test.DaggerMyComponent_DEFAULT_MODE @@ -37,17 +37,17 @@ public final class DaggerMyComponent { } public MyComponent build() { - return new MyComponentImpl(); + return new Impl(); } } private static final class MySubcomponentImpl implements MySubcomponent { - private final MyComponentImpl myComponentImpl; + private final Impl impl; private final MySubcomponentImpl mySubcomponentImpl = this; - MySubcomponentImpl(MyComponentImpl myComponentImpl) { - this.myComponentImpl = myComponentImpl; + MySubcomponentImpl(Impl impl) { + this.impl = impl; } @@ -72,10 +72,10 @@ public final class DaggerMyComponent { } } - private static final class MyComponentImpl implements MyComponent { - private final MyComponentImpl myComponentImpl = this; + private static final class Impl implements MyComponent { + private final Impl impl = this; - MyComponentImpl() { + Impl() { } @@ -91,7 +91,7 @@ public final class DaggerMyComponent { @Override public MySubcomponent subcomponent() { - return new MySubcomponentImpl(myComponentImpl); + return new MySubcomponentImpl(impl); } @CanIgnoreReturnValue diff --git a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/testMembersInjectionBindingExistsInParentComponent/test.DaggerMyComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/testMembersInjectionBindingExistsInParentComponent/test.DaggerMyComponent_FAST_INIT_MODE index 10f53216bc9..2ac4a841384 100644 --- a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/testMembersInjectionBindingExistsInParentComponent/test.DaggerMyComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/testMembersInjectionBindingExistsInParentComponent/test.DaggerMyComponent_FAST_INIT_MODE @@ -37,17 +37,17 @@ public final class DaggerMyComponent { } public MyComponent build() { - return new MyComponentImpl(); + return new Impl(); } } private static final class MySubcomponentImpl implements MySubcomponent { - private final MyComponentImpl myComponentImpl; + private final Impl impl; private final MySubcomponentImpl mySubcomponentImpl = this; - MySubcomponentImpl(MyComponentImpl myComponentImpl) { - this.myComponentImpl = myComponentImpl; + MySubcomponentImpl(Impl impl) { + this.impl = impl; } @@ -72,10 +72,10 @@ public final class DaggerMyComponent { } } - private static final class MyComponentImpl implements MyComponent { - private final MyComponentImpl myComponentImpl = this; + private static final class Impl implements MyComponent { + private final Impl impl = this; - MyComponentImpl() { + Impl() { } @@ -91,7 +91,7 @@ public final class DaggerMyComponent { @Override public MySubcomponent subcomponent() { - return new MySubcomponentImpl(myComponentImpl); + return new MySubcomponentImpl(impl); } @CanIgnoreReturnValue diff --git a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/testMembersInjectionBindingExistsInParentComponent/test.DaggerMyComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/testMembersInjectionBindingExistsInParentComponent/test.DaggerMyComponent_KT_DEFAULT_MODE index da7ad172f79..b8152bd5e73 100644 --- a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/testMembersInjectionBindingExistsInParentComponent/test.DaggerMyComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/testMembersInjectionBindingExistsInParentComponent/test.DaggerMyComponent_KT_DEFAULT_MODE @@ -36,17 +36,17 @@ public final class DaggerMyComponent { } public MyComponent build() { - return new MyComponentImpl(); + return new Impl(); } } private static final class MySubcomponentImpl implements MySubcomponent { - private final MyComponentImpl myComponentImpl; + private final Impl impl; private final MySubcomponentImpl mySubcomponentImpl = this; - MySubcomponentImpl(MyComponentImpl myComponentImpl) { - this.myComponentImpl = myComponentImpl; + MySubcomponentImpl(Impl impl) { + this.impl = impl; } @@ -71,10 +71,10 @@ public final class DaggerMyComponent { } } - private static final class MyComponentImpl implements MyComponent { - private final MyComponentImpl myComponentImpl = this; + private static final class Impl implements MyComponent { + private final Impl impl = this; - MyComponentImpl() { + Impl() { } @@ -90,7 +90,7 @@ public final class DaggerMyComponent { @Override public MySubcomponent subcomponent() { - return new MySubcomponentImpl(myComponentImpl); + return new MySubcomponentImpl(impl); } @CanIgnoreReturnValue diff --git a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/testMembersInjectionBindingExistsInParentComponent/test.DaggerMyComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/testMembersInjectionBindingExistsInParentComponent/test.DaggerMyComponent_KT_FAST_INIT_MODE index da7ad172f79..b8152bd5e73 100644 --- a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/testMembersInjectionBindingExistsInParentComponent/test.DaggerMyComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/testMembersInjectionBindingExistsInParentComponent/test.DaggerMyComponent_KT_FAST_INIT_MODE @@ -36,17 +36,17 @@ public final class DaggerMyComponent { } public MyComponent build() { - return new MyComponentImpl(); + return new Impl(); } } private static final class MySubcomponentImpl implements MySubcomponent { - private final MyComponentImpl myComponentImpl; + private final Impl impl; private final MySubcomponentImpl mySubcomponentImpl = this; - MySubcomponentImpl(MyComponentImpl myComponentImpl) { - this.myComponentImpl = myComponentImpl; + MySubcomponentImpl(Impl impl) { + this.impl = impl; } @@ -71,10 +71,10 @@ public final class DaggerMyComponent { } } - private static final class MyComponentImpl implements MyComponent { - private final MyComponentImpl myComponentImpl = this; + private static final class Impl implements MyComponent { + private final Impl impl = this; - MyComponentImpl() { + Impl() { } @@ -90,7 +90,7 @@ public final class DaggerMyComponent { @Override public MySubcomponent subcomponent() { - return new MySubcomponentImpl(myComponentImpl); + return new MySubcomponentImpl(impl); } @CanIgnoreReturnValue diff --git a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/testMembersInjectionBindingSharesInjectMethodsWithProvisionBinding/test.DaggerMyComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/testMembersInjectionBindingSharesInjectMethodsWithProvisionBinding/test.DaggerMyComponent_DEFAULT_MODE index 50b2a51226d..c5de6195dc9 100644 --- a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/testMembersInjectionBindingSharesInjectMethodsWithProvisionBinding/test.DaggerMyComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/testMembersInjectionBindingSharesInjectMethodsWithProvisionBinding/test.DaggerMyComponent_DEFAULT_MODE @@ -35,14 +35,14 @@ public final class DaggerMyComponent { } public MyComponent build() { - return new MyComponentImpl(); + return new Impl(); } } - private static final class MyComponentImpl implements MyComponent { - private final MyComponentImpl myComponentImpl = this; + private static final class Impl implements MyComponent { + private final Impl impl = this; - MyComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/testMembersInjectionBindingSharesInjectMethodsWithProvisionBinding/test.DaggerMyComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/testMembersInjectionBindingSharesInjectMethodsWithProvisionBinding/test.DaggerMyComponent_FAST_INIT_MODE index 50b2a51226d..c5de6195dc9 100644 --- a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/testMembersInjectionBindingSharesInjectMethodsWithProvisionBinding/test.DaggerMyComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/testMembersInjectionBindingSharesInjectMethodsWithProvisionBinding/test.DaggerMyComponent_FAST_INIT_MODE @@ -35,14 +35,14 @@ public final class DaggerMyComponent { } public MyComponent build() { - return new MyComponentImpl(); + return new Impl(); } } - private static final class MyComponentImpl implements MyComponent { - private final MyComponentImpl myComponentImpl = this; + private static final class Impl implements MyComponent { + private final Impl impl = this; - MyComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/testMembersInjectionBindingSharesInjectMethodsWithProvisionBinding/test.DaggerMyComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/testMembersInjectionBindingSharesInjectMethodsWithProvisionBinding/test.DaggerMyComponent_KT_DEFAULT_MODE index 9093e3ef738..46103ed97bf 100644 --- a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/testMembersInjectionBindingSharesInjectMethodsWithProvisionBinding/test.DaggerMyComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/testMembersInjectionBindingSharesInjectMethodsWithProvisionBinding/test.DaggerMyComponent_KT_DEFAULT_MODE @@ -35,14 +35,14 @@ public final class DaggerMyComponent { } public MyComponent build() { - return new MyComponentImpl(); + return new Impl(); } } - private static final class MyComponentImpl implements MyComponent { - private final MyComponentImpl myComponentImpl = this; + private static final class Impl implements MyComponent { + private final Impl impl = this; - MyComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/testMembersInjectionBindingSharesInjectMethodsWithProvisionBinding/test.DaggerMyComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/testMembersInjectionBindingSharesInjectMethodsWithProvisionBinding/test.DaggerMyComponent_KT_FAST_INIT_MODE index 9093e3ef738..46103ed97bf 100644 --- a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/testMembersInjectionBindingSharesInjectMethodsWithProvisionBinding/test.DaggerMyComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/testMembersInjectionBindingSharesInjectMethodsWithProvisionBinding/test.DaggerMyComponent_KT_FAST_INIT_MODE @@ -35,14 +35,14 @@ public final class DaggerMyComponent { } public MyComponent build() { - return new MyComponentImpl(); + return new Impl(); } } - private static final class MyComponentImpl implements MyComponent { - private final MyComponentImpl myComponentImpl = this; + private static final class Impl implements MyComponent { + private final Impl impl = this; - MyComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/testMembersInjectionBindingWithNoInjectionSites/test.DaggerMyComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/testMembersInjectionBindingWithNoInjectionSites/test.DaggerMyComponent_DEFAULT_MODE index 96e6220e618..2745f9fac57 100644 --- a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/testMembersInjectionBindingWithNoInjectionSites/test.DaggerMyComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/testMembersInjectionBindingWithNoInjectionSites/test.DaggerMyComponent_DEFAULT_MODE @@ -34,14 +34,14 @@ public final class DaggerMyComponent { } public MyComponent build() { - return new MyComponentImpl(); + return new Impl(); } } - private static final class MyComponentImpl implements MyComponent { - private final MyComponentImpl myComponentImpl = this; + private static final class Impl implements MyComponent { + private final Impl impl = this; - MyComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/testMembersInjectionBindingWithNoInjectionSites/test.DaggerMyComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/testMembersInjectionBindingWithNoInjectionSites/test.DaggerMyComponent_FAST_INIT_MODE index 96e6220e618..2745f9fac57 100644 --- a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/testMembersInjectionBindingWithNoInjectionSites/test.DaggerMyComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/testMembersInjectionBindingWithNoInjectionSites/test.DaggerMyComponent_FAST_INIT_MODE @@ -34,14 +34,14 @@ public final class DaggerMyComponent { } public MyComponent build() { - return new MyComponentImpl(); + return new Impl(); } } - private static final class MyComponentImpl implements MyComponent { - private final MyComponentImpl myComponentImpl = this; + private static final class Impl implements MyComponent { + private final Impl impl = this; - MyComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/testMembersInjectionBindingWithNoInjectionSites/test.DaggerMyComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/testMembersInjectionBindingWithNoInjectionSites/test.DaggerMyComponent_KT_DEFAULT_MODE index f8fc8d34dad..4bff83751dd 100644 --- a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/testMembersInjectionBindingWithNoInjectionSites/test.DaggerMyComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/testMembersInjectionBindingWithNoInjectionSites/test.DaggerMyComponent_KT_DEFAULT_MODE @@ -34,14 +34,14 @@ public final class DaggerMyComponent { } public MyComponent build() { - return new MyComponentImpl(); + return new Impl(); } } - private static final class MyComponentImpl implements MyComponent { - private final MyComponentImpl myComponentImpl = this; + private static final class Impl implements MyComponent { + private final Impl impl = this; - MyComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/testMembersInjectionBindingWithNoInjectionSites/test.DaggerMyComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/testMembersInjectionBindingWithNoInjectionSites/test.DaggerMyComponent_KT_FAST_INIT_MODE index f8fc8d34dad..4bff83751dd 100644 --- a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/testMembersInjectionBindingWithNoInjectionSites/test.DaggerMyComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest/testMembersInjectionBindingWithNoInjectionSites/test.DaggerMyComponent_KT_FAST_INIT_MODE @@ -34,14 +34,14 @@ public final class DaggerMyComponent { } public MyComponent build() { - return new MyComponentImpl(); + return new Impl(); } } - private static final class MyComponentImpl implements MyComponent { - private final MyComponentImpl myComponentImpl = this; + private static final class Impl implements MyComponent { + private final Impl impl = this; - MyComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/ModuleFactoryGeneratorTest/parameterizedModule_withPackagePrivateTypeArgumentAndNonCyclicRecursiveBounds/other.DaggerMyComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ModuleFactoryGeneratorTest/parameterizedModule_withPackagePrivateTypeArgumentAndNonCyclicRecursiveBounds/other.DaggerMyComponent_DEFAULT_MODE index e921f05ce00..96b42a97413 100644 --- a/javatests/dagger/internal/codegen/goldens/ModuleFactoryGeneratorTest/parameterizedModule_withPackagePrivateTypeArgumentAndNonCyclicRecursiveBounds/other.DaggerMyComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ModuleFactoryGeneratorTest/parameterizedModule_withPackagePrivateTypeArgumentAndNonCyclicRecursiveBounds/other.DaggerMyComponent_DEFAULT_MODE @@ -51,16 +51,16 @@ final class DaggerMyComponent { if (concreteModule == null) { this.concreteModule = new ConcreteModule(); } - return new MyComponentImpl(concreteModule); + return new Impl(concreteModule); } } - private static final class MyComponentImpl implements MyComponent { + private static final class Impl implements MyComponent { private final ConcreteModule concreteModule; - private final MyComponentImpl myComponentImpl = this; + private final Impl impl = this; - MyComponentImpl(ConcreteModule concreteModuleParam) { + Impl(ConcreteModule concreteModuleParam) { this.concreteModule = concreteModuleParam; } diff --git a/javatests/dagger/internal/codegen/goldens/ModuleFactoryGeneratorTest/parameterizedModule_withPackagePrivateTypeArgumentAndNonCyclicRecursiveBounds/other.DaggerMyComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ModuleFactoryGeneratorTest/parameterizedModule_withPackagePrivateTypeArgumentAndNonCyclicRecursiveBounds/other.DaggerMyComponent_FAST_INIT_MODE index e921f05ce00..96b42a97413 100644 --- a/javatests/dagger/internal/codegen/goldens/ModuleFactoryGeneratorTest/parameterizedModule_withPackagePrivateTypeArgumentAndNonCyclicRecursiveBounds/other.DaggerMyComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ModuleFactoryGeneratorTest/parameterizedModule_withPackagePrivateTypeArgumentAndNonCyclicRecursiveBounds/other.DaggerMyComponent_FAST_INIT_MODE @@ -51,16 +51,16 @@ final class DaggerMyComponent { if (concreteModule == null) { this.concreteModule = new ConcreteModule(); } - return new MyComponentImpl(concreteModule); + return new Impl(concreteModule); } } - private static final class MyComponentImpl implements MyComponent { + private static final class Impl implements MyComponent { private final ConcreteModule concreteModule; - private final MyComponentImpl myComponentImpl = this; + private final Impl impl = this; - MyComponentImpl(ConcreteModule concreteModuleParam) { + Impl(ConcreteModule concreteModuleParam) { this.concreteModule = concreteModuleParam; } diff --git a/javatests/dagger/internal/codegen/goldens/ModuleFactoryGeneratorTest/parameterizedModule_withPackagePrivateTypeArgumentAndNonCyclicRecursiveBounds/other.DaggerMyComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ModuleFactoryGeneratorTest/parameterizedModule_withPackagePrivateTypeArgumentAndNonCyclicRecursiveBounds/other.DaggerMyComponent_KT_DEFAULT_MODE index c4b500a2df3..5ac408ea5d3 100644 --- a/javatests/dagger/internal/codegen/goldens/ModuleFactoryGeneratorTest/parameterizedModule_withPackagePrivateTypeArgumentAndNonCyclicRecursiveBounds/other.DaggerMyComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ModuleFactoryGeneratorTest/parameterizedModule_withPackagePrivateTypeArgumentAndNonCyclicRecursiveBounds/other.DaggerMyComponent_KT_DEFAULT_MODE @@ -51,16 +51,16 @@ final class DaggerMyComponent { if (concreteModule == null) { this.concreteModule = new ConcreteModule(); } - return new MyComponentImpl(concreteModule); + return new Impl(concreteModule); } } - private static final class MyComponentImpl implements MyComponent { + private static final class Impl implements MyComponent { private final ConcreteModule concreteModule; - private final MyComponentImpl myComponentImpl = this; + private final Impl impl = this; - MyComponentImpl(ConcreteModule concreteModuleParam) { + Impl(ConcreteModule concreteModuleParam) { this.concreteModule = concreteModuleParam; } diff --git a/javatests/dagger/internal/codegen/goldens/ModuleFactoryGeneratorTest/parameterizedModule_withPackagePrivateTypeArgumentAndNonCyclicRecursiveBounds/other.DaggerMyComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ModuleFactoryGeneratorTest/parameterizedModule_withPackagePrivateTypeArgumentAndNonCyclicRecursiveBounds/other.DaggerMyComponent_KT_FAST_INIT_MODE index c4b500a2df3..5ac408ea5d3 100644 --- a/javatests/dagger/internal/codegen/goldens/ModuleFactoryGeneratorTest/parameterizedModule_withPackagePrivateTypeArgumentAndNonCyclicRecursiveBounds/other.DaggerMyComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ModuleFactoryGeneratorTest/parameterizedModule_withPackagePrivateTypeArgumentAndNonCyclicRecursiveBounds/other.DaggerMyComponent_KT_FAST_INIT_MODE @@ -51,16 +51,16 @@ final class DaggerMyComponent { if (concreteModule == null) { this.concreteModule = new ConcreteModule(); } - return new MyComponentImpl(concreteModule); + return new Impl(concreteModule); } } - private static final class MyComponentImpl implements MyComponent { + private static final class Impl implements MyComponent { private final ConcreteModule concreteModule; - private final MyComponentImpl myComponentImpl = this; + private final Impl impl = this; - MyComponentImpl(ConcreteModule concreteModuleParam) { + Impl(ConcreteModule concreteModuleParam) { this.concreteModule = concreteModuleParam; } diff --git a/javatests/dagger/internal/codegen/goldens/ModuleFactoryGeneratorTest/parameterizedModule_withPackagePrivateTypeArgumentAndPublicBounds/other.DaggerMyComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ModuleFactoryGeneratorTest/parameterizedModule_withPackagePrivateTypeArgumentAndPublicBounds/other.DaggerMyComponent_DEFAULT_MODE index de916710f0a..ed14b30a4f1 100644 --- a/javatests/dagger/internal/codegen/goldens/ModuleFactoryGeneratorTest/parameterizedModule_withPackagePrivateTypeArgumentAndPublicBounds/other.DaggerMyComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ModuleFactoryGeneratorTest/parameterizedModule_withPackagePrivateTypeArgumentAndPublicBounds/other.DaggerMyComponent_DEFAULT_MODE @@ -51,16 +51,16 @@ final class DaggerMyComponent { if (concreteModule == null) { this.concreteModule = new ConcreteModule(); } - return new MyComponentImpl(concreteModule); + return new Impl(concreteModule); } } - private static final class MyComponentImpl implements MyComponent { + private static final class Impl implements MyComponent { private final ConcreteModule concreteModule; - private final MyComponentImpl myComponentImpl = this; + private final Impl impl = this; - MyComponentImpl(ConcreteModule concreteModuleParam) { + Impl(ConcreteModule concreteModuleParam) { this.concreteModule = concreteModuleParam; } diff --git a/javatests/dagger/internal/codegen/goldens/ModuleFactoryGeneratorTest/parameterizedModule_withPackagePrivateTypeArgumentAndPublicBounds/other.DaggerMyComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ModuleFactoryGeneratorTest/parameterizedModule_withPackagePrivateTypeArgumentAndPublicBounds/other.DaggerMyComponent_FAST_INIT_MODE index de916710f0a..ed14b30a4f1 100644 --- a/javatests/dagger/internal/codegen/goldens/ModuleFactoryGeneratorTest/parameterizedModule_withPackagePrivateTypeArgumentAndPublicBounds/other.DaggerMyComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ModuleFactoryGeneratorTest/parameterizedModule_withPackagePrivateTypeArgumentAndPublicBounds/other.DaggerMyComponent_FAST_INIT_MODE @@ -51,16 +51,16 @@ final class DaggerMyComponent { if (concreteModule == null) { this.concreteModule = new ConcreteModule(); } - return new MyComponentImpl(concreteModule); + return new Impl(concreteModule); } } - private static final class MyComponentImpl implements MyComponent { + private static final class Impl implements MyComponent { private final ConcreteModule concreteModule; - private final MyComponentImpl myComponentImpl = this; + private final Impl impl = this; - MyComponentImpl(ConcreteModule concreteModuleParam) { + Impl(ConcreteModule concreteModuleParam) { this.concreteModule = concreteModuleParam; } diff --git a/javatests/dagger/internal/codegen/goldens/ModuleFactoryGeneratorTest/parameterizedModule_withPackagePrivateTypeArgumentAndPublicBounds/other.DaggerMyComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ModuleFactoryGeneratorTest/parameterizedModule_withPackagePrivateTypeArgumentAndPublicBounds/other.DaggerMyComponent_KT_DEFAULT_MODE index 3213fee0a4d..e3937a282e0 100644 --- a/javatests/dagger/internal/codegen/goldens/ModuleFactoryGeneratorTest/parameterizedModule_withPackagePrivateTypeArgumentAndPublicBounds/other.DaggerMyComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ModuleFactoryGeneratorTest/parameterizedModule_withPackagePrivateTypeArgumentAndPublicBounds/other.DaggerMyComponent_KT_DEFAULT_MODE @@ -51,16 +51,16 @@ final class DaggerMyComponent { if (concreteModule == null) { this.concreteModule = new ConcreteModule(); } - return new MyComponentImpl(concreteModule); + return new Impl(concreteModule); } } - private static final class MyComponentImpl implements MyComponent { + private static final class Impl implements MyComponent { private final ConcreteModule concreteModule; - private final MyComponentImpl myComponentImpl = this; + private final Impl impl = this; - MyComponentImpl(ConcreteModule concreteModuleParam) { + Impl(ConcreteModule concreteModuleParam) { this.concreteModule = concreteModuleParam; } diff --git a/javatests/dagger/internal/codegen/goldens/ModuleFactoryGeneratorTest/parameterizedModule_withPackagePrivateTypeArgumentAndPublicBounds/other.DaggerMyComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ModuleFactoryGeneratorTest/parameterizedModule_withPackagePrivateTypeArgumentAndPublicBounds/other.DaggerMyComponent_KT_FAST_INIT_MODE index 3213fee0a4d..e3937a282e0 100644 --- a/javatests/dagger/internal/codegen/goldens/ModuleFactoryGeneratorTest/parameterizedModule_withPackagePrivateTypeArgumentAndPublicBounds/other.DaggerMyComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ModuleFactoryGeneratorTest/parameterizedModule_withPackagePrivateTypeArgumentAndPublicBounds/other.DaggerMyComponent_KT_FAST_INIT_MODE @@ -51,16 +51,16 @@ final class DaggerMyComponent { if (concreteModule == null) { this.concreteModule = new ConcreteModule(); } - return new MyComponentImpl(concreteModule); + return new Impl(concreteModule); } } - private static final class MyComponentImpl implements MyComponent { + private static final class Impl implements MyComponent { private final ConcreteModule concreteModule; - private final MyComponentImpl myComponentImpl = this; + private final Impl impl = this; - MyComponentImpl(ConcreteModule concreteModuleParam) { + Impl(ConcreteModule concreteModuleParam) { this.concreteModule = concreteModuleParam; } diff --git a/javatests/dagger/internal/codegen/goldens/ModuleFactoryGeneratorTest/parameterizedModule_withPublicTypeArgumentAndPackagePrivateBounds/other.DaggerMyComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ModuleFactoryGeneratorTest/parameterizedModule_withPublicTypeArgumentAndPackagePrivateBounds/other.DaggerMyComponent_DEFAULT_MODE index 6d00a19b154..4c7e1a478d9 100644 --- a/javatests/dagger/internal/codegen/goldens/ModuleFactoryGeneratorTest/parameterizedModule_withPublicTypeArgumentAndPackagePrivateBounds/other.DaggerMyComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ModuleFactoryGeneratorTest/parameterizedModule_withPublicTypeArgumentAndPackagePrivateBounds/other.DaggerMyComponent_DEFAULT_MODE @@ -52,16 +52,16 @@ final class DaggerMyComponent { if (concreteModule == null) { this.concreteModule = new ConcreteModule(); } - return new MyComponentImpl(concreteModule); + return new Impl(concreteModule); } } - private static final class MyComponentImpl implements MyComponent { + private static final class Impl implements MyComponent { private final ConcreteModule concreteModule; - private final MyComponentImpl myComponentImpl = this; + private final Impl impl = this; - MyComponentImpl(ConcreteModule concreteModuleParam) { + Impl(ConcreteModule concreteModuleParam) { this.concreteModule = concreteModuleParam; } diff --git a/javatests/dagger/internal/codegen/goldens/ModuleFactoryGeneratorTest/parameterizedModule_withPublicTypeArgumentAndPackagePrivateBounds/other.DaggerMyComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ModuleFactoryGeneratorTest/parameterizedModule_withPublicTypeArgumentAndPackagePrivateBounds/other.DaggerMyComponent_FAST_INIT_MODE index 6d00a19b154..4c7e1a478d9 100644 --- a/javatests/dagger/internal/codegen/goldens/ModuleFactoryGeneratorTest/parameterizedModule_withPublicTypeArgumentAndPackagePrivateBounds/other.DaggerMyComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ModuleFactoryGeneratorTest/parameterizedModule_withPublicTypeArgumentAndPackagePrivateBounds/other.DaggerMyComponent_FAST_INIT_MODE @@ -52,16 +52,16 @@ final class DaggerMyComponent { if (concreteModule == null) { this.concreteModule = new ConcreteModule(); } - return new MyComponentImpl(concreteModule); + return new Impl(concreteModule); } } - private static final class MyComponentImpl implements MyComponent { + private static final class Impl implements MyComponent { private final ConcreteModule concreteModule; - private final MyComponentImpl myComponentImpl = this; + private final Impl impl = this; - MyComponentImpl(ConcreteModule concreteModuleParam) { + Impl(ConcreteModule concreteModuleParam) { this.concreteModule = concreteModuleParam; } diff --git a/javatests/dagger/internal/codegen/goldens/OptionalBindingRequestFulfillmentTest/inlinedOptionalBindings/test.DaggerTestComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/OptionalBindingRequestFulfillmentTest/inlinedOptionalBindings/test.DaggerTestComponent_DEFAULT_MODE index cf4f59de4a7..a0bc33c3635 100644 --- a/javatests/dagger/internal/codegen/goldens/OptionalBindingRequestFulfillmentTest/inlinedOptionalBindings/test.DaggerTestComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/OptionalBindingRequestFulfillmentTest/inlinedOptionalBindings/test.DaggerTestComponent_DEFAULT_MODE @@ -41,14 +41,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/OptionalBindingRequestFulfillmentTest/inlinedOptionalBindings/test.DaggerTestComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/OptionalBindingRequestFulfillmentTest/inlinedOptionalBindings/test.DaggerTestComponent_FAST_INIT_MODE index 4e134f48f21..40dfe87e002 100644 --- a/javatests/dagger/internal/codegen/goldens/OptionalBindingRequestFulfillmentTest/inlinedOptionalBindings/test.DaggerTestComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/OptionalBindingRequestFulfillmentTest/inlinedOptionalBindings/test.DaggerTestComponent_FAST_INIT_MODE @@ -41,16 +41,16 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; Provider provideMaybeProvider; - TestComponentImpl() { + Impl() { initialize(); @@ -58,7 +58,7 @@ final class DaggerTestComponent { @SuppressWarnings("unchecked") private void initialize() { - this.provideMaybeProvider = new SwitchingProvider<>(testComponentImpl, 0); + this.provideMaybeProvider = new SwitchingProvider<>(impl, 0); } @Override @@ -82,12 +82,12 @@ final class DaggerTestComponent { } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } diff --git a/javatests/dagger/internal/codegen/goldens/OptionalBindingRequestFulfillmentTest/inlinedOptionalBindings/test.DaggerTestComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/OptionalBindingRequestFulfillmentTest/inlinedOptionalBindings/test.DaggerTestComponent_KT_DEFAULT_MODE index 60228fbdc70..64c909664f9 100644 --- a/javatests/dagger/internal/codegen/goldens/OptionalBindingRequestFulfillmentTest/inlinedOptionalBindings/test.DaggerTestComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/OptionalBindingRequestFulfillmentTest/inlinedOptionalBindings/test.DaggerTestComponent_KT_DEFAULT_MODE @@ -41,14 +41,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/OptionalBindingRequestFulfillmentTest/inlinedOptionalBindings/test.DaggerTestComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/OptionalBindingRequestFulfillmentTest/inlinedOptionalBindings/test.DaggerTestComponent_KT_FAST_INIT_MODE index 52db98d4b6d..d47237fa8a2 100644 --- a/javatests/dagger/internal/codegen/goldens/OptionalBindingRequestFulfillmentTest/inlinedOptionalBindings/test.DaggerTestComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/OptionalBindingRequestFulfillmentTest/inlinedOptionalBindings/test.DaggerTestComponent_KT_FAST_INIT_MODE @@ -41,19 +41,19 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; /** * {@code Provider} */ Provider provideMaybeProvider; - TestComponentImpl() { + Impl() { initialize(); @@ -61,7 +61,7 @@ final class DaggerTestComponent { @SuppressWarnings("unchecked") private void initialize() { - this.provideMaybeProvider = new SwitchingProvider<>(testComponentImpl, 0); + this.provideMaybeProvider = new SwitchingProvider<>(impl, 0); } @Override @@ -85,12 +85,12 @@ final class DaggerTestComponent { } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } diff --git a/javatests/dagger/internal/codegen/goldens/OptionalBindingRequestFulfillmentTest/requestForFuture/test.DaggerTestComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/OptionalBindingRequestFulfillmentTest/requestForFuture/test.DaggerTestComponent_DEFAULT_MODE index 0dcad649cc4..ffd25d5e392 100644 --- a/javatests/dagger/internal/codegen/goldens/OptionalBindingRequestFulfillmentTest/requestForFuture/test.DaggerTestComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/OptionalBindingRequestFulfillmentTest/requestForFuture/test.DaggerTestComponent_DEFAULT_MODE @@ -41,14 +41,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent, CancellationListener { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent, CancellationListener { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/OptionalBindingRequestFulfillmentTest/requestForFuture/test.DaggerTestComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/OptionalBindingRequestFulfillmentTest/requestForFuture/test.DaggerTestComponent_FAST_INIT_MODE index 0dcad649cc4..ffd25d5e392 100644 --- a/javatests/dagger/internal/codegen/goldens/OptionalBindingRequestFulfillmentTest/requestForFuture/test.DaggerTestComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/OptionalBindingRequestFulfillmentTest/requestForFuture/test.DaggerTestComponent_FAST_INIT_MODE @@ -41,14 +41,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent, CancellationListener { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent, CancellationListener { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/OptionalBindingRequestFulfillmentTest/requestForFuture/test.DaggerTestComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/OptionalBindingRequestFulfillmentTest/requestForFuture/test.DaggerTestComponent_KT_DEFAULT_MODE index ed2c027005c..9f0182dcf80 100644 --- a/javatests/dagger/internal/codegen/goldens/OptionalBindingRequestFulfillmentTest/requestForFuture/test.DaggerTestComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/OptionalBindingRequestFulfillmentTest/requestForFuture/test.DaggerTestComponent_KT_DEFAULT_MODE @@ -41,14 +41,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent, CancellationListener { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent, CancellationListener { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/OptionalBindingRequestFulfillmentTest/requestForFuture/test.DaggerTestComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/OptionalBindingRequestFulfillmentTest/requestForFuture/test.DaggerTestComponent_KT_FAST_INIT_MODE index ed2c027005c..9f0182dcf80 100644 --- a/javatests/dagger/internal/codegen/goldens/OptionalBindingRequestFulfillmentTest/requestForFuture/test.DaggerTestComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/OptionalBindingRequestFulfillmentTest/requestForFuture/test.DaggerTestComponent_KT_FAST_INIT_MODE @@ -41,14 +41,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent, CancellationListener { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent, CancellationListener { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/ProductionComponentProcessorTest/productionScope_injectConstructor/test.DaggerParent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ProductionComponentProcessorTest/productionScope_injectConstructor/test.DaggerParent_DEFAULT_MODE index c9cf8b5405b..849fef73ae5 100644 --- a/javatests/dagger/internal/codegen/goldens/ProductionComponentProcessorTest/productionScope_injectConstructor/test.DaggerParent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ProductionComponentProcessorTest/productionScope_injectConstructor/test.DaggerParent_DEFAULT_MODE @@ -37,24 +37,24 @@ final class DaggerParent { } public Parent build() { - return new ParentImpl(); + return new Impl(); } } private static final class ChildImpl implements Child, CancellationListener { - private final ParentImpl parentImpl; + private final Impl impl; private final ChildImpl childImpl = this; - ChildImpl(ParentImpl parentImpl) { - this.parentImpl = parentImpl; + ChildImpl(Impl impl) { + this.impl = impl; } @Override public ProductionScoped productionScoped() { - return parentImpl.productionScopedProvider.get(); + return impl.productionScopedProvider.get(); } @Override @@ -64,12 +64,12 @@ final class DaggerParent { } } - private static final class ParentImpl implements Parent, CancellationListener { - private final ParentImpl parentImpl = this; + private static final class Impl implements Parent, CancellationListener { + private final Impl impl = this; Provider productionScopedProvider; - ParentImpl() { + Impl() { initialize(); @@ -82,7 +82,7 @@ final class DaggerParent { @Override public Child child() { - return new ChildImpl(parentImpl); + return new ChildImpl(impl); } @Override diff --git a/javatests/dagger/internal/codegen/goldens/ProductionComponentProcessorTest/productionScope_injectConstructor/test.DaggerParent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ProductionComponentProcessorTest/productionScope_injectConstructor/test.DaggerParent_FAST_INIT_MODE index c3de0678fef..309461a8f00 100644 --- a/javatests/dagger/internal/codegen/goldens/ProductionComponentProcessorTest/productionScope_injectConstructor/test.DaggerParent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ProductionComponentProcessorTest/productionScope_injectConstructor/test.DaggerParent_FAST_INIT_MODE @@ -37,24 +37,24 @@ final class DaggerParent { } public Parent build() { - return new ParentImpl(); + return new Impl(); } } private static final class ChildImpl implements Child, CancellationListener { - private final ParentImpl parentImpl; + private final Impl impl; private final ChildImpl childImpl = this; - ChildImpl(ParentImpl parentImpl) { - this.parentImpl = parentImpl; + ChildImpl(Impl impl) { + this.impl = impl; } @Override public ProductionScoped productionScoped() { - return parentImpl.productionScopedProvider.get(); + return impl.productionScopedProvider.get(); } @Override @@ -64,12 +64,12 @@ final class DaggerParent { } } - private static final class ParentImpl implements Parent, CancellationListener { - private final ParentImpl parentImpl = this; + private static final class Impl implements Parent, CancellationListener { + private final Impl impl = this; Provider productionScopedProvider; - ParentImpl() { + Impl() { initialize(); @@ -77,12 +77,12 @@ final class DaggerParent { @SuppressWarnings("unchecked") private void initialize() { - this.productionScopedProvider = DoubleCheck.provider(new SwitchingProvider(parentImpl, 0)); + this.productionScopedProvider = DoubleCheck.provider(new SwitchingProvider(impl, 0)); } @Override public Child child() { - return new ChildImpl(parentImpl); + return new ChildImpl(impl); } @Override @@ -92,12 +92,12 @@ final class DaggerParent { } private static final class SwitchingProvider implements Provider { - private final ParentImpl parentImpl; + private final Impl impl; private final int id; - SwitchingProvider(ParentImpl parentImpl, int id) { - this.parentImpl = parentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } diff --git a/javatests/dagger/internal/codegen/goldens/ProductionComponentProcessorTest/productionScope_injectConstructor/test.DaggerParent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ProductionComponentProcessorTest/productionScope_injectConstructor/test.DaggerParent_KT_DEFAULT_MODE index 2663328de26..617aecfa16e 100644 --- a/javatests/dagger/internal/codegen/goldens/ProductionComponentProcessorTest/productionScope_injectConstructor/test.DaggerParent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ProductionComponentProcessorTest/productionScope_injectConstructor/test.DaggerParent_KT_DEFAULT_MODE @@ -37,24 +37,24 @@ final class DaggerParent { } public Parent build() { - return new ParentImpl(); + return new Impl(); } } private static final class ChildImpl implements Child, CancellationListener { - private final ParentImpl parentImpl; + private final Impl impl; private final ChildImpl childImpl = this; - ChildImpl(ParentImpl parentImpl) { - this.parentImpl = parentImpl; + ChildImpl(Impl impl) { + this.impl = impl; } @Override public ProductionScoped productionScoped() { - return (ProductionScoped) ((Object) (parentImpl.productionScopedProvider.get())); + return (ProductionScoped) ((Object) (impl.productionScopedProvider.get())); } @Override @@ -64,15 +64,15 @@ final class DaggerParent { } } - private static final class ParentImpl implements Parent, CancellationListener { - private final ParentImpl parentImpl = this; + private static final class Impl implements Parent, CancellationListener { + private final Impl impl = this; /** * {@code Provider} */ Provider productionScopedProvider; - ParentImpl() { + Impl() { initialize(); @@ -85,7 +85,7 @@ final class DaggerParent { @Override public Child child() { - return new ChildImpl(parentImpl); + return new ChildImpl(impl); } @Override diff --git a/javatests/dagger/internal/codegen/goldens/ProductionComponentProcessorTest/productionScope_injectConstructor/test.DaggerParent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ProductionComponentProcessorTest/productionScope_injectConstructor/test.DaggerParent_KT_FAST_INIT_MODE index 0668996bc72..ac3ebdc9fef 100644 --- a/javatests/dagger/internal/codegen/goldens/ProductionComponentProcessorTest/productionScope_injectConstructor/test.DaggerParent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ProductionComponentProcessorTest/productionScope_injectConstructor/test.DaggerParent_KT_FAST_INIT_MODE @@ -37,24 +37,24 @@ final class DaggerParent { } public Parent build() { - return new ParentImpl(); + return new Impl(); } } private static final class ChildImpl implements Child, CancellationListener { - private final ParentImpl parentImpl; + private final Impl impl; private final ChildImpl childImpl = this; - ChildImpl(ParentImpl parentImpl) { - this.parentImpl = parentImpl; + ChildImpl(Impl impl) { + this.impl = impl; } @Override public ProductionScoped productionScoped() { - return (ProductionScoped) ((Object) (parentImpl.productionScopedProvider.get())); + return (ProductionScoped) ((Object) (impl.productionScopedProvider.get())); } @Override @@ -64,15 +64,15 @@ final class DaggerParent { } } - private static final class ParentImpl implements Parent, CancellationListener { - private final ParentImpl parentImpl = this; + private static final class Impl implements Parent, CancellationListener { + private final Impl impl = this; /** * {@code Provider} */ Provider productionScopedProvider; - ParentImpl() { + Impl() { initialize(); @@ -80,12 +80,12 @@ final class DaggerParent { @SuppressWarnings("unchecked") private void initialize() { - this.productionScopedProvider = DoubleCheck.provider(new SwitchingProvider<>(parentImpl, 0)); + this.productionScopedProvider = DoubleCheck.provider(new SwitchingProvider<>(impl, 0)); } @Override public Child child() { - return new ChildImpl(parentImpl); + return new ChildImpl(impl); } @Override @@ -95,12 +95,12 @@ final class DaggerParent { } private static final class SwitchingProvider implements Provider { - private final ParentImpl parentImpl; + private final Impl impl; private final int id; - SwitchingProvider(ParentImpl parentImpl, int id) { - this.parentImpl = parentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } diff --git a/javatests/dagger/internal/codegen/goldens/ProductionComponentProcessorTest/simpleComponent/test.DaggerTestClass_SimpleComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ProductionComponentProcessorTest/simpleComponent/test.DaggerTestClass_SimpleComponent_DEFAULT_MODE index f7ced956973..85a409eaf3f 100644 --- a/javatests/dagger/internal/codegen/goldens/ProductionComponentProcessorTest/simpleComponent/test.DaggerTestClass_SimpleComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ProductionComponentProcessorTest/simpleComponent/test.DaggerTestClass_SimpleComponent_DEFAULT_MODE @@ -65,12 +65,12 @@ final class DaggerTestClass_SimpleComponent { if (bModule == null) { this.bModule = new TestClass.BModule(); } - return new SimpleComponentImpl(aModule, bModule); + return new Impl(aModule, bModule); } } - private static final class SimpleComponentImpl implements TestClass.SimpleComponent, CancellationListener { - private final SimpleComponentImpl simpleComponentImpl = this; + private static final class Impl implements TestClass.SimpleComponent, CancellationListener { + private final Impl impl = this; Provider executorProvider; @@ -88,7 +88,7 @@ final class DaggerTestClass_SimpleComponent { Producer aEntryPoint; - SimpleComponentImpl(TestClass.AModule aModuleParam, TestClass.BModule bModuleParam) { + Impl(TestClass.AModule aModuleParam, TestClass.BModule bModuleParam) { initialize(aModuleParam, bModuleParam); @@ -99,7 +99,7 @@ final class DaggerTestClass_SimpleComponent { final TestClass.BModule bModuleParam) { this.executorProvider = TestClass_BModule_ExecutorFactory.create(bModuleParam); this.productionImplementationExecutorProvider = DoubleCheck.provider((Provider) (executorProvider)); - this.simpleComponentProvider = InstanceFactory.create((TestClass.SimpleComponent) (simpleComponentImpl)); + this.simpleComponentProvider = InstanceFactory.create((TestClass.SimpleComponent) (impl)); this.monitorProvider = DoubleCheck.provider(TestClass_SimpleComponent_MonitoringModule_MonitorFactory.create(simpleComponentProvider, SetFactory.empty())); this.bProvider = TestClass_BModule_BFactory.create(bModuleParam, TestClass_C_Factory.create()); this.bProducer = Producers.producerFromProvider(bProvider); diff --git a/javatests/dagger/internal/codegen/goldens/ProductionComponentProcessorTest/simpleComponent/test.DaggerTestClass_SimpleComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ProductionComponentProcessorTest/simpleComponent/test.DaggerTestClass_SimpleComponent_FAST_INIT_MODE index 028ef39566c..6af8929ed50 100644 --- a/javatests/dagger/internal/codegen/goldens/ProductionComponentProcessorTest/simpleComponent/test.DaggerTestClass_SimpleComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ProductionComponentProcessorTest/simpleComponent/test.DaggerTestClass_SimpleComponent_FAST_INIT_MODE @@ -65,14 +65,14 @@ final class DaggerTestClass_SimpleComponent { if (bModule == null) { this.bModule = new TestClass.BModule(); } - return new SimpleComponentImpl(aModule, bModule); + return new Impl(aModule, bModule); } } - private static final class SimpleComponentImpl implements TestClass.SimpleComponent, CancellationListener { + private static final class Impl implements TestClass.SimpleComponent, CancellationListener { private final TestClass.BModule bModule; - private final SimpleComponentImpl simpleComponentImpl = this; + private final Impl impl = this; Provider executorProvider; @@ -90,7 +90,7 @@ final class DaggerTestClass_SimpleComponent { Producer aEntryPoint; - SimpleComponentImpl(TestClass.AModule aModuleParam, TestClass.BModule bModuleParam) { + Impl(TestClass.AModule aModuleParam, TestClass.BModule bModuleParam) { this.bModule = bModuleParam; initialize(aModuleParam, bModuleParam); @@ -99,11 +99,11 @@ final class DaggerTestClass_SimpleComponent { @SuppressWarnings("unchecked") private void initialize(final TestClass.AModule aModuleParam, final TestClass.BModule bModuleParam) { - this.executorProvider = new SwitchingProvider<>(simpleComponentImpl, 0); + this.executorProvider = new SwitchingProvider<>(impl, 0); this.productionImplementationExecutorProvider = DoubleCheck.provider((Provider) (executorProvider)); - this.simpleComponentProvider = InstanceFactory.create((TestClass.SimpleComponent) (simpleComponentImpl)); - this.monitorProvider = DoubleCheck.provider(new SwitchingProvider(simpleComponentImpl, 1)); - this.bProvider = new SwitchingProvider<>(simpleComponentImpl, 2); + this.simpleComponentProvider = InstanceFactory.create((TestClass.SimpleComponent) (impl)); + this.monitorProvider = DoubleCheck.provider(new SwitchingProvider(impl, 1)); + this.bProvider = new SwitchingProvider<>(impl, 2); this.bProducer = Producers.producerFromProvider(bProvider); this.aProducer = TestClass_AModule_AFactory.create(aModuleParam, productionImplementationExecutorProvider, monitorProvider, bProducer); this.aEntryPoint = Producers.entryPointViewOf(aProducer, this); @@ -122,12 +122,12 @@ final class DaggerTestClass_SimpleComponent { } private static final class SwitchingProvider implements Provider { - private final SimpleComponentImpl simpleComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(SimpleComponentImpl simpleComponentImpl, int id) { - this.simpleComponentImpl = simpleComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } @@ -136,13 +136,13 @@ final class DaggerTestClass_SimpleComponent { public T get() { switch (id) { case 0: // @dagger.producers.Production java.util.concurrent.Executor - return (T) TestClass_BModule_ExecutorFactory.executor(simpleComponentImpl.bModule); + return (T) TestClass_BModule_ExecutorFactory.executor(impl.bModule); case 1: // dagger.producers.monitoring.ProductionComponentMonitor - return (T) TestClass_SimpleComponent_MonitoringModule_MonitorFactory.monitor(simpleComponentImpl.simpleComponentProvider, SetFactory.empty()); + return (T) TestClass_SimpleComponent_MonitoringModule_MonitorFactory.monitor(impl.simpleComponentProvider, SetFactory.empty()); case 2: // test.TestClass.B - return (T) TestClass_BModule_BFactory.b(simpleComponentImpl.bModule, new TestClass.C()); + return (T) TestClass_BModule_BFactory.b(impl.bModule, new TestClass.C()); default: throw new AssertionError(id); } diff --git a/javatests/dagger/internal/codegen/goldens/ProductionComponentProcessorTest/simpleComponent/test.DaggerTestClass_SimpleComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/ProductionComponentProcessorTest/simpleComponent/test.DaggerTestClass_SimpleComponent_KT_DEFAULT_MODE index 13b118fa797..37129455999 100644 --- a/javatests/dagger/internal/codegen/goldens/ProductionComponentProcessorTest/simpleComponent/test.DaggerTestClass_SimpleComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ProductionComponentProcessorTest/simpleComponent/test.DaggerTestClass_SimpleComponent_KT_DEFAULT_MODE @@ -64,12 +64,12 @@ final class DaggerTestClass_SimpleComponent { if (bModule == null) { this.bModule = new TestClass.BModule(); } - return new SimpleComponentImpl(aModule, bModule); + return new Impl(aModule, bModule); } } - private static final class SimpleComponentImpl implements TestClass.SimpleComponent, CancellationListener { - private final SimpleComponentImpl simpleComponentImpl = this; + private static final class Impl implements TestClass.SimpleComponent, CancellationListener { + private final Impl impl = this; /** * {@code Provider} @@ -111,7 +111,7 @@ final class DaggerTestClass_SimpleComponent { */ Producer aEntryPoint; - SimpleComponentImpl(TestClass.AModule aModuleParam, TestClass.BModule bModuleParam) { + Impl(TestClass.AModule aModuleParam, TestClass.BModule bModuleParam) { initialize(aModuleParam, bModuleParam); @@ -122,7 +122,7 @@ final class DaggerTestClass_SimpleComponent { final TestClass.BModule bModuleParam) { this.executorProvider = TestClass_BModule_ExecutorFactory.create(bModuleParam); this.productionImplementationExecutorProvider = DoubleCheck.provider((Provider) (executorProvider)); - this.simpleComponentProvider = InstanceFactory.create((TestClass.SimpleComponent) (simpleComponentImpl)); + this.simpleComponentProvider = InstanceFactory.create((TestClass.SimpleComponent) (impl)); this.monitorProvider = DoubleCheck.provider(TestClass_SimpleComponent_MonitoringModule_MonitorFactory.create(simpleComponentProvider, SetFactory.empty())); this.bProvider = TestClass_BModule_BFactory.create(bModuleParam, TestClass_C_Factory.create()); this.bProducer = Producers.producerFromProvider(bProvider); diff --git a/javatests/dagger/internal/codegen/goldens/ProductionComponentProcessorTest/simpleComponent/test.DaggerTestClass_SimpleComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/ProductionComponentProcessorTest/simpleComponent/test.DaggerTestClass_SimpleComponent_KT_FAST_INIT_MODE index 9ea7f38329f..bdc51ec4d8f 100644 --- a/javatests/dagger/internal/codegen/goldens/ProductionComponentProcessorTest/simpleComponent/test.DaggerTestClass_SimpleComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/ProductionComponentProcessorTest/simpleComponent/test.DaggerTestClass_SimpleComponent_KT_FAST_INIT_MODE @@ -64,14 +64,14 @@ final class DaggerTestClass_SimpleComponent { if (bModule == null) { this.bModule = new TestClass.BModule(); } - return new SimpleComponentImpl(aModule, bModule); + return new Impl(aModule, bModule); } } - private static final class SimpleComponentImpl implements TestClass.SimpleComponent, CancellationListener { + private static final class Impl implements TestClass.SimpleComponent, CancellationListener { private final TestClass.BModule bModule; - private final SimpleComponentImpl simpleComponentImpl = this; + private final Impl impl = this; /** * {@code Provider} @@ -113,7 +113,7 @@ final class DaggerTestClass_SimpleComponent { */ Producer aEntryPoint; - SimpleComponentImpl(TestClass.AModule aModuleParam, TestClass.BModule bModuleParam) { + Impl(TestClass.AModule aModuleParam, TestClass.BModule bModuleParam) { this.bModule = bModuleParam; initialize(aModuleParam, bModuleParam); @@ -122,11 +122,11 @@ final class DaggerTestClass_SimpleComponent { @SuppressWarnings("unchecked") private void initialize(final TestClass.AModule aModuleParam, final TestClass.BModule bModuleParam) { - this.executorProvider = new SwitchingProvider<>(simpleComponentImpl, 0); + this.executorProvider = new SwitchingProvider<>(impl, 0); this.productionImplementationExecutorProvider = DoubleCheck.provider((Provider) (executorProvider)); - this.simpleComponentProvider = InstanceFactory.create((TestClass.SimpleComponent) (simpleComponentImpl)); - this.monitorProvider = DoubleCheck.provider(new SwitchingProvider<>(simpleComponentImpl, 1)); - this.bProvider = new SwitchingProvider<>(simpleComponentImpl, 2); + this.simpleComponentProvider = InstanceFactory.create((TestClass.SimpleComponent) (impl)); + this.monitorProvider = DoubleCheck.provider(new SwitchingProvider<>(impl, 1)); + this.bProvider = new SwitchingProvider<>(impl, 2); this.bProducer = Producers.producerFromProvider(bProvider); this.aProducer = TestClass_AModule_AFactory.create(aModuleParam, productionImplementationExecutorProvider, monitorProvider, bProducer); this.aEntryPoint = Producers.entryPointViewOf(aProducer, this); @@ -145,12 +145,12 @@ final class DaggerTestClass_SimpleComponent { } private static final class SwitchingProvider implements Provider { - private final SimpleComponentImpl simpleComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(SimpleComponentImpl simpleComponentImpl, int id) { - this.simpleComponentImpl = simpleComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } @@ -159,13 +159,13 @@ final class DaggerTestClass_SimpleComponent { public T get() { switch (id) { case 0: // @dagger.producers.Production java.util.concurrent.Executor - return (T) TestClass_BModule_ExecutorFactory.executor(simpleComponentImpl.bModule); + return (T) TestClass_BModule_ExecutorFactory.executor(impl.bModule); case 1: // dagger.producers.monitoring.ProductionComponentMonitor - return (T) TestClass_SimpleComponent_MonitoringModule_MonitorFactory.monitor(simpleComponentImpl.simpleComponentProvider, SetFactory.empty()); + return (T) TestClass_SimpleComponent_MonitoringModule_MonitorFactory.monitor(impl.simpleComponentProvider, SetFactory.empty()); case 2: // test.TestClass.B - return (T) TestClass_BModule_BFactory.b(simpleComponentImpl.bModule, TestClass_C_Factory.newInstance()); + return (T) TestClass_BModule_BFactory.b(impl.bModule, TestClass_C_Factory.newInstance()); default: throw new AssertionError(id); } diff --git a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentTest/inaccessible/test.DaggerTestComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentTest/inaccessible/test.DaggerTestComponent_DEFAULT_MODE index 35faf9141ec..d6953606628 100644 --- a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentTest/inaccessible/test.DaggerTestComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentTest/inaccessible/test.DaggerTestComponent_DEFAULT_MODE @@ -40,14 +40,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentTest/inaccessible/test.DaggerTestComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentTest/inaccessible/test.DaggerTestComponent_FAST_INIT_MODE index 35faf9141ec..d6953606628 100644 --- a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentTest/inaccessible/test.DaggerTestComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentTest/inaccessible/test.DaggerTestComponent_FAST_INIT_MODE @@ -40,14 +40,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentTest/productionComponents/test.DaggerTestComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentTest/productionComponents/test.DaggerTestComponent_DEFAULT_MODE index 583b503587a..508598f6b42 100644 --- a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentTest/productionComponents/test.DaggerTestComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentTest/productionComponents/test.DaggerTestComponent_DEFAULT_MODE @@ -39,14 +39,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent, CancellationListener { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent, CancellationListener { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentTest/productionComponents/test.DaggerTestComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentTest/productionComponents/test.DaggerTestComponent_FAST_INIT_MODE index 583b503587a..508598f6b42 100644 --- a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentTest/productionComponents/test.DaggerTestComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentTest/productionComponents/test.DaggerTestComponent_FAST_INIT_MODE @@ -39,14 +39,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent, CancellationListener { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent, CancellationListener { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentTest/setBindings/test.DaggerTestComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentTest/setBindings/test.DaggerTestComponent_DEFAULT_MODE index bfdfd331d29..c1d59adc5c1 100644 --- a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentTest/setBindings/test.DaggerTestComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentTest/setBindings/test.DaggerTestComponent_DEFAULT_MODE @@ -37,14 +37,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentTest/setBindings/test.DaggerTestComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentTest/setBindings/test.DaggerTestComponent_FAST_INIT_MODE index bfdfd331d29..c1d59adc5c1 100644 --- a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentTest/setBindings/test.DaggerTestComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentTest/setBindings/test.DaggerTestComponent_FAST_INIT_MODE @@ -37,14 +37,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentTest/subcomponentOmitsInheritedBindings/test.DaggerTestComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentTest/subcomponentOmitsInheritedBindings/test.DaggerTestComponent_DEFAULT_MODE index c711335e3c7..627dd071769 100644 --- a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentTest/subcomponentOmitsInheritedBindings/test.DaggerTestComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentTest/subcomponentOmitsInheritedBindings/test.DaggerTestComponent_DEFAULT_MODE @@ -36,17 +36,17 @@ final class DaggerParent { } public Parent build() { - return new ParentImpl(); + return new Impl(); } } private static final class ChildImpl implements Child { - private final ParentImpl parentImpl; + private final Impl impl; private final ChildImpl childImpl = this; - ChildImpl(ParentImpl parentImpl) { - this.parentImpl = parentImpl; + ChildImpl(Impl impl) { + this.impl = impl; } @@ -57,17 +57,17 @@ final class DaggerParent { } } - private static final class ParentImpl implements Parent { - private final ParentImpl parentImpl = this; + private static final class Impl implements Parent { + private final Impl impl = this; - ParentImpl() { + Impl() { } @Override public Child child() { - return new ChildImpl(parentImpl); + return new ChildImpl(impl); } } } diff --git a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentTest/subcomponentOmitsInheritedBindings/test.DaggerTestComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentTest/subcomponentOmitsInheritedBindings/test.DaggerTestComponent_FAST_INIT_MODE index c711335e3c7..627dd071769 100644 --- a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentTest/subcomponentOmitsInheritedBindings/test.DaggerTestComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentTest/subcomponentOmitsInheritedBindings/test.DaggerTestComponent_FAST_INIT_MODE @@ -36,17 +36,17 @@ final class DaggerParent { } public Parent build() { - return new ParentImpl(); + return new Impl(); } } private static final class ChildImpl implements Child { - private final ParentImpl parentImpl; + private final Impl impl; private final ChildImpl childImpl = this; - ChildImpl(ParentImpl parentImpl) { - this.parentImpl = parentImpl; + ChildImpl(Impl impl) { + this.impl = impl; } @@ -57,17 +57,17 @@ final class DaggerParent { } } - private static final class ParentImpl implements Parent { - private final ParentImpl parentImpl = this; + private static final class Impl implements Parent { + private final Impl impl = this; - ParentImpl() { + Impl() { } @Override public Child child() { - return new ChildImpl(parentImpl); + return new ChildImpl(impl); } } } diff --git a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest/inaccessible/test.DaggerTestComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest/inaccessible/test.DaggerTestComponent_DEFAULT_MODE index 58511002315..3fbdf84e381 100644 --- a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest/inaccessible/test.DaggerTestComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest/inaccessible/test.DaggerTestComponent_DEFAULT_MODE @@ -39,14 +39,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest/inaccessible/test.DaggerTestComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest/inaccessible/test.DaggerTestComponent_FAST_INIT_MODE index 58511002315..3fbdf84e381 100644 --- a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest/inaccessible/test.DaggerTestComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest/inaccessible/test.DaggerTestComponent_FAST_INIT_MODE @@ -39,14 +39,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest/inaccessible/test.DaggerTestComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest/inaccessible/test.DaggerTestComponent_KT_DEFAULT_MODE index 1011b3010a0..daf2e389b58 100644 --- a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest/inaccessible/test.DaggerTestComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest/inaccessible/test.DaggerTestComponent_KT_DEFAULT_MODE @@ -39,14 +39,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest/inaccessible/test.DaggerTestComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest/inaccessible/test.DaggerTestComponent_KT_FAST_INIT_MODE index 1011b3010a0..daf2e389b58 100644 --- a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest/inaccessible/test.DaggerTestComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest/inaccessible/test.DaggerTestComponent_KT_FAST_INIT_MODE @@ -39,14 +39,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest/productionComponents/test.DaggerTestComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest/productionComponents/test.DaggerTestComponent_DEFAULT_MODE index bf47594769c..31b347fd549 100644 --- a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest/productionComponents/test.DaggerTestComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest/productionComponents/test.DaggerTestComponent_DEFAULT_MODE @@ -39,14 +39,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent, CancellationListener { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent, CancellationListener { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest/productionComponents/test.DaggerTestComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest/productionComponents/test.DaggerTestComponent_FAST_INIT_MODE index bf47594769c..31b347fd549 100644 --- a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest/productionComponents/test.DaggerTestComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest/productionComponents/test.DaggerTestComponent_FAST_INIT_MODE @@ -39,14 +39,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent, CancellationListener { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent, CancellationListener { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest/productionComponents/test.DaggerTestComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest/productionComponents/test.DaggerTestComponent_KT_DEFAULT_MODE index 424370ec526..64e0cd51a04 100644 --- a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest/productionComponents/test.DaggerTestComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest/productionComponents/test.DaggerTestComponent_KT_DEFAULT_MODE @@ -40,14 +40,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent, CancellationListener { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent, CancellationListener { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest/productionComponents/test.DaggerTestComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest/productionComponents/test.DaggerTestComponent_KT_FAST_INIT_MODE index 424370ec526..64e0cd51a04 100644 --- a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest/productionComponents/test.DaggerTestComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest/productionComponents/test.DaggerTestComponent_KT_FAST_INIT_MODE @@ -40,14 +40,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent, CancellationListener { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent, CancellationListener { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest/setBindings/test.DaggerTestComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest/setBindings/test.DaggerTestComponent_DEFAULT_MODE index b161bb8eec3..1a09e9b191a 100644 --- a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest/setBindings/test.DaggerTestComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest/setBindings/test.DaggerTestComponent_DEFAULT_MODE @@ -36,14 +36,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest/setBindings/test.DaggerTestComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest/setBindings/test.DaggerTestComponent_FAST_INIT_MODE index b161bb8eec3..1a09e9b191a 100644 --- a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest/setBindings/test.DaggerTestComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest/setBindings/test.DaggerTestComponent_FAST_INIT_MODE @@ -36,14 +36,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest/setBindings/test.DaggerTestComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest/setBindings/test.DaggerTestComponent_KT_DEFAULT_MODE index fbbb1c20e1e..d273e9bd8a4 100644 --- a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest/setBindings/test.DaggerTestComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest/setBindings/test.DaggerTestComponent_KT_DEFAULT_MODE @@ -37,14 +37,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest/setBindings/test.DaggerTestComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest/setBindings/test.DaggerTestComponent_KT_FAST_INIT_MODE index fbbb1c20e1e..d273e9bd8a4 100644 --- a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest/setBindings/test.DaggerTestComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest/setBindings/test.DaggerTestComponent_KT_FAST_INIT_MODE @@ -37,14 +37,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest/subcomponentOmitsInheritedBindings/test.DaggerParent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest/subcomponentOmitsInheritedBindings/test.DaggerParent_DEFAULT_MODE index ce6f6493e0c..321f3c7ee38 100644 --- a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest/subcomponentOmitsInheritedBindings/test.DaggerParent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest/subcomponentOmitsInheritedBindings/test.DaggerParent_DEFAULT_MODE @@ -36,17 +36,17 @@ final class DaggerParent { } public Parent build() { - return new ParentImpl(); + return new Impl(); } } private static final class ChildImpl implements Child { - private final ParentImpl parentImpl; + private final Impl impl; private final ChildImpl childImpl = this; - ChildImpl(ParentImpl parentImpl) { - this.parentImpl = parentImpl; + ChildImpl(Impl impl) { + this.impl = impl; } @@ -57,17 +57,17 @@ final class DaggerParent { } } - private static final class ParentImpl implements Parent { - private final ParentImpl parentImpl = this; + private static final class Impl implements Parent { + private final Impl impl = this; - ParentImpl() { + Impl() { } @Override public Child child() { - return new ChildImpl(parentImpl); + return new ChildImpl(impl); } } } diff --git a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest/subcomponentOmitsInheritedBindings/test.DaggerParent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest/subcomponentOmitsInheritedBindings/test.DaggerParent_FAST_INIT_MODE index ce6f6493e0c..321f3c7ee38 100644 --- a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest/subcomponentOmitsInheritedBindings/test.DaggerParent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest/subcomponentOmitsInheritedBindings/test.DaggerParent_FAST_INIT_MODE @@ -36,17 +36,17 @@ final class DaggerParent { } public Parent build() { - return new ParentImpl(); + return new Impl(); } } private static final class ChildImpl implements Child { - private final ParentImpl parentImpl; + private final Impl impl; private final ChildImpl childImpl = this; - ChildImpl(ParentImpl parentImpl) { - this.parentImpl = parentImpl; + ChildImpl(Impl impl) { + this.impl = impl; } @@ -57,17 +57,17 @@ final class DaggerParent { } } - private static final class ParentImpl implements Parent { - private final ParentImpl parentImpl = this; + private static final class Impl implements Parent { + private final Impl impl = this; - ParentImpl() { + Impl() { } @Override public Child child() { - return new ChildImpl(parentImpl); + return new ChildImpl(impl); } } } diff --git a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest/subcomponentOmitsInheritedBindings/test.DaggerParent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest/subcomponentOmitsInheritedBindings/test.DaggerParent_KT_DEFAULT_MODE index 1b2281e6788..48a56c7a63f 100644 --- a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest/subcomponentOmitsInheritedBindings/test.DaggerParent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest/subcomponentOmitsInheritedBindings/test.DaggerParent_KT_DEFAULT_MODE @@ -36,17 +36,17 @@ final class DaggerParent { } public Parent build() { - return new ParentImpl(); + return new Impl(); } } private static final class ChildImpl implements Child { - private final ParentImpl parentImpl; + private final Impl impl; private final ChildImpl childImpl = this; - ChildImpl(ParentImpl parentImpl) { - this.parentImpl = parentImpl; + ChildImpl(Impl impl) { + this.impl = impl; } @@ -57,17 +57,17 @@ final class DaggerParent { } } - private static final class ParentImpl implements Parent { - private final ParentImpl parentImpl = this; + private static final class Impl implements Parent { + private final Impl impl = this; - ParentImpl() { + Impl() { } @Override public Child child() { - return new ChildImpl(parentImpl); + return new ChildImpl(impl); } } } diff --git a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest/subcomponentOmitsInheritedBindings/test.DaggerParent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest/subcomponentOmitsInheritedBindings/test.DaggerParent_KT_FAST_INIT_MODE index 1b2281e6788..48a56c7a63f 100644 --- a/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest/subcomponentOmitsInheritedBindings/test.DaggerParent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/SetBindingRequestFulfillmentWithGuavaTest/subcomponentOmitsInheritedBindings/test.DaggerParent_KT_FAST_INIT_MODE @@ -36,17 +36,17 @@ final class DaggerParent { } public Parent build() { - return new ParentImpl(); + return new Impl(); } } private static final class ChildImpl implements Child { - private final ParentImpl parentImpl; + private final Impl impl; private final ChildImpl childImpl = this; - ChildImpl(ParentImpl parentImpl) { - this.parentImpl = parentImpl; + ChildImpl(Impl impl) { + this.impl = impl; } @@ -57,17 +57,17 @@ final class DaggerParent { } } - private static final class ParentImpl implements Parent { - private final ParentImpl parentImpl = this; + private static final class Impl implements Parent { + private final Impl impl = this; - ParentImpl() { + Impl() { } @Override public Child child() { - return new ChildImpl(parentImpl); + return new ChildImpl(impl); } } } diff --git a/javatests/dagger/internal/codegen/goldens/SubcomponentCreatorRequestFulfillmentTest/testInlinedSubcomponentCreators_componentMethod/test.DaggerC_compilerMode=DEFAULT_MODE, creatorKind=dagger.Subcomponent.Builder b/javatests/dagger/internal/codegen/goldens/SubcomponentCreatorRequestFulfillmentTest/testInlinedSubcomponentCreators_componentMethod/test.DaggerC_compilerMode=DEFAULT_MODE, creatorKind=dagger.Subcomponent.Builder index 19b43b585e7..c8d6fbd4fdc 100644 --- a/javatests/dagger/internal/codegen/goldens/SubcomponentCreatorRequestFulfillmentTest/testInlinedSubcomponentCreators_componentMethod/test.DaggerC_compilerMode=DEFAULT_MODE, creatorKind=dagger.Subcomponent.Builder +++ b/javatests/dagger/internal/codegen/goldens/SubcomponentCreatorRequestFulfillmentTest/testInlinedSubcomponentCreators_componentMethod/test.DaggerC_compilerMode=DEFAULT_MODE, creatorKind=dagger.Subcomponent.Builder @@ -34,51 +34,51 @@ final class DaggerC { } public C build() { - return new CImpl(); + return new Impl(); } } private static final class SubBuilder implements Sub.Builder { - private final CImpl cImpl; + private final Impl impl; - private SubBuilder(CImpl cImpl) { - this.cImpl = cImpl; + private SubBuilder(Impl impl) { + this.impl = impl; } @Override public Sub build() { - return new SubImpl(cImpl); + return new SubImpl(impl); } } private static final class SubImpl implements Sub { - private final CImpl cImpl; + private final Impl impl; private final SubImpl subImpl = this; - SubImpl(CImpl cImpl) { - this.cImpl = cImpl; + SubImpl(Impl impl) { + this.impl = impl; } } - private static final class CImpl implements C { - private final CImpl cImpl = this; + private static final class Impl implements C { + private final Impl impl = this; - CImpl() { + Impl() { } @Override public Sub.Builder sBuilder() { - return new SubBuilder(cImpl); + return new SubBuilder(impl); } @Override public UsesSubcomponent usesSubcomponent() { - return new UsesSubcomponent(new SubBuilder(cImpl)); + return new UsesSubcomponent(new SubBuilder(impl)); } } } diff --git a/javatests/dagger/internal/codegen/goldens/SubcomponentCreatorRequestFulfillmentTest/testInlinedSubcomponentCreators_componentMethod/test.DaggerC_compilerMode=DEFAULT_MODE, creatorKind=dagger.Subcomponent.Factory b/javatests/dagger/internal/codegen/goldens/SubcomponentCreatorRequestFulfillmentTest/testInlinedSubcomponentCreators_componentMethod/test.DaggerC_compilerMode=DEFAULT_MODE, creatorKind=dagger.Subcomponent.Factory index 20c4d9e9980..9100ce29754 100644 --- a/javatests/dagger/internal/codegen/goldens/SubcomponentCreatorRequestFulfillmentTest/testInlinedSubcomponentCreators_componentMethod/test.DaggerC_compilerMode=DEFAULT_MODE, creatorKind=dagger.Subcomponent.Factory +++ b/javatests/dagger/internal/codegen/goldens/SubcomponentCreatorRequestFulfillmentTest/testInlinedSubcomponentCreators_componentMethod/test.DaggerC_compilerMode=DEFAULT_MODE, creatorKind=dagger.Subcomponent.Factory @@ -34,51 +34,51 @@ final class DaggerC { } public C build() { - return new CImpl(); + return new Impl(); } } private static final class SubFactory implements Sub.Factory { - private final CImpl cImpl; + private final Impl impl; - private SubFactory(CImpl cImpl) { - this.cImpl = cImpl; + private SubFactory(Impl impl) { + this.impl = impl; } @Override public Sub createComponent() { - return new SubImpl(cImpl); + return new SubImpl(impl); } } private static final class SubImpl implements Sub { - private final CImpl cImpl; + private final Impl impl; private final SubImpl subImpl = this; - SubImpl(CImpl cImpl) { - this.cImpl = cImpl; + SubImpl(Impl impl) { + this.impl = impl; } } - private static final class CImpl implements C { - private final CImpl cImpl = this; + private static final class Impl implements C { + private final Impl impl = this; - CImpl() { + Impl() { } @Override public Sub.Factory sFactory() { - return new SubFactory(cImpl); + return new SubFactory(impl); } @Override public UsesSubcomponent usesSubcomponent() { - return new UsesSubcomponent(new SubFactory(cImpl)); + return new UsesSubcomponent(new SubFactory(impl)); } } } diff --git a/javatests/dagger/internal/codegen/goldens/SubcomponentCreatorRequestFulfillmentTest/testInlinedSubcomponentCreators_componentMethod/test.DaggerC_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Subcomponent.Builder b/javatests/dagger/internal/codegen/goldens/SubcomponentCreatorRequestFulfillmentTest/testInlinedSubcomponentCreators_componentMethod/test.DaggerC_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Subcomponent.Builder index 19b43b585e7..c8d6fbd4fdc 100644 --- a/javatests/dagger/internal/codegen/goldens/SubcomponentCreatorRequestFulfillmentTest/testInlinedSubcomponentCreators_componentMethod/test.DaggerC_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Subcomponent.Builder +++ b/javatests/dagger/internal/codegen/goldens/SubcomponentCreatorRequestFulfillmentTest/testInlinedSubcomponentCreators_componentMethod/test.DaggerC_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Subcomponent.Builder @@ -34,51 +34,51 @@ final class DaggerC { } public C build() { - return new CImpl(); + return new Impl(); } } private static final class SubBuilder implements Sub.Builder { - private final CImpl cImpl; + private final Impl impl; - private SubBuilder(CImpl cImpl) { - this.cImpl = cImpl; + private SubBuilder(Impl impl) { + this.impl = impl; } @Override public Sub build() { - return new SubImpl(cImpl); + return new SubImpl(impl); } } private static final class SubImpl implements Sub { - private final CImpl cImpl; + private final Impl impl; private final SubImpl subImpl = this; - SubImpl(CImpl cImpl) { - this.cImpl = cImpl; + SubImpl(Impl impl) { + this.impl = impl; } } - private static final class CImpl implements C { - private final CImpl cImpl = this; + private static final class Impl implements C { + private final Impl impl = this; - CImpl() { + Impl() { } @Override public Sub.Builder sBuilder() { - return new SubBuilder(cImpl); + return new SubBuilder(impl); } @Override public UsesSubcomponent usesSubcomponent() { - return new UsesSubcomponent(new SubBuilder(cImpl)); + return new UsesSubcomponent(new SubBuilder(impl)); } } } diff --git a/javatests/dagger/internal/codegen/goldens/SubcomponentCreatorRequestFulfillmentTest/testInlinedSubcomponentCreators_componentMethod/test.DaggerC_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Subcomponent.Factory b/javatests/dagger/internal/codegen/goldens/SubcomponentCreatorRequestFulfillmentTest/testInlinedSubcomponentCreators_componentMethod/test.DaggerC_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Subcomponent.Factory index 20c4d9e9980..9100ce29754 100644 --- a/javatests/dagger/internal/codegen/goldens/SubcomponentCreatorRequestFulfillmentTest/testInlinedSubcomponentCreators_componentMethod/test.DaggerC_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Subcomponent.Factory +++ b/javatests/dagger/internal/codegen/goldens/SubcomponentCreatorRequestFulfillmentTest/testInlinedSubcomponentCreators_componentMethod/test.DaggerC_compilerMode=FAST_INIT_MODE, creatorKind=dagger.Subcomponent.Factory @@ -34,51 +34,51 @@ final class DaggerC { } public C build() { - return new CImpl(); + return new Impl(); } } private static final class SubFactory implements Sub.Factory { - private final CImpl cImpl; + private final Impl impl; - private SubFactory(CImpl cImpl) { - this.cImpl = cImpl; + private SubFactory(Impl impl) { + this.impl = impl; } @Override public Sub createComponent() { - return new SubImpl(cImpl); + return new SubImpl(impl); } } private static final class SubImpl implements Sub { - private final CImpl cImpl; + private final Impl impl; private final SubImpl subImpl = this; - SubImpl(CImpl cImpl) { - this.cImpl = cImpl; + SubImpl(Impl impl) { + this.impl = impl; } } - private static final class CImpl implements C { - private final CImpl cImpl = this; + private static final class Impl implements C { + private final Impl impl = this; - CImpl() { + Impl() { } @Override public Sub.Factory sFactory() { - return new SubFactory(cImpl); + return new SubFactory(impl); } @Override public UsesSubcomponent usesSubcomponent() { - return new UsesSubcomponent(new SubFactory(cImpl)); + return new UsesSubcomponent(new SubFactory(impl)); } } } diff --git a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/delegateFactoryNotCreatedForSubcomponentWhenProviderExistsInParent/test.DaggerParentComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/delegateFactoryNotCreatedForSubcomponentWhenProviderExistsInParent/test.DaggerParentComponent_DEFAULT_MODE index a424f321c4d..6bfbeddd0f5 100644 --- a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/delegateFactoryNotCreatedForSubcomponentWhenProviderExistsInParent/test.DaggerParentComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/delegateFactoryNotCreatedForSubcomponentWhenProviderExistsInParent/test.DaggerParentComponent_DEFAULT_MODE @@ -37,29 +37,29 @@ final class DaggerParentComponent { } public ParentComponent build() { - return new ParentComponentImpl(); + return new Impl(); } } private static final class ChildComponentImpl implements ChildComponent { private final ChildModule childModule; - private final ParentComponentImpl parentComponentImpl; + private final Impl impl; private final ChildComponentImpl childComponentImpl = this; - ChildComponentImpl(ParentComponentImpl parentComponentImpl) { - this.parentComponentImpl = parentComponentImpl; + ChildComponentImpl(Impl impl) { + this.impl = impl; this.childModule = new ChildModule(); } NeedsDep1 needsDep1() { - return new NeedsDep1(parentComponentImpl.dep1Provider.get()); + return new NeedsDep1(impl.dep1Provider.get()); } A a() { - return injectA(A_Factory.newInstance(needsDep1(), parentComponentImpl.dep1Provider.get(), parentComponentImpl.dep2Provider.get())); + return injectA(A_Factory.newInstance(needsDep1(), impl.dep1Provider.get(), impl.dep2Provider.get())); } @Override @@ -74,14 +74,14 @@ final class DaggerParentComponent { } } - private static final class ParentComponentImpl implements ParentComponent { - private final ParentComponentImpl parentComponentImpl = this; + private static final class Impl implements ParentComponent { + private final Impl impl = this; Provider dep1Provider; Provider dep2Provider; - ParentComponentImpl() { + Impl() { initialize(); @@ -105,7 +105,7 @@ final class DaggerParentComponent { @Override public ChildComponent childComponent() { - return new ChildComponentImpl(parentComponentImpl); + return new ChildComponentImpl(impl); } } } diff --git a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/delegateFactoryNotCreatedForSubcomponentWhenProviderExistsInParent/test.DaggerParentComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/delegateFactoryNotCreatedForSubcomponentWhenProviderExistsInParent/test.DaggerParentComponent_FAST_INIT_MODE index 5bd6bb92d52..b4be230e495 100644 --- a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/delegateFactoryNotCreatedForSubcomponentWhenProviderExistsInParent/test.DaggerParentComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/delegateFactoryNotCreatedForSubcomponentWhenProviderExistsInParent/test.DaggerParentComponent_FAST_INIT_MODE @@ -37,29 +37,29 @@ final class DaggerParentComponent { } public ParentComponent build() { - return new ParentComponentImpl(); + return new Impl(); } } private static final class ChildComponentImpl implements ChildComponent { private final ChildModule childModule; - private final ParentComponentImpl parentComponentImpl; + private final Impl impl; private final ChildComponentImpl childComponentImpl = this; - ChildComponentImpl(ParentComponentImpl parentComponentImpl) { - this.parentComponentImpl = parentComponentImpl; + ChildComponentImpl(Impl impl) { + this.impl = impl; this.childModule = new ChildModule(); } NeedsDep1 needsDep1() { - return new NeedsDep1(parentComponentImpl.dep1Provider.get()); + return new NeedsDep1(impl.dep1Provider.get()); } A a() { - return injectA(A_Factory.newInstance(needsDep1(), parentComponentImpl.dep1Provider.get(), parentComponentImpl.dep2Provider.get())); + return injectA(A_Factory.newInstance(needsDep1(), impl.dep1Provider.get(), impl.dep2Provider.get())); } @Override @@ -74,14 +74,14 @@ final class DaggerParentComponent { } } - private static final class ParentComponentImpl implements ParentComponent { - private final ParentComponentImpl parentComponentImpl = this; + private static final class Impl implements ParentComponent { + private final Impl impl = this; Provider dep1Provider; Provider dep2Provider; - ParentComponentImpl() { + Impl() { initialize(); @@ -89,8 +89,8 @@ final class DaggerParentComponent { @SuppressWarnings("unchecked") private void initialize() { - this.dep1Provider = DoubleCheck.provider(new SwitchingProvider(parentComponentImpl, 0)); - this.dep2Provider = DoubleCheck.provider(new SwitchingProvider(parentComponentImpl, 1)); + this.dep1Provider = DoubleCheck.provider(new SwitchingProvider(impl, 0)); + this.dep2Provider = DoubleCheck.provider(new SwitchingProvider(impl, 1)); } @Override @@ -105,7 +105,7 @@ final class DaggerParentComponent { @Override public ChildComponent childComponent() { - return new ChildComponentImpl(parentComponentImpl); + return new ChildComponentImpl(impl); } @CanIgnoreReturnValue @@ -121,12 +121,12 @@ final class DaggerParentComponent { } private static final class SwitchingProvider implements Provider { - private final ParentComponentImpl parentComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(ParentComponentImpl parentComponentImpl, int id) { - this.parentComponentImpl = parentComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } @@ -135,10 +135,10 @@ final class DaggerParentComponent { public T get() { switch (id) { case 0: // test.Dep1 - return (T) parentComponentImpl.injectDep1(Dep1_Factory.newInstance()); + return (T) impl.injectDep1(Dep1_Factory.newInstance()); case 1: // test.Dep2 - return (T) parentComponentImpl.injectDep2(Dep2_Factory.newInstance()); + return (T) impl.injectDep2(Dep2_Factory.newInstance()); default: throw new AssertionError(id); } diff --git a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/delegateFactoryNotCreatedForSubcomponentWhenProviderExistsInParent/test.DaggerParentComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/delegateFactoryNotCreatedForSubcomponentWhenProviderExistsInParent/test.DaggerParentComponent_KT_DEFAULT_MODE index 89d8230e7ac..f39f9444914 100644 --- a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/delegateFactoryNotCreatedForSubcomponentWhenProviderExistsInParent/test.DaggerParentComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/delegateFactoryNotCreatedForSubcomponentWhenProviderExistsInParent/test.DaggerParentComponent_KT_DEFAULT_MODE @@ -37,29 +37,29 @@ final class DaggerParentComponent { } public ParentComponent build() { - return new ParentComponentImpl(); + return new Impl(); } } private static final class ChildComponentImpl implements ChildComponent { private final ChildModule childModule; - private final ParentComponentImpl parentComponentImpl; + private final Impl impl; private final ChildComponentImpl childComponentImpl = this; - ChildComponentImpl(ParentComponentImpl parentComponentImpl) { - this.parentComponentImpl = parentComponentImpl; + ChildComponentImpl(Impl impl) { + this.impl = impl; this.childModule = new ChildModule(); } Object needsDep1() { - return NeedsDep1_Factory.newInstance(parentComponentImpl.dep1Provider.get()); + return NeedsDep1_Factory.newInstance(impl.dep1Provider.get()); } Object a() { - return injectA(A_Factory.newInstance(needsDep1(), parentComponentImpl.dep1Provider.get(), parentComponentImpl.dep2Provider.get())); + return injectA(A_Factory.newInstance(needsDep1(), impl.dep1Provider.get(), impl.dep2Provider.get())); } @Override @@ -74,8 +74,8 @@ final class DaggerParentComponent { } } - private static final class ParentComponentImpl implements ParentComponent { - private final ParentComponentImpl parentComponentImpl = this; + private static final class Impl implements ParentComponent { + private final Impl impl = this; /** * {@code Provider} @@ -87,7 +87,7 @@ final class DaggerParentComponent { */ Provider dep2Provider; - ParentComponentImpl() { + Impl() { initialize(); @@ -111,7 +111,7 @@ final class DaggerParentComponent { @Override public ChildComponent childComponent() { - return new ChildComponentImpl(parentComponentImpl); + return new ChildComponentImpl(impl); } } } diff --git a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/delegateFactoryNotCreatedForSubcomponentWhenProviderExistsInParent/test.DaggerParentComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/delegateFactoryNotCreatedForSubcomponentWhenProviderExistsInParent/test.DaggerParentComponent_KT_FAST_INIT_MODE index 574c298d132..f45c0a6d52a 100644 --- a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/delegateFactoryNotCreatedForSubcomponentWhenProviderExistsInParent/test.DaggerParentComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/delegateFactoryNotCreatedForSubcomponentWhenProviderExistsInParent/test.DaggerParentComponent_KT_FAST_INIT_MODE @@ -37,29 +37,29 @@ final class DaggerParentComponent { } public ParentComponent build() { - return new ParentComponentImpl(); + return new Impl(); } } private static final class ChildComponentImpl implements ChildComponent { private final ChildModule childModule; - private final ParentComponentImpl parentComponentImpl; + private final Impl impl; private final ChildComponentImpl childComponentImpl = this; - ChildComponentImpl(ParentComponentImpl parentComponentImpl) { - this.parentComponentImpl = parentComponentImpl; + ChildComponentImpl(Impl impl) { + this.impl = impl; this.childModule = new ChildModule(); } Object needsDep1() { - return NeedsDep1_Factory.newInstance(parentComponentImpl.dep1Provider.get()); + return NeedsDep1_Factory.newInstance(impl.dep1Provider.get()); } Object a() { - return injectA(A_Factory.newInstance(needsDep1(), parentComponentImpl.dep1Provider.get(), parentComponentImpl.dep2Provider.get())); + return injectA(A_Factory.newInstance(needsDep1(), impl.dep1Provider.get(), impl.dep2Provider.get())); } @Override @@ -74,8 +74,8 @@ final class DaggerParentComponent { } } - private static final class ParentComponentImpl implements ParentComponent { - private final ParentComponentImpl parentComponentImpl = this; + private static final class Impl implements ParentComponent { + private final Impl impl = this; /** * {@code Provider} @@ -87,7 +87,7 @@ final class DaggerParentComponent { */ Provider dep2Provider; - ParentComponentImpl() { + Impl() { initialize(); @@ -95,8 +95,8 @@ final class DaggerParentComponent { @SuppressWarnings("unchecked") private void initialize() { - this.dep1Provider = DoubleCheck.provider(new SwitchingProvider<>(parentComponentImpl, 0)); - this.dep2Provider = DoubleCheck.provider(new SwitchingProvider<>(parentComponentImpl, 1)); + this.dep1Provider = DoubleCheck.provider(new SwitchingProvider<>(impl, 0)); + this.dep2Provider = DoubleCheck.provider(new SwitchingProvider<>(impl, 1)); } @Override @@ -111,7 +111,7 @@ final class DaggerParentComponent { @Override public ChildComponent childComponent() { - return new ChildComponentImpl(parentComponentImpl); + return new ChildComponentImpl(impl); } @CanIgnoreReturnValue @@ -127,12 +127,12 @@ final class DaggerParentComponent { } private static final class SwitchingProvider implements Provider { - private final ParentComponentImpl parentComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(ParentComponentImpl parentComponentImpl, int id) { - this.parentComponentImpl = parentComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } @@ -141,10 +141,10 @@ final class DaggerParentComponent { public T get() { switch (id) { case 0: // test.Dep1 - return (T) parentComponentImpl.injectDep1(Dep1_Factory.newInstance()); + return (T) impl.injectDep1(Dep1_Factory.newInstance()); case 1: // test.Dep2 - return (T) parentComponentImpl.injectDep2(Dep2_Factory.newInstance()); + return (T) impl.injectDep2(Dep2_Factory.newInstance()); default: throw new AssertionError(id); } diff --git a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/multipleSubcomponentsWithSameSimpleNamesCanExistInSameComponent/test.DaggerParentComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/multipleSubcomponentsWithSameSimpleNamesCanExistInSameComponent/test.DaggerParentComponent_DEFAULT_MODE index ae25f81b5b1..2afa83f6d17 100644 --- a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/multipleSubcomponentsWithSameSimpleNamesCanExistInSameComponent/test.DaggerParentComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/multipleSubcomponentsWithSameSimpleNamesCanExistInSameComponent/test.DaggerParentComponent_DEFAULT_MODE @@ -35,12 +35,12 @@ final class DaggerParentComponent { } public ParentComponent build() { - return new ParentComponentImpl(); + return new Impl(); } } private static final class ts_SubImpl implements Sub { - private final ParentComponentImpl parentComponentImpl; + private final Impl impl; private final F_SubImpl f_SubImpl; @@ -48,8 +48,8 @@ final class DaggerParentComponent { private final ts_SubImpl _ts_SubImpl = this; - ts_SubImpl(ParentComponentImpl parentComponentImpl, F_SubImpl f_SubImpl, B_SubImpl b_SubImpl) { - this.parentComponentImpl = parentComponentImpl; + ts_SubImpl(Impl impl, F_SubImpl f_SubImpl, B_SubImpl b_SubImpl) { + this.impl = impl; this.f_SubImpl = f_SubImpl; this.b_SubImpl = b_SubImpl; @@ -58,14 +58,14 @@ final class DaggerParentComponent { } private static final class B_SubImpl implements Bar.Sub { - private final ParentComponentImpl parentComponentImpl; + private final Impl impl; private final F_SubImpl f_SubImpl; private final B_SubImpl b_SubImpl = this; - B_SubImpl(ParentComponentImpl parentComponentImpl, F_SubImpl f_SubImpl) { - this.parentComponentImpl = parentComponentImpl; + B_SubImpl(Impl impl, F_SubImpl f_SubImpl) { + this.impl = impl; this.f_SubImpl = f_SubImpl; @@ -73,55 +73,55 @@ final class DaggerParentComponent { @Override public Sub newSubcomponentInSubpackage() { - return new ts_SubImpl(parentComponentImpl, f_SubImpl, b_SubImpl); + return new ts_SubImpl(impl, f_SubImpl, b_SubImpl); } } private static final class F_SubImpl implements Foo.Sub { - private final ParentComponentImpl parentComponentImpl; + private final Impl impl; private final F_SubImpl f_SubImpl = this; - F_SubImpl(ParentComponentImpl parentComponentImpl) { - this.parentComponentImpl = parentComponentImpl; + F_SubImpl(Impl impl) { + this.impl = impl; } @Override public Bar.Sub newBarSubcomponent() { - return new B_SubImpl(parentComponentImpl, f_SubImpl); + return new B_SubImpl(impl, f_SubImpl); } } private static final class NoConflictImpl implements NoConflict { - private final ParentComponentImpl parentComponentImpl; + private final Impl impl; private final NoConflictImpl noConflictImpl = this; - NoConflictImpl(ParentComponentImpl parentComponentImpl) { - this.parentComponentImpl = parentComponentImpl; + NoConflictImpl(Impl impl) { + this.impl = impl; } } - private static final class ParentComponentImpl implements ParentComponent { - private final ParentComponentImpl parentComponentImpl = this; + private static final class Impl implements ParentComponent { + private final Impl impl = this; - ParentComponentImpl() { + Impl() { } @Override public Foo.Sub newInstanceSubcomponent() { - return new F_SubImpl(parentComponentImpl); + return new F_SubImpl(impl); } @Override public NoConflict newNoConflictSubcomponent() { - return new NoConflictImpl(parentComponentImpl); + return new NoConflictImpl(impl); } } } diff --git a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/multipleSubcomponentsWithSameSimpleNamesCanExistInSameComponent/test.DaggerParentComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/multipleSubcomponentsWithSameSimpleNamesCanExistInSameComponent/test.DaggerParentComponent_FAST_INIT_MODE index ae25f81b5b1..2afa83f6d17 100644 --- a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/multipleSubcomponentsWithSameSimpleNamesCanExistInSameComponent/test.DaggerParentComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/multipleSubcomponentsWithSameSimpleNamesCanExistInSameComponent/test.DaggerParentComponent_FAST_INIT_MODE @@ -35,12 +35,12 @@ final class DaggerParentComponent { } public ParentComponent build() { - return new ParentComponentImpl(); + return new Impl(); } } private static final class ts_SubImpl implements Sub { - private final ParentComponentImpl parentComponentImpl; + private final Impl impl; private final F_SubImpl f_SubImpl; @@ -48,8 +48,8 @@ final class DaggerParentComponent { private final ts_SubImpl _ts_SubImpl = this; - ts_SubImpl(ParentComponentImpl parentComponentImpl, F_SubImpl f_SubImpl, B_SubImpl b_SubImpl) { - this.parentComponentImpl = parentComponentImpl; + ts_SubImpl(Impl impl, F_SubImpl f_SubImpl, B_SubImpl b_SubImpl) { + this.impl = impl; this.f_SubImpl = f_SubImpl; this.b_SubImpl = b_SubImpl; @@ -58,14 +58,14 @@ final class DaggerParentComponent { } private static final class B_SubImpl implements Bar.Sub { - private final ParentComponentImpl parentComponentImpl; + private final Impl impl; private final F_SubImpl f_SubImpl; private final B_SubImpl b_SubImpl = this; - B_SubImpl(ParentComponentImpl parentComponentImpl, F_SubImpl f_SubImpl) { - this.parentComponentImpl = parentComponentImpl; + B_SubImpl(Impl impl, F_SubImpl f_SubImpl) { + this.impl = impl; this.f_SubImpl = f_SubImpl; @@ -73,55 +73,55 @@ final class DaggerParentComponent { @Override public Sub newSubcomponentInSubpackage() { - return new ts_SubImpl(parentComponentImpl, f_SubImpl, b_SubImpl); + return new ts_SubImpl(impl, f_SubImpl, b_SubImpl); } } private static final class F_SubImpl implements Foo.Sub { - private final ParentComponentImpl parentComponentImpl; + private final Impl impl; private final F_SubImpl f_SubImpl = this; - F_SubImpl(ParentComponentImpl parentComponentImpl) { - this.parentComponentImpl = parentComponentImpl; + F_SubImpl(Impl impl) { + this.impl = impl; } @Override public Bar.Sub newBarSubcomponent() { - return new B_SubImpl(parentComponentImpl, f_SubImpl); + return new B_SubImpl(impl, f_SubImpl); } } private static final class NoConflictImpl implements NoConflict { - private final ParentComponentImpl parentComponentImpl; + private final Impl impl; private final NoConflictImpl noConflictImpl = this; - NoConflictImpl(ParentComponentImpl parentComponentImpl) { - this.parentComponentImpl = parentComponentImpl; + NoConflictImpl(Impl impl) { + this.impl = impl; } } - private static final class ParentComponentImpl implements ParentComponent { - private final ParentComponentImpl parentComponentImpl = this; + private static final class Impl implements ParentComponent { + private final Impl impl = this; - ParentComponentImpl() { + Impl() { } @Override public Foo.Sub newInstanceSubcomponent() { - return new F_SubImpl(parentComponentImpl); + return new F_SubImpl(impl); } @Override public NoConflict newNoConflictSubcomponent() { - return new NoConflictImpl(parentComponentImpl); + return new NoConflictImpl(impl); } } } diff --git a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/multipleSubcomponentsWithSameSimpleNamesCanExistInSameComponent/test.DaggerParentComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/multipleSubcomponentsWithSameSimpleNamesCanExistInSameComponent/test.DaggerParentComponent_KT_DEFAULT_MODE index ae25f81b5b1..2afa83f6d17 100644 --- a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/multipleSubcomponentsWithSameSimpleNamesCanExistInSameComponent/test.DaggerParentComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/multipleSubcomponentsWithSameSimpleNamesCanExistInSameComponent/test.DaggerParentComponent_KT_DEFAULT_MODE @@ -35,12 +35,12 @@ final class DaggerParentComponent { } public ParentComponent build() { - return new ParentComponentImpl(); + return new Impl(); } } private static final class ts_SubImpl implements Sub { - private final ParentComponentImpl parentComponentImpl; + private final Impl impl; private final F_SubImpl f_SubImpl; @@ -48,8 +48,8 @@ final class DaggerParentComponent { private final ts_SubImpl _ts_SubImpl = this; - ts_SubImpl(ParentComponentImpl parentComponentImpl, F_SubImpl f_SubImpl, B_SubImpl b_SubImpl) { - this.parentComponentImpl = parentComponentImpl; + ts_SubImpl(Impl impl, F_SubImpl f_SubImpl, B_SubImpl b_SubImpl) { + this.impl = impl; this.f_SubImpl = f_SubImpl; this.b_SubImpl = b_SubImpl; @@ -58,14 +58,14 @@ final class DaggerParentComponent { } private static final class B_SubImpl implements Bar.Sub { - private final ParentComponentImpl parentComponentImpl; + private final Impl impl; private final F_SubImpl f_SubImpl; private final B_SubImpl b_SubImpl = this; - B_SubImpl(ParentComponentImpl parentComponentImpl, F_SubImpl f_SubImpl) { - this.parentComponentImpl = parentComponentImpl; + B_SubImpl(Impl impl, F_SubImpl f_SubImpl) { + this.impl = impl; this.f_SubImpl = f_SubImpl; @@ -73,55 +73,55 @@ final class DaggerParentComponent { @Override public Sub newSubcomponentInSubpackage() { - return new ts_SubImpl(parentComponentImpl, f_SubImpl, b_SubImpl); + return new ts_SubImpl(impl, f_SubImpl, b_SubImpl); } } private static final class F_SubImpl implements Foo.Sub { - private final ParentComponentImpl parentComponentImpl; + private final Impl impl; private final F_SubImpl f_SubImpl = this; - F_SubImpl(ParentComponentImpl parentComponentImpl) { - this.parentComponentImpl = parentComponentImpl; + F_SubImpl(Impl impl) { + this.impl = impl; } @Override public Bar.Sub newBarSubcomponent() { - return new B_SubImpl(parentComponentImpl, f_SubImpl); + return new B_SubImpl(impl, f_SubImpl); } } private static final class NoConflictImpl implements NoConflict { - private final ParentComponentImpl parentComponentImpl; + private final Impl impl; private final NoConflictImpl noConflictImpl = this; - NoConflictImpl(ParentComponentImpl parentComponentImpl) { - this.parentComponentImpl = parentComponentImpl; + NoConflictImpl(Impl impl) { + this.impl = impl; } } - private static final class ParentComponentImpl implements ParentComponent { - private final ParentComponentImpl parentComponentImpl = this; + private static final class Impl implements ParentComponent { + private final Impl impl = this; - ParentComponentImpl() { + Impl() { } @Override public Foo.Sub newInstanceSubcomponent() { - return new F_SubImpl(parentComponentImpl); + return new F_SubImpl(impl); } @Override public NoConflict newNoConflictSubcomponent() { - return new NoConflictImpl(parentComponentImpl); + return new NoConflictImpl(impl); } } } diff --git a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/multipleSubcomponentsWithSameSimpleNamesCanExistInSameComponent/test.DaggerParentComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/multipleSubcomponentsWithSameSimpleNamesCanExistInSameComponent/test.DaggerParentComponent_KT_FAST_INIT_MODE index ae25f81b5b1..2afa83f6d17 100644 --- a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/multipleSubcomponentsWithSameSimpleNamesCanExistInSameComponent/test.DaggerParentComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/multipleSubcomponentsWithSameSimpleNamesCanExistInSameComponent/test.DaggerParentComponent_KT_FAST_INIT_MODE @@ -35,12 +35,12 @@ final class DaggerParentComponent { } public ParentComponent build() { - return new ParentComponentImpl(); + return new Impl(); } } private static final class ts_SubImpl implements Sub { - private final ParentComponentImpl parentComponentImpl; + private final Impl impl; private final F_SubImpl f_SubImpl; @@ -48,8 +48,8 @@ final class DaggerParentComponent { private final ts_SubImpl _ts_SubImpl = this; - ts_SubImpl(ParentComponentImpl parentComponentImpl, F_SubImpl f_SubImpl, B_SubImpl b_SubImpl) { - this.parentComponentImpl = parentComponentImpl; + ts_SubImpl(Impl impl, F_SubImpl f_SubImpl, B_SubImpl b_SubImpl) { + this.impl = impl; this.f_SubImpl = f_SubImpl; this.b_SubImpl = b_SubImpl; @@ -58,14 +58,14 @@ final class DaggerParentComponent { } private static final class B_SubImpl implements Bar.Sub { - private final ParentComponentImpl parentComponentImpl; + private final Impl impl; private final F_SubImpl f_SubImpl; private final B_SubImpl b_SubImpl = this; - B_SubImpl(ParentComponentImpl parentComponentImpl, F_SubImpl f_SubImpl) { - this.parentComponentImpl = parentComponentImpl; + B_SubImpl(Impl impl, F_SubImpl f_SubImpl) { + this.impl = impl; this.f_SubImpl = f_SubImpl; @@ -73,55 +73,55 @@ final class DaggerParentComponent { @Override public Sub newSubcomponentInSubpackage() { - return new ts_SubImpl(parentComponentImpl, f_SubImpl, b_SubImpl); + return new ts_SubImpl(impl, f_SubImpl, b_SubImpl); } } private static final class F_SubImpl implements Foo.Sub { - private final ParentComponentImpl parentComponentImpl; + private final Impl impl; private final F_SubImpl f_SubImpl = this; - F_SubImpl(ParentComponentImpl parentComponentImpl) { - this.parentComponentImpl = parentComponentImpl; + F_SubImpl(Impl impl) { + this.impl = impl; } @Override public Bar.Sub newBarSubcomponent() { - return new B_SubImpl(parentComponentImpl, f_SubImpl); + return new B_SubImpl(impl, f_SubImpl); } } private static final class NoConflictImpl implements NoConflict { - private final ParentComponentImpl parentComponentImpl; + private final Impl impl; private final NoConflictImpl noConflictImpl = this; - NoConflictImpl(ParentComponentImpl parentComponentImpl) { - this.parentComponentImpl = parentComponentImpl; + NoConflictImpl(Impl impl) { + this.impl = impl; } } - private static final class ParentComponentImpl implements ParentComponent { - private final ParentComponentImpl parentComponentImpl = this; + private static final class Impl implements ParentComponent { + private final Impl impl = this; - ParentComponentImpl() { + Impl() { } @Override public Foo.Sub newInstanceSubcomponent() { - return new F_SubImpl(parentComponentImpl); + return new F_SubImpl(impl); } @Override public NoConflict newNoConflictSubcomponent() { - return new NoConflictImpl(parentComponentImpl); + return new NoConflictImpl(impl); } } } diff --git a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentBuilderNamesShouldNotConflict/test.DaggerC_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentBuilderNamesShouldNotConflict/test.DaggerC_DEFAULT_MODE index 1a6655b0f88..04330ca6f93 100644 --- a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentBuilderNamesShouldNotConflict/test.DaggerC_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentBuilderNamesShouldNotConflict/test.DaggerC_DEFAULT_MODE @@ -34,76 +34,76 @@ final class DaggerC { } public C build() { - return new CImpl(); + return new Impl(); } } private static final class F_SubBuilder implements C.Foo.Sub.Builder { - private final CImpl cImpl; + private final Impl impl; - private F_SubBuilder(CImpl cImpl) { - this.cImpl = cImpl; + private F_SubBuilder(Impl impl) { + this.impl = impl; } @Override public C.Foo.Sub build() { - return new F_SubImpl(cImpl); + return new F_SubImpl(impl); } } private static final class B_SubBuilder implements C.Bar.Sub.Builder { - private final CImpl cImpl; + private final Impl impl; - private B_SubBuilder(CImpl cImpl) { - this.cImpl = cImpl; + private B_SubBuilder(Impl impl) { + this.impl = impl; } @Override public C.Bar.Sub build() { - return new B_SubImpl(cImpl); + return new B_SubImpl(impl); } } private static final class F_SubImpl implements C.Foo.Sub { - private final CImpl cImpl; + private final Impl impl; private final F_SubImpl f_SubImpl = this; - F_SubImpl(CImpl cImpl) { - this.cImpl = cImpl; + F_SubImpl(Impl impl) { + this.impl = impl; } } private static final class B_SubImpl implements C.Bar.Sub { - private final CImpl cImpl; + private final Impl impl; private final B_SubImpl b_SubImpl = this; - B_SubImpl(CImpl cImpl) { - this.cImpl = cImpl; + B_SubImpl(Impl impl) { + this.impl = impl; } } - private static final class CImpl implements C { - private final CImpl cImpl = this; + private static final class Impl implements C { + private final Impl impl = this; - CImpl() { + Impl() { } @Override public C.Foo.Sub.Builder fooBuilder() { - return new F_SubBuilder(cImpl); + return new F_SubBuilder(impl); } @Override public C.Bar.Sub.Builder barBuilder() { - return new B_SubBuilder(cImpl); + return new B_SubBuilder(impl); } } } diff --git a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentBuilderNamesShouldNotConflict/test.DaggerC_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentBuilderNamesShouldNotConflict/test.DaggerC_FAST_INIT_MODE index 1a6655b0f88..04330ca6f93 100644 --- a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentBuilderNamesShouldNotConflict/test.DaggerC_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentBuilderNamesShouldNotConflict/test.DaggerC_FAST_INIT_MODE @@ -34,76 +34,76 @@ final class DaggerC { } public C build() { - return new CImpl(); + return new Impl(); } } private static final class F_SubBuilder implements C.Foo.Sub.Builder { - private final CImpl cImpl; + private final Impl impl; - private F_SubBuilder(CImpl cImpl) { - this.cImpl = cImpl; + private F_SubBuilder(Impl impl) { + this.impl = impl; } @Override public C.Foo.Sub build() { - return new F_SubImpl(cImpl); + return new F_SubImpl(impl); } } private static final class B_SubBuilder implements C.Bar.Sub.Builder { - private final CImpl cImpl; + private final Impl impl; - private B_SubBuilder(CImpl cImpl) { - this.cImpl = cImpl; + private B_SubBuilder(Impl impl) { + this.impl = impl; } @Override public C.Bar.Sub build() { - return new B_SubImpl(cImpl); + return new B_SubImpl(impl); } } private static final class F_SubImpl implements C.Foo.Sub { - private final CImpl cImpl; + private final Impl impl; private final F_SubImpl f_SubImpl = this; - F_SubImpl(CImpl cImpl) { - this.cImpl = cImpl; + F_SubImpl(Impl impl) { + this.impl = impl; } } private static final class B_SubImpl implements C.Bar.Sub { - private final CImpl cImpl; + private final Impl impl; private final B_SubImpl b_SubImpl = this; - B_SubImpl(CImpl cImpl) { - this.cImpl = cImpl; + B_SubImpl(Impl impl) { + this.impl = impl; } } - private static final class CImpl implements C { - private final CImpl cImpl = this; + private static final class Impl implements C { + private final Impl impl = this; - CImpl() { + Impl() { } @Override public C.Foo.Sub.Builder fooBuilder() { - return new F_SubBuilder(cImpl); + return new F_SubBuilder(impl); } @Override public C.Bar.Sub.Builder barBuilder() { - return new B_SubBuilder(cImpl); + return new B_SubBuilder(impl); } } } diff --git a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentBuilderNamesShouldNotConflict/test.DaggerC_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentBuilderNamesShouldNotConflict/test.DaggerC_KT_DEFAULT_MODE index 2b7416c8cf2..dbc6afa3d87 100644 --- a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentBuilderNamesShouldNotConflict/test.DaggerC_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentBuilderNamesShouldNotConflict/test.DaggerC_KT_DEFAULT_MODE @@ -34,76 +34,76 @@ final class DaggerC { } public C build() { - return new CImpl(); + return new Impl(); } } private static final class F_SubBuilder implements C.Foo.Sub.Builder { - private final CImpl cImpl; + private final Impl impl; - private F_SubBuilder(CImpl cImpl) { - this.cImpl = cImpl; + private F_SubBuilder(Impl impl) { + this.impl = impl; } @Override public C.Foo.Sub build() { - return new F_SubImpl(cImpl); + return new F_SubImpl(impl); } } private static final class B_SubBuilder implements C.Bar.Sub.Builder { - private final CImpl cImpl; + private final Impl impl; - private B_SubBuilder(CImpl cImpl) { - this.cImpl = cImpl; + private B_SubBuilder(Impl impl) { + this.impl = impl; } @Override public C.Bar.Sub build() { - return new B_SubImpl(cImpl); + return new B_SubImpl(impl); } } private static final class F_SubImpl implements C.Foo.Sub { - private final CImpl cImpl; + private final Impl impl; private final F_SubImpl f_SubImpl = this; - F_SubImpl(CImpl cImpl) { - this.cImpl = cImpl; + F_SubImpl(Impl impl) { + this.impl = impl; } } private static final class B_SubImpl implements C.Bar.Sub { - private final CImpl cImpl; + private final Impl impl; private final B_SubImpl b_SubImpl = this; - B_SubImpl(CImpl cImpl) { - this.cImpl = cImpl; + B_SubImpl(Impl impl) { + this.impl = impl; } } - private static final class CImpl implements C { - private final CImpl cImpl = this; + private static final class Impl implements C { + private final Impl impl = this; - CImpl() { + Impl() { } @Override public C.Foo.Sub.Builder fooBuilder() { - return (C.Foo.Sub.Builder) ((Object) (new F_SubBuilder(cImpl))); + return (C.Foo.Sub.Builder) ((Object) (new F_SubBuilder(impl))); } @Override public C.Bar.Sub.Builder barBuilder() { - return (C.Bar.Sub.Builder) ((Object) (new B_SubBuilder(cImpl))); + return (C.Bar.Sub.Builder) ((Object) (new B_SubBuilder(impl))); } } } diff --git a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentBuilderNamesShouldNotConflict/test.DaggerC_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentBuilderNamesShouldNotConflict/test.DaggerC_KT_FAST_INIT_MODE index 2b7416c8cf2..dbc6afa3d87 100644 --- a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentBuilderNamesShouldNotConflict/test.DaggerC_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentBuilderNamesShouldNotConflict/test.DaggerC_KT_FAST_INIT_MODE @@ -34,76 +34,76 @@ final class DaggerC { } public C build() { - return new CImpl(); + return new Impl(); } } private static final class F_SubBuilder implements C.Foo.Sub.Builder { - private final CImpl cImpl; + private final Impl impl; - private F_SubBuilder(CImpl cImpl) { - this.cImpl = cImpl; + private F_SubBuilder(Impl impl) { + this.impl = impl; } @Override public C.Foo.Sub build() { - return new F_SubImpl(cImpl); + return new F_SubImpl(impl); } } private static final class B_SubBuilder implements C.Bar.Sub.Builder { - private final CImpl cImpl; + private final Impl impl; - private B_SubBuilder(CImpl cImpl) { - this.cImpl = cImpl; + private B_SubBuilder(Impl impl) { + this.impl = impl; } @Override public C.Bar.Sub build() { - return new B_SubImpl(cImpl); + return new B_SubImpl(impl); } } private static final class F_SubImpl implements C.Foo.Sub { - private final CImpl cImpl; + private final Impl impl; private final F_SubImpl f_SubImpl = this; - F_SubImpl(CImpl cImpl) { - this.cImpl = cImpl; + F_SubImpl(Impl impl) { + this.impl = impl; } } private static final class B_SubImpl implements C.Bar.Sub { - private final CImpl cImpl; + private final Impl impl; private final B_SubImpl b_SubImpl = this; - B_SubImpl(CImpl cImpl) { - this.cImpl = cImpl; + B_SubImpl(Impl impl) { + this.impl = impl; } } - private static final class CImpl implements C { - private final CImpl cImpl = this; + private static final class Impl implements C { + private final Impl impl = this; - CImpl() { + Impl() { } @Override public C.Foo.Sub.Builder fooBuilder() { - return (C.Foo.Sub.Builder) ((Object) (new F_SubBuilder(cImpl))); + return (C.Foo.Sub.Builder) ((Object) (new F_SubBuilder(impl))); } @Override public C.Bar.Sub.Builder barBuilder() { - return (C.Bar.Sub.Builder) ((Object) (new B_SubBuilder(cImpl))); + return (C.Bar.Sub.Builder) ((Object) (new B_SubBuilder(impl))); } } } diff --git a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentImplNameUsesFullyQualifiedClassNameIfNecessary/test.DaggerParentComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentImplNameUsesFullyQualifiedClassNameIfNecessary/test.DaggerParentComponent_DEFAULT_MODE index a80bdf97533..f85d0f9287e 100644 --- a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentImplNameUsesFullyQualifiedClassNameIfNecessary/test.DaggerParentComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentImplNameUsesFullyQualifiedClassNameIfNecessary/test.DaggerParentComponent_DEFAULT_MODE @@ -35,50 +35,50 @@ final class DaggerParentComponent { } public ParentComponent build() { - return new ParentComponentImpl(); + return new Impl(); } } private static final class F_SubImpl implements E.F.Sub { - private final ParentComponentImpl parentComponentImpl; + private final Impl impl; private final F_SubImpl f_SubImpl = this; - F_SubImpl(ParentComponentImpl parentComponentImpl) { - this.parentComponentImpl = parentComponentImpl; + F_SubImpl(Impl impl) { + this.impl = impl; } } private static final class F2_SubImpl implements top2.a.b.c.d.E.F.Sub { - private final ParentComponentImpl parentComponentImpl; + private final Impl impl; private final F2_SubImpl f2_SubImpl = this; - F2_SubImpl(ParentComponentImpl parentComponentImpl) { - this.parentComponentImpl = parentComponentImpl; + F2_SubImpl(Impl impl) { + this.impl = impl; } } - private static final class ParentComponentImpl implements ParentComponent { - private final ParentComponentImpl parentComponentImpl = this; + private static final class Impl implements ParentComponent { + private final Impl impl = this; - ParentComponentImpl() { + Impl() { } @Override public E.F.Sub top1() { - return new F_SubImpl(parentComponentImpl); + return new F_SubImpl(impl); } @Override public top2.a.b.c.d.E.F.Sub top2() { - return new F2_SubImpl(parentComponentImpl); + return new F2_SubImpl(impl); } } } diff --git a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentImplNameUsesFullyQualifiedClassNameIfNecessary/test.DaggerParentComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentImplNameUsesFullyQualifiedClassNameIfNecessary/test.DaggerParentComponent_FAST_INIT_MODE index a80bdf97533..f85d0f9287e 100644 --- a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentImplNameUsesFullyQualifiedClassNameIfNecessary/test.DaggerParentComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentImplNameUsesFullyQualifiedClassNameIfNecessary/test.DaggerParentComponent_FAST_INIT_MODE @@ -35,50 +35,50 @@ final class DaggerParentComponent { } public ParentComponent build() { - return new ParentComponentImpl(); + return new Impl(); } } private static final class F_SubImpl implements E.F.Sub { - private final ParentComponentImpl parentComponentImpl; + private final Impl impl; private final F_SubImpl f_SubImpl = this; - F_SubImpl(ParentComponentImpl parentComponentImpl) { - this.parentComponentImpl = parentComponentImpl; + F_SubImpl(Impl impl) { + this.impl = impl; } } private static final class F2_SubImpl implements top2.a.b.c.d.E.F.Sub { - private final ParentComponentImpl parentComponentImpl; + private final Impl impl; private final F2_SubImpl f2_SubImpl = this; - F2_SubImpl(ParentComponentImpl parentComponentImpl) { - this.parentComponentImpl = parentComponentImpl; + F2_SubImpl(Impl impl) { + this.impl = impl; } } - private static final class ParentComponentImpl implements ParentComponent { - private final ParentComponentImpl parentComponentImpl = this; + private static final class Impl implements ParentComponent { + private final Impl impl = this; - ParentComponentImpl() { + Impl() { } @Override public E.F.Sub top1() { - return new F_SubImpl(parentComponentImpl); + return new F_SubImpl(impl); } @Override public top2.a.b.c.d.E.F.Sub top2() { - return new F2_SubImpl(parentComponentImpl); + return new F2_SubImpl(impl); } } } diff --git a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentImplNameUsesFullyQualifiedClassNameIfNecessary/test.DaggerParentComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentImplNameUsesFullyQualifiedClassNameIfNecessary/test.DaggerParentComponent_KT_DEFAULT_MODE index a80bdf97533..f85d0f9287e 100644 --- a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentImplNameUsesFullyQualifiedClassNameIfNecessary/test.DaggerParentComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentImplNameUsesFullyQualifiedClassNameIfNecessary/test.DaggerParentComponent_KT_DEFAULT_MODE @@ -35,50 +35,50 @@ final class DaggerParentComponent { } public ParentComponent build() { - return new ParentComponentImpl(); + return new Impl(); } } private static final class F_SubImpl implements E.F.Sub { - private final ParentComponentImpl parentComponentImpl; + private final Impl impl; private final F_SubImpl f_SubImpl = this; - F_SubImpl(ParentComponentImpl parentComponentImpl) { - this.parentComponentImpl = parentComponentImpl; + F_SubImpl(Impl impl) { + this.impl = impl; } } private static final class F2_SubImpl implements top2.a.b.c.d.E.F.Sub { - private final ParentComponentImpl parentComponentImpl; + private final Impl impl; private final F2_SubImpl f2_SubImpl = this; - F2_SubImpl(ParentComponentImpl parentComponentImpl) { - this.parentComponentImpl = parentComponentImpl; + F2_SubImpl(Impl impl) { + this.impl = impl; } } - private static final class ParentComponentImpl implements ParentComponent { - private final ParentComponentImpl parentComponentImpl = this; + private static final class Impl implements ParentComponent { + private final Impl impl = this; - ParentComponentImpl() { + Impl() { } @Override public E.F.Sub top1() { - return new F_SubImpl(parentComponentImpl); + return new F_SubImpl(impl); } @Override public top2.a.b.c.d.E.F.Sub top2() { - return new F2_SubImpl(parentComponentImpl); + return new F2_SubImpl(impl); } } } diff --git a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentImplNameUsesFullyQualifiedClassNameIfNecessary/test.DaggerParentComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentImplNameUsesFullyQualifiedClassNameIfNecessary/test.DaggerParentComponent_KT_FAST_INIT_MODE index a80bdf97533..f85d0f9287e 100644 --- a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentImplNameUsesFullyQualifiedClassNameIfNecessary/test.DaggerParentComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentImplNameUsesFullyQualifiedClassNameIfNecessary/test.DaggerParentComponent_KT_FAST_INIT_MODE @@ -35,50 +35,50 @@ final class DaggerParentComponent { } public ParentComponent build() { - return new ParentComponentImpl(); + return new Impl(); } } private static final class F_SubImpl implements E.F.Sub { - private final ParentComponentImpl parentComponentImpl; + private final Impl impl; private final F_SubImpl f_SubImpl = this; - F_SubImpl(ParentComponentImpl parentComponentImpl) { - this.parentComponentImpl = parentComponentImpl; + F_SubImpl(Impl impl) { + this.impl = impl; } } private static final class F2_SubImpl implements top2.a.b.c.d.E.F.Sub { - private final ParentComponentImpl parentComponentImpl; + private final Impl impl; private final F2_SubImpl f2_SubImpl = this; - F2_SubImpl(ParentComponentImpl parentComponentImpl) { - this.parentComponentImpl = parentComponentImpl; + F2_SubImpl(Impl impl) { + this.impl = impl; } } - private static final class ParentComponentImpl implements ParentComponent { - private final ParentComponentImpl parentComponentImpl = this; + private static final class Impl implements ParentComponent { + private final Impl impl = this; - ParentComponentImpl() { + Impl() { } @Override public E.F.Sub top1() { - return new F_SubImpl(parentComponentImpl); + return new F_SubImpl(impl); } @Override public top2.a.b.c.d.E.F.Sub top2() { - return new F2_SubImpl(parentComponentImpl); + return new F2_SubImpl(impl); } } } diff --git a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentNamesShouldNotConflictWithParent/test.DaggerC_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentNamesShouldNotConflictWithParent/test.DaggerC_DEFAULT_MODE index 8a24f48b130..4df00d3dd57 100644 --- a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentNamesShouldNotConflictWithParent/test.DaggerC_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentNamesShouldNotConflictWithParent/test.DaggerC_DEFAULT_MODE @@ -34,33 +34,33 @@ final class DaggerC { } public C build() { - return new t_CImpl(); + return new Impl(); } } - private static final class F_CImpl implements Foo.C { - private final t_CImpl _t_CImpl; + private static final class CImpl implements Foo.C { + private final Impl impl; - private final F_CImpl f_CImpl = this; + private final CImpl cImpl = this; - F_CImpl(t_CImpl _t_CImpl) { - this._t_CImpl = _t_CImpl; + CImpl(Impl impl) { + this.impl = impl; } } - private static final class t_CImpl implements C { - private final t_CImpl _t_CImpl = this; + private static final class Impl implements C { + private final Impl impl = this; - t_CImpl() { + Impl() { } @Override public Foo.C newInstanceC() { - return new F_CImpl(_t_CImpl); + return new CImpl(impl); } } } diff --git a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentNamesShouldNotConflictWithParent/test.DaggerC_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentNamesShouldNotConflictWithParent/test.DaggerC_FAST_INIT_MODE index 8a24f48b130..4df00d3dd57 100644 --- a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentNamesShouldNotConflictWithParent/test.DaggerC_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentNamesShouldNotConflictWithParent/test.DaggerC_FAST_INIT_MODE @@ -34,33 +34,33 @@ final class DaggerC { } public C build() { - return new t_CImpl(); + return new Impl(); } } - private static final class F_CImpl implements Foo.C { - private final t_CImpl _t_CImpl; + private static final class CImpl implements Foo.C { + private final Impl impl; - private final F_CImpl f_CImpl = this; + private final CImpl cImpl = this; - F_CImpl(t_CImpl _t_CImpl) { - this._t_CImpl = _t_CImpl; + CImpl(Impl impl) { + this.impl = impl; } } - private static final class t_CImpl implements C { - private final t_CImpl _t_CImpl = this; + private static final class Impl implements C { + private final Impl impl = this; - t_CImpl() { + Impl() { } @Override public Foo.C newInstanceC() { - return new F_CImpl(_t_CImpl); + return new CImpl(impl); } } } diff --git a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentNamesShouldNotConflictWithParent/test.DaggerC_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentNamesShouldNotConflictWithParent/test.DaggerC_KT_DEFAULT_MODE index 8a24f48b130..4df00d3dd57 100644 --- a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentNamesShouldNotConflictWithParent/test.DaggerC_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentNamesShouldNotConflictWithParent/test.DaggerC_KT_DEFAULT_MODE @@ -34,33 +34,33 @@ final class DaggerC { } public C build() { - return new t_CImpl(); + return new Impl(); } } - private static final class F_CImpl implements Foo.C { - private final t_CImpl _t_CImpl; + private static final class CImpl implements Foo.C { + private final Impl impl; - private final F_CImpl f_CImpl = this; + private final CImpl cImpl = this; - F_CImpl(t_CImpl _t_CImpl) { - this._t_CImpl = _t_CImpl; + CImpl(Impl impl) { + this.impl = impl; } } - private static final class t_CImpl implements C { - private final t_CImpl _t_CImpl = this; + private static final class Impl implements C { + private final Impl impl = this; - t_CImpl() { + Impl() { } @Override public Foo.C newInstanceC() { - return new F_CImpl(_t_CImpl); + return new CImpl(impl); } } } diff --git a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentNamesShouldNotConflictWithParent/test.DaggerC_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentNamesShouldNotConflictWithParent/test.DaggerC_KT_FAST_INIT_MODE index 8a24f48b130..4df00d3dd57 100644 --- a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentNamesShouldNotConflictWithParent/test.DaggerC_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentNamesShouldNotConflictWithParent/test.DaggerC_KT_FAST_INIT_MODE @@ -34,33 +34,33 @@ final class DaggerC { } public C build() { - return new t_CImpl(); + return new Impl(); } } - private static final class F_CImpl implements Foo.C { - private final t_CImpl _t_CImpl; + private static final class CImpl implements Foo.C { + private final Impl impl; - private final F_CImpl f_CImpl = this; + private final CImpl cImpl = this; - F_CImpl(t_CImpl _t_CImpl) { - this._t_CImpl = _t_CImpl; + CImpl(Impl impl) { + this.impl = impl; } } - private static final class t_CImpl implements C { - private final t_CImpl _t_CImpl = this; + private static final class Impl implements C { + private final Impl impl = this; - t_CImpl() { + Impl() { } @Override public Foo.C newInstanceC() { - return new F_CImpl(_t_CImpl); + return new CImpl(impl); } } } diff --git a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentSimpleNamesDisambiguated/test.DaggerParentComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentSimpleNamesDisambiguated/test.DaggerParentComponent_DEFAULT_MODE index 9b5760d00f4..db841ba4695 100644 --- a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentSimpleNamesDisambiguated/test.DaggerParentComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentSimpleNamesDisambiguated/test.DaggerParentComponent_DEFAULT_MODE @@ -34,19 +34,19 @@ final class DaggerParentComponent { } public ParentComponent build() { - return new ParentComponentImpl(); + return new Impl(); } } private static final class tdmltmt_SubImpl implements test.deep.many.levels.that.match.test.Sub { - private final ParentComponentImpl parentComponentImpl; + private final Impl impl; private final t_SubImpl _t_SubImpl; private final tdmltmt_SubImpl _tdmltmt_SubImpl = this; - tdmltmt_SubImpl(ParentComponentImpl parentComponentImpl, t_SubImpl _t_SubImpl) { - this.parentComponentImpl = parentComponentImpl; + tdmltmt_SubImpl(Impl impl, t_SubImpl _t_SubImpl) { + this.impl = impl; this._t_SubImpl = _t_SubImpl; @@ -54,33 +54,33 @@ final class DaggerParentComponent { } private static final class t_SubImpl implements Sub { - private final ParentComponentImpl parentComponentImpl; + private final Impl impl; private final t_SubImpl _t_SubImpl = this; - t_SubImpl(ParentComponentImpl parentComponentImpl) { - this.parentComponentImpl = parentComponentImpl; + t_SubImpl(Impl impl) { + this.impl = impl; } @Override public test.deep.many.levels.that.match.test.Sub newDeepSubcomponent() { - return new tdmltmt_SubImpl(parentComponentImpl, _t_SubImpl); + return new tdmltmt_SubImpl(impl, _t_SubImpl); } } - private static final class ParentComponentImpl implements ParentComponent { - private final ParentComponentImpl parentComponentImpl = this; + private static final class Impl implements ParentComponent { + private final Impl impl = this; - ParentComponentImpl() { + Impl() { } @Override public Sub newSubcomponent() { - return new t_SubImpl(parentComponentImpl); + return new t_SubImpl(impl); } } } diff --git a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentSimpleNamesDisambiguated/test.DaggerParentComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentSimpleNamesDisambiguated/test.DaggerParentComponent_FAST_INIT_MODE index 9b5760d00f4..db841ba4695 100644 --- a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentSimpleNamesDisambiguated/test.DaggerParentComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentSimpleNamesDisambiguated/test.DaggerParentComponent_FAST_INIT_MODE @@ -34,19 +34,19 @@ final class DaggerParentComponent { } public ParentComponent build() { - return new ParentComponentImpl(); + return new Impl(); } } private static final class tdmltmt_SubImpl implements test.deep.many.levels.that.match.test.Sub { - private final ParentComponentImpl parentComponentImpl; + private final Impl impl; private final t_SubImpl _t_SubImpl; private final tdmltmt_SubImpl _tdmltmt_SubImpl = this; - tdmltmt_SubImpl(ParentComponentImpl parentComponentImpl, t_SubImpl _t_SubImpl) { - this.parentComponentImpl = parentComponentImpl; + tdmltmt_SubImpl(Impl impl, t_SubImpl _t_SubImpl) { + this.impl = impl; this._t_SubImpl = _t_SubImpl; @@ -54,33 +54,33 @@ final class DaggerParentComponent { } private static final class t_SubImpl implements Sub { - private final ParentComponentImpl parentComponentImpl; + private final Impl impl; private final t_SubImpl _t_SubImpl = this; - t_SubImpl(ParentComponentImpl parentComponentImpl) { - this.parentComponentImpl = parentComponentImpl; + t_SubImpl(Impl impl) { + this.impl = impl; } @Override public test.deep.many.levels.that.match.test.Sub newDeepSubcomponent() { - return new tdmltmt_SubImpl(parentComponentImpl, _t_SubImpl); + return new tdmltmt_SubImpl(impl, _t_SubImpl); } } - private static final class ParentComponentImpl implements ParentComponent { - private final ParentComponentImpl parentComponentImpl = this; + private static final class Impl implements ParentComponent { + private final Impl impl = this; - ParentComponentImpl() { + Impl() { } @Override public Sub newSubcomponent() { - return new t_SubImpl(parentComponentImpl); + return new t_SubImpl(impl); } } } diff --git a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentSimpleNamesDisambiguated/test.DaggerParentComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentSimpleNamesDisambiguated/test.DaggerParentComponent_KT_DEFAULT_MODE index 9b5760d00f4..db841ba4695 100644 --- a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentSimpleNamesDisambiguated/test.DaggerParentComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentSimpleNamesDisambiguated/test.DaggerParentComponent_KT_DEFAULT_MODE @@ -34,19 +34,19 @@ final class DaggerParentComponent { } public ParentComponent build() { - return new ParentComponentImpl(); + return new Impl(); } } private static final class tdmltmt_SubImpl implements test.deep.many.levels.that.match.test.Sub { - private final ParentComponentImpl parentComponentImpl; + private final Impl impl; private final t_SubImpl _t_SubImpl; private final tdmltmt_SubImpl _tdmltmt_SubImpl = this; - tdmltmt_SubImpl(ParentComponentImpl parentComponentImpl, t_SubImpl _t_SubImpl) { - this.parentComponentImpl = parentComponentImpl; + tdmltmt_SubImpl(Impl impl, t_SubImpl _t_SubImpl) { + this.impl = impl; this._t_SubImpl = _t_SubImpl; @@ -54,33 +54,33 @@ final class DaggerParentComponent { } private static final class t_SubImpl implements Sub { - private final ParentComponentImpl parentComponentImpl; + private final Impl impl; private final t_SubImpl _t_SubImpl = this; - t_SubImpl(ParentComponentImpl parentComponentImpl) { - this.parentComponentImpl = parentComponentImpl; + t_SubImpl(Impl impl) { + this.impl = impl; } @Override public test.deep.many.levels.that.match.test.Sub newDeepSubcomponent() { - return new tdmltmt_SubImpl(parentComponentImpl, _t_SubImpl); + return new tdmltmt_SubImpl(impl, _t_SubImpl); } } - private static final class ParentComponentImpl implements ParentComponent { - private final ParentComponentImpl parentComponentImpl = this; + private static final class Impl implements ParentComponent { + private final Impl impl = this; - ParentComponentImpl() { + Impl() { } @Override public Sub newSubcomponent() { - return new t_SubImpl(parentComponentImpl); + return new t_SubImpl(impl); } } } diff --git a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentSimpleNamesDisambiguated/test.DaggerParentComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentSimpleNamesDisambiguated/test.DaggerParentComponent_KT_FAST_INIT_MODE index 9b5760d00f4..db841ba4695 100644 --- a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentSimpleNamesDisambiguated/test.DaggerParentComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentSimpleNamesDisambiguated/test.DaggerParentComponent_KT_FAST_INIT_MODE @@ -34,19 +34,19 @@ final class DaggerParentComponent { } public ParentComponent build() { - return new ParentComponentImpl(); + return new Impl(); } } private static final class tdmltmt_SubImpl implements test.deep.many.levels.that.match.test.Sub { - private final ParentComponentImpl parentComponentImpl; + private final Impl impl; private final t_SubImpl _t_SubImpl; private final tdmltmt_SubImpl _tdmltmt_SubImpl = this; - tdmltmt_SubImpl(ParentComponentImpl parentComponentImpl, t_SubImpl _t_SubImpl) { - this.parentComponentImpl = parentComponentImpl; + tdmltmt_SubImpl(Impl impl, t_SubImpl _t_SubImpl) { + this.impl = impl; this._t_SubImpl = _t_SubImpl; @@ -54,33 +54,33 @@ final class DaggerParentComponent { } private static final class t_SubImpl implements Sub { - private final ParentComponentImpl parentComponentImpl; + private final Impl impl; private final t_SubImpl _t_SubImpl = this; - t_SubImpl(ParentComponentImpl parentComponentImpl) { - this.parentComponentImpl = parentComponentImpl; + t_SubImpl(Impl impl) { + this.impl = impl; } @Override public test.deep.many.levels.that.match.test.Sub newDeepSubcomponent() { - return new tdmltmt_SubImpl(parentComponentImpl, _t_SubImpl); + return new tdmltmt_SubImpl(impl, _t_SubImpl); } } - private static final class ParentComponentImpl implements ParentComponent { - private final ParentComponentImpl parentComponentImpl = this; + private static final class Impl implements ParentComponent { + private final Impl impl = this; - ParentComponentImpl() { + Impl() { } @Override public Sub newSubcomponent() { - return new t_SubImpl(parentComponentImpl); + return new t_SubImpl(impl); } } } diff --git a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentSimpleNamesDisambiguatedInRoot/DaggerParentComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentSimpleNamesDisambiguatedInRoot/DaggerParentComponent_DEFAULT_MODE index 91ef25007e8..eafc616e77b 100644 --- a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentSimpleNamesDisambiguatedInRoot/DaggerParentComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentSimpleNamesDisambiguatedInRoot/DaggerParentComponent_DEFAULT_MODE @@ -32,19 +32,19 @@ final class DaggerParentComponent { } public ParentComponent build() { - return new ParentComponentImpl(); + return new Impl(); } } private static final class tdmltmt_SubImpl implements test.deep.many.levels.that.match.test.Sub { - private final ParentComponentImpl parentComponentImpl; + private final Impl impl; private final $_SubImpl _$_SubImpl; private final tdmltmt_SubImpl _tdmltmt_SubImpl = this; - tdmltmt_SubImpl(ParentComponentImpl parentComponentImpl, $_SubImpl _$_SubImpl) { - this.parentComponentImpl = parentComponentImpl; + tdmltmt_SubImpl(Impl impl, $_SubImpl _$_SubImpl) { + this.impl = impl; this._$_SubImpl = _$_SubImpl; @@ -52,33 +52,33 @@ final class DaggerParentComponent { } private static final class $_SubImpl implements Sub { - private final ParentComponentImpl parentComponentImpl; + private final Impl impl; private final $_SubImpl _$_SubImpl = this; - $_SubImpl(ParentComponentImpl parentComponentImpl) { - this.parentComponentImpl = parentComponentImpl; + $_SubImpl(Impl impl) { + this.impl = impl; } @Override public test.deep.many.levels.that.match.test.Sub newDeepSubcomponent() { - return new tdmltmt_SubImpl(parentComponentImpl, _$_SubImpl); + return new tdmltmt_SubImpl(impl, _$_SubImpl); } } - private static final class ParentComponentImpl implements ParentComponent { - private final ParentComponentImpl parentComponentImpl = this; + private static final class Impl implements ParentComponent { + private final Impl impl = this; - ParentComponentImpl() { + Impl() { } @Override public Sub newSubcomponent() { - return new $_SubImpl(parentComponentImpl); + return new $_SubImpl(impl); } } } diff --git a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentSimpleNamesDisambiguatedInRoot/DaggerParentComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentSimpleNamesDisambiguatedInRoot/DaggerParentComponent_FAST_INIT_MODE index 91ef25007e8..eafc616e77b 100644 --- a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentSimpleNamesDisambiguatedInRoot/DaggerParentComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentSimpleNamesDisambiguatedInRoot/DaggerParentComponent_FAST_INIT_MODE @@ -32,19 +32,19 @@ final class DaggerParentComponent { } public ParentComponent build() { - return new ParentComponentImpl(); + return new Impl(); } } private static final class tdmltmt_SubImpl implements test.deep.many.levels.that.match.test.Sub { - private final ParentComponentImpl parentComponentImpl; + private final Impl impl; private final $_SubImpl _$_SubImpl; private final tdmltmt_SubImpl _tdmltmt_SubImpl = this; - tdmltmt_SubImpl(ParentComponentImpl parentComponentImpl, $_SubImpl _$_SubImpl) { - this.parentComponentImpl = parentComponentImpl; + tdmltmt_SubImpl(Impl impl, $_SubImpl _$_SubImpl) { + this.impl = impl; this._$_SubImpl = _$_SubImpl; @@ -52,33 +52,33 @@ final class DaggerParentComponent { } private static final class $_SubImpl implements Sub { - private final ParentComponentImpl parentComponentImpl; + private final Impl impl; private final $_SubImpl _$_SubImpl = this; - $_SubImpl(ParentComponentImpl parentComponentImpl) { - this.parentComponentImpl = parentComponentImpl; + $_SubImpl(Impl impl) { + this.impl = impl; } @Override public test.deep.many.levels.that.match.test.Sub newDeepSubcomponent() { - return new tdmltmt_SubImpl(parentComponentImpl, _$_SubImpl); + return new tdmltmt_SubImpl(impl, _$_SubImpl); } } - private static final class ParentComponentImpl implements ParentComponent { - private final ParentComponentImpl parentComponentImpl = this; + private static final class Impl implements ParentComponent { + private final Impl impl = this; - ParentComponentImpl() { + Impl() { } @Override public Sub newSubcomponent() { - return new $_SubImpl(parentComponentImpl); + return new $_SubImpl(impl); } } } diff --git a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentSimpleNamesDisambiguatedInRoot/DaggerParentComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentSimpleNamesDisambiguatedInRoot/DaggerParentComponent_KT_DEFAULT_MODE index 91ef25007e8..eafc616e77b 100644 --- a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentSimpleNamesDisambiguatedInRoot/DaggerParentComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentSimpleNamesDisambiguatedInRoot/DaggerParentComponent_KT_DEFAULT_MODE @@ -32,19 +32,19 @@ final class DaggerParentComponent { } public ParentComponent build() { - return new ParentComponentImpl(); + return new Impl(); } } private static final class tdmltmt_SubImpl implements test.deep.many.levels.that.match.test.Sub { - private final ParentComponentImpl parentComponentImpl; + private final Impl impl; private final $_SubImpl _$_SubImpl; private final tdmltmt_SubImpl _tdmltmt_SubImpl = this; - tdmltmt_SubImpl(ParentComponentImpl parentComponentImpl, $_SubImpl _$_SubImpl) { - this.parentComponentImpl = parentComponentImpl; + tdmltmt_SubImpl(Impl impl, $_SubImpl _$_SubImpl) { + this.impl = impl; this._$_SubImpl = _$_SubImpl; @@ -52,33 +52,33 @@ final class DaggerParentComponent { } private static final class $_SubImpl implements Sub { - private final ParentComponentImpl parentComponentImpl; + private final Impl impl; private final $_SubImpl _$_SubImpl = this; - $_SubImpl(ParentComponentImpl parentComponentImpl) { - this.parentComponentImpl = parentComponentImpl; + $_SubImpl(Impl impl) { + this.impl = impl; } @Override public test.deep.many.levels.that.match.test.Sub newDeepSubcomponent() { - return new tdmltmt_SubImpl(parentComponentImpl, _$_SubImpl); + return new tdmltmt_SubImpl(impl, _$_SubImpl); } } - private static final class ParentComponentImpl implements ParentComponent { - private final ParentComponentImpl parentComponentImpl = this; + private static final class Impl implements ParentComponent { + private final Impl impl = this; - ParentComponentImpl() { + Impl() { } @Override public Sub newSubcomponent() { - return new $_SubImpl(parentComponentImpl); + return new $_SubImpl(impl); } } } diff --git a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentSimpleNamesDisambiguatedInRoot/DaggerParentComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentSimpleNamesDisambiguatedInRoot/DaggerParentComponent_KT_FAST_INIT_MODE index 91ef25007e8..eafc616e77b 100644 --- a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentSimpleNamesDisambiguatedInRoot/DaggerParentComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest/subcomponentSimpleNamesDisambiguatedInRoot/DaggerParentComponent_KT_FAST_INIT_MODE @@ -32,19 +32,19 @@ final class DaggerParentComponent { } public ParentComponent build() { - return new ParentComponentImpl(); + return new Impl(); } } private static final class tdmltmt_SubImpl implements test.deep.many.levels.that.match.test.Sub { - private final ParentComponentImpl parentComponentImpl; + private final Impl impl; private final $_SubImpl _$_SubImpl; private final tdmltmt_SubImpl _tdmltmt_SubImpl = this; - tdmltmt_SubImpl(ParentComponentImpl parentComponentImpl, $_SubImpl _$_SubImpl) { - this.parentComponentImpl = parentComponentImpl; + tdmltmt_SubImpl(Impl impl, $_SubImpl _$_SubImpl) { + this.impl = impl; this._$_SubImpl = _$_SubImpl; @@ -52,33 +52,33 @@ final class DaggerParentComponent { } private static final class $_SubImpl implements Sub { - private final ParentComponentImpl parentComponentImpl; + private final Impl impl; private final $_SubImpl _$_SubImpl = this; - $_SubImpl(ParentComponentImpl parentComponentImpl) { - this.parentComponentImpl = parentComponentImpl; + $_SubImpl(Impl impl) { + this.impl = impl; } @Override public test.deep.many.levels.that.match.test.Sub newDeepSubcomponent() { - return new tdmltmt_SubImpl(parentComponentImpl, _$_SubImpl); + return new tdmltmt_SubImpl(impl, _$_SubImpl); } } - private static final class ParentComponentImpl implements ParentComponent { - private final ParentComponentImpl parentComponentImpl = this; + private static final class Impl implements ParentComponent { + private final Impl impl = this; - ParentComponentImpl() { + Impl() { } @Override public Sub newSubcomponent() { - return new $_SubImpl(parentComponentImpl); + return new $_SubImpl(impl); } } } diff --git a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/emptyMultibindings_avoidSwitchProviders/test.DaggerTestComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/emptyMultibindings_avoidSwitchProviders/test.DaggerTestComponent_DEFAULT_MODE index f490ab8ee06..3e8c97e7580 100644 --- a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/emptyMultibindings_avoidSwitchProviders/test.DaggerTestComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/emptyMultibindings_avoidSwitchProviders/test.DaggerTestComponent_DEFAULT_MODE @@ -39,14 +39,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/emptyMultibindings_avoidSwitchProviders/test.DaggerTestComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/emptyMultibindings_avoidSwitchProviders/test.DaggerTestComponent_FAST_INIT_MODE index f490ab8ee06..3e8c97e7580 100644 --- a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/emptyMultibindings_avoidSwitchProviders/test.DaggerTestComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/emptyMultibindings_avoidSwitchProviders/test.DaggerTestComponent_FAST_INIT_MODE @@ -39,14 +39,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/emptyMultibindings_avoidSwitchProviders/test.DaggerTestComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/emptyMultibindings_avoidSwitchProviders/test.DaggerTestComponent_KT_DEFAULT_MODE index 83fa777ef28..0c5cdc6ff02 100644 --- a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/emptyMultibindings_avoidSwitchProviders/test.DaggerTestComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/emptyMultibindings_avoidSwitchProviders/test.DaggerTestComponent_KT_DEFAULT_MODE @@ -39,14 +39,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/emptyMultibindings_avoidSwitchProviders/test.DaggerTestComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/emptyMultibindings_avoidSwitchProviders/test.DaggerTestComponent_KT_FAST_INIT_MODE index 83fa777ef28..0c5cdc6ff02 100644 --- a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/emptyMultibindings_avoidSwitchProviders/test.DaggerTestComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/emptyMultibindings_avoidSwitchProviders/test.DaggerTestComponent_KT_FAST_INIT_MODE @@ -39,14 +39,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/memberInjectors/test.DaggerTestComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/memberInjectors/test.DaggerTestComponent_DEFAULT_MODE index f6818894256..d9bacafd160 100644 --- a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/memberInjectors/test.DaggerTestComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/memberInjectors/test.DaggerTestComponent_DEFAULT_MODE @@ -38,16 +38,16 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; Provider> fooMembersInjectorProvider; - TestComponentImpl() { + Impl() { initialize(); diff --git a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/memberInjectors/test.DaggerTestComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/memberInjectors/test.DaggerTestComponent_FAST_INIT_MODE index f6818894256..d9bacafd160 100644 --- a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/memberInjectors/test.DaggerTestComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/memberInjectors/test.DaggerTestComponent_FAST_INIT_MODE @@ -38,16 +38,16 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; Provider> fooMembersInjectorProvider; - TestComponentImpl() { + Impl() { initialize(); diff --git a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/memberInjectors/test.DaggerTestComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/memberInjectors/test.DaggerTestComponent_KT_DEFAULT_MODE index b1b11a3f703..75ed8b3a7db 100644 --- a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/memberInjectors/test.DaggerTestComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/memberInjectors/test.DaggerTestComponent_KT_DEFAULT_MODE @@ -38,19 +38,19 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; /** * {@code Provider>} */ Provider fooMembersInjectorProvider; - TestComponentImpl() { + Impl() { initialize(); diff --git a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/memberInjectors/test.DaggerTestComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/memberInjectors/test.DaggerTestComponent_KT_FAST_INIT_MODE index b1b11a3f703..75ed8b3a7db 100644 --- a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/memberInjectors/test.DaggerTestComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/memberInjectors/test.DaggerTestComponent_KT_FAST_INIT_MODE @@ -38,19 +38,19 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; /** * {@code Provider>} */ Provider fooMembersInjectorProvider; - TestComponentImpl() { + Impl() { initialize(); diff --git a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/optionals/test.DaggerTestComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/optionals/test.DaggerTestComponent_DEFAULT_MODE index b4562caecc0..150340d3479 100644 --- a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/optionals/test.DaggerTestComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/optionals/test.DaggerTestComponent_DEFAULT_MODE @@ -73,18 +73,18 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; Provider> optionalOfPresentProvider; Provider> optionalOfAbsentProvider; - TestComponentImpl() { + Impl() { initialize(); diff --git a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/optionals/test.DaggerTestComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/optionals/test.DaggerTestComponent_FAST_INIT_MODE index 203e683529a..722e7897a67 100644 --- a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/optionals/test.DaggerTestComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/optionals/test.DaggerTestComponent_FAST_INIT_MODE @@ -52,18 +52,18 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; Provider> optionalOfPresentProvider; Provider> optionalOfAbsentProvider; - TestComponentImpl() { + Impl() { initialize(); @@ -71,7 +71,7 @@ final class DaggerTestComponent { @SuppressWarnings("unchecked") private void initialize() { - this.optionalOfPresentProvider = new SwitchingProvider<>(testComponentImpl, 0); + this.optionalOfPresentProvider = new SwitchingProvider<>(impl, 0); this.optionalOfAbsentProvider = absentJdkOptionalProvider(); } @@ -86,12 +86,12 @@ final class DaggerTestComponent { } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } diff --git a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/optionals/test.DaggerTestComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/optionals/test.DaggerTestComponent_KT_DEFAULT_MODE index 69a7758b832..8c48b54b1ba 100644 --- a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/optionals/test.DaggerTestComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/optionals/test.DaggerTestComponent_KT_DEFAULT_MODE @@ -73,12 +73,12 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; /** * {@code Provider>} @@ -90,7 +90,7 @@ final class DaggerTestComponent { */ Provider optionalOfAbsentProvider; - TestComponentImpl() { + Impl() { initialize(); diff --git a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/optionals/test.DaggerTestComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/optionals/test.DaggerTestComponent_KT_FAST_INIT_MODE index 874b7d15ea8..ea859b91c26 100644 --- a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/optionals/test.DaggerTestComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/optionals/test.DaggerTestComponent_KT_FAST_INIT_MODE @@ -52,12 +52,12 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; /** * {@code Provider>} @@ -69,7 +69,7 @@ final class DaggerTestComponent { */ Provider optionalOfAbsentProvider; - TestComponentImpl() { + Impl() { initialize(); @@ -77,7 +77,7 @@ final class DaggerTestComponent { @SuppressWarnings("unchecked") private void initialize() { - this.optionalOfPresentProvider = new SwitchingProvider<>(testComponentImpl, 0); + this.optionalOfPresentProvider = new SwitchingProvider<>(impl, 0); this.optionalOfAbsentProvider = absentJdkOptionalProvider(); } @@ -92,12 +92,12 @@ final class DaggerTestComponent { } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } diff --git a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/scopedBinds/test.DaggerTestComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/scopedBinds/test.DaggerTestComponent_DEFAULT_MODE index b053936862a..d17c52e9156 100644 --- a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/scopedBinds/test.DaggerTestComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/scopedBinds/test.DaggerTestComponent_DEFAULT_MODE @@ -36,16 +36,16 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; Provider cProvider; - TestComponentImpl() { + Impl() { initialize(); diff --git a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/scopedBinds/test.DaggerTestComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/scopedBinds/test.DaggerTestComponent_FAST_INIT_MODE index 81458f253b8..ab3390f4e79 100644 --- a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/scopedBinds/test.DaggerTestComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/scopedBinds/test.DaggerTestComponent_FAST_INIT_MODE @@ -36,18 +36,18 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; Provider sProvider; Provider cProvider; - TestComponentImpl() { + Impl() { initialize(); @@ -55,7 +55,7 @@ final class DaggerTestComponent { @SuppressWarnings("unchecked") private void initialize() { - this.sProvider = new SwitchingProvider<>(testComponentImpl, 0); + this.sProvider = new SwitchingProvider<>(impl, 0); this.cProvider = DoubleCheck.provider((Provider) (sProvider)); } @@ -70,12 +70,12 @@ final class DaggerTestComponent { } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } diff --git a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/scopedBinds/test.DaggerTestComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/scopedBinds/test.DaggerTestComponent_KT_DEFAULT_MODE index 68bd17d276c..16e1ac34981 100644 --- a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/scopedBinds/test.DaggerTestComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/scopedBinds/test.DaggerTestComponent_KT_DEFAULT_MODE @@ -36,19 +36,19 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; /** * {@code Provider} */ Provider cProvider; - TestComponentImpl() { + Impl() { initialize(); diff --git a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/scopedBinds/test.DaggerTestComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/scopedBinds/test.DaggerTestComponent_KT_FAST_INIT_MODE index 15d83ea2a77..4092bc09a95 100644 --- a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/scopedBinds/test.DaggerTestComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/scopedBinds/test.DaggerTestComponent_KT_FAST_INIT_MODE @@ -36,12 +36,12 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; /** * {@code Provider} @@ -53,7 +53,7 @@ final class DaggerTestComponent { */ Provider cProvider; - TestComponentImpl() { + Impl() { initialize(); @@ -61,7 +61,7 @@ final class DaggerTestComponent { @SuppressWarnings("unchecked") private void initialize() { - this.sProvider = new SwitchingProvider<>(testComponentImpl, 0); + this.sProvider = new SwitchingProvider<>(impl, 0); this.cProvider = DoubleCheck.provider((Provider) (sProvider)); } @@ -76,12 +76,12 @@ final class DaggerTestComponent { } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } diff --git a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/switchingProviderTest/test.DaggerTestComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/switchingProviderTest/test.DaggerTestComponent_DEFAULT_MODE index 3654dcbd827..b2271cc20cf 100644 --- a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/switchingProviderTest/test.DaggerTestComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/switchingProviderTest/test.DaggerTestComponent_DEFAULT_MODE @@ -35,14 +35,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/switchingProviderTest/test.DaggerTestComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/switchingProviderTest/test.DaggerTestComponent_FAST_INIT_MODE index 3970f11a55b..f781d87d480 100644 --- a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/switchingProviderTest/test.DaggerTestComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/switchingProviderTest/test.DaggerTestComponent_FAST_INIT_MODE @@ -35,12 +35,12 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; Provider binding0Provider; @@ -244,7 +244,7 @@ final class DaggerTestComponent { Provider binding100Provider; - TestComponentImpl() { + Impl() { initialize(); initialize2(); @@ -256,123 +256,123 @@ final class DaggerTestComponent { @SuppressWarnings("unchecked") private void initialize() { - this.binding0Provider = new SwitchingProvider<>(testComponentImpl, 0); - this.binding1Provider = new SwitchingProvider<>(testComponentImpl, 1); - this.binding2Provider = new SwitchingProvider<>(testComponentImpl, 2); - this.binding3Provider = new SwitchingProvider<>(testComponentImpl, 3); - this.binding4Provider = new SwitchingProvider<>(testComponentImpl, 4); - this.binding5Provider = new SwitchingProvider<>(testComponentImpl, 5); - this.binding6Provider = new SwitchingProvider<>(testComponentImpl, 6); - this.binding7Provider = new SwitchingProvider<>(testComponentImpl, 7); - this.binding8Provider = new SwitchingProvider<>(testComponentImpl, 8); - this.binding9Provider = new SwitchingProvider<>(testComponentImpl, 9); - this.binding10Provider = new SwitchingProvider<>(testComponentImpl, 10); - this.binding11Provider = new SwitchingProvider<>(testComponentImpl, 11); - this.binding12Provider = new SwitchingProvider<>(testComponentImpl, 12); - this.binding13Provider = new SwitchingProvider<>(testComponentImpl, 13); - this.binding14Provider = new SwitchingProvider<>(testComponentImpl, 14); - this.binding15Provider = new SwitchingProvider<>(testComponentImpl, 15); - this.binding16Provider = new SwitchingProvider<>(testComponentImpl, 16); - this.binding17Provider = new SwitchingProvider<>(testComponentImpl, 17); - this.binding18Provider = new SwitchingProvider<>(testComponentImpl, 18); - this.binding19Provider = new SwitchingProvider<>(testComponentImpl, 19); - this.binding20Provider = new SwitchingProvider<>(testComponentImpl, 20); - this.binding21Provider = new SwitchingProvider<>(testComponentImpl, 21); - this.binding22Provider = new SwitchingProvider<>(testComponentImpl, 22); - this.binding23Provider = new SwitchingProvider<>(testComponentImpl, 23); - this.binding24Provider = new SwitchingProvider<>(testComponentImpl, 24); + this.binding0Provider = new SwitchingProvider<>(impl, 0); + this.binding1Provider = new SwitchingProvider<>(impl, 1); + this.binding2Provider = new SwitchingProvider<>(impl, 2); + this.binding3Provider = new SwitchingProvider<>(impl, 3); + this.binding4Provider = new SwitchingProvider<>(impl, 4); + this.binding5Provider = new SwitchingProvider<>(impl, 5); + this.binding6Provider = new SwitchingProvider<>(impl, 6); + this.binding7Provider = new SwitchingProvider<>(impl, 7); + this.binding8Provider = new SwitchingProvider<>(impl, 8); + this.binding9Provider = new SwitchingProvider<>(impl, 9); + this.binding10Provider = new SwitchingProvider<>(impl, 10); + this.binding11Provider = new SwitchingProvider<>(impl, 11); + this.binding12Provider = new SwitchingProvider<>(impl, 12); + this.binding13Provider = new SwitchingProvider<>(impl, 13); + this.binding14Provider = new SwitchingProvider<>(impl, 14); + this.binding15Provider = new SwitchingProvider<>(impl, 15); + this.binding16Provider = new SwitchingProvider<>(impl, 16); + this.binding17Provider = new SwitchingProvider<>(impl, 17); + this.binding18Provider = new SwitchingProvider<>(impl, 18); + this.binding19Provider = new SwitchingProvider<>(impl, 19); + this.binding20Provider = new SwitchingProvider<>(impl, 20); + this.binding21Provider = new SwitchingProvider<>(impl, 21); + this.binding22Provider = new SwitchingProvider<>(impl, 22); + this.binding23Provider = new SwitchingProvider<>(impl, 23); + this.binding24Provider = new SwitchingProvider<>(impl, 24); } @SuppressWarnings("unchecked") private void initialize2() { - this.binding25Provider = new SwitchingProvider<>(testComponentImpl, 25); - this.binding26Provider = new SwitchingProvider<>(testComponentImpl, 26); - this.binding27Provider = new SwitchingProvider<>(testComponentImpl, 27); - this.binding28Provider = new SwitchingProvider<>(testComponentImpl, 28); - this.binding29Provider = new SwitchingProvider<>(testComponentImpl, 29); - this.binding30Provider = new SwitchingProvider<>(testComponentImpl, 30); - this.binding31Provider = new SwitchingProvider<>(testComponentImpl, 31); - this.binding32Provider = new SwitchingProvider<>(testComponentImpl, 32); - this.binding33Provider = new SwitchingProvider<>(testComponentImpl, 33); - this.binding34Provider = new SwitchingProvider<>(testComponentImpl, 34); - this.binding35Provider = new SwitchingProvider<>(testComponentImpl, 35); - this.binding36Provider = new SwitchingProvider<>(testComponentImpl, 36); - this.binding37Provider = new SwitchingProvider<>(testComponentImpl, 37); - this.binding38Provider = new SwitchingProvider<>(testComponentImpl, 38); - this.binding39Provider = new SwitchingProvider<>(testComponentImpl, 39); - this.binding40Provider = new SwitchingProvider<>(testComponentImpl, 40); - this.binding41Provider = new SwitchingProvider<>(testComponentImpl, 41); - this.binding42Provider = new SwitchingProvider<>(testComponentImpl, 42); - this.binding43Provider = new SwitchingProvider<>(testComponentImpl, 43); - this.binding44Provider = new SwitchingProvider<>(testComponentImpl, 44); - this.binding45Provider = new SwitchingProvider<>(testComponentImpl, 45); - this.binding46Provider = new SwitchingProvider<>(testComponentImpl, 46); - this.binding47Provider = new SwitchingProvider<>(testComponentImpl, 47); - this.binding48Provider = new SwitchingProvider<>(testComponentImpl, 48); - this.binding49Provider = new SwitchingProvider<>(testComponentImpl, 49); + this.binding25Provider = new SwitchingProvider<>(impl, 25); + this.binding26Provider = new SwitchingProvider<>(impl, 26); + this.binding27Provider = new SwitchingProvider<>(impl, 27); + this.binding28Provider = new SwitchingProvider<>(impl, 28); + this.binding29Provider = new SwitchingProvider<>(impl, 29); + this.binding30Provider = new SwitchingProvider<>(impl, 30); + this.binding31Provider = new SwitchingProvider<>(impl, 31); + this.binding32Provider = new SwitchingProvider<>(impl, 32); + this.binding33Provider = new SwitchingProvider<>(impl, 33); + this.binding34Provider = new SwitchingProvider<>(impl, 34); + this.binding35Provider = new SwitchingProvider<>(impl, 35); + this.binding36Provider = new SwitchingProvider<>(impl, 36); + this.binding37Provider = new SwitchingProvider<>(impl, 37); + this.binding38Provider = new SwitchingProvider<>(impl, 38); + this.binding39Provider = new SwitchingProvider<>(impl, 39); + this.binding40Provider = new SwitchingProvider<>(impl, 40); + this.binding41Provider = new SwitchingProvider<>(impl, 41); + this.binding42Provider = new SwitchingProvider<>(impl, 42); + this.binding43Provider = new SwitchingProvider<>(impl, 43); + this.binding44Provider = new SwitchingProvider<>(impl, 44); + this.binding45Provider = new SwitchingProvider<>(impl, 45); + this.binding46Provider = new SwitchingProvider<>(impl, 46); + this.binding47Provider = new SwitchingProvider<>(impl, 47); + this.binding48Provider = new SwitchingProvider<>(impl, 48); + this.binding49Provider = new SwitchingProvider<>(impl, 49); } @SuppressWarnings("unchecked") private void initialize3() { - this.binding50Provider = new SwitchingProvider<>(testComponentImpl, 50); - this.binding51Provider = new SwitchingProvider<>(testComponentImpl, 51); - this.binding52Provider = new SwitchingProvider<>(testComponentImpl, 52); - this.binding53Provider = new SwitchingProvider<>(testComponentImpl, 53); - this.binding54Provider = new SwitchingProvider<>(testComponentImpl, 54); - this.binding55Provider = new SwitchingProvider<>(testComponentImpl, 55); - this.binding56Provider = new SwitchingProvider<>(testComponentImpl, 56); - this.binding57Provider = new SwitchingProvider<>(testComponentImpl, 57); - this.binding58Provider = new SwitchingProvider<>(testComponentImpl, 58); - this.binding59Provider = new SwitchingProvider<>(testComponentImpl, 59); - this.binding60Provider = new SwitchingProvider<>(testComponentImpl, 60); - this.binding61Provider = new SwitchingProvider<>(testComponentImpl, 61); - this.binding62Provider = new SwitchingProvider<>(testComponentImpl, 62); - this.binding63Provider = new SwitchingProvider<>(testComponentImpl, 63); - this.binding64Provider = new SwitchingProvider<>(testComponentImpl, 64); - this.binding65Provider = new SwitchingProvider<>(testComponentImpl, 65); - this.binding66Provider = new SwitchingProvider<>(testComponentImpl, 66); - this.binding67Provider = new SwitchingProvider<>(testComponentImpl, 67); - this.binding68Provider = new SwitchingProvider<>(testComponentImpl, 68); - this.binding69Provider = new SwitchingProvider<>(testComponentImpl, 69); - this.binding70Provider = new SwitchingProvider<>(testComponentImpl, 70); - this.binding71Provider = new SwitchingProvider<>(testComponentImpl, 71); - this.binding72Provider = new SwitchingProvider<>(testComponentImpl, 72); - this.binding73Provider = new SwitchingProvider<>(testComponentImpl, 73); - this.binding74Provider = new SwitchingProvider<>(testComponentImpl, 74); + this.binding50Provider = new SwitchingProvider<>(impl, 50); + this.binding51Provider = new SwitchingProvider<>(impl, 51); + this.binding52Provider = new SwitchingProvider<>(impl, 52); + this.binding53Provider = new SwitchingProvider<>(impl, 53); + this.binding54Provider = new SwitchingProvider<>(impl, 54); + this.binding55Provider = new SwitchingProvider<>(impl, 55); + this.binding56Provider = new SwitchingProvider<>(impl, 56); + this.binding57Provider = new SwitchingProvider<>(impl, 57); + this.binding58Provider = new SwitchingProvider<>(impl, 58); + this.binding59Provider = new SwitchingProvider<>(impl, 59); + this.binding60Provider = new SwitchingProvider<>(impl, 60); + this.binding61Provider = new SwitchingProvider<>(impl, 61); + this.binding62Provider = new SwitchingProvider<>(impl, 62); + this.binding63Provider = new SwitchingProvider<>(impl, 63); + this.binding64Provider = new SwitchingProvider<>(impl, 64); + this.binding65Provider = new SwitchingProvider<>(impl, 65); + this.binding66Provider = new SwitchingProvider<>(impl, 66); + this.binding67Provider = new SwitchingProvider<>(impl, 67); + this.binding68Provider = new SwitchingProvider<>(impl, 68); + this.binding69Provider = new SwitchingProvider<>(impl, 69); + this.binding70Provider = new SwitchingProvider<>(impl, 70); + this.binding71Provider = new SwitchingProvider<>(impl, 71); + this.binding72Provider = new SwitchingProvider<>(impl, 72); + this.binding73Provider = new SwitchingProvider<>(impl, 73); + this.binding74Provider = new SwitchingProvider<>(impl, 74); } @SuppressWarnings("unchecked") private void initialize4() { - this.binding75Provider = new SwitchingProvider<>(testComponentImpl, 75); - this.binding76Provider = new SwitchingProvider<>(testComponentImpl, 76); - this.binding77Provider = new SwitchingProvider<>(testComponentImpl, 77); - this.binding78Provider = new SwitchingProvider<>(testComponentImpl, 78); - this.binding79Provider = new SwitchingProvider<>(testComponentImpl, 79); - this.binding80Provider = new SwitchingProvider<>(testComponentImpl, 80); - this.binding81Provider = new SwitchingProvider<>(testComponentImpl, 81); - this.binding82Provider = new SwitchingProvider<>(testComponentImpl, 82); - this.binding83Provider = new SwitchingProvider<>(testComponentImpl, 83); - this.binding84Provider = new SwitchingProvider<>(testComponentImpl, 84); - this.binding85Provider = new SwitchingProvider<>(testComponentImpl, 85); - this.binding86Provider = new SwitchingProvider<>(testComponentImpl, 86); - this.binding87Provider = new SwitchingProvider<>(testComponentImpl, 87); - this.binding88Provider = new SwitchingProvider<>(testComponentImpl, 88); - this.binding89Provider = new SwitchingProvider<>(testComponentImpl, 89); - this.binding90Provider = new SwitchingProvider<>(testComponentImpl, 90); - this.binding91Provider = new SwitchingProvider<>(testComponentImpl, 91); - this.binding92Provider = new SwitchingProvider<>(testComponentImpl, 92); - this.binding93Provider = new SwitchingProvider<>(testComponentImpl, 93); - this.binding94Provider = new SwitchingProvider<>(testComponentImpl, 94); - this.binding95Provider = new SwitchingProvider<>(testComponentImpl, 95); - this.binding96Provider = new SwitchingProvider<>(testComponentImpl, 96); - this.binding97Provider = new SwitchingProvider<>(testComponentImpl, 97); - this.binding98Provider = new SwitchingProvider<>(testComponentImpl, 98); - this.binding99Provider = new SwitchingProvider<>(testComponentImpl, 99); + this.binding75Provider = new SwitchingProvider<>(impl, 75); + this.binding76Provider = new SwitchingProvider<>(impl, 76); + this.binding77Provider = new SwitchingProvider<>(impl, 77); + this.binding78Provider = new SwitchingProvider<>(impl, 78); + this.binding79Provider = new SwitchingProvider<>(impl, 79); + this.binding80Provider = new SwitchingProvider<>(impl, 80); + this.binding81Provider = new SwitchingProvider<>(impl, 81); + this.binding82Provider = new SwitchingProvider<>(impl, 82); + this.binding83Provider = new SwitchingProvider<>(impl, 83); + this.binding84Provider = new SwitchingProvider<>(impl, 84); + this.binding85Provider = new SwitchingProvider<>(impl, 85); + this.binding86Provider = new SwitchingProvider<>(impl, 86); + this.binding87Provider = new SwitchingProvider<>(impl, 87); + this.binding88Provider = new SwitchingProvider<>(impl, 88); + this.binding89Provider = new SwitchingProvider<>(impl, 89); + this.binding90Provider = new SwitchingProvider<>(impl, 90); + this.binding91Provider = new SwitchingProvider<>(impl, 91); + this.binding92Provider = new SwitchingProvider<>(impl, 92); + this.binding93Provider = new SwitchingProvider<>(impl, 93); + this.binding94Provider = new SwitchingProvider<>(impl, 94); + this.binding95Provider = new SwitchingProvider<>(impl, 95); + this.binding96Provider = new SwitchingProvider<>(impl, 96); + this.binding97Provider = new SwitchingProvider<>(impl, 97); + this.binding98Provider = new SwitchingProvider<>(impl, 98); + this.binding99Provider = new SwitchingProvider<>(impl, 99); } @SuppressWarnings("unchecked") private void initialize5() { - this.binding100Provider = new SwitchingProvider<>(testComponentImpl, 100); + this.binding100Provider = new SwitchingProvider<>(impl, 100); } @Override @@ -881,12 +881,12 @@ final class DaggerTestComponent { } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } diff --git a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/switchingProviderTest/test.DaggerTestComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/switchingProviderTest/test.DaggerTestComponent_KT_DEFAULT_MODE index 7fbe1f87543..d75aa79b7f6 100644 --- a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/switchingProviderTest/test.DaggerTestComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/switchingProviderTest/test.DaggerTestComponent_KT_DEFAULT_MODE @@ -35,14 +35,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/switchingProviderTest/test.DaggerTestComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/switchingProviderTest/test.DaggerTestComponent_KT_FAST_INIT_MODE index cb48030ff94..3801ee9e9c3 100644 --- a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/switchingProviderTest/test.DaggerTestComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/switchingProviderTest/test.DaggerTestComponent_KT_FAST_INIT_MODE @@ -35,12 +35,12 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; /** * {@code Provider} @@ -547,7 +547,7 @@ final class DaggerTestComponent { */ Provider binding100Provider; - TestComponentImpl() { + Impl() { initialize(); initialize2(); @@ -559,123 +559,123 @@ final class DaggerTestComponent { @SuppressWarnings("unchecked") private void initialize() { - this.binding0Provider = new SwitchingProvider<>(testComponentImpl, 0); - this.binding1Provider = new SwitchingProvider<>(testComponentImpl, 1); - this.binding2Provider = new SwitchingProvider<>(testComponentImpl, 2); - this.binding3Provider = new SwitchingProvider<>(testComponentImpl, 3); - this.binding4Provider = new SwitchingProvider<>(testComponentImpl, 4); - this.binding5Provider = new SwitchingProvider<>(testComponentImpl, 5); - this.binding6Provider = new SwitchingProvider<>(testComponentImpl, 6); - this.binding7Provider = new SwitchingProvider<>(testComponentImpl, 7); - this.binding8Provider = new SwitchingProvider<>(testComponentImpl, 8); - this.binding9Provider = new SwitchingProvider<>(testComponentImpl, 9); - this.binding10Provider = new SwitchingProvider<>(testComponentImpl, 10); - this.binding11Provider = new SwitchingProvider<>(testComponentImpl, 11); - this.binding12Provider = new SwitchingProvider<>(testComponentImpl, 12); - this.binding13Provider = new SwitchingProvider<>(testComponentImpl, 13); - this.binding14Provider = new SwitchingProvider<>(testComponentImpl, 14); - this.binding15Provider = new SwitchingProvider<>(testComponentImpl, 15); - this.binding16Provider = new SwitchingProvider<>(testComponentImpl, 16); - this.binding17Provider = new SwitchingProvider<>(testComponentImpl, 17); - this.binding18Provider = new SwitchingProvider<>(testComponentImpl, 18); - this.binding19Provider = new SwitchingProvider<>(testComponentImpl, 19); - this.binding20Provider = new SwitchingProvider<>(testComponentImpl, 20); - this.binding21Provider = new SwitchingProvider<>(testComponentImpl, 21); - this.binding22Provider = new SwitchingProvider<>(testComponentImpl, 22); - this.binding23Provider = new SwitchingProvider<>(testComponentImpl, 23); - this.binding24Provider = new SwitchingProvider<>(testComponentImpl, 24); + this.binding0Provider = new SwitchingProvider<>(impl, 0); + this.binding1Provider = new SwitchingProvider<>(impl, 1); + this.binding2Provider = new SwitchingProvider<>(impl, 2); + this.binding3Provider = new SwitchingProvider<>(impl, 3); + this.binding4Provider = new SwitchingProvider<>(impl, 4); + this.binding5Provider = new SwitchingProvider<>(impl, 5); + this.binding6Provider = new SwitchingProvider<>(impl, 6); + this.binding7Provider = new SwitchingProvider<>(impl, 7); + this.binding8Provider = new SwitchingProvider<>(impl, 8); + this.binding9Provider = new SwitchingProvider<>(impl, 9); + this.binding10Provider = new SwitchingProvider<>(impl, 10); + this.binding11Provider = new SwitchingProvider<>(impl, 11); + this.binding12Provider = new SwitchingProvider<>(impl, 12); + this.binding13Provider = new SwitchingProvider<>(impl, 13); + this.binding14Provider = new SwitchingProvider<>(impl, 14); + this.binding15Provider = new SwitchingProvider<>(impl, 15); + this.binding16Provider = new SwitchingProvider<>(impl, 16); + this.binding17Provider = new SwitchingProvider<>(impl, 17); + this.binding18Provider = new SwitchingProvider<>(impl, 18); + this.binding19Provider = new SwitchingProvider<>(impl, 19); + this.binding20Provider = new SwitchingProvider<>(impl, 20); + this.binding21Provider = new SwitchingProvider<>(impl, 21); + this.binding22Provider = new SwitchingProvider<>(impl, 22); + this.binding23Provider = new SwitchingProvider<>(impl, 23); + this.binding24Provider = new SwitchingProvider<>(impl, 24); } @SuppressWarnings("unchecked") private void initialize2() { - this.binding25Provider = new SwitchingProvider<>(testComponentImpl, 25); - this.binding26Provider = new SwitchingProvider<>(testComponentImpl, 26); - this.binding27Provider = new SwitchingProvider<>(testComponentImpl, 27); - this.binding28Provider = new SwitchingProvider<>(testComponentImpl, 28); - this.binding29Provider = new SwitchingProvider<>(testComponentImpl, 29); - this.binding30Provider = new SwitchingProvider<>(testComponentImpl, 30); - this.binding31Provider = new SwitchingProvider<>(testComponentImpl, 31); - this.binding32Provider = new SwitchingProvider<>(testComponentImpl, 32); - this.binding33Provider = new SwitchingProvider<>(testComponentImpl, 33); - this.binding34Provider = new SwitchingProvider<>(testComponentImpl, 34); - this.binding35Provider = new SwitchingProvider<>(testComponentImpl, 35); - this.binding36Provider = new SwitchingProvider<>(testComponentImpl, 36); - this.binding37Provider = new SwitchingProvider<>(testComponentImpl, 37); - this.binding38Provider = new SwitchingProvider<>(testComponentImpl, 38); - this.binding39Provider = new SwitchingProvider<>(testComponentImpl, 39); - this.binding40Provider = new SwitchingProvider<>(testComponentImpl, 40); - this.binding41Provider = new SwitchingProvider<>(testComponentImpl, 41); - this.binding42Provider = new SwitchingProvider<>(testComponentImpl, 42); - this.binding43Provider = new SwitchingProvider<>(testComponentImpl, 43); - this.binding44Provider = new SwitchingProvider<>(testComponentImpl, 44); - this.binding45Provider = new SwitchingProvider<>(testComponentImpl, 45); - this.binding46Provider = new SwitchingProvider<>(testComponentImpl, 46); - this.binding47Provider = new SwitchingProvider<>(testComponentImpl, 47); - this.binding48Provider = new SwitchingProvider<>(testComponentImpl, 48); - this.binding49Provider = new SwitchingProvider<>(testComponentImpl, 49); + this.binding25Provider = new SwitchingProvider<>(impl, 25); + this.binding26Provider = new SwitchingProvider<>(impl, 26); + this.binding27Provider = new SwitchingProvider<>(impl, 27); + this.binding28Provider = new SwitchingProvider<>(impl, 28); + this.binding29Provider = new SwitchingProvider<>(impl, 29); + this.binding30Provider = new SwitchingProvider<>(impl, 30); + this.binding31Provider = new SwitchingProvider<>(impl, 31); + this.binding32Provider = new SwitchingProvider<>(impl, 32); + this.binding33Provider = new SwitchingProvider<>(impl, 33); + this.binding34Provider = new SwitchingProvider<>(impl, 34); + this.binding35Provider = new SwitchingProvider<>(impl, 35); + this.binding36Provider = new SwitchingProvider<>(impl, 36); + this.binding37Provider = new SwitchingProvider<>(impl, 37); + this.binding38Provider = new SwitchingProvider<>(impl, 38); + this.binding39Provider = new SwitchingProvider<>(impl, 39); + this.binding40Provider = new SwitchingProvider<>(impl, 40); + this.binding41Provider = new SwitchingProvider<>(impl, 41); + this.binding42Provider = new SwitchingProvider<>(impl, 42); + this.binding43Provider = new SwitchingProvider<>(impl, 43); + this.binding44Provider = new SwitchingProvider<>(impl, 44); + this.binding45Provider = new SwitchingProvider<>(impl, 45); + this.binding46Provider = new SwitchingProvider<>(impl, 46); + this.binding47Provider = new SwitchingProvider<>(impl, 47); + this.binding48Provider = new SwitchingProvider<>(impl, 48); + this.binding49Provider = new SwitchingProvider<>(impl, 49); } @SuppressWarnings("unchecked") private void initialize3() { - this.binding50Provider = new SwitchingProvider<>(testComponentImpl, 50); - this.binding51Provider = new SwitchingProvider<>(testComponentImpl, 51); - this.binding52Provider = new SwitchingProvider<>(testComponentImpl, 52); - this.binding53Provider = new SwitchingProvider<>(testComponentImpl, 53); - this.binding54Provider = new SwitchingProvider<>(testComponentImpl, 54); - this.binding55Provider = new SwitchingProvider<>(testComponentImpl, 55); - this.binding56Provider = new SwitchingProvider<>(testComponentImpl, 56); - this.binding57Provider = new SwitchingProvider<>(testComponentImpl, 57); - this.binding58Provider = new SwitchingProvider<>(testComponentImpl, 58); - this.binding59Provider = new SwitchingProvider<>(testComponentImpl, 59); - this.binding60Provider = new SwitchingProvider<>(testComponentImpl, 60); - this.binding61Provider = new SwitchingProvider<>(testComponentImpl, 61); - this.binding62Provider = new SwitchingProvider<>(testComponentImpl, 62); - this.binding63Provider = new SwitchingProvider<>(testComponentImpl, 63); - this.binding64Provider = new SwitchingProvider<>(testComponentImpl, 64); - this.binding65Provider = new SwitchingProvider<>(testComponentImpl, 65); - this.binding66Provider = new SwitchingProvider<>(testComponentImpl, 66); - this.binding67Provider = new SwitchingProvider<>(testComponentImpl, 67); - this.binding68Provider = new SwitchingProvider<>(testComponentImpl, 68); - this.binding69Provider = new SwitchingProvider<>(testComponentImpl, 69); - this.binding70Provider = new SwitchingProvider<>(testComponentImpl, 70); - this.binding71Provider = new SwitchingProvider<>(testComponentImpl, 71); - this.binding72Provider = new SwitchingProvider<>(testComponentImpl, 72); - this.binding73Provider = new SwitchingProvider<>(testComponentImpl, 73); - this.binding74Provider = new SwitchingProvider<>(testComponentImpl, 74); + this.binding50Provider = new SwitchingProvider<>(impl, 50); + this.binding51Provider = new SwitchingProvider<>(impl, 51); + this.binding52Provider = new SwitchingProvider<>(impl, 52); + this.binding53Provider = new SwitchingProvider<>(impl, 53); + this.binding54Provider = new SwitchingProvider<>(impl, 54); + this.binding55Provider = new SwitchingProvider<>(impl, 55); + this.binding56Provider = new SwitchingProvider<>(impl, 56); + this.binding57Provider = new SwitchingProvider<>(impl, 57); + this.binding58Provider = new SwitchingProvider<>(impl, 58); + this.binding59Provider = new SwitchingProvider<>(impl, 59); + this.binding60Provider = new SwitchingProvider<>(impl, 60); + this.binding61Provider = new SwitchingProvider<>(impl, 61); + this.binding62Provider = new SwitchingProvider<>(impl, 62); + this.binding63Provider = new SwitchingProvider<>(impl, 63); + this.binding64Provider = new SwitchingProvider<>(impl, 64); + this.binding65Provider = new SwitchingProvider<>(impl, 65); + this.binding66Provider = new SwitchingProvider<>(impl, 66); + this.binding67Provider = new SwitchingProvider<>(impl, 67); + this.binding68Provider = new SwitchingProvider<>(impl, 68); + this.binding69Provider = new SwitchingProvider<>(impl, 69); + this.binding70Provider = new SwitchingProvider<>(impl, 70); + this.binding71Provider = new SwitchingProvider<>(impl, 71); + this.binding72Provider = new SwitchingProvider<>(impl, 72); + this.binding73Provider = new SwitchingProvider<>(impl, 73); + this.binding74Provider = new SwitchingProvider<>(impl, 74); } @SuppressWarnings("unchecked") private void initialize4() { - this.binding75Provider = new SwitchingProvider<>(testComponentImpl, 75); - this.binding76Provider = new SwitchingProvider<>(testComponentImpl, 76); - this.binding77Provider = new SwitchingProvider<>(testComponentImpl, 77); - this.binding78Provider = new SwitchingProvider<>(testComponentImpl, 78); - this.binding79Provider = new SwitchingProvider<>(testComponentImpl, 79); - this.binding80Provider = new SwitchingProvider<>(testComponentImpl, 80); - this.binding81Provider = new SwitchingProvider<>(testComponentImpl, 81); - this.binding82Provider = new SwitchingProvider<>(testComponentImpl, 82); - this.binding83Provider = new SwitchingProvider<>(testComponentImpl, 83); - this.binding84Provider = new SwitchingProvider<>(testComponentImpl, 84); - this.binding85Provider = new SwitchingProvider<>(testComponentImpl, 85); - this.binding86Provider = new SwitchingProvider<>(testComponentImpl, 86); - this.binding87Provider = new SwitchingProvider<>(testComponentImpl, 87); - this.binding88Provider = new SwitchingProvider<>(testComponentImpl, 88); - this.binding89Provider = new SwitchingProvider<>(testComponentImpl, 89); - this.binding90Provider = new SwitchingProvider<>(testComponentImpl, 90); - this.binding91Provider = new SwitchingProvider<>(testComponentImpl, 91); - this.binding92Provider = new SwitchingProvider<>(testComponentImpl, 92); - this.binding93Provider = new SwitchingProvider<>(testComponentImpl, 93); - this.binding94Provider = new SwitchingProvider<>(testComponentImpl, 94); - this.binding95Provider = new SwitchingProvider<>(testComponentImpl, 95); - this.binding96Provider = new SwitchingProvider<>(testComponentImpl, 96); - this.binding97Provider = new SwitchingProvider<>(testComponentImpl, 97); - this.binding98Provider = new SwitchingProvider<>(testComponentImpl, 98); - this.binding99Provider = new SwitchingProvider<>(testComponentImpl, 99); + this.binding75Provider = new SwitchingProvider<>(impl, 75); + this.binding76Provider = new SwitchingProvider<>(impl, 76); + this.binding77Provider = new SwitchingProvider<>(impl, 77); + this.binding78Provider = new SwitchingProvider<>(impl, 78); + this.binding79Provider = new SwitchingProvider<>(impl, 79); + this.binding80Provider = new SwitchingProvider<>(impl, 80); + this.binding81Provider = new SwitchingProvider<>(impl, 81); + this.binding82Provider = new SwitchingProvider<>(impl, 82); + this.binding83Provider = new SwitchingProvider<>(impl, 83); + this.binding84Provider = new SwitchingProvider<>(impl, 84); + this.binding85Provider = new SwitchingProvider<>(impl, 85); + this.binding86Provider = new SwitchingProvider<>(impl, 86); + this.binding87Provider = new SwitchingProvider<>(impl, 87); + this.binding88Provider = new SwitchingProvider<>(impl, 88); + this.binding89Provider = new SwitchingProvider<>(impl, 89); + this.binding90Provider = new SwitchingProvider<>(impl, 90); + this.binding91Provider = new SwitchingProvider<>(impl, 91); + this.binding92Provider = new SwitchingProvider<>(impl, 92); + this.binding93Provider = new SwitchingProvider<>(impl, 93); + this.binding94Provider = new SwitchingProvider<>(impl, 94); + this.binding95Provider = new SwitchingProvider<>(impl, 95); + this.binding96Provider = new SwitchingProvider<>(impl, 96); + this.binding97Provider = new SwitchingProvider<>(impl, 97); + this.binding98Provider = new SwitchingProvider<>(impl, 98); + this.binding99Provider = new SwitchingProvider<>(impl, 99); } @SuppressWarnings("unchecked") private void initialize5() { - this.binding100Provider = new SwitchingProvider<>(testComponentImpl, 100); + this.binding100Provider = new SwitchingProvider<>(impl, 100); } @Override @@ -1184,12 +1184,12 @@ final class DaggerTestComponent { } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } diff --git a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/unscopedBinds/test.DaggerTestComponent_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/unscopedBinds/test.DaggerTestComponent_DEFAULT_MODE index c120e17da41..dc080a89b1f 100644 --- a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/unscopedBinds/test.DaggerTestComponent_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/unscopedBinds/test.DaggerTestComponent_DEFAULT_MODE @@ -35,14 +35,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/unscopedBinds/test.DaggerTestComponent_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/unscopedBinds/test.DaggerTestComponent_FAST_INIT_MODE index 20149766b71..d17b930196d 100644 --- a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/unscopedBinds/test.DaggerTestComponent_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/unscopedBinds/test.DaggerTestComponent_FAST_INIT_MODE @@ -35,16 +35,16 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; Provider sProvider; - TestComponentImpl() { + Impl() { initialize(); @@ -52,7 +52,7 @@ final class DaggerTestComponent { @SuppressWarnings("unchecked") private void initialize() { - this.sProvider = new SwitchingProvider<>(testComponentImpl, 0); + this.sProvider = new SwitchingProvider<>(impl, 0); } @Override @@ -66,12 +66,12 @@ final class DaggerTestComponent { } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } diff --git a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/unscopedBinds/test.DaggerTestComponent_KT_DEFAULT_MODE b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/unscopedBinds/test.DaggerTestComponent_KT_DEFAULT_MODE index cd0df20c9d1..9241d47e0a2 100644 --- a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/unscopedBinds/test.DaggerTestComponent_KT_DEFAULT_MODE +++ b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/unscopedBinds/test.DaggerTestComponent_KT_DEFAULT_MODE @@ -35,14 +35,14 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl() { + Impl() { } diff --git a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/unscopedBinds/test.DaggerTestComponent_KT_FAST_INIT_MODE b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/unscopedBinds/test.DaggerTestComponent_KT_FAST_INIT_MODE index 073dd976474..e7d790143fa 100644 --- a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/unscopedBinds/test.DaggerTestComponent_KT_FAST_INIT_MODE +++ b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest/unscopedBinds/test.DaggerTestComponent_KT_FAST_INIT_MODE @@ -35,19 +35,19 @@ final class DaggerTestComponent { } public TestComponent build() { - return new TestComponentImpl(); + return new Impl(); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; /** * {@code Provider} */ Provider sProvider; - TestComponentImpl() { + Impl() { initialize(); @@ -55,7 +55,7 @@ final class DaggerTestComponent { @SuppressWarnings("unchecked") private void initialize() { - this.sProvider = new SwitchingProvider<>(testComponentImpl, 0); + this.sProvider = new SwitchingProvider<>(impl, 0); } @Override @@ -69,12 +69,12 @@ final class DaggerTestComponent { } private static final class SwitchingProvider implements Provider { - private final TestComponentImpl testComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(TestComponentImpl testComponentImpl, int id) { - this.testComponentImpl = testComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } diff --git a/javatests/dagger/internal/codegen/goldens/TypeUseNullableTest/componentDependencyWithTypeUseNullableType/test.DaggerBComponent_DEFAULT_MODE_typeUseNullables_DISABLED b/javatests/dagger/internal/codegen/goldens/TypeUseNullableTest/componentDependencyWithTypeUseNullableType/test.DaggerBComponent_DEFAULT_MODE_typeUseNullables_DISABLED index 84e8ab74d04..6b843d73824 100644 --- a/javatests/dagger/internal/codegen/goldens/TypeUseNullableTest/componentDependencyWithTypeUseNullableType/test.DaggerBComponent_DEFAULT_MODE_typeUseNullables_DISABLED +++ b/javatests/dagger/internal/codegen/goldens/TypeUseNullableTest/componentDependencyWithTypeUseNullableType/test.DaggerBComponent_DEFAULT_MODE_typeUseNullables_DISABLED @@ -40,16 +40,16 @@ final class DaggerBComponent { public BComponent build() { Preconditions.checkBuilderRequirement(nullableStringComponent, NullableStringComponent.class); - return new BComponentImpl(nullableStringComponent); + return new Impl(nullableStringComponent); } } - private static final class BComponentImpl implements BComponent { - private final BComponentImpl bComponentImpl = this; + private static final class Impl implements BComponent { + private final Impl impl = this; Provider nullableStringProvider; - BComponentImpl(NullableStringComponent nullableStringComponentParam) { + Impl(NullableStringComponent nullableStringComponentParam) { initialize(nullableStringComponentParam); diff --git a/javatests/dagger/internal/codegen/goldens/TypeUseNullableTest/componentDependencyWithTypeUseNullableType/test.DaggerBComponent_DEFAULT_MODE_typeUseNullables_ENABLED b/javatests/dagger/internal/codegen/goldens/TypeUseNullableTest/componentDependencyWithTypeUseNullableType/test.DaggerBComponent_DEFAULT_MODE_typeUseNullables_ENABLED index 7c1c464ab6a..bfa83c9f3f6 100644 --- a/javatests/dagger/internal/codegen/goldens/TypeUseNullableTest/componentDependencyWithTypeUseNullableType/test.DaggerBComponent_DEFAULT_MODE_typeUseNullables_ENABLED +++ b/javatests/dagger/internal/codegen/goldens/TypeUseNullableTest/componentDependencyWithTypeUseNullableType/test.DaggerBComponent_DEFAULT_MODE_typeUseNullables_ENABLED @@ -40,16 +40,16 @@ final class DaggerBComponent { public BComponent build() { Preconditions.checkBuilderRequirement(nullableStringComponent, NullableStringComponent.class); - return new BComponentImpl(nullableStringComponent); + return new Impl(nullableStringComponent); } } - private static final class BComponentImpl implements BComponent { - private final BComponentImpl bComponentImpl = this; + private static final class Impl implements BComponent { + private final Impl impl = this; Provider<@Nullable String> nullableStringProvider; - BComponentImpl(NullableStringComponent nullableStringComponentParam) { + Impl(NullableStringComponent nullableStringComponentParam) { initialize(nullableStringComponentParam); diff --git a/javatests/dagger/internal/codegen/goldens/TypeUseNullableTest/componentDependencyWithTypeUseNullableType/test.DaggerBComponent_FAST_INIT_MODE_typeUseNullables_DISABLED b/javatests/dagger/internal/codegen/goldens/TypeUseNullableTest/componentDependencyWithTypeUseNullableType/test.DaggerBComponent_FAST_INIT_MODE_typeUseNullables_DISABLED index 5293a376913..bef703648c3 100644 --- a/javatests/dagger/internal/codegen/goldens/TypeUseNullableTest/componentDependencyWithTypeUseNullableType/test.DaggerBComponent_FAST_INIT_MODE_typeUseNullables_DISABLED +++ b/javatests/dagger/internal/codegen/goldens/TypeUseNullableTest/componentDependencyWithTypeUseNullableType/test.DaggerBComponent_FAST_INIT_MODE_typeUseNullables_DISABLED @@ -40,18 +40,18 @@ final class DaggerBComponent { public BComponent build() { Preconditions.checkBuilderRequirement(nullableStringComponent, NullableStringComponent.class); - return new BComponentImpl(nullableStringComponent); + return new Impl(nullableStringComponent); } } - private static final class BComponentImpl implements BComponent { + private static final class Impl implements BComponent { private final NullableStringComponent nullableStringComponent; - private final BComponentImpl bComponentImpl = this; + private final Impl impl = this; Provider nullableStringProvider; - BComponentImpl(NullableStringComponent nullableStringComponentParam) { + Impl(NullableStringComponent nullableStringComponentParam) { this.nullableStringComponent = nullableStringComponentParam; initialize(nullableStringComponentParam); @@ -59,7 +59,7 @@ final class DaggerBComponent { @SuppressWarnings("unchecked") private void initialize(final NullableStringComponent nullableStringComponentParam) { - this.nullableStringProvider = new SwitchingProvider<>(bComponentImpl, 0); + this.nullableStringProvider = new SwitchingProvider<>(impl, 0); } @Override @@ -68,12 +68,12 @@ final class DaggerBComponent { } private static final class SwitchingProvider implements Provider { - private final BComponentImpl bComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(BComponentImpl bComponentImpl, int id) { - this.bComponentImpl = bComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } @@ -82,7 +82,7 @@ final class DaggerBComponent { public T get() { switch (id) { case 0: // java.lang.String - return (T) bComponentImpl.nullableStringComponent.nullableString(); + return (T) impl.nullableStringComponent.nullableString(); default: throw new AssertionError(id); } diff --git a/javatests/dagger/internal/codegen/goldens/TypeUseNullableTest/componentDependencyWithTypeUseNullableType/test.DaggerBComponent_FAST_INIT_MODE_typeUseNullables_ENABLED b/javatests/dagger/internal/codegen/goldens/TypeUseNullableTest/componentDependencyWithTypeUseNullableType/test.DaggerBComponent_FAST_INIT_MODE_typeUseNullables_ENABLED index e2723eda175..e4ce1fcfbbd 100644 --- a/javatests/dagger/internal/codegen/goldens/TypeUseNullableTest/componentDependencyWithTypeUseNullableType/test.DaggerBComponent_FAST_INIT_MODE_typeUseNullables_ENABLED +++ b/javatests/dagger/internal/codegen/goldens/TypeUseNullableTest/componentDependencyWithTypeUseNullableType/test.DaggerBComponent_FAST_INIT_MODE_typeUseNullables_ENABLED @@ -40,18 +40,18 @@ final class DaggerBComponent { public BComponent build() { Preconditions.checkBuilderRequirement(nullableStringComponent, NullableStringComponent.class); - return new BComponentImpl(nullableStringComponent); + return new Impl(nullableStringComponent); } } - private static final class BComponentImpl implements BComponent { + private static final class Impl implements BComponent { private final NullableStringComponent nullableStringComponent; - private final BComponentImpl bComponentImpl = this; + private final Impl impl = this; Provider<@Nullable String> nullableStringProvider; - BComponentImpl(NullableStringComponent nullableStringComponentParam) { + Impl(NullableStringComponent nullableStringComponentParam) { this.nullableStringComponent = nullableStringComponentParam; initialize(nullableStringComponentParam); @@ -59,7 +59,7 @@ final class DaggerBComponent { @SuppressWarnings("unchecked") private void initialize(final NullableStringComponent nullableStringComponentParam) { - this.nullableStringProvider = new SwitchingProvider<>(bComponentImpl, 0); + this.nullableStringProvider = new SwitchingProvider<>(impl, 0); } @Override @@ -68,12 +68,12 @@ final class DaggerBComponent { } private static final class SwitchingProvider implements Provider { - private final BComponentImpl bComponentImpl; + private final Impl impl; private final int id; - SwitchingProvider(BComponentImpl bComponentImpl, int id) { - this.bComponentImpl = bComponentImpl; + SwitchingProvider(Impl impl, int id) { + this.impl = impl; this.id = id; } @@ -82,7 +82,7 @@ final class DaggerBComponent { public T get() { switch (id) { case 0: // java.lang.String - return (T) bComponentImpl.nullableStringComponent.nullableString(); + return (T) impl.nullableStringComponent.nullableString(); default: throw new AssertionError(id); } diff --git a/javatests/dagger/internal/codegen/goldens/TypeUseNullableTest/componentDependencyWithTypeUseNullableTypeArguments/test.DaggerAComponent_DEFAULT_MODE_typeUseNullables_DISABLED b/javatests/dagger/internal/codegen/goldens/TypeUseNullableTest/componentDependencyWithTypeUseNullableTypeArguments/test.DaggerAComponent_DEFAULT_MODE_typeUseNullables_DISABLED index f0ac4077518..1878088cb2c 100644 --- a/javatests/dagger/internal/codegen/goldens/TypeUseNullableTest/componentDependencyWithTypeUseNullableTypeArguments/test.DaggerAComponent_DEFAULT_MODE_typeUseNullables_DISABLED +++ b/javatests/dagger/internal/codegen/goldens/TypeUseNullableTest/componentDependencyWithTypeUseNullableTypeArguments/test.DaggerAComponent_DEFAULT_MODE_typeUseNullables_DISABLED @@ -40,16 +40,16 @@ final class DaggerAComponent { public AComponent build() { Preconditions.checkBuilderRequirement(nestedNullableComponent, NestedNullableComponent.class); - return new AComponentImpl(nestedNullableComponent); + return new Impl(nestedNullableComponent); } } - private static final class AComponentImpl implements AComponent { + private static final class Impl implements AComponent { private final NestedNullableComponent nestedNullableComponent; - private final AComponentImpl aComponentImpl = this; + private final Impl impl = this; - AComponentImpl(NestedNullableComponent nestedNullableComponentParam) { + Impl(NestedNullableComponent nestedNullableComponentParam) { this.nestedNullableComponent = nestedNullableComponentParam; } diff --git a/javatests/dagger/internal/codegen/goldens/TypeUseNullableTest/componentDependencyWithTypeUseNullableTypeArguments/test.DaggerAComponent_DEFAULT_MODE_typeUseNullables_ENABLED b/javatests/dagger/internal/codegen/goldens/TypeUseNullableTest/componentDependencyWithTypeUseNullableTypeArguments/test.DaggerAComponent_DEFAULT_MODE_typeUseNullables_ENABLED index a6aedfb3601..181008a6173 100644 --- a/javatests/dagger/internal/codegen/goldens/TypeUseNullableTest/componentDependencyWithTypeUseNullableTypeArguments/test.DaggerAComponent_DEFAULT_MODE_typeUseNullables_ENABLED +++ b/javatests/dagger/internal/codegen/goldens/TypeUseNullableTest/componentDependencyWithTypeUseNullableTypeArguments/test.DaggerAComponent_DEFAULT_MODE_typeUseNullables_ENABLED @@ -40,16 +40,16 @@ final class DaggerAComponent { public AComponent build() { Preconditions.checkBuilderRequirement(nestedNullableComponent, NestedNullableComponent.class); - return new AComponentImpl(nestedNullableComponent); + return new Impl(nestedNullableComponent); } } - private static final class AComponentImpl implements AComponent { + private static final class Impl implements AComponent { private final NestedNullableComponent nestedNullableComponent; - private final AComponentImpl aComponentImpl = this; + private final Impl impl = this; - AComponentImpl(NestedNullableComponent nestedNullableComponentParam) { + Impl(NestedNullableComponent nestedNullableComponentParam) { this.nestedNullableComponent = nestedNullableComponentParam; } diff --git a/javatests/dagger/internal/codegen/goldens/TypeUseNullableTest/componentDependencyWithTypeUseNullableTypeArguments/test.DaggerAComponent_FAST_INIT_MODE_typeUseNullables_DISABLED b/javatests/dagger/internal/codegen/goldens/TypeUseNullableTest/componentDependencyWithTypeUseNullableTypeArguments/test.DaggerAComponent_FAST_INIT_MODE_typeUseNullables_DISABLED index f0ac4077518..1878088cb2c 100644 --- a/javatests/dagger/internal/codegen/goldens/TypeUseNullableTest/componentDependencyWithTypeUseNullableTypeArguments/test.DaggerAComponent_FAST_INIT_MODE_typeUseNullables_DISABLED +++ b/javatests/dagger/internal/codegen/goldens/TypeUseNullableTest/componentDependencyWithTypeUseNullableTypeArguments/test.DaggerAComponent_FAST_INIT_MODE_typeUseNullables_DISABLED @@ -40,16 +40,16 @@ final class DaggerAComponent { public AComponent build() { Preconditions.checkBuilderRequirement(nestedNullableComponent, NestedNullableComponent.class); - return new AComponentImpl(nestedNullableComponent); + return new Impl(nestedNullableComponent); } } - private static final class AComponentImpl implements AComponent { + private static final class Impl implements AComponent { private final NestedNullableComponent nestedNullableComponent; - private final AComponentImpl aComponentImpl = this; + private final Impl impl = this; - AComponentImpl(NestedNullableComponent nestedNullableComponentParam) { + Impl(NestedNullableComponent nestedNullableComponentParam) { this.nestedNullableComponent = nestedNullableComponentParam; } diff --git a/javatests/dagger/internal/codegen/goldens/TypeUseNullableTest/componentDependencyWithTypeUseNullableTypeArguments/test.DaggerAComponent_FAST_INIT_MODE_typeUseNullables_ENABLED b/javatests/dagger/internal/codegen/goldens/TypeUseNullableTest/componentDependencyWithTypeUseNullableTypeArguments/test.DaggerAComponent_FAST_INIT_MODE_typeUseNullables_ENABLED index a6aedfb3601..181008a6173 100644 --- a/javatests/dagger/internal/codegen/goldens/TypeUseNullableTest/componentDependencyWithTypeUseNullableTypeArguments/test.DaggerAComponent_FAST_INIT_MODE_typeUseNullables_ENABLED +++ b/javatests/dagger/internal/codegen/goldens/TypeUseNullableTest/componentDependencyWithTypeUseNullableTypeArguments/test.DaggerAComponent_FAST_INIT_MODE_typeUseNullables_ENABLED @@ -40,16 +40,16 @@ final class DaggerAComponent { public AComponent build() { Preconditions.checkBuilderRequirement(nestedNullableComponent, NestedNullableComponent.class); - return new AComponentImpl(nestedNullableComponent); + return new Impl(nestedNullableComponent); } } - private static final class AComponentImpl implements AComponent { + private static final class Impl implements AComponent { private final NestedNullableComponent nestedNullableComponent; - private final AComponentImpl aComponentImpl = this; + private final Impl impl = this; - AComponentImpl(NestedNullableComponent nestedNullableComponentParam) { + Impl(NestedNullableComponent nestedNullableComponentParam) { this.nestedNullableComponent = nestedNullableComponentParam; } diff --git a/javatests/dagger/internal/codegen/goldens/TypeUseNullableTest/testBindsTypeUseNullableInstance/test.DaggerTestComponent_DEFAULT_MODE_typeUseNullables_DISABLED b/javatests/dagger/internal/codegen/goldens/TypeUseNullableTest/testBindsTypeUseNullableInstance/test.DaggerTestComponent_DEFAULT_MODE_typeUseNullables_DISABLED index e074bf6e4d9..3850cd881cc 100644 --- a/javatests/dagger/internal/codegen/goldens/TypeUseNullableTest/testBindsTypeUseNullableInstance/test.DaggerTestComponent_DEFAULT_MODE_typeUseNullables_DISABLED +++ b/javatests/dagger/internal/codegen/goldens/TypeUseNullableTest/testBindsTypeUseNullableInstance/test.DaggerTestComponent_DEFAULT_MODE_typeUseNullables_DISABLED @@ -28,14 +28,14 @@ final class DaggerTestComponent { private static final class Factory implements TestComponent.Factory { @Override public TestComponent create(Bar arg) { - return new TestComponentImpl(arg); + return new Impl(arg); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl(Bar argParam) { + Impl(Bar argParam) { } diff --git a/javatests/dagger/internal/codegen/goldens/TypeUseNullableTest/testBindsTypeUseNullableInstance/test.DaggerTestComponent_DEFAULT_MODE_typeUseNullables_ENABLED b/javatests/dagger/internal/codegen/goldens/TypeUseNullableTest/testBindsTypeUseNullableInstance/test.DaggerTestComponent_DEFAULT_MODE_typeUseNullables_ENABLED index b77c3fec0fb..35edc10a6fc 100644 --- a/javatests/dagger/internal/codegen/goldens/TypeUseNullableTest/testBindsTypeUseNullableInstance/test.DaggerTestComponent_DEFAULT_MODE_typeUseNullables_ENABLED +++ b/javatests/dagger/internal/codegen/goldens/TypeUseNullableTest/testBindsTypeUseNullableInstance/test.DaggerTestComponent_DEFAULT_MODE_typeUseNullables_ENABLED @@ -28,14 +28,14 @@ final class DaggerTestComponent { private static final class Factory implements TestComponent.Factory { @Override public TestComponent create(@Nullable Bar arg) { - return new TestComponentImpl(arg); + return new Impl(arg); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl(@Nullable Bar argParam) { + Impl(@Nullable Bar argParam) { } diff --git a/javatests/dagger/internal/codegen/goldens/TypeUseNullableTest/testBindsTypeUseNullableInstance/test.DaggerTestComponent_FAST_INIT_MODE_typeUseNullables_DISABLED b/javatests/dagger/internal/codegen/goldens/TypeUseNullableTest/testBindsTypeUseNullableInstance/test.DaggerTestComponent_FAST_INIT_MODE_typeUseNullables_DISABLED index e074bf6e4d9..3850cd881cc 100644 --- a/javatests/dagger/internal/codegen/goldens/TypeUseNullableTest/testBindsTypeUseNullableInstance/test.DaggerTestComponent_FAST_INIT_MODE_typeUseNullables_DISABLED +++ b/javatests/dagger/internal/codegen/goldens/TypeUseNullableTest/testBindsTypeUseNullableInstance/test.DaggerTestComponent_FAST_INIT_MODE_typeUseNullables_DISABLED @@ -28,14 +28,14 @@ final class DaggerTestComponent { private static final class Factory implements TestComponent.Factory { @Override public TestComponent create(Bar arg) { - return new TestComponentImpl(arg); + return new Impl(arg); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl(Bar argParam) { + Impl(Bar argParam) { } diff --git a/javatests/dagger/internal/codegen/goldens/TypeUseNullableTest/testBindsTypeUseNullableInstance/test.DaggerTestComponent_FAST_INIT_MODE_typeUseNullables_ENABLED b/javatests/dagger/internal/codegen/goldens/TypeUseNullableTest/testBindsTypeUseNullableInstance/test.DaggerTestComponent_FAST_INIT_MODE_typeUseNullables_ENABLED index b77c3fec0fb..35edc10a6fc 100644 --- a/javatests/dagger/internal/codegen/goldens/TypeUseNullableTest/testBindsTypeUseNullableInstance/test.DaggerTestComponent_FAST_INIT_MODE_typeUseNullables_ENABLED +++ b/javatests/dagger/internal/codegen/goldens/TypeUseNullableTest/testBindsTypeUseNullableInstance/test.DaggerTestComponent_FAST_INIT_MODE_typeUseNullables_ENABLED @@ -28,14 +28,14 @@ final class DaggerTestComponent { private static final class Factory implements TestComponent.Factory { @Override public TestComponent create(@Nullable Bar arg) { - return new TestComponentImpl(arg); + return new Impl(arg); } } - private static final class TestComponentImpl implements TestComponent { - private final TestComponentImpl testComponentImpl = this; + private static final class Impl implements TestComponent { + private final Impl impl = this; - TestComponentImpl(@Nullable Bar argParam) { + Impl(@Nullable Bar argParam) { } diff --git a/javatests/dagger/internal/codegen/kotlin/KspComponentProcessorTest.java b/javatests/dagger/internal/codegen/kotlin/KspComponentProcessorTest.java index 2a343586054..24c01ffab57 100644 --- a/javatests/dagger/internal/codegen/kotlin/KspComponentProcessorTest.java +++ b/javatests/dagger/internal/codegen/kotlin/KspComponentProcessorTest.java @@ -79,14 +79,14 @@ public void emptyComponentTest() throws Exception { " }", "", " public MyComponent build() {", - " return new MyComponentImpl();", + " return new Impl();", " }", " }", "", - " private static final class MyComponentImpl implements MyComponent {", - " private final MyComponentImpl myComponentImpl = this;", + " private static final class Impl implements MyComponent {", + " private final Impl impl = this;", "", - " MyComponentImpl() {", + " Impl() {", "", "", " }", @@ -185,14 +185,14 @@ public void injectBindingComponentTest() throws Exception { " }", "", " public MyComponent build() {", - " return new MyComponentImpl();", + " return new Impl();", " }", " }", "", - " private static final class MyComponentImpl implements MyComponent {", - " private final MyComponentImpl myComponentImpl = this;", + " private static final class Impl implements MyComponent {", + " private final Impl impl = this;", "", - " MyComponentImpl() {", + " Impl() {", "", "", " }", @@ -270,16 +270,16 @@ public void injectBindingWithProvidersComponentTest() throws Exception { " }", "", " public MyComponent build() {", - " return new MyComponentImpl();", + " return new Impl();", " }", " }", "", - " private static final class MyComponentImpl implements MyComponent {", - " private final MyComponentImpl myComponentImpl = this;", + " private static final class Impl implements MyComponent {", + " private final Impl impl = this;", "", " Provider fooProvider;", "", - " MyComponentImpl() {", + " Impl() {", "", " initialize();", "", @@ -383,16 +383,16 @@ public void moduleProvidesBindingTest() throws Exception { " if (myModule == null) {", " this.myModule = new MyModule();", " }", - " return new MyComponentImpl(myModule);", + " return new Impl(myModule);", " }", " }", "", - " private static final class MyComponentImpl implements MyComponent {", + " private static final class Impl implements MyComponent {", " private final MyModule myModule;", "", - " private final MyComponentImpl myComponentImpl = this;", + " private final Impl impl = this;", "", - " MyComponentImpl(MyModule myModuleParam) {", + " Impl(MyModule myModuleParam) {", " this.myModule = myModuleParam;", "", " }", @@ -492,16 +492,16 @@ public void membersInjectionMethodTest() throws Exception { " if (myModule == null) {", " this.myModule = new MyModule();", " }", - " return new MyComponentImpl(myModule);", + " return new Impl(myModule);", " }", " }", "", - " private static final class MyComponentImpl implements MyComponent {", + " private static final class Impl implements MyComponent {", " private final MyModule myModule;", "", - " private final MyComponentImpl myComponentImpl = this;", + " private final Impl impl = this;", "", - " MyComponentImpl(MyModule myModuleParam) {", + " Impl(MyModule myModuleParam) {", " this.myModule = myModuleParam;", "", " }", @@ -607,16 +607,16 @@ public void membersInjectionTest() throws Exception { " if (myModule == null) {", " this.myModule = new MyModule();", " }", - " return new MyComponentImpl(myModule);", + " return new Impl(myModule);", " }", " }", "", - " private static final class MyComponentImpl implements MyComponent {", + " private static final class Impl implements MyComponent {", " private final MyModule myModule;", "", - " private final MyComponentImpl myComponentImpl = this;", + " private final Impl impl = this;", "", - " MyComponentImpl(MyModule myModuleParam) {", + " Impl(MyModule myModuleParam) {", " this.myModule = myModuleParam;", "", " }",