Repository: jclouds Updated Branches: refs/heads/master 192785dba -> e711275fb
http://git-wip-us.apache.org/repos/asf/jclouds/blob/e711275f/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/AWSEC2TemplateOptions.java ---------------------------------------------------------------------- diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/AWSEC2TemplateOptions.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/AWSEC2TemplateOptions.java index d1ec773..82f0cd4 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/AWSEC2TemplateOptions.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/AWSEC2TemplateOptions.java @@ -79,7 +79,7 @@ public class AWSEC2TemplateOptions extends EC2TemplateOptions implements Cloneab eTo.noPlacementGroup(); if (getPlacementGroup() != null) eTo.placementGroup(getPlacementGroup()); - if (getGroupIds().size() > 0) + if (!getGroupIds().isEmpty()) eTo.securityGroupIds(getGroupIds()); if (getSpotPrice() != null) eTo.spotPrice(getSpotPrice()); @@ -131,7 +131,7 @@ public class AWSEC2TemplateOptions extends EC2TemplateOptions implements Cloneab toString.add("spotPrice", spotPrice); if (spotOptions != RequestSpotInstancesOptions.NONE) toString.add("spotOptions", spotOptions); - if (groupIds.size() != 0) + if (!groupIds.isEmpty()) toString.add("groupIds", groupIds); toString.add("iamInstanceProfileArn", iamInstanceProfileArn); toString.add("iamInstanceProfileName", iamInstanceProfileName); @@ -142,7 +142,7 @@ public class AWSEC2TemplateOptions extends EC2TemplateOptions implements Cloneab /** * Enable Cloudwatch monitoring - * + * * @see CloudWatchClient */ public AWSEC2TemplateOptions enableMonitoring() { @@ -212,7 +212,7 @@ public class AWSEC2TemplateOptions extends EC2TemplateOptions implements Cloneab } /** - * + * * @see AWSEC2TemplateOptions#securityGroupIds(Iterable<String>) */ public AWSEC2TemplateOptions securityGroupIds(String... groupIds) { @@ -223,7 +223,7 @@ public class AWSEC2TemplateOptions extends EC2TemplateOptions implements Cloneab * Specifies the security group ids to be used for nodes with this template */ public AWSEC2TemplateOptions securityGroupIds(Iterable<String> groupIds) { - checkArgument(Iterables.size(groupIds) > 0, "you must specify at least one security group"); + checkArgument(!Iterables.isEmpty(groupIds), "you must specify at least one security group"); for (String groupId : groupIds) checkNotNull(emptyToNull(groupId), "all security groups must be non-empty"); this.groupIds = ImmutableSet.copyOf(groupIds); @@ -685,7 +685,7 @@ public class AWSEC2TemplateOptions extends EC2TemplateOptions implements Cloneab public AWSEC2TemplateOptions runScript(Statement script) { return AWSEC2TemplateOptions.class.cast(super.runScript(script)); } - + /** * {@inheritDoc} */ @@ -771,7 +771,7 @@ public class AWSEC2TemplateOptions extends EC2TemplateOptions implements Cloneab /** * The Amazon resource name (ARN) of the IAM Instance Profile (IIP) to associate with the instance. - * + * * @see org.jclouds.aws.ec2.options.AWSRunInstancesOptions#withIAMInstanceProfileArn(String) */ @SinceApiVersion("2012-06-01") @@ -781,7 +781,7 @@ public class AWSEC2TemplateOptions extends EC2TemplateOptions implements Cloneab /** * The name of the IAM Instance Profile (IIP) to associate with the instance. - * + * * @see org.jclouds.aws.ec2.options.AWSRunInstancesOptions#withIAMInstanceProfileName(String) */ @SinceApiVersion("2012-06-01") http://git-wip-us.apache.org/repos/asf/jclouds/blob/e711275f/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/config/AWSEC2ComputeServiceContextModule.java ---------------------------------------------------------------------- diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/config/AWSEC2ComputeServiceContextModule.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/config/AWSEC2ComputeServiceContextModule.java index 2f801bf..cde8e59 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/config/AWSEC2ComputeServiceContextModule.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/config/AWSEC2ComputeServiceContextModule.java @@ -95,13 +95,13 @@ public class AWSEC2ComputeServiceContextModule extends BaseComputeServiceContext protected void installDependencies() { install(new AWSEC2ComputeServiceDependenciesModule()); } - + @Override protected boolean shouldEagerlyParseImages(Injector injector) { Map<String, String> queries = injector.getInstance(Key.get(new TypeLiteral<Map<String, String>>() { }, ImageQuery.class)); // If no queries defined, then will never lookup all images - return queries.size() > 0; + return !queries.isEmpty(); } // duplicates EC2ComputeServiceContextModule; but that's easiest thing to do with guice; could extract to common util @@ -143,7 +143,7 @@ public class AWSEC2ComputeServiceContextModule extends BaseComputeServiceContext }; return new SetAndThrowAuthorizationExceptionSupplier<Image>(rawSupplier, authException).get(); } - + }); } @@ -157,7 +157,7 @@ public class AWSEC2ComputeServiceContextModule extends BaseComputeServiceContext /** * With amazon linux 2011.09, ssh starts after package updates, which slows the boot process and * runs us out of ssh retries (context property {@code "jclouds.ssh.max-retries"}). - * + * * @see <a href="http://aws.amazon.com/amazon-linux-ami/latest-release-notes/"; /> * @see AWSEC2PropertiesBuilder#defaultProperties */ @@ -165,7 +165,7 @@ public class AWSEC2ComputeServiceContextModule extends BaseComputeServiceContext protected TemplateOptions provideTemplateOptions(Injector injector, TemplateOptions options) { return options.as(EC2TemplateOptions.class).userData("#cloud-config\nrepo_upgrade: none\n".getBytes()); } - + @Override protected Optional<ImageExtension> provideImageExtension(Injector i) { return Optional.of(i.getInstance(ImageExtension.class)); http://git-wip-us.apache.org/repos/asf/jclouds/blob/e711275f/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/extensions/AWSEC2SecurityGroupExtension.java ---------------------------------------------------------------------- diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/extensions/AWSEC2SecurityGroupExtension.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/extensions/AWSEC2SecurityGroupExtension.java index b73ff43..68fc14f 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/extensions/AWSEC2SecurityGroupExtension.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/extensions/AWSEC2SecurityGroupExtension.java @@ -136,14 +136,14 @@ public class AWSEC2SecurityGroupExtension extends EC2SecurityGroupExtension { builder.ipProtocol(protocol); builder.fromPort(startPort); builder.toPort(endPort); - - if (Iterables.size(ipRanges) > 0) { + + if (!Iterables.isEmpty(ipRanges)) { for (String cidr : ipRanges) { builder.cidrBlock(cidr); } } - if (tenantIdGroupNamePairs.size() > 0) { + if (!tenantIdGroupNamePairs.isEmpty()) { for (String userId : tenantIdGroupNamePairs.keySet()) { for (String groupString : tenantIdGroupNamePairs.get(userId)) { String[] parts = AWSUtils.parseHandle(groupString); @@ -157,7 +157,7 @@ public class AWSEC2SecurityGroupExtension extends EC2SecurityGroupExtension { return getSecurityGroupById(group.getId()); } - + @Override public SecurityGroup removeIpPermission(IpPermission ipPermission, SecurityGroup group) { String region = AWSUtils.getRegionFromLocationOrNull(group.getLocation()); @@ -181,14 +181,14 @@ public class AWSEC2SecurityGroupExtension extends EC2SecurityGroupExtension { builder.ipProtocol(protocol); builder.fromPort(startPort); builder.toPort(endPort); - - if (Iterables.size(ipRanges) > 0) { + + if (!Iterables.isEmpty(ipRanges)) { for (String cidr : ipRanges) { builder.cidrBlock(cidr); } } - if (tenantIdGroupNamePairs.size() > 0) { + if (!tenantIdGroupNamePairs.isEmpty()) { for (String userId : tenantIdGroupNamePairs.keySet()) { for (String groupString : tenantIdGroupNamePairs.get(userId)) { String[] parts = AWSUtils.parseHandle(groupString); http://git-wip-us.apache.org/repos/asf/jclouds/blob/e711275f/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/loaders/AWSEC2CreateSecurityGroupIfNeeded.java ---------------------------------------------------------------------- diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/loaders/AWSEC2CreateSecurityGroupIfNeeded.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/loaders/AWSEC2CreateSecurityGroupIfNeeded.java index dd8ccf8..81f3e34 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/loaders/AWSEC2CreateSecurityGroupIfNeeded.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/loaders/AWSEC2CreateSecurityGroupIfNeeded.java @@ -121,11 +121,11 @@ public class AWSEC2CreateSecurityGroupIfNeeded extends CacheLoader<RegionAndName Set<IpPermission> perms = permissions.build(); - if (perms.size() > 0) { + if (!perms.isEmpty()) { logger.debug(">> authorizing securityGroup region(%s) name(%s) IpPermissions(%s)", region, name, perms); securityApi.authorizeSecurityGroupIngressInRegion(region, id, perms); logger.debug("<< authorized securityGroup(%s)", name); - } + } } catch (IllegalStateException e) { logger.debug("<< reused securityGroup(%s)", name); http://git-wip-us.apache.org/repos/asf/jclouds/blob/e711275f/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/strategy/CreateKeyPairPlacementAndSecurityGroupsAsNeededAndReturnRunOptions.java ---------------------------------------------------------------------- diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/strategy/CreateKeyPairPlacementAndSecurityGroupsAsNeededAndReturnRunOptions.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/strategy/CreateKeyPairPlacementAndSecurityGroupsAsNeededAndReturnRunOptions.java index 78b9573..58dc2f1 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/strategy/CreateKeyPairPlacementAndSecurityGroupsAsNeededAndReturnRunOptions.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/strategy/CreateKeyPairPlacementAndSecurityGroupsAsNeededAndReturnRunOptions.java @@ -67,7 +67,7 @@ public class CreateKeyPairPlacementAndSecurityGroupsAsNeededAndReturnRunOptions Provider<RunInstancesOptions> optionsProvider, @Named("PLACEMENT") LoadingCache<RegionAndName, String> placementGroupMap, CreatePlacementGroupIfNeeded createPlacementGroupIfNeeded, - Function<RegionNameAndPublicKeyMaterial, KeyPair> importExistingKeyPair, + Function<RegionNameAndPublicKeyMaterial, KeyPair> importExistingKeyPair, GroupNamingConvention.Factory namingConvention) { super(makeKeyPair, credentialsMap, securityGroupMap, optionsProvider, namingConvention); this.placementGroupMap = placementGroupMap; @@ -166,7 +166,7 @@ public class CreateKeyPairPlacementAndSecurityGroupsAsNeededAndReturnRunOptions @Override protected boolean userSpecifiedTheirOwnGroups(TemplateOptions options) { return options instanceof AWSEC2TemplateOptions - && AWSEC2TemplateOptions.class.cast(options).getGroupIds().size() > 0 + && !AWSEC2TemplateOptions.class.cast(options).getGroupIds().isEmpty() || super.userSpecifiedTheirOwnGroups(options); } @@ -174,7 +174,7 @@ public class CreateKeyPairPlacementAndSecurityGroupsAsNeededAndReturnRunOptions protected void addSecurityGroups(String region, String group, Template template, RunInstancesOptions instanceOptions) { AWSEC2TemplateOptions awsTemplateOptions = AWSEC2TemplateOptions.class.cast(template.getOptions()); AWSRunInstancesOptions awsInstanceOptions = AWSRunInstancesOptions.class.cast(instanceOptions); - if (awsTemplateOptions.getGroupIds().size() > 0) + if (!awsTemplateOptions.getGroupIds().isEmpty()) awsInstanceOptions.withSecurityGroupIds(awsTemplateOptions.getGroupIds()); String subnetId = awsTemplateOptions.getSubnetId(); if (subnetId != null) { http://git-wip-us.apache.org/repos/asf/jclouds/blob/e711275f/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/AWSEC2ComputeServiceLiveTest.java ---------------------------------------------------------------------- diff --git a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/AWSEC2ComputeServiceLiveTest.java b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/AWSEC2ComputeServiceLiveTest.java index ba7431b..b16f2ca 100644 --- a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/AWSEC2ComputeServiceLiveTest.java +++ b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/AWSEC2ComputeServiceLiveTest.java @@ -161,7 +161,7 @@ public class AWSEC2ComputeServiceLiveTest extends EC2ComputeServiceLiveTest { .period(60) .statistic(Statistics.AVERAGE) .build()); - assert datapoints.size() > 0 : instance; + assert !datapoints.isEmpty() : instance; } finally { monitoringApi.close(); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/e711275f/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/features/SpotInstanceApiLiveTest.java ---------------------------------------------------------------------- diff --git a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/features/SpotInstanceApiLiveTest.java b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/features/SpotInstanceApiLiveTest.java index f7d2f87..c1201c9 100644 --- a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/features/SpotInstanceApiLiveTest.java +++ b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/features/SpotInstanceApiLiveTest.java @@ -134,7 +134,7 @@ public class SpotInstanceApiLiveTest extends BaseComputeServiceContextLiveTest for (String region : Region.DEFAULT_REGIONS) { Set<Spot> spots = client.getSpotInstanceApi().get().describeSpotPriceHistoryInRegion(region, from(new Date())); assertNotNull(spots); - assert spots.size() > 0; + assert !spots.isEmpty(); for (Spot spot : spots) { assert spot.getSpotPrice() > 0 : spots; assertEquals(spot.getRegion(), region); @@ -143,7 +143,7 @@ public class SpotInstanceApiLiveTest extends BaseComputeServiceContextLiveTest "Windows", "Windows (Amazon VPC)")).apply(spot.getProductDescription()) : spot; assert in( ImmutableSet.of("c1.medium", "c1.xlarge", "cc1.4xlarge", "cg1.4xlarge", "cc2.8xlarge", "m1.large", - "m1.small", "m1.medium", "m1.xlarge", "m2.2xlarge", "m2.4xlarge", "m2.xlarge", "m3.xlarge", + "m1.small", "m1.medium", "m1.xlarge", "m2.2xlarge", "m2.4xlarge", "m2.xlarge", "m3.xlarge", "m3.2xlarge", "t1.micro", "cr1.8xlarge")).apply( spot.getInstanceType()) : spot; http://git-wip-us.apache.org/repos/asf/jclouds/blob/e711275f/providers/aws-s3/src/main/java/org/jclouds/aws/s3/binders/BindPartIdsAndETagsToRequest.java ---------------------------------------------------------------------- diff --git a/providers/aws-s3/src/main/java/org/jclouds/aws/s3/binders/BindPartIdsAndETagsToRequest.java b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/binders/BindPartIdsAndETagsToRequest.java index f6edf02..464c206 100644 --- a/providers/aws-s3/src/main/java/org/jclouds/aws/s3/binders/BindPartIdsAndETagsToRequest.java +++ b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/binders/BindPartIdsAndETagsToRequest.java @@ -40,7 +40,7 @@ public class BindPartIdsAndETagsToRequest implements Binder { checkNotNull(request, "request"); Map<Integer, String> map = (Map<Integer, String>) input; - checkArgument(map.size() != 0, "Please send parts"); + checkArgument(!map.isEmpty(), "Please send parts"); StringBuilder content = new StringBuilder(); content.append("<CompleteMultipartUpload>"); for (Entry<Integer, String> entry : map.entrySet()) { http://git-wip-us.apache.org/repos/asf/jclouds/blob/e711275f/providers/aws-s3/src/main/java/org/jclouds/aws/s3/blobstore/strategy/internal/ParallelMultipartUploadStrategy.java ---------------------------------------------------------------------- diff --git a/providers/aws-s3/src/main/java/org/jclouds/aws/s3/blobstore/strategy/internal/ParallelMultipartUploadStrategy.java b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/blobstore/strategy/internal/ParallelMultipartUploadStrategy.java index ba6fa19..56b0a13 100644 --- a/providers/aws-s3/src/main/java/org/jclouds/aws/s3/blobstore/strategy/internal/ParallelMultipartUploadStrategy.java +++ b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/blobstore/strategy/internal/ParallelMultipartUploadStrategy.java @@ -61,16 +61,16 @@ public class ParallelMultipartUploadStrategy implements AsyncMultipartUploadStra @Resource @Named(BlobStoreConstants.BLOBSTORE_LOGGER) protected Logger logger = Logger.NULL; - + @VisibleForTesting static final int DEFAULT_PARALLEL_DEGREE = 4; @VisibleForTesting static final int DEFAULT_MIN_RETRIES = 5; @VisibleForTesting static final int DEFAULT_MAX_PERCENT_RETRIES = 10; - + private final ListeningExecutorService ioExecutor; - + @Inject(optional = true) @Named("jclouds.mpu.parallel.degree") @VisibleForTesting @@ -92,7 +92,7 @@ public class ParallelMultipartUploadStrategy implements AsyncMultipartUploadStra @Inject(optional = true) @Named(Constants.PROPERTY_REQUEST_TIMEOUT) protected Long maxTime; - + protected final AWSS3AsyncBlobStore ablobstore; protected final PayloadSlicer slicer; @@ -103,13 +103,13 @@ public class ParallelMultipartUploadStrategy implements AsyncMultipartUploadStra this.slicer = checkNotNull(slicer, "slicer"); this.ioExecutor = checkNotNull(ioExecutor, "ioExecutor"); } - - protected void prepareUploadPart(final String container, final String key, - final String uploadId, final Integer part, final Payload payload, - final long offset, final long size, final SortedMap<Integer, String> etags, - final BlockingQueue<Integer> activeParts, - final Map<Integer, ListenableFuture<String>> futureParts, - final AtomicInteger errors, final int maxRetries, final Map<Integer, Exception> errorMap, + + protected void prepareUploadPart(final String container, final String key, + final String uploadId, final Integer part, final Payload payload, + final long offset, final long size, final SortedMap<Integer, String> etags, + final BlockingQueue<Integer> activeParts, + final Map<Integer, ListenableFuture<String>> futureParts, + final AtomicInteger errors, final int maxRetries, final Map<Integer, Exception> errorMap, final Queue<Part> toRetry, final CountDownLatch latch) { if (errors.get() > maxRetries) { activeParts.remove(part); // remove part from the bounded-queue without blocking @@ -126,16 +126,16 @@ public class ParallelMultipartUploadStrategy implements AsyncMultipartUploadStra public void run() { try { etags.put(part, futureETag.get()); - logger.debug(String.format("async uploaded part %s of %s to container %s in %sms with uploadId %s", + logger.debug(String.format("async uploaded part %s of %s to container %s in %sms with uploadId %s", part, key, container, System.currentTimeMillis() - start, uploadId)); } catch (CancellationException e) { errorMap.put(part, e); - String message = String.format("%s while uploading part %s - [%s,%s] to container %s with uploadId: %s running since %dms", + String message = String.format("%s while uploading part %s - [%s,%s] to container %s with uploadId: %s running since %dms", e.getMessage(), part, offset, size, container, uploadId, System.currentTimeMillis() - start); logger.debug(message); } catch (Exception e) { errorMap.put(part, e); - String message = String.format("%s while uploading part %s - [%s,%s] to container %s with uploadId: %s running since %dms", + String message = String.format("%s while uploading part %s - [%s,%s] to container %s with uploadId: %s running since %dms", e.getMessage(), part, offset, size, container, uploadId, System.currentTimeMillis() - start); logger.error(message, e); if (errors.incrementAndGet() <= maxRetries) @@ -148,8 +148,8 @@ public class ParallelMultipartUploadStrategy implements AsyncMultipartUploadStra } }, ioExecutor); futureParts.put(part, futureETag); - } - + } + @Override public ListenableFuture<String> execute(final String container, final Blob blob, final PutOptions options) { return ioExecutor.submit(new Callable<String>() { @@ -167,7 +167,7 @@ public class ParallelMultipartUploadStrategy implements AsyncMultipartUploadStra AWSS3Client client = ablobstore .getContext().unwrap(AWSS3ApiMetadata.CONTEXT_TOKEN).getApi(); String uploadId = null; - final Map<Integer, ListenableFuture<String>> futureParts = + final Map<Integer, ListenableFuture<String>> futureParts = new ConcurrentHashMap<Integer, ListenableFuture<String>>(); final Map<Integer, Exception> errorMap = Maps.newHashMap(); AtomicInteger errors = new AtomicInteger(0); @@ -176,10 +176,10 @@ public class ParallelMultipartUploadStrategy implements AsyncMultipartUploadStra try { uploadId = client.initiateMultipartUpload(container, ObjectMetadataBuilder.create().key(key).build()); // TODO md5 - logger.debug(String.format("initiated multipart upload of %s to container %s" + - " with uploadId %s consisting from %s part (possible max. retries: %d)", + logger.debug(String.format("initiated multipart upload of %s to container %s" + + " with uploadId %s consisting from %s part (possible max. retries: %d)", key, container, uploadId, effectiveParts, maxRetries)); - // we need a bounded-blocking queue to control the amount of parallel jobs + // we need a bounded-blocking queue to control the amount of parallel jobs ArrayBlockingQueue<Integer> activeParts = new ArrayBlockingQueue<Integer>(parallelDegree); Queue<Part> toRetry = new ConcurrentLinkedQueue<Part>(); SortedMap<Integer, String> etags = new ConcurrentSkipListMap<Integer, String>(); @@ -188,35 +188,35 @@ public class ParallelMultipartUploadStrategy implements AsyncMultipartUploadStra while ((part = algorithm.getNextPart()) <= parts) { Integer partKey = Integer.valueOf(part); activeParts.put(partKey); - prepareUploadPart(container, key, uploadId, partKey, payload, - algorithm.getNextChunkOffset(), chunkSize, etags, + prepareUploadPart(container, key, uploadId, partKey, payload, + algorithm.getNextChunkOffset(), chunkSize, etags, activeParts, futureParts, errors, maxRetries, errorMap, toRetry, latch); } if (remaining > 0) { Integer partKey = Integer.valueOf(part); activeParts.put(partKey); - prepareUploadPart(container, key, uploadId, partKey, payload, - algorithm.getNextChunkOffset(), remaining, etags, + prepareUploadPart(container, key, uploadId, partKey, payload, + algorithm.getNextChunkOffset(), remaining, etags, activeParts, futureParts, errors, maxRetries, errorMap, toRetry, latch); } 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++) { Part failedPart = toRetry.poll(); Integer partKey = Integer.valueOf(failedPart.getPart()); activeParts.put(partKey); - prepareUploadPart(container, key, uploadId, partKey, payload, - failedPart.getOffset(), failedPart.getSize(), etags, + prepareUploadPart(container, key, uploadId, partKey, payload, + failedPart.getOffset(), failedPart.getSize(), etags, activeParts, futureParts, errors, maxRetries, errorMap, toRetry, retryLatch); } retryLatch.await(); } if (errors.get() > maxRetries) { throw new BlobRuntimeException(String.format( - "Too many failed parts: %s while multipart upload of %s to container %s with uploadId %s", + "Too many failed parts: %s while multipart upload of %s to container %s with uploadId %s", errors.get(), key, container, uploadId)); } String eTag = client.completeMultipartUpload(container, key, uploadId, etags); @@ -237,23 +237,23 @@ public class ParallelMultipartUploadStrategy implements AsyncMultipartUploadStra throw rtex; } } else { - // Issue 936: don't just call putBlob, as that will see options=multiPart and + // Issue 936: don't just call putBlob, as that will see options=multiPart and // recursively call this execute method again; instead mark as not multipart // because it can all fit in one go. PutOptions nonMultipartOptions = PutOptions.Builder.multipart(false); ListenableFuture<String> futureETag = ablobstore.putBlob(container, blob, nonMultipartOptions); - return maxTime != null ? + return maxTime != null ? futureETag.get(maxTime, TimeUnit.SECONDS) : futureETag.get(); } } }); } - + static class Part { private int part; private long offset; private long size; - + Part(int part, long offset, long size) { this.part = part; this.offset = offset; @@ -282,6 +282,6 @@ public class ParallelMultipartUploadStrategy implements AsyncMultipartUploadStra public void setSize(long size) { this.size = size; - } + } } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/e711275f/providers/azureblob/src/main/java/org/jclouds/azureblob/handlers/ParseAzureBlobErrorFromXmlContent.java ---------------------------------------------------------------------- diff --git a/providers/azureblob/src/main/java/org/jclouds/azureblob/handlers/ParseAzureBlobErrorFromXmlContent.java b/providers/azureblob/src/main/java/org/jclouds/azureblob/handlers/ParseAzureBlobErrorFromXmlContent.java index ff8ae7c..e6c20ae 100644 --- a/providers/azureblob/src/main/java/org/jclouds/azureblob/handlers/ParseAzureBlobErrorFromXmlContent.java +++ b/providers/azureblob/src/main/java/org/jclouds/azureblob/handlers/ParseAzureBlobErrorFromXmlContent.java @@ -51,7 +51,7 @@ public class ParseAzureBlobErrorFromXmlContent extends ParseAzureStorageErrorFro List<String> parts = Lists.newArrayList(Splitter.on('/').split( command.getCurrentRequest().getEndpoint().getPath())); parts.remove(""); - if (parts.size() > 0) { + if (!parts.isEmpty()) { String container = parts.remove(0); String query = command.getCurrentRequest().getEndpoint().getQuery(); if (query != null && query.indexOf("container") != -1) { http://git-wip-us.apache.org/repos/asf/jclouds/blob/e711275f/providers/dynect/src/test/java/org/jclouds/dynect/v3/features/GeoRegionGroupApiLiveTest.java ---------------------------------------------------------------------- diff --git a/providers/dynect/src/test/java/org/jclouds/dynect/v3/features/GeoRegionGroupApiLiveTest.java b/providers/dynect/src/test/java/org/jclouds/dynect/v3/features/GeoRegionGroupApiLiveTest.java index 1965d3b..5ce32dc 100644 --- a/providers/dynect/src/test/java/org/jclouds/dynect/v3/features/GeoRegionGroupApiLiveTest.java +++ b/providers/dynect/src/test/java/org/jclouds/dynect/v3/features/GeoRegionGroupApiLiveTest.java @@ -47,8 +47,8 @@ public class GeoRegionGroupApiLiveTest extends BaseDynECTApiLiveTest { static void checkGeoRegionGroup(GeoRegionGroup group) { assertNotNull(group.getName(), "Name cannot be null " + group); - assertTrue(group.getCountries().size() > 0, "countries must be assigned " + group); - assertTrue(group.getRecordSets().size() > 0, "RecordSets must be assigned " + group); + assertTrue(!group.getCountries().isEmpty(), "countries must be assigned " + group); + assertTrue(!group.getRecordSets().isEmpty(), "RecordSets must be assigned " + group); for (RecordSet recordSet : group.getRecordSets()) checkRecordSet(recordSet); } @@ -63,7 +63,7 @@ public class GeoRegionGroupApiLiveTest extends BaseDynECTApiLiveTest { static void checkValue(Value value) { assertNotNull(value.getLabel(), "Label cannot be null " + value); assertNotNull(value.getWeight(), "Weight cannot be null " + value); - assertTrue(value.getRData().size() > 0, "RData entries should be present: " + value); + assertTrue(!value.getRData().isEmpty(), "RData entries should be present: " + value); } protected GeoRegionGroupApi api(String serviceName) { http://git-wip-us.apache.org/repos/asf/jclouds/blob/e711275f/providers/dynect/src/test/java/org/jclouds/dynect/v3/features/GeoServiceApiLiveTest.java ---------------------------------------------------------------------- diff --git a/providers/dynect/src/test/java/org/jclouds/dynect/v3/features/GeoServiceApiLiveTest.java b/providers/dynect/src/test/java/org/jclouds/dynect/v3/features/GeoServiceApiLiveTest.java index 6ad9c55..2c2b212 100644 --- a/providers/dynect/src/test/java/org/jclouds/dynect/v3/features/GeoServiceApiLiveTest.java +++ b/providers/dynect/src/test/java/org/jclouds/dynect/v3/features/GeoServiceApiLiveTest.java @@ -43,8 +43,8 @@ public class GeoServiceApiLiveTest extends BaseDynECTApiLiveTest { static void checkGeoService(GeoService service) { assertNotNull(service.getName(), "Name cannot be null " + service); assertTrue(service.getTTL() >= 0, "TTL cannot be negative " + service); - assertTrue(service.getNodes().size() > 0, "Nodes must be assigned " + service); - assertTrue(service.getGroups().size() > 0, "Groups must be assigned " + service); + assertTrue(!service.getNodes().isEmpty(), "Nodes must be assigned " + service); + assertTrue(!service.getGroups().isEmpty(), "Groups must be assigned " + service); for (GeoRegionGroup group : service.getGroups()) GeoRegionGroupApiLiveTest.checkGeoRegionGroup(group); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/e711275f/providers/dynect/src/test/java/org/jclouds/dynect/v3/features/RecordApiLiveTest.java ---------------------------------------------------------------------- diff --git a/providers/dynect/src/test/java/org/jclouds/dynect/v3/features/RecordApiLiveTest.java b/providers/dynect/src/test/java/org/jclouds/dynect/v3/features/RecordApiLiveTest.java index fae9445..de75164 100644 --- a/providers/dynect/src/test/java/org/jclouds/dynect/v3/features/RecordApiLiveTest.java +++ b/providers/dynect/src/test/java/org/jclouds/dynect/v3/features/RecordApiLiveTest.java @@ -62,7 +62,7 @@ public class RecordApiLiveTest extends BaseDynECTApiLiveTest { private void checkRecord(Record<? extends Map<String, Object>> record) { checkRecordId(record); - assertTrue(record.getRData().size() > 0, "RData entries should be present for cannot be zero for Record: " + assertTrue(!record.getRData().isEmpty(), "RData entries should be present for cannot be zero for Record: " + record); checkNotNull(record.getTTL(), "TTL cannot be null for RecordId: %s", record); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/e711275f/providers/glesys/src/main/java/org/jclouds/glesys/compute/GleSYSComputeServiceAdapter.java ---------------------------------------------------------------------- diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/compute/GleSYSComputeServiceAdapter.java b/providers/glesys/src/main/java/org/jclouds/glesys/compute/GleSYSComputeServiceAdapter.java index 3111c26..3e014d5 100644 --- a/providers/glesys/src/main/java/org/jclouds/glesys/compute/GleSYSComputeServiceAdapter.java +++ b/providers/glesys/src/main/java/org/jclouds/glesys/compute/GleSYSComputeServiceAdapter.java @@ -112,7 +112,7 @@ public class GleSYSComputeServiceAdapter implements ComputeServiceAdapter<Server template.getOptions().userMetadata(ComputeServiceConstants.NODE_GROUP_KEY, group); Map<String, String> md = metadataAndTagsAsCommaDelimitedValue(template.getOptions()); - if (md.size() > 0) { + if (!md.isEmpty()) { String description = Joiner.on('\n').withKeyValueSeparator("=").join(md); // TODO: get glesys to stop stripping out equals and commas! createServerOptions.description(base16().lowerCase().encode(description.getBytes(UTF_8))); @@ -127,7 +127,7 @@ public class GleSYSComputeServiceAdapter implements ComputeServiceAdapter<Server builder.transferGB(templateOptions.getTransferGB()); ServerSpec spec = builder.build(); - + // use random root password unless one was provided via template options String password = templateOptions.hasRootPassword() ? templateOptions.getRootPassword() : getRandomPassword(); @@ -168,7 +168,7 @@ public class GleSYSComputeServiceAdapter implements ComputeServiceAdapter<Server templatesSupportedBuilder.add(template.getName()); } ImmutableSet<String> templatesSupported = templatesSupportedBuilder.build(); - if (templatesSupported.size() > 0) + if (!templatesSupported.isEmpty()) hardwareToReturn.add(new HardwareBuilder() .ids(String.format( "datacenter(%s)platform(%s)cpuCores(%d)memorySizeMB(%d)diskSizeGB(%d)", datacenter, @@ -187,7 +187,7 @@ public class GleSYSComputeServiceAdapter implements ComputeServiceAdapter<Server public Set<OSTemplate> listImages() { return api.getServerApi().listTemplates().toSet(); } - + // cheat until we have a getTemplate command @Override public OSTemplate getImage(final String id) { @@ -197,10 +197,10 @@ public class GleSYSComputeServiceAdapter implements ComputeServiceAdapter<Server public boolean apply(OSTemplate input) { return input.getName().equals(id); } - + }, null); } - + @Override public Iterable<ServerDetails> listNodes() { return api.getServerApi().list().transform(new Function<Server, ServerDetails>() { http://git-wip-us.apache.org/repos/asf/jclouds/blob/e711275f/providers/glesys/src/test/java/org/jclouds/glesys/features/ArchiveApiLiveTest.java ---------------------------------------------------------------------- diff --git a/providers/glesys/src/test/java/org/jclouds/glesys/features/ArchiveApiLiveTest.java b/providers/glesys/src/test/java/org/jclouds/glesys/features/ArchiveApiLiveTest.java index b62ebf0..86ef85e 100644 --- a/providers/glesys/src/test/java/org/jclouds/glesys/features/ArchiveApiLiveTest.java +++ b/providers/glesys/src/test/java/org/jclouds/glesys/features/ArchiveApiLiveTest.java @@ -40,7 +40,7 @@ public class ArchiveApiLiveTest extends BaseGleSYSApiLiveTest { @BeforeClass(groups = { "integration", "live" }) public void setup() { super.setup(); - + archiveApi = api.getArchiveApi(); archiveUser = identity.toLowerCase() + "_test9"; archiveCounter = retry(new Predicate<Integer>() { @@ -49,7 +49,7 @@ public class ArchiveApiLiveTest extends BaseGleSYSApiLiveTest { } }, 30, 1, SECONDS); } - + @AfterClass(groups = { "integration", "live" }) protected void tearDown() { int before = archiveApi.list().size(); @@ -68,22 +68,22 @@ public class ArchiveApiLiveTest extends BaseGleSYSApiLiveTest { ArchiveAllowedArguments args = archiveApi.getAllowedArguments(); assertNotNull(args); assertNotNull(args.getSizes()); - assertTrue(args.getSizes().size() > 0); - + assertTrue(!args.getSizes().isEmpty()); + for (int size : args.getSizes()) { assertTrue(size > 0); } } - + @Test public void testCreateArchive() throws Exception { try { archiveApi.delete(archiveUser); } catch (Exception ex) { } - + int before = archiveApi.list().size(); - + archiveApi.createWithCredentialsAndSize(archiveUser, "password", 10); assertTrue(archiveCounter.apply(before + 1)); @@ -97,7 +97,7 @@ public class ArchiveApiLiveTest extends BaseGleSYSApiLiveTest { @Test(dependsOnMethods = "testCreateArchive") public void testChangePassword() throws Exception { - archiveApi.changePassword(archiveUser, "newpassword"); + archiveApi.changePassword(archiveUser, "newpassword"); // TODO assert something useful! } http://git-wip-us.apache.org/repos/asf/jclouds/blob/e711275f/providers/glesys/src/test/java/org/jclouds/glesys/features/ServerApiLiveTest.java ---------------------------------------------------------------------- diff --git a/providers/glesys/src/test/java/org/jclouds/glesys/features/ServerApiLiveTest.java b/providers/glesys/src/test/java/org/jclouds/glesys/features/ServerApiLiveTest.java index de22cbc..0dd16a3 100644 --- a/providers/glesys/src/test/java/org/jclouds/glesys/features/ServerApiLiveTest.java +++ b/providers/glesys/src/test/java/org/jclouds/glesys/features/ServerApiLiveTest.java @@ -53,7 +53,7 @@ import com.google.common.collect.FluentIterable; @Test(groups = "live", testName = "ServerApiLiveTest", singleThreaded = true) public class ServerApiLiveTest extends BaseGleSYSApiWithAServerLiveTest { public static final String testHostName2 = "jclouds-test2"; - + @BeforeClass(groups = { "integration", "live" }) @Override public void setup() { @@ -78,14 +78,14 @@ public class ServerApiLiveTest extends BaseGleSYSApiWithAServerLiveTest { public void makeSureServerIsRunning() throws Exception { serverStatusChecker.apply(Server.State.RUNNING); } - + @Test public void testAllowedArguments() throws Exception { Map<String, AllowedArgumentsForCreateServer> templates = serverApi.getAllowedArgumentsForCreateByPlatform(); - + assertTrue(templates.containsKey("OpenVZ")); assertTrue(templates.containsKey("Xen")); - + checkAllowedArguments(templates.get("OpenVZ")); checkAllowedArguments(templates.get("Xen")); } @@ -93,15 +93,15 @@ public class ServerApiLiveTest extends BaseGleSYSApiWithAServerLiveTest { private void checkAllowedArguments(AllowedArgumentsForCreateServer t) { assertNotNull(t); - assert t.getDataCenters().size() > 0 : t; - assert t.getCpuCoreOptions().getAllowedUnits().size() > 0 : t; - assert t.getDiskSizesInGB().getAllowedUnits().size() > 0 : t; - assert t.getMemorySizesInMB().getAllowedUnits().size() > 0 : t; - assert t.getTemplateNames().size() > 0 : t; - assert t.getTransfersInGB().getAllowedUnits().size() > 0 : t; - assert t.getTransfersInGB().getAllowedUnits().size() > 0 : t; + assert !t.getDataCenters().isEmpty() : t; + assert !t.getCpuCoreOptions().getAllowedUnits().isEmpty() : t; + assert !t.getDiskSizesInGB().getAllowedUnits().isEmpty() : t; + assert !t.getMemorySizesInMB().getAllowedUnits().isEmpty() : t; + assert !t.getTemplateNames().isEmpty() : t; + assert !t.getTransfersInGB().getAllowedUnits().isEmpty() : t; + assert !t.getTransfersInGB().getAllowedUnits().isEmpty() : t; } - + public void testListTemplates() throws Exception { FluentIterable<OSTemplate> oSTemplates = serverApi.listTemplates(); @@ -109,7 +109,7 @@ public class ServerApiLiveTest extends BaseGleSYSApiWithAServerLiveTest { checkTemplate(oSTemplate); } } - + private void checkTemplate(OSTemplate t) { assertNotNull(t); assertNotNull(t.getName()); @@ -119,11 +119,11 @@ public class ServerApiLiveTest extends BaseGleSYSApiWithAServerLiveTest { assert t.getMinDiskSize() > 0 : t; assert t.getMinMemSize() > 0 : t; } - + public void testListServers() throws Exception { FluentIterable<Server> response = serverApi.list(); assertNotNull(response); - assertTrue(response.size() > 0); + assertTrue(!response.isEmpty()); for (Server server : response) { ServerDetails newDetails = serverApi.get(server.getId()); @@ -172,7 +172,7 @@ public class ServerApiLiveTest extends BaseGleSYSApiWithAServerLiveTest { assertTrue(serverStatusChecker.apply(Server.State.RUNNING)); serverApi.reboot(serverId); - + assertTrue(serverStatusChecker.apply(Server.State.RUNNING)); } @@ -240,10 +240,10 @@ public class ServerApiLiveTest extends BaseGleSYSApiWithAServerLiveTest { assertNotNull(testServer2.getId()); assertEquals(testServer2.getHostname(), "jclouds-test2"); assertTrue(testServer2.getIps().isEmpty()); - + testServerId2 = testServer2.getId(); - Predicate<State> cloneChecker = statusChecker(serverApi, testServerId2); + Predicate<State> cloneChecker = statusChecker(serverApi, testServerId2); assertTrue(cloneChecker.apply(Server.State.STOPPED)); serverApi.start(testServer2.getId()); @@ -279,15 +279,15 @@ public class ServerApiLiveTest extends BaseGleSYSApiWithAServerLiveTest { assertNotNull(status.getState()); assertNotNull(status.getUptime()); - + for (ResourceStatus usage : new ResourceStatus[] { status.getCpu(), status.getDisk(), status.getMemory() }) { assertNotNull(usage); assert usage.getMax() >= 0.0 : status; assert usage.getUsage() >= 0.0 : status; - + assertNotNull(usage.getUnit()); } - + assertNotNull(status.getUptime()); assert status.getUptime().getCurrent() > 0 : status; assertNotNull(status.getUptime().getUnit()); http://git-wip-us.apache.org/repos/asf/jclouds/blob/e711275f/providers/gogrid/src/main/java/org/jclouds/gogrid/functions/ParseCredentialsFromJsonResponse.java ---------------------------------------------------------------------- diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/functions/ParseCredentialsFromJsonResponse.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/functions/ParseCredentialsFromJsonResponse.java index 12970d3..a9c56c9 100644 --- a/providers/gogrid/src/main/java/org/jclouds/gogrid/functions/ParseCredentialsFromJsonResponse.java +++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/functions/ParseCredentialsFromJsonResponse.java @@ -47,6 +47,6 @@ public class ParseCredentialsFromJsonResponse implements checkState(!(returnVal.size() > 1), "expecting only 1 credential in response, but had more: " + returnVal.keySet()); - return (returnVal.size() > 0) ? Iterables.getOnlyElement(returnVal.values()) : null; + return (!returnVal.isEmpty()) ? Iterables.getOnlyElement(returnVal.values()) : null; } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/e711275f/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/strategy/SoftLayerComputeServiceAdapter.java ---------------------------------------------------------------------- diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/strategy/SoftLayerComputeServiceAdapter.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/strategy/SoftLayerComputeServiceAdapter.java index 7ef331b..e2a15b5 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/strategy/SoftLayerComputeServiceAdapter.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/strategy/SoftLayerComputeServiceAdapter.java @@ -465,7 +465,7 @@ public class SoftLayerComputeServiceAdapter implements boolean hasBackendIp = newGuest.getPrimaryBackendIpAddress() != null; boolean hasPrimaryIp = newGuest.getPrimaryIpAddress() != null; boolean hasPasswords = newGuest.getOperatingSystem() != null - && newGuest.getOperatingSystem().getPasswords().size() > 0; + && !newGuest.getOperatingSystem().getPasswords().isEmpty(); return hasBackendIp && hasPrimaryIp && hasPasswords; } http://git-wip-us.apache.org/repos/asf/jclouds/blob/e711275f/providers/ultradns-ws/src/test/java/org/jclouds/ultradns/ws/features/DirectionalGroupApiLiveTest.java ---------------------------------------------------------------------- diff --git a/providers/ultradns-ws/src/test/java/org/jclouds/ultradns/ws/features/DirectionalGroupApiLiveTest.java b/providers/ultradns-ws/src/test/java/org/jclouds/ultradns/ws/features/DirectionalGroupApiLiveTest.java index 1cbb341..e3a6b78 100644 --- a/providers/ultradns-ws/src/test/java/org/jclouds/ultradns/ws/features/DirectionalGroupApiLiveTest.java +++ b/providers/ultradns-ws/src/test/java/org/jclouds/ultradns/ws/features/DirectionalGroupApiLiveTest.java @@ -67,7 +67,7 @@ public class DirectionalGroupApiLiveTest extends BaseUltraDNSWSApiLiveTest { for (AccountLevelGroup group : api().listAccountLevelGroups()) { DirectionalGroup withRegions = api().get(group.getId()); assertEquals(withRegions.getName(), group.getName()); - assertTrue(withRegions.size() > 0); + assertTrue(!withRegions.isEmpty()); } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/e711275f/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/InitScript.java ---------------------------------------------------------------------- diff --git a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/InitScript.java b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/InitScript.java index 3d47b54..c8d7d2a 100644 --- a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/InitScript.java +++ b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/InitScript.java @@ -184,12 +184,12 @@ public class InitScript extends ForwardingObject implements Statement, AcceptsSt this.exports = ImmutableMap.<String, String> copyOf(checkNotNull(exports, "exports")); this.init = checkNotNull(init, "init"); this.run = checkNotNull(run, "run"); - checkArgument(run.delegate().size() > 0, "you must specify at least one statement to run"); + checkArgument(!run.delegate().isEmpty(), "you must specify at least one statement to run"); this.delegate = makeInitScriptStatement(instanceName, instanceHome, logDir, exports, init, run); } /** - * + * * @param exports keys are the variables to export in UPPER_UNDERSCORE case format */ public static ScriptBuilder makeInitScriptStatement(String instanceName, String instanceHome, String logDir, @@ -244,7 +244,7 @@ public class InitScript extends ForwardingObject implements Statement, AcceptsSt } /** - * + * * @return what will be bound to the INSTANCE_NAME variable, and uniquely * identifies the process */ @@ -253,13 +253,13 @@ public class InitScript extends ForwardingObject implements Statement, AcceptsSt } /** - * default {@code /tmp/$INSTANCE_NAME} + * default {@code /tmp/$INSTANCE_NAME} * <br/> * <h3>note</h3> The parent directory * should be set with unix sticky-bit or otherwise made available to all * users. Otherwise, new instances by other users may fail due to not being * able to create a directory. This is why the default is set to {@code /tmp} - * + * * @return what will be bound to the INSTANCE_HOME variable, and represents * the working directory of the instance */ @@ -269,7 +269,7 @@ public class InitScript extends ForwardingObject implements Statement, AcceptsSt /** * default {@code $INSTANCE_HOME} - * + * * @return what will be bound to the LOG_DIR variable, and represents where * stdout and stderr.logs are written. */ @@ -278,7 +278,7 @@ public class InitScript extends ForwardingObject implements Statement, AcceptsSt } /** - * + * * @return statements that will be executed upon the init command */ public StatementList getInitStatement() { @@ -286,7 +286,7 @@ public class InitScript extends ForwardingObject implements Statement, AcceptsSt } /** - * + * * @return statements that will be executed upon the run or start commands */ public StatementList getRunStatement() { http://git-wip-us.apache.org/repos/asf/jclouds/blob/e711275f/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/ScriptBuilder.java ---------------------------------------------------------------------- diff --git a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/ScriptBuilder.java b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/ScriptBuilder.java index a97f685..8f4552d 100644 --- a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/ScriptBuilder.java +++ b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/ScriptBuilder.java @@ -100,7 +100,7 @@ public class ScriptBuilder implements Statement, AcceptsStatementVisitor { * <li>variable exports</li> * <li>case/switch</li> * </ol> - * + * * @param osFamily * whether to write a cmd or bash script. */ @@ -130,7 +130,7 @@ public class ScriptBuilder implements Statement, AcceptsStatementVisitor { } public static void writeFunctions(Map<String, String> functionsToWrite, OsFamily osFamily, StringBuilder builder) { - if (functionsToWrite.size() > 0) { + if (!functionsToWrite.isEmpty()) { builder.append(ShellToken.BEGIN_FUNCTIONS.to(osFamily)); for (String function : functionsToWrite.values()) { builder.append(Utils.replaceTokens(function, ShellToken.tokenValueMap(osFamily))); http://git-wip-us.apache.org/repos/asf/jclouds/blob/e711275f/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/domain/AppendFile.java ---------------------------------------------------------------------- diff --git a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/domain/AppendFile.java b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/domain/AppendFile.java index 2476b78..d4efcfd 100644 --- a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/domain/AppendFile.java +++ b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/domain/AppendFile.java @@ -90,7 +90,7 @@ public class AppendFile implements Statement { this.path = checkNotNull(path, "PATH"); this.lines = checkNotNull(lines, "lines"); this.delimiter = checkNotNull(delimiter, "delimiter"); - checkState(Iterables.size(lines) > 0, "you must pass something to execute"); + checkState(!Iterables.isEmpty(lines), "you must pass something to execute"); this.expandVariables = expandVariables; } http://git-wip-us.apache.org/repos/asf/jclouds/blob/e711275f/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/UserAdd.java ---------------------------------------------------------------------- diff --git a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/UserAdd.java b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/UserAdd.java index dc2713f..370f76e 100644 --- a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/UserAdd.java +++ b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/UserAdd.java @@ -72,7 +72,7 @@ public class UserAdd implements Statement { this.cryptFunction = cryptFunction; return this; } - + /** * See --home in `man useradd`. */ @@ -164,7 +164,7 @@ public class UserAdd implements Statement { this.shell = checkNotNull(shell, "shell"); this.fullName = fullName; } - + private final Function<String, String> cryptFunction; private final String home; private final String defaultHome; @@ -201,14 +201,14 @@ public class UserAdd implements Statement { } userAddOptions.put("-s", shell); - if (groups.size() > 0) { + if (!groups.isEmpty()) { for (String group : groups) statements.add(Statements.exec("groupadd -f " + group)); List<String> groups = Lists.newArrayList(this.groups); String primaryGroup = groups.remove(0); userAddOptions.put("-g", primaryGroup); - if (groups.size() > 0) + if (!groups.isEmpty()) userAddOptions.put("-G", Joiner.on(',').join(groups)); } @@ -226,9 +226,9 @@ public class UserAdd implements Statement { statements.add(Statements.exec(String.format("useradd %s %s", options, login))); - if (authorizeRSAPublicKeys.size() > 0 || installRSAPrivateKey != null) { + if (!authorizeRSAPublicKeys.isEmpty() || installRSAPrivateKey != null) { String sshDir = homeDir + "{fs}.ssh"; - if (authorizeRSAPublicKeys.size() > 0) + if (!authorizeRSAPublicKeys.isEmpty()) statements.add(new AuthorizeRSAPublicKeys(sshDir, authorizeRSAPublicKeys)); if (installRSAPrivateKey != null) statements.add(new InstallRSAPrivateKey(sshDir, installRSAPrivateKey));
