forked from square/dagger
-
Notifications
You must be signed in to change notification settings - Fork 2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix an issue where a scoped @BINDS used in a cycle would cause an NPE…
… on component creation. RELNOTES=Fix an issue where a scoped @BINDS used in a cycle would cause an NPE on component creation. PiperOrigin-RevId: 507636194
- Loading branch information
1 parent
85a2cb2
commit fae46c7
Showing
23 changed files
with
1,466 additions
and
31 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| /* | ||
| * Copyright (C) 2023 The Dagger Authors. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package dagger.functional.binds; | ||
|
|
||
| import static com.google.common.truth.Truth.assertThat; | ||
|
|
||
| import dagger.Binds; | ||
| import dagger.Component; | ||
| import dagger.Module; | ||
| import javax.inject.Inject; | ||
| import javax.inject.Provider; | ||
| import javax.inject.Singleton; | ||
| import org.junit.Test; | ||
| import org.junit.runner.RunWith; | ||
| import org.junit.runners.JUnit4; | ||
|
|
||
| // This is a regression test for b/267223822 where a scoped @Binds used in a cycle caused problems | ||
| // in fastInit mode. | ||
| @RunWith(JUnit4.class) | ||
| public class RecursiveBindsTest { | ||
|
|
||
| public interface Foo {} | ||
|
|
||
| public static final class FooImpl implements Foo { | ||
| @Inject FooImpl(@SuppressWarnings("unused") Provider<Foo> provider) {} | ||
| } | ||
|
|
||
| @Module | ||
| public interface FooModule { | ||
| // This binding must be scoped to create the cycle. Otherwise without a scope, the generated | ||
| // code just doesn't have a field for this @Binds because we can directly use FooImpl's | ||
| // provider as they are equivalent. | ||
| @Binds | ||
| @Singleton | ||
| Foo bindFoo(FooImpl impl); | ||
| } | ||
|
|
||
| @Component(modules = FooModule.class) | ||
| @Singleton | ||
| public interface TestSingletonComponent { | ||
| // We get the impl here to create a cycle where the impl factory needs to be delegated. | ||
| // That way the scoped binds (which does something like DoubleCheck.provider(implFactory)) is | ||
| // the one that would fail if it wasn't delegated properly. | ||
| Provider<FooImpl> getFooImplProvider(); | ||
| } | ||
|
|
||
| @Test | ||
| public void test() { | ||
| // Technically the NPE would happen when just initializing the component. | ||
| assertThat(DaggerRecursiveBindsTest_TestSingletonComponent.create().getFooImplProvider().get()) | ||
| .isNotNull(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
63 changes: 63 additions & 0 deletions
63
javatests/dagger/functional/kotlinsrc/binds/RecursiveBindsTest.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| /* | ||
| * Copyright (C) 2023 The Dagger Authors. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package dagger.functional.kotlinsrc.binds | ||
|
|
||
| import com.google.common.truth.Truth.assertThat | ||
| import dagger.Binds | ||
| import dagger.Component | ||
| import dagger.Module | ||
| import javax.inject.Inject | ||
| import javax.inject.Provider | ||
| import javax.inject.Singleton | ||
| import org.junit.Test | ||
| import org.junit.runner.RunWith | ||
| import org.junit.runners.JUnit4 | ||
|
|
||
| // This is a regression test for b/267223822 where a scoped @Binds used in a cycle caused problems | ||
| // in fastInit mode. | ||
| @RunWith(JUnit4::class) | ||
| class RecursiveBindsTest { | ||
|
|
||
| interface Foo {} | ||
|
|
||
| class FooImpl internal @Inject constructor(@SuppressWarnings("unused") provider: Provider<Foo>) : | ||
| Foo {} | ||
|
|
||
| @Module | ||
| interface FooModule { | ||
| // This binding must be scoped to create the cycle. Otherwise without a scope, the generated | ||
| // code just doesn't have a field for this @Binds because we can directly use FooImpl's | ||
| // provider as they are equivalent. | ||
| @Binds @Singleton fun bindFoo(impl: FooImpl): Foo | ||
| } | ||
|
|
||
| @Component(modules = FooModule::class) | ||
| @Singleton | ||
| interface TestSingletonComponent { | ||
| // We get the impl here to create a cycle where the impl factory needs to be delegated. | ||
| // That way the scoped binds (which does something like DoubleCheck.provider(implFactory)) is | ||
| // the one that would fail if it wasn't delegated properly. | ||
| fun getFooImplProvider(): Provider<FooImpl> | ||
| } | ||
|
|
||
| @Test | ||
| fun test() { | ||
| // Technically the NPE would happen when just initializing the component. | ||
| assertThat(DaggerRecursiveBindsTest_TestSingletonComponent.create().getFooImplProvider().get()) | ||
| .isNotNull() | ||
| } | ||
| } |
Oops, something went wrong.