[guice] Merge internal changes (#915)
6 views
Skip to first unread message
Sam Berlin
Apr 20, 2015, 8:52:59 PM4/20/15
to google/guice
Notably, this changes the singleton scope to get rid of the injector-wide lock.
You can view, comment on, or merge this pull request online at:
https://github.com/google/guice/pull/915
Commit Summary
- Add a default value and make it true for dagger & guice MapKey.
- Implement more granular locks for a Singleton scope in Guice.
File Changes
- M core/src/com/google/inject/internal/BindingProcessor.java (4)
- M core/src/com/google/inject/internal/BoundProviderFactory.java (5)
- M core/src/com/google/inject/internal/ConstructionContext.java (17)
- M core/src/com/google/inject/internal/ConstructorBindingImpl.java (4)
- M core/src/com/google/inject/internal/ConstructorInjector.java (13)
- A core/src/com/google/inject/internal/CycleDetectingLock.java (292)
- M core/src/com/google/inject/internal/DelegatingInvocationHandler.java (29)
- M core/src/com/google/inject/internal/Errors.java (3)
- M core/src/com/google/inject/internal/InheritingState.java (7)
- M core/src/com/google/inject/internal/InjectorImpl.java (51)
- M core/src/com/google/inject/internal/InternalContext.java (17)
- M core/src/com/google/inject/internal/InternalFactoryToInitializableAdapter.java (7)
- M core/src/com/google/inject/internal/ProvidedByInternalFactory.java (7)
- M core/src/com/google/inject/internal/ProviderInternalFactory.java (15)
- M core/src/com/google/inject/internal/Scoping.java (11)
- M core/src/com/google/inject/internal/SingletonScope.java (340)
- M core/src/com/google/inject/internal/State.java (6)
- M core/test/com/google/inject/ScopesTest.java (417)
- A core/test/com/google/inject/internal/CycleDetectingLockTest.java (101)
- M extensions/multibindings/src/com/google/inject/multibindings/MapKey.java (2)
Patch Links:
—
Reply to this email directly or view it on GitHub.
Sam Berlin
Apr 20, 2015, 9:03:34 PM4/20/15
to google/guice
FYI the dagger interop maven stuff is breaking due to the dagger 2.0 release. @cgruber is going to fix.
Sam Berlin
Apr 21, 2015, 10:04:33 AM4/21/15
to google/guice
OK this is all set now.
Colin Decker
Apr 21, 2015, 1:52:02 PM4/21/15
to google/guice
LGTM
Sam Berlin
Apr 21, 2015, 2:14:49 PM4/21/15
to google/guice
Merged #915.
Reply all
Reply to author
Forward
0 new messages