diff --git a/apis/atmos/src/main/java/org/jclouds/atmos/binders/BindUserMetadataToHeaders.java b/apis/atmos/src/main/java/org/jclouds/atmos/binders/BindUserMetadataToHeaders.java index ea0a08b1d9..670466d589 100644 --- a/apis/atmos/src/main/java/org/jclouds/atmos/binders/BindUserMetadataToHeaders.java +++ b/apis/atmos/src/main/java/org/jclouds/atmos/binders/BindUserMetadataToHeaders.java @@ -52,7 +52,7 @@ public class BindUserMetadataToHeaders implements Binder, Function apply(UserMetadata md) { - Builder headers = ImmutableMap. builder(); + Builder headers = ImmutableMap.builder(); if (md.getMetadata().size() > 0) { String header = Joiner.on(',').withKeyValueSeparator("=").join(md.getMetadata()); headers.put("x-emc-meta", header); diff --git a/apis/atmos/src/main/java/org/jclouds/atmos/functions/ParseUserMetadataFromHeaders.java b/apis/atmos/src/main/java/org/jclouds/atmos/functions/ParseUserMetadataFromHeaders.java index 7fb167c16b..de352521d2 100644 --- a/apis/atmos/src/main/java/org/jclouds/atmos/functions/ParseUserMetadataFromHeaders.java +++ b/apis/atmos/src/main/java/org/jclouds/atmos/functions/ParseUserMetadataFromHeaders.java @@ -74,7 +74,7 @@ public class ParseUserMetadataFromHeaders implements Function getMetaMap(String meta) { - Builder metaMap = ImmutableMap. builder(); + Builder metaMap = ImmutableMap.builder(); for (String entry : Splitter.on(", ").split(meta)) { String[] entrySplit = entry.split("="); metaMap.put(entrySplit[0], entrySplit[1]); diff --git a/apis/atmos/src/test/java/org/jclouds/atmos/functions/ParseDirectoryListFromContentAndHeadersTest.java b/apis/atmos/src/test/java/org/jclouds/atmos/functions/ParseDirectoryListFromContentAndHeadersTest.java index 4bd7874a72..01d03cea75 100644 --- a/apis/atmos/src/test/java/org/jclouds/atmos/functions/ParseDirectoryListFromContentAndHeadersTest.java +++ b/apis/atmos/src/test/java/org/jclouds/atmos/functions/ParseDirectoryListFromContentAndHeadersTest.java @@ -69,7 +69,7 @@ public class ParseDirectoryListFromContentAndHeadersTest extends BaseHandlerTest } protected Set values() { - Builder expected = ImmutableSet.builder(); + Builder expected = ImmutableSet.builder(); expected.add(new DirectoryEntry("4980cdb2a411106a04a4538c92a1b204ad92077de6e3", FileType.DIRECTORY, "adriancole-blobstore-2096685753")); expected.add(new DirectoryEntry("4980cdb2a410105404980d99e53a0504ad93939e7dc3", FileType.DIRECTORY, diff --git a/apis/byon/src/main/java/org/jclouds/byon/domain/YamlNode.java b/apis/byon/src/main/java/org/jclouds/byon/domain/YamlNode.java index e9b9173d77..b8b8615f56 100644 --- a/apis/byon/src/main/java/org/jclouds/byon/domain/YamlNode.java +++ b/apis/byon/src/main/java/org/jclouds/byon/domain/YamlNode.java @@ -130,7 +130,7 @@ public class YamlNode { public InputStream apply(YamlNode in) { if (in == null) return null; - Builder prettier = ImmutableMap. builder(); + Builder prettier = ImmutableMap.builder(); if (in.id != null) prettier.put("id", in.id); if (in.name != null) diff --git a/apis/cloudsigma/src/main/java/org/jclouds/cloudsigma/compute/CloudSigmaComputeServiceAdapter.java b/apis/cloudsigma/src/main/java/org/jclouds/cloudsigma/compute/CloudSigmaComputeServiceAdapter.java index 1652168653..52ade29acf 100644 --- a/apis/cloudsigma/src/main/java/org/jclouds/cloudsigma/compute/CloudSigmaComputeServiceAdapter.java +++ b/apis/cloudsigma/src/main/java/org/jclouds/cloudsigma/compute/CloudSigmaComputeServiceAdapter.java @@ -140,7 +140,7 @@ public class CloudSigmaComputeServiceAdapter implements @Override public Iterable listHardwareProfiles() { - Builder hardware = ImmutableSet. builder(); + Builder hardware = ImmutableSet.builder(); for (double cpu : new double[] { 1000, 5000, 10000, 20000 }) for (int ram : new int[] { 512, 1024, 4 * 1024, 16 * 1024, 32 * 1024 }) { final float size = (float) cpu / 100; diff --git a/apis/cloudsigma/src/main/java/org/jclouds/cloudsigma/functions/MapToDriveMetrics.java b/apis/cloudsigma/src/main/java/org/jclouds/cloudsigma/functions/MapToDriveMetrics.java index 345321567f..8aff9137e4 100644 --- a/apis/cloudsigma/src/main/java/org/jclouds/cloudsigma/functions/MapToDriveMetrics.java +++ b/apis/cloudsigma/src/main/java/org/jclouds/cloudsigma/functions/MapToDriveMetrics.java @@ -36,7 +36,7 @@ import com.google.common.collect.ImmutableMap.Builder; public class MapToDriveMetrics implements Function, Map> { public Map apply(Map from) { - Builder builder = ImmutableMap. builder(); + Builder builder = ImmutableMap.builder(); addIDEDevices(from, builder); addSCSIDevices(from, builder); addBlockDevices(from, builder); diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/strategy/CloudStackComputeServiceAdapter.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/strategy/CloudStackComputeServiceAdapter.java index 4ace1b5a87..2179d4fb36 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/strategy/CloudStackComputeServiceAdapter.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/strategy/CloudStackComputeServiceAdapter.java @@ -264,7 +264,7 @@ public class CloudStackComputeServiceAdapter implements } public void disableStaticNATOnIPAddresses(Set ipAddresses) { - Builder jobsToTrack = ImmutableSet. builder(); + Builder jobsToTrack = ImmutableSet.builder(); for (Long ipAddress : ipAddresses) { Long disableStaticNAT = client.getNATClient().disableStaticNATOnPublicIP(ipAddress); if (disableStaticNAT != null) { @@ -276,7 +276,7 @@ public class CloudStackComputeServiceAdapter implements } public Set deleteIPForwardingRulesForVMAndReturnDistinctIPs(long virtualMachineId) { - Builder jobsToTrack = ImmutableSet. builder(); + Builder jobsToTrack = ImmutableSet.builder(); // immutable doesn't permit duplicates Set ipAddresses = Sets.newLinkedHashSet(); diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NetworkService.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NetworkService.java index 4853d3ea7e..a3d8306359 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NetworkService.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NetworkService.java @@ -108,7 +108,7 @@ public class NetworkService implements Comparable { public NetworkService(String name, Map capabilities) { this.name = checkNotNull(name, "name"); - ImmutableSortedSet.Builder internal = ImmutableSortedSet. naturalOrder(); + ImmutableSortedSet.Builder internal = ImmutableSortedSet.naturalOrder(); for (Entry capabililty : checkNotNull(capabilities, "capabilities").entrySet()) internal.add(new Capability(capabililty.getKey(), capabililty.getValue())); this.capabilities = internal.build(); @@ -120,7 +120,7 @@ public class NetworkService implements Comparable { public Map getCapabilities() { // so tests and serialization comes out expected - Builder returnVal = ImmutableSortedMap. naturalOrder(); + Builder returnVal = ImmutableSortedMap.naturalOrder(); for (Capability capability : capabilities) { returnVal.put(capability.name, capability.value); } diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/filters/QuerySigner.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/filters/QuerySigner.java index 4f8f0bd3b8..bf5a18fc0b 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/filters/QuerySigner.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/filters/QuerySigner.java @@ -122,7 +122,7 @@ public class QuerySigner implements AuthenticationFilter, RequestSigner { utils.logRequest(signatureLog, request, ">>"); // encode each parameter value first, - ImmutableSortedSet.Builder builder = ImmutableSortedSet. naturalOrder(); + ImmutableSortedSet.Builder builder = ImmutableSortedSet.naturalOrder(); for (Entry entry : decodedParams.entries()) builder.add(entry.getKey() + "=" + Strings2.urlEncode(entry.getValue())); diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/CreatePortForwardingRulesForIP.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/CreatePortForwardingRulesForIP.java index 9bfccf51ea..572ef7ede2 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/CreatePortForwardingRulesForIP.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/CreatePortForwardingRulesForIP.java @@ -76,14 +76,14 @@ public class CreatePortForwardingRulesForIP { "ip %s should be static NATed to a virtual machine before applying rules", ip); if (Iterables.size(ports) == 0) return ImmutableSet. of(); - Builder responses = ImmutableSet. builder(); + Builder responses = ImmutableSet.builder(); for (int port : ports) { AsyncCreateResponse response = client.getNATClient().createIPForwardingRule(ip.getId(), protocol, port); logger.debug(">> creating IP forwarding rule IPAddress(%s) for protocol(%s), port(%s); response(%s)", ip.getId(), protocol, port, response); responses.add(response); } - Builder rules = ImmutableSet. builder(); + Builder rules = ImmutableSet.builder(); for (AsyncCreateResponse response : responses.build()) { IPForwardingRule rule = blockUntilJobCompletesAndReturnResult. apply(response); rules.add(rule); diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseEventTypesFromHttpResponse.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseEventTypesFromHttpResponse.java index 1b20f5221f..341b578ef0 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseEventTypesFromHttpResponse.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseEventTypesFromHttpResponse.java @@ -64,7 +64,7 @@ public class ParseEventTypesFromHttpResponse implements Function toParse = parser.apply(response); checkNotNull(toParse, "parsed result from %s", response); - Builder builder = ImmutableSet.builder(); + Builder builder = ImmutableSet.builder(); for (EventType entry : toParse) builder.add(entry.name); return builder.build(); diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseIdToNameFromHttpResponse.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseIdToNameFromHttpResponse.java index 8697aa9ace..ec9a209a3a 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseIdToNameFromHttpResponse.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseIdToNameFromHttpResponse.java @@ -88,7 +88,7 @@ public class ParseIdToNameFromHttpResponse implements Function toParse = parser.apply(response); checkNotNull(toParse, "parsed result from %s", response); - Builder builder = ImmutableSortedMap. naturalOrder(); + Builder builder = ImmutableSortedMap.naturalOrder(); for (IdName entry : toParse) builder.put(entry.id, entry.name); return builder.build(); diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseNamesFromHttpResponse.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseNamesFromHttpResponse.java index e93898742c..16b8af5984 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseNamesFromHttpResponse.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseNamesFromHttpResponse.java @@ -83,7 +83,7 @@ public class ParseNamesFromHttpResponse implements Function toParse = parser.apply(response); checkNotNull(toParse, "parsed result from %s", response); - Builder builder = ImmutableSet. builder(); + Builder builder = ImmutableSet.builder(); for (Name entry : toParse) builder.add(entry.name); return builder.build(); diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/CorrectHypervisorForZone.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/CorrectHypervisorForZone.java index 7af0b51a03..2ef792964f 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/CorrectHypervisorForZone.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/CorrectHypervisorForZone.java @@ -63,7 +63,7 @@ public class CorrectHypervisorForZone implements Function> apply(CloudStackClient client) { checkNotNull(client, "client"); - Builder> builder = ImmutableMap.> builder(); + Builder> builder = ImmutableMap.builder(); for (Zone zone : client.getZoneClient().listZones()) { builder.put(zone.getId(), client.getHypervisorClient().listHypervisorsInZone(zone.getId())); } diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindBlockDeviceMappingToIndexedFormParams.java b/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindBlockDeviceMappingToIndexedFormParams.java index 3b2d88ca3d..5b8945c5b6 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindBlockDeviceMappingToIndexedFormParams.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindBlockDeviceMappingToIndexedFormParams.java @@ -50,7 +50,7 @@ public class BindBlockDeviceMappingToIndexedFormParams implements Binder { checkArgument(checkNotNull(input, "input") instanceof Map, "this binder is only valid for Map"); Map blockDeviceMapping = (Map) input; - com.google.common.collect.ImmutableMap.Builder builder = ImmutableMap. builder(); + ImmutableMap.Builder builder = ImmutableMap.builder(); int amazonOneBasedIndex = 1; // according to docs, counters must start with 1 for (Entry ebsBlockDeviceName : blockDeviceMapping.entrySet()) { // not null by contract diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindIpPermissionsToIndexedFormParams.java b/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindIpPermissionsToIndexedFormParams.java index 8a83d1c3a8..590e1694b3 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindIpPermissionsToIndexedFormParams.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindIpPermissionsToIndexedFormParams.java @@ -40,7 +40,7 @@ public class BindIpPermissionsToIndexedFormParams implements Binder { public R bindToRequest(R request, Object input) { checkArgument(checkNotNull(input, "input") instanceof Iterable, "this binder is only valid for Iterable"); - Builder headers = ImmutableMultimap. builder(); + Builder headers = ImmutableMultimap.builder(); int index = 0; for (IpPermission perm : (Iterable) input) headers.putAll(IpPermissions.buildFormParametersForIndex(index++, perm)); diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindS3UploadPolicyAndSignature.java b/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindS3UploadPolicyAndSignature.java index 4d9def5bbf..e0ca36827d 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindS3UploadPolicyAndSignature.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindS3UploadPolicyAndSignature.java @@ -49,7 +49,7 @@ public class BindS3UploadPolicyAndSignature implements Binder { @Override public R bindToRequest(R request, Object input) { String encodedJson = CryptoStreams.base64(checkNotNull(input, "json").toString().getBytes(Charsets.UTF_8)); - Builder builder = ImmutableMultimap. builder(); + Builder builder = ImmutableMultimap.builder(); builder.put("Storage.S3.UploadPolicy", encodedJson); String signature = signer.sign(encodedJson); builder.put("Storage.S3.UploadPolicySignature", signature); diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindUserIdGroupPairToSourceSecurityGroupFormParams.java b/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindUserIdGroupPairToSourceSecurityGroupFormParams.java index ee4628d8d7..004e7292b0 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindUserIdGroupPairToSourceSecurityGroupFormParams.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindUserIdGroupPairToSourceSecurityGroupFormParams.java @@ -43,7 +43,7 @@ public class BindUserIdGroupPairToSourceSecurityGroupFormParams implements Binde checkArgument(checkNotNull(input, "input") instanceof UserIdGroupPair, "this binder is only valid for UserIdGroupPair!"); UserIdGroupPair pair = (UserIdGroupPair) input; - Builder builder = ImmutableMultimap. builder(); + Builder builder = ImmutableMultimap.builder(); builder.put("SourceSecurityGroupOwnerId", pair.getUserId()); builder.put("SourceSecurityGroupName", pair.getGroupName()); return ModifyRequest.putFormParams(request, builder.build()); diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/EC2ComputeService.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/EC2ComputeService.java index 36fe633f40..3ea04e1638 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/EC2ComputeService.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/EC2ComputeService.java @@ -191,7 +191,7 @@ public class EC2ComputeService extends BaseComputeService { */ @Override protected void cleanUpIncidentalResourcesOfDeadNodes(Set deadNodes) { - Builder regionGroups = ImmutableMultimap. builder(); + Builder regionGroups = ImmutableMultimap.builder(); for (NodeMetadata nodeMetadata : deadNodes) { if (nodeMetadata.getGroup() != null) regionGroups.put(AWSUtils.parseHandle(nodeMetadata.getId())[0], nodeMetadata.getGroup()); diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/RunningInstanceToNodeMetadata.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/RunningInstanceToNodeMetadata.java index be6de1c5b0..ae286b251c 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/RunningInstanceToNodeMetadata.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/RunningInstanceToNodeMetadata.java @@ -116,7 +116,7 @@ public class RunningInstanceToNodeMetadata implements Function addressesBuilder = ImmutableSet. builder(); + Builder addressesBuilder = ImmutableSet.builder(); if (Strings.emptyToNull(instance.getIpAddress()) != null) addressesBuilder.add(instance.getIpAddress()); if (Strings.emptyToNull(instance.getPrivateIpAddress()) != null) diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/options/EC2TemplateOptions.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/options/EC2TemplateOptions.java index a37a75d28f..8beac49fe9 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/options/EC2TemplateOptions.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/options/EC2TemplateOptions.java @@ -87,7 +87,7 @@ public class EC2TemplateOptions extends TemplateOptions implements Cloneable { private String keyPair = null; private boolean noKeyPair; private byte[] userData; - private ImmutableSet.Builder blockDeviceMappings = ImmutableSet. builder(); + private ImmutableSet.Builder blockDeviceMappings = ImmutableSet.builder(); public static final EC2TemplateOptions NONE = new EC2TemplateOptions(); diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptions.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptions.java index 80920cd79c..31b2a03f5a 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptions.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptions.java @@ -166,7 +166,7 @@ public class CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptions { @VisibleForTesting public Set getSecurityGroupsForTagAndOptions(String region, @Nullable String group, TemplateOptions options) { - Builder groups = ImmutableSet. builder(); + Builder groups = ImmutableSet.builder(); if (group != null) { String markerGroup = String.format("jclouds#%s#%s", group, region).replace('#', delimiter); diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2CreateNodesInGroupThenAddToSet.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2CreateNodesInGroupThenAddToSet.java index dbcaa08e14..6ac3cd9b80 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2CreateNodesInGroupThenAddToSet.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2CreateNodesInGroupThenAddToSet.java @@ -170,7 +170,7 @@ public class EC2CreateNodesInGroupThenAddToSet implements CreateNodesInGroupThen protected Iterable allocateElasticIpsInRegion(int count, Template template) { - Builder ips = ImmutableSet. builder(); + Builder ips = ImmutableSet.builder(); if (!autoAllocateElasticIps) return ips.build(); diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/suppliers/EC2ImageSupplier.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/suppliers/EC2ImageSupplier.java index 231bcb0f4d..f1c3dce547 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/suppliers/EC2ImageSupplier.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/suppliers/EC2ImageSupplier.java @@ -106,7 +106,7 @@ public class EC2ImageSupplier implements Supplier> { public Iterable> getDescribeQueriesForOwnersInRegions(Set regions, String[] amiOwners) { DescribeImagesOptions options = getOptionsForOwners(amiOwners); - Builder builder = ImmutableMap. builder(); + Builder builder = ImmutableMap.builder(); for (String region : regions) builder.put(region, options); return builder.build().entrySet(); diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/options/internal/BaseEC2RequestOptions.java b/apis/ec2/src/main/java/org/jclouds/ec2/options/internal/BaseEC2RequestOptions.java index 88d9735ec7..cbb336a444 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/options/internal/BaseEC2RequestOptions.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/options/internal/BaseEC2RequestOptions.java @@ -51,7 +51,7 @@ public class BaseEC2RequestOptions extends BaseHttpRequestOptions { } protected Set getFormValuesWithKeysPrefixedBy(final String prefix) { - Builder values = ImmutableSet. builder(); + Builder values = ImmutableSet.builder(); for (String key : Iterables.filter(formParameters.keySet(), new Predicate() { public boolean apply(String input) { diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/compute/ElasticStackComputeServiceAdapter.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/compute/ElasticStackComputeServiceAdapter.java index 2142e7a053..6211969d9d 100644 --- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/compute/ElasticStackComputeServiceAdapter.java +++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/compute/ElasticStackComputeServiceAdapter.java @@ -132,7 +132,7 @@ public class ElasticStackComputeServiceAdapter implements @Override public Iterable listHardwareProfiles() { - Builder hardware = ImmutableSet. builder(); + Builder hardware = ImmutableSet.builder(); for (double cpu : new double[] { 1000, 5000, 10000, 20000 }) for (int ram : new int[] { 512, 1024, 2048, 4096, 8192 }) { final float size = (float) cpu / 1000; diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/MapToDriveMetrics.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/MapToDriveMetrics.java index 58845b76a4..ba3071442d 100644 --- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/MapToDriveMetrics.java +++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/MapToDriveMetrics.java @@ -36,7 +36,7 @@ import com.google.common.collect.ImmutableMap.Builder; public class MapToDriveMetrics implements Function, Map> { public Map apply(Map from) { - Builder builder = ImmutableMap. builder(); + Builder builder = ImmutableMap.builder(); addIDEDevices(from, builder); addSCSIDevices(from, builder); addBlockDevices(from, builder); diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/binders/BindSecurityGroupRuleToJsonPayload.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/binders/BindSecurityGroupRuleToJsonPayload.java index 023b7a2777..90e229479a 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/binders/BindSecurityGroupRuleToJsonPayload.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/binders/BindSecurityGroupRuleToJsonPayload.java @@ -57,7 +57,7 @@ public class BindSecurityGroupRuleToJsonPayload extends BindToJsonPayload implem @Override public R bindToRequest(R request, Map postParams) { - Builder payload = ImmutableMap. builder(); + Builder payload = ImmutableMap.builder(); payload.putAll(postParams); checkArgument(checkNotNull(request, "request") instanceof GeneratedHttpRequest, "this binder is only valid for GeneratedHttpRequests!"); diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/NovaComputeServiceAdapter.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/NovaComputeServiceAdapter.java index 5a44c11518..409cebf306 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/NovaComputeServiceAdapter.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/NovaComputeServiceAdapter.java @@ -131,7 +131,7 @@ public class NovaComputeServiceAdapter implements @Override public Iterable listHardwareProfiles() { - Builder builder = ImmutableSet. builder(); + Builder builder = ImmutableSet.builder(); for (final String zoneId : zoneIds.get()) { builder.addAll(transform(novaClient.getFlavorClientForZone(zoneId).listFlavorsInDetail(), new Function() { @@ -148,7 +148,7 @@ public class NovaComputeServiceAdapter implements @Override public Iterable listImages() { - Builder builder = ImmutableSet. builder(); + Builder builder = ImmutableSet.builder(); for (final String zoneId : zoneIds.get()) { builder.addAll(transform(filter(novaClient.getImageClientForZone(zoneId).listImagesInDetail(), ImagePredicates .statusEquals(Image.Status.ACTIVE)), new Function() { @@ -165,7 +165,7 @@ public class NovaComputeServiceAdapter implements @Override public Iterable listNodes() { - Builder builder = ImmutableSet. builder(); + Builder builder = ImmutableSet.builder(); for (final String zoneId : zoneIds.get()) { builder.addAll(transform(novaClient.getServerClientForZone(zoneId).listServersInDetail(), new Function() { diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/functions/CreateSecurityGroupIfNeededTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/functions/CreateSecurityGroupIfNeededTest.java index 0dc08b589f..fcdd6cfd3c 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/functions/CreateSecurityGroupIfNeededTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/functions/CreateSecurityGroupIfNeededTest.java @@ -55,7 +55,7 @@ public class CreateSecurityGroupIfNeededTest extends BaseNovaClientExpectTest { public void testCreateNewGroup() throws Exception { - Builder builder = ImmutableMap.builder(); + Builder builder = ImmutableMap.builder(); builder.put(keystoneAuthWithUsernameAndPassword, responseWithKeystoneAccess); builder.put(extensionsOfNovaRequest, extensionsOfNovaResponse); @@ -133,7 +133,7 @@ public class CreateSecurityGroupIfNeededTest extends BaseNovaClientExpectTest { public void testReturnExistingGroupOnAlreadyExists() throws Exception { - Builder builder = ImmutableMap.builder(); + Builder builder = ImmutableMap.builder(); builder.put(keystoneAuthWithUsernameAndPassword, responseWithKeystoneAccess); builder.put(extensionsOfNovaRequest, extensionsOfNovaResponse); diff --git a/apis/s3/src/main/java/org/jclouds/s3/options/CopyObjectOptions.java b/apis/s3/src/main/java/org/jclouds/s3/options/CopyObjectOptions.java index cc9989a948..8f3ba01b2f 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/options/CopyObjectOptions.java +++ b/apis/s3/src/main/java/org/jclouds/s3/options/CopyObjectOptions.java @@ -254,7 +254,7 @@ public class CopyObjectOptions extends BaseHttpRequestOptions { public Multimap buildRequestHeaders() { checkState(headerTag != null, "headerTag should have been injected!"); checkState(metadataPrefix != null, "metadataPrefix should have been injected!"); - ImmutableMultimap.Builder returnVal = ImmutableMultimap. builder(); + ImmutableMultimap.Builder returnVal = ImmutableMultimap.builder(); for (Entry entry : headers.entries()) { returnVal.put(entry.getKey().replace(DEFAULT_AMAZON_HEADERTAG, headerTag), entry.getValue()); } diff --git a/apis/s3/src/main/java/org/jclouds/s3/options/PutObjectOptions.java b/apis/s3/src/main/java/org/jclouds/s3/options/PutObjectOptions.java index ffdb53e7fa..472b4087eb 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/options/PutObjectOptions.java +++ b/apis/s3/src/main/java/org/jclouds/s3/options/PutObjectOptions.java @@ -73,7 +73,7 @@ public class PutObjectOptions extends BaseHttpRequestOptions { @Override public Multimap buildRequestHeaders() { checkState(headerTag != null, "headerTag should have been injected!"); - ImmutableMultimap.Builder returnVal = ImmutableMultimap. builder(); + ImmutableMultimap.Builder returnVal = ImmutableMultimap.builder(); for (Entry entry : headers.entries()) { returnVal.put(entry.getKey().replace(DEFAULT_AMAZON_HEADERTAG, headerTag), entry.getValue()); } diff --git a/apis/s3/src/main/java/org/jclouds/s3/xml/ListBucketHandler.java b/apis/s3/src/main/java/org/jclouds/s3/xml/ListBucketHandler.java index 214d588fa3..95e8eef42b 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/xml/ListBucketHandler.java +++ b/apis/s3/src/main/java/org/jclouds/s3/xml/ListBucketHandler.java @@ -49,8 +49,8 @@ import com.google.common.collect.ImmutableSet.Builder; * /> */ public class ListBucketHandler extends ParseSax.HandlerWithResult { - private Builder contents = ImmutableSet. builder(); - private Builder commonPrefixes = ImmutableSet. builder(); + private Builder contents = ImmutableSet.builder(); + private Builder commonPrefixes = ImmutableSet.builder(); private CanonicalUser currentOwner; private StringBuilder currentText = new StringBuilder(); 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 707852c6de..d2c919868f 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 @@ -124,7 +124,7 @@ public class VCloudComputeServiceAdapter implements ComputeServiceAdapter listNodes() { // TODO: parallel or cache - Builder nodes = ImmutableSet. builder(); + Builder nodes = ImmutableSet.builder(); for (Org org : nameToOrg.get().values()) { for (ReferenceType vdc : org.getVDCs().values()) { for (ReferenceType resource : client.getVDCClient().getVDC(vdc.getHref()).getResourceEntities().values()) { 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 93f197db70..22b929db58 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 @@ -86,7 +86,7 @@ public class VCloudComputeUtils { // TODO make this work with composite vApps if (vApp.getChildren().size() == 0) return ImmutableSet.of(); - Builder ips = ImmutableSet. builder(); + Builder ips = ImmutableSet.builder(); Vm vm = Iterables.get(vApp.getChildren(), 0); // TODO: figure out how to differentiate public from private ip addresses // assumption is that we'll do this from the network object, which may diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/config/DefaultVCloudReferencesModule.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/config/DefaultVCloudReferencesModule.java index 708f119007..314825fc36 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/config/DefaultVCloudReferencesModule.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/config/DefaultVCloudReferencesModule.java @@ -102,7 +102,7 @@ public class DefaultVCloudReferencesModule extends AbstractModule { @Override public Map apply(Map> arg0) { - Builder builder = ImmutableMap. builder(); + Builder builder = ImmutableMap.builder(); for (Map v1 : arg0.values()) { for (Catalog v2 : v1.values()) { builder.put(v2.getHref(), v2); diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/config/VCloudRestClientModule.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/config/VCloudRestClientModule.java index f23b05ad11..910e5d37d9 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/config/VCloudRestClientModule.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/config/VCloudRestClientModule.java @@ -224,7 +224,7 @@ public class VCloudRestClientModule extends RestClientModule apply(Map arg0) { - Builder returnVal = ImmutableMap. builder(); + Builder returnVal = ImmutableMap.builder(); for (Entry orgr : arg0.entrySet()) { for (String vdc : orgr.getValue().getVDCs().keySet()) { returnVal.put(vdc, orgr.getKey()); diff --git a/apis/vcloud/src/test/java/org/jclouds/vcloud/binders/BindCloneVAppParamsToXmlPayloadTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/binders/BindCloneVAppParamsToXmlPayloadTest.java index 368e9917a4..fb2c2c2483 100644 --- a/apis/vcloud/src/test/java/org/jclouds/vcloud/binders/BindCloneVAppParamsToXmlPayloadTest.java +++ b/apis/vcloud/src/test/java/org/jclouds/vcloud/binders/BindCloneVAppParamsToXmlPayloadTest.java @@ -72,7 +72,7 @@ public class BindCloneVAppParamsToXmlPayloadTest { BindCloneVAppParamsToXmlPayload binder = injector.getInstance(BindCloneVAppParamsToXmlPayload.class); - Builder map = ImmutableMap. builder(); + Builder map = ImmutableMap.builder(); map.put("name", "new-linux-server"); map.put("Source", "https://vcenterprise.bluelock.com/api/v1.0/vapp/201"); binder.bindToRequest(request, map.build()); @@ -92,7 +92,7 @@ public class BindCloneVAppParamsToXmlPayloadTest { BindCloneVAppParamsToXmlPayload binder = injector.getInstance(BindCloneVAppParamsToXmlPayload.class); - Builder map = ImmutableMap. builder(); + Builder map = ImmutableMap.builder(); map.put("name", "new-linux-server"); map.put("Source", "https://vcenterprise.bluelock.com/api/v1.0/vapp/201"); map.put("IsSourceDelete", "true"); @@ -111,7 +111,7 @@ public class BindCloneVAppParamsToXmlPayloadTest { BindCloneVAppParamsToXmlPayload binder = injector.getInstance(BindCloneVAppParamsToXmlPayload.class); - Builder map = ImmutableMap. builder(); + Builder map = ImmutableMap.builder(); map.put("name", "my-vapp"); map.put("Source", "https://vcenterprise.bluelock.com/api/v1.0/vapp/4181"); binder.bindToRequest(request, map.build()); diff --git a/apis/vcloud/src/test/java/org/jclouds/vcloud/binders/BindCloneVAppTemplateParamsToXmlPayloadTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/binders/BindCloneVAppTemplateParamsToXmlPayloadTest.java index c7ccee619a..e0caf5fbdc 100644 --- a/apis/vcloud/src/test/java/org/jclouds/vcloud/binders/BindCloneVAppTemplateParamsToXmlPayloadTest.java +++ b/apis/vcloud/src/test/java/org/jclouds/vcloud/binders/BindCloneVAppTemplateParamsToXmlPayloadTest.java @@ -73,7 +73,7 @@ public class BindCloneVAppTemplateParamsToXmlPayloadTest { BindCloneVAppTemplateParamsToXmlPayload binder = injector .getInstance(BindCloneVAppTemplateParamsToXmlPayload.class); - Builder map = ImmutableMap. builder(); + Builder map = ImmutableMap.builder(); map.put("name", "new-linux-server"); map.put("Source", "https://vcenterprise.bluelock.com/api/v1.0/vAppTemplate/201"); binder.bindToRequest(request, map.build()); @@ -94,7 +94,7 @@ public class BindCloneVAppTemplateParamsToXmlPayloadTest { BindCloneVAppTemplateParamsToXmlPayload binder = injector .getInstance(BindCloneVAppTemplateParamsToXmlPayload.class); - Builder map = ImmutableMap. builder(); + Builder map = ImmutableMap.builder(); map.put("name", "new-linux-server"); map.put("Source", "https://vcenterprise.bluelock.com/api/v1.0/vAppTemplate/201"); map.put("IsSourceDelete", "true"); @@ -114,7 +114,7 @@ public class BindCloneVAppTemplateParamsToXmlPayloadTest { BindCloneVAppTemplateParamsToXmlPayload binder = injector .getInstance(BindCloneVAppTemplateParamsToXmlPayload.class); - Builder map = ImmutableMap. builder(); + Builder map = ImmutableMap.builder(); map.put("name", "my-vapptemplate"); map.put("Source", "https://vcenterprise.bluelock.com/api/v1.0/vAppTemplate/4181"); binder.bindToRequest(request, map.build()); diff --git a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobMapIntegrationTest.java b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobMapIntegrationTest.java index 1580f6f23c..a4780a7e87 100644 --- a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobMapIntegrationTest.java +++ b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobMapIntegrationTest.java @@ -204,7 +204,7 @@ public abstract class BaseBlobMapIntegrationTest extends BaseMapIntegrationTest< String bucketName = getContainerName(); try { Map map = createMap(context, bucketName); - ImmutableMap.Builder newMap = ImmutableMap. builder(); + ImmutableMap.Builder newMap = ImmutableMap.builder(); for (String key : fiveInputs.keySet()) { newMap.put( key, @@ -227,7 +227,7 @@ public abstract class BaseBlobMapIntegrationTest extends BaseMapIntegrationTest< String bucketName = getContainerName(); try { BlobMap map = createMap(context, bucketName); - Builder keySet = ImmutableSet. builder(); + Builder keySet = ImmutableSet.builder(); for (int i = 0; i < maxResultsForTestListings() + 1; i++) { keySet.add(i + ""); } diff --git a/common/aws/src/main/java/org/jclouds/aws/util/AWSUtils.java b/common/aws/src/main/java/org/jclouds/aws/util/AWSUtils.java index bb72785ad3..7e25dfc498 100644 --- a/common/aws/src/main/java/org/jclouds/aws/util/AWSUtils.java +++ b/common/aws/src/main/java/org/jclouds/aws/util/AWSUtils.java @@ -113,7 +113,7 @@ public class AWSUtils { checkArgument(checkNotNull(input, "input") instanceof String[], "this binder is only valid for String[] : " + input.getClass()); String[] values = (String[]) input; - Builder builder = ImmutableMultimap. builder(); + Builder builder = ImmutableMultimap.builder(); for (int i = 0; i < values.length; i++) { builder.put(String.format(format, (i + 1)), checkNotNull(values[i], format.toLowerCase() + "s[" + i + "]")); } @@ -130,7 +130,7 @@ public class AWSUtils { checkArgument(checkNotNull(input, "input") instanceof Iterable, "this binder is only valid for Iterable: " + input.getClass()); Iterable values = (Iterable) input; - Builder builder = ImmutableMultimap. builder(); + Builder builder = ImmutableMultimap.builder(); int i = 0; for (Object o : values) { builder.put(prefix + "." + (i++ + 1), checkNotNull(o.toString(), prefix.toLowerCase() + "s[" + i + "]")); @@ -143,7 +143,7 @@ public class AWSUtils { checkArgument(checkNotNull(input, "input") instanceof String[], "this binder is only valid for String[] : " + input.getClass()); String[] values = (String[]) input; - Builder builder = ImmutableMultimap. builder(); + Builder builder = ImmutableMultimap.builder(); for (int i = 0; i < values.length; i++) { builder.put(prefix + "." + (i + 1), checkNotNull(values[i], prefix.toLowerCase() + "s[" + i + "]")); } @@ -154,7 +154,7 @@ public class AWSUtils { public static R indexMapToFormValuesWithPrefix(R request, String prefix, String keySuffix, String valueSuffix, Object input) { checkArgument(checkNotNull(input, "input") instanceof Map, "this binder is only valid for Map: " + input.getClass()); Map map = (Map) input; - Builder builder = ImmutableMultimap. builder(); + Builder builder = ImmutableMultimap.builder(); int i = 1; for (Map.Entry e : map.entrySet()) { builder.put(prefix + "." + i + "." + keySuffix, checkNotNull(e.getKey().toString(), keySuffix.toLowerCase() + "s[" + i + "]")); @@ -171,7 +171,7 @@ public class AWSUtils { public static R indexMultimapToFormValuesWithPrefix(R request, String prefix, String keySuffix, String valueSuffix, Object input) { checkArgument(checkNotNull(input, "input") instanceof Multimap, "this binder is only valid for Multimap: " + input.getClass()); Multimap map = (Multimap) input; - Builder builder = ImmutableMultimap. builder(); + Builder builder = ImmutableMultimap.builder(); int i = 1; for (Object k : map.keySet()) { builder.put(prefix + "." + i + "." + keySuffix, checkNotNull(k.toString(), keySuffix.toLowerCase() + "s[" + i + "]")); @@ -190,7 +190,7 @@ public class AWSUtils { public static R indexMapOfIterableToFormValuesWithPrefix(R request, String prefix, String keySuffix, String valueSuffix, Object input) { checkArgument(checkNotNull(input, "input") instanceof Map, "this binder is only valid for Map>: " + input.getClass()); Map> map = (Map>) input; - Builder builder = ImmutableMultimap. builder(); + Builder builder = ImmutableMultimap.builder(); int i = 1; for (Object k : map.keySet()) { builder.put(prefix + "." + i + "." + keySuffix, checkNotNull(k.toString(), keySuffix.toLowerCase() + "s[" + i + "]")); diff --git a/common/openstack/src/main/java/org/jclouds/openstack/functions/ParseAuthenticationResponseFromHeaders.java b/common/openstack/src/main/java/org/jclouds/openstack/functions/ParseAuthenticationResponseFromHeaders.java index ca2a301c91..249a6165e4 100644 --- a/common/openstack/src/main/java/org/jclouds/openstack/functions/ParseAuthenticationResponseFromHeaders.java +++ b/common/openstack/src/main/java/org/jclouds/openstack/functions/ParseAuthenticationResponseFromHeaders.java @@ -66,7 +66,7 @@ public class ParseAuthenticationResponseFromHeaders implements Function builder = ImmutableMap. builder(); + Builder builder = ImmutableMap.builder(); for (Entry entry : from.getHeaders().entries()) { if (entry.getKey().endsWith(URL_SUFFIX)) builder.put(entry.getKey(), getURI(entry.getValue())); diff --git a/common/openstack/src/main/java/org/jclouds/openstack/keystone/v2_0/binders/BindAuthToJsonPayload.java b/common/openstack/src/main/java/org/jclouds/openstack/keystone/v2_0/binders/BindAuthToJsonPayload.java index 4dfbb92691..aa7e591238 100644 --- a/common/openstack/src/main/java/org/jclouds/openstack/keystone/v2_0/binders/BindAuthToJsonPayload.java +++ b/common/openstack/src/main/java/org/jclouds/openstack/keystone/v2_0/binders/BindAuthToJsonPayload.java @@ -73,7 +73,7 @@ public class BindAuthToJsonPayload extends BindToJsonPayload implements MapBinde GeneratedHttpRequest gRequest = (GeneratedHttpRequest) request; checkState(gRequest.getArgs() != null, "args should be initialized at this point"); - Builder builder = ImmutableMap. builder(); + Builder builder = ImmutableMap.builder(); addCredentialsInArgsOrNull(gRequest, builder); // TODO: is tenantName permanent? or should we switch to tenantId at some point. seems most tools // still use tenantName diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/config/DefaultVCloudReferencesModule.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/config/DefaultVCloudReferencesModule.java index 59e765640b..ec96dfd891 100644 --- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/config/DefaultVCloudReferencesModule.java +++ b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/config/DefaultVCloudReferencesModule.java @@ -106,7 +106,7 @@ public class DefaultVCloudReferencesModule extends AbstractModule { @Override public Map apply(Map> arg0) { - Builder builder = ImmutableMap. builder(); + Builder builder = ImmutableMap.builder(); for (Map v1 : arg0.values()) { for (Catalog v2 : v1.values()) { builder.put(v2.getHref(), v2); diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/config/TerremarkVCloudRestClientModule.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/config/TerremarkVCloudRestClientModule.java index ef66700ad1..0d48d18910 100644 --- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/config/TerremarkVCloudRestClientModule.java +++ b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/config/TerremarkVCloudRestClientModule.java @@ -150,7 +150,7 @@ public class TerremarkVCloudRestClientModule apply(Map arg0) { - Builder returnVal = ImmutableMap. builder(); + Builder returnVal = ImmutableMap.builder(); for (Entry orgr : arg0.entrySet()) { for (String vdc : orgr.getValue().getVDCs().keySet()) { returnVal.put(vdc, orgr.getKey()); diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/options/AddInternetServiceOptions.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/options/AddInternetServiceOptions.java index 1c7cf9a38d..232582615f 100644 --- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/options/AddInternetServiceOptions.java +++ b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/options/AddInternetServiceOptions.java @@ -42,7 +42,7 @@ public class AddInternetServiceOptions extends BindAddInternetServiceToXmlPayloa @Override public R bindToRequest(R request, Map postParams) { - ImmutableMap.Builder copy = ImmutableMap. builder(); + ImmutableMap.Builder copy = ImmutableMap.builder(); copy.putAll(postParams); if (description != null) copy.put("description", description); diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/xml/DataCentersHandler.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/xml/DataCentersHandler.java index d6b6154828..0218308046 100644 --- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/xml/DataCentersHandler.java +++ b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/xml/DataCentersHandler.java @@ -37,7 +37,7 @@ import com.google.common.collect.ImmutableSet.Builder; public class DataCentersHandler extends ParseSax.HandlerWithResult> { protected StringBuilder currentText = new StringBuilder(); - protected Builder dataCenters = ImmutableSet. builder(); + protected Builder dataCenters = ImmutableSet.builder(); protected DataCenter.Builder builder = DataCenter.builder(); diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/xml/InternetServicesHandler.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/xml/InternetServicesHandler.java index b1e0f1ddb2..e71bda9644 100644 --- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/xml/InternetServicesHandler.java +++ b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/xml/InternetServicesHandler.java @@ -37,7 +37,7 @@ import com.google.common.collect.ImmutableSet.Builder; public class InternetServicesHandler extends HandlerWithResult> { private final InternetServiceHandler handler; - private Builder builder = ImmutableSet. builder(); + private Builder builder = ImmutableSet.builder(); @Inject public InternetServicesHandler(InternetServiceHandler handler) { diff --git a/compute/src/main/java/org/jclouds/compute/RunScriptData.java b/compute/src/main/java/org/jclouds/compute/RunScriptData.java index e62fd67348..c678d6b851 100644 --- a/compute/src/main/java/org/jclouds/compute/RunScriptData.java +++ b/compute/src/main/java/org/jclouds/compute/RunScriptData.java @@ -51,7 +51,7 @@ public class RunScriptData { public static String JBOSS_HOME = "/usr/local/jboss"; public static Statement authorizePortsInIpTables(int... ports) { - Builder builder = ImmutableList. builder(); + Builder builder = ImmutableList.builder(); for (int port : ports) builder.add(exec("iptables -I INPUT 1 -p tcp --dport " + port + " -j ACCEPT")); builder.add(exec("iptables-save")); diff --git a/compute/src/main/java/org/jclouds/compute/domain/internal/NullEqualToIsParentOrIsGrandparentOfCurrentLocation.java b/compute/src/main/java/org/jclouds/compute/domain/internal/NullEqualToIsParentOrIsGrandparentOfCurrentLocation.java index 89cf0cbe84..54f6593c33 100644 --- a/compute/src/main/java/org/jclouds/compute/domain/internal/NullEqualToIsParentOrIsGrandparentOfCurrentLocation.java +++ b/compute/src/main/java/org/jclouds/compute/domain/internal/NullEqualToIsParentOrIsGrandparentOfCurrentLocation.java @@ -65,7 +65,7 @@ public class NullEqualToIsParentOrIsGrandparentOfCurrentLocation implements Pred "only locations of scope PROVIDER can have a null parent; input: %s", input.getLocation()); - Builder> predicates = ImmutableSet.>builder(); + Builder> predicates = ImmutableSet.builder(); predicates.add(equalTo(current)); diff --git a/compute/src/main/java/org/jclouds/compute/stub/config/StubComputeServiceAdapter.java b/compute/src/main/java/org/jclouds/compute/stub/config/StubComputeServiceAdapter.java index 178f870e09..0bb2a81782 100644 --- a/compute/src/main/java/org/jclouds/compute/stub/config/StubComputeServiceAdapter.java +++ b/compute/src/main/java/org/jclouds/compute/stub/config/StubComputeServiceAdapter.java @@ -141,7 +141,7 @@ public class StubComputeServiceAdapter implements JCloudsNativeComputeServiceAda public Iterable listImages() { // initializing as a List, as ImmutableSet does not allow you to put // duplicates - Builder images = ImmutableList. builder(); + Builder images = ImmutableList.builder(); int id = 1; for (boolean is64Bit : new boolean[] { true, false }) for (Entry> osVersions : this.osToVersionMap.entrySet()) { diff --git a/core/src/main/java/org/jclouds/crypto/SshKeys.java b/core/src/main/java/org/jclouds/crypto/SshKeys.java index 09b609acd2..e085d7a1ad 100644 --- a/core/src/main/java/org/jclouds/crypto/SshKeys.java +++ b/core/src/main/java/org/jclouds/crypto/SshKeys.java @@ -149,7 +149,7 @@ public class SshKeys { public static Map generate(KeyPairGenerator generator) { KeyPair pair = generateRsaKeyPair(generator); - Builder builder = ImmutableMap. builder(); + Builder builder = ImmutableMap.builder(); builder.put("public", encodeAsOpenSSH(RSAPublicKey.class.cast(pair.getPublic()))); builder.put("private", encodeAsPem(RSAPrivateKey.class.cast(pair.getPrivate()))); return builder.build(); diff --git a/core/src/main/java/org/jclouds/functions/JoinOnK2.java b/core/src/main/java/org/jclouds/functions/JoinOnK2.java index 23866bc0fd..206ed43891 100644 --- a/core/src/main/java/org/jclouds/functions/JoinOnK2.java +++ b/core/src/main/java/org/jclouds/functions/JoinOnK2.java @@ -37,7 +37,7 @@ public class JoinOnK2 implements Function>>, M @Override public Map> apply(Map>> regionToZones) { Map> regionToEndpoint = regionToEndpointSupplier.get(); - Builder> builder = ImmutableMap.> builder(); + Builder> builder = ImmutableMap.builder(); for (Entry>> entry : regionToZones.entrySet()) { for (K2 zone : entry.getValue().get()) { builder.put(zone, regionToEndpoint.get(entry.getKey())); diff --git a/core/src/main/java/org/jclouds/json/config/GsonModule.java b/core/src/main/java/org/jclouds/json/config/GsonModule.java index 2af1baf370..7e0712cacb 100644 --- a/core/src/main/java/org/jclouds/json/config/GsonModule.java +++ b/core/src/main/java/org/jclouds/json/config/GsonModule.java @@ -185,7 +185,7 @@ public class GsonModule extends AbstractModule { @Override public void write(JsonWriter out, Properties value) throws IOException { - Builder srcMap = ImmutableMap. builder(); + Builder srcMap = ImmutableMap.builder(); for (Enumeration propNames = value.propertyNames(); propNames.hasMoreElements();) { String propName = (String) propNames.nextElement(); srcMap.put(propName, value.getProperty(propName)); diff --git a/core/src/main/java/org/jclouds/location/suppliers/fromconfig/LocationIdToIso3166CodesFromConfiguration.java b/core/src/main/java/org/jclouds/location/suppliers/fromconfig/LocationIdToIso3166CodesFromConfiguration.java index 13360e87c8..5eb0a2c1f9 100644 --- a/core/src/main/java/org/jclouds/location/suppliers/fromconfig/LocationIdToIso3166CodesFromConfiguration.java +++ b/core/src/main/java/org/jclouds/location/suppliers/fromconfig/LocationIdToIso3166CodesFromConfiguration.java @@ -71,7 +71,7 @@ public class LocationIdToIso3166CodesFromConfiguration implements LocationIdToIs } }); - Builder>> codes = ImmutableMap.>> builder(); + Builder>> codes = ImmutableMap.builder(); for (String key : ImmutableSet.of(PROPERTY_REGION, PROPERTY_ZONE)) { String regionOrZoneString = stringsBoundWithRegionOrZonePrefix.get(key + "s"); if (regionOrZoneString == null) diff --git a/core/src/main/java/org/jclouds/location/suppliers/fromconfig/LocationIdToURIFromConfigurationOrDefaultToProvider.java b/core/src/main/java/org/jclouds/location/suppliers/fromconfig/LocationIdToURIFromConfigurationOrDefaultToProvider.java index 5cc3b45a8e..04a2656f0d 100644 --- a/core/src/main/java/org/jclouds/location/suppliers/fromconfig/LocationIdToURIFromConfigurationOrDefaultToProvider.java +++ b/core/src/main/java/org/jclouds/location/suppliers/fromconfig/LocationIdToURIFromConfigurationOrDefaultToProvider.java @@ -60,7 +60,7 @@ public class LocationIdToURIFromConfigurationOrDefaultToProvider implements Supp @Override public Map> get() { - Builder> locations = ImmutableMap.> builder(); + Builder> locations = ImmutableMap.builder(); for (String location : locationIds.get()) { String configKey = configPrefix + "." + location + "." + ENDPOINT; String locationUri = config.apply(configKey); diff --git a/core/src/main/java/org/jclouds/location/suppliers/fromconfig/RegionIdToZoneIdsFromConfiguration.java b/core/src/main/java/org/jclouds/location/suppliers/fromconfig/RegionIdToZoneIdsFromConfiguration.java index 33636bcae4..03cc753371 100644 --- a/core/src/main/java/org/jclouds/location/suppliers/fromconfig/RegionIdToZoneIdsFromConfiguration.java +++ b/core/src/main/java/org/jclouds/location/suppliers/fromconfig/RegionIdToZoneIdsFromConfiguration.java @@ -75,7 +75,7 @@ public class RegionIdToZoneIdsFromConfiguration implements RegionIdToZoneIdsSupp logger.debug("no regions configured for provider %s", provider); return ImmutableMap.of(); } - Builder>> regionToZones = ImmutableMap.>> builder(); + Builder>> regionToZones = ImmutableMap.builder(); for (String region : regions) { String configKey = PROPERTY_REGION + "." + region + ".zones"; String zones = config.apply(configKey); 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 a8dd2a78ff..1564b57ce8 100644 --- a/core/src/main/java/org/jclouds/rest/internal/RestAnnotationProcessor.java +++ b/core/src/main/java/org/jclouds/rest/internal/RestAnnotationProcessor.java @@ -243,7 +243,7 @@ public class RestAnnotationProcessor { new CacheLoader>() { @Override public Set load(Method method) { - Builder toReturn = ImmutableSet. builder(); + Builder toReturn = ImmutableSet.builder(); for (int index = 0; index < method.getParameterTypes().length; index++) { Class type = method.getParameterTypes()[index]; if (HttpRequestOptions.class.isAssignableFrom(type) || optionsVarArgsClass.isAssignableFrom(type)) @@ -922,7 +922,7 @@ public class RestAnnotationProcessor { } public static Set getHttpMethods(Method method) { - Builder methodsBuilder = ImmutableSet. builder(); + Builder methodsBuilder = ImmutableSet.builder(); for (Annotation annotation : method.getAnnotations()) { HttpMethod http = annotation.annotationType().getAnnotation(HttpMethod.class); if (http != null) diff --git a/core/src/main/java/org/jclouds/util/Multimaps2.java b/core/src/main/java/org/jclouds/util/Multimaps2.java index 905e0e5ced..d55d29f553 100644 --- a/core/src/main/java/org/jclouds/util/Multimaps2.java +++ b/core/src/main/java/org/jclouds/util/Multimaps2.java @@ -44,7 +44,7 @@ public class Multimaps2 { */ @Deprecated public static Map> toOldSchool(Multimap in) { - ImmutableMap.Builder> out = ImmutableMap.> builder(); + ImmutableMap.Builder> out = ImmutableMap.builder(); for (K type : in.keySet()) out.put(type, ImmutableSet.copyOf(in.get(type))); return out.build(); @@ -55,7 +55,7 @@ public class Multimaps2 { */ @Deprecated public static ImmutableMultimap fromOldSchool(Map> in) { - Builder out = ImmutableMultimap. builder(); + Builder out = ImmutableMultimap.builder(); for (K type : in.keySet()) out.putAll(type, ImmutableSet.copyOf(in.get(type))); return out.build(); diff --git a/core/src/main/java/org/jclouds/util/SaxUtils.java b/core/src/main/java/org/jclouds/util/SaxUtils.java index a7fad6b54d..145719a2b0 100644 --- a/core/src/main/java/org/jclouds/util/SaxUtils.java +++ b/core/src/main/java/org/jclouds/util/SaxUtils.java @@ -36,7 +36,7 @@ public class SaxUtils { } public static Map cleanseAttributes(Attributes in) { - Builder attrs = ImmutableMap. builder(); + Builder attrs = ImmutableMap.builder(); for (int i = 0; i < in.getLength(); i++) { String name = in.getQName(i); if (name.indexOf(':') != -1) diff --git a/labs/glesys/src/main/java/org/jclouds/glesys/compute/GleSYSComputeServiceAdapter.java b/labs/glesys/src/main/java/org/jclouds/glesys/compute/GleSYSComputeServiceAdapter.java index d2e2feb677..8027a90676 100644 --- a/labs/glesys/src/main/java/org/jclouds/glesys/compute/GleSYSComputeServiceAdapter.java +++ b/labs/glesys/src/main/java/org/jclouds/glesys/compute/GleSYSComputeServiceAdapter.java @@ -156,7 +156,7 @@ public class GleSYSComputeServiceAdapter implements ComputeServiceAdapter listHardwareProfiles() { Set locationsSet = locations.get(); - ImmutableSet.Builder hardwareToReturn = ImmutableSet. builder(); + ImmutableSet.Builder hardwareToReturn = ImmutableSet.builder(); // do this loop after dupes are filtered, else OOM Set images = listImages(); @@ -167,7 +167,7 @@ public class GleSYSComputeServiceAdapter implements ComputeServiceAdapter templatesSupportedBuilder = ImmutableSet. builder(); + ImmutableSet.Builder templatesSupportedBuilder = ImmutableSet.builder(); for (OSTemplate template : images) { if (template.getPlatform().equals(platformToArgs.getKey()) && diskSizeGB >= template.getMinDiskSize() && memorySizeMB >= template.getMinMemSize()) diff --git a/labs/glesys/src/main/java/org/jclouds/glesys/options/CreateServerOptions.java b/labs/glesys/src/main/java/org/jclouds/glesys/options/CreateServerOptions.java index 5764e62526..8b69892918 100644 --- a/labs/glesys/src/main/java/org/jclouds/glesys/options/CreateServerOptions.java +++ b/labs/glesys/src/main/java/org/jclouds/glesys/options/CreateServerOptions.java @@ -53,7 +53,7 @@ public class CreateServerOptions implements MapBinder { GeneratedHttpRequest gRequest = (GeneratedHttpRequest) request; checkState(gRequest.getArgs() != null, "args should be initialized at this point"); - ImmutableMultimap.Builder formParams = ImmutableMultimap. builder(); + ImmutableMultimap.Builder formParams = ImmutableMultimap.builder(); formParams.putAll(forMap(postParams)); ServerSpec serverSpec = ServerSpec.class.cast(find(gRequest.getArgs(), instanceOf(ServerSpec.class))); formParams.put("datacenter", serverSpec.getDatacenter()); diff --git a/labs/glesys/src/test/java/org/jclouds/glesys/features/ServerClientExpectTest.java b/labs/glesys/src/test/java/org/jclouds/glesys/features/ServerClientExpectTest.java index 0fdfd17159..32001b2894 100644 --- a/labs/glesys/src/test/java/org/jclouds/glesys/features/ServerClientExpectTest.java +++ b/labs/glesys/src/test/java/org/jclouds/glesys/features/ServerClientExpectTest.java @@ -134,7 +134,7 @@ public class ServerClientExpectTest extends BaseRestClientExpectTest expectedBuilder = ImmutableSet. builder(); + ImmutableSet.Builder expectedBuilder = ImmutableSet.builder(); for (String name : new String[] { "Centos 5", "Centos 5 64-bit", "Centos 6 32-bit", "Centos 6 64-bit", "Debian 5.0 32-bit", "Debian 5.0 64-bit", "Debian 6.0 32-bit", "Debian 6.0 64-bit", "Fedora Core 11", diff --git a/labs/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/compute/strategy/VPDCComputeServiceAdapter.java b/labs/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/compute/strategy/VPDCComputeServiceAdapter.java index d75c622ad6..9c6b6ea457 100644 --- a/labs/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/compute/strategy/VPDCComputeServiceAdapter.java +++ b/labs/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/compute/strategy/VPDCComputeServiceAdapter.java @@ -126,7 +126,7 @@ public class VPDCComputeServiceAdapter implements ComputeServiceAdapter listNodes() { - Builder builder = ImmutableSet. builder(); + Builder builder = ImmutableSet.builder(); for (Resource org1 : client.listOrgs()) { Org org = client.getBrowsingClient().getOrg(org1.getId()); for (Resource vdc : org.getVDCs()) { @@ -149,7 +149,7 @@ public class VPDCComputeServiceAdapter implements ComputeServiceAdapter listLocations() { - Builder builder = ImmutableSet. builder(); + Builder builder = ImmutableSet.builder(); for (Resource org1 : client.listOrgs()) { Org org = client.getBrowsingClient().getOrg(org1.getId()); for (Resource vdc : org.getVDCs()) { diff --git a/labs/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/util/Utils.java b/labs/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/util/Utils.java index 9faba4bd31..dd191b98c6 100644 --- a/labs/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/util/Utils.java +++ b/labs/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/util/Utils.java @@ -81,7 +81,7 @@ public class Utils { } public static Map cleanseAttributes(Attributes in) { - Builder attrs = ImmutableMap. builder(); + Builder attrs = ImmutableMap.builder(); for (int i = 0; i < in.getLength(); i++) { String name = in.getQName(i); if (name.indexOf(':') != -1) diff --git a/labs/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/xml/OrgListHandler.java b/labs/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/xml/OrgListHandler.java index 3ae57c260c..14777d7201 100644 --- a/labs/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/xml/OrgListHandler.java +++ b/labs/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/xml/OrgListHandler.java @@ -38,7 +38,7 @@ import com.google.common.collect.ImmutableSet.Builder; */ public class OrgListHandler extends ParseSax.HandlerWithResult> { - private Builder org = ImmutableSet. builder(); + private Builder org = ImmutableSet.builder(); public Set getResult() { try { diff --git a/labs/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/xml/TasksListHandler.java b/labs/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/xml/TasksListHandler.java index 6e8f27d454..f5807f680b 100644 --- a/labs/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/xml/TasksListHandler.java +++ b/labs/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/xml/TasksListHandler.java @@ -37,7 +37,7 @@ import com.google.common.collect.ImmutableSet.Builder; */ public class TasksListHandler extends ParseSax.HandlerWithResult> { - private Builder tasks = ImmutableSet. builder(); + private Builder tasks = ImmutableSet.builder(); private final TaskHandler taskHandler; @Inject diff --git a/labs/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/features/VMClientLiveTest.java b/labs/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/features/VMClientLiveTest.java index 9798bdbba8..6ad7591f97 100644 --- a/labs/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/features/VMClientLiveTest.java +++ b/labs/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/features/VMClientLiveTest.java @@ -170,7 +170,7 @@ public class VMClientLiveTest extends BaseVPDCClientLiveTest { System.out.printf("Creating vm's - vpdcId %s, vpdcName %s, networkName %s, name %s, os %s%n", vpdcId, vpdc.getName(), networkTier .getName().replace("-", " "), name, os); - Builder vmSpecs = ImmutableSet. builder(); + Builder vmSpecs = ImmutableSet.builder(); int noOfVms = 2; for (int i = 0; i < noOfVms; i++) { // TODO: determine the sizes available in the VDC, for example there's diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/binders/BindLaunchSpecificationToFormParams.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/binders/BindLaunchSpecificationToFormParams.java index 8e7b9f76d6..753ab0302b 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/binders/BindLaunchSpecificationToFormParams.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/binders/BindLaunchSpecificationToFormParams.java @@ -53,7 +53,7 @@ public class BindLaunchSpecificationToFormParams implements Binder, Function apply(LaunchSpecification launchSpec) { - Builder builder = ImmutableMap. builder(); + Builder builder = ImmutableMap.builder(); builder.put("LaunchSpecification.ImageId", checkNotNull(launchSpec.getImageId(), "imageId")); if (launchSpec.getAvailabilityZone() != null) builder.put("LaunchSpecification.Placement.AvailabilityZone", launchSpec.getAvailabilityZone()); diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/suppliers/AWSEC2ImageSupplier.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/suppliers/AWSEC2ImageSupplier.java index b2c85c4719..277bc0a18c 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/suppliers/AWSEC2ImageSupplier.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/suppliers/AWSEC2ImageSupplier.java @@ -149,7 +149,7 @@ public class AWSEC2ImageSupplier implements Supplier> { INSTANCE; @Override public Multimap apply(String arg0) { - ImmutableMultimap.Builder builder = ImmutableMultimap. builder(); + ImmutableMultimap.Builder builder = ImmutableMultimap.builder(); for (String pair : Splitter.on(';').split(arg0)) { String[] keyValue = pair.split("="); if (keyValue.length == 1) diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/suppliers/CallForImages.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/suppliers/CallForImages.java index 04adf718a3..fa4559c7d1 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/suppliers/CallForImages.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/suppliers/CallForImages.java @@ -76,7 +76,7 @@ public class CallForImages implements Callable> { logger.debug(">> providing images"); - Builder builder = ImmutableMap. builder(); + Builder builder = ImmutableMap.builder(); for (String region : regions) builder.put(region, filters(filter)); diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/domain/LaunchSpecification.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/domain/LaunchSpecification.java index e4c7513dec..7b390b2150 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/domain/LaunchSpecification.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/domain/LaunchSpecification.java @@ -48,7 +48,7 @@ public class LaunchSpecification { } public static class Builder { - protected ImmutableMap.Builder securityGroupIdToNames = ImmutableMap. builder(); + protected ImmutableMap.Builder securityGroupIdToNames = ImmutableMap.builder(); protected String imageId; protected String instanceType; protected String kernelId; @@ -57,13 +57,13 @@ public class LaunchSpecification { protected String ramdiskId; protected Boolean monitoringEnabled; protected ImmutableSet.Builder blockDeviceMappings = ImmutableSet - . builder(); - protected ImmutableSet.Builder securityGroupIds = ImmutableSet. builder(); - protected ImmutableSet.Builder securityGroupNames = ImmutableSet. builder(); + .builder(); + protected ImmutableSet.Builder securityGroupIds = ImmutableSet.builder(); + protected ImmutableSet.Builder securityGroupNames = ImmutableSet.builder(); protected byte[] userData; public void clear() { - securityGroupIdToNames = ImmutableMap. builder(); + securityGroupIdToNames = ImmutableMap.builder(); imageId = null; instanceType = null; kernelId = null; @@ -71,9 +71,9 @@ public class LaunchSpecification { availabilityZone = null; ramdiskId = null; monitoringEnabled = false; - blockDeviceMappings = ImmutableSet. builder(); - securityGroupIds = ImmutableSet. builder(); - securityGroupNames = ImmutableSet. builder(); + blockDeviceMappings = ImmutableSet.builder(); + securityGroupIds = ImmutableSet.builder(); + securityGroupNames = ImmutableSet.builder(); userData = null; } diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/DescribeSpotPriceHistoryResponseHandler.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/DescribeSpotPriceHistoryResponseHandler.java index 020e579496..fd058b7c75 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/DescribeSpotPriceHistoryResponseHandler.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/DescribeSpotPriceHistoryResponseHandler.java @@ -38,7 +38,7 @@ import com.google.common.collect.ImmutableSet.Builder; public class DescribeSpotPriceHistoryResponseHandler extends ParseSax.HandlerWithResult> { - private Builder spots = ImmutableSet.builder(); + private Builder spots = ImmutableSet.builder(); private final SpotHandler spotHandler; @Inject diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/SpotInstancesHandler.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/SpotInstancesHandler.java index 9960502864..87babbc623 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/SpotInstancesHandler.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/SpotInstancesHandler.java @@ -37,7 +37,7 @@ import com.google.common.collect.ImmutableSet.Builder; */ public class SpotInstancesHandler extends ParseSax.HandlerWithResult> { - private final Builder spotRequests = ImmutableSet. builder(); + private final Builder spotRequests = ImmutableSet.builder(); private final SpotInstanceHandler spotRequestHandler; private int itemDepth; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/TagSetHandler.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/TagSetHandler.java index a718e2fad3..af611683b3 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/TagSetHandler.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/TagSetHandler.java @@ -52,7 +52,7 @@ public class TagSetHandler extends ParseSax.HandlerForGeneratedRequestWithResult @Override public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException { if (equalsOrSuffix(qName, "tagSet")) { - result = ImmutableMap.builder(); + result = ImmutableMap.builder(); } else if (qName.equals("item")) { inItem = true; key = null; diff --git a/providers/aws-s3/src/main/java/org/jclouds/aws/s3/binders/BindObjectMetadataToRequest.java b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/binders/BindObjectMetadataToRequest.java index 7f9cee3013..f498de18f7 100644 --- a/providers/aws-s3/src/main/java/org/jclouds/aws/s3/binders/BindObjectMetadataToRequest.java +++ b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/binders/BindObjectMetadataToRequest.java @@ -59,7 +59,7 @@ public class BindObjectMetadataToRequest implements Binder { request = metadataPrefixer.bindToRequest(request, md.getUserMetadata()); - Builder headers = ImmutableMultimap. builder(); + Builder headers = ImmutableMultimap.builder(); if (md.getCacheControl() != null) { headers.put(HttpHeaders.CACHE_CONTROL, md.getCacheControl()); } diff --git a/providers/azureblob/src/main/java/org/jclouds/azureblob/binders/BindAzureBlobMetadataToRequest.java b/providers/azureblob/src/main/java/org/jclouds/azureblob/binders/BindAzureBlobMetadataToRequest.java index 396ca42676..43b85e60b2 100644 --- a/providers/azureblob/src/main/java/org/jclouds/azureblob/binders/BindAzureBlobMetadataToRequest.java +++ b/providers/azureblob/src/main/java/org/jclouds/azureblob/binders/BindAzureBlobMetadataToRequest.java @@ -57,7 +57,7 @@ public class BindAzureBlobMetadataToRequest implements Binder { checkArgument(blob.getPayload().getContentMetadata().getContentLength() != null && blob.getPayload().getContentMetadata().getContentLength() >= 0, "size must be set"); - Builder headers = ImmutableMap. builder(); + Builder headers = ImmutableMap.builder(); headers.put("x-ms-blob-type", blob.getProperties().getType().toString()); diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/SoftLayerPropertiesBuilder.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/SoftLayerPropertiesBuilder.java index cc6b7ed6f7..142ddb9df6 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/SoftLayerPropertiesBuilder.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/SoftLayerPropertiesBuilder.java @@ -57,7 +57,7 @@ public class SoftLayerPropertiesBuilder extends PropertiesBuilder { // 10, 100, 1000 properties.setProperty(PROPERTY_SOFTLAYER_VIRTUALGUEST_PORT_SPEED, "10"); properties.setProperty(PROPERTY_ISO3166_CODES, "SG,NL,US-CA,US-TX,US-VA,US-WA,US-TX"); - Builder prices = ImmutableSet. builder(); + Builder prices = ImmutableSet.builder(); prices.add("21"); // 1 IP Address prices.add("55"); // Host Ping: categoryCode: monitoring, notification prices.add("57"); // Email and Ticket: categoryCode: notification 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 528f334b5e..74a334199d 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 @@ -146,7 +146,7 @@ public class SoftLayerComputeServiceAdapter implements } private Iterable getPrices(Template template) { - Builder result = ImmutableSet. builder(); + Builder result = ImmutableSet.builder(); int imageId = Integer.parseInt(template.getImage().getId()); result.add(ProductItemPrice.builder().id(imageId).build()); @@ -167,7 +167,7 @@ public class SoftLayerComputeServiceAdapter implements public Iterable> listHardwareProfiles() { ProductPackage productPackage = productPackageSupplier.get(); Set items = productPackage.getItems(); - Builder> result = ImmutableSet.> builder(); + Builder> result = ImmutableSet.builder(); for (ProductItem cpuItem : filter(items, matches(cpuPattern))) { for (ProductItem ramItem : filter(items, categoryCode("ram"))) { for (ProductItem sanItem : filter(items, and(matches(disk0Type), categoryCode("guest_disk0")))) { diff --git a/providers/softlayer/src/test/java/org/jclouds/softlayer/features/DatacenterClientLiveTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/features/DatacenterClientLiveTest.java index 786b9b9100..77ca945ab6 100644 --- a/providers/softlayer/src/test/java/org/jclouds/softlayer/features/DatacenterClientLiveTest.java +++ b/providers/softlayer/src/test/java/org/jclouds/softlayer/features/DatacenterClientLiveTest.java @@ -61,7 +61,7 @@ public class DatacenterClientLiveTest extends BaseSoftLayerClientLiveTest { @Test public void testListDatacentersContent() { - Builder builder = ImmutableSet. builder(); + Builder builder = ImmutableSet.builder(); builder.add(Datacenter.builder().id(265592).name("ams01").longName("Amsterdam 1").build()); builder.add(Datacenter.builder().id(3).name("dal01").longName("Dallas").build()); builder.add(Datacenter.builder().id(18171).name("sea01").longName("Seattle").build()); diff --git a/providers/softlayer/src/test/java/org/jclouds/softlayer/features/VirtualGuestClientLiveTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/features/VirtualGuestClientLiveTest.java index 41db69da16..791a9cd1ea 100644 --- a/providers/softlayer/src/test/java/org/jclouds/softlayer/features/VirtualGuestClientLiveTest.java +++ b/providers/softlayer/src/test/java/org/jclouds/softlayer/features/VirtualGuestClientLiveTest.java @@ -116,7 +116,7 @@ public class VirtualGuestClientLiveTest extends BaseSoftLayerClientLiveTest { ProductItemPrice osPrice = ProductItems.price().apply( osToProductItem.get("Ubuntu Linux 8 LTS Hardy Heron - Minimal Install (64 bit)")); - Builder prices = ImmutableSet. builder(); + Builder prices = ImmutableSet.builder(); prices.addAll(Guice.createInjector(module).getInstance(Key.get(new TypeLiteral>() { }))); prices.add(ramPrice); diff --git a/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/xml/TagNameToUsageCountHandler.java b/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/xml/TagNameToUsageCountHandler.java index 68340ba8df..139a64f998 100644 --- a/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/xml/TagNameToUsageCountHandler.java +++ b/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/xml/TagNameToUsageCountHandler.java @@ -34,7 +34,7 @@ import com.google.common.collect.ImmutableMap.Builder; public class TagNameToUsageCountHandler extends ParseSax.HandlerWithResult> { protected StringBuilder currentText = new StringBuilder(); - private Builder builder = ImmutableMap. builder(); + private Builder builder = ImmutableMap.builder(); private String name; public Map getResult() { diff --git a/sandbox-apis/simpledb/src/main/java/org/jclouds/simpledb/binders/BindAttributesToIndexedFormParams.java b/sandbox-apis/simpledb/src/main/java/org/jclouds/simpledb/binders/BindAttributesToIndexedFormParams.java index 660c380e76..cfba32053f 100644 --- a/sandbox-apis/simpledb/src/main/java/org/jclouds/simpledb/binders/BindAttributesToIndexedFormParams.java +++ b/sandbox-apis/simpledb/src/main/java/org/jclouds/simpledb/binders/BindAttributesToIndexedFormParams.java @@ -49,7 +49,7 @@ public class BindAttributesToIndexedFormParams implements Binder { checkArgument(checkNotNull(input, "input") instanceof Item, "this binder is only valid for AttributeMap"); Item attributeMap = (Item) input; - Builder builder = ImmutableMultimap. builder(); + Builder builder = ImmutableMultimap.builder(); int amazonOneBasedIndex = 1; // according to docs, counters must start with 1 for (String itemName : attributeMap.getAttributes().keySet()) { diff --git a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/ScriptBuilder.java b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/ScriptBuilder.java index 6b29ac5966..7c71ce85fc 100644 --- a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/ScriptBuilder.java +++ b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/ScriptBuilder.java @@ -153,7 +153,7 @@ public class ScriptBuilder implements Statement, AcceptsStatementVisitor { @VisibleForTesting public static Map resolveFunctionDependenciesForStatements(Map knownFunctions, Iterable statements, final OsFamily osFamily) { - Builder builder = ImmutableMap. builder(); + Builder builder = ImmutableMap.builder(); builder.putAll(knownFunctions); Set dependentFunctions = ImmutableSet.copyOf(Iterables.concat(Iterables.transform(statements, new Function>() { diff --git a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/domain/CreateRunScript.java b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/domain/CreateRunScript.java index ad680797e4..0678107bd5 100644 --- a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/domain/CreateRunScript.java +++ b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/domain/CreateRunScript.java @@ -121,7 +121,7 @@ public class CreateRunScript extends StatementList { private void addUnixRunScript(String runScript, StringBuilder builder) { builder.append("# add desired commands from the user\n"); - Builder userCommands = ImmutableList.builder(); + Builder userCommands = ImmutableList.builder(); userCommands.add("cd " + pwd); for (Statement statement : statements) { if (statement instanceof Call @@ -137,7 +137,7 @@ public class CreateRunScript extends StatementList { private void addUnixRunScriptHeader(String runScript, StringBuilder builder) { builder.append("# create runscript header\n"); - Builder beginningOfFile = ImmutableList. builder(); + Builder beginningOfFile = ImmutableList.builder(); beginningOfFile.addAll(Splitter.on(ShellToken.LF.to(OsFamily.UNIX)).split( ShellToken.BEGIN_SCRIPT.to(OsFamily.UNIX))); beginningOfFile.add(format("PROMPT_COMMAND='echo -ne \\\"\\033]0;%s\\007\\\"'", instanceName)); diff --git a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/domain/StatementList.java b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/domain/StatementList.java index db5f4a3aaa..60b1c924f9 100644 --- a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/domain/StatementList.java +++ b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/domain/StatementList.java @@ -53,7 +53,7 @@ public class StatementList extends ForwardingList implements Statemen @Override public Iterable functionDependencies(OsFamily family) { - Builder functions = ImmutableList. builder(); + Builder functions = ImmutableList.builder(); for (Statement statement : delegate()) { functions.addAll(statement.functionDependencies(family)); } diff --git a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/AdminAccess.java b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/AdminAccess.java index f222bc8b0b..4c7237e830 100644 --- a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/AdminAccess.java +++ b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/AdminAccess.java @@ -361,7 +361,7 @@ public class AdminAccess implements Statement { checkNotNull(config.getAdminPrivateKey(), "adminPrivateKey"); checkNotNull(config.getLoginPassword(), "loginPassword"); - ImmutableList.Builder statements = ImmutableList. builder(); + ImmutableList.Builder statements = ImmutableList.builder(); UserAdd.Builder userBuilder = UserAdd.builder(); userBuilder.login(config.getAdminUsername()); if (config.shouldAuthorizeAdminPublicKey()) diff --git a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/Sudoers.java b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/Sudoers.java index 12c9840235..a519a26041 100644 --- a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/Sudoers.java +++ b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/Sudoers.java @@ -44,7 +44,7 @@ public class Sudoers implements Statement { checkNotNull(family, "family"); if (family == OsFamily.WINDOWS) throw new UnsupportedOperationException("windows not yet implemented"); - Builder statements = ImmutableList. builder(); + Builder statements = ImmutableList.builder(); statements.add(createOrOverwriteFile(sudoers, ImmutableSet.of("root ALL = (ALL) ALL", "%wheel ALL = (ALL) NOPASSWD:ALL"))); statements.add(exec("chmod 0440 " + sudoers)); return new StatementList(statements.build()).render(family); 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 20acff8053..22dccd9492 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 @@ -160,11 +160,11 @@ public class UserAdd implements Statement { if (family == OsFamily.WINDOWS) throw new UnsupportedOperationException("windows not yet implemented"); String homeDir = defaultHome + "{fs}" + login; - ImmutableList.Builder statements = ImmutableList. builder(); + ImmutableList.Builder statements = ImmutableList.builder(); // useradd cannot create the default homedir statements.add(Statements.exec("{md} " + defaultHome)); - ImmutableMap.Builder userAddOptions = ImmutableMap. builder(); + ImmutableMap.Builder userAddOptions = ImmutableMap.builder(); userAddOptions.put("-s", shell); if (groups.size() > 0) { for (String group : groups) diff --git a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/ssh/AuthorizeRSAPublicKeys.java b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/ssh/AuthorizeRSAPublicKeys.java index 7d3b43bb24..fabf96a37a 100644 --- a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/ssh/AuthorizeRSAPublicKeys.java +++ b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/ssh/AuthorizeRSAPublicKeys.java @@ -61,11 +61,11 @@ public class AuthorizeRSAPublicKeys implements Statement { checkNotNull(family, "family"); if (family == OsFamily.WINDOWS) throw new UnsupportedOperationException("windows not yet implemented"); - Builder statements = ImmutableList. builder(); + Builder statements = ImmutableList.builder(); statements.add(exec("mkdir -p " + sshDir)); String authorizedKeys = sshDir + "{fs}authorized_keys"; statements.add(appendFile(authorizedKeys, Splitter.on('\n').split(Joiner.on("\n\n").join(publicKeys)))); statements.add(exec("chmod 600 " + authorizedKeys)); return new StatementList(statements.build()).render(family); } -} \ No newline at end of file +} diff --git a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/ssh/InstallRSAPrivateKey.java b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/ssh/InstallRSAPrivateKey.java index c603842750..4a999e9131 100644 --- a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/ssh/InstallRSAPrivateKey.java +++ b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/ssh/InstallRSAPrivateKey.java @@ -59,7 +59,7 @@ public class InstallRSAPrivateKey implements Statement { checkNotNull(family, "family"); if (family == OsFamily.WINDOWS) throw new UnsupportedOperationException("windows not yet implemented"); - Builder statements = ImmutableList. builder(); + Builder statements = ImmutableList.builder(); statements.add(exec("{md} " + sshDir)); String idRsa = sshDir + "{fs}id_rsa"; statements.add(exec("{rm} " + idRsa));