JCLOUDS-1497: Fix checkstyle-suppressions for jcloud-labs (#27)
* Fix NoWhitespaceBefore Checkstyle Violation
* checkstyle updates: remove suppressionsfilter from checkstyle.xml
* suppressions now done in maven-checkstyle-plugin
diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/LimitApiTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/LimitApiTest.java
index ea432f0..f784e23 100644
--- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/LimitApiTest.java
+++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/LimitApiTest.java
@@ -54,7 +54,7 @@
public void testListResourceLimitsOptions() throws SecurityException, NoSuchMethodException, IOException {
Invokable<?, ?> method = method(LimitApi.class, "listResourceLimits", ListResourceLimitsOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(ListResourceLimitsOptions.Builder.account("jclouds" , "23")));
+ GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(ListResourceLimitsOptions.Builder.account("jclouds", "23")));
assertRequestLineEquals(httpRequest,
"GET http://localhost:8080/client/api?response=json&command=listResourceLimits&listAll=true&account=jclouds&domainid=23 HTTP/1.1");
diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SecurityGroupApiTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SecurityGroupApiTest.java
index c2ebe89..1051832 100644
--- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SecurityGroupApiTest.java
+++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SecurityGroupApiTest.java
@@ -209,7 +209,7 @@
.addQueryParam("cidrlist", "1.1.1.1/24,1.2.2.2/16").build();
public void testAuthorizeIngressICMPToCIDRs() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(SecurityGroupApi.class, "authorizeIngressICMPToCIDRs", String.class , int.class,
+ Invokable<?, ?> method = method(SecurityGroupApi.class, "authorizeIngressICMPToCIDRs", String.class, int.class,
int.class, Iterable.class, AccountInDomainOptions[].class);
GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(2, 22, 22, ImmutableSet.of("1.1.1.1/24", "1.2.2.2/16")));
diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/xml/RunInstancesResponseHandlerTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/xml/RunInstancesResponseHandlerTest.java
index ff818b0..bc293e2 100644
--- a/apis/ec2/src/test/java/org/jclouds/ec2/xml/RunInstancesResponseHandlerTest.java
+++ b/apis/ec2/src/test/java/org/jclouds/ec2/xml/RunInstancesResponseHandlerTest.java
@@ -72,9 +72,8 @@
.imageId("ami-60a54009").instanceId("i-2be64332").instanceState(InstanceState.PENDING).rawState(
"pending").instanceType(InstanceType.M1_SMALL).keyName("example-key-name").launchTime(
dateService.iso8601DateParse("2007-08-07T11:51:50.000Z"))// MonitoringState.ENABLED,
- .availabilityZone("us-east-1b").build())
-
- , "AIDADH4IGTRXXKCD", null, "r-47a5402e");
+ .availabilityZone("us-east-1b").build()),
+ "AIDADH4IGTRXXKCD", null, "r-47a5402e");
RunInstancesResponseHandler handler = injector.getInstance(RunInstancesResponseHandler.class);
addDefaultRegionToHandler(handler);
@@ -93,8 +92,8 @@
.imageId("qmi-9ac92558").instanceId("i-01b0dac3").instanceState(InstanceState.PENDING).rawState(
"pending").instanceType(InstanceType.M1_SMALL).keyName("jclouds#greenqloud-computeblock#35")
.launchTime(dateService.iso8601DateParse("2012-06-15T19:06:35.000+00:00"))
- .rootDeviceType(RootDeviceType.EBS).availabilityZone("is-1a").build())
- , "56eeacd9-c790-45c3-85f3-e4380b55e1d8<", null, "r-f847a6ca");
+ .rootDeviceType(RootDeviceType.EBS).availabilityZone("is-1a").build()),
+ "56eeacd9-c790-45c3-85f3-e4380b55e1d8<", null, "r-f847a6ca");
RunInstancesResponseHandler handler = injector.getInstance(RunInstancesResponseHandler.class);
addDefaultRegionToHandler(handler);
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/regionscoped/AvailabilityZone.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/regionscoped/AvailabilityZone.java
index b2b70f9..c06d663 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/regionscoped/AvailabilityZone.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/regionscoped/AvailabilityZone.java
@@ -31,7 +31,7 @@
private final String name;
private final ZoneState state;
- @ConstructorProperties({"zoneName" , "zoneState"})
+ @ConstructorProperties({"zoneName", "zoneState"})
protected AvailabilityZone(String name, ZoneState state) {
this.name = name;
this.state = state;
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/regionscoped/AvailabilityZoneDetails.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/regionscoped/AvailabilityZoneDetails.java
index f98c074..a155ed3 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/regionscoped/AvailabilityZoneDetails.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/regionscoped/AvailabilityZoneDetails.java
@@ -70,7 +70,7 @@
private final ZoneState state;
private final Map<String, Map<String, HostService>> hosts;
- @ConstructorProperties({"zoneName" , "zoneState", "hosts"})
+ @ConstructorProperties({"zoneName", "zoneState", "hosts"})
protected AvailabilityZoneDetails(String name, ZoneState state, Map<String, Map<String, HostService>> hosts) {
this.name = name;
this.state = state;
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/regionscoped/Hypervisor.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/regionscoped/Hypervisor.java
index c2712b3..81df0dc 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/regionscoped/Hypervisor.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/regionscoped/Hypervisor.java
@@ -31,7 +31,7 @@
@Nullable
public abstract String getName();
- @SerializedNames({"id" , "hypervisor_hostname"})
+ @SerializedNames({"id", "hypervisor_hostname"})
private static Hypervisor create(String id, String name) {
return new AutoValue_Hypervisor(id, name);
}
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/AvailabilityZone.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/AvailabilityZone.java
index cae07ea..3369f63 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/AvailabilityZone.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/AvailabilityZone.java
@@ -34,7 +34,7 @@
private final String name;
private final ZoneState state;
- @ConstructorProperties({"zoneName" , "zoneState"})
+ @ConstructorProperties({"zoneName", "zoneState"})
protected AvailabilityZone(String name, ZoneState state) {
this.name = name;
this.state = state;
diff --git a/apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/TempAuthMockTest.java b/apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/TempAuthMockTest.java
index 6b9a865..5e36a68 100644
--- a/apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/TempAuthMockTest.java
+++ b/apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/TempAuthMockTest.java
@@ -48,8 +48,8 @@
final String headerName = "X-Auth-User";
final String headerPass = "X-Auth-Pass";
Properties overrides = new Properties();
- overrides.setProperty(TempAuthHeaders.TEMP_AUTH_HEADER_USER , headerName);
- overrides.setProperty(TempAuthHeaders.TEMP_AUTH_HEADER_PASS , headerPass);
+ overrides.setProperty(TempAuthHeaders.TEMP_AUTH_HEADER_USER, headerName);
+ overrides.setProperty(TempAuthHeaders.TEMP_AUTH_HEADER_PASS, headerPass);
// with specific Header Name values
test(overrides, headerName, headerPass);
}
diff --git a/project/pom.xml b/project/pom.xml
index 8efc1c1..68a370d 100644
--- a/project/pom.xml
+++ b/project/pom.xml
@@ -785,7 +785,7 @@
</plugin>
<plugin>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.15</version>
+ <version>3.0.0</version>
<!-- configuration and dependencies set via profiles -->
<executions>
<execution>
@@ -1142,6 +1142,8 @@
<artifactId>maven-checkstyle-plugin</artifactId>
<configuration>
<configLocation>../resources/checkstyle.xml</configLocation>
+ <suppressionsLocation>../resources/checkstyle-suppressions.xml</suppressionsLocation>
+ <suppressionsFileExpression>checkstyle.suppressions.file</suppressionsFileExpression>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
<failOnViolation>true</failOnViolation>
<failsOnError>true</failsOnError>
@@ -1328,6 +1330,8 @@
<configuration>
<!-- jclouds-resources has the checkstyle config in the classpath -->
<configLocation>resources/checkstyle.xml</configLocation>
+ <suppressionsLocation>resources/checkstyle-suppressions.xml</suppressionsLocation>
+ <suppressionsFileExpression>checkstyle.suppressions.file</suppressionsFileExpression>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
<failOnViolation>true</failOnViolation>
<failsOnError>true</failsOnError>
diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/DeploymentTemplate.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/DeploymentTemplate.java
index 84e6061..f31bd17 100644
--- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/DeploymentTemplate.java
+++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/DeploymentTemplate.java
@@ -67,7 +67,7 @@
@Nullable
public abstract List<?> outputs();
- @SerializedNames({"$schema", "contentVersion", "parameters", "variables", "resources" , "outputs"})
+ @SerializedNames({"$schema", "contentVersion", "parameters", "variables", "resources", "outputs"})
public static DeploymentTemplate create(final String schema,
final String contentVersion,
final TemplateParameters parameters,
diff --git a/providers/rackspace-cloudblockstorage-uk/src/test/java/org/jclouds/rackspace/cloudblockstorage/uk/CloudBlockStorageUKProviderMetadataExpectTest.java b/providers/rackspace-cloudblockstorage-uk/src/test/java/org/jclouds/rackspace/cloudblockstorage/uk/CloudBlockStorageUKProviderMetadataExpectTest.java
index 840a960..b26cdd3 100644
--- a/providers/rackspace-cloudblockstorage-uk/src/test/java/org/jclouds/rackspace/cloudblockstorage/uk/CloudBlockStorageUKProviderMetadataExpectTest.java
+++ b/providers/rackspace-cloudblockstorage-uk/src/test/java/org/jclouds/rackspace/cloudblockstorage/uk/CloudBlockStorageUKProviderMetadataExpectTest.java
@@ -44,8 +44,8 @@
.endpoint("https://lon.identity.api.rackspacecloud.com/v2.0/tokens")
.addHeader("Accept", "application/json")
.payload(payloadFromStringWithContentType(
- "{\"auth\":{\"RAX-KSKEY:apiKeyCredentials\":{\"username\":\"myUsername\",\"apiKey\":\"myApiKey\"}}}"
- , "application/json")).build();
+ "{\"auth\":{\"RAX-KSKEY:apiKeyCredentials\":{\"username\":\"myUsername\",\"apiKey\":\"myApiKey\"}}}",
+ "application/json")).build();
HttpResponse authenticationResponse = HttpResponse.builder()
diff --git a/providers/rackspace-cloudblockstorage-us/src/test/java/org/jclouds/rackspace/cloudblockstorage/us/CloudBlockStorageUSProviderMetadataExpectTest.java b/providers/rackspace-cloudblockstorage-us/src/test/java/org/jclouds/rackspace/cloudblockstorage/us/CloudBlockStorageUSProviderMetadataExpectTest.java
index 0ffbdcb..01c7299 100644
--- a/providers/rackspace-cloudblockstorage-us/src/test/java/org/jclouds/rackspace/cloudblockstorage/us/CloudBlockStorageUSProviderMetadataExpectTest.java
+++ b/providers/rackspace-cloudblockstorage-us/src/test/java/org/jclouds/rackspace/cloudblockstorage/us/CloudBlockStorageUSProviderMetadataExpectTest.java
@@ -44,8 +44,8 @@
.endpoint("https://identity.api.rackspacecloud.com/v2.0/tokens")
.addHeader("Accept", "application/json")
.payload(payloadFromStringWithContentType(
- "{\"auth\":{\"RAX-KSKEY:apiKeyCredentials\":{\"username\":\"myUsername\",\"apiKey\":\"myApiKey\"}}}"
- , "application/json")).build();
+ "{\"auth\":{\"RAX-KSKEY:apiKeyCredentials\":{\"username\":\"myUsername\",\"apiKey\":\"myApiKey\"}}}",
+ "application/json")).build();
HttpResponse authenticationResponse = HttpResponse.builder()
diff --git a/providers/rackspace-clouddatabases-uk/src/test/java/org/jclouds/rackspace/clouddatabases/uk/CloudDatabasesUKProviderMetadataExpectTest.java b/providers/rackspace-clouddatabases-uk/src/test/java/org/jclouds/rackspace/clouddatabases/uk/CloudDatabasesUKProviderMetadataExpectTest.java
index 5cf11b8..e85a2fe 100644
--- a/providers/rackspace-clouddatabases-uk/src/test/java/org/jclouds/rackspace/clouddatabases/uk/CloudDatabasesUKProviderMetadataExpectTest.java
+++ b/providers/rackspace-clouddatabases-uk/src/test/java/org/jclouds/rackspace/clouddatabases/uk/CloudDatabasesUKProviderMetadataExpectTest.java
@@ -44,8 +44,8 @@
.endpoint("https://lon.identity.api.rackspacecloud.com/v2.0/tokens")
.addHeader("Accept", "application/json")
.payload(payloadFromStringWithContentType(
- "{\"auth\":{\"RAX-KSKEY:apiKeyCredentials\":{\"username\":\"myUsername\",\"apiKey\":\"myApiKey\"}}}"
- , "application/json")).build();
+ "{\"auth\":{\"RAX-KSKEY:apiKeyCredentials\":{\"username\":\"myUsername\",\"apiKey\":\"myApiKey\"}}}",
+ "application/json")).build();
HttpResponse authenticationResponse = HttpResponse.builder()
diff --git a/providers/rackspace-clouddatabases-us/src/test/java/org/jclouds/rackspace/clouddatabases/us/CloudDatabasesUSProviderMetadataExpectTest.java b/providers/rackspace-clouddatabases-us/src/test/java/org/jclouds/rackspace/clouddatabases/us/CloudDatabasesUSProviderMetadataExpectTest.java
index eeeccc7..ab2f5b6 100644
--- a/providers/rackspace-clouddatabases-us/src/test/java/org/jclouds/rackspace/clouddatabases/us/CloudDatabasesUSProviderMetadataExpectTest.java
+++ b/providers/rackspace-clouddatabases-us/src/test/java/org/jclouds/rackspace/clouddatabases/us/CloudDatabasesUSProviderMetadataExpectTest.java
@@ -44,8 +44,8 @@
.endpoint("https://identity.api.rackspacecloud.com/v2.0/tokens")
.addHeader("Accept", "application/json")
.payload(payloadFromStringWithContentType(
- "{\"auth\":{\"RAX-KSKEY:apiKeyCredentials\":{\"username\":\"myUsername\",\"apiKey\":\"myApiKey\"}}}"
- , "application/json")).build();
+ "{\"auth\":{\"RAX-KSKEY:apiKeyCredentials\":{\"username\":\"myUsername\",\"apiKey\":\"myApiKey\"}}}",
+ "application/json")).build();
HttpResponse authenticationResponse = HttpResponse.builder()
diff --git a/providers/rackspace-cloudservers-uk/src/test/java/org/jclouds/rackspace/cloudservers/uk/CloudServersUKProviderMetadataExpectTest.java b/providers/rackspace-cloudservers-uk/src/test/java/org/jclouds/rackspace/cloudservers/uk/CloudServersUKProviderMetadataExpectTest.java
index aaadc20..c72d493 100644
--- a/providers/rackspace-cloudservers-uk/src/test/java/org/jclouds/rackspace/cloudservers/uk/CloudServersUKProviderMetadataExpectTest.java
+++ b/providers/rackspace-cloudservers-uk/src/test/java/org/jclouds/rackspace/cloudservers/uk/CloudServersUKProviderMetadataExpectTest.java
@@ -44,8 +44,8 @@
.endpoint("https://lon.identity.api.rackspacecloud.com/v2.0/tokens")
.addHeader("Accept", "application/json")
.payload(payloadFromStringWithContentType(
- "{\"auth\":{\"RAX-KSKEY:apiKeyCredentials\":{\"username\":\"myUsername\",\"apiKey\":\"myApiKey\"}}}"
- , "application/json")).build();
+ "{\"auth\":{\"RAX-KSKEY:apiKeyCredentials\":{\"username\":\"myUsername\",\"apiKey\":\"myApiKey\"}}}",
+ "application/json")).build();
HttpResponse authenticationResponse = HttpResponse.builder().statusCode(200)
diff --git a/providers/rackspace-cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/us/CloudServersUSProviderMetadataExpectTest.java b/providers/rackspace-cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/us/CloudServersUSProviderMetadataExpectTest.java
index 5f49924..58f8533 100644
--- a/providers/rackspace-cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/us/CloudServersUSProviderMetadataExpectTest.java
+++ b/providers/rackspace-cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/us/CloudServersUSProviderMetadataExpectTest.java
@@ -44,8 +44,8 @@
.endpoint("https://identity.api.rackspacecloud.com/v2.0/tokens")
.addHeader("Accept", "application/json")
.payload(payloadFromStringWithContentType(
- "{\"auth\":{\"RAX-KSKEY:apiKeyCredentials\":{\"username\":\"myUsername\",\"apiKey\":\"myApiKey\"}}}"
- , "application/json")).build();
+ "{\"auth\":{\"RAX-KSKEY:apiKeyCredentials\":{\"username\":\"myUsername\",\"apiKey\":\"myApiKey\"}}}",
+ "application/json")).build();
HttpResponse authenticationResponse = HttpResponse.builder().statusCode(200)
diff --git a/resources/checkstyle.xml b/resources/checkstyle.xml
index c89b58b..395ba67 100644
--- a/resources/checkstyle.xml
+++ b/resources/checkstyle.xml
@@ -48,7 +48,7 @@
</module>
<module name="NoWhitespaceBefore"/>
<module name="RedundantImport"/>
- <module name="RedundantModifier"/>
+ <!-- <module name="RedundantModifier"/> -->
<module name="SimplifyBooleanExpression"/>
<module name="TypeName"/>
<module name="UnnecessaryParentheses"/>
@@ -97,8 +97,4 @@
<property name="message" value="Do not use Windows line endings"/>
<property name="fileExtensions" value="java,xml,json"/>
</module>
-
- <module name="SuppressionFilter">
- <property name="file" value="resources/checkstyle-suppressions.xml"/>
- </module>
</module>
diff --git a/resources/pom.xml b/resources/pom.xml
index 4449e7a..c7d3734 100644
--- a/resources/pom.xml
+++ b/resources/pom.xml
@@ -37,6 +37,7 @@
<directory>${project.basedir}</directory>
<includes>
<include>checkstyle.xml</include>
+ <include>checkstyle-suppressions.xml</include>
<include>modernizer_exclusions.txt</include>
</includes>
</resource>
