From 92a3c68838edc47f8864e4fe539fdb25e71a3cd4 Mon Sep 17 00:00:00 2001 From: Olaf Flebbe Date: Tue, 7 May 2019 11:49:54 +0200 Subject: [PATCH] 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 --- .../org/jclouds/cloudstack/features/LimitApiTest.java | 2 +- .../cloudstack/features/SecurityGroupApiTest.java | 2 +- .../jclouds/ec2/xml/RunInstancesResponseHandlerTest.java | 9 ++++----- .../nova/v2_0/domain/regionscoped/AvailabilityZone.java | 2 +- .../domain/regionscoped/AvailabilityZoneDetails.java | 2 +- .../nova/v2_0/domain/regionscoped/Hypervisor.java | 2 +- .../nova/v2_0/domain/zonescoped/AvailabilityZone.java | 2 +- .../org/jclouds/openstack/swift/v1/TempAuthMockTest.java | 4 ++-- project/pom.xml | 6 +++++- .../azurecompute/arm/domain/DeploymentTemplate.java | 2 +- .../CloudBlockStorageUKProviderMetadataExpectTest.java | 4 ++-- .../CloudBlockStorageUSProviderMetadataExpectTest.java | 4 ++-- .../uk/CloudDatabasesUKProviderMetadataExpectTest.java | 4 ++-- .../us/CloudDatabasesUSProviderMetadataExpectTest.java | 4 ++-- .../uk/CloudServersUKProviderMetadataExpectTest.java | 4 ++-- .../us/CloudServersUSProviderMetadataExpectTest.java | 4 ++-- resources/checkstyle.xml | 6 +----- resources/pom.xml | 1 + 18 files changed, 32 insertions(+), 32 deletions(-) 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 ea432f094b..f784e23bc1 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 class LimitApiTest extends BaseCloudStackApiTest { public void testListResourceLimitsOptions() throws SecurityException, NoSuchMethodException, IOException { Invokable method = method(LimitApi.class, "listResourceLimits", ListResourceLimitsOptions[].class); - GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList. of(ListResourceLimitsOptions.Builder.account("jclouds" , "23"))); + GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList. 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 c2ebe8957a..10518320ea 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 @@ public class SecurityGroupApiTest extends BaseCloudStackApiTest 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. 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 ff818b0607..bc293e2348 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 @@ public class RunInstancesResponseHandlerTest extends BaseEC2HandlerTest { .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 @@ public class RunInstancesResponseHandlerTest extends BaseEC2HandlerTest { .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 b2b70f97c0..c06d6638f3 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 @@ public class AvailabilityZone { 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 f98c074b49..a155ed3c88 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 @@ public class AvailabilityZoneDetails { private final ZoneState state; private final Map> hosts; - @ConstructorProperties({"zoneName" , "zoneState", "hosts"}) + @ConstructorProperties({"zoneName", "zoneState", "hosts"}) protected AvailabilityZoneDetails(String name, ZoneState state, Map> 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 c2712b35e3..81df0dc75c 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 @@ public abstract class Hypervisor { @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 cae07eac2f..3369f63c50 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 @@ public class AvailabilityZone { 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 6b9a865e4f..5e36a6833d 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 @@ public class TempAuthMockTest { 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 8efc1c1965..68a370d6fb 100644 --- a/project/pom.xml +++ b/project/pom.xml @@ -785,7 +785,7 @@ maven-checkstyle-plugin - 2.15 + 3.0.0 @@ -1142,6 +1142,8 @@ maven-checkstyle-plugin ../resources/checkstyle.xml + ../resources/checkstyle-suppressions.xml + checkstyle.suppressions.file true true true @@ -1328,6 +1330,8 @@ resources/checkstyle.xml + resources/checkstyle-suppressions.xml + checkstyle.suppressions.file true true true 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 84e6061ef7..f31bd174e5 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 @@ public abstract class DeploymentTemplate { @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 840a960a19..b26cdd3b96 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 @@ public class CloudBlockStorageUKProviderMetadataExpectTest extends BaseCinderApi .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 0ffbdcbfd0..01c7299b87 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 @@ public class CloudBlockStorageUSProviderMetadataExpectTest extends BaseCinderApi .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 5cf11b8cb3..e85a2feee6 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 @@ public class CloudDatabasesUKProviderMetadataExpectTest extends BaseTroveApiExpe .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 eeeccc7d7f..ab2f5b68e4 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 @@ public class CloudDatabasesUSProviderMetadataExpectTest extends BaseTroveApiExpe .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 aaadc20450..c72d493fde 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 @@ public class CloudServersUKProviderMetadataExpectTest extends BaseNovaApiExpectT .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 5f49924291..58f85338f3 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 @@ public class CloudServersUSProviderMetadataExpectTest extends BaseNovaApiExpectT .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 c89b58bf59..395ba67fac 100644 --- a/resources/checkstyle.xml +++ b/resources/checkstyle.xml @@ -48,7 +48,7 @@ - + @@ -97,8 +97,4 @@ - - - - diff --git a/resources/pom.xml b/resources/pom.xml index 4449e7a85b..c7d3734b6f 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -37,6 +37,7 @@ ${project.basedir} checkstyle.xml + checkstyle-suppressions.xml modernizer_exclusions.txt