Repository: jclouds-labs-google Updated Branches: refs/heads/master 16dc0e331 -> caf21af16
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/caf21af1 Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/tree/caf21af1 Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/diff/caf21af1 Branch: refs/heads/master Commit: caf21af166f0c619a5f9429beec9fecea4a42b49 Parents: 16dc0e3 Author: Andrew Gaul <[email protected]> Authored: Tue Jun 17 15:56:35 2014 -0700 Committer: Andrew Gaul <[email protected]> Committed: Tue Jun 17 15:56:35 2014 -0700 ---------------------------------------------------------------------- .../compute/GoogleComputeEngineServiceAdapter.java | 2 +- .../extensions/GoogleComputeEngineSecurityGroupExtension.java | 4 ++-- .../compute/functions/FirewallToIpPermission.java | 2 +- .../CreateNodesWithGroupEncodedIntoNameThenAddToSet.java | 2 +- .../java/org/jclouds/googlecomputeengine/domain/Metadata.java | 4 ++-- .../org/jclouds/googlecomputeengine/handlers/MetadataBinder.java | 2 +- .../predicates/NetworkFirewallPredicates.java | 4 ++-- .../compute/GoogleComputeEngineServiceExpectTest.java | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/caf21af1/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 998b8bf..3fdd084 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 @@ -298,7 +298,7 @@ public class GoogleComputeEngineServiceAdapter implements ComputeServiceAdapter< public InstanceInZone getNode(String name) { SlashEncodedIds slashEncodedIds = SlashEncodedIds.fromSlashEncoded(name); - Instance instance= api.getInstanceApiForProject(userProject.get()).getInZone(slashEncodedIds.getFirstId(), + Instance instance = api.getInstanceApiForProject(userProject.get()).getInZone(slashEncodedIds.getFirstId(), slashEncodedIds.getSecondId()); return instance == null ? null : new InstanceInZone(instance, slashEncodedIds.getFirstId()); http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/caf21af1/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 c3dbfd5..f1113e0 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 @@ -241,7 +241,7 @@ public class GoogleComputeEngineSecurityGroupExtension implements SecurityGroupE @Override public SecurityGroup addIpPermission(IpProtocol protocol, int fromPort, int toPort, - Multimap<String,String> tenantIdGroupNamePairs, Iterable<String> cidrBlocks, + Multimap<String, String> tenantIdGroupNamePairs, Iterable<String> cidrBlocks, Iterable<String> groupIds, SecurityGroup group) { IpPermission.Builder permBuilder = IpPermission.builder(); @@ -283,7 +283,7 @@ public class GoogleComputeEngineSecurityGroupExtension implements SecurityGroupE @Override public SecurityGroup removeIpPermission(IpProtocol protocol, int fromPort, int toPort, - Multimap<String,String> tenantIdGroupNamePairs, Iterable<String> cidrBlocks, + Multimap<String, String> tenantIdGroupNamePairs, Iterable<String> cidrBlocks, Iterable<String> groupIds, SecurityGroup group) { IpPermission.Builder permBuilder = IpPermission.builder(); http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/caf21af1/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/FirewallToIpPermission.java ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/FirewallToIpPermission.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/FirewallToIpPermission.java index 78f8a86..ea069e0 100644 --- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/FirewallToIpPermission.java +++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/FirewallToIpPermission.java @@ -47,7 +47,7 @@ public class FirewallToIpPermission implements Function<Firewall, Iterable<IpPer public Iterable<IpPermission> apply(Firewall fw) { ImmutableSet.Builder setBuilder = ImmutableSet.builder(); - for (Rule rule: fw.getAllowed()) { + for (Rule rule : fw.getAllowed()) { if (!rule.getPorts().isEmpty()) { for (Range<Integer> r : rule.getPorts().asRanges()) { IpPermission.Builder builder = populateBuilder(fw, rule.getIpProtocol()); http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/caf21af1/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 07aa33d..d44a098 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 @@ -175,7 +175,7 @@ public class CreateNodesWithGroupEncodedIntoNameThenAddToSet extends for (AtomicReference<Operation> operation : operations) { retry(operationDonePredicate, operationCompleteCheckTimeout, operationCompleteCheckInterval, MILLISECONDS).apply(operation); - checkState(!operation.get().getHttpError().isPresent(),"Could not create firewall, operation failed" + operation); + checkState(!operation.get().getHttpError().isPresent(), "Could not create firewall, operation failed" + operation); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/caf21af1/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 93e2ccb..53a8cfb 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 @@ -38,7 +38,7 @@ public class Metadata { @ConstructorProperties({"fingerprint", "items"}) public Metadata(@Nullable String fingerprint, @Nullable Map<String, String> items) { this.fingerprint = fingerprint; - this.items = items == null ? ImmutableMap.<String,String>of() : items; + this.items = items == null ? ImmutableMap.<String, String>of() : items; } /** @@ -100,7 +100,7 @@ public class Metadata { public static final class Builder { - private ImmutableMap.Builder<String,String> items = ImmutableMap.builder(); + private ImmutableMap.Builder<String, String> items = ImmutableMap.builder(); private String fingerprint; /** http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/caf21af1/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/handlers/MetadataBinder.java ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/handlers/MetadataBinder.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/handlers/MetadataBinder.java index 415890a..ddfecaa 100644 --- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/handlers/MetadataBinder.java +++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/handlers/MetadataBinder.java @@ -39,7 +39,7 @@ public class MetadataBinder implements MapBinder { */ @Override public <R extends HttpRequest> R bindToRequest(R request, Map<String, Object> postParams) { - Map<String, String> items = ImmutableMap.copyOf((Map<String,String>)checkNotNull(postParams.get("items"), "item")); + Map<String, String> items = ImmutableMap.copyOf((Map<String, String>)checkNotNull(postParams.get("items"), "item")); String fingerprint = (String) checkNotNull(postParams.get("fingerprint"), "fingerprint"); Metadata metadata = Metadata.builder() .fingerprint(fingerprint) http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/caf21af1/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/predicates/NetworkFirewallPredicates.java ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/predicates/NetworkFirewallPredicates.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/predicates/NetworkFirewallPredicates.java index 3d2f13b..63d2767 100644 --- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/predicates/NetworkFirewallPredicates.java +++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/predicates/NetworkFirewallPredicates.java @@ -33,7 +33,7 @@ public class NetworkFirewallPredicates { @Override public boolean apply(Firewall fw) { - for (Rule rule: fw.getAllowed()) { + for (Rule rule : fw.getAllowed()) { if (rule.getIpProtocol().equals(protocol)) { return true; } @@ -95,7 +95,7 @@ public class NetworkFirewallPredicates { public boolean apply(Firewall input) { boolean groupsMatchTags = (permission.getGroupIds().isEmpty() && input.getSourceTags().isEmpty()) || !Sets.intersection(permission.getGroupIds(), input.getSourceTags()).isEmpty(); - boolean cidrsMatchRanges =(permission.getCidrBlocks().isEmpty() && input.getSourceRanges().isEmpty()) + boolean cidrsMatchRanges = (permission.getCidrBlocks().isEmpty() && input.getSourceRanges().isEmpty()) || !Sets.intersection(permission.getCidrBlocks(), input.getSourceRanges()).isEmpty(); boolean firewallHasPorts = hasProtocol(permission.getIpProtocol()).apply(input) && ((permission.getFromPort() == 0 && permission.getToPort() == 0) http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/caf21af1/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineServiceExpectTest.java ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineServiceExpectTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineServiceExpectTest.java index 193f33e..323faa7 100644 --- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineServiceExpectTest.java +++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineServiceExpectTest.java @@ -344,7 +344,7 @@ public class GoogleComputeEngineServiceExpectTest extends BaseGoogleComputeEngin .addHeader("Accept", "application/json") .addHeader("Authorization", "Bearer " + TOKEN).build(); - HttpRequest deleteDiskRequest= HttpRequest.builder() + HttpRequest deleteDiskRequest = HttpRequest.builder() .method("DELETE") .endpoint("https://www.googleapis"; + ".com/compute/v1/projects/myproject/zones/us-central1-a/disks/test")
