You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ga...@apache.org on 2014/05/09 03:35:34 UTC
[2/4] git commit: Enforce that all commas have trailing whitespace
Enforce that all commas have trailing whitespace
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/2d88f516
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/2d88f516
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/2d88f516
Branch: refs/heads/master
Commit: 2d88f5164ec165d0ba0d982084774f28c1039578
Parents: aef9fc8
Author: Andrew Gaul <ga...@apache.org>
Authored: Wed May 7 10:32:32 2014 -0700
Committer: Andrew Gaul <ga...@apache.org>
Committed: Thu May 8 18:28:08 2014 -0700
----------------------------------------------------------------------
...irectoryEntryListToResourceMetadataList.java | 4 +-
.../functions/ObjectToBlobMetadata.java | 2 +-
.../ParseImageListFromJsonResponseTest.java | 2 +-
.../options/CreateSharedIpGroupOptionsTest.java | 2 +-
.../CloudStackSecurityGroupExtension.java | 4 +-
.../CloudStackSecurityGroupToSecurityGroup.java | 4 +-
.../functions/ParseTypedAsyncJob.java | 2 +-
.../loaders/LoginWithPasswordCredentials.java | 2 +-
.../predicates/SecurityGroupPredicates.java | 2 +-
.../PasswordAuthenticationExpectTest.java | 4 +-
.../compute/strategy/OptionsConverterTest.java | 2 +-
.../cloudstack/features/SnapshotApiTest.java | 2 +-
.../cloudstack/features/TemplateApiTest.java | 2 +-
.../predicates/SecurityGroupPredicatesTest.java | 6 +--
.../cloudwatch/domain/GetMetricStatistics.java | 2 +-
.../compute/strategy/EC2ListNodesStrategy.java | 4 +-
.../org/jclouds/ec2/domain/UserIdGroupPair.java | 4 +-
...dApplicationArchitecturesEC2ApiLiveTest.java | 2 +-
.../ec2/compute/EC2TemplateBuilderTest.java | 6 +--
.../functions/CreateUniqueKeyPairTest.java | 4 +-
.../RunningInstanceToNodeMetadataTest.java | 2 +-
.../jclouds/ec2/features/WindowsApiTest.java | 2 +-
.../DescribeInstancesResponseHandlerTest.java | 2 +-
.../features/VolumeAndSnapshotApiLiveTest.java | 2 +-
.../NovaSecurityGroupToSecurityGroup.java | 4 +-
.../nova/v2_0/domain/HostAggregate.java | 2 +-
.../functions/internal/ParseDiagnostics.java | 8 ++--
.../NovaComputeServiceAdapterExpectTest.java | 28 ++++++-------
.../NovaSecurityGroupToSecurityGroupTest.java | 2 +-
.../v2_0/extensions/VolumeApiExpectTest.java | 2 +-
.../VolumeAttachmentApiExpectTest.java | 2 +-
.../nova/v2_0/features/ImageApiExpectTest.java | 8 ++--
.../nova/v2_0/features/ServerApiExpectTest.java | 42 ++++++++++----------
.../CreateSecurityGroupIfNeededTest.java | 2 +-
.../nova/v2_0/internal/BaseNovaApiLiveTest.java | 2 +-
.../nova/v2_0/parse/ParseServerDiagnostics.java | 36 ++++++++---------
.../trove/v1/binders/BindGrantUserToJson.java | 4 +-
.../jclouds/openstack/trove/v1/domain/User.java | 12 +++---
.../trove/v1/features/DatabaseApiLiveTest.java | 2 +-
.../trove/v1/features/FlavorApiExpectTest.java | 2 +-
.../v1/features/InstanceApiExpectTest.java | 4 +-
.../trove/v1/features/InstanceApiLiveTest.java | 2 +-
.../trove/v1/features/UserApiLiveTest.java | 2 +-
.../trove/v1/utils/TroveUtilsExpectTest.java | 2 +-
.../functions/ObjectToBlobMetadata.java | 2 +-
.../jclouds/sqs/xml/BatchResponseHandler.java | 2 +-
...hangeMessageVisibilityBatchResponseTest.java | 4 +-
.../parse/DeleteMessageBatchResponseTest.java | 4 +-
.../parse/GetQueueAttributesResponseTest.java | 2 +-
.../SwiftBlobIntegrationLiveTest.java | 2 +-
.../SwiftContainerIntegrationLiveTest.java | 2 +-
.../KeystoneStorageEndpointModuleTest.java | 4 +-
.../swift/internal/StubSwiftAsyncClient.java | 2 +-
.../VCloudComputeServiceAdapterTest.java | 2 +-
.../vcloud/xml/CatalogItemHandlerTest.java | 4 +-
.../binders/BindMapToHeadersWithPrefix.java | 2 +-
.../functions/BlobToHttpGetOptionsTest.java | 4 +-
.../java/org/jclouds/openstack/domain/Link.java | 2 +-
.../domain/internal/TemplateBuilderImpl.java | 8 ++--
.../main/java/org/jclouds/ContextBuilder.java | 4 +-
.../JavaUrlHttpCommandExecutorService.java | 2 +-
.../binders/BindMapToStringPayloadTest.java | 4 +-
.../internal/RestAnnotationProcessorTest.java | 10 ++---
.../jclouds/http/apachehc/ApacheHCUtils.java | 2 +-
.../AWSCloudWatchProviderMetadata.java | 2 +-
.../jclouds/aws/ec2/AWSEC2ProviderMetadata.java | 2 +-
.../BindTagFiltersToIndexedFormParams.java | 2 +-
.../strategy/AWSEC2ListNodesStrategy.java | 4 +-
.../AWSRunningInstanceToNodeMetadataTest.java | 4 +-
.../DescribeSecurityGroupsResponseTest.java | 2 +-
.../jclouds/aws/s3/AWSS3ProviderMetadata.java | 2 +-
.../ParallelMultipartUploadStrategy.java | 2 +-
.../jclouds/aws/sqs/AWSSQSProviderMetadata.java | 2 +-
.../azureblob/AzureBlobProviderMetadata.java | 2 +-
.../internal/ContainerPropertiesImpl.java | 2 +-
.../validators/ContainerNameValidator.java | 2 +-
.../AzureBlobBlockUploadStrategyTest.java | 2 +-
.../CloudFilesUSProviderMetadata.java | 2 +-
.../jclouds/glesys/GleSYSProviderMetadata.java | 2 +-
.../compute/GleSYSComputeServiceAdapter.java | 2 +-
.../glesys/features/ServerApiLiveTest.java | 2 +-
.../glesys/internal/BaseGleSYSApiLiveTest.java | 2 +-
.../BaseGleSYSApiWithAServerLiveTest.java | 2 +-
.../softlayer/SoftLayerProviderMetadata.java | 2 +-
.../compute/functions/DatacenterToLocation.java | 2 +-
.../binders/ProductOrderToJsonTest.java | 6 +--
.../functions/ProductItemToImageTest.java | 22 +++++-----
.../compute/functions/ProductItemsTest.java | 6 +--
.../functions/ProductItemsToHardwareTest.java | 2 +-
.../features/DatacenterApiLiveTest.java | 2 +-
.../softlayer/parse/ParseProductOrderTest.java | 2 +-
.../ProductPackagePredicatesTest.java | 2 +-
resources/checkstyle.xml | 3 ++
.../statements/ssh/SshStatements.java | 2 +-
94 files changed, 201 insertions(+), 198 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/2d88f516/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/functions/DirectoryEntryListToResourceMetadataList.java
----------------------------------------------------------------------
diff --git a/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/functions/DirectoryEntryListToResourceMetadataList.java b/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/functions/DirectoryEntryListToResourceMetadataList.java
index b39bdfa..2c17ac6 100644
--- a/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/functions/DirectoryEntryListToResourceMetadataList.java
+++ b/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/functions/DirectoryEntryListToResourceMetadataList.java
@@ -58,10 +58,10 @@ public class DirectoryEntryListToResourceMetadataList implements
StorageType type = from.getType() == FileType.DIRECTORY ? StorageType.FOLDER : StorageType.BLOB;
if (type == StorageType.FOLDER)
return new StorageMetadataImpl(type, from.getObjectID(), from.getObjectName(), defaultLocation
- .get(), null, null, null, null, ImmutableMap.<String,String>of());
+ .get(), null, null, null, null, ImmutableMap.<String, String>of());
else
return new BlobMetadataImpl(from.getObjectID(), from.getObjectName(), defaultLocation.get(),
- null, null, null, null, ImmutableMap.<String,String>of(), null,
+ null, null, null, null, ImmutableMap.<String, String>of(), null,
null, new BaseMutableContentMetadata());
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/2d88f516/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/functions/ObjectToBlobMetadata.java
----------------------------------------------------------------------
diff --git a/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/functions/ObjectToBlobMetadata.java b/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/functions/ObjectToBlobMetadata.java
index 1aae619..4d56b8a 100644
--- a/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/functions/ObjectToBlobMetadata.java
+++ b/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/functions/ObjectToBlobMetadata.java
@@ -65,7 +65,7 @@ public class ObjectToBlobMetadata implements Function<AtmosObject, MutableBlobMe
HttpUtils.copy(from.getContentMetadata(), to.getContentMetadata());
to.setName(objectName.apply(from));
to.setUri(from.getContentMetadata().getUri());
- to.setContainer(Iterables.get(Splitter.on('/').split(from.getContentMetadata().getPath()),0));
+ to.setContainer(Iterables.get(Splitter.on('/').split(from.getContentMetadata().getPath()), 0));
if (from.getAllHeaders().containsEntry("x-emc-groupacl", "other=READ"))
to.setPublicUri(shareUrl.apply(from.getContentMetadata().getPath()));
if (from.getSystemMetadata().getType() == FileType.DIRECTORY) {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/2d88f516/apis/cloudservers/src/test/java/org/jclouds/cloudservers/functions/ParseImageListFromJsonResponseTest.java
----------------------------------------------------------------------
diff --git a/apis/cloudservers/src/test/java/org/jclouds/cloudservers/functions/ParseImageListFromJsonResponseTest.java b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/functions/ParseImageListFromJsonResponseTest.java
index 1bb4a5b..e41a867 100644
--- a/apis/cloudservers/src/test/java/org/jclouds/cloudservers/functions/ParseImageListFromJsonResponseTest.java
+++ b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/functions/ParseImageListFromJsonResponseTest.java
@@ -53,7 +53,7 @@ public class ParseImageListFromJsonResponseTest {
bind(DateAdapter.class).to(Iso8601DateAdapter.class);
}
- },new GsonModule());
+ }, new GsonModule());
DateService dateService = i.getInstance(DateService.class);
public void testApplyInputStream() {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/2d88f516/apis/cloudservers/src/test/java/org/jclouds/cloudservers/options/CreateSharedIpGroupOptionsTest.java
----------------------------------------------------------------------
diff --git a/apis/cloudservers/src/test/java/org/jclouds/cloudservers/options/CreateSharedIpGroupOptionsTest.java b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/options/CreateSharedIpGroupOptionsTest.java
index 4151c06..58f091a 100644
--- a/apis/cloudservers/src/test/java/org/jclouds/cloudservers/options/CreateSharedIpGroupOptionsTest.java
+++ b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/options/CreateSharedIpGroupOptionsTest.java
@@ -47,7 +47,7 @@ public class CreateSharedIpGroupOptionsTest {
private HttpRequest buildRequest(CreateSharedIpGroupOptions options) {
injector.injectMembers(options);
HttpRequest request = HttpRequest.builder().method("POST").endpoint("http://localhost").build();
- options.bindToRequest(request, ImmutableMap.<String,Object>of("name", "foo"));
+ options.bindToRequest(request, ImmutableMap.<String, Object>of("name", "foo"));
return request;
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/2d88f516/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/extensions/CloudStackSecurityGroupExtension.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/extensions/CloudStackSecurityGroupExtension.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/extensions/CloudStackSecurityGroupExtension.java
index 0c7d54e..dd36ee5 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/extensions/CloudStackSecurityGroupExtension.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/extensions/CloudStackSecurityGroupExtension.java
@@ -56,7 +56,7 @@ import com.google.common.collect.Multimap;
*/
public class CloudStackSecurityGroupExtension implements SecurityGroupExtension {
protected final CloudStackApi api;
- protected final Function<org.jclouds.cloudstack.domain.SecurityGroup,SecurityGroup> groupConverter;
+ protected final Function<org.jclouds.cloudstack.domain.SecurityGroup, SecurityGroup> groupConverter;
protected final LoadingCache<ZoneAndName, org.jclouds.cloudstack.domain.SecurityGroup> groupCreator;
protected final GroupNamingConvention.Factory namingConvention;
protected final Supplier<Set<? extends Location>> locations;
@@ -65,7 +65,7 @@ public class CloudStackSecurityGroupExtension implements SecurityGroupExtension
@Inject
public CloudStackSecurityGroupExtension(CloudStackApi api,
- Function<org.jclouds.cloudstack.domain.SecurityGroup,SecurityGroup> groupConverter,
+ Function<org.jclouds.cloudstack.domain.SecurityGroup, SecurityGroup> groupConverter,
LoadingCache<ZoneAndName, org.jclouds.cloudstack.domain.SecurityGroup> groupCreator,
GroupNamingConvention.Factory namingConvention,
@Memoized Supplier<Set<? extends Location>> locations,
http://git-wip-us.apache.org/repos/asf/jclouds/blob/2d88f516/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/CloudStackSecurityGroupToSecurityGroup.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/CloudStackSecurityGroupToSecurityGroup.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/CloudStackSecurityGroupToSecurityGroup.java
index 1fff41a..d6d137e 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/CloudStackSecurityGroupToSecurityGroup.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/CloudStackSecurityGroupToSecurityGroup.java
@@ -46,10 +46,10 @@ public class CloudStackSecurityGroupToSecurityGroup implements Function<org.jclo
@Named(ComputeServiceConstants.COMPUTE_LOGGER)
protected Logger logger = Logger.NULL;
- protected final Function<IngressRule,IpPermission> ruleToPermission;
+ protected final Function<IngressRule, IpPermission> ruleToPermission;
@Inject
- public CloudStackSecurityGroupToSecurityGroup(Function<IngressRule,IpPermission> ruleToPermission) {
+ public CloudStackSecurityGroupToSecurityGroup(Function<IngressRule, IpPermission> ruleToPermission) {
this.ruleToPermission = ruleToPermission;
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/2d88f516/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 fb37f2c..e04846e 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
@@ -91,7 +91,7 @@ public class ParseTypedAsyncJob implements Function<AsyncJob<Map<String, JsonBal
if (toParse.getResult() != null) {
if (toParse.getResult().size() == 1) {
@SuppressWarnings({"unchecked", "rawtypes"})
- Builder<?,Object> builder = AsyncJob.Builder.fromAsyncJobUntyped((AsyncJob) toParse);
+ Builder<?, Object> builder = AsyncJob.Builder.fromAsyncJobUntyped((AsyncJob) toParse);
if (toParse.getResult().containsKey("success")) {
builder.result(null);
} else {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/2d88f516/apis/cloudstack/src/main/java/org/jclouds/cloudstack/loaders/LoginWithPasswordCredentials.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/loaders/LoginWithPasswordCredentials.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/loaders/LoginWithPasswordCredentials.java
index da99182..9d6ca1b 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/loaders/LoginWithPasswordCredentials.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/loaders/LoginWithPasswordCredentials.java
@@ -46,7 +46,7 @@ public class LoginWithPasswordCredentials extends CacheLoader<Credentials, Login
// domain may be present
if (username.indexOf('/') != -1) {
// username may not end with slash!
- domain = username.substring(0,username.lastIndexOf('/'));
+ domain = username.substring(0, username.lastIndexOf('/'));
username = username.substring(username.lastIndexOf('/') + 1, username.length());
}
String hashedPassword = base16().lowerCase().encode(md5().hashString(input.credential, UTF_8).asBytes());
http://git-wip-us.apache.org/repos/asf/jclouds/blob/2d88f516/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/SecurityGroupPredicates.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/SecurityGroupPredicates.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/SecurityGroupPredicates.java
index 598b491..065fcac 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/SecurityGroupPredicates.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/SecurityGroupPredicates.java
@@ -214,7 +214,7 @@ public class SecurityGroupPredicates {
public static Predicate<IngressRule> ruleGroupMatches(final String protocol,
final int startPort,
final int endPort,
- final Multimap<String,String> accountGroupNames) {
+ final Multimap<String, String> accountGroupNames) {
checkNotNull(protocol, "protocol");
checkNotNull(accountGroupNames, "accountGroupNames");
http://git-wip-us.apache.org/repos/asf/jclouds/blob/2d88f516/apis/cloudstack/src/test/java/org/jclouds/cloudstack/PasswordAuthenticationExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/PasswordAuthenticationExpectTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/PasswordAuthenticationExpectTest.java
index 3ade6cc..6a3e866 100644
--- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/PasswordAuthenticationExpectTest.java
+++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/PasswordAuthenticationExpectTest.java
@@ -60,8 +60,8 @@ public class PasswordAuthenticationExpectTest extends BaseCloudStackExpectTest<A
HttpResponse.builder()
.statusCode(200)
.payload(payloadFromResource("/listaccountsresponse.json"))
- .build()
- ,logout, logoutResponse);
+ .build(),
+ logout, logoutResponse);
assertNotNull(client.listAccounts());
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/2d88f516/apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/strategy/OptionsConverterTest.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/strategy/OptionsConverterTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/strategy/OptionsConverterTest.java
index fecd79b..9e27815 100644
--- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/strategy/OptionsConverterTest.java
+++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/strategy/OptionsConverterTest.java
@@ -32,7 +32,7 @@ import static org.testng.Assert.assertTrue;
@Test(singleThreaded = true, testName="OptionsConverterTest")
public class OptionsConverterTest {
- private static final Map<String,Network> EMPTY_NETWORKS_MAP = ImmutableMap.<String, Network>of();
+ private static final Map<String, Network> EMPTY_NETWORKS_MAP = ImmutableMap.<String, Network>of();
private static final String ZONE_ID = "2";
private final NetworkService firewallServiceWithStaticNat
= NetworkService.builder().name("Firewall").capabilities(ImmutableMap.of("StaticNat", "true")).build();
http://git-wip-us.apache.org/repos/asf/jclouds/blob/2d88f516/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SnapshotApiTest.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SnapshotApiTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SnapshotApiTest.java
index cd46ba7..448d2af 100644
--- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SnapshotApiTest.java
+++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SnapshotApiTest.java
@@ -163,7 +163,7 @@ public class SnapshotApiTest extends BaseCloudStackApiTest<SnapshotApi> {
Invokable<?, ?> method = method(SnapshotApi.class, "createSnapshotPolicy", SnapshotPolicySchedule.class, String.class, String.class, String.class);
GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(SnapshotPolicySchedules.monthly(5, 6, 7), 10, "UTC", 12));
- assertRequestLineEquals(httpRequest,extractIso.getRequestLine());
+ assertRequestLineEquals(httpRequest, extractIso.getRequestLine());
assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
assertPayloadEquals(httpRequest, null, null, false);
http://git-wip-us.apache.org/repos/asf/jclouds/blob/2d88f516/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/TemplateApiTest.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/TemplateApiTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/TemplateApiTest.java
index e390c2e..fc08699 100644
--- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/TemplateApiTest.java
+++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/TemplateApiTest.java
@@ -194,7 +194,7 @@ public class TemplateApiTest extends BaseCloudStackApiTest<TemplateApi> {
Invokable<?, ?> method = method(TemplateApi.class, "copyTemplateToZone", String.class, String.class, String.class);
GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(17, 18, 19));
- assertRequestLineEquals(httpRequest,copyTemplate.getRequestLine());
+ assertRequestLineEquals(httpRequest, copyTemplate.getRequestLine());
assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
assertPayloadEquals(httpRequest, null, null, false);
http://git-wip-us.apache.org/repos/asf/jclouds/blob/2d88f516/apis/cloudstack/src/test/java/org/jclouds/cloudstack/predicates/SecurityGroupPredicatesTest.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/predicates/SecurityGroupPredicatesTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/predicates/SecurityGroupPredicatesTest.java
index 107fe0d..b33aede 100644
--- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/predicates/SecurityGroupPredicatesTest.java
+++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/predicates/SecurityGroupPredicatesTest.java
@@ -99,12 +99,12 @@ public class SecurityGroupPredicatesTest {
public void testRuleGroupMatches() {
assertTrue(Iterables.any(group().getIngressRules(),
ruleGroupMatches("tcp", 22, 22,
- ImmutableMultimap.<String,String>builder().put("adrian", "adriancole").build())));
+ ImmutableMultimap.<String, String>builder().put("adrian", "adriancole").build())));
assertFalse(Iterables.any(group().getIngressRules(),
ruleGroupMatches("tcp", 22, 22,
- ImmutableMultimap.<String,String>builder().put("adrian", "somegroup").build())));
+ ImmutableMultimap.<String, String>builder().put("adrian", "somegroup").build())));
assertFalse(Iterables.any(group().getIngressRules(),
ruleGroupMatches("tcp", 22, 22,
- ImmutableMultimap.<String,String>builder().put("someuser", "adriancole").build())));
+ ImmutableMultimap.<String, String>builder().put("someuser", "adriancole").build())));
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/2d88f516/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/GetMetricStatistics.java
----------------------------------------------------------------------
diff --git a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/GetMetricStatistics.java b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/GetMetricStatistics.java
index 5e157bd..7a52e96 100644
--- a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/GetMetricStatistics.java
+++ b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/GetMetricStatistics.java
@@ -270,7 +270,7 @@ public class GetMetricStatistics {
* the {@code Builder}.
*/
public GetMetricStatistics build() {
- return new GetMetricStatistics(dimensions, endTime, metricName,namespace, period, startTime, statistics,
+ return new GetMetricStatistics(dimensions, endTime, metricName, namespace, period, startTime, statistics,
unit);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/2d88f516/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2ListNodesStrategy.java
----------------------------------------------------------------------
diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2ListNodesStrategy.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2ListNodesStrategy.java
index 21bfef2..9ecfb7c 100644
--- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2ListNodesStrategy.java
+++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2ListNodesStrategy.java
@@ -121,7 +121,7 @@ public class EC2ListNodesStrategy implements ListNodesStrategy {
return concat(concat(reservations));
}
- protected Iterable<? extends RunningInstance> pollRunningInstancesByRegionsAndIds(final Multimap<String,String> idsByRegions) {
+ protected Iterable<? extends RunningInstance> pollRunningInstancesByRegionsAndIds(final Multimap<String, String> idsByRegions) {
Iterable<? extends Set<? extends Reservation<? extends RunningInstance>>> reservations
= transform(idsByRegions.keySet(), instancesByIdInRegion(idsByRegions));
@@ -150,7 +150,7 @@ public class EC2ListNodesStrategy implements ListNodesStrategy {
}
protected Function<String, Set<? extends Reservation<? extends RunningInstance>>>
- instancesByIdInRegion(final Multimap<String,String> idsByRegions) {
+ instancesByIdInRegion(final Multimap<String, String> idsByRegions) {
return new Function<String, Set<? extends Reservation<? extends RunningInstance>>>() {
@Override
http://git-wip-us.apache.org/repos/asf/jclouds/blob/2d88f516/apis/ec2/src/main/java/org/jclouds/ec2/domain/UserIdGroupPair.java
----------------------------------------------------------------------
diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/domain/UserIdGroupPair.java b/apis/ec2/src/main/java/org/jclouds/ec2/domain/UserIdGroupPair.java
index 657ad17..f625761 100644
--- a/apis/ec2/src/main/java/org/jclouds/ec2/domain/UserIdGroupPair.java
+++ b/apis/ec2/src/main/java/org/jclouds/ec2/domain/UserIdGroupPair.java
@@ -30,8 +30,8 @@ public class UserIdGroupPair implements Comparable<UserIdGroupPair> {
private final String groupName;
public UserIdGroupPair(String userId, String groupName) {
- this.userId = checkNotNull(userId,"userId");
- this.groupName = checkNotNull(groupName,"groupName");
+ this.userId = checkNotNull(userId, "userId");
+ this.groupName = checkNotNull(groupName, "groupName");
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/2d88f516/apis/ec2/src/test/java/org/jclouds/ec2/CloudApplicationArchitecturesEC2ApiLiveTest.java
----------------------------------------------------------------------
diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/CloudApplicationArchitecturesEC2ApiLiveTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/CloudApplicationArchitecturesEC2ApiLiveTest.java
index 2a999da..90f9733 100644
--- a/apis/ec2/src/test/java/org/jclouds/ec2/CloudApplicationArchitecturesEC2ApiLiveTest.java
+++ b/apis/ec2/src/test/java/org/jclouds/ec2/CloudApplicationArchitecturesEC2ApiLiveTest.java
@@ -98,7 +98,7 @@ public class CloudApplicationArchitecturesEC2ApiLiveTest extends BaseComputeServ
Injector injector = view.utils().injector();
client = injector.getInstance(EC2Api.class);
sshFactory = injector.getInstance(SshClient.Factory.class);
- runningTester = retry(new InstanceStateRunning(client), 180, 5,SECONDS);
+ runningTester = retry(new InstanceStateRunning(client), 180, 5, SECONDS);
hasIpTester = retry(new InstanceHasIpAddress(client), 180, 5, SECONDS);
SocketOpen socketOpen = injector.getInstance(SocketOpen.class);
socketTester = retry(socketOpen, 180, 1, SECONDS);
http://git-wip-us.apache.org/repos/asf/jclouds/blob/2d88f516/apis/ec2/src/test/java/org/jclouds/ec2/compute/EC2TemplateBuilderTest.java
----------------------------------------------------------------------
diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/compute/EC2TemplateBuilderTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/compute/EC2TemplateBuilderTest.java
index e581605..0331b2a 100644
--- a/apis/ec2/src/test/java/org/jclouds/ec2/compute/EC2TemplateBuilderTest.java
+++ b/apis/ec2/src/test/java/org/jclouds/ec2/compute/EC2TemplateBuilderTest.java
@@ -172,7 +172,7 @@ public class EC2TemplateBuilderTest {
// weird compilation error means have to declare extra generics for call to build() - see https://bugs.eclipse.org/bugs/show_bug.cgi?id=365818
Supplier<LoadingCache<RegionAndName, ? extends Image>> imageCache = Suppliers.<LoadingCache<RegionAndName, ? extends Image>> ofInstance(
- CacheBuilder.newBuilder().<RegionAndName,Image>build(CacheLoader.from(Functions.forMap(imageMap))));
+ CacheBuilder.newBuilder().<RegionAndName, Image>build(CacheLoader.from(Functions.forMap(imageMap))));
Template template = newTemplateBuilder(images, imageCache).imageId("us-east-1/cc-image").build();
@@ -202,7 +202,7 @@ public class EC2TemplateBuilderTest {
@SuppressWarnings("unchecked")
ImmutableMap<RegionAndName, Image> imageMap = (ImmutableMap<RegionAndName, Image>) ImagesToRegionAndIdMap.imagesToMap(images.get());
Supplier<LoadingCache<RegionAndName, ? extends Image>> imageCache = Suppliers.<LoadingCache<RegionAndName, ? extends Image>> ofInstance(
- CacheBuilder.newBuilder().<RegionAndName,Image>build(CacheLoader.from(Functions.forMap(imageMap))));
+ CacheBuilder.newBuilder().<RegionAndName, Image>build(CacheLoader.from(Functions.forMap(imageMap))));
return newTemplateBuilder(images, imageCache);
}
@@ -222,7 +222,7 @@ public class EC2TemplateBuilderTest {
Supplier<Set<? extends Hardware>> sizes = Suppliers.<Set<? extends Hardware>> ofInstance(ImmutableSet
.<Hardware> of(t1_micro().build(), c1_medium().build(), c1_xlarge().build(), m1_large().build(),
m1_small().build(), m1_xlarge().build(), m2_xlarge().build(), m2_2xlarge().build(),
- m2_4xlarge().build(),g2_2xlarge().build(),CC1_4XLARGE));
+ m2_4xlarge().build(), g2_2xlarge().build(), CC1_4XLARGE));
return new EC2TemplateBuilderImpl(locations, images, sizes, Suppliers.ofInstance(location), optionsProvider,
templateBuilderProvider, imageCache) {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/2d88f516/apis/ec2/src/test/java/org/jclouds/ec2/compute/functions/CreateUniqueKeyPairTest.java
----------------------------------------------------------------------
diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/compute/functions/CreateUniqueKeyPairTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/compute/functions/CreateUniqueKeyPairTest.java
index ddee5e1..055b8e0 100644
--- a/apis/ec2/src/test/java/org/jclouds/ec2/compute/functions/CreateUniqueKeyPairTest.java
+++ b/apis/ec2/src/test/java/org/jclouds/ec2/compute/functions/CreateUniqueKeyPairTest.java
@@ -61,7 +61,7 @@ public class CreateUniqueKeyPairTest {
@Override
protected void configure() {
- Names.bindProperties(binder(),new EC2ApiMetadata().getDefaultProperties());
+ Names.bindProperties(binder(), new EC2ApiMetadata().getDefaultProperties());
bind(new TypeLiteral<Supplier<String>>() {
}).toInstance(Suppliers.ofInstance("1"));
bind(EC2Api.class).toInstance(client);
@@ -99,7 +99,7 @@ public class CreateUniqueKeyPairTest {
@Override
protected void configure() {
- Names.bindProperties(binder(),new EC2ApiMetadata().getDefaultProperties());
+ Names.bindProperties(binder(), new EC2ApiMetadata().getDefaultProperties());
bind(new TypeLiteral<Supplier<String>>() {
}).toInstance(uniqueIdSupplier);
bind(EC2Api.class).toInstance(client);
http://git-wip-us.apache.org/repos/asf/jclouds/blob/2d88f516/apis/ec2/src/test/java/org/jclouds/ec2/compute/functions/RunningInstanceToNodeMetadataTest.java
----------------------------------------------------------------------
diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/compute/functions/RunningInstanceToNodeMetadataTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/compute/functions/RunningInstanceToNodeMetadataTest.java
index b6c04c6..981a8ad 100644
--- a/apis/ec2/src/test/java/org/jclouds/ec2/compute/functions/RunningInstanceToNodeMetadataTest.java
+++ b/apis/ec2/src/test/java/org/jclouds/ec2/compute/functions/RunningInstanceToNodeMetadataTest.java
@@ -284,7 +284,7 @@ public class RunningInstanceToNodeMetadataTest {
@Override
protected void configure() {
- Names.bindProperties(binder(),new EC2ApiMetadata().getDefaultProperties());
+ Names.bindProperties(binder(), new EC2ApiMetadata().getDefaultProperties());
}
}).getInstance(GroupNamingConvention.Factory.class);
http://git-wip-us.apache.org/repos/asf/jclouds/blob/2d88f516/apis/ec2/src/test/java/org/jclouds/ec2/features/WindowsApiTest.java
----------------------------------------------------------------------
diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/features/WindowsApiTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/features/WindowsApiTest.java
index d6b44e7..c840677 100644
--- a/apis/ec2/src/test/java/org/jclouds/ec2/features/WindowsApiTest.java
+++ b/apis/ec2/src/test/java/org/jclouds/ec2/features/WindowsApiTest.java
@@ -87,7 +87,7 @@ public class WindowsApiTest extends BaseEC2ApiTest<WindowsApi> {
.endpoint("https://ec2.us-east-1.amazonaws.com/")
.addHeader("Host", "ec2.us-east-1.amazonaws.com")
.addFormParam("Action", "BundleInstance")
- .addFormParam("InstanceId","i-e468cd8d")
+ .addFormParam("InstanceId", "i-e468cd8d")
.addFormParam("Signature", "9UbWwb%2BnO2vHn2O59K9FpmaK445RwX7vXsruHRznwik%3D")
.addFormParam("SignatureMethod", "HmacSHA256")
.addFormParam("SignatureVersion", "2")
http://git-wip-us.apache.org/repos/asf/jclouds/blob/2d88f516/apis/ec2/src/test/java/org/jclouds/ec2/xml/DescribeInstancesResponseHandlerTest.java
----------------------------------------------------------------------
diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/xml/DescribeInstancesResponseHandlerTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/xml/DescribeInstancesResponseHandlerTest.java
index f1ac58b..06e128a 100644
--- a/apis/ec2/src/test/java/org/jclouds/ec2/xml/DescribeInstancesResponseHandlerTest.java
+++ b/apis/ec2/src/test/java/org/jclouds/ec2/xml/DescribeInstancesResponseHandlerTest.java
@@ -99,7 +99,7 @@ public class DescribeInstancesResponseHandlerTest extends BaseEC2HandlerTest {
.availabilityZone("us-east-1b").virtualizationType("paravirtual").privateDnsName(
"10-251-50-132.ec2.internal")// product codes
// ImmutableSet.of("774F4FF8")
- .tags(ImmutableMap.of("Name","ec2-o", "Empty",""))
+ .tags(ImmutableMap.of("Name", "ec2-o", "Empty", ""))
.ramdiskId("ari-badbad00").rootDeviceType(RootDeviceType.INSTANCE_STORE).build(),
RunningInstance.builder().region(defaultRegion).groupName("default").amiLaunchIndex("23")
.dnsName("ec2-72-44-33-6.compute-1.amazonaws.com").imageId("ami-6ea54007").instanceId(
http://git-wip-us.apache.org/repos/asf/jclouds/blob/2d88f516/apis/openstack-cinder/src/test/java/org/jclouds/openstack/cinder/v1/features/VolumeAndSnapshotApiLiveTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-cinder/src/test/java/org/jclouds/openstack/cinder/v1/features/VolumeAndSnapshotApiLiveTest.java b/apis/openstack-cinder/src/test/java/org/jclouds/openstack/cinder/v1/features/VolumeAndSnapshotApiLiveTest.java
index b543352..eef4405 100644
--- a/apis/openstack-cinder/src/test/java/org/jclouds/openstack/cinder/v1/features/VolumeAndSnapshotApiLiveTest.java
+++ b/apis/openstack-cinder/src/test/java/org/jclouds/openstack/cinder/v1/features/VolumeAndSnapshotApiLiveTest.java
@@ -43,7 +43,7 @@ import com.google.common.collect.Iterables;
*/
@Test(groups = "live", testName = "VolumeApiLiveTest", singleThreaded = true)
public class VolumeAndSnapshotApiLiveTest extends BaseCinderApiLiveTest {
- private static final String name = System.getProperty("user.name").replace('.','-').toLowerCase();
+ private static final String name = System.getProperty("user.name").replace('.', '-').toLowerCase();
private String zone;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/2d88f516/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/NovaSecurityGroupToSecurityGroup.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/NovaSecurityGroupToSecurityGroup.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/NovaSecurityGroupToSecurityGroup.java
index d39f849..88db50b 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/NovaSecurityGroupToSecurityGroup.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/NovaSecurityGroupToSecurityGroup.java
@@ -45,10 +45,10 @@ public class NovaSecurityGroupToSecurityGroup implements Function<org.jclouds.op
@Named(ComputeServiceConstants.COMPUTE_LOGGER)
protected Logger logger = Logger.NULL;
- protected Function<SecurityGroupRule,IpPermission> ruleToPermission;
+ protected Function<SecurityGroupRule, IpPermission> ruleToPermission;
@Inject
- public NovaSecurityGroupToSecurityGroup(Function<SecurityGroupRule,IpPermission> ruleToPermission) {
+ public NovaSecurityGroupToSecurityGroup(Function<SecurityGroupRule, IpPermission> ruleToPermission) {
this.ruleToPermission = ruleToPermission;
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/2d88f516/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/HostAggregate.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/HostAggregate.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/HostAggregate.java
index fc6744c..75d3b70 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/HostAggregate.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/HostAggregate.java
@@ -177,7 +177,7 @@ public class HostAggregate {
this.state = checkNotNull(state, "state");
this.created = checkNotNull(created, "created");
this.updated = Optional.fromNullable(updated);
- this.metadata = metadata == null ? ImmutableMap.<String,String>of() : ImmutableMap.copyOf(metadata);
+ this.metadata = metadata == null ? ImmutableMap.<String, String>of() : ImmutableMap.copyOf(metadata);
}
public String getId() {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/2d88f516/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/functions/internal/ParseDiagnostics.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/functions/internal/ParseDiagnostics.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/functions/internal/ParseDiagnostics.java
index 366aa4c..70c4ab6 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/functions/internal/ParseDiagnostics.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/functions/internal/ParseDiagnostics.java
@@ -28,18 +28,18 @@ import java.util.Map;
/**
* @author Leander Beernaert
*/
-public class ParseDiagnostics implements Function<HttpResponse, Optional <Map<String,String>>> {
+public class ParseDiagnostics implements Function<HttpResponse, Optional <Map<String, String>>> {
- private final ParseJson<Optional <Map<String,String>>> parser;
+ private final ParseJson<Optional <Map<String, String>>> parser;
@Inject
- public ParseDiagnostics(ParseJson<Optional <Map<String,String>>> parser) {
+ public ParseDiagnostics(ParseJson<Optional <Map<String, String>>> parser) {
this.parser = parser;
}
@Override
- public Optional <Map<String,String>> apply(HttpResponse response) {
+ public Optional <Map<String, String>> apply(HttpResponse response) {
checkNotNull(response, "response");
return parser.apply(response);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/2d88f516/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeServiceAdapterExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeServiceAdapterExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeServiceAdapterExpectTest.java
index a9dce03..7709734 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeServiceAdapterExpectTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeServiceAdapterExpectTest.java
@@ -72,11 +72,11 @@ public class NovaComputeServiceAdapterExpectTest extends BaseNovaComputeServiceC
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(payloadFromStringWithContentType(
- "{\"server\":{\"name\":\"test-e92\",\"imageRef\":\"1241\",\"flavorRef\":\"100\",\"networks\": [{\"uuid\": \"4ebd35cf-bfe7-4d93-b0d8-eb468ce2245a\"}]}}","application/json"))
+ "{\"server\":{\"name\":\"test-e92\",\"imageRef\":\"1241\",\"flavorRef\":\"100\",\"networks\": [{\"uuid\": \"4ebd35cf-bfe7-4d93-b0d8-eb468ce2245a\"}]}}", "application/json"))
.build();
HttpResponse createServerResponse = HttpResponse.builder().statusCode(202).message("HTTP/1.1 202 Accepted")
- .payload(payloadFromResourceWithContentType("/new_server_networks_response.json","application/json; charset=UTF-8")).build();
+ .payload(payloadFromResourceWithContentType("/new_server_networks_response.json", "application/json; charset=UTF-8")).build();
Map<HttpRequest, HttpResponse> requestResponseMap = ImmutableMap.<HttpRequest, HttpResponse> builder()
.put(keystoneAuthWithUsernameAndPasswordAndTenantName, responseWithKeystoneAccess)
@@ -107,11 +107,11 @@ public class NovaComputeServiceAdapterExpectTest extends BaseNovaComputeServiceC
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(payloadFromStringWithContentType(
- "{\"server\":{\"name\":\"test-e92\",\"imageRef\":\"1241\",\"flavorRef\":\"100\",\"OS-DCF:diskConfig\":\"AUTO\"}}","application/json"))
+ "{\"server\":{\"name\":\"test-e92\",\"imageRef\":\"1241\",\"flavorRef\":\"100\",\"OS-DCF:diskConfig\":\"AUTO\"}}", "application/json"))
.build();
HttpResponse createServerResponse = HttpResponse.builder().statusCode(202).message("HTTP/1.1 202 Accepted")
- .payload(payloadFromResourceWithContentType("/new_server_disk_config_auto.json","application/json; charset=UTF-8")).build();
+ .payload(payloadFromResourceWithContentType("/new_server_disk_config_auto.json", "application/json; charset=UTF-8")).build();
Map<HttpRequest, HttpResponse> requestResponseMap = ImmutableMap.<HttpRequest, HttpResponse> builder()
.put(keystoneAuthWithUsernameAndPasswordAndTenantName, responseWithKeystoneAccess)
@@ -142,11 +142,11 @@ public class NovaComputeServiceAdapterExpectTest extends BaseNovaComputeServiceC
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(payloadFromStringWithContentType(
- "{\"server\":{\"name\":\"test-e92\",\"imageRef\":\"1241\",\"flavorRef\":\"100\",\"config_drive\":\"true\"}}","application/json"))
+ "{\"server\":{\"name\":\"test-e92\",\"imageRef\":\"1241\",\"flavorRef\":\"100\",\"config_drive\":\"true\"}}", "application/json"))
.build();
HttpResponse createServerResponse = HttpResponse.builder().statusCode(202).message("HTTP/1.1 202 Accepted")
- .payload(payloadFromResourceWithContentType("/new_server_config_drive.json","application/json; charset=UTF-8")).build();
+ .payload(payloadFromResourceWithContentType("/new_server_config_drive.json", "application/json; charset=UTF-8")).build();
Map<HttpRequest, HttpResponse> requestResponseMap = ImmutableMap.<HttpRequest, HttpResponse> builder()
.put(keystoneAuthWithUsernameAndPasswordAndTenantName, responseWithKeystoneAccess)
@@ -176,11 +176,11 @@ public class NovaComputeServiceAdapterExpectTest extends BaseNovaComputeServiceC
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(payloadFromStringWithContentType(
- "{\"server\":{\"name\":\"test-e92\",\"imageRef\":\"1241\",\"flavorRef\":\"100\",\"networks\":[{\"uuid\":\"12345\", \"port\":\"67890\", \"fixed_ip\":\"192.168.0.1\"},{\"uuid\":\"54321\", \"port\":\"09876\", \"fixed_ip\":\"192.168.0.2\"},{\"uuid\":\"non-nova-uuid\"}]}}","application/json"))
+ "{\"server\":{\"name\":\"test-e92\",\"imageRef\":\"1241\",\"flavorRef\":\"100\",\"networks\":[{\"uuid\":\"12345\", \"port\":\"67890\", \"fixed_ip\":\"192.168.0.1\"},{\"uuid\":\"54321\", \"port\":\"09876\", \"fixed_ip\":\"192.168.0.2\"},{\"uuid\":\"non-nova-uuid\"}]}}", "application/json"))
.build();
HttpResponse createServerResponse = HttpResponse.builder().statusCode(202).message("HTTP/1.1 202 Accepted")
- .payload(payloadFromResourceWithContentType("/new_server_nova_networks.json","application/json; charset=UTF-8")).build();
+ .payload(payloadFromResourceWithContentType("/new_server_nova_networks.json", "application/json; charset=UTF-8")).build();
Map<HttpRequest, HttpResponse> requestResponseMap = ImmutableMap.<HttpRequest, HttpResponse> builder()
.put(keystoneAuthWithUsernameAndPasswordAndTenantName, responseWithKeystoneAccess)
@@ -223,11 +223,11 @@ public class NovaComputeServiceAdapterExpectTest extends BaseNovaComputeServiceC
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(payloadFromStringWithContentType(
- "{\"server\":{\"name\":\"test-e92\",\"imageRef\":\"1241\",\"flavorRef\":\"100\",\"security_groups\":[{\"name\":\"group1\"}, {\"name\":\"group2\"}]}}","application/json"))
+ "{\"server\":{\"name\":\"test-e92\",\"imageRef\":\"1241\",\"flavorRef\":\"100\",\"security_groups\":[{\"name\":\"group1\"}, {\"name\":\"group2\"}]}}", "application/json"))
.build();
HttpResponse createServerResponse = HttpResponse.builder().statusCode(202).message("HTTP/1.1 202 Accepted")
- .payload(payloadFromResourceWithContentType("/new_server.json","application/json; charset=UTF-8")).build();
+ .payload(payloadFromResourceWithContentType("/new_server.json", "application/json; charset=UTF-8")).build();
Map<HttpRequest, HttpResponse> requestResponseMap = ImmutableMap.<HttpRequest, HttpResponse> builder()
.put(keystoneAuthWithUsernameAndPasswordAndTenantName, responseWithKeystoneAccess)
@@ -264,12 +264,12 @@ public class NovaComputeServiceAdapterExpectTest extends BaseNovaComputeServiceC
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(payloadFromStringWithContentType(
- "{\"server\":{\"name\":\"test-e92\",\"imageRef\":\"1241\",\"flavorRef\":\"100\",\"key_name\":\"foo\"}}","application/json"))
+ "{\"server\":{\"name\":\"test-e92\",\"imageRef\":\"1241\",\"flavorRef\":\"100\",\"key_name\":\"foo\"}}", "application/json"))
.build();
HttpResponse createServerResponse = HttpResponse.builder().statusCode(202).message("HTTP/1.1 202 Accepted")
- .payload(payloadFromResourceWithContentType("/new_server_no_adminpass.json","application/json; charset=UTF-8")).build();
+ .payload(payloadFromResourceWithContentType("/new_server_no_adminpass.json", "application/json; charset=UTF-8")).build();
Map<HttpRequest, HttpResponse> requestResponseMap = ImmutableMap.<HttpRequest, HttpResponse> builder()
.put(keystoneAuthWithUsernameAndPasswordAndTenantName, responseWithKeystoneAccess)
@@ -314,11 +314,11 @@ public class NovaComputeServiceAdapterExpectTest extends BaseNovaComputeServiceC
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(payloadFromStringWithContentType(
- "{\"server\":{\"name\":\"test-e92\",\"imageRef\":\"1241\",\"flavorRef\":\"100\"}}","application/json"))
+ "{\"server\":{\"name\":\"test-e92\",\"imageRef\":\"1241\",\"flavorRef\":\"100\"}}", "application/json"))
.build();
HttpResponse createServerResponse = HttpResponse.builder().statusCode(202).message("HTTP/1.1 202 Accepted")
- .payload(payloadFromResourceWithContentType("/new_server_no_adminpass.json","application/json; charset=UTF-8")).build();
+ .payload(payloadFromResourceWithContentType("/new_server_no_adminpass.json", "application/json; charset=UTF-8")).build();
Map<HttpRequest, HttpResponse> requestResponseMap = ImmutableMap.<HttpRequest, HttpResponse> builder()
.put(keystoneAuthWithUsernameAndPasswordAndTenantName, responseWithKeystoneAccess)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/2d88f516/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/functions/NovaSecurityGroupToSecurityGroupTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/functions/NovaSecurityGroupToSecurityGroupTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/functions/NovaSecurityGroupToSecurityGroupTest.java
index 6754087..61694a6 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/functions/NovaSecurityGroupToSecurityGroupTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/functions/NovaSecurityGroupToSecurityGroupTest.java
@@ -65,7 +65,7 @@ public class NovaSecurityGroupToSecurityGroupTest {
ZoneAndName.fromZoneAndName("az-1.region-a.geo-1", "some-other-group"), new SecurityGroupInZone(securityGroupWithCidr(), "az-1.region-a.geo-1"));
// weird compilation error means have to declare extra generics for call to build() - see https://bugs.eclipse.org/bugs/show_bug.cgi?id=365818
- private static final Supplier <LoadingCache<ZoneAndName, SecurityGroupInZone>> groupCache = Suppliers.<LoadingCache<ZoneAndName,SecurityGroupInZone>> ofInstance(
+ private static final Supplier <LoadingCache<ZoneAndName, SecurityGroupInZone>> groupCache = Suppliers.<LoadingCache<ZoneAndName, SecurityGroupInZone>> ofInstance(
CacheBuilder.newBuilder().<ZoneAndName, SecurityGroupInZone>build(CacheLoader.from(Functions.forMap(groupMap))));
public static final SecurityGroupRuleToIpPermission ruleConverter = new SecurityGroupRuleToIpPermission(returnSecurityGroupExistsInZone, locationIndex,
http://git-wip-us.apache.org/repos/asf/jclouds/blob/2d88f516/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeApiExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeApiExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeApiExpectTest.java
index c177ce2..c541fec 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeApiExpectTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeApiExpectTest.java
@@ -274,7 +274,7 @@ public class VolumeApiExpectTest extends BaseNovaApiExpectTest {
HttpResponse.builder().statusCode(404).build()
).getVolumeExtensionForZone("az-1.region-a.geo-1").get();
- api.attachVolumeToServerAsDevice("1", "instance-1","/dev/vdc");
+ api.attachVolumeToServerAsDevice("1", "instance-1", "/dev/vdc");
}
public void testDetachVolume() {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/2d88f516/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeAttachmentApiExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeAttachmentApiExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeAttachmentApiExpectTest.java
index 1b4857d..9269de0 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeAttachmentApiExpectTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeAttachmentApiExpectTest.java
@@ -130,7 +130,7 @@ public class VolumeAttachmentApiExpectTest extends BaseNovaApiExpectTest {
HttpResponse.builder().statusCode(404).build()
).getVolumeAttachmentExtensionForZone("az-1.region-a.geo-1").get();
- api.attachVolumeToServerAsDevice("1", "instance-1","/dev/vdc");
+ api.attachVolumeToServerAsDevice("1", "instance-1", "/dev/vdc");
}
public void testDetachVolume() {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/2d88f516/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/features/ImageApiExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/features/ImageApiExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/features/ImageApiExpectTest.java
index 85407d1..f7cf3c9 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/features/ImageApiExpectTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/features/ImageApiExpectTest.java
@@ -170,7 +170,7 @@ public class ImageApiExpectTest extends BaseNovaApiExpectTest {
.endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/images/" + imageId + "/metadata")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
- .payload(payloadFromStringWithContentType("{\"metadata\":{\"Server Label\":\"Web Head 1\",\"Image Version\":\"2.1\"}}","application/json"))
+ .payload(payloadFromStringWithContentType("{\"metadata\":{\"Server Label\":\"Web Head 1\",\"Image Version\":\"2.1\"}}", "application/json"))
.build();
HttpResponse setMetadataResponse = HttpResponse.builder().statusCode(200)
@@ -196,7 +196,7 @@ public class ImageApiExpectTest extends BaseNovaApiExpectTest {
.endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/images/" +imageId + "/metadata")
.addHeader("Accept", "*/*")
.addHeader("X-Auth-Token", authToken)
- .payload(payloadFromStringWithContentType("{\"metadata\":{\"Server Label\":\"Web Head 1\",\"Image Version\":\"2.1\"}}","application/json"))
+ .payload(payloadFromStringWithContentType("{\"metadata\":{\"Server Label\":\"Web Head 1\",\"Image Version\":\"2.1\"}}", "application/json"))
.build();
HttpResponse setMetadataResponse = HttpResponse.builder().statusCode(404).build();
@@ -225,7 +225,7 @@ public class ImageApiExpectTest extends BaseNovaApiExpectTest {
.endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/images/" + imageId + "/metadata")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
- .payload(payloadFromStringWithContentType("{\"metadata\":{\"Server Label\":\"Web Head 2\",\"Server Description\":\"Simple Server\"}}","application/json"))
+ .payload(payloadFromStringWithContentType("{\"metadata\":{\"Server Label\":\"Web Head 2\",\"Server Description\":\"Simple Server\"}}", "application/json"))
.build();
HttpResponse setMetadataResponse = HttpResponse.builder().statusCode(200)
@@ -251,7 +251,7 @@ public class ImageApiExpectTest extends BaseNovaApiExpectTest {
.endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/" + imageId + "/metadata")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
- .payload(payloadFromStringWithContentType("{\"metadata\":{\"Server Label\":\"Web Head 2\",\"Server Description\":\"Simple Server\"}}","application/json"))
+ .payload(payloadFromStringWithContentType("{\"metadata\":{\"Server Label\":\"Web Head 2\",\"Server Description\":\"Simple Server\"}}", "application/json"))
.build();
HttpResponse setMetadataResponse = HttpResponse.builder().statusCode(404)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/2d88f516/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/features/ServerApiExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/features/ServerApiExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/features/ServerApiExpectTest.java
index 3b2b2d8..8e7bbc8 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/features/ServerApiExpectTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/features/ServerApiExpectTest.java
@@ -127,12 +127,12 @@ public class ServerApiExpectTest extends BaseNovaApiExpectTest {
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(payloadFromStringWithContentType(
- "{\"server\":{\"name\":\"test-e92\",\"imageRef\":\"1241\",\"flavorRef\":\"100\"}}","application/json"))
+ "{\"server\":{\"name\":\"test-e92\",\"imageRef\":\"1241\",\"flavorRef\":\"100\"}}", "application/json"))
.build();
HttpResponse createServerResponse = HttpResponse.builder().statusCode(202).message("HTTP/1.1 202 Accepted")
- .payload(payloadFromResourceWithContentType("/new_server.json","application/json; charset=UTF-8")).build();
+ .payload(payloadFromResourceWithContentType("/new_server.json", "application/json; charset=UTF-8")).build();
NovaApi apiWithNewServer = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, createServer, createServerResponse);
@@ -149,12 +149,12 @@ public class ServerApiExpectTest extends BaseNovaApiExpectTest {
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(payloadFromStringWithContentType(
- "{\"server\":{\"name\":\"test-e92\",\"imageRef\":\"1241\",\"flavorRef\":\"100\",\"availability_zone\":\"nova\"}}","application/json"))
+ "{\"server\":{\"name\":\"test-e92\",\"imageRef\":\"1241\",\"flavorRef\":\"100\",\"availability_zone\":\"nova\"}}", "application/json"))
.build();
HttpResponse createServerResponse = HttpResponse.builder().statusCode(202).message("HTTP/1.1 202 Accepted")
- .payload(payloadFromResourceWithContentType("/new_server_in_zone.json","application/json; charset=UTF-8")).build();
+ .payload(payloadFromResourceWithContentType("/new_server_in_zone.json", "application/json; charset=UTF-8")).build();
NovaApi apiWithNewServer = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, createServer, createServerResponse);
@@ -174,12 +174,12 @@ public class ServerApiExpectTest extends BaseNovaApiExpectTest {
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(payloadFromStringWithContentType(
- "{\"server\":{\"name\":\"test-e92\",\"imageRef\":\"1241\",\"flavorRef\":\"100\",\"security_groups\":[{\"name\":\"group1\"},{\"name\":\"group2\"}]}}","application/json"))
+ "{\"server\":{\"name\":\"test-e92\",\"imageRef\":\"1241\",\"flavorRef\":\"100\",\"security_groups\":[{\"name\":\"group1\"},{\"name\":\"group2\"}]}}", "application/json"))
.build();
HttpResponse createServerResponse = HttpResponse.builder().statusCode(202).message("HTTP/1.1 202 Accepted")
- .payload(payloadFromResourceWithContentType("/new_server.json","application/json; charset=UTF-8")).build();
+ .payload(payloadFromResourceWithContentType("/new_server.json", "application/json; charset=UTF-8")).build();
NovaApi apiWithNewServer = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
@@ -199,12 +199,12 @@ public class ServerApiExpectTest extends BaseNovaApiExpectTest {
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(payloadFromStringWithContentType(
- "{\"server\":{\"name\":\"test-e92\",\"imageRef\":\"1241\",\"flavorRef\":\"100\",\"networks\":[{\"uuid\":\"b3856ac0-f481-11e2-b778-0800200c9a66\"},{\"uuid\":\"bf0f0f90-f481-11e2-b778-0800200c9a66\"}]}}","application/json"))
+ "{\"server\":{\"name\":\"test-e92\",\"imageRef\":\"1241\",\"flavorRef\":\"100\",\"networks\":[{\"uuid\":\"b3856ac0-f481-11e2-b778-0800200c9a66\"},{\"uuid\":\"bf0f0f90-f481-11e2-b778-0800200c9a66\"}]}}", "application/json"))
.build();
HttpResponse createServerResponse = HttpResponse.builder().statusCode(202).message("HTTP/1.1 202 Accepted")
- .payload(payloadFromResourceWithContentType("/new_server.json","application/json; charset=UTF-8")).build();
+ .payload(payloadFromResourceWithContentType("/new_server.json", "application/json; charset=UTF-8")).build();
NovaApi apiWithNewServer = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
@@ -224,12 +224,12 @@ public class ServerApiExpectTest extends BaseNovaApiExpectTest {
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(payloadFromStringWithContentType(
- "{\"server\":{\"name\":\"test-e92\",\"imageRef\":\"1241\",\"flavorRef\":\"100\",\"OS-DCF:diskConfig\":\"AUTO\"}}","application/json"))
+ "{\"server\":{\"name\":\"test-e92\",\"imageRef\":\"1241\",\"flavorRef\":\"100\",\"OS-DCF:diskConfig\":\"AUTO\"}}", "application/json"))
.build();
HttpResponse createServerResponse = HttpResponse.builder().statusCode(202).message("HTTP/1.1 202 Accepted")
- .payload(payloadFromResourceWithContentType("/new_server_disk_config_auto.json","application/json; charset=UTF-8")).build();
+ .payload(payloadFromResourceWithContentType("/new_server_disk_config_auto.json", "application/json; charset=UTF-8")).build();
NovaApi apiWithNewServer = requestsSendResponses(
@@ -250,12 +250,12 @@ public class ServerApiExpectTest extends BaseNovaApiExpectTest {
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(payloadFromStringWithContentType(
- "{\"server\":{\"name\":\"test-e92\",\"imageRef\":\"1241\",\"flavorRef\":\"100\",\"OS-DCF:diskConfig\":\"MANUAL\"}}","application/json"))
+ "{\"server\":{\"name\":\"test-e92\",\"imageRef\":\"1241\",\"flavorRef\":\"100\",\"OS-DCF:diskConfig\":\"MANUAL\"}}", "application/json"))
.build();
HttpResponse createServerResponse = HttpResponse.builder().statusCode(202).message("HTTP/1.1 202 Accepted")
- .payload(payloadFromResourceWithContentType("/new_server_disk_config_manual.json","application/json; charset=UTF-8")).build();
+ .payload(payloadFromResourceWithContentType("/new_server_disk_config_manual.json", "application/json; charset=UTF-8")).build();
NovaApi apiWithNewServer = requestsSendResponses(
@@ -276,7 +276,7 @@ public class ServerApiExpectTest extends BaseNovaApiExpectTest {
.addHeader("Accept", "*/*")
.addHeader("X-Auth-Token", authToken)
.payload(payloadFromStringWithContentType(
- "{\"rebuild\":{\"adminPass\":\"password\",\"imageRef\":\"1234\",\"name\":\"newName\",\"accessIPv4\":\"1.1.1.1\",\"accessIPv6\":\"fe80::100\"}}","application/json"))
+ "{\"rebuild\":{\"adminPass\":\"password\",\"imageRef\":\"1234\",\"name\":\"newName\",\"accessIPv4\":\"1.1.1.1\",\"accessIPv6\":\"fe80::100\"}}", "application/json"))
.build();
HttpResponse rebuildServerResponse = HttpResponse.builder().statusCode(202).build();
@@ -492,7 +492,7 @@ public class ServerApiExpectTest extends BaseNovaApiExpectTest {
.endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/" + serverId + "/metadata")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
- .payload(payloadFromStringWithContentType("{\"metadata\":{\"Server Label\":\"Web Head 1\",\"Image Version\":\"2.1\"}}","application/json"))
+ .payload(payloadFromStringWithContentType("{\"metadata\":{\"Server Label\":\"Web Head 1\",\"Image Version\":\"2.1\"}}", "application/json"))
.build();
HttpResponse setMetadataResponse = HttpResponse.builder().statusCode(200)
@@ -518,7 +518,7 @@ public class ServerApiExpectTest extends BaseNovaApiExpectTest {
.endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/" + serverId + "/metadata")
.addHeader("Accept", "*/*")
.addHeader("X-Auth-Token", authToken)
- .payload(payloadFromStringWithContentType("{\"metadata\":{\"Server Label\":\"Web Head 1\",\"Image Version\":\"2.1\"}}","application/json"))
+ .payload(payloadFromStringWithContentType("{\"metadata\":{\"Server Label\":\"Web Head 1\",\"Image Version\":\"2.1\"}}", "application/json"))
.build();
HttpResponse setMetadataResponse = HttpResponse.builder().statusCode(404).build();
@@ -547,7 +547,7 @@ public class ServerApiExpectTest extends BaseNovaApiExpectTest {
.endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/" + serverId + "/metadata")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
- .payload(payloadFromStringWithContentType("{\"metadata\":{\"Server Label\":\"Web Head 2\",\"Server Description\":\"Simple Server\"}}","application/json"))
+ .payload(payloadFromStringWithContentType("{\"metadata\":{\"Server Label\":\"Web Head 2\",\"Server Description\":\"Simple Server\"}}", "application/json"))
.build();
HttpResponse setMetadataResponse = HttpResponse.builder().statusCode(200)
@@ -573,7 +573,7 @@ public class ServerApiExpectTest extends BaseNovaApiExpectTest {
.endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/" + serverId + "/metadata")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
- .payload(payloadFromStringWithContentType("{\"metadata\":{\"Server Label\":\"Web Head 2\",\"Server Description\":\"Simple Server\"}}","application/json"))
+ .payload(payloadFromStringWithContentType("{\"metadata\":{\"Server Label\":\"Web Head 2\",\"Server Description\":\"Simple Server\"}}", "application/json"))
.build();
HttpResponse setMetadataResponse = HttpResponse.builder().statusCode(404)
@@ -624,7 +624,7 @@ public class ServerApiExpectTest extends BaseNovaApiExpectTest {
.endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/" + serverId + "/metadata")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
- .payload(payloadFromStringWithContentType("{\"metadata\":{\"Server Label\":\"Web Head 2\",\"Server Description\":\"Simple Server\"}}","application/json"))
+ .payload(payloadFromStringWithContentType("{\"metadata\":{\"Server Label\":\"Web Head 2\",\"Server Description\":\"Simple Server\"}}", "application/json"))
.build();
HttpResponse setMetadataResponse = HttpResponse.builder().statusCode(404)
@@ -654,7 +654,7 @@ public class ServerApiExpectTest extends BaseNovaApiExpectTest {
.endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/" + serverId + "/metadata")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
- .payload(payloadFromStringWithContentType("{\"metadata\":{\"Server Label\":\"Web Head 2\",\"Server Description\":\"Simple Server\"}}","application/json"))
+ .payload(payloadFromStringWithContentType("{\"metadata\":{\"Server Label\":\"Web Head 2\",\"Server Description\":\"Simple Server\"}}", "application/json"))
.build();
HttpResponse setMetadataResponse = HttpResponse.builder().statusCode(200)
@@ -680,7 +680,7 @@ public class ServerApiExpectTest extends BaseNovaApiExpectTest {
.endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/" + serverId + "/metadata")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
- .payload(payloadFromStringWithContentType("{\"metadata\":{\"Server Label\":\"Web Head 2\",\"Server Description\":\"Simple Server\"}}","application/json"))
+ .payload(payloadFromStringWithContentType("{\"metadata\":{\"Server Label\":\"Web Head 2\",\"Server Description\":\"Simple Server\"}}", "application/json"))
.build();
HttpResponse setMetadataResponse = HttpResponse.builder().statusCode(404)
@@ -752,7 +752,7 @@ public class ServerApiExpectTest extends BaseNovaApiExpectTest {
HttpResponse serverDiagnosticsResponse = HttpResponse.builder().statusCode(202).message("HTTP/1.1 202 Accepted")
- .payload(payloadFromResourceWithContentType("/server_diagnostics.json","application/json; charset=UTF-8")).build();
+ .payload(payloadFromResourceWithContentType("/server_diagnostics.json", "application/json; charset=UTF-8")).build();
NovaApi apiWithNewServer = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, getDiagnostics, serverDiagnosticsResponse);
http://git-wip-us.apache.org/repos/asf/jclouds/blob/2d88f516/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/functions/CreateSecurityGroupIfNeededTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/functions/CreateSecurityGroupIfNeededTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/functions/CreateSecurityGroupIfNeededTest.java
index ba4be4d..165b66b 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/functions/CreateSecurityGroupIfNeededTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/functions/CreateSecurityGroupIfNeededTest.java
@@ -69,7 +69,7 @@ public class CreateSecurityGroupIfNeededTest extends BaseNovaApiExpectTest {
int ruleId = 10331;
- for (int port : ImmutableList.of(22,8080)) {
+ for (int port : ImmutableList.of(22, 8080)) {
HttpRequest createCidrRule = HttpRequest.builder().method("POST").endpoint(
URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-security-group-rules")).headers(
http://git-wip-us.apache.org/repos/asf/jclouds/blob/2d88f516/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/internal/BaseNovaApiLiveTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/internal/BaseNovaApiLiveTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/internal/BaseNovaApiLiveTest.java
index 996249b..c423444 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/internal/BaseNovaApiLiveTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/internal/BaseNovaApiLiveTest.java
@@ -47,7 +47,7 @@ import com.google.common.base.Throwables;
*/
@Test(groups = "live")
public class BaseNovaApiLiveTest extends BaseApiLiveTest<NovaApi> {
- protected String hostName = System.getProperty("user.name").replace('.','-').toLowerCase();
+ protected String hostName = System.getProperty("user.name").replace('.', '-').toLowerCase();
public BaseNovaApiLiveTest() {
provider = "openstack-nova";
http://git-wip-us.apache.org/repos/asf/jclouds/blob/2d88f516/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseServerDiagnostics.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseServerDiagnostics.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseServerDiagnostics.java
index 8d4eb8b..ca947a5 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseServerDiagnostics.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseServerDiagnostics.java
@@ -31,27 +31,27 @@ import com.google.common.collect.ImmutableMap;
*
* @author Leander Beernaert
*/
-public class ParseServerDiagnostics extends BaseItemParserTest<Optional<Map<String,String>>> {
+public class ParseServerDiagnostics extends BaseItemParserTest<Optional<Map<String, String>>> {
@Override
- public Optional<Map<String,String>> expected() {
- return Optional.<Map<String,String>>of(
- new ImmutableMap.Builder<String,String>()
+ public Optional<Map<String, String>> expected() {
+ return Optional.<Map<String, String>>of(
+ new ImmutableMap.Builder<String, String>()
.put("vnet0_tx_errors", "0")
- .put("vda_read","77364736")
- .put("vda_write","415446016")
- .put("vnet0_tx_packets","9701")
- .put("vda_write_req","47278")
- .put("cpu0_time","143150000000")
- .put("vnet0_tx","1691221")
- .put("vnet0_rx_drop","0")
- .put("vda_errors","-1")
- .put("vnet0_rx_errors","0")
- .put("memory","524288")
- .put("vnet0_rx_packets","11271")
- .put("vda_read_req","9551")
- .put("vnet0_rx","1805288")
- .put("vnet0_tx_drop","0").build());
+ .put("vda_read", "77364736")
+ .put("vda_write", "415446016")
+ .put("vnet0_tx_packets", "9701")
+ .put("vda_write_req", "47278")
+ .put("cpu0_time", "143150000000")
+ .put("vnet0_tx", "1691221")
+ .put("vnet0_rx_drop", "0")
+ .put("vda_errors", "-1")
+ .put("vnet0_rx_errors", "0")
+ .put("memory", "524288")
+ .put("vnet0_rx_packets", "11271")
+ .put("vda_read_req", "9551")
+ .put("vnet0_rx", "1805288")
+ .put("vnet0_tx_drop", "0").build());
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/2d88f516/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/binders/BindGrantUserToJson.java
----------------------------------------------------------------------
diff --git a/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/binders/BindGrantUserToJson.java b/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/binders/BindGrantUserToJson.java
index cb8fe7c..5ea2f2f 100644
--- a/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/binders/BindGrantUserToJson.java
+++ b/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/binders/BindGrantUserToJson.java
@@ -45,9 +45,9 @@ public class BindGrantUserToJson implements MapBinder {
databases = (List<String>) postParams.get("databases");
}
- List<Map<String,String>> databaseList = Lists.newArrayList();
+ List<Map<String, String>> databaseList = Lists.newArrayList();
for(String databaseName : databases) {
- Map<String,String> singleDatabase = Maps.newHashMap();
+ Map<String, String> singleDatabase = Maps.newHashMap();
singleDatabase.put("name", databaseName);
databaseList.add(singleDatabase);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/2d88f516/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/domain/User.java
----------------------------------------------------------------------
diff --git a/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/domain/User.java b/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/domain/User.java
index 965e6e0..9ece6dc 100644
--- a/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/domain/User.java
+++ b/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/domain/User.java
@@ -37,12 +37,12 @@ public class User implements Comparable<User>{
private final String name;
private final String password;
private final String host;
- private final List<Map<String,String>> databases;
+ private final List<Map<String, String>> databases;
@ConstructorProperties({
"name", "password", "host", "databases"
})
- protected User(String name, String password, String host, List<Map<String,String>> databases) {
+ protected User(String name, String password, String host, List<Map<String, String>> databases) {
this.name = checkNotNull(name, "name required");
this.password = password;
this.host = host;
@@ -64,11 +64,11 @@ public class User implements Comparable<User>{
this.databases = Lists.newArrayList();
}
else {
- // Using List<Map<String,String>> as the internal representation makes it easy to serialize properly
+ // Using List<Map<String, String>> as the internal representation makes it easy to serialize properly
// with less code; this code is to present databases as List<String> to the user.
- List<Map<String,String>> databaseList = Lists.newArrayList();
+ List<Map<String, String>> databaseList = Lists.newArrayList();
for(String databaseName : databases) {
- Map<String,String> singleDatabase = Maps.newHashMap();
+ Map<String, String> singleDatabase = Maps.newHashMap();
singleDatabase.put("name", databaseName);
databaseList.add(singleDatabase);
}
@@ -117,7 +117,7 @@ public class User implements Comparable<User>{
*/
public List<String> getDatabases() {
List<String> databaseList = Lists.newArrayList();
- for(Map<String,String> database : this.databases) {
+ for(Map<String, String> database : this.databases) {
databaseList.add(database.get("name"));
}
return ImmutableList.copyOf(databaseList);
http://git-wip-us.apache.org/repos/asf/jclouds/blob/2d88f516/apis/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/DatabaseApiLiveTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/DatabaseApiLiveTest.java b/apis/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/DatabaseApiLiveTest.java
index c60ee7c..641ca31 100644
--- a/apis/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/DatabaseApiLiveTest.java
+++ b/apis/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/DatabaseApiLiveTest.java
@@ -39,7 +39,7 @@ import com.google.common.collect.Maps;
public class DatabaseApiLiveTest extends BaseTroveApiLiveTest {
// zone to instance
- private static Map<String,List<Instance>> instancesToDelete = Maps.newHashMap();
+ private static Map<String, List<Instance>> instancesToDelete = Maps.newHashMap();
// not deleting databases. they will be deleted when instances are deleted
@Override
http://git-wip-us.apache.org/repos/asf/jclouds/blob/2d88f516/apis/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/FlavorApiExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/FlavorApiExpectTest.java b/apis/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/FlavorApiExpectTest.java
index 30c4b98..24a93f5 100644
--- a/apis/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/FlavorApiExpectTest.java
+++ b/apis/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/FlavorApiExpectTest.java
@@ -47,7 +47,7 @@ public class FlavorApiExpectTest extends BaseTroveApiExpectTest {
).getFlavorApiForZone("RegionOne");
Set<? extends Flavor> flavors = api.list().toSet();
- assertEquals(flavors.size(),6);
+ assertEquals(flavors.size(), 6);
assertEquals(flavors.iterator().next().getRam(), 512);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/2d88f516/apis/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/InstanceApiExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/InstanceApiExpectTest.java b/apis/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/InstanceApiExpectTest.java
index 369c469..b9eca00 100644
--- a/apis/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/InstanceApiExpectTest.java
+++ b/apis/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/InstanceApiExpectTest.java
@@ -49,7 +49,7 @@ public class InstanceApiExpectTest extends BaseTroveApiExpectTest {
).getInstanceApiForZone("RegionOne");
Instance instance = api.create("1", 2, "json_rack_instance");
- assertEquals(instance.getSize(),2);
+ assertEquals(instance.getSize(), 2);
assertEquals(instance.getName(), "json_rack_instance");
}
@@ -104,7 +104,7 @@ public class InstanceApiExpectTest extends BaseTroveApiExpectTest {
).getInstanceApiForZone("RegionOne");
Set<? extends Instance> instances = api.list().toSet();
- assertEquals(instances.size(),2);
+ assertEquals(instances.size(), 2);
assertEquals(instances.iterator().next().getSize(), 2);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/2d88f516/apis/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/InstanceApiLiveTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/InstanceApiLiveTest.java b/apis/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/InstanceApiLiveTest.java
index 6de832a..bb115ce 100644
--- a/apis/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/InstanceApiLiveTest.java
+++ b/apis/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/InstanceApiLiveTest.java
@@ -44,7 +44,7 @@ import com.google.common.collect.Maps;
@Test(groups = "live", testName = "InstanceApiLiveTest")
public class InstanceApiLiveTest extends BaseTroveApiLiveTest {
- private static Map<String,List<Instance>> created = Maps.newHashMap();
+ private static Map<String, List<Instance>> created = Maps.newHashMap();
@Override
@BeforeClass(groups = { "integration", "live" })
http://git-wip-us.apache.org/repos/asf/jclouds/blob/2d88f516/apis/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/UserApiLiveTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/UserApiLiveTest.java b/apis/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/UserApiLiveTest.java
index cd4a468..0c98dac 100644
--- a/apis/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/UserApiLiveTest.java
+++ b/apis/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/UserApiLiveTest.java
@@ -48,7 +48,7 @@ import com.google.common.collect.Maps;
public class UserApiLiveTest extends BaseTroveApiLiveTest {
// zone to instance
- private static Map<String,List<Instance>> instancesToDelete = Maps.newHashMap();
+ private static Map<String, List<Instance>> instancesToDelete = Maps.newHashMap();
// not deleting users. they will be deleted when instances are deleted
@Override