From 100d1dac6cdbcab05903dd3c05c319e8645ad337 Mon Sep 17 00:00:00 2001 From: Andrew Gaul Date: Thu, 21 Jan 2016 03:21:47 -0800 Subject: [PATCH] Do not override S3 provider methods Fixes Guice 4.0 support. --- .../main/java/org/jclouds/s3/config/S3HttpApiModule.java | 7 +++++++ 1 file changed, 7 insertions(+) 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 e8eded5dc0..aae98ec013 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 extends AWSHttpApiModule { @Provides @TimeStamp @Singleton + protected final Supplier guiceProvideTimeStampCacheDate( + @Named(Constants.PROPERTY_SESSION_INTERVAL) long seconds, + @TimeStamp final Supplier timestamp, + final DateService dateService) { + return provideTimeStampCacheDate(seconds, timestamp, dateService); + } + protected Supplier provideTimeStampCacheDate( @Named(Constants.PROPERTY_SESSION_INTERVAL) long seconds, @TimeStamp final Supplier timestamp,