Branch:
refs/heads/moe_writing_branch_from_76be88e8140f77a25824f5deb67bb13b8e5dabc6
Home: https://github.com/google/guice
Commit: 9040306545ddd134a8b0ebe97a21b581cc3df962
https://github.com/google/guice/commit/9040306545ddd134a8b0ebe97a21b581cc3df962
Author: Sam Berlin <[email protected]>
Date: 2014-07-09 (Wed, 09 Jul 2014)
Changed paths:
M
extensions/multibindings/src/com/google/inject/multibindings/OptionalBinder.java
M
extensions/multibindings/test/com/google/inject/multibindings/OptionalBinderTest.java
M
extensions/multibindings/test/com/google/inject/multibindings/SpiUtils.java
Log Message:
-----------
Simplify OptionalBinder implementation to not delegate to a MapBinder.
Instead, bind directly to annotated @Actual/@Default keys. This is in
preparation for future improvements.
This contains two logical changes:
1) The error message for duplicate actual/default bindings is now the default
Guice message, instead of a custom thing in MapBinder.
2) getDependencies now returns the live dependency (either the actual or the
default, not both). Also, Optional<Provider<T>> continues to return a dep to
Provider<T>, but Optional<T> returns a dep of T directly.
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=70734332
Commit: 8f89a23e16435f81bd4e083185f2f2c5a520f954
https://github.com/google/guice/commit/8f89a23e16435f81bd4e083185f2f2c5a520f954
Author: Sam Berlin <[email protected]>
Date: 2014-07-09 (Wed, 09 Jul 2014)
Changed paths:
M
extensions/multibindings/src/com/google/inject/multibindings/OptionalBinder.java
M
extensions/multibindings/test/com/google/inject/multibindings/OptionalBinderTest.java
M
extensions/multibindings/test/com/google/inject/multibindings/SpiUtils.java
Log Message:
-----------
Automated g4 rollback of changelist 70734332.
*** Reason for rollback ***
Broke a project.
*** Original change description ***
Simplify OptionalBinder implementation to not delegate to a MapBinder.
Instead, bind directly to annotated @Actual/@Default keys. This is in
preparation for future improvements.
This contains two logical changes:
1) The error message for duplicate actual/default bindings is now the default
Guice message, instead of a custom thing in MapBinder.
2) getDependencies now returns the live dependency (either the actual or the
default, not both). Also, Optional<Provider<T>> continues to return a de...
***
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=70738452
Commit: c66f08e3d6798e88f35be51679854568f337e7eb
https://github.com/google/guice/commit/c66f08e3d6798e88f35be51679854568f337e7eb
Author: Sam Berlin <[email protected]>
Date: 2014-07-09 (Wed, 09 Jul 2014)
Changed paths:
M
extensions/multibindings/src/com/google/inject/multibindings/OptionalBinder.java
M
extensions/multibindings/test/com/google/inject/multibindings/OptionalBinderTest.java
M
extensions/multibindings/test/com/google/inject/multibindings/SpiUtils.java
Log Message:
-----------
Automated g4 rollback of changelist 70738452.
*** Reason for rollback ***
Fix projects that were doing dependency analysis by returning a dependency on
the Injector when run on raw Elements (instead of a dependency on
@Actual+@Default, even though we didn't know which would really exist).
*** Original change description ***
Automated g4 rollback of changelist 70734332.
*** Reason for rollback ***
Broke a project.
*** Original change description ***
Simplify OptionalBinder implementation to not delegate to a MapBinder.
Instead, bind directly to annotated @Actual/@Default keys. This is in
preparation for future improvements.
This contains two logical changes:
1) The error message for duplicate actual/default bindings is now the default
Guice message, instead of a custom thing in MapBinder.
2) getDependencies now...
***
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=70742247
Commit: 6ae9ff6c662e979efea1c5f7195c47ef5715b20a
https://github.com/google/guice/commit/6ae9ff6c662e979efea1c5f7195c47ef5715b20a
Author: Sam Berlin <[email protected]>
Date: 2014-07-09 (Wed, 09 Jul 2014)
Changed paths:
M core/test/com/google/inject/internal/WeakKeySetTest.java
M
extensions/multibindings/test/com/google/inject/multibindings/MapBinderTest.java
M
extensions/multibindings/test/com/google/inject/multibindings/OptionalBinderTest.java
M
extensions/multibindings/test/com/google/inject/multibindings/WeakKeySetUtils.java
Log Message:
-----------
Wrap GcFinalization usage around wrappers that also await a ReferenceQueue. I
couldn't get any failures internally in 10,000 runs even w/o these changes, but
on the external builds I reliably reproduced some flakes in 100 runs w/o this,
and no flakes (that I saw) afterwards.
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=70835114
Commit: 842f351c4b2b3b0a90d9f3bcf164d8fd19aede6c
https://github.com/google/guice/commit/842f351c4b2b3b0a90d9f3bcf164d8fd19aede6c
Author: Sam Berlin <[email protected]>
Date: 2014-07-09 (Wed, 09 Jul 2014)
Changed paths:
M
extensions/multibindings/src/com/google/inject/multibindings/OptionalBinder.java
M
extensions/multibindings/test/com/google/inject/multibindings/OptionalBinderTest.java
M
extensions/multibindings/test/com/google/inject/multibindings/SpiUtils.java
Log Message:
-----------
Add support for OptionalBinder to link to normal bindings of that type if
neither setDefault nor setBinding are called. From the javadoc, example:
* <pre><code>
* public class FrameworkModule extends AbstractModule {
* protected void configure() {
* OptionalBinder.newOptionalBinder(binder(), Renamer.class);
* }
* }</code></pre>
*
* <p>With this module, an {@link Optional}{@code <Renamer>} can now be
* injected. With no other bindings, the optional will be absent.
* Users can specify bindings in one of two ways:
*
* <p>Option 1:
* <pre><code>
* public class UserRenamerModule extends AbstractModule {
* protected void configure() {
* bind(Renamer.class).to(ReplacingRenamer.class);
* }
* }</code></pre>
*
* <p>or Option 2:
* <pre><code>
* public class UserRenamerModule extends AbstractModule {
* protected void configure() {
* OptionalBinder.newOptionalBinder(binder(), Renamer.class)
* .setBinding().to(ReplacingRenamer.class);
* }
* }</code></pre>
* With both options, the {@code Optional<Renamer>} will be present and supply
the
* ReplacingRenamer.
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=70835975
Commit: 94d0a151d43b4f32fdcc6a598ba9edc3ca7c254f
https://github.com/google/guice/commit/94d0a151d43b4f32fdcc6a598ba9edc3ca7c254f
Author: Sam Berlin <[email protected]>
Date: 2014-07-09 (Wed, 09 Jul 2014)
Changed paths:
M
extensions/assistedinject/test/com/google/inject/assistedinject/ExtensionSpiTest.java
Log Message:
-----------
More flake fixing: don't assume methods come in a certain order. Super
strange
that this one never really flaked for us. (It immediately flaked after I added
runs_per_test..)
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=70836577
Compare: https://github.com/google/guice/compare/9040306545dd^...94d0a151d43b
--
You received this message because you are subscribed to the Google Groups
"google-guice-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To post to this group, send email to [email protected].
Visit this group at http://groups.google.com/group/google-guice-dev.
For more options, visit https://groups.google.com/d/optout.
