Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Enforce that all commas have trailing whitespace

This commit is contained in:
Andrew Gaul 2014-05-07 10:32:32 -07:00
parent aef9fc8d83
commit 2d88f5164e
94 changed files with 201 additions and 198 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apis/cloudstack/src/test/java/org/jclouds/cloudstack/PasswordAuthenticationExpectTest.java
View File

@ -60,8 +60,8 @@ public class PasswordAuthenticationExpectTest extends BaseCloudStackExpectTest<A
HttpResponse.builder() HttpResponse.builder()
.statusCode(200) .statusCode(200)
.payload(payloadFromResource("/listaccountsresponse.json")) .payload(payloadFromResource("/listaccountsresponse.json"))
.build() .build(),
,logout, logoutResponse); logout, logoutResponse);
assertNotNull(client.listAccounts()); assertNotNull(client.listAccounts());
} }

8
compute/src/main/java/org/jclouds/compute/domain/internal/TemplateBuilderImpl.java
View File

@ -495,13 +495,13 @@ public class TemplateBuilderImpl implements TemplateBuilder {
.compare(left.getName(), right.getName(), Ordering.<String> natural().nullsLast()) .compare(left.getName(), right.getName(), Ordering.<String> natural().nullsLast())
.compare(left.getVersion(), right.getVersion(), Ordering.<String> natural().nullsLast()) .compare(left.getVersion(), right.getVersion(), Ordering.<String> natural().nullsLast())
.compare(left.getDescription(), right.getDescription(), Ordering.<String> natural().nullsLast()) .compare(left.getDescription(), right.getDescription(), Ordering.<String> natural().nullsLast())
.compare(left.getOperatingSystem().getName(), right.getOperatingSystem().getName(),// .compare(left.getOperatingSystem().getName(), right.getOperatingSystem().getName(),
Ordering.<String> natural().nullsLast()) Ordering.<String> natural().nullsLast())
.compare(left.getOperatingSystem().getVersion(), right.getOperatingSystem().getVersion(),// .compare(left.getOperatingSystem().getVersion(), right.getOperatingSystem().getVersion(),
Ordering.<String> natural().nullsLast()) Ordering.<String> natural().nullsLast())
.compare(left.getOperatingSystem().getDescription(), right.getOperatingSystem().getDescription(),// .compare(left.getOperatingSystem().getDescription(), right.getOperatingSystem().getDescription(),
Ordering.<String> natural().nullsLast()) Ordering.<String> natural().nullsLast())
.compare(left.getOperatingSystem().getArch(), right.getOperatingSystem().getArch(),// .compare(left.getOperatingSystem().getArch(), right.getOperatingSystem().getArch(),
Ordering.<String> natural().nullsLast()).result(); Ordering.<String> natural().nullsLast()).result();
} }
}; };

10
core/src/test/java/org/jclouds/rest/internal/RestAnnotationProcessorTest.java
View File

@ -1119,7 +1119,7 @@ public class RestAnnotationProcessorTest extends BaseRestApiTest {
ImmutableList.<Object> of("foobledata"))); ImmutableList.<Object> of("foobledata")));
assertRequestLineEquals(httpRequest, "POST http://localhost:9999 HTTP/1.1"); assertRequestLineEquals(httpRequest, "POST http://localhost:9999 HTTP/1.1");
assertNonPayloadHeadersEqual(httpRequest, ""); assertNonPayloadHeadersEqual(httpRequest, "");
assertPayloadEquals(httpRequest,// assertPayloadEquals(httpRequest,
"----JCLOUDS--\r\n" + // "----JCLOUDS--\r\n" + //
"Content-Disposition: form-data; name=\"fooble\"\r\n" + // "Content-Disposition: form-data; name=\"fooble\"\r\n" + //
"\r\n" + // "\r\n" + //
@ -1140,7 +1140,7 @@ public class RestAnnotationProcessorTest extends BaseRestApiTest {
ImmutableList.<Object> of("name", "foobledata"))); ImmutableList.<Object> of("name", "foobledata")));
assertRequestLineEquals(httpRequest, "POST http://localhost:9999 HTTP/1.1"); assertRequestLineEquals(httpRequest, "POST http://localhost:9999 HTTP/1.1");
assertNonPayloadHeadersEqual(httpRequest, ""); assertNonPayloadHeadersEqual(httpRequest, "");
assertPayloadEquals(httpRequest,// assertPayloadEquals(httpRequest,
"----JCLOUDS--\r\n" + // "----JCLOUDS--\r\n" + //
"Content-Disposition: form-data; name=\"name\"\r\n" + // "Content-Disposition: form-data; name=\"name\"\r\n" + //
"\r\n" + // "\r\n" + //
@ -1170,7 +1170,7 @@ public class RestAnnotationProcessorTest extends BaseRestApiTest {
ImmutableList.<Object> of("name", file))); ImmutableList.<Object> of("name", file)));
assertRequestLineEquals(httpRequest, "POST http://localhost:9999 HTTP/1.1"); assertRequestLineEquals(httpRequest, "POST http://localhost:9999 HTTP/1.1");
assertNonPayloadHeadersEqual(httpRequest, ""); assertNonPayloadHeadersEqual(httpRequest, "");
assertPayloadEquals(httpRequest,// assertPayloadEquals(httpRequest,
"----JCLOUDS--\r\n" + // "----JCLOUDS--\r\n" + //
"Content-Disposition: form-data; name=\"name\"\r\n" + // "Content-Disposition: form-data; name=\"name\"\r\n" + //
"\r\n" + // "\r\n" + //
@ -1189,7 +1189,7 @@ public class RestAnnotationProcessorTest extends BaseRestApiTest {
ImmutableList.<Object> of("name", "goo".getBytes()))); ImmutableList.<Object> of("name", "goo".getBytes())));
assertRequestLineEquals(httpRequest, "POST http://localhost:9999 HTTP/1.1"); assertRequestLineEquals(httpRequest, "POST http://localhost:9999 HTTP/1.1");
assertNonPayloadHeadersEqual(httpRequest, ""); assertNonPayloadHeadersEqual(httpRequest, "");
assertPayloadEquals(httpRequest,// assertPayloadEquals(httpRequest,
"----JCLOUDS--\r\n" + // "----JCLOUDS--\r\n" + //
"Content-Disposition: form-data; name=\"name\"\r\n" + // "Content-Disposition: form-data; name=\"name\"\r\n" + //
"\r\n" + // "\r\n" + //
@ -1213,7 +1213,7 @@ public class RestAnnotationProcessorTest extends BaseRestApiTest {
ImmutableList.<Object> of("name", file))); ImmutableList.<Object> of("name", file)));
assertRequestLineEquals(httpRequest, "POST http://localhost:9999 HTTP/1.1"); assertRequestLineEquals(httpRequest, "POST http://localhost:9999 HTTP/1.1");
assertNonPayloadHeadersEqual(httpRequest, ""); assertNonPayloadHeadersEqual(httpRequest, "");
assertPayloadEquals(httpRequest,// assertPayloadEquals(httpRequest,
"----JCLOUDS--\r\n" + // "----JCLOUDS--\r\n" + //
"Content-Disposition: form-data; name=\"name\"\r\n" + // "Content-Disposition: form-data; name=\"name\"\r\n" + //
"\r\n" + // "\r\n" + //

2
providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/functions/AWSRunningInstanceToNodeMetadataTest.java
View File

@ -106,7 +106,7 @@ public class AWSRunningInstanceToNodeMetadataTest {
.tag("Name", "foo") .tag("Name", "foo")
.tag("Empty", "") .tag("Empty", "")
.hypervisor(Hypervisor.XEN) .hypervisor(Hypervisor.XEN)
.build(),// .build(),
new AWSRunningInstance.Builder() new AWSRunningInstance.Builder()
.region(defaultRegion) .region(defaultRegion)
.instanceId("i-931444f2") .instanceId("i-931444f2")

3
resources/checkstyle.xml
View File

@ -43,6 +43,9 @@
<module name="SimplifyBooleanExpression"/> <module name="SimplifyBooleanExpression"/>
<module name="UnnecessaryParentheses"/> <module name="UnnecessaryParentheses"/>
<module name="UnusedImports"/> <module name="UnusedImports"/>
<module name="WhitespaceAfter">
<property name="tokens" value="COMMA"/>
</module>
</module> </module>
<module name="RegexpMultiline"> <module name="RegexpMultiline">
<property name="format" value="=\s*new ArrayList&lt;[^&gt;]"/> <property name="format" value="=\s*new ArrayList&lt;[^&gt;]"/>