Updated Branches: refs/heads/master e6bba5acb -> 06d11b1c0
Address Checkstyle violations Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/commit/06d11b1c Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/tree/06d11b1c Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/diff/06d11b1c Branch: refs/heads/master Commit: 06d11b1c0ee25b5e939a8b8a20b289c3618d0941 Parents: e6bba5a Author: Andrew Gaul <[email protected]> Authored: Sun Dec 1 23:19:24 2013 -0800 Committer: Andrew Gaul <[email protected]> Committed: Sun Dec 1 23:22:47 2013 -0800 ---------------------------------------------------------------------- .../compute/GoogleComputeEngineService.java | 3 ++- .../compute/GoogleComputeEngineServiceAdapter.java | 5 +++-- .../GoogleComputeEngineServiceContextModule.java | 4 ++-- .../GoogleComputeEngineSecurityGroupExtension.java | 9 +++++---- ...teNodesWithGroupEncodedIntoNameThenAddToSet.java | 3 ++- .../config/GoogleComputeEngineHttpApiModule.java | 16 ++++++++-------- .../googlecomputeengine/domain/Metadata.java | 2 +- .../jclouds/googlecomputeengine/domain/Quota.java | 2 +- .../functions/CreateNetworkIfNeeded.java | 5 +++-- .../handlers/FirewallBinder.java | 2 +- .../googlecomputeengine/handlers/RouteBinder.java | 2 +- .../jclouds/oauth/v2/domain/TokenRequestFormat.java | 6 +++--- .../v2/functions/OAuthCredentialsSupplier.java | 2 +- 13 files changed, 33 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/06d11b1c/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineService.java ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineService.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineService.java index ebb93f5..9b68282 100644 --- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineService.java +++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineService.java @@ -74,6 +74,7 @@ import com.google.common.base.Optional; import com.google.common.base.Predicate; import com.google.common.base.Supplier; import com.google.common.collect.Sets; +import com.google.common.util.concurrent.Atomics; import com.google.common.util.concurrent.ListeningExecutorService; /** @@ -179,7 +180,7 @@ public class GoogleComputeEngineService extends BaseComputeService { } } - AtomicReference<Operation> operation = new AtomicReference<Operation>(api.getNetworkApiForProject(project.get()).delete(resourceName)); + AtomicReference<Operation> operation = Atomics.newReference(api.getNetworkApiForProject(project.get()).delete(resourceName)); retry(operationDonePredicate, operationCompleteCheckTimeout, operationCompleteCheckInterval, MILLISECONDS).apply(operation); http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/06d11b1c/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineServiceAdapter.java ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineServiceAdapter.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineServiceAdapter.java index ecc2e63..f4495c0 100644 --- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineServiceAdapter.java +++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineServiceAdapter.java @@ -69,6 +69,7 @@ import com.google.common.base.Supplier; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; +import com.google.common.util.concurrent.Atomics; import com.google.common.util.concurrent.UncheckedTimeoutException; import com.google.inject.Inject; @@ -154,7 +155,7 @@ public class GoogleComputeEngineServiceAdapter implements ComputeServiceAdapter< } // some times the newly created instances are not immediately returned - AtomicReference<Instance> instance = new AtomicReference<Instance>(); + AtomicReference<Instance> instance = Atomics.newReference(); retry(new Predicate<AtomicReference<Instance>>() { @Override @@ -336,7 +337,7 @@ public class GoogleComputeEngineServiceAdapter implements ComputeServiceAdapter< } private void waitOperationDone(Operation operation) { - AtomicReference<Operation> operationRef = new AtomicReference<Operation>(operation); + AtomicReference<Operation> operationRef = Atomics.newReference(operation); // wait for the operation to complete if (!retryOperationDonePredicate.apply(operationRef)) { http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/06d11b1c/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/config/GoogleComputeEngineServiceContextModule.java ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/config/GoogleComputeEngineServiceContextModule.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/config/GoogleComputeEngineServiceContextModule.java index df50b19..071e402 100644 --- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/config/GoogleComputeEngineServiceContextModule.java +++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/config/GoogleComputeEngineServiceContextModule.java @@ -209,7 +209,7 @@ public class GoogleComputeEngineServiceContextModule public Supplier<Map<URI, ? extends Location>> provideZones( AtomicReference<AuthorizationException> authException, final GoogleComputeEngineApi api, final Function<Zone, Location> zoneToLocation, - final @UserProject Supplier<String> userProject, + @UserProject final Supplier<String> userProject, @Named(PROPERTY_SESSION_INTERVAL) long seconds) { return MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier.create(authException, new Supplier<Map<URI, ? extends Location>>() { @@ -233,7 +233,7 @@ public class GoogleComputeEngineServiceContextModule public Supplier<Map<URI, Region>> provideRegions( AtomicReference<AuthorizationException> authException, final GoogleComputeEngineApi api, - final @UserProject Supplier<String> userProject, + @UserProject final Supplier<String> userProject, @Named(PROPERTY_SESSION_INTERVAL) long seconds) { return MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier.create(authException, new Supplier<Map<URI, Region>>() { http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/06d11b1c/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/extensions/GoogleComputeEngineSecurityGroupExtension.java ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/extensions/GoogleComputeEngineSecurityGroupExtension.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/extensions/GoogleComputeEngineSecurityGroupExtension.java index 71557bb..7656c76 100644 --- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/extensions/GoogleComputeEngineSecurityGroupExtension.java +++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/extensions/GoogleComputeEngineSecurityGroupExtension.java @@ -60,6 +60,7 @@ import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import com.google.common.collect.Multimap; +import com.google.common.util.concurrent.Atomics; /** * An extension to compute service to allow for the manipulation of {@link org.jclouds.compute.domain.SecurityGroup}s. Implementation @@ -175,7 +176,7 @@ public class GoogleComputeEngineSecurityGroupExtension implements SecurityGroupE FluentIterable<Firewall> fws = api.getFirewallApiForProject(userProject.get()).list(options).concat(); for (Firewall fw : fws) { - AtomicReference<Operation> operation = new AtomicReference<Operation>(api.getFirewallApiForProject(userProject.get()) + AtomicReference<Operation> operation = Atomics.newReference(api.getFirewallApiForProject(userProject.get()) .delete(fw.getName())); retry(operationDonePredicate, operationCompleteCheckTimeout, operationCompleteCheckInterval, @@ -184,7 +185,7 @@ public class GoogleComputeEngineSecurityGroupExtension implements SecurityGroupE checkState(!operation.get().getHttpError().isPresent(), "Could not delete firewall, operation failed" + operation); } - AtomicReference<Operation> operation = new AtomicReference<Operation>( + AtomicReference<Operation> operation = Atomics.newReference( api.getNetworkApiForProject(userProject.get()).delete(id)); retry(operationDonePredicate, operationCompleteCheckTimeout, operationCompleteCheckInterval, @@ -226,7 +227,7 @@ public class GoogleComputeEngineSecurityGroupExtension implements SecurityGroupE } fwOptions.addAllowedRule(ruleBuilder.build()); - AtomicReference<Operation> operation = new AtomicReference<Operation>(api.getFirewallApiForProject(userProject + AtomicReference<Operation> operation = Atomics.newReference(api.getFirewallApiForProject(userProject .get()).createInNetwork( uniqueFwName, group.getUri(), @@ -269,7 +270,7 @@ public class GoogleComputeEngineSecurityGroupExtension implements SecurityGroupE for (Firewall fw : fws) { if (equalsIpPermission(ipPermission).apply(fw)) { - AtomicReference<Operation> operation = new AtomicReference<Operation>(api.getFirewallApiForProject(userProject.get()) + AtomicReference<Operation> operation = Atomics.newReference(api.getFirewallApiForProject(userProject.get()) .delete(fw.getName())); retry(operationDonePredicate, operationCompleteCheckTimeout, operationCompleteCheckInterval, http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/06d11b1c/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/strategy/CreateNodesWithGroupEncodedIntoNameThenAddToSet.java ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/strategy/CreateNodesWithGroupEncodedIntoNameThenAddToSet.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/strategy/CreateNodesWithGroupEncodedIntoNameThenAddToSet.java index 52d807c..d09e417 100644 --- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/strategy/CreateNodesWithGroupEncodedIntoNameThenAddToSet.java +++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/strategy/CreateNodesWithGroupEncodedIntoNameThenAddToSet.java @@ -57,6 +57,7 @@ import com.google.common.cache.LoadingCache; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Multimap; import com.google.common.collect.Sets; +import com.google.common.util.concurrent.Atomics; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; @@ -166,7 +167,7 @@ public class CreateNodesWithGroupEncodedIntoNameThenAddToSet extends .sourceTags(templateOptions.getTags()) .sourceRanges(of(DEFAULT_INTERNAL_NETWORK_RANGE, EXTERIOR_RANGE)) .targetTags(ImmutableSet.of(name)); - AtomicReference<Operation> operation = new AtomicReference<Operation>(firewallApi.createInNetwork( + AtomicReference<Operation> operation = Atomics.newReference(firewallApi.createInNetwork( firewallOptions.getName(), network.getSelfLink(), firewallOptions)); http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/06d11b1c/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/config/GoogleComputeEngineHttpApiModule.java ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/config/GoogleComputeEngineHttpApiModule.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/config/GoogleComputeEngineHttpApiModule.java index bbf10f0..10e68e6 100644 --- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/config/GoogleComputeEngineHttpApiModule.java +++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/config/GoogleComputeEngineHttpApiModule.java @@ -123,8 +123,8 @@ public class GoogleComputeEngineHttpApiModule extends HttpApiModule<GoogleComput @Provides @Singleton @Named("machineTypeToURI") - public Function<String, URI> provideMachineTypeNameToURIFunction(final @Provider Supplier<URI> endpoint, - final @UserProject Supplier<String> userProject) { + public Function<String, URI> provideMachineTypeNameToURIFunction(@Provider final Supplier<URI> endpoint, + @UserProject final Supplier<String> userProject) { return new Function<String, URI>() { @Override public URI apply(String input) { @@ -139,8 +139,8 @@ public class GoogleComputeEngineHttpApiModule extends HttpApiModule<GoogleComput @Provides @Singleton @Named("networkToURI") - public Function<String, URI> provideNetworkNameToURIFunction(final @Provider Supplier<URI> endpoint, - final @UserProject Supplier<String> userProject) { + public Function<String, URI> provideNetworkNameToURIFunction(@Provider final Supplier<URI> endpoint, + @UserProject final Supplier<String> userProject) { return new Function<String, URI>() { @Override public URI apply(String input) { @@ -153,8 +153,8 @@ public class GoogleComputeEngineHttpApiModule extends HttpApiModule<GoogleComput @Provides @Singleton @Named("zoneToURI") - public Function<String, URI> provideZoneNameToURIFunction(final @Provider Supplier<URI> endpoint, - final @UserProject Supplier<String> userProject) { + public Function<String, URI> provideZoneNameToURIFunction(@Provider final Supplier<URI> endpoint, + @UserProject final Supplier<String> userProject) { return new Function<String, URI>() { @Override public URI apply(String input) { @@ -167,8 +167,8 @@ public class GoogleComputeEngineHttpApiModule extends HttpApiModule<GoogleComput @Provides @Singleton @Named("regionToURI") - public Function<String, URI> provideRegionNameToURIFunction(final @Provider Supplier<URI> endpoint, - final @UserProject Supplier<String> userProject) { + public Function<String, URI> provideRegionNameToURIFunction(@Provider final Supplier<URI> endpoint, + @UserProject final Supplier<String> userProject) { return new Function<String, URI>() { @Override public URI apply(String input) { http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/06d11b1c/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Metadata.java ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Metadata.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Metadata.java index 66c6636..e81e94e 100644 --- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Metadata.java +++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Metadata.java @@ -137,4 +137,4 @@ public class Metadata { .items(in.getItems()); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/06d11b1c/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Quota.java ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Quota.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Quota.java index 9aec605..7b036a0 100644 --- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Quota.java +++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Quota.java @@ -149,4 +149,4 @@ public class Quota { return new Builder().metric(quota.getMetric()).usage(quota.getUsage()).limit(quota.getLimit()); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/06d11b1c/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/functions/CreateNetworkIfNeeded.java ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/functions/CreateNetworkIfNeeded.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/functions/CreateNetworkIfNeeded.java index 15057db..4323013 100644 --- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/functions/CreateNetworkIfNeeded.java +++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/functions/CreateNetworkIfNeeded.java @@ -41,6 +41,7 @@ import org.jclouds.logging.Logger; import com.google.common.base.Function; import com.google.common.base.Predicate; import com.google.common.base.Supplier; +import com.google.common.util.concurrent.Atomics; /** * @author Andrew Bayer @@ -82,14 +83,14 @@ public class CreateNetworkIfNeeded implements Function<NetworkAndAddressRange, N } if (input.getGateway().isPresent()) { - AtomicReference<Operation> operation = new AtomicReference<Operation>(api.getNetworkApiForProject(userProject + AtomicReference<Operation> operation = Atomics.newReference(api.getNetworkApiForProject(userProject .get()).createInIPv4RangeWithGateway(input.getName(), input.getIpV4Range(), input.getGateway().get())); retry(operationDonePredicate, operationCompleteCheckTimeout, operationCompleteCheckInterval, MILLISECONDS).apply(operation); checkState(!operation.get().getHttpError().isPresent(), "Could not create network, operation failed" + operation); } else { - AtomicReference<Operation> operation = new AtomicReference<Operation>(api.getNetworkApiForProject(userProject + AtomicReference<Operation> operation = Atomics.newReference(api.getNetworkApiForProject(userProject .get()).createInIPv4Range(input.getName(), input.getIpV4Range())); retry(operationDonePredicate, operationCompleteCheckTimeout, operationCompleteCheckInterval, MILLISECONDS).apply(operation); http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/06d11b1c/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/handlers/FirewallBinder.java ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/handlers/FirewallBinder.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/handlers/FirewallBinder.java index 6c3b8b8..902fbd7 100644 --- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/handlers/FirewallBinder.java +++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/handlers/FirewallBinder.java @@ -56,4 +56,4 @@ public class FirewallBinder implements MapBinder { public <R extends HttpRequest> R bindToRequest(R request, Object input) { return jsonBinder.bindToRequest(request, input); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/06d11b1c/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/handlers/RouteBinder.java ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/handlers/RouteBinder.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/handlers/RouteBinder.java index e4a1232..aa89410 100644 --- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/handlers/RouteBinder.java +++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/handlers/RouteBinder.java @@ -56,4 +56,4 @@ public class RouteBinder implements MapBinder { public <R extends HttpRequest> R bindToRequest(R request, Object input) { return jsonBinder.bindToRequest(request, input); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/06d11b1c/oauth/src/main/java/org/jclouds/oauth/v2/domain/TokenRequestFormat.java ---------------------------------------------------------------------- diff --git a/oauth/src/main/java/org/jclouds/oauth/v2/domain/TokenRequestFormat.java b/oauth/src/main/java/org/jclouds/oauth/v2/domain/TokenRequestFormat.java index 7364561..25925e4 100644 --- a/oauth/src/main/java/org/jclouds/oauth/v2/domain/TokenRequestFormat.java +++ b/oauth/src/main/java/org/jclouds/oauth/v2/domain/TokenRequestFormat.java @@ -33,15 +33,15 @@ public interface TokenRequestFormat { /** * Transforms the provided HttpRequest into a particular token request with a specific format. */ - public <R extends HttpRequest> R formatRequest(R httpRequest, TokenRequest tokenRequest); + <R extends HttpRequest> R formatRequest(R httpRequest, TokenRequest tokenRequest); /** * The name of the type of the token request, e.g., "JWT" */ - public String getTypeName(); + String getTypeName(); /** * The claims that must be present in the token request for it to be valid. */ - public Set<String> requiredClaims(); + Set<String> requiredClaims(); } http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/06d11b1c/oauth/src/main/java/org/jclouds/oauth/v2/functions/OAuthCredentialsSupplier.java ---------------------------------------------------------------------- diff --git a/oauth/src/main/java/org/jclouds/oauth/v2/functions/OAuthCredentialsSupplier.java b/oauth/src/main/java/org/jclouds/oauth/v2/functions/OAuthCredentialsSupplier.java index 68476ce..e204e8f 100644 --- a/oauth/src/main/java/org/jclouds/oauth/v2/functions/OAuthCredentialsSupplier.java +++ b/oauth/src/main/java/org/jclouds/oauth/v2/functions/OAuthCredentialsSupplier.java @@ -115,7 +115,7 @@ public class OAuthCredentialsSupplier implements Supplier<OAuthCredentials> { } catch (UncheckedExecutionException e) { Throwable authorizationException = getFirstThrowableOfType(e, AuthorizationException.class); if (authorizationException != null) { - throw ((AuthorizationException) authorizationException); + throw (AuthorizationException) authorizationException; } throw propagate(e); }
