Repository: jclouds Updated Branches: refs/heads/master 614f5194e -> 8b16bf0e4
Add whitespace after semicolons Also correct some bad line-wrapping. Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/74fb8f01 Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/74fb8f01 Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/74fb8f01 Branch: refs/heads/master Commit: 74fb8f0183b3c58e79f06ba7c2bc88ea62dedb18 Parents: 614f519 Author: Andrew Gaul <[email protected]> Authored: Tue Aug 26 10:55:56 2014 -0700 Committer: Andrew Gaul <[email protected]> Committed: Tue Aug 26 11:06:00 2014 -0700 ---------------------------------------------------------------------- .../atmos/blobstore/AtmosAsyncBlobStore.java | 2 +- .../cloudstack/functions/ParseTypedAsyncJob.java | 2 +- .../main/java/org/jclouds/ec2/domain/KeyPair.java | 4 ++-- .../org/jclouds/ec2/domain/RunningInstance.java | 8 ++++---- .../jclouds/ec2/xml/BlockDeviceMappingHandler.java | 2 +- .../ec2/xml/DescribeImagesResponseHandler.java | 2 +- .../org/jclouds/ec2/EBSBootEC2ApiLiveTest.java | 17 ++++------------- .../ec2/features/SecurityGroupApiLiveTest.java | 2 +- .../v1/domain/internal/BaseLoadBalancer.java | 6 +++--- .../v1/features/AccessRuleApiLiveTest.java | 2 +- .../vcloud/domain/internal/CatalogImpl.java | 2 +- .../jclouds/vcloud/domain/internal/VAppImpl.java | 2 +- .../vcloud/domain/internal/VAppTemplateImpl.java | 2 +- .../jclouds/vcloud/domain/internal/VDCImpl.java | 8 ++++---- .../org/jclouds/vcloud/domain/internal/VmImpl.java | 2 +- .../main/java/org/jclouds/crypto/ASN1Codec.java | 2 +- core/src/main/java/org/jclouds/http/Uris.java | 2 +- .../rest/internal/RestAnnotationProcessor.java | 4 ++-- .../org/jclouds/gae/ConvertToGaeRequestTest.java | 2 +- .../ssh/jsch/config/JschSshClientModule.java | 2 +- .../jclouds/sshj/config/SshjSshClientModule.java | 2 +- .../internal/BaseLoadBalancerService.java | 2 +- .../ec2/compute/AWSEC2ComputeServiceLiveTest.java | 2 +- .../ec2/features/AWSSecurityGroupApiLiveTest.java | 2 +- .../dynect/v3/config/DynECTParserModule.java | 2 +- .../org/jclouds/gogrid/features/GridServerApi.java | 3 ++- 26 files changed, 40 insertions(+), 48 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/74fb8f01/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/AtmosAsyncBlobStore.java ---------------------------------------------------------------------- diff --git a/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/AtmosAsyncBlobStore.java b/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/AtmosAsyncBlobStore.java index 983f068..3beec33 100644 --- a/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/AtmosAsyncBlobStore.java +++ b/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/AtmosAsyncBlobStore.java @@ -144,7 +144,7 @@ public class AtmosAsyncBlobStore extends BaseAsyncBlobStore { public ListenableFuture<Void> createDirectory(String container, String directory) { return transform(async.createDirectory(container + "/" + directory), new Function<URI, Void>() { public Void apply(URI from) { - return null;// no etag + return null; // no etag } }, userExecutor); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/74fb8f01/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseTypedAsyncJob.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseTypedAsyncJob.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseTypedAsyncJob.java index 1bc449f..0082ea8 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseTypedAsyncJob.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseTypedAsyncJob.java @@ -114,7 +114,7 @@ public class ParseTypedAsyncJob implements Function<AsyncJob<Map<String, JsonBal } else if (toParse.getResult().containsKey("errorcode")) { @SuppressWarnings({"unchecked", "rawtypes"}) Builder<?, Object> builder = AsyncJob.Builder.fromAsyncJobUntyped((AsyncJob) toParse); - builder.result(null);// avoid classcastexceptions + builder.result(null); // avoid classcastexceptions builder.error(AsyncJobError.builder().errorCode(ErrorCode.fromValue(toParse.getResult().get("errorcode").toString())) .errorText(toParse.getResult().containsKey("errortext") ? toParse.getResult().get("errortext").toString().replace("\"", "") : null) .build()); http://git-wip-us.apache.org/repos/asf/jclouds/blob/74fb8f01/apis/ec2/src/main/java/org/jclouds/ec2/domain/KeyPair.java ---------------------------------------------------------------------- diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/domain/KeyPair.java b/apis/ec2/src/main/java/org/jclouds/ec2/domain/KeyPair.java index 74e6f17..22b15be 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/domain/KeyPair.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/domain/KeyPair.java @@ -95,8 +95,8 @@ public class KeyPair implements Comparable<KeyPair> { this.region = checkNotNull(region, "region"); this.keyName = checkNotNull(keyName, "keyName"); this.sha1OfPrivateKey = checkNotNull(sha1OfPrivateKey, "sha1OfPrivateKey"); - this.keyMaterial = keyMaterial;// nullable on list - this.fingerprint = fingerprint;// nullable on list + this.keyMaterial = keyMaterial; // nullable on list + this.fingerprint = fingerprint; // nullable on list } /** http://git-wip-us.apache.org/repos/asf/jclouds/blob/74fb8f01/apis/ec2/src/main/java/org/jclouds/ec2/domain/RunningInstance.java ---------------------------------------------------------------------- diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/domain/RunningInstance.java b/apis/ec2/src/main/java/org/jclouds/ec2/domain/RunningInstance.java index 54e9566..d0f1ab6 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/domain/RunningInstance.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/domain/RunningInstance.java @@ -299,12 +299,12 @@ public class RunningInstance implements Comparable<RunningInstance> { this.ipAddress = ipAddress; this.kernelId = kernelId; this.keyName = keyName; - this.launchTime = launchTime;// nullable on spot. - this.availabilityZone = availabilityZone;// nullable on spot. + this.launchTime = launchTime; // nullable on spot. + this.availabilityZone = availabilityZone; // nullable on spot. this.virtualizationType = virtualizationType; this.platform = platform; - this.privateDnsName = privateDnsName;// nullable on runinstances. - this.privateIpAddress = privateIpAddress;// nullable on runinstances. + this.privateDnsName = privateDnsName; // nullable on runinstances. + this.privateIpAddress = privateIpAddress; // nullable on runinstances. this.ramdiskId = ramdiskId; this.reason = reason; this.rootDeviceType = checkNotNull(rootDeviceType, "rootDeviceType for %s/%s", region, instanceId); http://git-wip-us.apache.org/repos/asf/jclouds/blob/74fb8f01/apis/ec2/src/main/java/org/jclouds/ec2/xml/BlockDeviceMappingHandler.java ---------------------------------------------------------------------- diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/xml/BlockDeviceMappingHandler.java b/apis/ec2/src/main/java/org/jclouds/ec2/xml/BlockDeviceMappingHandler.java index 8e2f514..6078df7 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/xml/BlockDeviceMappingHandler.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/xml/BlockDeviceMappingHandler.java @@ -35,7 +35,7 @@ public class BlockDeviceMappingHandler extends private Map<String, BlockDevice> ebsBlockDevices = Maps.newHashMap(); private String deviceName; private String volumeId; - private boolean deleteOnTermination = true;// correct default is true. + private boolean deleteOnTermination = true; // correct default is true. private Attachment.Status attachmentStatus; private Date attachTime; http://git-wip-us.apache.org/repos/asf/jclouds/blob/74fb8f01/apis/ec2/src/main/java/org/jclouds/ec2/xml/DescribeImagesResponseHandler.java ---------------------------------------------------------------------- diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/xml/DescribeImagesResponseHandler.java b/apis/ec2/src/main/java/org/jclouds/ec2/xml/DescribeImagesResponseHandler.java index 55a2c92..a525946 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/xml/DescribeImagesResponseHandler.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/xml/DescribeImagesResponseHandler.java @@ -91,7 +91,7 @@ public class DescribeImagesResponseHandler extends ParseSax.HandlerForGeneratedR private Hypervisor hypervisor = Hypervisor.XEN; private int volumeSize; - private boolean deleteOnTermination = true;// correct default is true. + private boolean deleteOnTermination = true; // correct default is true. private boolean encrypted = false; private String volumeType; private Integer iops; http://git-wip-us.apache.org/repos/asf/jclouds/blob/74fb8f01/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 8741af6..4879005 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/EBSBootEC2ApiLiveTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/EBSBootEC2ApiLiveTest.java @@ -193,21 +193,12 @@ public class EBSBootEC2ApiLiveTest extends BaseComputeServiceContextLiveTest { try { System.out.printf("%d: running instance%n", System.currentTimeMillis()); Reservation<? extends RunningInstance> reservation = client.getInstanceApi().get().runInstancesInRegion( - null, null, // allow - // ec2 - // to - // chose - // an - // availability - // zone + null, null, // allow ec2 to chose an availability zone imageId, 1, // minimum instances 1, // maximum instances - withKeyName(keyPair.getKeyName())// key I created above - .asType(InstanceType.M1_SMALL)// smallest instance - // size - .withSecurityGroup(securityGroupName));// group I - // created - // above + withKeyName(keyPair.getKeyName()) // key created above + .asType(InstanceType.M1_SMALL) // smallest instance size + .withSecurityGroup(securityGroupName)); // group created above instance = Iterables.getOnlyElement(reservation); } catch (HttpResponseException htpe) { if (htpe.getResponse().getStatusCode() == 400) http://git-wip-us.apache.org/repos/asf/jclouds/blob/74fb8f01/apis/ec2/src/test/java/org/jclouds/ec2/features/SecurityGroupApiLiveTest.java ---------------------------------------------------------------------- diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/features/SecurityGroupApiLiveTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/features/SecurityGroupApiLiveTest.java index 9318975..c4c32ca 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/features/SecurityGroupApiLiveTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/features/SecurityGroupApiLiveTest.java @@ -286,7 +286,7 @@ public class SecurityGroupApiLiveTest extends BaseComputeServiceContextLiveTest protected void ensureGroupsExist(String group1Name, String group2Name) { Set<SecurityGroup> twoResults = client.describeSecurityGroupsInRegion(null, group1Name, group2Name); assertNotNull(twoResults); - assertTrue(twoResults.size() >= 2);// in VPC could be multiple groups with the same name + assertTrue(twoResults.size() >= 2); // in VPC could be multiple groups with the same name assertTrue(all(twoResults, compose(in(ImmutableSet.of(group1Name, group2Name)), new Function<SecurityGroup, String>() { http://git-wip-us.apache.org/repos/asf/jclouds/blob/74fb8f01/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/internal/BaseLoadBalancer.java ---------------------------------------------------------------------- diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/internal/BaseLoadBalancer.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/internal/BaseLoadBalancer.java index 041e9d2..05753c1 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/internal/BaseLoadBalancer.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/internal/BaseLoadBalancer.java @@ -66,10 +66,10 @@ public class BaseLoadBalancer<N extends BaseNode<N>, T extends BaseLoadBalancer< @Nullable Map<String, Boolean> connectionLogging, @Nullable ConnectionThrottle connectionThrottle, @Nullable HealthMonitor healthMonitor) { this.name = checkNotNull(name, "name"); - this.protocol = protocol;// null on deleted LB - this.port = port;// null on deleted LB + this.protocol = protocol; // null on deleted LB + this.port = port; // null on deleted LB this.nodes = ImmutableSortedSet.copyOf(checkNotNull(nodes, "nodes")); - this.algorithm = algorithm;// null on deleted LB + this.algorithm = algorithm; // null on deleted LB this.timeout = timeout; this.halfClosed = halfClosed; this.sessionPersistence = sessionPersistence; http://git-wip-us.apache.org/repos/asf/jclouds/blob/74fb8f01/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/AccessRuleApiLiveTest.java ---------------------------------------------------------------------- diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/AccessRuleApiLiveTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/AccessRuleApiLiveTest.java index 76b9ed5..c98c626 100644 --- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/AccessRuleApiLiveTest.java +++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/AccessRuleApiLiveTest.java @@ -71,7 +71,7 @@ public class AccessRuleApiLiveTest extends BaseCloudLoadBalancersApiLiveTest { CreateLoadBalancer createLB = CreateLoadBalancer.builder() .name(prefix + "-jclouds").protocol("HTTP").port(80).virtualIPType(Type.PUBLIC).node(addNode).build(); - region = "ORD";//Iterables.getFirst(api.getConfiguredRegions(), null); + region = "ORD"; //Iterables.getFirst(api.getConfiguredRegions(), null); lb = api.getLoadBalancerApi(region).create(createLB); assertTrue(awaitAvailable(api.getLoadBalancerApi(region)).apply(lb)); http://git-wip-us.apache.org/repos/asf/jclouds/blob/74fb8f01/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/CatalogImpl.java ---------------------------------------------------------------------- diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/CatalogImpl.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/CatalogImpl.java index 37dfb10..5d0d16f 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/CatalogImpl.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/CatalogImpl.java @@ -50,7 +50,7 @@ public class CatalogImpl extends LinkedHashMap<String, ReferenceType> implements Map<String, ReferenceType> contents, Iterable<Task> tasks, boolean published, boolean readOnly) { this.name = checkNotNull(name, "name"); this.type = checkNotNull(type, "type"); - this.org = org;// TODO: once <1.0 is killed check not null + this.org = org; // TODO: once <1.0 is killed check not null this.description = description; this.href = checkNotNull(href, "href"); putAll(checkNotNull(contents, "contents")); http://git-wip-us.apache.org/repos/asf/jclouds/blob/74fb8f01/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/VAppImpl.java ---------------------------------------------------------------------- diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/VAppImpl.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/VAppImpl.java index 7b032bc..95dc6f5 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/VAppImpl.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/VAppImpl.java @@ -54,7 +54,7 @@ public class VAppImpl extends ReferenceTypeImpl implements VApp { @Nullable VCloudNetworkSection networkSection) { super(name, type, id); this.status = checkNotNull(status, "status"); - this.vdc = vdc;// TODO: once <1.0 is killed check not null + this.vdc = vdc; // TODO: once <1.0 is killed check not null this.description = description; Iterables.addAll(this.tasks, checkNotNull(tasks, "tasks")); this.ovfDescriptorUploaded = ovfDescriptorUploaded; http://git-wip-us.apache.org/repos/asf/jclouds/blob/74fb8f01/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/VAppTemplateImpl.java ---------------------------------------------------------------------- diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/VAppTemplateImpl.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/VAppTemplateImpl.java index fa480c7..c7b35e1 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/VAppTemplateImpl.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/VAppTemplateImpl.java @@ -56,7 +56,7 @@ public class VAppTemplateImpl extends ReferenceTypeImpl implements VAppTemplate @Nullable VCloudNetworkSection networkSection) { super(name, type, id); this.status = checkNotNull(status, "status"); - this.vdc = vdc;// TODO: once <1.0 is killed check not null + this.vdc = vdc; // TODO: once <1.0 is killed check not null this.description = description; Iterables.addAll(this.tasks, checkNotNull(tasks, "tasks")); this.vAppScopedLocalId = vAppScopedLocalId; http://git-wip-us.apache.org/repos/asf/jclouds/blob/74fb8f01/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/VDCImpl.java ---------------------------------------------------------------------- diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/VDCImpl.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/VDCImpl.java index 740df72..f68c486 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/VDCImpl.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/VDCImpl.java @@ -62,13 +62,13 @@ public class VDCImpl extends ReferenceTypeImpl implements VDC { int networkQuota, int vmQuota, boolean isEnabled) { super(name, type, id); this.status = checkNotNull(status, "status"); - this.org = org;// TODO: once <1.0 is killed check not null + this.org = org; // TODO: once <1.0 is killed check not null this.description = description; Iterables.addAll(this.tasks, checkNotNull(tasks, "tasks")); this.allocationModel = checkNotNull(allocationModel, "allocationModel"); - this.storageCapacity = storageCapacity;// TODO: once <1.0 is killed check not null - this.cpuCapacity = cpuCapacity;// TODO: once <1.0 is killed check not null - this.memoryCapacity = memoryCapacity;// TODO: once <1.0 is killed check not null + this.storageCapacity = storageCapacity; // TODO: once <1.0 is killed check not null + this.cpuCapacity = cpuCapacity; // TODO: once <1.0 is killed check not null + this.memoryCapacity = memoryCapacity; // TODO: once <1.0 is killed check not null this.resourceEntities.putAll(checkNotNull(resourceEntities, "resourceEntities")); this.availableNetworks.putAll(checkNotNull(availableNetworks, "availableNetworks")); this.nicQuota = nicQuota; http://git-wip-us.apache.org/repos/asf/jclouds/blob/74fb8f01/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/VmImpl.java ---------------------------------------------------------------------- diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/VmImpl.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/VmImpl.java index a6385c6..00ea089 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/VmImpl.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/VmImpl.java @@ -60,7 +60,7 @@ public class VmImpl extends ReferenceTypeImpl implements Vm { @Nullable GuestCustomizationSection guestCustomization, @Nullable String vAppScopedLocalId) { super(name, type, id); this.status = status; - this.vApp = vApp;// TODO: once <1.0 is killed check not null + this.vApp = vApp; // TODO: once <1.0 is killed check not null this.description = description; Iterables.addAll(this.tasks, checkNotNull(tasks, "tasks")); this.hardware = hardware; http://git-wip-us.apache.org/repos/asf/jclouds/blob/74fb8f01/core/src/main/java/org/jclouds/crypto/ASN1Codec.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/crypto/ASN1Codec.java b/core/src/main/java/org/jclouds/crypto/ASN1Codec.java index c194478..249c9bc 100644 --- a/core/src/main/java/org/jclouds/crypto/ASN1Codec.java +++ b/core/src/main/java/org/jclouds/crypto/ASN1Codec.java @@ -175,7 +175,7 @@ final class ASN1Codec { try { return s.read(); } catch (IOException e) { - throw propagate(e);// impossible as we are only using a byte array + throw propagate(e); // impossible as we are only using a byte array } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/74fb8f01/core/src/main/java/org/jclouds/http/Uris.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/http/Uris.java b/core/src/main/java/org/jclouds/http/Uris.java index aaf05d8..eaef663 100644 --- a/core/src/main/java/org/jclouds/http/Uris.java +++ b/core/src/main/java/org/jclouds/http/Uris.java @@ -244,7 +244,7 @@ public final class Uris { if (uri.length() < 5) // skip encoding if there's no valid variables set. ex. ((a)) is the left valid return uri.toString(); - char last = uri.charAt(0);// duplicates even if there are no special characters, but only requires 1 scan + char last = uri.charAt(0); // duplicates even if there are no special characters, but only requires 1 scan StringBuilder builder = new StringBuilder(); for (char c : Lists.charactersOf(uri)) { switch (c) { http://git-wip-us.apache.org/repos/asf/jclouds/blob/74fb8f01/core/src/main/java/org/jclouds/rest/internal/RestAnnotationProcessor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/rest/internal/RestAnnotationProcessor.java b/core/src/main/java/org/jclouds/rest/internal/RestAnnotationProcessor.java index 9f1461a..e5f1c13 100644 --- a/core/src/main/java/org/jclouds/rest/internal/RestAnnotationProcessor.java +++ b/core/src/main/java/org/jclouds/rest/internal/RestAnnotationProcessor.java @@ -254,7 +254,7 @@ public class RestAnnotationProcessor implements Function<Invocation, HttpRequest Payload payload = null; for (HttpRequestOptions options : findOptionsIn(invocation)) { - injector.injectMembers(options);// TODO test case + injector.injectMembers(options); // TODO test case for (Entry<String, String> header : options.buildRequestHeaders().entries()) { headers.put(header.getKey(), replaceTokens(header.getValue(), tokenValues)); } @@ -490,7 +490,7 @@ public class RestAnnotationProcessor implements Function<Invocation, HttpRequest invocation.getInvokable()); Parameter endpointParam = get(endpointParams, 0); Function<Object, URI> parser = injector.getInstance(endpointParam.getAnnotation(EndpointParam.class).parser()); - int position = endpointParam.hashCode();// guava issue 1243 + int position = endpointParam.hashCode(); // guava issue 1243 try { URI returnVal = parser.apply(invocation.getArgs().get(position)); checkArgument(returnVal != null, http://git-wip-us.apache.org/repos/asf/jclouds/blob/74fb8f01/drivers/gae/src/test/java/org/jclouds/gae/ConvertToGaeRequestTest.java ---------------------------------------------------------------------- diff --git a/drivers/gae/src/test/java/org/jclouds/gae/ConvertToGaeRequestTest.java b/drivers/gae/src/test/java/org/jclouds/gae/ConvertToGaeRequestTest.java index 86f568a..21d0f3f 100644 --- a/drivers/gae/src/test/java/org/jclouds/gae/ConvertToGaeRequestTest.java +++ b/drivers/gae/src/test/java/org/jclouds/gae/ConvertToGaeRequestTest.java @@ -100,7 +100,7 @@ public class ConvertToGaeRequestTest { HttpRequest request = HttpRequest.builder().method(HttpMethod.GET).endpoint(endPoint).build(); HTTPRequest gaeRequest = req.apply(request); assert gaeRequest.getPayload() == null; - assertEquals(gaeRequest.getHeaders().size(), 1);// user agent + assertEquals(gaeRequest.getHeaders().size(), 1); // user agent assertEquals(gaeRequest.getHeaders().get(0).getName(), HttpHeaders.USER_AGENT); assertEquals(gaeRequest.getHeaders().get(0).getValue(), "jclouds/1.0 urlfetch/1.4.3"); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/74fb8f01/drivers/jsch/src/main/java/org/jclouds/ssh/jsch/config/JschSshClientModule.java ---------------------------------------------------------------------- diff --git a/drivers/jsch/src/main/java/org/jclouds/ssh/jsch/config/JschSshClientModule.java b/drivers/jsch/src/main/java/org/jclouds/ssh/jsch/config/JschSshClientModule.java index a2f3838..3f30091 100644 --- a/drivers/jsch/src/main/java/org/jclouds/ssh/jsch/config/JschSshClientModule.java +++ b/drivers/jsch/src/main/java/org/jclouds/ssh/jsch/config/JschSshClientModule.java @@ -74,7 +74,7 @@ public class JschSshClientModule extends AbstractModule { @Override public SshClient create(HostAndPort socket, LoginCredentials credentials) { SshClient client = new JschSshClient(proxyConfig, backoffLimitedRetryHandler, socket, credentials, timeout, getAgentConnector()); - injector.injectMembers(client);// add logger + injector.injectMembers(client); // add logger return client; } http://git-wip-us.apache.org/repos/asf/jclouds/blob/74fb8f01/drivers/sshj/src/main/java/org/jclouds/sshj/config/SshjSshClientModule.java ---------------------------------------------------------------------- diff --git a/drivers/sshj/src/main/java/org/jclouds/sshj/config/SshjSshClientModule.java b/drivers/sshj/src/main/java/org/jclouds/sshj/config/SshjSshClientModule.java index 8146bfb..20b0767 100644 --- a/drivers/sshj/src/main/java/org/jclouds/sshj/config/SshjSshClientModule.java +++ b/drivers/sshj/src/main/java/org/jclouds/sshj/config/SshjSshClientModule.java @@ -70,7 +70,7 @@ public class SshjSshClientModule extends AbstractModule { @Override public SshClient create(HostAndPort socket, LoginCredentials credentials) { SshClient client = new SshjSshClient(backoffLimitedRetryHandler, socket, credentials, timeout, getAgentConnector()); - injector.injectMembers(client);// add logger + injector.injectMembers(client); // add logger return client; } http://git-wip-us.apache.org/repos/asf/jclouds/blob/74fb8f01/loadbalancer/src/main/java/org/jclouds/loadbalancer/internal/BaseLoadBalancerService.java ---------------------------------------------------------------------- diff --git a/loadbalancer/src/main/java/org/jclouds/loadbalancer/internal/BaseLoadBalancerService.java b/loadbalancer/src/main/java/org/jclouds/loadbalancer/internal/BaseLoadBalancerService.java index a88c5cf..ccf7614 100644 --- a/loadbalancer/src/main/java/org/jclouds/loadbalancer/internal/BaseLoadBalancerService.java +++ b/loadbalancer/src/main/java/org/jclouds/loadbalancer/internal/BaseLoadBalancerService.java @@ -143,7 +143,7 @@ public class BaseLoadBalancerService implements LoadBalancerService { return false; } } - }, 3000, 1000, MILLISECONDS);// TODO make timeouts class like ComputeServiceconstants + }, 3000, 1000, MILLISECONDS); // TODO make timeouts class like ComputeServiceconstants boolean successful = tester.apply(id) && loadBalancer.get() == null; // TODO add load // balancerTerminated // retryable predicate http://git-wip-us.apache.org/repos/asf/jclouds/blob/74fb8f01/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 b16f2ca..2ca67b0 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 @@ -98,7 +98,7 @@ public class AWSEC2ComputeServiceLiveTest extends EC2ComputeServiceLiveTest { try { cleanupExtendedStuffInRegion(region, securityGroupApi, keyPairApi, group); - Thread.sleep(3000);// eventual consistency if deletes actually occurred. + Thread.sleep(3000); // eventual consistency if deletes actually occurred. // create a security group that allows ssh in so that our scripts later // will work http://git-wip-us.apache.org/repos/asf/jclouds/blob/74fb8f01/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/features/AWSSecurityGroupApiLiveTest.java ---------------------------------------------------------------------- diff --git a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/features/AWSSecurityGroupApiLiveTest.java b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/features/AWSSecurityGroupApiLiveTest.java index 48081e4..9100a5b 100644 --- a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/features/AWSSecurityGroupApiLiveTest.java +++ b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/features/AWSSecurityGroupApiLiveTest.java @@ -86,7 +86,7 @@ public class AWSSecurityGroupApiLiveTest extends SecurityGroupApiLiveTest { group1Name, group1Name); final String group2Id = AWSSecurityGroupApi.class.cast(client).createSecurityGroupInRegionAndReturnId(null, group2Name, group2Name); - Thread.sleep(100);// eventual consistent + Thread.sleep(100); // eventual consistent ensureGroupsExist(group1Name, group2Name); AWSSecurityGroupApi.class.cast(client).authorizeSecurityGroupIngressInRegion(null, group1Id, IpPermissions.permit(IpProtocol.TCP).port(80)); http://git-wip-us.apache.org/repos/asf/jclouds/blob/74fb8f01/providers/dynect/src/main/java/org/jclouds/dynect/v3/config/DynECTParserModule.java ---------------------------------------------------------------------- diff --git a/providers/dynect/src/main/java/org/jclouds/dynect/v3/config/DynECTParserModule.java b/providers/dynect/src/main/java/org/jclouds/dynect/v3/config/DynECTParserModule.java index 1fa0535..c676180 100644 --- a/providers/dynect/src/main/java/org/jclouds/dynect/v3/config/DynECTParserModule.java +++ b/providers/dynect/src/main/java/org/jclouds/dynect/v3/config/DynECTParserModule.java @@ -145,7 +145,7 @@ public class DynECTParserModule extends AbstractModule { private static class CreepyGeoService { String name; - String active;// creepy part + String active; // creepy part int ttl; List<Node> nodes; List<GeoRegionGroup> groups; http://git-wip-us.apache.org/repos/asf/jclouds/blob/74fb8f01/providers/gogrid/src/main/java/org/jclouds/gogrid/features/GridServerApi.java ---------------------------------------------------------------------- diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/features/GridServerApi.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/features/GridServerApi.java index 41a6ebd..48da01b 100644 --- a/providers/gogrid/src/main/java/org/jclouds/gogrid/features/GridServerApi.java +++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/features/GridServerApi.java @@ -290,4 +290,5 @@ public interface GridServerApi { @OnlyElement @Path("/grid/server/edit") Server editServerType(@QueryParam("id") long id, - @QueryParam("server.type") String newType);} + @QueryParam("server.type") String newType); +}
