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:35 UTC
[3/4] Enable whitespace around Checkstyle rule
http://git-wip-us.apache.org/repos/asf/jclouds/blob/67c2b5f6/apis/s3/src/test/java/org/jclouds/s3/services/BucketsLiveTest.java
----------------------------------------------------------------------
diff --git a/apis/s3/src/test/java/org/jclouds/s3/services/BucketsLiveTest.java b/apis/s3/src/test/java/org/jclouds/s3/services/BucketsLiveTest.java
index f9f9bcb..3b6f7ce 100644
--- a/apis/s3/src/test/java/org/jclouds/s3/services/BucketsLiveTest.java
+++ b/apis/s3/src/test/java/org/jclouds/s3/services/BucketsLiveTest.java
@@ -222,7 +222,7 @@ public class BucketsLiveTest extends BaseBlobStoreIntegrationTest {
public void run() {
try {
BucketLogging newLogging = getApi().getBucketLogging(bucketName);
- assert newLogging !=null;
+ assert newLogging != null;
AccessControlList acl = new AccessControlList();
for (Grant grant : newLogging.getTargetGrants()) { // TODO: add permission
// checking features to
http://git-wip-us.apache.org/repos/asf/jclouds/blob/67c2b5f6/apis/swift/src/main/java/org/jclouds/openstack/swift/binders/BindIterableToHeadersWithContainerDeleteMetadataPrefix.java
----------------------------------------------------------------------
diff --git a/apis/swift/src/main/java/org/jclouds/openstack/swift/binders/BindIterableToHeadersWithContainerDeleteMetadataPrefix.java b/apis/swift/src/main/java/org/jclouds/openstack/swift/binders/BindIterableToHeadersWithContainerDeleteMetadataPrefix.java
index 036769e..aec042a 100644
--- a/apis/swift/src/main/java/org/jclouds/openstack/swift/binders/BindIterableToHeadersWithContainerDeleteMetadataPrefix.java
+++ b/apis/swift/src/main/java/org/jclouds/openstack/swift/binders/BindIterableToHeadersWithContainerDeleteMetadataPrefix.java
@@ -61,7 +61,7 @@ public class BindIterableToHeadersWithContainerDeleteMetadataPrefix implements B
Iterable<String> metadataKeys = Iterables.transform((Iterable<String>) input, FN);
HashMultimap<String, String> headers = HashMultimap.create();
- for (String metadataKey: metadataKeys) {
+ for (String metadataKey : metadataKeys) {
headers.put(metadataKey, "");
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/67c2b5f6/apis/swift/src/test/java/org/jclouds/openstack/swift/CommonSwiftClientLiveTest.java
----------------------------------------------------------------------
diff --git a/apis/swift/src/test/java/org/jclouds/openstack/swift/CommonSwiftClientLiveTest.java b/apis/swift/src/test/java/org/jclouds/openstack/swift/CommonSwiftClientLiveTest.java
index d56f945..7221877 100644
--- a/apis/swift/src/test/java/org/jclouds/openstack/swift/CommonSwiftClientLiveTest.java
+++ b/apis/swift/src/test/java/org/jclouds/openstack/swift/CommonSwiftClientLiveTest.java
@@ -358,7 +358,7 @@ public abstract class CommonSwiftClientLiveTest<C extends CommonSwiftClient> ext
protected void testGetObjectContentType(SwiftObject getBlob) {
String contentType = getBlob.getPayload().getContentMetadata().getContentType();
- assert contentType.startsWith("text/plain") || "application/x-www-form-urlencoded".equals(contentType): contentType;
+ assert contentType.startsWith("text/plain") || "application/x-www-form-urlencoded".equals(contentType) : contentType;
}
protected SwiftObject newSwiftObject(String data, String key) throws IOException {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/67c2b5f6/apis/swift/src/test/java/org/jclouds/openstack/swift/internal/BaseSwiftExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/swift/src/test/java/org/jclouds/openstack/swift/internal/BaseSwiftExpectTest.java b/apis/swift/src/test/java/org/jclouds/openstack/swift/internal/BaseSwiftExpectTest.java
index 814f7f0..dbf3e13 100644
--- a/apis/swift/src/test/java/org/jclouds/openstack/swift/internal/BaseSwiftExpectTest.java
+++ b/apis/swift/src/test/java/org/jclouds/openstack/swift/internal/BaseSwiftExpectTest.java
@@ -37,7 +37,7 @@ public class BaseSwiftExpectTest<T> extends BaseRestClientExpectTest<T> {
credential = "testing";
authRequest = HttpRequest.builder()
.method("GET")
- .endpoint(endpoint+ "/v1.0")
+ .endpoint(endpoint + "/v1.0")
.addHeader("X-Auth-User", identity)
.addHeader("X-Auth-Key", credential)
.addHeader("Accept", "*/*")
@@ -62,7 +62,7 @@ public class BaseSwiftExpectTest<T> extends BaseRestClientExpectTest<T> {
protected Properties setupProperties() {
Properties props = super.setupProperties();
- props.put(provider+".endpoint", endpoint);
+ props.put(provider + ".endpoint", endpoint);
return props;
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/67c2b5f6/apis/vcloud/src/test/java/org/jclouds/vcloud/compute/BaseVCloudComputeServiceExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/test/java/org/jclouds/vcloud/compute/BaseVCloudComputeServiceExpectTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/compute/BaseVCloudComputeServiceExpectTest.java
index 8dc8f40..1925430 100644
--- a/apis/vcloud/src/test/java/org/jclouds/vcloud/compute/BaseVCloudComputeServiceExpectTest.java
+++ b/apis/vcloud/src/test/java/org/jclouds/vcloud/compute/BaseVCloudComputeServiceExpectTest.java
@@ -58,7 +58,7 @@ public abstract class BaseVCloudComputeServiceExpectTest extends BaseRestClientE
// login response includes a cookie and also a vcloud extended header with the session token in it
// NOTE: vCloud Director 1.5 returns ;version=1.0 on responses to requests made in 1.0 format.
protected HttpResponse successfulVersion1_0LoginResponseFromVCD1_5WithSingleOrg = HttpResponse.builder().statusCode(200)
- .message("HTTP/1.1 200 OK").payload(payloadFromResourceWithContentType("/orgList1.0-vcd15.xml", VCloudMediaType.ORGLIST_XML +";version=1.0"))
+ .message("HTTP/1.1 200 OK").payload(payloadFromResourceWithContentType("/orgList1.0-vcd15.xml", VCloudMediaType.ORGLIST_XML + ";version=1.0"))
.addHeader("x-vcloud-authorization", sessionToken)
.addHeader(HttpHeaders.SET_COOKIE, String.format("vcloud-token=%s; Secure; Path=/", sessionToken)).build();
@@ -71,7 +71,7 @@ public abstract class BaseVCloudComputeServiceExpectTest extends BaseRestClientE
.addHeader(HttpHeaders.COOKIE, "vcloud-token=" + sessionToken).build();
protected HttpResponse successfulVersion1_0GetOrgResponseFromVCD1_5WithSingleTasksListVDCAndNetwork = HttpResponse.builder().statusCode(200)
- .message("HTTP/1.1 200 OK").payload(payloadFromResourceWithContentType("/org1.0-vcd15.xml", VCloudMediaType.ORG_XML +";version=1.0"))
+ .message("HTTP/1.1 200 OK").payload(payloadFromResourceWithContentType("/org1.0-vcd15.xml", VCloudMediaType.ORG_XML + ";version=1.0"))
.build();
protected String catalogId = "3155f393-1e1d-4572-8c9c-d76f72ddb658";
@@ -83,7 +83,7 @@ public abstract class BaseVCloudComputeServiceExpectTest extends BaseRestClientE
.addHeader(HttpHeaders.COOKIE, "vcloud-token=" + sessionToken).build();
protected HttpResponse successfulVersion1_0GetCatalogResponseFromVCD1_5WithSingleTemplate = HttpResponse.builder().statusCode(200)
- .message("HTTP/1.1 200 OK").payload(payloadFromResourceWithContentType("/catalog1.0-vcd15.xml", VCloudMediaType.CATALOG_XML +";version=1.0"))
+ .message("HTTP/1.1 200 OK").payload(payloadFromResourceWithContentType("/catalog1.0-vcd15.xml", VCloudMediaType.CATALOG_XML + ";version=1.0"))
.build();
protected String catalogItemId = "ceb369f7-1d07-4e32-9dbd-ebb5aa6ca55c";
@@ -94,7 +94,7 @@ public abstract class BaseVCloudComputeServiceExpectTest extends BaseRestClientE
.addHeader(HttpHeaders.COOKIE, "vcloud-token=" + sessionToken).build();
protected HttpResponse successfulVersion1_0GetCatalogItemResponseFromVCD1_5ForTemplate = HttpResponse.builder().statusCode(200)
- .message("HTTP/1.1 200 OK").payload(payloadFromResourceWithContentType("/catalogItem1.0-vcd15.xml", VCloudMediaType.CATALOGITEM_XML +";version=1.0"))
+ .message("HTTP/1.1 200 OK").payload(payloadFromResourceWithContentType("/catalogItem1.0-vcd15.xml", VCloudMediaType.CATALOGITEM_XML + ";version=1.0"))
.build();
// note vAppTemplate has a prefix in its id
@@ -106,7 +106,7 @@ public abstract class BaseVCloudComputeServiceExpectTest extends BaseRestClientE
.addHeader(HttpHeaders.COOKIE, "vcloud-token=" + sessionToken).build();
protected HttpResponse successfulVersion1_0GetVDCResponseFromVCD1_5WithSingleTemplateAndNetwork = HttpResponse.builder().statusCode(200)
- .message("HTTP/1.1 200 OK").payload(payloadFromResourceWithContentType("/vdc1.0-vcd15.xml", VCloudMediaType.VDC_XML +";version=1.0"))
+ .message("HTTP/1.1 200 OK").payload(payloadFromResourceWithContentType("/vdc1.0-vcd15.xml", VCloudMediaType.VDC_XML + ";version=1.0"))
.build();
protected String networkId = "b466c0c5-8a5c-4335-b703-a2e2e6b5f3e1";
@@ -117,11 +117,11 @@ public abstract class BaseVCloudComputeServiceExpectTest extends BaseRestClientE
.addHeader(HttpHeaders.COOKIE, "vcloud-token=" + sessionToken).build();
protected HttpResponse successfulVersion1_0GetVAppTemplateResponseFromVCD1_5WithSingleVMAndVDCParent = HttpResponse.builder().statusCode(200)
- .message("HTTP/1.1 200 OK").payload(payloadFromResourceWithContentType("/template1.0-vcd15.xml", VCloudMediaType.VAPPTEMPLATE_XML +";version=1.0"))
+ .message("HTTP/1.1 200 OK").payload(payloadFromResourceWithContentType("/template1.0-vcd15.xml", VCloudMediaType.VAPPTEMPLATE_XML + ";version=1.0"))
.build();
protected HttpResponse successfulVersion1_0GetVAppTemplateResponseFromVCD1_5WithMultipleVMsAndVDCParent = HttpResponse.builder().statusCode(200)
- .message("HTTP/1.1 200 OK").payload(payloadFromResourceWithContentType("/template1.0-vcd15-multi-vm.xml", VCloudMediaType.VAPPTEMPLATE_XML +";version=1.0"))
+ .message("HTTP/1.1 200 OK").payload(payloadFromResourceWithContentType("/template1.0-vcd15-multi-vm.xml", VCloudMediaType.VAPPTEMPLATE_XML + ";version=1.0"))
.build();
protected HttpRequest version1_0GetOVFForVAppTemplateRequest = HttpRequest.builder().method("GET").endpoint(ENDPOINT + "/v1.0/vAppTemplate/" + templateId + "/ovf")
@@ -130,11 +130,11 @@ public abstract class BaseVCloudComputeServiceExpectTest extends BaseRestClientE
.addHeader(HttpHeaders.COOKIE, "vcloud-token=" + sessionToken).build();
protected HttpResponse successfulVersion1_0GetOVFForVAppTemplateResponseFromVCD1_5WithSingleVM = HttpResponse.builder().statusCode(200)
- .message("HTTP/1.1 200 OK").payload(payloadFromResourceWithContentType("/ovf-ubuntu64.xml", MediaType.TEXT_XML +";version=1.0"))
+ .message("HTTP/1.1 200 OK").payload(payloadFromResourceWithContentType("/ovf-ubuntu64.xml", MediaType.TEXT_XML + ";version=1.0"))
.build();
protected HttpResponse successfulVersion1_0GetOVFForVAppTemplateResponseFromVCD1_5WithMultipleVMs = HttpResponse.builder().statusCode(200)
- .message("HTTP/1.1 200 OK").payload(payloadFromResourceWithContentType("/ovf-multi-vm.xml", MediaType.TEXT_XML +";version=1.0"))
+ .message("HTTP/1.1 200 OK").payload(payloadFromResourceWithContentType("/ovf-multi-vm.xml", MediaType.TEXT_XML + ";version=1.0"))
.build();
public BaseVCloudComputeServiceExpectTest() {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/67c2b5f6/compute/src/test/java/org/jclouds/compute/StubComputeServiceIntegrationTest.java
----------------------------------------------------------------------
diff --git a/compute/src/test/java/org/jclouds/compute/StubComputeServiceIntegrationTest.java b/compute/src/test/java/org/jclouds/compute/StubComputeServiceIntegrationTest.java
index eb5d51a..2a5da7b 100644
--- a/compute/src/test/java/org/jclouds/compute/StubComputeServiceIntegrationTest.java
+++ b/compute/src/test/java/org/jclouds/compute/StubComputeServiceIntegrationTest.java
@@ -59,7 +59,7 @@ import com.google.inject.Module;
*
* @author Adrian Cole
*/
-@Test(groups = "live", testName="StubComputeServiceIntegrationTest")
+@Test(groups = "live", testName = "StubComputeServiceIntegrationTest")
public class StubComputeServiceIntegrationTest extends BaseComputeServiceLiveTest {
private static final ExecResponse EXEC_GOOD = new ExecResponse("", "", 0);
http://git-wip-us.apache.org/repos/asf/jclouds/blob/67c2b5f6/compute/src/test/java/org/jclouds/compute/stub/extensions/StubSecurityGroupExtensionIntegrationTest.java
----------------------------------------------------------------------
diff --git a/compute/src/test/java/org/jclouds/compute/stub/extensions/StubSecurityGroupExtensionIntegrationTest.java b/compute/src/test/java/org/jclouds/compute/stub/extensions/StubSecurityGroupExtensionIntegrationTest.java
index df744bf..f6dad8c 100644
--- a/compute/src/test/java/org/jclouds/compute/stub/extensions/StubSecurityGroupExtensionIntegrationTest.java
+++ b/compute/src/test/java/org/jclouds/compute/stub/extensions/StubSecurityGroupExtensionIntegrationTest.java
@@ -28,7 +28,7 @@ import org.testng.annotations.Test;
* @author Andrew Bayer
*
*/
-@Test(groups = { "integration", "live" }, singleThreaded = true, testName="StubSecurityGroupExtensionIntegrationTest")
+@Test(groups = { "integration", "live" }, singleThreaded = true, testName = "StubSecurityGroupExtensionIntegrationTest")
public class StubSecurityGroupExtensionIntegrationTest extends BaseSecurityGroupExtensionLiveTest {
public StubSecurityGroupExtensionIntegrationTest() {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/67c2b5f6/core/src/test/java/org/jclouds/ContextBuilderTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/jclouds/ContextBuilderTest.java b/core/src/test/java/org/jclouds/ContextBuilderTest.java
index 177e2b4..83b4446 100644
--- a/core/src/test/java/org/jclouds/ContextBuilderTest.java
+++ b/core/src/test/java/org/jclouds/ContextBuilderTest.java
@@ -57,7 +57,7 @@ import com.google.inject.TypeLiteral;
*
* @author Adrian Cole
*/
-@Test(groups = "unit", testName="ContextBuilderTest")
+@Test(groups = "unit", testName = "ContextBuilderTest")
public class ContextBuilderTest {
@ConfiguresHttpCommandExecutorService
http://git-wip-us.apache.org/repos/asf/jclouds/blob/67c2b5f6/core/src/test/java/org/jclouds/PerformanceTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/jclouds/PerformanceTest.java b/core/src/test/java/org/jclouds/PerformanceTest.java
index d18f017..d7d3a5a 100644
--- a/core/src/test/java/org/jclouds/PerformanceTest.java
+++ b/core/src/test/java/org/jclouds/PerformanceTest.java
@@ -35,7 +35,7 @@ import org.testng.annotations.Test;
*
* @author Adrian Cole
*/
-@Test(groups="performance")
+@Test(groups = "performance")
public abstract class PerformanceTest {
protected static int LOOP_COUNT = 1000;
protected static int THREAD_COUNT = 100;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/67c2b5f6/core/src/test/java/org/jclouds/apis/BaseApiLiveTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/jclouds/apis/BaseApiLiveTest.java b/core/src/test/java/org/jclouds/apis/BaseApiLiveTest.java
index e3e4e07..b53c86e 100644
--- a/core/src/test/java/org/jclouds/apis/BaseApiLiveTest.java
+++ b/core/src/test/java/org/jclouds/apis/BaseApiLiveTest.java
@@ -84,7 +84,7 @@ public abstract class BaseApiLiveTest<A extends Closeable> {
*/
protected Set<String> filterZones(Set<String> zones) {
String zonesToList = System.getProperty("test.live.zones");
- if(zonesToList == null) {
+ if (zonesToList == null) {
return zones; // no filter applied
}
Set<String> zoneFilter = Sets.newHashSet(Splitter.on(',').split(zonesToList));
http://git-wip-us.apache.org/repos/asf/jclouds/blob/67c2b5f6/core/src/test/java/org/jclouds/logging/BufferLogger.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/jclouds/logging/BufferLogger.java b/core/src/test/java/org/jclouds/logging/BufferLogger.java
index d203169..9f981b0 100644
--- a/core/src/test/java/org/jclouds/logging/BufferLogger.java
+++ b/core/src/test/java/org/jclouds/logging/BufferLogger.java
@@ -65,16 +65,16 @@ public class BufferLogger extends BaseLogger {
* otherwise returns a record which does satisfy the constraint
*/
public Record assertLogContains(String fragment) {
- for (Record r: messages) {
+ for (Record r : messages) {
if (r.getMessage() != null && r.getMessage().contains(fragment)) return r;
}
- throw new AssertionError("log did not contain expected '"+fragment+"'");
+ throw new AssertionError("log did not contain expected '" + fragment + "'");
}
/** fails if log _does_ contain the indicated fragment */
public void assertLogDoesntContain(String fragment) {
- for (Record r: messages) {
+ for (Record r : messages) {
if (r.getMessage() != null && r.getMessage().contains(fragment))
- throw new AssertionError("log contained unexpected '"+fragment+"'");
+ throw new AssertionError("log contained unexpected '" + fragment + "'");
}
}
@@ -82,7 +82,7 @@ public class BufferLogger extends BaseLogger {
* otherwise returns a record which does satisfy the constraint
*/
public Record assertLogContains(Predicate<Record> test) {
- for (Record r: messages) {
+ for (Record r : messages) {
if (r.getMessage() != null && test.apply(r)) return r;
}
throw new AssertionError("log did not contain any records satisfying expected predicate");
http://git-wip-us.apache.org/repos/asf/jclouds/blob/67c2b5f6/core/src/test/java/org/jclouds/rest/internal/BaseRestApiTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/jclouds/rest/internal/BaseRestApiTest.java b/core/src/test/java/org/jclouds/rest/internal/BaseRestApiTest.java
index eb53854..7155a24 100644
--- a/core/src/test/java/org/jclouds/rest/internal/BaseRestApiTest.java
+++ b/core/src/test/java/org/jclouds/rest/internal/BaseRestApiTest.java
@@ -180,7 +180,7 @@ public abstract class BaseRestApiTest {
protected void assertSaxResponseParserClassEquals(Invokable<?, ?> method, @Nullable Class<?> parserClass) {
XMLResponseParser annotation = method.getAnnotation(XMLResponseParser.class);
- Class<?> expected = (annotation != null) ? annotation.value() :null;
+ Class<?> expected = (annotation != null) ? annotation.value() : null;
assertEquals(expected, parserClass);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/67c2b5f6/core/src/test/java/org/jclouds/util/Predicates2Test.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/jclouds/util/Predicates2Test.java b/core/src/test/java/org/jclouds/util/Predicates2Test.java
index 242363f..5e16fcb 100644
--- a/core/src/test/java/org/jclouds/util/Predicates2Test.java
+++ b/core/src/test/java/org/jclouds/util/Predicates2Test.java
@@ -120,7 +120,7 @@ public class Predicates2Test {
stopwatch.start();
predicate.apply("");
long duration = stopwatch.elapsed(MILLISECONDS);
- assertOrdered(3000-EARLY_RETURN_GRACE, duration, 3000+SLOW_BUILD_SERVER_GRACE);
+ assertOrdered(3000 - EARLY_RETURN_GRACE, duration, 3000 + SLOW_BUILD_SERVER_GRACE);
}
@Test
@@ -134,8 +134,8 @@ public class Predicates2Test {
predicate.apply("");
long duration = stopwatch.elapsed(MILLISECONDS);
- assertOrdered(2500-EARLY_RETURN_GRACE, duration, 2500+SLOW_BUILD_SERVER_GRACE);
- assertCallTimes(rawPredicate.callTimes, 0, 1000, 1000+1500);
+ assertOrdered(2500 - EARLY_RETURN_GRACE, duration, 2500 + SLOW_BUILD_SERVER_GRACE);
+ assertCallTimes(rawPredicate.callTimes, 0, 1000, 1000 + 1500);
}
@Test
@@ -149,7 +149,7 @@ public class Predicates2Test {
predicate.apply("");
long duration = stopwatch.elapsed(MILLISECONDS);
- assertOrdered(2000-EARLY_RETURN_GRACE, duration, 2000+SLOW_BUILD_SERVER_GRACE);
+ assertOrdered(2000 - EARLY_RETURN_GRACE, duration, 2000 + SLOW_BUILD_SERVER_GRACE);
assertCallTimes(rawPredicate.callTimes, 0, 1000, 2000);
}
@@ -171,12 +171,12 @@ public class Predicates2Test {
}
}
- @Test(enabled=false) // not a test, but picked up as such because public
+ @Test(enabled = false) // not a test, but picked up as such because public
public static void assertCallTimes(List<Long> actual, Integer... expected) {
Assert.assertEquals(actual.size(), expected.length);
for (int i = 0; i < expected.length; i++) {
long callTime = actual.get(i);
- assertOrdered(expected[i]-EARLY_RETURN_GRACE, callTime, expected[i]+SLOW_BUILD_SERVER_GRACE);
+ assertOrdered(expected[i] - EARLY_RETURN_GRACE, callTime, expected[i] + SLOW_BUILD_SERVER_GRACE);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/67c2b5f6/drivers/gae/src/test/java/org/jclouds/gae/GaeSocketOpenTest.java
----------------------------------------------------------------------
diff --git a/drivers/gae/src/test/java/org/jclouds/gae/GaeSocketOpenTest.java b/drivers/gae/src/test/java/org/jclouds/gae/GaeSocketOpenTest.java
index bdca034..b2b0451 100644
--- a/drivers/gae/src/test/java/org/jclouds/gae/GaeSocketOpenTest.java
+++ b/drivers/gae/src/test/java/org/jclouds/gae/GaeSocketOpenTest.java
@@ -30,7 +30,7 @@ import com.google.common.net.HostAndPort;
public class GaeSocketOpenTest {
- @Test(expectedExceptions=UnsupportedOperationException.class)
+ @Test(expectedExceptions = UnsupportedOperationException.class)
public void testSocketOpenThrowsUnsupported() {
Context context = ContextBuilder.newBuilder(
AnonymousProviderMetadata.forClientMappedToAsyncClientOnEndpoint(IntegrationTestClient.class, IntegrationTestAsyncClient.class,
http://git-wip-us.apache.org/repos/asf/jclouds/blob/67c2b5f6/drivers/jsch/src/test/java/org/jclouds/ssh/jsch/JschSshClientLiveTest.java
----------------------------------------------------------------------
diff --git a/drivers/jsch/src/test/java/org/jclouds/ssh/jsch/JschSshClientLiveTest.java b/drivers/jsch/src/test/java/org/jclouds/ssh/jsch/JschSshClientLiveTest.java
index e5f1ce2..37d3de0 100644
--- a/drivers/jsch/src/test/java/org/jclouds/ssh/jsch/JschSshClientLiveTest.java
+++ b/drivers/jsch/src/test/java/org/jclouds/ssh/jsch/JschSshClientLiveTest.java
@@ -196,14 +196,14 @@ public class JschSshClientLiveTest {
ExecResponse response = client.exec("thisCommandDoesNotExist");
assertNotEquals(response.getExitStatus(), 0);
assertTrue(response.getOutput().contains("not found") || response.getError().contains("not found"),
- "stdout="+response.getOutput()+"; stderr="+response.getError());
+ "stdout=" + response.getOutput() + "; stderr=" + response.getError());
} finally {
client.disconnect();
}
}
// Added for issue #1016.
- @Test(invocationCount=100)
+ @Test(invocationCount = 100)
public void testExecHostnameRepeatedlyWithDifferentSessions() throws Exception {
testExecHostname();
}
@@ -219,7 +219,7 @@ public class JschSshClientLiveTest {
assertEquals(response.getError(), "");
assertEquals(response.getOutput().trim(), "localhost".equals(sshHost) ? InetAddress.getLocalHost().getHostName()
: sshHost);
- //System.out.println("completed (sequentially) "+i);
+ //System.out.println("completed (sequentially) " + i);
}
} finally {
client.disconnect();
@@ -241,7 +241,7 @@ public class JschSshClientLiveTest {
@Override
public ExecResponse call() {
ExecResponse response = client.exec("hostname");
- //System.out.println("completed (concurrently) "+count.incrementAndGet());
+ //System.out.println("completed (concurrently) " + count.incrementAndGet());
return response;
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/67c2b5f6/providers/glesys/src/test/java/org/jclouds/glesys/features/ServerApiLiveTest.java
----------------------------------------------------------------------
diff --git a/providers/glesys/src/test/java/org/jclouds/glesys/features/ServerApiLiveTest.java b/providers/glesys/src/test/java/org/jclouds/glesys/features/ServerApiLiveTest.java
index 839214f..0f31285 100644
--- a/providers/glesys/src/test/java/org/jclouds/glesys/features/ServerApiLiveTest.java
+++ b/providers/glesys/src/test/java/org/jclouds/glesys/features/ServerApiLiveTest.java
@@ -236,7 +236,7 @@ public class ServerApiLiveTest extends BaseGleSYSApiWithAServerLiveTest {
}
// takes a few minutes and requires an extra server (used 1 already)
- @Test(enabled=false)
+ @Test(enabled = false)
public void testCloneServer() throws Exception {
ServerDetails testServer2 = serverApi.clone(serverId, testHostName2, CloneServerOptions.Builder.cpucores(1));
http://git-wip-us.apache.org/repos/asf/jclouds/blob/67c2b5f6/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/SoftLayerTemplateBuilderLiveTest.java
----------------------------------------------------------------------
diff --git a/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/SoftLayerTemplateBuilderLiveTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/SoftLayerTemplateBuilderLiveTest.java
index 98f31e7..2c23470 100644
--- a/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/SoftLayerTemplateBuilderLiveTest.java
+++ b/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/SoftLayerTemplateBuilderLiveTest.java
@@ -87,7 +87,7 @@ public class SoftLayerTemplateBuilderLiveTest extends BaseTemplateBuilderLiveTes
assertEquals(defaultTemplate.getImage().getOperatingSystem().is64Bit(), true);
assertEquals(defaultTemplate.getImage().getOperatingSystem().getFamily(), OsFamily.UBUNTU);
assertEquals(getCores(defaultTemplate.getHardware()), 1.0d);
- assertEquals(defaultTemplate.getHardware().getRam(), 1*1024);
+ assertEquals(defaultTemplate.getHardware().getRam(), 1 * 1024);
assertEquals(getSpace(defaultTemplate.getHardware()), 25.0d);
assertEquals(defaultTemplate.getHardware().getVolumes().get(0).getType(), Volume.Type.LOCAL);
// test that we bound the correct templateoptions in guice
@@ -141,7 +141,7 @@ public class SoftLayerTemplateBuilderLiveTest extends BaseTemplateBuilderLiveTes
Template template = context.getComputeService().templateBuilder().biggest().build();
assertEquals(getCores(template.getHardware()), 16.0d);
- assertEquals(template.getHardware().getRam(), 16*1024);
+ assertEquals(template.getHardware().getRam(), 16 * 1024);
assertEquals(getSpace(template.getHardware()), 100.0d);
assertEquals(template.getHardware().getVolumes().get(0).getType(), Volume.Type.SAN);
} finally {
@@ -161,7 +161,7 @@ public class SoftLayerTemplateBuilderLiveTest extends BaseTemplateBuilderLiveTes
Template template = context.getComputeService().templateBuilder().build();
assertEquals(getCores(template.getHardware()), 1.0d);
- assertEquals(template.getHardware().getRam(), 1*1024);
+ assertEquals(template.getHardware().getRam(), 1 * 1024);
assertEquals(getSpace(template.getHardware()), 25.0d);
assertEquals(template.getHardware().getVolumes().get(0).getType(), Volume.Type.LOCAL);
} finally {
@@ -181,7 +181,7 @@ public class SoftLayerTemplateBuilderLiveTest extends BaseTemplateBuilderLiveTes
Template template = context.getComputeService().templateBuilder().biggest().build();
assertEquals(getCores(template.getHardware()), 8.0d);
- assertEquals(template.getHardware().getRam(), 16*1024);
+ assertEquals(template.getHardware().getRam(), 16 * 1024);
assertEquals(getSpace(template.getHardware()), 100.0d);
assertEquals(template.getHardware().getVolumes().get(0).getType(), Volume.Type.LOCAL);
} finally {
@@ -194,7 +194,7 @@ public class SoftLayerTemplateBuilderLiveTest extends BaseTemplateBuilderLiveTes
public void testFastestTemplateBuilder() throws IOException {
Template template = view.getComputeService().templateBuilder().fastest().build();
assertEquals(getCores(template.getHardware()), 16.0d);
- assertEquals(template.getHardware().getRam(), 1*1024);
+ assertEquals(template.getHardware().getRam(), 1 * 1024);
assertEquals(getSpace(template.getHardware()), 25.0d);
assertEquals(template.getHardware().getVolumes().get(0).getType(), Volume.Type.LOCAL);
}
@@ -203,7 +203,7 @@ public class SoftLayerTemplateBuilderLiveTest extends BaseTemplateBuilderLiveTes
public void testBiggestTemplateBuilder() throws IOException {
Template template = view.getComputeService().templateBuilder().biggest().build();
assertEquals(getCores(template.getHardware()), 16.0d);
- assertEquals(template.getHardware().getRam(), 16*1024);
+ assertEquals(template.getHardware().getRam(), 16 * 1024);
assertEquals(getSpace(template.getHardware()), 100.0d);
assertEquals(template.getHardware().getVolumes().get(0).getType(), Volume.Type.LOCAL);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/67c2b5f6/providers/softlayer/src/test/java/org/jclouds/softlayer/features/AccountApiLiveTest.java
----------------------------------------------------------------------
diff --git a/providers/softlayer/src/test/java/org/jclouds/softlayer/features/AccountApiLiveTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/features/AccountApiLiveTest.java
index f80b0cc..1232133 100644
--- a/providers/softlayer/src/test/java/org/jclouds/softlayer/features/AccountApiLiveTest.java
+++ b/providers/softlayer/src/test/java/org/jclouds/softlayer/features/AccountApiLiveTest.java
@@ -37,7 +37,7 @@ public class AccountApiLiveTest extends BaseSoftLayerApiLiveTest {
assert null != response;
assertTrue(response.size() >= 0);
- for (ProductPackage productPackage: response) {
+ for (ProductPackage productPackage : response) {
assert productPackage.getId() > 0 : response;
assert productPackage.getName() != null : response;
assert productPackage.getDescription() != null : response;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/67c2b5f6/providers/softlayer/src/test/java/org/jclouds/softlayer/features/DatacenterApiLiveTest.java
----------------------------------------------------------------------
diff --git a/providers/softlayer/src/test/java/org/jclouds/softlayer/features/DatacenterApiLiveTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/features/DatacenterApiLiveTest.java
index 4a4d804..fbe65b6 100644
--- a/providers/softlayer/src/test/java/org/jclouds/softlayer/features/DatacenterApiLiveTest.java
+++ b/providers/softlayer/src/test/java/org/jclouds/softlayer/features/DatacenterApiLiveTest.java
@@ -73,7 +73,7 @@ public class DatacenterApiLiveTest extends BaseSoftLayerApiLiveTest {
assertEquals(response.size(), expected.size());
assertTrue(response.containsAll(expected));
- for (Datacenter datacenter: response) {
+ for (Datacenter datacenter : response) {
Address address = datacenter.getLocationAddress();
if (address != null) checkAddress(address);
}
@@ -87,7 +87,7 @@ public class DatacenterApiLiveTest extends BaseSoftLayerApiLiveTest {
assert dc.getId() > 0 : dc;
assert dc.getName() != null : dc;
assert dc.getLongName() != null : dc;
- for ( Region region: dc.getRegions()) checkRegion(region);
+ for (Region region : dc.getRegions()) checkRegion(region);
}
private void checkRegion(Region region) {
@@ -96,7 +96,7 @@ public class DatacenterApiLiveTest extends BaseSoftLayerApiLiveTest {
}
private void checkAddress(Address address) {
- assert address.getId() >0 : address;
+ assert address.getId() > 0 : address;
assert address.getCountry() != null : address;
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/67c2b5f6/resources/checkstyle.xml
----------------------------------------------------------------------
diff --git a/resources/checkstyle.xml b/resources/checkstyle.xml
index 982302c..8766cfa 100644
--- a/resources/checkstyle.xml
+++ b/resources/checkstyle.xml
@@ -46,6 +46,11 @@
<module name="WhitespaceAfter">
<property name="tokens" value="COMMA"/>
</module>
+ <module name="WhitespaceAround">
+ <property name="ignoreEnhancedForColon" value="false" />
+ <!-- TODO: enable LCURLY, RCURLY, SLIST -->
+ <property name="tokens" value="ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, EQUAL, GE, GT, LAND, LE, LITERAL_ASSERT, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_RETURN, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, SL, SL_ASSIGN, SR, SR_ASSIGN, STAR, STAR_ASSIGN, TYPE_EXTENSION_AND" />
+ </module>
</module>
<module name="RegexpMultiline">
<property name="format" value="=\s*new ArrayList<[^>]"/>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/67c2b5f6/scriptbuilder/src/test/java/org/jclouds/scriptbuilder/domain/SwitchArgTest.java
----------------------------------------------------------------------
diff --git a/scriptbuilder/src/test/java/org/jclouds/scriptbuilder/domain/SwitchArgTest.java b/scriptbuilder/src/test/java/org/jclouds/scriptbuilder/domain/SwitchArgTest.java
index 9b1f6c6..1fb0298 100644
--- a/scriptbuilder/src/test/java/org/jclouds/scriptbuilder/domain/SwitchArgTest.java
+++ b/scriptbuilder/src/test/java/org/jclouds/scriptbuilder/domain/SwitchArgTest.java
@@ -36,16 +36,16 @@ public class SwitchArgTest {
assertEquals(new SwitchArg(1, ImmutableMap.of("0", newStatementList(appendFile(
"{tmp}{fs}{uid}{fs}scripttest{fs}temp.txt", ImmutableList.of("hello world")),
interpret("echo hello zero{lf}")), "1", interpret("echo hello one{lf}"))).render(OsFamily.UNIX),
- "case $1 in\n"+
- "0)\n"+
- " cat >> /tmp/$USER/scripttest/temp.txt <<-'END_OF_JCLOUDS_FILE'\n"+
- "\thello world\n"+
- "END_OF_JCLOUDS_FILE\n"+
- " echo hello zero\n"+
- " ;;\n"+
- "1)\n"+
- " echo hello one\n"+
- " ;;\n"+
+ "case $1 in\n" +
+ "0)\n" +
+ " cat >> /tmp/$USER/scripttest/temp.txt <<-'END_OF_JCLOUDS_FILE'\n" +
+ "\thello world\n" +
+ "END_OF_JCLOUDS_FILE\n" +
+ " echo hello zero\n" +
+ " ;;\n" +
+ "1)\n" +
+ " echo hello one\n" +
+ " ;;\n" +
"esac\n");
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/67c2b5f6/scriptbuilder/src/test/java/org/jclouds/scriptbuilder/statements/login/SudoStatementsTest.java
----------------------------------------------------------------------
diff --git a/scriptbuilder/src/test/java/org/jclouds/scriptbuilder/statements/login/SudoStatementsTest.java b/scriptbuilder/src/test/java/org/jclouds/scriptbuilder/statements/login/SudoStatementsTest.java
index 4298c45..c8df7ff 100644
--- a/scriptbuilder/src/test/java/org/jclouds/scriptbuilder/statements/login/SudoStatementsTest.java
+++ b/scriptbuilder/src/test/java/org/jclouds/scriptbuilder/statements/login/SudoStatementsTest.java
@@ -30,10 +30,10 @@ public class SudoStatementsTest {
public void testCreateWheelUNIX() {
assertEquals(
SudoStatements.createWheel().render(OsFamily.UNIX),
- "cat > /etc/sudoers <<-'END_OF_JCLOUDS_FILE'\n"+
- "\troot ALL = (ALL) ALL\n"+
- "\t%wheel ALL = (ALL) NOPASSWD:ALL\n"+
- "END_OF_JCLOUDS_FILE\n"+
+ "cat > /etc/sudoers <<-'END_OF_JCLOUDS_FILE'\n" +
+ "\troot ALL = (ALL) ALL\n" +
+ "\t%wheel ALL = (ALL) NOPASSWD:ALL\n" +
+ "END_OF_JCLOUDS_FILE\n" +
"chmod 0440 /etc/sudoers\n");
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/67c2b5f6/scriptbuilder/src/test/java/org/jclouds/scriptbuilder/statements/ssh/AuthorizeRSAPublicKeyTest.java
----------------------------------------------------------------------
diff --git a/scriptbuilder/src/test/java/org/jclouds/scriptbuilder/statements/ssh/AuthorizeRSAPublicKeyTest.java b/scriptbuilder/src/test/java/org/jclouds/scriptbuilder/statements/ssh/AuthorizeRSAPublicKeyTest.java
index 270935b..4900500 100644
--- a/scriptbuilder/src/test/java/org/jclouds/scriptbuilder/statements/ssh/AuthorizeRSAPublicKeyTest.java
+++ b/scriptbuilder/src/test/java/org/jclouds/scriptbuilder/statements/ssh/AuthorizeRSAPublicKeyTest.java
@@ -32,32 +32,32 @@ public class AuthorizeRSAPublicKeyTest {
public void testAuthorizeRSAPublicKeyUNIXCurrentUser() {
assertEquals(
new AuthorizeRSAPublicKeys(ImmutableSet.of("ssh-dss AAAAB")).render(OsFamily.UNIX),
- "mkdir -p ~/.ssh\n"+
- "cat >> ~/.ssh/authorized_keys <<-'END_OF_JCLOUDS_FILE'\n"+
- "\tssh-dss AAAAB\n"+
- "END_OF_JCLOUDS_FILE\n"+
+ "mkdir -p ~/.ssh\n" +
+ "cat >> ~/.ssh/authorized_keys <<-'END_OF_JCLOUDS_FILE'\n" +
+ "\tssh-dss AAAAB\n" +
+ "END_OF_JCLOUDS_FILE\n" +
"chmod 600 ~/.ssh/authorized_keys\n");
}
public void testAuthorizeRSAPublicKeyUNIXCurrentUserWith2Keys() {
assertEquals(
new AuthorizeRSAPublicKeys(ImmutableSet.of("ssh-dss AAAAB", "ssh-dss CCCCD")).render(OsFamily.UNIX),
- "mkdir -p ~/.ssh\n"+
- "cat >> ~/.ssh/authorized_keys <<-'END_OF_JCLOUDS_FILE'\n"+
- "\tssh-dss AAAAB\n"+
- "\t\n"+
- "\tssh-dss CCCCD\n"+
- "END_OF_JCLOUDS_FILE\n"+
+ "mkdir -p ~/.ssh\n" +
+ "cat >> ~/.ssh/authorized_keys <<-'END_OF_JCLOUDS_FILE'\n" +
+ "\tssh-dss AAAAB\n" +
+ "\t\n" +
+ "\tssh-dss CCCCD\n" +
+ "END_OF_JCLOUDS_FILE\n" +
"chmod 600 ~/.ssh/authorized_keys\n");
}
public void testAuthorizeRSAPublicKeyUNIXSpecifiedDir() {
assertEquals(
new AuthorizeRSAPublicKeys("/home/me/.ssh", ImmutableSet.of("ssh-dss AAAAB")).render(OsFamily.UNIX),
- "mkdir -p /home/me/.ssh\n"+
- "cat >> /home/me/.ssh/authorized_keys <<-'END_OF_JCLOUDS_FILE'\n"+
- "\tssh-dss AAAAB\n"+
- "END_OF_JCLOUDS_FILE\n"+
+ "mkdir -p /home/me/.ssh\n" +
+ "cat >> /home/me/.ssh/authorized_keys <<-'END_OF_JCLOUDS_FILE'\n" +
+ "\tssh-dss AAAAB\n" +
+ "END_OF_JCLOUDS_FILE\n" +
"chmod 600 /home/me/.ssh/authorized_keys\n");
}
@@ -65,12 +65,12 @@ public class AuthorizeRSAPublicKeyTest {
assertEquals(
new AuthorizeRSAPublicKeys("/home/me/.ssh", ImmutableSet.of("ssh-dss AAAAB", "ssh-dss CCCCD"))
.render(OsFamily.UNIX),
- "mkdir -p /home/me/.ssh\n"+
- "cat >> /home/me/.ssh/authorized_keys <<-'END_OF_JCLOUDS_FILE'\n"+
- "\tssh-dss AAAAB\n"+
- "\t\n"+
- "\tssh-dss CCCCD\n"+
- "END_OF_JCLOUDS_FILE\n"+
+ "mkdir -p /home/me/.ssh\n" +
+ "cat >> /home/me/.ssh/authorized_keys <<-'END_OF_JCLOUDS_FILE'\n" +
+ "\tssh-dss AAAAB\n" +
+ "\t\n" +
+ "\tssh-dss CCCCD\n" +
+ "END_OF_JCLOUDS_FILE\n" +
"chmod 600 /home/me/.ssh/authorized_keys\n");
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/67c2b5f6/scriptbuilder/src/test/java/org/jclouds/scriptbuilder/statements/ssh/InstallRSAPrivateKeyTest.java
----------------------------------------------------------------------
diff --git a/scriptbuilder/src/test/java/org/jclouds/scriptbuilder/statements/ssh/InstallRSAPrivateKeyTest.java b/scriptbuilder/src/test/java/org/jclouds/scriptbuilder/statements/ssh/InstallRSAPrivateKeyTest.java
index ee15251..0e9d857 100644
--- a/scriptbuilder/src/test/java/org/jclouds/scriptbuilder/statements/ssh/InstallRSAPrivateKeyTest.java
+++ b/scriptbuilder/src/test/java/org/jclouds/scriptbuilder/statements/ssh/InstallRSAPrivateKeyTest.java
@@ -31,13 +31,13 @@ public class InstallRSAPrivateKeyTest {
assertEquals(
new InstallRSAPrivateKey("-----BEGIN RSA PRIVATE KEY-----\n-----END RSA PRIVATE KEY-----\n")
.render(OsFamily.UNIX),
- "mkdir -p ~/.ssh\n"+
- "rm ~/.ssh/id_rsa\n"+
- "cat >> ~/.ssh/id_rsa <<-'END_OF_JCLOUDS_FILE'\n"+
- "\t-----BEGIN RSA PRIVATE KEY-----\n"+
- "\t-----END RSA PRIVATE KEY-----\n"+
- "\t\n"+
- "END_OF_JCLOUDS_FILE\n"+
+ "mkdir -p ~/.ssh\n" +
+ "rm ~/.ssh/id_rsa\n" +
+ "cat >> ~/.ssh/id_rsa <<-'END_OF_JCLOUDS_FILE'\n" +
+ "\t-----BEGIN RSA PRIVATE KEY-----\n" +
+ "\t-----END RSA PRIVATE KEY-----\n" +
+ "\t\n" +
+ "END_OF_JCLOUDS_FILE\n" +
"chmod 600 ~/.ssh/id_rsa\n");
}
@@ -45,13 +45,13 @@ public class InstallRSAPrivateKeyTest {
assertEquals(
new InstallRSAPrivateKey("/home/me/.ssh", "-----BEGIN RSA PRIVATE KEY-----\n-----END RSA PRIVATE KEY-----\n")
.render(OsFamily.UNIX),
- "mkdir -p /home/me/.ssh\n"+
- "rm /home/me/.ssh/id_rsa\n"+
- "cat >> /home/me/.ssh/id_rsa <<-'END_OF_JCLOUDS_FILE'\n"+
- "\t-----BEGIN RSA PRIVATE KEY-----\n"+
- "\t-----END RSA PRIVATE KEY-----\n"+
- "\t\n"+
- "END_OF_JCLOUDS_FILE\n"+
+ "mkdir -p /home/me/.ssh\n" +
+ "rm /home/me/.ssh/id_rsa\n" +
+ "cat >> /home/me/.ssh/id_rsa <<-'END_OF_JCLOUDS_FILE'\n" +
+ "\t-----BEGIN RSA PRIVATE KEY-----\n" +
+ "\t-----END RSA PRIVATE KEY-----\n" +
+ "\t\n" +
+ "END_OF_JCLOUDS_FILE\n" +
"chmod 600 /home/me/.ssh/id_rsa\n"); }
@Test(expectedExceptions = UnsupportedOperationException.class)