honeymoose/jclouds
1
0
Fork 0
mirror of https://github.com/apache/jclouds.git synced 2026-09-01 00:44:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

JCLOUDS-962: Make all @Provider methods final

Browse Source
This commit is contained in:
Oliver Gondža
2015-07-17 07:05:19 +02:00
committed by Ignasi Barrera
parent 6cd716f1ea
commit edde721937
68 changed files with 321 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/openstack/src/main/java/org/jclouds/openstack/config/OpenStackAuthenticationModule.java
+16 -5
View File
@@ -59,15 +59,21 @@ public class OpenStackAuthenticationModule extends AbstractModule {
bind(HttpRetryHandler.class).annotatedWith(ClientError.class).to(RetryOnRenew.class);
}
/**
* borrowing concurrency code to ensure that caching takes place properly
*/
@Provides
@Singleton
@Authentication
protected final Supplier<String> guiceProvideAuthenticationTokenCache(final Supplier<AuthenticationResponse> supplier)
throws InterruptedException, ExecutionException, TimeoutException {
return provideAuthenticationTokenCache(supplier);
}
/**
* borrowing concurrency code to ensure that caching takes place properly
*/
protected Supplier<String> provideAuthenticationTokenCache(final Supplier<AuthenticationResponse> supplier)
throws InterruptedException, ExecutionException, TimeoutException {
return new Supplier<String>() {
@Override
public String get() {
return supplier.get().getAuthToken();
}
@@ -97,14 +103,14 @@ public class OpenStackAuthenticationModule extends AbstractModule {
@Provides
@Singleton
public LoadingCache<Credentials, AuthenticationResponse> provideAuthenticationResponseCache(
public final LoadingCache<Credentials, AuthenticationResponse> provideAuthenticationResponseCache(
GetAuthenticationResponse getAuthenticationResponse) {
return CacheBuilder.newBuilder().expireAfterWrite(23, TimeUnit.HOURS).build(getAuthenticationResponse);
}
@Provides
@Singleton
protected Supplier<AuthenticationResponse> provideAuthenticationResponseSupplier(
protected final Supplier<AuthenticationResponse> provideAuthenticationResponseSupplier(
final LoadingCache<Credentials, AuthenticationResponse> cache, @Provider final Supplier<Credentials> creds) {
return new Supplier<AuthenticationResponse>() {
@Override
@@ -117,8 +123,13 @@ public class OpenStackAuthenticationModule extends AbstractModule {
@Provides
@Singleton
@TimeStamp
protected final Supplier<Date> guiceProvideCacheBusterDate() {
return provideCacheBusterDate();
}
protected Supplier<Date> provideCacheBusterDate() {
return memoizeWithExpiration(new Supplier<Date>() {
@Override
public Date get() {
return new Date();
}
common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/config/AuthenticationServiceModule.java
+3 -3
View File
@@ -67,7 +67,7 @@ public class AuthenticationServiceModule extends AbstractModule {
@Provides
@Singleton
@Authentication
protected Supplier<String> provideAuthenticationTokenCache(final Supplier<Auth> supplier)
protected final Supplier<String> provideAuthenticationTokenCache(final Supplier<Auth> supplier)
throws InterruptedException, ExecutionException, TimeoutException {
return new Supplier<String>() {
public String get() {
@@ -99,14 +99,14 @@ public class AuthenticationServiceModule extends AbstractModule {
@Provides
@Singleton
protected LoadingCache<Credentials, Auth> provideAuthCache(GetAuth getAuth,
protected final LoadingCache<Credentials, Auth> provideAuthCache(GetAuth getAuth,
@Named(PROPERTY_SESSION_INTERVAL) long sessionInterval) {
return CacheBuilder.newBuilder().expireAfterWrite(sessionInterval, TimeUnit.SECONDS).build(getAuth);
}
@Provides
@Singleton
protected Supplier<Auth> provideAuthSupplier(final LoadingCache<Credentials, Auth> cache,
protected final Supplier<Auth> provideAuthSupplier(final LoadingCache<Credentials, Auth> cache,
@Provider final Supplier<Credentials> creds) {
return new Supplier<Auth>() {
@Override