Repository: jclouds Updated Branches: refs/heads/master 7b3a300d5 -> 100d1dac6
Do not override S3 provider methods Fixes Guice 4.0 support. Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/100d1dac Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/100d1dac Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/100d1dac Branch: refs/heads/master Commit: 100d1dac6cdbcab05903dd3c05c319e8645ad337 Parents: 7b3a300 Author: Andrew Gaul <[email protected]> Authored: Thu Jan 21 03:21:47 2016 -0800 Committer: Andrew Gaul <[email protected]> Committed: Thu Jan 21 10:12:19 2016 -0800 ---------------------------------------------------------------------- .../src/main/java/org/jclouds/s3/config/S3HttpApiModule.java | 7 +++++++ 1 file changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/100d1dac/apis/s3/src/main/java/org/jclouds/s3/config/S3HttpApiModule.java ---------------------------------------------------------------------- diff --git a/apis/s3/src/main/java/org/jclouds/s3/config/S3HttpApiModule.java b/apis/s3/src/main/java/org/jclouds/s3/config/S3HttpApiModule.java index e8eded5..aae98ec 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/config/S3HttpApiModule.java +++ b/apis/s3/src/main/java/org/jclouds/s3/config/S3HttpApiModule.java @@ -251,6 +251,13 @@ public class S3HttpApiModule<S extends S3Client> extends AWSHttpApiModule<S> { @Provides @TimeStamp @Singleton + protected final Supplier<Date> guiceProvideTimeStampCacheDate( + @Named(Constants.PROPERTY_SESSION_INTERVAL) long seconds, + @TimeStamp final Supplier<String> timestamp, + final DateService dateService) { + return provideTimeStampCacheDate(seconds, timestamp, dateService); + } + protected Supplier<Date> provideTimeStampCacheDate( @Named(Constants.PROPERTY_SESSION_INTERVAL) long seconds, @TimeStamp final Supplier<String> timestamp,
