Repository: jclouds Updated Branches: refs/heads/master d45f08e82 -> edde72193
http://git-wip-us.apache.org/repos/asf/jclouds/blob/edde7219/compute/src/main/java/org/jclouds/compute/config/ComputeServiceAdapterContextModule.java ---------------------------------------------------------------------- diff --git a/compute/src/main/java/org/jclouds/compute/config/ComputeServiceAdapterContextModule.java b/compute/src/main/java/org/jclouds/compute/config/ComputeServiceAdapterContextModule.java index 343ed0d..a6f0f4d 100644 --- a/compute/src/main/java/org/jclouds/compute/config/ComputeServiceAdapterContextModule.java +++ b/compute/src/main/java/org/jclouds/compute/config/ComputeServiceAdapterContextModule.java @@ -76,7 +76,7 @@ public class ComputeServiceAdapterContextModule<N, H, I, L> extends BaseComputeS @Provides @Singleton - protected LocationsSupplier supplyLocationsFromComputeServiceAdapter( + protected final LocationsSupplier supplyLocationsFromComputeServiceAdapter( final ComputeServiceAdapter<N, H, I, L> adapter, final Function<L, Location> transformer) { return new LocationsSupplier() { @Override @@ -93,7 +93,7 @@ public class ComputeServiceAdapterContextModule<N, H, I, L> extends BaseComputeS @Provides @Singleton - protected Supplier<Set<? extends Hardware>> provideHardware(final ComputeServiceAdapter<N, H, I, L> adapter, + protected final Supplier<Set<? extends Hardware>> provideHardware(final ComputeServiceAdapter<N, H, I, L> adapter, final Function<H, Hardware> transformer) { return new Supplier<Set<? extends Hardware>>() { @Override @@ -113,7 +113,7 @@ public class ComputeServiceAdapterContextModule<N, H, I, L> extends BaseComputeS @Provides @Singleton - protected Supplier<Set<? extends Image>> provideImages(final ComputeServiceAdapter<N, H, I, L> adapter, + protected final Supplier<Set<? extends Image>> provideImages(final ComputeServiceAdapter<N, H, I, L> adapter, final Function<I, Image> transformer, final AddDefaultCredentialsToImage addDefaultCredentialsToImage) { return new Supplier<Set<? extends Image>>() { @Override @@ -152,50 +152,50 @@ public class ComputeServiceAdapterContextModule<N, H, I, L> extends BaseComputeS @Provides @Singleton - protected CreateNodeWithGroupEncodedIntoName defineAddNodeWithTagStrategy( + protected final CreateNodeWithGroupEncodedIntoName defineAddNodeWithTagStrategy( AdaptingComputeServiceStrategies<N, H, I, L> in) { return in; } @Provides @Singleton - protected DestroyNodeStrategy defineDestroyNodeStrategy(AdaptingComputeServiceStrategies<N, H, I, L> in) { + protected final DestroyNodeStrategy defineDestroyNodeStrategy(AdaptingComputeServiceStrategies<N, H, I, L> in) { return in; } @Provides @Singleton - protected GetNodeMetadataStrategy defineGetNodeMetadataStrategy(AdaptingComputeServiceStrategies<N, H, I, L> in) { + protected final GetNodeMetadataStrategy defineGetNodeMetadataStrategy(AdaptingComputeServiceStrategies<N, H, I, L> in) { return in; } @Provides @Singleton - protected GetImageStrategy defineGetImageStrategy(AdaptingComputeServiceStrategies<N, H, I, L> in) { + protected final GetImageStrategy defineGetImageStrategy(AdaptingComputeServiceStrategies<N, H, I, L> in) { return in; } @Provides @Singleton - protected ListNodesStrategy defineListNodesStrategy(AdaptingComputeServiceStrategies<N, H, I, L> in) { + protected final ListNodesStrategy defineListNodesStrategy(AdaptingComputeServiceStrategies<N, H, I, L> in) { return in; } @Provides @Singleton - protected RebootNodeStrategy defineRebootNodeStrategy(AdaptingComputeServiceStrategies<N, H, I, L> in) { + protected final RebootNodeStrategy defineRebootNodeStrategy(AdaptingComputeServiceStrategies<N, H, I, L> in) { return in; } @Provides @Singleton - protected ResumeNodeStrategy defineStartNodeStrategy(AdaptingComputeServiceStrategies<N, H, I, L> in) { + protected final ResumeNodeStrategy defineStartNodeStrategy(AdaptingComputeServiceStrategies<N, H, I, L> in) { return in; } @Provides @Singleton - protected SuspendNodeStrategy defineStopNodeStrategy(AdaptingComputeServiceStrategies<N, H, I, L> in) { + protected final SuspendNodeStrategy defineStopNodeStrategy(AdaptingComputeServiceStrategies<N, H, I, L> in) { return in; } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/edde7219/compute/src/main/java/org/jclouds/compute/config/ComputeServiceTimeoutsModule.java ---------------------------------------------------------------------- diff --git a/compute/src/main/java/org/jclouds/compute/config/ComputeServiceTimeoutsModule.java b/compute/src/main/java/org/jclouds/compute/config/ComputeServiceTimeoutsModule.java index f452ce8..9634d1e 100644 --- a/compute/src/main/java/org/jclouds/compute/config/ComputeServiceTimeoutsModule.java +++ b/compute/src/main/java/org/jclouds/compute/config/ComputeServiceTimeoutsModule.java @@ -54,6 +54,11 @@ public class ComputeServiceTimeoutsModule extends AbstractModule { @Provides @Singleton @Named(TIMEOUT_NODE_RUNNING) + protected final Predicate<AtomicReference<NodeMetadata>> provideNodeRunning(AtomicNodeRunning statusRunning, Timeouts timeouts, + PollPeriod period) { + return nodeRunning(statusRunning, timeouts, period); + } + protected Predicate<AtomicReference<NodeMetadata>> nodeRunning(AtomicNodeRunning statusRunning, Timeouts timeouts, PollPeriod period) { return timeouts.nodeRunning == 0 ? statusRunning : RetryablePredicateGuardingNull.create(statusRunning, @@ -63,6 +68,11 @@ public class ComputeServiceTimeoutsModule extends AbstractModule { @Provides @Singleton @Named(TIMEOUT_NODE_TERMINATED) + protected final Predicate<AtomicReference<NodeMetadata>> provideServerTerminated(AtomicNodeTerminated statusTerminated, + Timeouts timeouts, PollPeriod period) { + return serverTerminated(statusTerminated, timeouts, period); + } + protected Predicate<AtomicReference<NodeMetadata>> serverTerminated(AtomicNodeTerminated statusTerminated, Timeouts timeouts, PollPeriod period) { return timeouts.nodeTerminated == 0 ? statusTerminated : retry(statusTerminated, timeouts.nodeTerminated, @@ -72,6 +82,11 @@ public class ComputeServiceTimeoutsModule extends AbstractModule { @Provides @Singleton @Named(TIMEOUT_NODE_SUSPENDED) + protected final Predicate<AtomicReference<NodeMetadata>> provideserverSuspended(AtomicNodeSuspended statusSuspended, + Timeouts timeouts, PollPeriod period) { + return serverSuspended(statusSuspended, timeouts, period); + } + protected Predicate<AtomicReference<NodeMetadata>> serverSuspended(AtomicNodeSuspended statusSuspended, Timeouts timeouts, PollPeriod period) { return timeouts.nodeSuspended == 0 ? statusSuspended : RetryablePredicateGuardingNull.create(statusSuspended, @@ -81,6 +96,10 @@ public class ComputeServiceTimeoutsModule extends AbstractModule { @Provides @Singleton @Named(TIMEOUT_SCRIPT_COMPLETE) + protected final Predicate<CommandUsingClient> provideRunScriptRunning(ScriptStatusReturnsZero statusRunning, Timeouts timeouts) { + return runScriptRunning(statusRunning, timeouts); + } + protected Predicate<CommandUsingClient> runScriptRunning(ScriptStatusReturnsZero statusRunning, Timeouts timeouts) { return timeouts.scriptComplete == 0 ? not(statusRunning) : retry(not(statusRunning), timeouts.scriptComplete); } @@ -88,7 +107,7 @@ public class ComputeServiceTimeoutsModule extends AbstractModule { @Provides @Singleton @Named(TIMEOUT_IMAGE_AVAILABLE) - protected Predicate<AtomicReference<Image>> imageAvailable(AtomicImageAvailable statusAvailable, Timeouts timeouts, + protected final Predicate<AtomicReference<Image>> imageAvailable(AtomicImageAvailable statusAvailable, Timeouts timeouts, PollPeriod period) { return timeouts.imageAvailable == 0 ? statusAvailable : retry(statusAvailable, timeouts.imageAvailable, period.pollInitialPeriod, period.pollMaxPeriod); @@ -97,7 +116,7 @@ public class ComputeServiceTimeoutsModule extends AbstractModule { @Provides @Singleton @Named(TIMEOUT_IMAGE_DELETED) - protected Predicate<AtomicReference<Image>> serverDeleted(AtomicImageDeleted statusDeleted, Timeouts timeouts, + protected final Predicate<AtomicReference<Image>> serverDeleted(AtomicImageDeleted statusDeleted, Timeouts timeouts, PollPeriod period) { return timeouts.imageDeleted == 0 ? statusDeleted : retry(statusDeleted, timeouts.imageDeleted, period.pollInitialPeriod, period.pollMaxPeriod); http://git-wip-us.apache.org/repos/asf/jclouds/blob/edde7219/compute/src/main/java/org/jclouds/compute/stub/config/StubComputeServiceDependenciesModule.java ---------------------------------------------------------------------- diff --git a/compute/src/main/java/org/jclouds/compute/stub/config/StubComputeServiceDependenciesModule.java b/compute/src/main/java/org/jclouds/compute/stub/config/StubComputeServiceDependenciesModule.java index 2077f71..aea242f 100644 --- a/compute/src/main/java/org/jclouds/compute/stub/config/StubComputeServiceDependenciesModule.java +++ b/compute/src/main/java/org/jclouds/compute/stub/config/StubComputeServiceDependenciesModule.java @@ -72,7 +72,7 @@ public class StubComputeServiceDependenciesModule extends AbstractModule { @Provides @Singleton - protected ConcurrentMap<String, NodeMetadata> provideNodesForIdentity(@Provider Supplier<Credentials> creds) + protected final ConcurrentMap<String, NodeMetadata> provideNodesForIdentity(@Provider Supplier<Credentials> creds) throws ExecutionException { return backing.get(creds.get().identity); } @@ -89,7 +89,7 @@ public class StubComputeServiceDependenciesModule extends AbstractModule { @Provides @Singleton - protected ConcurrentMap<String, SecurityGroup> provideGroups(@Provider Supplier<Credentials> creds) + protected final ConcurrentMap<String, SecurityGroup> provideGroups(@Provider Supplier<Credentials> creds) throws ExecutionException { return groupBacking.get(creds.get().identity); } @@ -106,7 +106,7 @@ public class StubComputeServiceDependenciesModule extends AbstractModule { @Provides @Singleton - protected Multimap<String, SecurityGroup> provideGroupsForNode(@Provider Supplier<Credentials> creds) + protected final Multimap<String, SecurityGroup> provideGroupsForNode(@Provider Supplier<Credentials> creds) throws ExecutionException { return groupsForNodeBacking.get(creds.get().identity); } @@ -123,7 +123,7 @@ public class StubComputeServiceDependenciesModule extends AbstractModule { @Provides @Named("NODE_ID") - protected Integer provideNodeIdForIdentity(@Provider Supplier<Credentials> creds) throws ExecutionException { + protected final Integer provideNodeIdForIdentity(@Provider Supplier<Credentials> creds) throws ExecutionException { return nodeIds.get(creds.get().identity).incrementAndGet(); } @@ -139,34 +139,34 @@ public class StubComputeServiceDependenciesModule extends AbstractModule { @Provides @Named("GROUP_ID") - protected Integer provideGroupIdForIdentity(@Provider Supplier<Credentials> creds) throws ExecutionException { + protected final Integer provideGroupIdForIdentity(@Provider Supplier<Credentials> creds) throws ExecutionException { return groupIds.get(creds.get().identity).incrementAndGet(); } @Singleton @Provides @Named("PUBLIC_IP_PREFIX") - String publicIpPrefix() { + final String publicIpPrefix() { return "144.175.1."; } @Singleton @Provides @Named("PRIVATE_IP_PREFIX") - String privateIpPrefix() { + final String privateIpPrefix() { return "10.1.1."; } @Singleton @Provides @Named("PASSWORD_PREFIX") - String passwordPrefix() { + final String passwordPrefix() { return "password"; } @Singleton @Provides - SocketOpen socketOpen(StubSocketOpen in) { + final SocketOpen socketOpen(StubSocketOpen in) { return in; } http://git-wip-us.apache.org/repos/asf/jclouds/blob/edde7219/core/src/main/java/org/jclouds/concurrent/config/ExecutorServiceModule.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/concurrent/config/ExecutorServiceModule.java b/core/src/main/java/org/jclouds/concurrent/config/ExecutorServiceModule.java index 9e0e81d..a78411c 100644 --- a/core/src/main/java/org/jclouds/concurrent/config/ExecutorServiceModule.java +++ b/core/src/main/java/org/jclouds/concurrent/config/ExecutorServiceModule.java @@ -112,14 +112,14 @@ public class ExecutorServiceModule extends AbstractModule { @Provides @Singleton - TimeLimiter timeLimiter(@Named(PROPERTY_USER_THREADS) ListeningExecutorService userExecutor) { + final TimeLimiter timeLimiter(@Named(PROPERTY_USER_THREADS) ListeningExecutorService userExecutor) { return new SimpleTimeLimiter(userExecutor); } @Provides @Singleton @Named(PROPERTY_USER_THREADS) - ListeningExecutorService provideListeningUserExecutorService(@Named(PROPERTY_USER_THREADS) int count, Closer closer) { // NO_UCD + final ListeningExecutorService provideListeningUserExecutorService(@Named(PROPERTY_USER_THREADS) int count, Closer closer) { // NO_UCD if (userExecutorFromConstructor != null) return userExecutorFromConstructor; return shutdownOnClose(WithSubmissionTrace.wrap(newThreadPoolNamed("user thread %d", count)), closer); @@ -128,7 +128,7 @@ public class ExecutorServiceModule extends AbstractModule { @Provides @Singleton @Named(PROPERTY_USER_THREADS) - ExecutorService provideUserExecutorService(@Named(PROPERTY_USER_THREADS) ListeningExecutorService in) { // NO_UCD + final ExecutorService provideUserExecutorService(@Named(PROPERTY_USER_THREADS) ListeningExecutorService in) { // NO_UCD return in; } http://git-wip-us.apache.org/repos/asf/jclouds/blob/edde7219/core/src/main/java/org/jclouds/concurrent/config/ScheduledExecutorServiceModule.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/concurrent/config/ScheduledExecutorServiceModule.java b/core/src/main/java/org/jclouds/concurrent/config/ScheduledExecutorServiceModule.java index ae92154..3f5f4af 100644 --- a/core/src/main/java/org/jclouds/concurrent/config/ScheduledExecutorServiceModule.java +++ b/core/src/main/java/org/jclouds/concurrent/config/ScheduledExecutorServiceModule.java @@ -48,7 +48,7 @@ public class ScheduledExecutorServiceModule extends AbstractModule { @Provides @Singleton @Named(PROPERTY_SCHEDULER_THREADS) - ListeningScheduledExecutorService provideListeningScheduledExecutorService( + final ListeningScheduledExecutorService provideListeningScheduledExecutorService( @Named(PROPERTY_SCHEDULER_THREADS) int count, Closer closer) { return shutdownOnClose(WithSubmissionTrace.wrap(newScheduledThreadPoolNamed("scheduler thread %d", count)), closer); @@ -57,7 +57,7 @@ public class ScheduledExecutorServiceModule extends AbstractModule { @Provides @Singleton @Named(PROPERTY_SCHEDULER_THREADS) - ScheduledExecutorService provideScheduledExecutor( + final ScheduledExecutorService provideScheduledExecutor( @Named(PROPERTY_SCHEDULER_THREADS) ListeningScheduledExecutorService in) { return in; } http://git-wip-us.apache.org/repos/asf/jclouds/blob/edde7219/core/src/main/java/org/jclouds/events/config/EventBusModule.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/events/config/EventBusModule.java b/core/src/main/java/org/jclouds/events/config/EventBusModule.java index cf412c7..84ab8d9 100644 --- a/core/src/main/java/org/jclouds/events/config/EventBusModule.java +++ b/core/src/main/java/org/jclouds/events/config/EventBusModule.java @@ -50,7 +50,7 @@ public class EventBusModule extends AbstractModule { */ @Provides @Singleton - AsyncEventBus provideAsyncEventBus(@Named(PROPERTY_USER_THREADS) ListeningExecutorService userExecutor, + final AsyncEventBus provideAsyncEventBus(@Named(PROPERTY_USER_THREADS) ListeningExecutorService userExecutor, DeadEventLoggingHandler deadEventsHandler) {// NO_UCD AsyncEventBus asyncBus = new AsyncEventBus("jclouds-async-event-bus", userExecutor); asyncBus.register(deadEventsHandler); @@ -62,7 +62,7 @@ public class EventBusModule extends AbstractModule { */ @Provides @Singleton - EventBus provideSyncEventBus(DeadEventLoggingHandler deadEventsHandler) { // NO_UCD + final EventBus provideSyncEventBus(DeadEventLoggingHandler deadEventsHandler) { // NO_UCD EventBus syncBus = new EventBus("jclouds-sync-event-bus"); syncBus.register(deadEventsHandler); return syncBus; http://git-wip-us.apache.org/repos/asf/jclouds/blob/edde7219/core/src/main/java/org/jclouds/http/functions/config/SaxParserModule.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/http/functions/config/SaxParserModule.java b/core/src/main/java/org/jclouds/http/functions/config/SaxParserModule.java index 5e8d845..c2705d9 100644 --- a/core/src/main/java/org/jclouds/http/functions/config/SaxParserModule.java +++ b/core/src/main/java/org/jclouds/http/functions/config/SaxParserModule.java @@ -68,7 +68,7 @@ public class SaxParserModule extends AbstractModule { @Provides @Singleton - SAXParserFactory provideSAXParserFactory() { + final SAXParserFactory provideSAXParserFactory() { SAXParserFactory factory = SAXParserFactory.newInstance(); factory.setNamespaceAware(false); factory.setValidating(false); http://git-wip-us.apache.org/repos/asf/jclouds/blob/edde7219/core/src/main/java/org/jclouds/json/config/GsonModule.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/json/config/GsonModule.java b/core/src/main/java/org/jclouds/json/config/GsonModule.java index 934541b..7b8bd0c 100644 --- a/core/src/main/java/org/jclouds/json/config/GsonModule.java +++ b/core/src/main/java/org/jclouds/json/config/GsonModule.java @@ -87,7 +87,7 @@ public class GsonModule extends AbstractModule { @SuppressWarnings("rawtypes") @Provides @Singleton - Gson provideGson(TypeAdapter<JsonBall> jsonAdapter, DateAdapter adapter, ByteListAdapter byteListAdapter, + final Gson provideGson(TypeAdapter<JsonBall> jsonAdapter, DateAdapter adapter, ByteListAdapter byteListAdapter, ByteArrayAdapter byteArrayAdapter, PropertiesAdapter propertiesAdapter, JsonAdapterBindings bindings, CredentialsAdapterFactory credentialsAdapterFactory, OptionalTypeAdapterFactory optional, SetTypeAdapterFactory set, ImmutableSetTypeAdapterFactory immutableSet, MapTypeAdapterFactory map, @@ -165,7 +165,7 @@ public class GsonModule extends AbstractModule { @Provides @Singleton - protected TypeAdapter<JsonBall> provideJsonBallAdapter(NullHackJsonBallAdapter in) { + protected final TypeAdapter<JsonBall> provideJsonBallAdapter(NullHackJsonBallAdapter in) { return in; } http://git-wip-us.apache.org/repos/asf/jclouds/blob/edde7219/core/src/main/java/org/jclouds/location/config/LocationModule.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/location/config/LocationModule.java b/core/src/main/java/org/jclouds/location/config/LocationModule.java index a117c9b..d8c5de3 100644 --- a/core/src/main/java/org/jclouds/location/config/LocationModule.java +++ b/core/src/main/java/org/jclouds/location/config/LocationModule.java @@ -75,7 +75,7 @@ public class LocationModule extends AbstractModule { @Provides @Singleton @Iso3166 - protected Supplier<Map<String, Supplier<Set<String>>>> isoCodesSupplier( + protected final Supplier<Map<String, Supplier<Set<String>>>> isoCodesSupplier( AtomicReference<AuthorizationException> authException, @Named(PROPERTY_SESSION_INTERVAL) long seconds, LocationIdToIso3166CodesSupplier uncached) { return MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier.create(authException, uncached, seconds, @@ -85,7 +85,7 @@ public class LocationModule extends AbstractModule { @Provides @Singleton @Provider - protected Supplier<URI> provideProvider(AtomicReference<AuthorizationException> authException, + protected final Supplier<URI> provideProvider(AtomicReference<AuthorizationException> authException, @Named(PROPERTY_SESSION_INTERVAL) long seconds, ProviderURISupplier uncached) { return MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier.create(authException, uncached, seconds, TimeUnit.SECONDS); @@ -93,7 +93,7 @@ public class LocationModule extends AbstractModule { @Provides @Singleton - protected Supplier<Location> implicitLocationSupplier(AtomicReference<AuthorizationException> authException, + protected final Supplier<Location> implicitLocationSupplier(AtomicReference<AuthorizationException> authException, @Named(PROPERTY_SESSION_INTERVAL) long seconds, ImplicitLocationSupplier uncached) { return MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier.create(authException, uncached, seconds, TimeUnit.SECONDS); @@ -103,7 +103,7 @@ public class LocationModule extends AbstractModule { @Singleton // TODO: we should eventually get rid of memoized as an annotation, as it is confusing @Memoized - protected Supplier<Set<? extends Location>> memoizedLocationsSupplier( + protected final Supplier<Set<? extends Location>> memoizedLocationsSupplier( AtomicReference<AuthorizationException> authException, @Named(PROPERTY_SESSION_INTERVAL) long seconds, LocationsSupplier uncached) { return MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier.create(authException, uncached, seconds, @@ -113,7 +113,7 @@ public class LocationModule extends AbstractModule { @Provides @Singleton @Region - protected Supplier<Set<String>> regionIdsSupplier(AtomicReference<AuthorizationException> authException, + protected final Supplier<Set<String>> regionIdsSupplier(AtomicReference<AuthorizationException> authException, @Named(PROPERTY_SESSION_INTERVAL) long seconds, RegionIdFilter filter, RegionIdsSupplier uncached) { return MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier.create(authException, Suppliers.compose(new FilterStrings(filter), uncached), seconds, TimeUnit.SECONDS); @@ -122,7 +122,7 @@ public class LocationModule extends AbstractModule { @Provides @Singleton @Zone - protected Supplier<Set<String>> zoneIdsSupplier( + protected final Supplier<Set<String>> zoneIdsSupplier( AtomicReference<AuthorizationException> authException, @Named(PROPERTY_SESSION_INTERVAL) long seconds, ZoneIdFilter filter, ZoneIdsSupplier uncached) { return MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier.create(authException, @@ -152,7 +152,7 @@ public class LocationModule extends AbstractModule { @Provides @Singleton @Region - protected Supplier<Map<String, Supplier<URI>>> regionIdToURISupplier( + protected final Supplier<Map<String, Supplier<URI>>> regionIdToURISupplier( AtomicReference<AuthorizationException> authException, @Named(PROPERTY_SESSION_INTERVAL) long seconds, RegionIdToURISupplier uncached) { return MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier.create(authException, uncached, seconds, @@ -162,7 +162,7 @@ public class LocationModule extends AbstractModule { @Provides @Singleton @Region - protected Supplier<String> implicitRegionIdSupplier(AtomicReference<AuthorizationException> authException, + protected final Supplier<String> implicitRegionIdSupplier(AtomicReference<AuthorizationException> authException, @Named(PROPERTY_SESSION_INTERVAL) long seconds, ImplicitRegionIdSupplier uncached) { return MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier.create(authException, uncached, seconds, TimeUnit.SECONDS); @@ -172,7 +172,7 @@ public class LocationModule extends AbstractModule { @Provides @Singleton @Zone - protected Supplier<Map<String, Supplier<Set<String>>>> regionIdToZoneIdsSupplier( + protected final Supplier<Map<String, Supplier<Set<String>>>> regionIdToZoneIdsSupplier( AtomicReference<AuthorizationException> authException, @Named(PROPERTY_SESSION_INTERVAL) long seconds, RegionIdToZoneIdsSupplier uncached) { return MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier.create(authException, uncached, seconds, @@ -182,7 +182,7 @@ public class LocationModule extends AbstractModule { @Provides @Singleton @Zone - protected Supplier<Map<String, Supplier<URI>>> zoneIdToURISupplier( + protected final Supplier<Map<String, Supplier<URI>>> zoneIdToURISupplier( AtomicReference<AuthorizationException> authException, @Named(PROPERTY_SESSION_INTERVAL) long seconds, ZoneIdToURISupplier uncached) { return MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier.create(authException, uncached, seconds, http://git-wip-us.apache.org/repos/asf/jclouds/blob/edde7219/core/src/main/java/org/jclouds/logging/config/LoggingModule.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/logging/config/LoggingModule.java b/core/src/main/java/org/jclouds/logging/config/LoggingModule.java index 1d791a2..5d50f73 100644 --- a/core/src/main/java/org/jclouds/logging/config/LoggingModule.java +++ b/core/src/main/java/org/jclouds/logging/config/LoggingModule.java @@ -38,7 +38,7 @@ public abstract class LoggingModule extends AbstractModule { @Provides @Singleton public final Logger.LoggerFactory provideLoggerFactory() { - return createLoggerFactory(); + return createLoggerFactory(); } public abstract Logger.LoggerFactory createLoggerFactory(); http://git-wip-us.apache.org/repos/asf/jclouds/blob/edde7219/core/src/main/java/org/jclouds/rest/config/CredentialStoreModule.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/rest/config/CredentialStoreModule.java b/core/src/main/java/org/jclouds/rest/config/CredentialStoreModule.java index 180d89d..cd5481a 100644 --- a/core/src/main/java/org/jclouds/rest/config/CredentialStoreModule.java +++ b/core/src/main/java/org/jclouds/rest/config/CredentialStoreModule.java @@ -104,7 +104,7 @@ public class CredentialStoreModule extends AbstractModule { @Provides @Singleton - protected Map<String, Credentials> provideCredentialStore(Map<String, ByteSource> backing, + protected final Map<String, Credentials> provideCredentialStore(Map<String, ByteSource> backing, Function<Credentials, ByteSource> credentialsSerializer, Function<ByteSource, Credentials> credentialsDeserializer) { return new TransformingMap<String, ByteSource, Credentials>(backing, credentialsDeserializer, http://git-wip-us.apache.org/repos/asf/jclouds/blob/edde7219/drivers/apachehc/src/main/java/org/jclouds/http/apachehc/config/ApacheHCHttpCommandExecutorServiceModule.java ---------------------------------------------------------------------- diff --git a/drivers/apachehc/src/main/java/org/jclouds/http/apachehc/config/ApacheHCHttpCommandExecutorServiceModule.java b/drivers/apachehc/src/main/java/org/jclouds/http/apachehc/config/ApacheHCHttpCommandExecutorServiceModule.java index c568508..00f23f4 100644 --- a/drivers/apachehc/src/main/java/org/jclouds/http/apachehc/config/ApacheHCHttpCommandExecutorServiceModule.java +++ b/drivers/apachehc/src/main/java/org/jclouds/http/apachehc/config/ApacheHCHttpCommandExecutorServiceModule.java @@ -74,7 +74,7 @@ public class ApacheHCHttpCommandExecutorServiceModule extends AbstractModule { @Singleton @Provides - HttpParams newBasicHttpParams(HttpUtils utils) { + final HttpParams newBasicHttpParams(HttpUtils utils) { BasicHttpParams params = new BasicHttpParams(); params.setIntParameter(CoreConnectionPNames.SOCKET_BUFFER_SIZE, 8 * 1024).setBooleanParameter( @@ -102,14 +102,14 @@ public class ApacheHCHttpCommandExecutorServiceModule extends AbstractModule { @Singleton @Provides - X509HostnameVerifier newHostnameVerifier(HttpUtils utils) { + final X509HostnameVerifier newHostnameVerifier(HttpUtils utils) { return utils.relaxHostname() ? SSLSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER : SSLSocketFactory.STRICT_HOSTNAME_VERIFIER; } @Singleton @Provides - SSLContext newSSLContext(HttpUtils utils, @Named("untrusted") Supplier<SSLContext> untrustedSSLContextProvider) + final SSLContext newSSLContext(HttpUtils utils, @Named("untrusted") Supplier<SSLContext> untrustedSSLContextProvider) throws NoSuchAlgorithmException, KeyManagementException { if (utils.trustAllCerts()) return untrustedSSLContextProvider.get(); @@ -121,7 +121,7 @@ public class ApacheHCHttpCommandExecutorServiceModule extends AbstractModule { @Singleton @Provides - ClientConnectionManager newClientConnectionManager(HttpParams params, X509HostnameVerifier verifier, + final ClientConnectionManager newClientConnectionManager(HttpParams params, X509HostnameVerifier verifier, SSLContext context, Closer closer) throws NoSuchAlgorithmException, KeyManagementException { SchemeRegistry schemeRegistry = new SchemeRegistry(); @@ -143,7 +143,7 @@ public class ApacheHCHttpCommandExecutorServiceModule extends AbstractModule { @Provides @Singleton - HttpClient newDefaultHttpClient(ProxyConfig config, BasicHttpParams params, ClientConnectionManager cm) { + final HttpClient newDefaultHttpClient(ProxyConfig config, BasicHttpParams params, ClientConnectionManager cm) { DefaultHttpClient client = new DefaultHttpClient(cm, params); if (config.useSystem()) { ProxySelectorRoutePlanner routePlanner = new ProxySelectorRoutePlanner(client.getConnectionManager() http://git-wip-us.apache.org/repos/asf/jclouds/blob/edde7219/drivers/gae/src/main/java/org/jclouds/gae/config/CurrentRequestExecutorServiceModule.java ---------------------------------------------------------------------- diff --git a/drivers/gae/src/main/java/org/jclouds/gae/config/CurrentRequestExecutorServiceModule.java b/drivers/gae/src/main/java/org/jclouds/gae/config/CurrentRequestExecutorServiceModule.java index 70c8f19..1554390 100644 --- a/drivers/gae/src/main/java/org/jclouds/gae/config/CurrentRequestExecutorServiceModule.java +++ b/drivers/gae/src/main/java/org/jclouds/gae/config/CurrentRequestExecutorServiceModule.java @@ -99,7 +99,7 @@ public class CurrentRequestExecutorServiceModule extends AbstractModule { @Provides @Singleton @Named(Constants.PROPERTY_USER_THREADS) - protected ListeningExecutorService userExecutor() { + protected final ListeningExecutorService userExecutor() { return memoizedCurrentRequestExecutorService.get(); } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/edde7219/drivers/gae/src/main/java/org/jclouds/gae/config/GoogleAppEngineConfigurationModule.java ---------------------------------------------------------------------- diff --git a/drivers/gae/src/main/java/org/jclouds/gae/config/GoogleAppEngineConfigurationModule.java b/drivers/gae/src/main/java/org/jclouds/gae/config/GoogleAppEngineConfigurationModule.java index e991951..30facce 100644 --- a/drivers/gae/src/main/java/org/jclouds/gae/config/GoogleAppEngineConfigurationModule.java +++ b/drivers/gae/src/main/java/org/jclouds/gae/config/GoogleAppEngineConfigurationModule.java @@ -80,7 +80,7 @@ public class GoogleAppEngineConfigurationModule extends AbstractModule { } @Provides - protected URLFetchService provideURLFetchService() { + protected final URLFetchService provideURLFetchService() { return URLFetchServiceFactory.getURLFetchService(); } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/edde7219/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/config/AWSEC2ComputeServiceContextModule.java ---------------------------------------------------------------------- diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/config/AWSEC2ComputeServiceContextModule.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/config/AWSEC2ComputeServiceContextModule.java index cde8e59..4d3d6c9 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/config/AWSEC2ComputeServiceContextModule.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/config/AWSEC2ComputeServiceContextModule.java @@ -124,6 +124,11 @@ public class AWSEC2ComputeServiceContextModule extends BaseComputeServiceContext // duplicates EC2ComputeServiceContextModule; but that's easiest thing to do with guice; could extract to common util @Provides @Singleton + protected final Supplier<CacheLoader<RegionAndName, Image>> guiceProvideRegionAndNameToImageSupplierCacheLoader( + final RegionAndIdToImage delegate) { + return provideRegionAndNameToImageSupplierCacheLoader(delegate); + } + protected Supplier<CacheLoader<RegionAndName, Image>> provideRegionAndNameToImageSupplierCacheLoader( final RegionAndIdToImage delegate) { return Suppliers.<CacheLoader<RegionAndName, Image>>ofInstance(new CacheLoader<RegionAndName, Image>() { @@ -149,7 +154,7 @@ public class AWSEC2ComputeServiceContextModule extends BaseComputeServiceContext @Provides @Singleton - protected Supplier<LoadingCache<RegionAndName, ? extends Image>> provideRegionAndNameToImageSupplierCache( + protected final Supplier<LoadingCache<RegionAndName, ? extends Image>> provideRegionAndNameToImageSupplierCache( final RegionAndNameToImageSupplier supplier) { return supplier; } http://git-wip-us.apache.org/repos/asf/jclouds/blob/edde7219/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/config/AWSEC2ComputeServiceDependenciesModule.java ---------------------------------------------------------------------- diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/config/AWSEC2ComputeServiceDependenciesModule.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/config/AWSEC2ComputeServiceDependenciesModule.java index 5a32459..4e2dacf 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/config/AWSEC2ComputeServiceDependenciesModule.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/config/AWSEC2ComputeServiceDependenciesModule.java @@ -119,7 +119,7 @@ public class AWSEC2ComputeServiceDependenciesModule extends EC2ComputeServiceDep @Provides @Singleton @ImageQuery - protected Map<String, String> imageQuery(ValueOfConfigurationKeyOrNull config) { + protected final Map<String, String> imageQuery(ValueOfConfigurationKeyOrNull config) { String amiQuery = Strings.emptyToNull(config.apply(PROPERTY_EC2_AMI_QUERY)); String owners = config.apply(PROPERTY_EC2_AMI_OWNERS); if ("".equals(owners)) { @@ -147,28 +147,28 @@ public class AWSEC2ComputeServiceDependenciesModule extends EC2ComputeServiceDep @Provides @Singleton @Named("AVAILABLE") - protected Predicate<PlacementGroup> placementGroupAvailable(PlacementGroupAvailable available) { + protected final Predicate<PlacementGroup> placementGroupAvailable(PlacementGroupAvailable available) { return retry(available, 60, 1, SECONDS); } @Provides @Singleton @Named("DELETED") - protected Predicate<PlacementGroup> placementGroupDeleted(PlacementGroupDeleted deleted) { + protected final Predicate<PlacementGroup> placementGroupDeleted(PlacementGroupDeleted deleted) { return retry(deleted, 60, 1, SECONDS); } @Provides @Singleton @Named("PLACEMENT") - protected LoadingCache<RegionAndName, String> placementGroupMap(CreatePlacementGroupIfNeeded in) { + protected final LoadingCache<RegionAndName, String> placementGroupMap(CreatePlacementGroupIfNeeded in) { return CacheBuilder.newBuilder().build(in); } @Provides @ClusterCompute @Singleton - protected Set<String> provideClusterComputeIds() { + protected final Set<String> provideClusterComputeIds() { return Sets.newLinkedHashSet(); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/edde7219/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/config/AWSEC2HttpApiModule.java ---------------------------------------------------------------------- diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/config/AWSEC2HttpApiModule.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/config/AWSEC2HttpApiModule.java index d025fc7..c162c2f 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/config/AWSEC2HttpApiModule.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/config/AWSEC2HttpApiModule.java @@ -57,25 +57,25 @@ public class AWSEC2HttpApiModule extends BaseEC2HttpApiModule<AWSEC2Api> { @Singleton @Provides - EC2Api provide(AWSEC2Api in) { + final EC2Api provide(AWSEC2Api in) { return in; } @Singleton @Provides - InstanceApi getInstanceApi(AWSEC2Api in) { + final InstanceApi getInstanceApi(AWSEC2Api in) { return in.getInstanceApi().get(); } @Singleton @Provides - SecurityGroupApi getSecurityGroupApi(AWSEC2Api in) { + final SecurityGroupApi getSecurityGroupApi(AWSEC2Api in) { return in.getSecurityGroupApi().get(); } @Singleton @Provides - AMIApi getAMIApi(AWSEC2Api in) { + final AMIApi getAMIApi(AWSEC2Api in) { return in.getAMIApi().get(); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/edde7219/providers/aws-s3/src/main/java/org/jclouds/aws/s3/config/AWSS3HttpApiModule.java ---------------------------------------------------------------------- diff --git a/providers/aws-s3/src/main/java/org/jclouds/aws/s3/config/AWSS3HttpApiModule.java b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/config/AWSS3HttpApiModule.java index dea5438..d9338e6 100644 --- a/providers/aws-s3/src/main/java/org/jclouds/aws/s3/config/AWSS3HttpApiModule.java +++ b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/config/AWSS3HttpApiModule.java @@ -63,7 +63,7 @@ public class AWSS3HttpApiModule extends S3HttpApiModule<AWSS3Client> { @Singleton @Provides - S3Client provide(AWSS3Client in) { + final S3Client provide(AWSS3Client in) { return in; } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/edde7219/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/config/AzureBlobStoreContextModule.java ---------------------------------------------------------------------- diff --git a/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/config/AzureBlobStoreContextModule.java b/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/config/AzureBlobStoreContextModule.java index 9721617..aa5b233 100644 --- a/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/config/AzureBlobStoreContextModule.java +++ b/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/config/AzureBlobStoreContextModule.java @@ -46,7 +46,7 @@ public class AzureBlobStoreContextModule extends AbstractModule { @Provides @Singleton - protected LoadingCache<String, PublicAccess> containerAcls(final AzureBlobClient client) { + protected final LoadingCache<String, PublicAccess> containerAcls(final AzureBlobClient client) { return CacheBuilder.newBuilder().expireAfterWrite(30, TimeUnit.SECONDS).build( new CacheLoader<String, PublicAccess>() { @Override http://git-wip-us.apache.org/repos/asf/jclouds/blob/edde7219/providers/azureblob/src/main/java/org/jclouds/azureblob/config/AzureBlobHttpApiModule.java ---------------------------------------------------------------------- diff --git a/providers/azureblob/src/main/java/org/jclouds/azureblob/config/AzureBlobHttpApiModule.java b/providers/azureblob/src/main/java/org/jclouds/azureblob/config/AzureBlobHttpApiModule.java index 52a4195..18365e1 100644 --- a/providers/azureblob/src/main/java/org/jclouds/azureblob/config/AzureBlobHttpApiModule.java +++ b/providers/azureblob/src/main/java/org/jclouds/azureblob/config/AzureBlobHttpApiModule.java @@ -17,8 +17,6 @@ package org.jclouds.azureblob.config; import static org.jclouds.Constants.PROPERTY_SESSION_INTERVAL; -import static org.jclouds.json.config.GsonModule.DateAdapter; -import static org.jclouds.json.config.GsonModule.Iso8601DateAdapter; import java.util.concurrent.TimeUnit; @@ -34,6 +32,8 @@ import org.jclouds.http.HttpRetryHandler; import org.jclouds.http.annotation.ClientError; import org.jclouds.http.annotation.Redirection; import org.jclouds.http.annotation.ServerError; +import org.jclouds.json.config.GsonModule.DateAdapter; +import org.jclouds.json.config.GsonModule.Iso8601DateAdapter; import org.jclouds.rest.ConfiguresHttpApi; import org.jclouds.rest.config.HttpApiModule; @@ -56,6 +56,10 @@ public class AzureBlobHttpApiModule extends HttpApiModule<AzureBlobClient> { @Provides @TimeStamp + protected final String guiceProvideTimeStamp(@TimeStamp Supplier<String> cache) { + return provideTimeStamp(cache); + } + protected String provideTimeStamp(@TimeStamp Supplier<String> cache) { return cache.get(); } @@ -68,6 +72,7 @@ public class AzureBlobHttpApiModule extends HttpApiModule<AzureBlobClient> { protected Supplier<String> provideTimeStampCache(@Named(PROPERTY_SESSION_INTERVAL) long seconds, final DateService dateService) { return Suppliers.memoizeWithExpiration(new Supplier<String>() { + @Override public String get() { return dateService.rfc822DateFormat(); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/edde7219/providers/azureblob/src/main/java/org/jclouds/azureblob/config/AzureBlobModule.java ---------------------------------------------------------------------- diff --git a/providers/azureblob/src/main/java/org/jclouds/azureblob/config/AzureBlobModule.java b/providers/azureblob/src/main/java/org/jclouds/azureblob/config/AzureBlobModule.java index 8f54632..ffd4832 100644 --- a/providers/azureblob/src/main/java/org/jclouds/azureblob/config/AzureBlobModule.java +++ b/providers/azureblob/src/main/java/org/jclouds/azureblob/config/AzureBlobModule.java @@ -54,7 +54,7 @@ public class AzureBlobModule extends AbstractModule { } @Provides - AzureBlob provideAzureBlob(AzureBlob.Factory factory) { + final AzureBlob provideAzureBlob(AzureBlob.Factory factory) { return factory.create(null); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/edde7219/providers/dynect/src/main/java/org/jclouds/dynect/v3/config/DynECTParserModule.java ---------------------------------------------------------------------- diff --git a/providers/dynect/src/main/java/org/jclouds/dynect/v3/config/DynECTParserModule.java b/providers/dynect/src/main/java/org/jclouds/dynect/v3/config/DynECTParserModule.java index c676180..d047f6b 100644 --- a/providers/dynect/src/main/java/org/jclouds/dynect/v3/config/DynECTParserModule.java +++ b/providers/dynect/src/main/java/org/jclouds/dynect/v3/config/DynECTParserModule.java @@ -51,7 +51,7 @@ public class DynECTParserModule extends AbstractModule { @Provides @Singleton - public Map<Type, Object> provideCustomAdapterBindings() { + public final Map<Type, Object> provideCustomAdapterBindings() { return new ImmutableMap.Builder<Type, Object>() .put(SessionCredentials.class, new SessionCredentialsTypeAdapter()) .put(GeoRegionGroup.class, new GeoRegionGroupTypeAdapter()) http://git-wip-us.apache.org/repos/asf/jclouds/blob/edde7219/providers/glesys/src/main/java/org/jclouds/glesys/config/GleSYSParserModule.java ---------------------------------------------------------------------- diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/config/GleSYSParserModule.java b/providers/glesys/src/main/java/org/jclouds/glesys/config/GleSYSParserModule.java index 8433d9f..07e395d 100644 --- a/providers/glesys/src/main/java/org/jclouds/glesys/config/GleSYSParserModule.java +++ b/providers/glesys/src/main/java/org/jclouds/glesys/config/GleSYSParserModule.java @@ -35,7 +35,7 @@ public class GleSYSParserModule extends AbstractModule { @Provides @Singleton - public Map<Type, Object> provideCustomAdapterBindings() { + public final Map<Type, Object> provideCustomAdapterBindings() { return ImmutableMap.<Type, Object>of(Server.State.class, new GleSYSTypeAdapters.ServerStateAdapter(), GleSYSBoolean.class, new GleSYSTypeAdapters.GleSYSBooleanAdapter()); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/edde7219/providers/gogrid/src/main/java/org/jclouds/gogrid/compute/config/GoGridComputeServiceContextModule.java ---------------------------------------------------------------------- diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/compute/config/GoGridComputeServiceContextModule.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/compute/config/GoGridComputeServiceContextModule.java index fc9f4d8..9ef70e3 100644 --- a/providers/gogrid/src/main/java/org/jclouds/gogrid/compute/config/GoGridComputeServiceContextModule.java +++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/compute/config/GoGridComputeServiceContextModule.java @@ -92,7 +92,7 @@ public class GoGridComputeServiceContextModule extends @Singleton @Provides - Map<ServerState, Status> toPortableNodeStatus() { + final Map<ServerState, Status> toPortableNodeStatus() { return toPortableNodeStatus; } @@ -106,7 +106,7 @@ public class GoGridComputeServiceContextModule extends @Singleton @Provides - Map<ServerImageState, Image.Status> toPortableImageStatus() { + final Map<ServerImageState, Image.Status> toPortableImageStatus() { return toPortableImageStatus; } @@ -121,7 +121,7 @@ public class GoGridComputeServiceContextModule extends */ @Singleton @Provides - Function<Hardware, String> provideSizeToRam() { + final Function<Hardware, String> provideSizeToRam() { return new Function<Hardware, String>() { @Override public String apply(Hardware hardware) { http://git-wip-us.apache.org/repos/asf/jclouds/blob/edde7219/providers/gogrid/src/main/java/org/jclouds/gogrid/config/GoGridHttpApiModule.java ---------------------------------------------------------------------- diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/config/GoGridHttpApiModule.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/config/GoGridHttpApiModule.java index 3a691b4..6ec1301 100644 --- a/providers/gogrid/src/main/java/org/jclouds/gogrid/config/GoGridHttpApiModule.java +++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/config/GoGridHttpApiModule.java @@ -47,6 +47,10 @@ public class GoGridHttpApiModule extends HttpApiModule<GoGridApi> { @Provides @TimeStamp + protected final Long guiceProvideTimeStamp(@TimeStamp Supplier<Long> cache) { + return provideTimeStamp(cache); + } + protected Long provideTimeStamp(@TimeStamp Supplier<Long> cache) { return cache.get(); } @@ -56,8 +60,9 @@ public class GoGridHttpApiModule extends HttpApiModule<GoGridApi> { */ @Provides @TimeStamp - Supplier<Long> provideTimeStampCache(@Named(PROPERTY_SESSION_INTERVAL) long seconds) { + final Supplier<Long> provideTimeStampCache(@Named(PROPERTY_SESSION_INTERVAL) long seconds) { return Suppliers.memoizeWithExpiration(new Supplier<Long>() { + @Override public Long get() { return System.currentTimeMillis() / 1000; } http://git-wip-us.apache.org/repos/asf/jclouds/blob/edde7219/providers/gogrid/src/main/java/org/jclouds/gogrid/config/GoGridParserModule.java ---------------------------------------------------------------------- diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/config/GoGridParserModule.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/config/GoGridParserModule.java index cf7ec4a..3fb8d86 100644 --- a/providers/gogrid/src/main/java/org/jclouds/gogrid/config/GoGridParserModule.java +++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/config/GoGridParserModule.java @@ -47,7 +47,7 @@ public class GoGridParserModule extends AbstractModule { @Provides @Singleton - public Map<Type, Object> provideCustomAdapterBindings() { + public final Map<Type, Object> provideCustomAdapterBindings() { Map<Type, Object> bindings = Maps.newHashMap(); bindings.put(ObjectType.class, new CustomDeserializers.ObjectTypeAdapter()); bindings.put(LoadBalancerOs.class, new CustomDeserializers.LoadBalancerOsAdapter()); http://git-wip-us.apache.org/repos/asf/jclouds/blob/edde7219/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/config/GoogleComputeEngineParserModule.java ---------------------------------------------------------------------- diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/config/GoogleComputeEngineParserModule.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/config/GoogleComputeEngineParserModule.java index a0c7fdd..43b0a87 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/config/GoogleComputeEngineParserModule.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/config/GoogleComputeEngineParserModule.java @@ -16,8 +16,6 @@ */ package org.jclouds.googlecomputeengine.config; -import static org.jclouds.googlecomputeengine.domain.Firewall.Rule; - import java.lang.reflect.Type; import java.util.Map; import java.util.Set; @@ -26,6 +24,7 @@ import javax.inject.Singleton; import org.jclouds.googlecloud.config.ListPageAdapterFactory; import org.jclouds.googlecomputeengine.domain.Firewall; +import org.jclouds.googlecomputeengine.domain.Firewall.Rule; import org.jclouds.googlecomputeengine.options.FirewallOptions; import org.jclouds.googlecomputeengine.options.RouteOptions; import org.jclouds.json.config.GsonModule; http://git-wip-us.apache.org/repos/asf/jclouds/blob/edde7219/providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/blobstore/config/HPCloudObjectStorageBlobStoreContextModule.java ---------------------------------------------------------------------- diff --git a/providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/blobstore/config/HPCloudObjectStorageBlobStoreContextModule.java b/providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/blobstore/config/HPCloudObjectStorageBlobStoreContextModule.java index a636b4d..df1960c 100644 --- a/providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/blobstore/config/HPCloudObjectStorageBlobStoreContextModule.java +++ b/providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/blobstore/config/HPCloudObjectStorageBlobStoreContextModule.java @@ -85,7 +85,7 @@ public class HPCloudObjectStorageBlobStoreContextModule extends SwiftBlobStoreCo @Provides @Singleton - protected LoadingCache<String, URI> cdnContainer(GetCDNMetadata loader) { + protected final LoadingCache<String, URI> cdnContainer(GetCDNMetadata loader) { return CacheBuilder.newBuilder().expireAfterWrite(30, TimeUnit.SECONDS).build(loader); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/edde7219/providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/config/HPCloudObjectStorageHttpApiModule.java ---------------------------------------------------------------------- diff --git a/providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/config/HPCloudObjectStorageHttpApiModule.java b/providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/config/HPCloudObjectStorageHttpApiModule.java index 01f88f1..d522f06 100644 --- a/providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/config/HPCloudObjectStorageHttpApiModule.java +++ b/providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/config/HPCloudObjectStorageHttpApiModule.java @@ -68,7 +68,7 @@ public class HPCloudObjectStorageHttpApiModule extends SwiftHttpApiModule<HPClou @Singleton @HPExtensionCDN @Nullable - protected Supplier<URI> provideCDNUrl(RegionIdToURISupplier.Factory factory, + protected final Supplier<URI> provideCDNUrl(RegionIdToURISupplier.Factory factory, @ApiVersion String apiVersion, @Named(LocationConstants.PROPERTY_REGION) String region) { @@ -81,7 +81,7 @@ public class HPCloudObjectStorageHttpApiModule extends SwiftHttpApiModule<HPClou @Singleton @Storage @Nullable - protected Supplier<URI> provideStorageUrl(RegionIdToURISupplier.Factory factory, + protected final Supplier<URI> provideStorageUrl(RegionIdToURISupplier.Factory factory, @ApiVersion String apiVersion, @Named(LocationConstants.PROPERTY_REGION) String region) { http://git-wip-us.apache.org/repos/asf/jclouds/blob/edde7219/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/config/SoftLayerComputeServiceContextModule.java ---------------------------------------------------------------------- diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/config/SoftLayerComputeServiceContextModule.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/config/SoftLayerComputeServiceContextModule.java index 89589fb..c69376e 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/config/SoftLayerComputeServiceContextModule.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/config/SoftLayerComputeServiceContextModule.java @@ -79,7 +79,7 @@ public class SoftLayerComputeServiceContextModule extends @Provides @Singleton @Memoized - public Supplier<ContainerVirtualGuestConfiguration> getCreateObjectOptions( + public final Supplier<ContainerVirtualGuestConfiguration> getCreateObjectOptions( AtomicReference<AuthorizationException> authException, @Named(PROPERTY_SESSION_INTERVAL) long seconds, final SoftLayerApi api) { return MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier.create(authException,
