http://git-wip-us.apache.org/repos/asf/jclouds/blob/e711275f/apis/ec2/src/test/java/org/jclouds/ec2/EBSBootEC2ApiLiveTest.java ---------------------------------------------------------------------- diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/EBSBootEC2ApiLiveTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/EBSBootEC2ApiLiveTest.java index ff18a9d..8741af6 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/EBSBootEC2ApiLiveTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/EBSBootEC2ApiLiveTest.java @@ -80,7 +80,7 @@ import com.google.inject.Injector; * Adapted from the following sources: {@link http://gist.github.com/249915}, {@link http * ://www.capsunlock.net/2009/12/create-ebs-boot-ami.html} * <p/> - * + * * Generally disabled, as it incurs higher fees. */ @Test(groups = "live", enabled = false, singleThreaded = true, testName = "EBSBootEC2ApiLiveTest") @@ -334,7 +334,7 @@ public class EBSBootEC2ApiLiveTest extends BaseComputeServiceContextLiveTest { void testAMIFromBundle() { volume = Iterables.getOnlyElement(client.getElasticBlockStoreApi().get().describeVolumesInRegion( volume.getRegion(), volume.getId())); - if (volume.getAttachments().size() > 0) { + if (!volume.getAttachments().isEmpty()) { // should be cleanly unmounted, so force is not necessary. client.getElasticBlockStoreApi().get().detachVolumeInRegion(instance.getRegion(), volume.getId(), false); System.out.printf("%d: %s awaiting detachment to complete%n", System.currentTimeMillis(), volume.getId()); @@ -483,7 +483,7 @@ public class EBSBootEC2ApiLiveTest extends BaseComputeServiceContextLiveTest { /** * this tests "personality" as the file looked up was sent during instance creation - * + * * @throws UnknownHostException */ private void sshPing(RunningInstance newDetails) throws UnknownHostException {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/e711275f/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/BaseDriveToMap.java ---------------------------------------------------------------------- diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/BaseDriveToMap.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/BaseDriveToMap.java index 625686d..e8ab235 100644 --- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/BaseDriveToMap.java +++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/BaseDriveToMap.java @@ -40,9 +40,9 @@ public class BaseDriveToMap implements Function<Drive, Map<String, String>> { builder.put("size", from.getSize() + ""); if (from.getClaimType() != ClaimType.EXCLUSIVE) builder.put("claim:type", from.getClaimType().toString()); - if (from.getReaders().size() != 0) + if (!from.getReaders().isEmpty()) builder.put("readers", Joiner.on(' ').join(from.getReaders())); - if (from.getTags().size() != 0) + if (!from.getTags().isEmpty()) builder.put("tags", Joiner.on(' ').join(from.getTags())); for (Entry<String, String> entry : from.getUserMetadata().entrySet()) builder.put("user:" + entry.getKey(), entry.getValue()); http://git-wip-us.apache.org/repos/asf/jclouds/blob/e711275f/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/CreateDriveRequestToMap.java ---------------------------------------------------------------------- diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/CreateDriveRequestToMap.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/CreateDriveRequestToMap.java index 68e65f9..6c6d5b4 100644 --- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/CreateDriveRequestToMap.java +++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/CreateDriveRequestToMap.java @@ -43,7 +43,7 @@ public class CreateDriveRequestToMap implements Function<Drive, Map<String, Stri builder.putAll(baseDriveToMap.apply(from)); if (from instanceof CreateDriveRequest) { CreateDriveRequest create = CreateDriveRequest.class.cast(from); - if (create.getAvoid().size() != 0) + if (!create.getAvoid().isEmpty()) builder.put("avoid", Joiner.on(' ').join(create.getAvoid())); if (create.getEncryptionCipher() != null) builder.put("encryption:cipher", create.getEncryptionCipher()); http://git-wip-us.apache.org/repos/asf/jclouds/blob/e711275f/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/KeyValuesDelimitedByBlankLinesToDriveInfo.java ---------------------------------------------------------------------- diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/KeyValuesDelimitedByBlankLinesToDriveInfo.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/KeyValuesDelimitedByBlankLinesToDriveInfo.java index ce1b689..432a4af 100644 --- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/KeyValuesDelimitedByBlankLinesToDriveInfo.java +++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/KeyValuesDelimitedByBlankLinesToDriveInfo.java @@ -39,7 +39,7 @@ public class KeyValuesDelimitedByBlankLinesToDriveInfo implements Function<HttpR @Override public DriveInfo apply(HttpResponse response) { Set<DriveInfo> drives = setParser.apply(response); - if (drives.size() == 0) + if (drives.isEmpty()) return null; return Iterables.get(drives, 0); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/e711275f/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/KeyValuesDelimitedByBlankLinesToServerInfo.java ---------------------------------------------------------------------- diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/KeyValuesDelimitedByBlankLinesToServerInfo.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/KeyValuesDelimitedByBlankLinesToServerInfo.java index a3c8ae4..08dfb64 100644 --- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/KeyValuesDelimitedByBlankLinesToServerInfo.java +++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/KeyValuesDelimitedByBlankLinesToServerInfo.java @@ -39,7 +39,7 @@ public class KeyValuesDelimitedByBlankLinesToServerInfo implements Function<Http @Override public ServerInfo apply(HttpResponse response) { Set<ServerInfo> drives = setParser.apply(response); - if (drives.size() == 0) + if (drives.isEmpty()) return null; return Iterables.get(drives, 0); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/e711275f/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/ListOfKeyValuesDelimitedByBlankLinesToListOfMaps.java ---------------------------------------------------------------------- diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/ListOfKeyValuesDelimitedByBlankLinesToListOfMaps.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/ListOfKeyValuesDelimitedByBlankLinesToListOfMaps.java index 4bf1669..d3427a7 100644 --- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/ListOfKeyValuesDelimitedByBlankLinesToListOfMaps.java +++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/ListOfKeyValuesDelimitedByBlankLinesToListOfMaps.java @@ -45,7 +45,7 @@ public class ListOfKeyValuesDelimitedByBlankLinesToListOfMaps implements Functio } } } - if (map.size() != 0) + if (!map.isEmpty()) maps.add(map); } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/e711275f/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/MapToDriveInfo.java ---------------------------------------------------------------------- diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/MapToDriveInfo.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/MapToDriveInfo.java index 645d804..c8bebb5 100644 --- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/MapToDriveInfo.java +++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/MapToDriveInfo.java @@ -40,7 +40,7 @@ public class MapToDriveInfo implements Function<Map<String, String>, DriveInfo> @Override public DriveInfo apply(Map<String, String> from) { - if (from.size() == 0) + if (from.isEmpty()) return null; DriveInfo.Builder builder = new DriveInfo.Builder(); builder.name(from.get("name")); http://git-wip-us.apache.org/repos/asf/jclouds/blob/e711275f/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/MapToServerInfo.java ---------------------------------------------------------------------- diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/MapToServerInfo.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/MapToServerInfo.java index 0cdfdd2..2743a6a 100644 --- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/MapToServerInfo.java +++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/MapToServerInfo.java @@ -51,7 +51,7 @@ public class MapToServerInfo implements Function<Map<String, String>, ServerInfo @Override public ServerInfo apply(Map<String, String> from) { - if (from.size() == 0) + if (from.isEmpty()) return null; ServerInfo.Builder builder = new ServerInfo.Builder(); builder.name(from.get("name")); http://git-wip-us.apache.org/repos/asf/jclouds/blob/e711275f/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/ServerToMap.java ---------------------------------------------------------------------- diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/ServerToMap.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/ServerToMap.java index c21d71b..1402b0a 100644 --- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/ServerToMap.java +++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/ServerToMap.java @@ -60,7 +60,7 @@ public class ServerToMap implements Function<Server, Map<String, String>> { builder.put("smp", "auto"); builder.put("mem", from.getMem() + ""); builder.put("persistent", from.isPersistent() + ""); - if (from.getBootDeviceIds().size() != 0) + if (!from.getBootDeviceIds().isEmpty()) builder.put("boot", Joiner.on(' ').join(from.getBootDeviceIds())); for (Entry<String, ? extends Device> entry : from.getDevices().entrySet()) { builder.put(entry.getKey(), entry.getValue().getDriveUuid()); @@ -89,7 +89,7 @@ public class ServerToMap implements Function<Server, Map<String, String>> { builder.put("password", from.getVnc().getPassword()); if (from.getVnc().isTls()) builder.put("vnc:tls", "on"); - if (from.getTags().size() != 0) + if (!from.getTags().isEmpty()) builder.put("tags", Joiner.on(' ').join(from.getTags())); for (Entry<String, String> entry : from.getUserMetadata().entrySet()) builder.put("user:" + entry.getKey(), entry.getValue()); http://git-wip-us.apache.org/repos/asf/jclouds/blob/e711275f/apis/elasticstack/src/main/java/org/jclouds/elasticstack/predicates/DriveClaimed.java ---------------------------------------------------------------------- diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/predicates/DriveClaimed.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/predicates/DriveClaimed.java index fa7ff8d..1ffad10 100644 --- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/predicates/DriveClaimed.java +++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/predicates/DriveClaimed.java @@ -47,7 +47,7 @@ public class DriveClaimed implements Predicate<DriveInfo> { if (drive == null) return false; logger.trace("%s: looking for drive claims: currently: %s", drive.getUuid(), drive.getClaimed()); - return drive.getClaimed().size() > 0; + return !drive.getClaimed().isEmpty(); } private DriveInfo refresh(DriveInfo drive) { http://git-wip-us.apache.org/repos/asf/jclouds/blob/e711275f/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/suppliers/LocationIdToURIFromAccessForTypeAndVersion.java ---------------------------------------------------------------------- diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/suppliers/LocationIdToURIFromAccessForTypeAndVersion.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/suppliers/LocationIdToURIFromAccessForTypeAndVersion.java index cab564a..b03e285 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/suppliers/LocationIdToURIFromAccessForTypeAndVersion.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/suppliers/LocationIdToURIFromAccessForTypeAndVersion.java @@ -18,10 +18,11 @@ package org.jclouds.openstack.keystone.v2_0.suppliers; import static com.google.common.collect.Iterables.any; import static com.google.common.collect.Iterables.concat; -import static com.google.common.collect.Iterables.size; +import static com.google.common.collect.Iterables.isEmpty; import static com.google.common.collect.Iterables.tryFind; import static com.google.common.collect.Multimaps.index; + import java.net.URI; import java.util.Collection; import java.util.Map; @@ -93,12 +94,12 @@ public class LocationIdToURIFromAccessForTypeAndVersion implements Supplier<Map< @Override public Map<String, Supplier<URI>> get() { FluentIterable<Service> services = FluentIterable.from(access.get()).filter(apiTypeEquals); - if (services.toSet().size() == 0) + if (services.isEmpty()) throw new NoSuchElementException(String.format("apiType %s not found in catalog %s", apiType, services)); Iterable<Endpoint> endpoints = concat(services); - if (size(endpoints) == 0) + if (isEmpty(endpoints)) throw new NoSuchElementException( String.format("no endpoints for apiType %s in services %s", apiType, services)); http://git-wip-us.apache.org/repos/asf/jclouds/blob/e711275f/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeServiceAdapter.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeServiceAdapter.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeServiceAdapter.java index f0c973b..2762c30 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeServiceAdapter.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeServiceAdapter.java @@ -164,15 +164,15 @@ public class NovaComputeServiceAdapter implements public Iterable<ImageInRegion> listImages() { Builder<ImageInRegion> builder = ImmutableSet.builder(); Set<String> regions = regionIds.get(); - checkState(regions.size() > 0, "no regions found in supplier %s", regionIds); + checkState(!regions.isEmpty(), "no regions found in supplier %s", regionIds); for (final String regionId : regions) { Set<? extends Image> images = novaApi.getImageApi(regionId).listInDetail().concat().toSet(); - if (images.size() == 0) { + if (images.isEmpty()) { logger.debug("no images found in region %s", regionId); continue; } Iterable<? extends Image> active = filter(images, ImagePredicates.statusEquals(Image.Status.ACTIVE)); - if (images.size() == 0) { + if (images.isEmpty()) { logger.debug("no images with status active in region %s; non-active: %s", regionId, transform(active, new Function<Image, String>() { http://git-wip-us.apache.org/repos/asf/jclouds/blob/e711275f/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/extensions/NovaSecurityGroupExtension.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/extensions/NovaSecurityGroupExtension.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/extensions/NovaSecurityGroupExtension.java index 0899bb3..c6f78b4 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/extensions/NovaSecurityGroupExtension.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/extensions/NovaSecurityGroupExtension.java @@ -209,7 +209,7 @@ public class NovaSecurityGroupExtension implements SecurityGroupExtension { return null; } - if (ipPermission.getCidrBlocks().size() > 0) { + if (!ipPermission.getCidrBlocks().isEmpty()) { for (String cidr : ipPermission.getCidrBlocks()) { sgApi.get().createRuleAllowingCidrBlock(id, Ingress.builder() @@ -221,7 +221,7 @@ public class NovaSecurityGroupExtension implements SecurityGroupExtension { } } - if (ipPermission.getGroupIds().size() > 0) { + if (!ipPermission.getGroupIds().isEmpty()) { for (String regionAndGroupRaw : ipPermission.getGroupIds()) { RegionAndId regionAndId = RegionAndId.fromSlashEncoded(regionAndGroupRaw); String groupId = regionAndId.getId(); @@ -268,7 +268,7 @@ public class NovaSecurityGroupExtension implements SecurityGroupExtension { org.jclouds.openstack.nova.v2_0.domain.SecurityGroup securityGroup = sgApi.get().get(id); - if (ipPermission.getCidrBlocks().size() > 0) { + if (!ipPermission.getCidrBlocks().isEmpty()) { for (String cidr : ipPermission.getCidrBlocks()) { for (SecurityGroupRule rule : filter(securityGroup.getRules(), and(ruleCidr(cidr), ruleProtocol(ipPermission.getIpProtocol()), @@ -279,7 +279,7 @@ public class NovaSecurityGroupExtension implements SecurityGroupExtension { } } - if (ipPermission.getGroupIds().size() > 0) { + if (!ipPermission.getGroupIds().isEmpty()) { for (String groupId : ipPermission.getGroupIds()) { for (SecurityGroupRule rule : filter(securityGroup.getRules(), and(ruleGroup(groupId), ruleProtocol(ipPermission.getIpProtocol()), http://git-wip-us.apache.org/repos/asf/jclouds/blob/e711275f/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/SecurityGroup.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/SecurityGroup.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/SecurityGroup.java index 97223a7..e00348b 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/SecurityGroup.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/SecurityGroup.java @@ -35,11 +35,11 @@ import com.google.common.collect.ImmutableSet; */ public class SecurityGroup { - public static Builder<?> builder() { + public static Builder<?> builder() { return new ConcreteBuilder(); } - - public Builder<?> toBuilder() { + + public Builder<?> toBuilder() { return new ConcreteBuilder().fromSecurityGroup(this); } @@ -51,8 +51,8 @@ public class SecurityGroup { protected String name; protected String description; protected Set<SecurityGroupRule> rules = ImmutableSet.of(); - - /** + + /** * @see SecurityGroup#getId() */ public T id(String id) { @@ -60,7 +60,7 @@ public class SecurityGroup { return self(); } - /** + /** * @see SecurityGroup#getTenantId() */ public T tenantId(String tenantId) { @@ -68,7 +68,7 @@ public class SecurityGroup { return self(); } - /** + /** * @see SecurityGroup#getName() */ public T name(String name) { @@ -76,7 +76,7 @@ public class SecurityGroup { return self(); } - /** + /** * @see SecurityGroup#getDescription() */ public T description(String description) { @@ -84,11 +84,11 @@ public class SecurityGroup { return self(); } - /** + /** * @see SecurityGroup#getRules() */ public T rules(Set<SecurityGroupRule> rules) { - this.rules = ImmutableSet.copyOf(checkNotNull(rules, "rules")); + this.rules = ImmutableSet.copyOf(checkNotNull(rules, "rules")); return self(); } @@ -99,7 +99,7 @@ public class SecurityGroup { public SecurityGroup build() { return new SecurityGroup(id, tenantId, name, description, rules); } - + public T fromSecurityGroup(SecurityGroup in) { return this .id(in.getId()) @@ -133,7 +133,7 @@ public class SecurityGroup { this.name = name; this.description = description; // if empty, leave null so this doesn't serialize to json - this.rules = checkNotNull(rules, "rules").size() == 0 ? null : ImmutableSet.copyOf(rules); + this.rules = checkNotNull(rules, "rules").isEmpty() ? null : ImmutableSet.copyOf(rules); } public String getId() { @@ -175,12 +175,12 @@ public class SecurityGroup { && Objects.equal(this.description, that.description) && Objects.equal(this.rules, that.rules); } - + protected ToStringHelper string() { return MoreObjects.toStringHelper(this) .add("id", id).add("tenantId", tenantId).add("name", name).add("description", description).add("rules", rules); } - + @Override public String toString() { return string().toString(); http://git-wip-us.apache.org/repos/asf/jclouds/blob/e711275f/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateServerOptions.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateServerOptions.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateServerOptions.java index 0ed8a69..f3f7a6f 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateServerOptions.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateServerOptions.java @@ -136,11 +136,11 @@ public class CreateServerOptions implements MapBinder { protected ToStringHelper string() { ToStringHelper toString = MoreObjects.toStringHelper("").omitNullValues(); toString.add("keyName", keyName); - if (securityGroupNames.size() > 0) + if (!securityGroupNames.isEmpty()) toString.add("securityGroupNames", securityGroupNames); - if (metadata.size() > 0) + if (!metadata.isEmpty()) toString.add("metadata", metadata); - if (personality.size() > 0) + if (!personality.isEmpty()) toString.add("personality", personality); if (adminPass != null) toString.add("adminPassPresent", true); @@ -191,9 +191,9 @@ public class CreateServerOptions implements MapBinder { ServerRequest server = new ServerRequest(checkNotNull(postParams.get("name"), "name parameter not present").toString(), checkNotNull(postParams.get("imageRef"), "imageRef parameter not present").toString(), checkNotNull(postParams.get("flavorRef"), "flavorRef parameter not present").toString()); - if (metadata.size() > 0) + if (!metadata.isEmpty()) server.metadata = metadata; - if (personality.size() > 0) + if (!personality.isEmpty()) server.personality = personality; if (keyName != null) server.key_name = keyName; @@ -203,7 +203,7 @@ public class CreateServerOptions implements MapBinder { server.user_data = base64().encode(userData); if (configDrive) server.configDrive = "true"; - if (securityGroupNames.size() > 0) { + if (!securityGroupNames.isEmpty()) { server.securityGroupNames = Sets.newLinkedHashSet(); for (String groupName : securityGroupNames) { server.securityGroupNames.add(new NamedThingy(groupName)); http://git-wip-us.apache.org/repos/asf/jclouds/blob/e711275f/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/LoadBalancer.java ---------------------------------------------------------------------- diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/LoadBalancer.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/LoadBalancer.java index 7bd638d..245282e 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/LoadBalancer.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/LoadBalancer.java @@ -126,15 +126,15 @@ public class LoadBalancer extends BaseLoadBalancer<Node, LoadBalancer> { } /** - * Broken out as a separate field because when LoadBalancers are returned from + * Broken out as a separate field because when LoadBalancers are returned from * {@link LoadBalancerApi#list()}, no Nodes are returned (so you can't rely on getNodes().size()) * but a nodeCount is returned. When {@link LoadBalancerApi#get(int)} is called, nodes are * returned but no nodeCount is returned. - * - * @return The number of Nodes in this LoadBalancer + * + * @return The number of Nodes in this LoadBalancer */ public int getNodeCount() { - return nodes.size() > 0 ? nodes.size() : nodeCount; + return !nodes.isEmpty() ? nodes.size() : nodeCount; } /** @@ -165,7 +165,7 @@ public class LoadBalancer extends BaseLoadBalancer<Node, LoadBalancer> { public Metadata getMetadata() { return metadata; } - + public URI getUri() { return uri; } @@ -343,7 +343,7 @@ public class LoadBalancer extends BaseLoadBalancer<Node, LoadBalancer> { this.metadata = checkNotNull(metadata, "metadata"); return this; } - + public Builder uri(URI uri) { this.uri = uri; return this; http://git-wip-us.apache.org/repos/asf/jclouds/blob/e711275f/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseAlgorithms.java ---------------------------------------------------------------------- diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseAlgorithms.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseAlgorithms.java index 878e150..0d5ce4e 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseAlgorithms.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseAlgorithms.java @@ -45,17 +45,17 @@ public class ParseAlgorithms implements Function<HttpResponse, List<String>>, In @Override public List<String> apply(HttpResponse response) { Map<String, List<Map<String, String>>> map = json.apply(response); - - if (map == null || map.size() == 0) + + if (map == null || map.isEmpty()) throw new HttpResponseException("Unexpected JSON format returned.", null, response); - + List<Map<String, String>> list = Iterables.get(map.values(), 0); List<String> algorithms = Lists.newArrayList(); - + for (Map<String, String> nameAlgorithmPair : list) { algorithms.add(Iterables.get(nameAlgorithmPair.values(), 0)); } - + return algorithms; } http://git-wip-us.apache.org/repos/asf/jclouds/blob/e711275f/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseLoadBalancer.java ---------------------------------------------------------------------- diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseLoadBalancer.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseLoadBalancer.java index 2112c7c..06ddb73 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseLoadBalancer.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseLoadBalancer.java @@ -51,7 +51,7 @@ public class ParseLoadBalancer implements Function<HttpResponse, LoadBalancer>, public LoadBalancer apply(HttpResponse arg0) { checkState(convertLB != null, "convertLB should be set by InvocationContext"); Map<String, LB> map = json.apply(arg0); - if (map == null || map.size() == 0) + if (map == null || map.isEmpty()) return null; LB lb = Iterables.get(map.values(), 0); return convertLB.apply(lb); @@ -64,9 +64,9 @@ public class ParseLoadBalancer implements Function<HttpResponse, LoadBalancer>, ParseLoadBalancer setEndpointAndRegion(URI endpoint) { String region = endpoint.getHost().substring(0, endpoint.getHost().indexOf('.')); - + this.convertLB = factory.createForEndpointAndRegion(endpoint, region); - + return this; } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/e711275f/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseLoadBalancers.java ---------------------------------------------------------------------- diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseLoadBalancers.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseLoadBalancers.java index 92c1087..fcbc099 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseLoadBalancers.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseLoadBalancers.java @@ -61,7 +61,7 @@ public class ParseLoadBalancers implements Function<HttpResponse, IterableWithMa public IterableWithMarker<LoadBalancer> apply(HttpResponse arg0) { LoadBalancers lbs = json.apply(arg0); - if (lbs.size() == 0) + if (lbs.isEmpty()) return IterableWithMarkers.EMPTY; Iterable<LoadBalancer> transform = Iterables.transform(lbs, convertLB); http://git-wip-us.apache.org/repos/asf/jclouds/blob/e711275f/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseNestedBoolean.java ---------------------------------------------------------------------- diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseNestedBoolean.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseNestedBoolean.java index ab95657..8d92d5f 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseNestedBoolean.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseNestedBoolean.java @@ -43,10 +43,10 @@ public class ParseNestedBoolean implements Function<HttpResponse, Boolean>, Invo @Override public Boolean apply(HttpResponse response) { Map<String, Map<String, Boolean>> map = json.apply(response); - - if (map == null || map.size() == 0) + + if (map == null || map.isEmpty()) throw new HttpResponseException("Unexpected JSON format returned.", null, response); - + return Iterables.get(Iterables.get(map.values(), 0).values(), 0); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/e711275f/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseNestedString.java ---------------------------------------------------------------------- diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseNestedString.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseNestedString.java index b4ca33e..17ab094 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseNestedString.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseNestedString.java @@ -44,7 +44,7 @@ public class ParseNestedString implements Function<HttpResponse, String>, Invoca public String apply(HttpResponse response) { Map<String, Map<String, String>> map = json.apply(response); - if (map == null || map.size() == 0) + if (map == null || map.isEmpty()) throw new HttpResponseException("Unexpected JSON format returned.", null, response); return Iterables.get(Iterables.get(map.values(), 0).values(), 0); http://git-wip-us.apache.org/repos/asf/jclouds/blob/e711275f/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseNode.java ---------------------------------------------------------------------- diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseNode.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseNode.java index 8e32dc9..5af5477 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseNode.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseNode.java @@ -47,10 +47,10 @@ public class ParseNode implements Function<HttpResponse, Node>, InvocationContex @Override public Node apply(HttpResponse response) { Map<String, NodeWithCLBMetadata> map = json.apply(response); - - if (map == null || map.size() == 0) + + if (map == null || map.isEmpty()) return null; - + NodeWithCLBMetadata nodeWithCLBMetadata = Iterables.get(map.values(), 0); Node node = Node.builder() .address(nodeWithCLBMetadata.getAddress()) @@ -62,7 +62,7 @@ public class ParseNode implements Function<HttpResponse, Node>, InvocationContex .status(nodeWithCLBMetadata.status) .metadata(ParseMetadata.transformCLBMetadataToMetadata(nodeWithCLBMetadata.metadata)) .build(); - + return node; } @@ -70,7 +70,7 @@ public class ParseNode implements Function<HttpResponse, Node>, InvocationContex public ParseNode setContext(HttpRequest request) { return this; } - + /** * This class is here only to deal with the metadata format in CLB. */ http://git-wip-us.apache.org/repos/asf/jclouds/blob/e711275f/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseSessionPersistence.java ---------------------------------------------------------------------- diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseSessionPersistence.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseSessionPersistence.java index 5e0c274..8c0b578 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseSessionPersistence.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseSessionPersistence.java @@ -44,10 +44,10 @@ public class ParseSessionPersistence implements Function<HttpResponse, SessionPe @Override public SessionPersistence apply(HttpResponse response) { Map<String, Map<String, SessionPersistence>> map = json.apply(response); - - if (map == null || map.size() == 0) + + if (map == null || map.isEmpty()) throw new HttpResponseException("Unexpected connection logging format returned.", null, response); - else if (Iterables.get(map.values(), 0).size() == 0) + else if (Iterables.get(map.values(), 0).isEmpty()) return null; else return Iterables.get(Iterables.get(map.values(), 0).values(), 0); http://git-wip-us.apache.org/repos/asf/jclouds/blob/e711275f/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/LoadBalancerApiLiveTest.java ---------------------------------------------------------------------- diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/LoadBalancerApiLiveTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/LoadBalancerApiLiveTest.java index b343a13..f080498 100644 --- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/LoadBalancerApiLiveTest.java +++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/LoadBalancerApiLiveTest.java @@ -122,7 +122,7 @@ public class LoadBalancerApiLiveTest extends BaseCloudLoadBalancersApiLiveTest { assert lb.getStatus() != null : lb; assert lb.getCreated() != null : lb; assert lb.getUpdated() != null : lb; - assert lb.getVirtualIPs().size() > 0 : lb; + assert !lb.getVirtualIPs().isEmpty() : lb; // node info not available during list; assert lb.getNodes().size() == 0 : lb; @@ -139,7 +139,7 @@ public class LoadBalancerApiLiveTest extends BaseCloudLoadBalancersApiLiveTest { assertEquals(getDetails.getUpdated(), lb.getUpdated()); assertEquals(getDetails.getVirtualIPs(), lb.getVirtualIPs()); // node info not available during list; - assert getDetails.getNodes().size() > 0 : lb; + assert !getDetails.getNodes().isEmpty() : lb; } catch (AssertionError e) { throw new AssertionError(String.format("%s\n%s - %s", e.getMessage(), getDetails, lb)); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/e711275f/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/NodeApiLiveTest.java ---------------------------------------------------------------------- diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/NodeApiLiveTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/NodeApiLiveTest.java index 1524829..c82898d 100644 --- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/NodeApiLiveTest.java +++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/NodeApiLiveTest.java @@ -51,7 +51,7 @@ public class NodeApiLiveTest extends BaseCloudLoadBalancersApiLiveTest { private Map<LoadBalancer, Set<Node>> nodes = Maps.newHashMap(); public void testCreateLoadBalancers() { - assertTrue(api.getConfiguredRegions().size() > 0, "Need to have some regions!"); + assertTrue(!api.getConfiguredRegions().isEmpty(), "Need to have some regions!"); Logger.getAnonymousLogger().info("running against regions " + api.getConfiguredRegions()); for (String region : api.getConfiguredRegions()) { Logger.getAnonymousLogger().info("starting lb in region " + region); http://git-wip-us.apache.org/repos/asf/jclouds/blob/e711275f/apis/route53/src/test/java/org/jclouds/route53/features/HostedZoneApiLiveTest.java ---------------------------------------------------------------------- diff --git a/apis/route53/src/test/java/org/jclouds/route53/features/HostedZoneApiLiveTest.java b/apis/route53/src/test/java/org/jclouds/route53/features/HostedZoneApiLiveTest.java index ad34b4e..2cd50ac 100644 --- a/apis/route53/src/test/java/org/jclouds/route53/features/HostedZoneApiLiveTest.java +++ b/apis/route53/src/test/java/org/jclouds/route53/features/HostedZoneApiLiveTest.java @@ -77,11 +77,11 @@ public class HostedZoneApiLiveTest extends BaseRoute53ApiLiveTest { try { checkHostedZone(newHostedZone.getZone()); assertEquals(newHostedZone.getChange().getStatus(), PENDING, "invalid status on zone " + newHostedZone); - assertTrue(newHostedZone.getNameServers().size() > 0, "no name servers for zone " + newHostedZone); + assertTrue(!newHostedZone.getNameServers().isEmpty(), "no name servers for zone " + newHostedZone); assertEquals(newHostedZone.getZone().getName(), name); assertEquals(newHostedZone.getZone().getCallerReference(), nonce); assertEquals(newHostedZone.getZone().getComment().get(), comment); - + assertTrue(inSync.apply(newHostedZone.getChange()), "zone didn't sync " + newHostedZone); } finally { Change delete = api().delete(newHostedZone.getZone().getId()); http://git-wip-us.apache.org/repos/asf/jclouds/blob/e711275f/apis/s3/src/main/java/org/jclouds/s3/config/S3RestClientModule.java ---------------------------------------------------------------------- diff --git a/apis/s3/src/main/java/org/jclouds/s3/config/S3RestClientModule.java b/apis/s3/src/main/java/org/jclouds/s3/config/S3RestClientModule.java index 707b04a..9086681 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/config/S3RestClientModule.java +++ b/apis/s3/src/main/java/org/jclouds/s3/config/S3RestClientModule.java @@ -86,7 +86,7 @@ public class S3RestClientModule<S extends S3Client, A extends S3AsyncClient> ext protected CacheLoader<String, Optional<String>> bucketToRegion(@Region Supplier<Set<String>> regionSupplier, final S3Client client) { Set<String> regions = regionSupplier.get(); - if (regions.size() == 0) { + if (regions.isEmpty()) { return new CacheLoader<String, Optional<String>>() { @Override http://git-wip-us.apache.org/repos/asf/jclouds/blob/e711275f/apis/s3/src/test/java/org/jclouds/s3/internal/StubS3AsyncClient.java ---------------------------------------------------------------------- diff --git a/apis/s3/src/test/java/org/jclouds/s3/internal/StubS3AsyncClient.java b/apis/s3/src/test/java/org/jclouds/s3/internal/StubS3AsyncClient.java index 5e94924..bbd79ff 100644 --- a/apis/s3/src/test/java/org/jclouds/s3/internal/StubS3AsyncClient.java +++ b/apis/s3/src/test/java/org/jclouds/s3/internal/StubS3AsyncClient.java @@ -51,6 +51,7 @@ import org.jclouds.http.options.GetOptions; import org.jclouds.javax.annotation.Nullable; import org.jclouds.lifecycle.Closer; import org.jclouds.s3.S3AsyncClient; +import org.jclouds.s3.blobstore.S3AsyncBlobStore; import org.jclouds.s3.blobstore.functions.BlobToObject; import org.jclouds.s3.blobstore.functions.BlobToObjectMetadata; import org.jclouds.s3.blobstore.functions.BucketToContainerListOptions; @@ -223,7 +224,7 @@ public class StubS3AsyncClient implements S3AsyncClient { * to match S3 which substitutes each email address grantee with that user's corresponding ID. In * short, although you can PUT email address grantees, these are actually subsequently returned * by S3 as canonical user grantees. - * + * * @param acl * @return */ @@ -258,7 +259,7 @@ public class StubS3AsyncClient implements S3AsyncClient { public ListenableFuture<Boolean> deleteBucketIfEmpty(String bucketName) { Boolean returnVal = true; if (containerToBlobs.containsKey(bucketName)) { - if (containerToBlobs.get(bucketName).size() == 0) + if (containerToBlobs.get(bucketName).isEmpty()) containerToBlobs.remove(bucketName); else returnVal = false; http://git-wip-us.apache.org/repos/asf/jclouds/blob/e711275f/apis/sqs/src/main/java/org/jclouds/sqs/binders/BindAttributeNamesToIndexedFormParams.java ---------------------------------------------------------------------- diff --git a/apis/sqs/src/main/java/org/jclouds/sqs/binders/BindAttributeNamesToIndexedFormParams.java b/apis/sqs/src/main/java/org/jclouds/sqs/binders/BindAttributeNamesToIndexedFormParams.java index c713765..0617f9c 100644 --- a/apis/sqs/src/main/java/org/jclouds/sqs/binders/BindAttributeNamesToIndexedFormParams.java +++ b/apis/sqs/src/main/java/org/jclouds/sqs/binders/BindAttributeNamesToIndexedFormParams.java @@ -42,7 +42,7 @@ public class BindAttributeNamesToIndexedFormParams implements Binder { builder.put("AttributeName." + (i++ + 1), o.toString()); } ImmutableMultimap<String, String> forms = builder.build(); - return (R) (forms.size() == 0 ? request : request.toBuilder().replaceFormParams(forms).build()); + return (R) (forms.isEmpty() ? request : request.toBuilder().replaceFormParams(forms).build()); } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/e711275f/apis/sqs/src/main/java/org/jclouds/sqs/options/CreateQueueOptions.java ---------------------------------------------------------------------- diff --git a/apis/sqs/src/main/java/org/jclouds/sqs/options/CreateQueueOptions.java b/apis/sqs/src/main/java/org/jclouds/sqs/options/CreateQueueOptions.java index 1f76ced..d02b49f 100644 --- a/apis/sqs/src/main/java/org/jclouds/sqs/options/CreateQueueOptions.java +++ b/apis/sqs/src/main/java/org/jclouds/sqs/options/CreateQueueOptions.java @@ -28,7 +28,7 @@ import com.google.common.collect.Multimap; /** * Options used to receive a message from a queue. - * + * * @see <a * href="http://docs.amazonwebservices.com/AWSSimpleQueueService/2011-10-01/APIReference/Query_QueryCreateQueue.html"; * >docs</a> @@ -41,10 +41,10 @@ public class CreateQueueOptions extends BaseHttpRequestOptions implements Clonea * The duration (in seconds) that the received messages are hidden from * subsequent retrieve requests after being retrieved by a CreateQueue * request. - * + * * @param visibilityTimeout * Constraints: 0 to 43200 (maximum 12 hours) - * + * * Default: The visibility timeout for the queue */ public CreateQueueOptions visibilityTimeout(int visibilityTimeout) { @@ -94,7 +94,7 @@ public class CreateQueueOptions extends BaseHttpRequestOptions implements Clonea public Multimap<String, String> buildFormParameters() { Multimap<String, String> params = super.buildFormParameters(); ImmutableMap<String, String> attributes = this.attributes.build(); - if (attributes.size() > 0) { + if (!attributes.isEmpty()) { int nameIndex = 1; for (Entry<String, String> attribute : attributes.entrySet()) { params.put("Attribute." + nameIndex + ".Name", attribute.getKey()); @@ -139,7 +139,7 @@ public class CreateQueueOptions extends BaseHttpRequestOptions implements Clonea @Override public String toString() { ImmutableMap<String, String> attributes = this.attributes.build(); - return MoreObjects.toStringHelper(this).omitNullValues().add("attributes", attributes.size() > 0 ? attributes : null) + return MoreObjects.toStringHelper(this).omitNullValues().add("attributes", !attributes.isEmpty() ? attributes : null) .toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/e711275f/apis/sqs/src/main/java/org/jclouds/sqs/options/ReceiveMessageOptions.java ---------------------------------------------------------------------- diff --git a/apis/sqs/src/main/java/org/jclouds/sqs/options/ReceiveMessageOptions.java b/apis/sqs/src/main/java/org/jclouds/sqs/options/ReceiveMessageOptions.java index 0001d2d..a626d56 100644 --- a/apis/sqs/src/main/java/org/jclouds/sqs/options/ReceiveMessageOptions.java +++ b/apis/sqs/src/main/java/org/jclouds/sqs/options/ReceiveMessageOptions.java @@ -25,7 +25,7 @@ import com.google.common.collect.Multimap; /** * Options used to receive a message from a queue. - * + * * @see <a * href="http://docs.amazonwebservices.com/AWSSimpleQueueService/2011-10-01/APIReference/Query_QueryReceiveMessage.html"; * >docs</a> @@ -39,10 +39,10 @@ public class ReceiveMessageOptions extends BaseHttpRequestOptions implements Clo * The duration (in seconds) that the received messages are hidden from * subsequent retrieve requests after being retrieved by a ReceiveMessage * request. - * + * * @param visibilityTimeout * Constraints: 0 to 43200 (maximum 12 hours) - * + * * Default: The visibility timeout for the queue */ public ReceiveMessageOptions visibilityTimeout(Integer visibilityTimeout) { @@ -52,18 +52,18 @@ public class ReceiveMessageOptions extends BaseHttpRequestOptions implements Clo /** * The attribute you want to get. - * + * * All - returns all values. - * + * * SenderId - returns the AWS account number (or the IP address, if anonymous * access is allowed) of the sender. - * + * * SentTimestamp - returns the time when the message was sent (epoch time in * milliseconds). - * + * * ApproximateReceiveCount - returns the number of times a message has been * received but not deleted. - * + * * ApproximateFirstReceiveTimestamp - returns the time when the message was * first received (epoch time in milliseconds). */ @@ -110,7 +110,7 @@ public class ReceiveMessageOptions extends BaseHttpRequestOptions implements Clo if (visibilityTimeout != null) params.put("VisibilityTimeout", visibilityTimeout.toString()); ImmutableSet<String> attributes = this.attributes.build(); - if (attributes.size() > 0) { + if (!attributes.isEmpty()) { int nameIndex = 1; for (String attribute : attributes) { params.put("AttributeName." + nameIndex, attribute); @@ -156,6 +156,6 @@ public class ReceiveMessageOptions extends BaseHttpRequestOptions implements Clo public String toString() { ImmutableSet<String> attributes = this.attributes.build(); return MoreObjects.toStringHelper(this).omitNullValues().add("visibilityTimeout", visibilityTimeout) - .add("attributes", attributes.size() > 0 ? attributes : null).toString(); + .add("attributes", !attributes.isEmpty() ? attributes : null).toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/e711275f/apis/sts/src/main/java/org/jclouds/aws/binders/BindMapToIndexedFormParams.java ---------------------------------------------------------------------- diff --git a/apis/sts/src/main/java/org/jclouds/aws/binders/BindMapToIndexedFormParams.java b/apis/sts/src/main/java/org/jclouds/aws/binders/BindMapToIndexedFormParams.java index 149988c..202c335 100644 --- a/apis/sts/src/main/java/org/jclouds/aws/binders/BindMapToIndexedFormParams.java +++ b/apis/sts/src/main/java/org/jclouds/aws/binders/BindMapToIndexedFormParams.java @@ -67,7 +67,7 @@ public class BindMapToIndexedFormParams implements Binder { amazonOneBasedIndex++; } Multimap<String, String> forms = Multimaps.forMap(builder.build()); - return forms.size() == 0 ? request : (R) request.toBuilder().replaceFormParams(forms).build(); + return forms.isEmpty() ? request : (R) request.toBuilder().replaceFormParams(forms).build(); } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/e711275f/apis/sts/src/main/java/org/jclouds/aws/binders/BindTableToIndexedFormParams.java ---------------------------------------------------------------------- diff --git a/apis/sts/src/main/java/org/jclouds/aws/binders/BindTableToIndexedFormParams.java b/apis/sts/src/main/java/org/jclouds/aws/binders/BindTableToIndexedFormParams.java index b6adfe3..6c0f690 100644 --- a/apis/sts/src/main/java/org/jclouds/aws/binders/BindTableToIndexedFormParams.java +++ b/apis/sts/src/main/java/org/jclouds/aws/binders/BindTableToIndexedFormParams.java @@ -70,7 +70,7 @@ public class BindTableToIndexedFormParams implements Binder { amazonOneBasedIndex++; } Multimap<String, String> forms = Multimaps.forMap(builder.build()); - return forms.size() == 0 ? request : (R) request.toBuilder().replaceFormParams(forms).build(); + return forms.isEmpty() ? request : (R) request.toBuilder().replaceFormParams(forms).build(); } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/e711275f/apis/sts/src/main/java/org/jclouds/aws/util/AWSUtils.java ---------------------------------------------------------------------- diff --git a/apis/sts/src/main/java/org/jclouds/aws/util/AWSUtils.java b/apis/sts/src/main/java/org/jclouds/aws/util/AWSUtils.java index 8b86598..a93f845 100644 --- a/apis/sts/src/main/java/org/jclouds/aws/util/AWSUtils.java +++ b/apis/sts/src/main/java/org/jclouds/aws/util/AWSUtils.java @@ -130,7 +130,7 @@ public class AWSUtils { builder.put(prefix + "." + (i++ + 1), checkNotNull(o.toString(), prefix.toLowerCase() + "s[" + i + "]")); } ImmutableMultimap<String, String> forms = builder.build(); - return forms.size() == 0 ? request : (R) request.toBuilder().replaceFormParams(forms).build(); + return forms.isEmpty() ? request : (R) request.toBuilder().replaceFormParams(forms).build(); } public static <R extends HttpRequest> R indexStringArrayToFormValuesWithPrefix(R request, String prefix, Object input) { @@ -142,7 +142,7 @@ public class AWSUtils { builder.put(prefix + "." + (i + 1), checkNotNull(values[i], prefix.toLowerCase() + "s[" + i + "]")); } ImmutableMultimap<String, String> forms = builder.build(); - return forms.size() == 0 ? request : (R) request.toBuilder().replaceFormParams(forms).build(); + return forms.isEmpty() ? request : (R) request.toBuilder().replaceFormParams(forms).build(); } public static <R extends HttpRequest> R indexMapToFormValuesWithPrefix(R request, String prefix, String keySuffix, String valueSuffix, Object input) { @@ -158,7 +158,7 @@ public class AWSUtils { i++; } ImmutableMultimap<String, String> forms = builder.build(); - return forms.size() == 0 ? request : (R) request.toBuilder().replaceFormParams(forms).build(); + return forms.isEmpty() ? request : (R) request.toBuilder().replaceFormParams(forms).build(); } public static <R extends HttpRequest> R indexMultimapToFormValuesWithPrefix(R request, String prefix, String keySuffix, String valueSuffix, Object input) { http://git-wip-us.apache.org/repos/asf/jclouds/blob/e711275f/apis/swift/src/main/java/org/jclouds/openstack/swift/blobstore/strategy/internal/ParallelMultipartUploadStrategy.java ---------------------------------------------------------------------- diff --git a/apis/swift/src/main/java/org/jclouds/openstack/swift/blobstore/strategy/internal/ParallelMultipartUploadStrategy.java b/apis/swift/src/main/java/org/jclouds/openstack/swift/blobstore/strategy/internal/ParallelMultipartUploadStrategy.java index 53465f4..bf11489 100644 --- a/apis/swift/src/main/java/org/jclouds/openstack/swift/blobstore/strategy/internal/ParallelMultipartUploadStrategy.java +++ b/apis/swift/src/main/java/org/jclouds/openstack/swift/blobstore/strategy/internal/ParallelMultipartUploadStrategy.java @@ -207,7 +207,7 @@ public class ParallelMultipartUploadStrategy implements AsyncMultipartUploadStra } latch.await(); // handling retries - while (errors.get() <= maxRetries && toRetry.size() > 0) { + while (errors.get() <= maxRetries && !toRetry.isEmpty()) { int atOnce = Math.min(Math.min(toRetry.size(), errors.get()), parallelDegree); CountDownLatch retryLatch = new CountDownLatch(atOnce); for (int i = 0; i < atOnce; i++) { http://git-wip-us.apache.org/repos/asf/jclouds/blob/e711275f/apis/vcloud/src/main/java/org/jclouds/vcloud/binders/BindInstantiateVAppTemplateParamsToXmlPayload.java ---------------------------------------------------------------------- diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/binders/BindInstantiateVAppTemplateParamsToXmlPayload.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/binders/BindInstantiateVAppTemplateParamsToXmlPayload.java index 08e5443..5576ca0 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/binders/BindInstantiateVAppTemplateParamsToXmlPayload.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/binders/BindInstantiateVAppTemplateParamsToXmlPayload.java @@ -95,7 +95,7 @@ public class BindInstantiateVAppTemplateParamsToXmlPayload implements MapBinder InstantiateVAppTemplateOptions options = findOptionsInArgsOrNull(gRequest); if (options != null) { - if (options.getNetworkConfig().size() > 0) + if (!options.getNetworkConfig().isEmpty()) networkConfig = ImmutableSet .copyOf(transform(options.getNetworkConfig(), networkConfigDecorator)); } else { @@ -125,7 +125,7 @@ public class BindInstantiateVAppTemplateParamsToXmlPayload implements MapBinder VAppTemplate vAppTemplate = templateCache.getUnchecked(template); checkArgument(vAppTemplate != null, "vAppTemplate %s not found!", template); vms = vAppTemplate.getChildren(); - checkArgument(vms.size() > 0, "no vms found in vAppTemplate %s", vAppTemplate); + checkArgument(!vms.isEmpty(), "no vms found in vAppTemplate %s", vAppTemplate); } return vms; } http://git-wip-us.apache.org/repos/asf/jclouds/blob/e711275f/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/functions/HardwareForVApp.java ---------------------------------------------------------------------- diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/functions/HardwareForVApp.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/functions/HardwareForVApp.java index ebfb010..6ec2bf8 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/functions/HardwareForVApp.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/functions/HardwareForVApp.java @@ -53,7 +53,7 @@ public class HardwareForVApp implements Function<VApp, Hardware> { public Hardware apply(VApp from) { checkNotNull(from, "VApp"); // TODO make this work with composite vApps - Vm vm = from.getChildren().size() == 0 ? null : Iterables.get(from.getChildren(), 0); + Vm vm = from.getChildren().isEmpty() ? null : Iterables.get(from.getChildren(), 0); if (vm == null) return null; http://git-wip-us.apache.org/repos/asf/jclouds/blob/e711275f/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/functions/ValidateVAppTemplateAndReturnEnvelopeOrThrowIllegalArgumentException.java ---------------------------------------------------------------------- diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/functions/ValidateVAppTemplateAndReturnEnvelopeOrThrowIllegalArgumentException.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/functions/ValidateVAppTemplateAndReturnEnvelopeOrThrowIllegalArgumentException.java index dce8306..6114281 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/functions/ValidateVAppTemplateAndReturnEnvelopeOrThrowIllegalArgumentException.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/functions/ValidateVAppTemplateAndReturnEnvelopeOrThrowIllegalArgumentException.java @@ -63,7 +63,7 @@ public class ValidateVAppTemplateAndReturnEnvelopeOrThrowIllegalArgumentExceptio Envelope ovf; try { ovf = envelopes.get(from.getHref()); - checkArgument(ovf.getVirtualSystem().getVirtualHardwareSections().size() > 0, + checkArgument(!ovf.getVirtualSystem().getVirtualHardwareSections().isEmpty(), "no hardware sections exist in ovf %s", ovf); } catch (ExecutionException e) { throw new IllegalArgumentException("no ovf envelope found for: " + from, e); http://git-wip-us.apache.org/repos/asf/jclouds/blob/e711275f/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/strategy/InstantiateVAppTemplateWithGroupEncodedIntoNameThenCustomizeDeployAndPowerOn.java ---------------------------------------------------------------------- diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/strategy/InstantiateVAppTemplateWithGroupEncodedIntoNameThenCustomizeDeployAndPowerOn.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/strategy/InstantiateVAppTemplateWithGroupEncodedIntoNameThenCustomizeDeployAndPowerOn.java index e8b9fcd..574f3e7 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/strategy/InstantiateVAppTemplateWithGroupEncodedIntoNameThenCustomizeDeployAndPowerOn.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/strategy/InstantiateVAppTemplateWithGroupEncodedIntoNameThenCustomizeDeployAndPowerOn.java @@ -85,7 +85,7 @@ public class InstantiateVAppTemplateWithGroupEncodedIntoNameThenCustomizeDeployA this.networkConfigurationForNetworkAndOptions = networkConfigurationForNetworkAndOptions; this.buildVersion = buildVersion; } - + /** * per john ellis at bluelock, vCloud Director 1.5 is more strict than earlier versions. * <p/> @@ -95,19 +95,19 @@ public class InstantiateVAppTemplateWithGroupEncodedIntoNameThenCustomizeDeployA */ public static enum ComputerNameValidator { INSTANCE; - + private DnsNameValidator validator; ComputerNameValidator() { this.validator = new DnsNameValidator(3, 15); } - + public void validate(@Nullable String t) throws IllegalArgumentException { this.validator.validate(t); } } - + public NodeAndInitialCredentials<VApp> createNodeWithGroupEncodedIntoName(String group, String name, Template template) { // no sense waiting until failures occur later ComputerNameValidator.INSTANCE.validate(name); @@ -156,11 +156,11 @@ public class InstantiateVAppTemplateWithGroupEncodedIntoNameThenCustomizeDeployA getCredentialsFrom(vAppResponse)); } - + @VisibleForTesting protected VApp instantiateVAppFromTemplate(String name, Template template) { VCloudTemplateOptions vOptions = VCloudTemplateOptions.class.cast(template.getOptions()); - + URI templateId = URI.create(template.getImage().getId()); VAppTemplate vAppTemplate = vAppTemplates.getUnchecked(templateId); @@ -175,7 +175,7 @@ public class InstantiateVAppTemplateWithGroupEncodedIntoNameThenCustomizeDeployA Network networkToConnect = get(vAppTemplate.getNetworkSection().getNetworks(), 0); - + NetworkConfig config = networkConfigurationForNetworkAndOptions.apply(networkToConnect, vOptions); // note that in VCD 1.5, the network name after instantiation will be the same as the parent @@ -217,7 +217,7 @@ public class InstantiateVAppTemplateWithGroupEncodedIntoNameThenCustomizeDeployA } }; - + public void waitForTask(Task task) { if (!successTester.apply(task.getHref())) { throw new TaskStillRunningException(task); @@ -251,7 +251,7 @@ public class InstantiateVAppTemplateWithGroupEncodedIntoNameThenCustomizeDeployA Vm vm = get(vApp.getChildren(), 0); NetworkConnectionSection net = vm.getNetworkConnectionSection(); - checkArgument(net.getConnections().size() > 0, "no connections on vm %s", vm); + checkArgument(!net.getConnections().isEmpty(), "no connections on vm %s", vm); NetworkConnection toConnect = findWithPoolAllocationOrFirst(net); http://git-wip-us.apache.org/repos/asf/jclouds/blob/e711275f/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/strategy/VCloudComputeServiceAdapter.java ---------------------------------------------------------------------- diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/strategy/VCloudComputeServiceAdapter.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/strategy/VCloudComputeServiceAdapter.java index cd636df..4d300c8 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/strategy/VCloudComputeServiceAdapter.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/strategy/VCloudComputeServiceAdapter.java @@ -179,13 +179,13 @@ public class VCloudComputeServiceAdapter implements ComputeServiceAdapter<VApp, URI id = URI.create(in); return client.getVAppApi().getVApp(id); } - + @Override public VAppTemplate getImage(String in) { URI id = URI.create(in); return client.getVAppTemplateApi().getVAppTemplate(id); } - + @Override public void destroyNode(String id) { URI vappId = URI.create(checkNotNull(id, "node.id")); @@ -215,7 +215,7 @@ public class VCloudComputeServiceAdapter implements ComputeServiceAdapter<VApp, VApp waitForPendingTasksToComplete(URI vappId) { VApp vApp = client.getVAppApi().getVApp(vappId); - if (vApp.getTasks().size() == 0) + if (vApp.getTasks().isEmpty()) return vApp; for (Task task : vApp.getTasks()) waitForTask(task); @@ -224,7 +224,7 @@ public class VCloudComputeServiceAdapter implements ComputeServiceAdapter<VApp, VApp cancelAnyRunningTasks(URI vappId) { VApp vApp = client.getVAppApi().getVApp(vappId); - if (vApp.getTasks().size() == 0) + if (vApp.getTasks().isEmpty()) return vApp; for (Task task : vApp.getTasks()) { try { @@ -238,7 +238,7 @@ public class VCloudComputeServiceAdapter implements ComputeServiceAdapter<VApp, } public void waitForTask(Task task) { - if (!successTester.apply(task.getHref())) + if (!successTester.apply(task.getHref())) throw new TaskStillRunningException(task); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/e711275f/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/util/VCloudComputeUtils.java ---------------------------------------------------------------------- diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/util/VCloudComputeUtils.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/util/VCloudComputeUtils.java index 905565e..7d2d80f 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/util/VCloudComputeUtils.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/util/VCloudComputeUtils.java @@ -44,7 +44,7 @@ public class VCloudComputeUtils { public static CIMOperatingSystem toComputeOs(VApp vApp) { // TODO we need to change the design so that it doesn't assume single-vms - return vApp.getChildren().size() > 0 ? toComputeOs(Iterables.get(vApp.getChildren(), 0)) : null; + return !vApp.getChildren().isEmpty() ? toComputeOs(Iterables.get(vApp.getChildren(), 0)) : null; } public static CIMOperatingSystem toComputeOs(Vm vm) { @@ -52,7 +52,7 @@ public class VCloudComputeUtils { } public static String getVirtualSystemIdentifierOfFirstVMIn(VApp vApp) { - return vApp.getChildren().size() > 0 ? getVirtualSystemIdentifierOf(Iterables.get(vApp.getChildren(), 0)) : null; + return !vApp.getChildren().isEmpty() ? getVirtualSystemIdentifierOf(Iterables.get(vApp.getChildren(), 0)) : null; } public static String getVirtualSystemIdentifierOf(Vm vm) { @@ -62,11 +62,11 @@ public class VCloudComputeUtils { } public static LoginCredentials getCredentialsFrom(VApp vApp) { - return vApp.getChildren().size() > 0 ? getCredentialsFrom(Iterables.get(vApp.getChildren(), 0)) : null; + return !vApp.getChildren().isEmpty() ? getCredentialsFrom(Iterables.get(vApp.getChildren(), 0)) : null; } public static LoginCredentials getCredentialsFrom(VAppTemplate vApp) { - return vApp.getChildren().size() > 0 ? getCredentialsFrom(Iterables.get(vApp.getChildren(), 0)) : null; + return !vApp.getChildren().isEmpty() ? getCredentialsFrom(Iterables.get(vApp.getChildren(), 0)) : null; } public static LoginCredentials getCredentialsFrom(Vm vm) { @@ -78,7 +78,7 @@ public class VCloudComputeUtils { public static Set<String> getIpsFromVApp(VApp vApp) { // TODO make this work with composite vApps - if (vApp.getChildren().size() == 0) + if (vApp.getChildren().isEmpty()) return ImmutableSet.of(); Builder<String> ips = ImmutableSet.builder(); Vm vm = Iterables.get(vApp.getChildren(), 0); http://git-wip-us.apache.org/repos/asf/jclouds/blob/e711275f/apis/vcloud/src/main/java/org/jclouds/vcloud/config/VCloudHttpApiModule.java ---------------------------------------------------------------------- diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/config/VCloudHttpApiModule.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/config/VCloudHttpApiModule.java index 1f2f07c..5a98257b 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/config/VCloudHttpApiModule.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/config/VCloudHttpApiModule.java @@ -122,7 +122,7 @@ public class VCloudHttpApiModule extends HttpApiModule<VCloudApi> { public VCloudSession get() { return login.login(); } - + @Override public String toString() { return MoreObjects.toStringHelper(login).add("method", "login").toString(); @@ -362,7 +362,7 @@ public class VCloudHttpApiModule extends HttpApiModule<VCloudApi> { @Override public URI get() { SortedMap<String, URI> versions = versionService.getSupportedVersions(); - checkState(versions.size() > 0, "No versions present"); + checkState(!versions.isEmpty(), "No versions present"); checkState(versions.containsKey(version), "version " + version + " not present in: " + versions); return versions.get(version); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/e711275f/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/FirewallService.java ---------------------------------------------------------------------- diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/FirewallService.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/FirewallService.java index fb52cdc..7b71a6a 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/FirewallService.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/FirewallService.java @@ -45,7 +45,7 @@ public class FirewallService { /** * @return Firewall rules for the network - * + * * @since vcloud api 0.8 */ public List<FirewallRule> getFirewallRules() { @@ -54,7 +54,7 @@ public class FirewallService { /** * @return true if the service is enabled - * + * * @since vcloud api 0.9 */ @Nullable @@ -80,7 +80,7 @@ public class FirewallService { @Override public String toString() { ToStringHelper helper = MoreObjects.toStringHelper("").omitNullValues().add("enabled", enabled); - if (firewallRules.size() > 0) + if (!firewallRules.isEmpty()) helper.add("firewallRules", firewallRules); return helper.toString(); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/e711275f/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/IpScope.java ---------------------------------------------------------------------- diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/IpScope.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/IpScope.java index 65a9942..da042fa 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/IpScope.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/IpScope.java @@ -72,7 +72,7 @@ public class IpScope { /** * @return IP address of the network gateway - * + * * @since vcloud api 0.8 */ @Nullable @@ -82,7 +82,7 @@ public class IpScope { /** * @return netmask to apply to addresses on the network - * + * * @since vcloud api 0.8 */ @Nullable @@ -92,7 +92,7 @@ public class IpScope { /** * @return IP address of the primary DNS server for this network - * + * * @since vcloud api 0.9 */ @Nullable @@ -102,7 +102,7 @@ public class IpScope { /** * @return IP address of the secondary DNS server for this network - * + * * @since vcloud api 0.9 */ @Nullable @@ -112,7 +112,7 @@ public class IpScope { /** * @return suffix to be applied when resolving hostnames that are not fullyâqualified. - * + * * @since vcloud api 0.9 */ @Nullable @@ -122,7 +122,7 @@ public class IpScope { /** * @return A container for IpRange elements. - * + * * @since vcloud api 0.9 */ public Set<IpRange> getIpRanges() { @@ -131,7 +131,7 @@ public class IpScope { /** * @return A list of addresses allocated from any of the specified IpRanges - * + * * @since vcloud api 0.9 */ public Set<String> getAllocatedIpAddresses() { @@ -161,9 +161,9 @@ public class IpScope { public String toString() { ToStringHelper helper = MoreObjects.toStringHelper("").omitNullValues().add("inherited", inherited).add("gateway", gateway) .add("netmask", netmask).add("dns1", dns1).add("dns2", dns2).add("dnsSuffix", dnsSuffix); - if (ipRanges.size() > 0) + if (!ipRanges.isEmpty()) helper.add("ipRanges", ipRanges); - if (allocatedIpAddresses.size() > 0) + if (!allocatedIpAddresses.isEmpty()) helper.add("allocatedIpAddresses", allocatedIpAddresses); return helper.toString(); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/e711275f/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/NatService.java ---------------------------------------------------------------------- diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/NatService.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/NatService.java index e9fe116..240d780 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/NatService.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/NatService.java @@ -53,7 +53,7 @@ public class NatService { /** * @return Nat rules for the network - * + * * @since vcloud api 0.8 */ public List<NatRule> getNatRules() { @@ -62,7 +62,7 @@ public class NatService { /** * @return true if the service is enabled - * + * * @since vcloud api 0.9 */ public boolean isEnabled() { @@ -71,7 +71,7 @@ public class NatService { /** * @return specifies how Network Address Translation is implemented by the NAT service - * + * * @since vcloud api 0.9 */ @Nullable @@ -81,7 +81,7 @@ public class NatService { /** * @return specifies how packets are handled by the NAT service. - * + * * @since vcloud api 0.9 */ @Nullable @@ -109,7 +109,7 @@ public class NatService { public String toString() { ToStringHelper helper = MoreObjects.toStringHelper("").omitNullValues().add("enabled", enabled) .add("type", type).add("policy", policy); - if (natRules.size() > 0) + if (!natRules.isEmpty()) helper.add("natRules", natRules); return helper.toString(); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/e711275f/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/internal/OrgNetworkImpl.java ---------------------------------------------------------------------- diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/internal/OrgNetworkImpl.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/internal/OrgNetworkImpl.java index 8f7a65d..29add2c 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/internal/OrgNetworkImpl.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/internal/OrgNetworkImpl.java @@ -189,9 +189,9 @@ public class OrgNetworkImpl extends ReferenceTypeImpl implements OrgNetwork { public ToStringHelper string() { ToStringHelper helper = super.string().add("org", org).add("description", description) .add("configuration", configuration).add("networkPool", networkPool); - if (allowedExternalIpAddresses.size() > 0) + if (!allowedExternalIpAddresses.isEmpty()) helper.add("allowedExternalIpAddresses", allowedExternalIpAddresses); - if (tasks.size() > 0) + if (!tasks.isEmpty()) helper.add("tasks", tasks); return helper; } http://git-wip-us.apache.org/repos/asf/jclouds/blob/e711275f/apis/vcloud/src/main/java/org/jclouds/vcloud/functions/DefaultNetworkNameInTemplate.java ---------------------------------------------------------------------- diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/functions/DefaultNetworkNameInTemplate.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/functions/DefaultNetworkNameInTemplate.java index eeecb8d..11712cc 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/functions/DefaultNetworkNameInTemplate.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/functions/DefaultNetworkNameInTemplate.java @@ -39,7 +39,7 @@ public class DefaultNetworkNameInTemplate implements Function<VAppTemplate, Stri public String apply(VAppTemplate vAppTemplate) { checkArgument(vAppTemplate != null, "vAppTemplate was null!"); Set<Network> networks = vAppTemplate.getNetworkSection().getNetworks(); - checkArgument(networks.size() > 0, "no networks found in vAppTemplate %s", vAppTemplate); + checkArgument(!networks.isEmpty(), "no networks found in vAppTemplate %s", vAppTemplate); if (networks.size() > 1) logger.warn("multiple networks found for %s, choosing first from: %s", vAppTemplate.getName(), networks); return get(networks, 0).getName(); http://git-wip-us.apache.org/repos/asf/jclouds/blob/e711275f/apis/vcloud/src/main/java/org/jclouds/vcloud/location/OrgAndVDCToLocationSupplier.java ---------------------------------------------------------------------- diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/location/OrgAndVDCToLocationSupplier.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/location/OrgAndVDCToLocationSupplier.java index 92b3c2e..a0c1505 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/location/OrgAndVDCToLocationSupplier.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/location/OrgAndVDCToLocationSupplier.java @@ -67,7 +67,7 @@ public class OrgAndVDCToLocationSupplier extends JustProvider implements Locatio protected Builder<Location> buildJustProviderOrVDCs() { Builder<Location> locations = ImmutableSet.builder(); Location provider = Iterables.getOnlyElement(super.get()); - if (orgNameToResource.get().size() == 0) + if (orgNameToResource.get().isEmpty()) return locations.add(provider); Map<String, Supplier<Set<String>>> isoCodesById = isoCodesByIdSupplier.get(); for (ReferenceType org : orgNameToResource.get().values()) { http://git-wip-us.apache.org/repos/asf/jclouds/blob/e711275f/apis/vcloud/src/main/java/org/jclouds/vcloud/options/InstantiateVAppTemplateOptions.java ---------------------------------------------------------------------- diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/options/InstantiateVAppTemplateOptions.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/options/InstantiateVAppTemplateOptions.java index 9a21caf..090b7a4 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/options/InstantiateVAppTemplateOptions.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/options/InstantiateVAppTemplateOptions.java @@ -76,7 +76,7 @@ public class InstantiateVAppTemplateOptions { /** * {@networkConfig VAppTemplate}s have internal networks that can be * connected in order to access the internet or other external networks. - * + * * <h4>default behaviour if you don't use this option</h4> By default, we * connect the first internal {@networkConfig * org.jclouds.vcloud.domain.VAppTemplate#getNetworkSection network in the @@ -153,16 +153,16 @@ public class InstantiateVAppTemplateOptions { public int hashCode() { return Objects.hashCode(networkConfig, customizeOnInstantiate, description, deploy, powerOn); } - + @Override public String toString() { return string().toString(); } - + protected ToStringHelper string() { ToStringHelper toString = MoreObjects.toStringHelper("").omitNullValues(); toString.add("customizeOnInstantiate", customizeOnInstantiate).add("description", description); - if (networkConfig.size() > 0) + if (!networkConfig.isEmpty()) toString.add("networkConfig", networkConfig); if (!deploy) toString.add("deploy", deploy); http://git-wip-us.apache.org/repos/asf/jclouds/blob/e711275f/apis/vcloud/src/main/java/org/jclouds/vcloud/suppliers/OnlyReferenceTypeFirstWithNameMatchingConfigurationKeyOrDefault.java ---------------------------------------------------------------------- diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/suppliers/OnlyReferenceTypeFirstWithNameMatchingConfigurationKeyOrDefault.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/suppliers/OnlyReferenceTypeFirstWithNameMatchingConfigurationKeyOrDefault.java index 938b6fd..fbe8406 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/suppliers/OnlyReferenceTypeFirstWithNameMatchingConfigurationKeyOrDefault.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/suppliers/OnlyReferenceTypeFirstWithNameMatchingConfigurationKeyOrDefault.java @@ -46,7 +46,7 @@ public class OnlyReferenceTypeFirstWithNameMatchingConfigurationKeyOrDefault imp @Override public ReferenceType apply(Iterable<ReferenceType> referenceTypes) { checkNotNull(referenceTypes, "referenceTypes"); - checkArgument(Iterables.size(referenceTypes) > 0, + checkArgument(!Iterables.isEmpty(referenceTypes), "No referenceTypes corresponding to configuration key %s present", configurationKey); if (Iterables.size(referenceTypes) == 1) return Iterables.getLast(referenceTypes); http://git-wip-us.apache.org/repos/asf/jclouds/blob/e711275f/apis/vcloud/src/main/java/org/jclouds/vcloud/xml/ovf/VCloudResourceAllocationSettingDataHandler.java ---------------------------------------------------------------------- diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/xml/ovf/VCloudResourceAllocationSettingDataHandler.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/xml/ovf/VCloudResourceAllocationSettingDataHandler.java index b576c1f..5331a34 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/xml/ovf/VCloudResourceAllocationSettingDataHandler.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/xml/ovf/VCloudResourceAllocationSettingDataHandler.java @@ -71,11 +71,11 @@ public class VCloudResourceAllocationSettingDataHandler extends ResourceAllocati Map<String, String> attributes = SaxUtils.cleanseAttributes(attrs); if (qName.endsWith("Link")) { this.edit = Utils.newReferenceType(attributes); - } else if (qName.endsWith("HostResource") && attributes.size() > 0) { + } else if (qName.endsWith("HostResource") && !attributes.isEmpty()) { capacity = Long.parseLong(attributes.get("capacity")); busType = Integer.parseInt(attributes.get("busType")); busSubType = attributes.get("busSubType"); - } else if (qName.endsWith("Connection") && attributes.size() > 0) { + } else if (qName.endsWith("Connection") && !attributes.isEmpty()) { ipAddress = attributes.get("ipAddress"); primaryNetworkConnection = Boolean.parseBoolean(attributes.get("primaryNetworkConnection")); ipAddressingMode = attributes.get("ipAddressingMode"); http://git-wip-us.apache.org/repos/asf/jclouds/blob/e711275f/blobstore/src/main/java/org/jclouds/blobstore/LocalAsyncBlobStore.java ---------------------------------------------------------------------- diff --git a/blobstore/src/main/java/org/jclouds/blobstore/LocalAsyncBlobStore.java b/blobstore/src/main/java/org/jclouds/blobstore/LocalAsyncBlobStore.java index 6ddf6a3..71c2c4e 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/LocalAsyncBlobStore.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/LocalAsyncBlobStore.java @@ -467,7 +467,7 @@ public class LocalAsyncBlobStore extends BaseAsyncBlobStore { } blob = copyBlob(blob); - if (options.getRanges() != null && options.getRanges().size() > 0) { + if (options.getRanges() != null && !options.getRanges().isEmpty()) { byte[] data; try { data = ByteStreams2.toByteArrayAndClose(blob.getPayload().openStream()); http://git-wip-us.apache.org/repos/asf/jclouds/blob/e711275f/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/MarkersDeleteDirectoryStrategy.java ---------------------------------------------------------------------- diff --git a/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/MarkersDeleteDirectoryStrategy.java b/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/MarkersDeleteDirectoryStrategy.java index f3b7813..81a6a37 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/MarkersDeleteDirectoryStrategy.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/MarkersDeleteDirectoryStrategy.java @@ -45,7 +45,7 @@ import com.google.inject.Inject; * Key-value implementations of BlobStore, such as S3, do not have directories. In following the * rackspace cloud files project, we use an empty object '#{dirpath}' with content type set to * 'application/directory'. - * + * * <p/> * To interoperate with other S3 tools, we accept the following ways to tell if the directory * exists: @@ -57,7 +57,7 @@ import com.google.inject.Inject; * <li>if both a file with the name of a directory and a marker for that directory exists, then the * *file masks the directory*, and the directory is never returned.</li> * </ul> - * + * * @see MarkerFileMkdirStrategy */ @Singleton @@ -103,7 +103,7 @@ public class MarkersDeleteDirectoryStrategy implements DeleteDirectoryStrategy { } catch (TimeoutException te) { throw propagate(te); } - if (exceptions.size() > 0) + if (!exceptions.isEmpty()) throw new BlobRuntimeException(String.format("error %s: %s", message, exceptions)); assert !blobstore.directoryExists(containerName, directory) : String.format( "still exists %s: %s", message, exceptions); http://git-wip-us.apache.org/repos/asf/jclouds/blob/e711275f/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/PutBlobsStrategyImpl.java ---------------------------------------------------------------------- diff --git a/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/PutBlobsStrategyImpl.java b/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/PutBlobsStrategyImpl.java index e72fff0..6cf457c 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/PutBlobsStrategyImpl.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/PutBlobsStrategyImpl.java @@ -74,7 +74,7 @@ public class PutBlobsStrategyImpl implements PutBlobsStrategy { } catch (TimeoutException te) { throw propagate(te); } - if (exceptions.size() > 0) + if (!exceptions.isEmpty()) throw new BlobRuntimeException(String.format("error putting into container %s: %s", containerName, exceptions)); }
