From 17ce72794ca3197b19c783d9b616a94843254fa6 Mon Sep 17 00:00:00 2001 From: Andrew Gaul Date: Wed, 30 Oct 2013 13:07:46 -0700 Subject: [PATCH] Enable RedundantModifier for Checkstyle --- .../atmos/domain/MutableContentMetadata.java | 12 ++++++------ .../StaticNATVirtualMachineInNetwork.java | 2 +- .../main/java/org/jclouds/ec2/domain/Subnet.java | 2 +- .../main/java/org/jclouds/ec2/domain/Tag.java | 2 +- ...cationIdToURIFromAccessForTypeAndVersion.java | 2 +- .../suppliers/RegionIdToAdminURISupplier.java | 2 +- .../v2_0/config/ProviderModuleExpectTest.java | 2 +- ...aceEqualsAnyNamespaceInExtensionsSetTest.java | 6 +++--- .../v1/functions/ConvertLB.java | 2 +- .../main/java/org/jclouds/s3/S3AsyncClient.java | 4 ++-- .../src/main/java/org/jclouds/s3/S3Client.java | 2 +- .../org/jclouds/s3/domain/AccessControlList.java | 2 +- .../sqs/features/PermissionApiLiveTest.java | 4 ++-- .../URIFromAuthenticationResponseForService.java | 2 +- .../suppliers/V1DefaultRegionIdSupplier.java | 2 +- ...ilInitScriptStatusIsZeroThenReturnOutput.java | 2 +- .../config/BaseComputeServiceContextModule.java | 2 +- .../compute/domain/CloneImageTemplate.java | 2 +- .../jclouds/compute/domain/ComputeMetadata.java | 10 +++++----- .../domain/ComputeMetadataIncludingStatus.java | 4 ++-- .../jclouds/compute/domain/ImageTemplate.java | 2 +- .../jclouds/compute/domain/TemplateBuilder.java | 2 +- .../compute/domain/TemplateBuilderSpec.java | 2 +- .../compute/functions/GroupNamingConvention.java | 2 +- .../jclouds/compute/functions/Sha512Crypt.java | 2 +- ...eAndAddToGoodMapOrPutExceptionIntoBadMap.java | 2 +- .../main/java/org/jclouds/apis/ApiMetadata.java | 2 +- .../main/java/org/jclouds/date/DateCodec.java | 4 ++-- .../org/jclouds/http/functions/ParseSax.java | 2 +- .../org/jclouds/io/ContentMetadataCodec.java | 6 +++--- .../java/org/jclouds/json/config/GsonModule.java | 2 +- .../suppliers/RegionIdToURISupplier.java | 2 +- .../location/suppliers/ZoneIdToURISupplier.java | 2 +- .../main/java/org/jclouds/logging/Logger.java | 2 +- .../org/jclouds/providers/ProviderMetadata.java | 10 +++++----- .../java/org/jclouds/rest/HttpApiMetadata.java | 2 +- .../java/org/jclouds/rest/RestApiMetadata.java | 2 +- .../binders/BindToJsonPayloadWrappedWith.java | 2 +- .../src/main/java/org/jclouds/xml/XMLParser.java | 8 ++++---- .../jclouds/rest/InputParamValidatorTest.java | 4 ++-- .../rest/annotationparsing/ClosableApiTest.java | 4 ++-- .../DelegateAnnotationExpectTest.java | 8 ++++---- .../ProvidesAnnotationExpectTest.java | 4 ++-- .../rest/binders/BindMapToStringPayloadTest.java | 2 +- .../config/MappedHttpInvocationModuleTest.java | 8 ++++---- .../config/ReadAnnotationsAndPropertiesTest.java | 4 ++-- ...ographicallyAtOrAfterSinceApiVersionTest.java | 8 ++++---- .../rest/internal/InvokeHttpMethodTest.java | 2 +- .../internal/InvokeMappedHttpMethodTest.java | 4 ++-- .../internal/RestAnnotationProcessorTest.java | 16 ++++++++-------- .../java/org/jclouds/util/Optionals2Test.java | 2 +- .../java/org/jclouds/ssh/jsch/JschSshClient.java | 4 ++-- .../java/org/jclouds/sshj/SshjSshClient.java | 2 +- .../jclouds/azureblob/AzureBlobAsyncClient.java | 2 +- .../org/jclouds/azureblob/AzureBlobClient.java | 2 +- resources/checkstyle.xml | 4 ++++ .../functionloader/FunctionLoader.java | 2 +- .../statements/login/AdminAccess.java | 2 +- .../statements/login/AdminAccessBuilderSpec.java | 2 +- 59 files changed, 108 insertions(+), 104 deletions(-) diff --git a/apis/atmos/src/main/java/org/jclouds/atmos/domain/MutableContentMetadata.java b/apis/atmos/src/main/java/org/jclouds/atmos/domain/MutableContentMetadata.java index de02cbdd27..13c255b4ca 100644 --- a/apis/atmos/src/main/java/org/jclouds/atmos/domain/MutableContentMetadata.java +++ b/apis/atmos/src/main/java/org/jclouds/atmos/domain/MutableContentMetadata.java @@ -30,15 +30,15 @@ import com.google.inject.ImplementedBy; @ImplementedBy(DelegatingMutableContentMetadata.class) public interface MutableContentMetadata extends org.jclouds.io.MutableContentMetadata { - public String getName(); + String getName(); - public void setName(String name); + void setName(String name); - public URI getUri(); + URI getUri(); - public void setUri(URI uri); + void setUri(URI uri); - public String getPath(); + String getPath(); - public void setPath(String path); + void setPath(String path); } diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/StaticNATVirtualMachineInNetwork.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/StaticNATVirtualMachineInNetwork.java index 6a7761342e..534ff4b735 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/StaticNATVirtualMachineInNetwork.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/StaticNATVirtualMachineInNetwork.java @@ -39,7 +39,7 @@ import com.google.inject.assistedinject.Assisted; */ @Singleton public class StaticNATVirtualMachineInNetwork implements Function { - public static interface Factory { + public interface Factory { StaticNATVirtualMachineInNetwork create(Network in); } diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/domain/Subnet.java b/apis/ec2/src/main/java/org/jclouds/ec2/domain/Subnet.java index 3c0a7083c1..5e14ad8f26 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/domain/Subnet.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/domain/Subnet.java @@ -145,7 +145,7 @@ public final class Subnet { return string().toString(); } - private final ToStringHelper string() { + private ToStringHelper string() { return Objects.toStringHelper(this).omitNullValues().add("subnetId", subnetId).add("subnetState", subnetState) .add("vpcId", vpcId).add("cidrBlock", cidrBlock).add("availableIpAddressCount", availableIpAddressCount) .add("availabilityZone", availabilityZone).add("tags", tags); diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/domain/Tag.java b/apis/ec2/src/main/java/org/jclouds/ec2/domain/Tag.java index 4de216785c..e64048807a 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/domain/Tag.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/domain/Tag.java @@ -38,7 +38,7 @@ public class Tag { /** * Describes the well-known resource types that can be tagged. */ - public static interface ResourceType { + public interface ResourceType { public static final String CUSTOMER_GATEWAY = "customer-gateway"; public static final String DHCP_OPTIONS = "dhcp-options"; public static final String IMAGE = "image"; diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/suppliers/LocationIdToURIFromAccessForTypeAndVersion.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/suppliers/LocationIdToURIFromAccessForTypeAndVersion.java index 1467b9d6d8..cab564ac74 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/suppliers/LocationIdToURIFromAccessForTypeAndVersion.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/suppliers/LocationIdToURIFromAccessForTypeAndVersion.java @@ -54,7 +54,7 @@ import com.google.inject.assistedinject.Assisted; @Singleton public class LocationIdToURIFromAccessForTypeAndVersion implements Supplier>> { - public static interface Factory { + public interface Factory { /** * * @param apiType diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/suppliers/RegionIdToAdminURISupplier.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/suppliers/RegionIdToAdminURISupplier.java index 5cd8c7cc18..54382ad4b4 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/suppliers/RegionIdToAdminURISupplier.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/suppliers/RegionIdToAdminURISupplier.java @@ -31,7 +31,7 @@ import com.google.inject.assistedinject.Assisted; */ @ImplementedBy(RegionIdToAdminURIFromAccessForTypeAndVersion.class) public interface RegionIdToAdminURISupplier extends Supplier>> { - static interface Factory { + interface Factory { /** * * @param apiType diff --git a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/config/ProviderModuleExpectTest.java b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/config/ProviderModuleExpectTest.java index ac92ffa44c..63a278e731 100644 --- a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/config/ProviderModuleExpectTest.java +++ b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/config/ProviderModuleExpectTest.java @@ -91,7 +91,7 @@ public class ProviderModuleExpectTest extends BaseRestApiExpectTest getFloatingIPExtensionForZone(String zone); diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ConvertLB.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ConvertLB.java index f0a13391c1..10f769c19c 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ConvertLB.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ConvertLB.java @@ -39,7 +39,7 @@ import com.google.inject.assistedinject.Assisted; public class ConvertLB implements Function { private static final String LOAD_BALANCERS = "loadbalancers"; - public static interface Factory { + public interface Factory { ConvertLB createForEndpointAndRegion(URI endpoint, String region); } diff --git a/apis/s3/src/main/java/org/jclouds/s3/S3AsyncClient.java b/apis/s3/src/main/java/org/jclouds/s3/S3AsyncClient.java index 802358c87f..08b6e4f153 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/S3AsyncClient.java +++ b/apis/s3/src/main/java/org/jclouds/s3/S3AsyncClient.java @@ -112,13 +112,13 @@ import com.google.inject.Provides; @RequestFilters(RequestAuthorizeSignature.class) @BlobScope(CONTAINER) public interface S3AsyncClient extends Closeable { - public static final String VERSION = "2006-03-01"; + static final String VERSION = "2006-03-01"; /** * Creates a default implementation of S3Object */ @Provides - public S3Object newS3Object(); + S3Object newS3Object(); /** * @see S3Client#getObject diff --git a/apis/s3/src/main/java/org/jclouds/s3/S3Client.java b/apis/s3/src/main/java/org/jclouds/s3/S3Client.java index 5aaef2299c..c670281699 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/S3Client.java +++ b/apis/s3/src/main/java/org/jclouds/s3/S3Client.java @@ -54,7 +54,7 @@ public interface S3Client extends Closeable { * Creates a default implementation of S3Object */ @Provides - public S3Object newS3Object(); + S3Object newS3Object(); /** * Retrieves the S3Object associated with the Key or KeyNotFoundException if not available; diff --git a/apis/s3/src/main/java/org/jclouds/s3/domain/AccessControlList.java b/apis/s3/src/main/java/org/jclouds/s3/domain/AccessControlList.java index 15520df2ec..0b0050237a 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/domain/AccessControlList.java +++ b/apis/s3/src/main/java/org/jclouds/s3/domain/AccessControlList.java @@ -248,7 +248,7 @@ public class AccessControlList { // Class and Enum declarations to represent Grants, Grantees and Permissions // // ///////////////////////////////////////////////////////////////////////////// - public static interface Permission { + public interface Permission { public static final String READ = "READ"; public static final String WRITE = "WRITE"; public static final String READ_ACP = "READ_ACP"; diff --git a/apis/sqs/src/test/java/org/jclouds/sqs/features/PermissionApiLiveTest.java b/apis/sqs/src/test/java/org/jclouds/sqs/features/PermissionApiLiveTest.java index cb00a0d3f7..ec297012f0 100644 --- a/apis/sqs/src/test/java/org/jclouds/sqs/features/PermissionApiLiveTest.java +++ b/apis/sqs/src/test/java/org/jclouds/sqs/features/PermissionApiLiveTest.java @@ -61,11 +61,11 @@ public class PermissionApiLiveTest extends BaseSQSApiLiveTest { recreateQueueInRegion(prefix, null); } - static interface AnonymousAttributesApi extends Closeable { + interface AnonymousAttributesApi extends Closeable { String getQueueArn(); } - static interface AnonymousAttributesAsyncApi extends Closeable { + interface AnonymousAttributesAsyncApi extends Closeable { @POST @Path("/") @FormParams(keys = { ACTION, "AttributeName.1" }, values = { "GetQueueAttributes", "QueueArn" }) diff --git a/common/openstack/src/main/java/org/jclouds/openstack/functions/URIFromAuthenticationResponseForService.java b/common/openstack/src/main/java/org/jclouds/openstack/functions/URIFromAuthenticationResponseForService.java index cd052070f1..1ab2cf02bd 100644 --- a/common/openstack/src/main/java/org/jclouds/openstack/functions/URIFromAuthenticationResponseForService.java +++ b/common/openstack/src/main/java/org/jclouds/openstack/functions/URIFromAuthenticationResponseForService.java @@ -28,7 +28,7 @@ import com.google.inject.assistedinject.Assisted; @Singleton public class URIFromAuthenticationResponseForService implements Supplier { - public static interface Factory { + public interface Factory { URIFromAuthenticationResponseForService create(String service); } diff --git a/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/suppliers/V1DefaultRegionIdSupplier.java b/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/suppliers/V1DefaultRegionIdSupplier.java index 0e9a519372..a9e8b778ac 100644 --- a/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/suppliers/V1DefaultRegionIdSupplier.java +++ b/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/suppliers/V1DefaultRegionIdSupplier.java @@ -37,7 +37,7 @@ import com.google.inject.assistedinject.Assisted; @Singleton public class V1DefaultRegionIdSupplier implements ImplicitRegionIdSupplier { - public static interface Factory { + public interface Factory { /** * * @param apiType diff --git a/compute/src/main/java/org/jclouds/compute/callables/BlockUntilInitScriptStatusIsZeroThenReturnOutput.java b/compute/src/main/java/org/jclouds/compute/callables/BlockUntilInitScriptStatusIsZeroThenReturnOutput.java index 8f767ad4a2..588d68fa1c 100644 --- a/compute/src/main/java/org/jclouds/compute/callables/BlockUntilInitScriptStatusIsZeroThenReturnOutput.java +++ b/compute/src/main/java/org/jclouds/compute/callables/BlockUntilInitScriptStatusIsZeroThenReturnOutput.java @@ -54,7 +54,7 @@ import com.google.inject.name.Named; */ public class BlockUntilInitScriptStatusIsZeroThenReturnOutput extends AbstractFuture implements Runnable { - public static interface Factory { + public interface Factory { BlockUntilInitScriptStatusIsZeroThenReturnOutput create(SudoAwareInitManager commandRunner); } diff --git a/compute/src/main/java/org/jclouds/compute/config/BaseComputeServiceContextModule.java b/compute/src/main/java/org/jclouds/compute/config/BaseComputeServiceContextModule.java index 8cac5dcd53..a6da2be889 100644 --- a/compute/src/main/java/org/jclouds/compute/config/BaseComputeServiceContextModule.java +++ b/compute/src/main/java/org/jclouds/compute/config/BaseComputeServiceContextModule.java @@ -125,7 +125,7 @@ public abstract class BaseComputeServiceContextModule extends AbstractModule { @Singleton public static class RunScriptOnNodeFactoryImpl implements RunScriptOnNode.Factory { - static interface Factory { + interface Factory { @Named("direct") RunScriptOnNodeUsingSsh exec(NodeMetadata node, Statement script, RunScriptOptions options); diff --git a/compute/src/main/java/org/jclouds/compute/domain/CloneImageTemplate.java b/compute/src/main/java/org/jclouds/compute/domain/CloneImageTemplate.java index 12d195048d..9551cf23a4 100644 --- a/compute/src/main/java/org/jclouds/compute/domain/CloneImageTemplate.java +++ b/compute/src/main/java/org/jclouds/compute/domain/CloneImageTemplate.java @@ -23,6 +23,6 @@ package org.jclouds.compute.domain; */ public interface CloneImageTemplate extends ImageTemplate { - public String getSourceNodeId(); + String getSourceNodeId(); } diff --git a/compute/src/main/java/org/jclouds/compute/domain/ComputeMetadata.java b/compute/src/main/java/org/jclouds/compute/domain/ComputeMetadata.java index 048ad6217e..af19da8a2e 100644 --- a/compute/src/main/java/org/jclouds/compute/domain/ComputeMetadata.java +++ b/compute/src/main/java/org/jclouds/compute/domain/ComputeMetadata.java @@ -34,21 +34,21 @@ public interface ComputeMetadata extends ResourceMetadata { * @return Type of the resource, ex node, image, size */ @Override - public ComputeType getType(); + ComputeType getType(); /** * @return id of the server within the naming scope it was created. potentially generated by the * service. */ @Override - public String getProviderId(); + String getProviderId(); /** * @return user defined name of the server. */ @Override @Nullable - public String getName(); + String getName(); /** * @@ -58,10 +58,10 @@ public interface ComputeMetadata extends ResourceMetadata { * * @return unique id within your account on the provider */ - public String getId(); + String getId(); /** * @return tags describing this resource, if supported */ - public Set getTags(); + Set getTags(); } diff --git a/compute/src/main/java/org/jclouds/compute/domain/ComputeMetadataIncludingStatus.java b/compute/src/main/java/org/jclouds/compute/domain/ComputeMetadataIncludingStatus.java index 4bd9223c74..ca90c8585d 100644 --- a/compute/src/main/java/org/jclouds/compute/domain/ComputeMetadataIncludingStatus.java +++ b/compute/src/main/java/org/jclouds/compute/domain/ComputeMetadataIncludingStatus.java @@ -28,7 +28,7 @@ public interface ComputeMetadataIncludingStatus> extends Compu * * @since 1.5 */ - public S getStatus(); + S getStatus(); /** * status of the resource, as supplied literally from the backend api. @@ -37,5 +37,5 @@ public interface ComputeMetadataIncludingStatus> extends Compu * @since 1.5 */ @Nullable - public String getBackendStatus(); + String getBackendStatus(); } diff --git a/compute/src/main/java/org/jclouds/compute/domain/ImageTemplate.java b/compute/src/main/java/org/jclouds/compute/domain/ImageTemplate.java index 5f61bb7bba..5b44992499 100644 --- a/compute/src/main/java/org/jclouds/compute/domain/ImageTemplate.java +++ b/compute/src/main/java/org/jclouds/compute/domain/ImageTemplate.java @@ -27,6 +27,6 @@ public interface ImageTemplate { /** * @return the name of the new image */ - public String getName(); + String getName(); } diff --git a/compute/src/main/java/org/jclouds/compute/domain/TemplateBuilder.java b/compute/src/main/java/org/jclouds/compute/domain/TemplateBuilder.java index b60c136b3a..b3ddcadafa 100644 --- a/compute/src/main/java/org/jclouds/compute/domain/TemplateBuilder.java +++ b/compute/src/main/java/org/jclouds/compute/domain/TemplateBuilder.java @@ -177,7 +177,7 @@ public interface TemplateBuilder { * If no function is supplied, jclouds will select one according to an internal strategy. * This strategy may change from version to version. */ - public TemplateBuilderImpl imageChooser(Function,Image> imageChooser); + TemplateBuilderImpl imageChooser(Function,Image> imageChooser); /** * Configure this template to require the minimum cores below diff --git a/compute/src/main/java/org/jclouds/compute/domain/TemplateBuilderSpec.java b/compute/src/main/java/org/jclouds/compute/domain/TemplateBuilderSpec.java index adee909389..3897da26d3 100644 --- a/compute/src/main/java/org/jclouds/compute/domain/TemplateBuilderSpec.java +++ b/compute/src/main/java/org/jclouds/compute/domain/TemplateBuilderSpec.java @@ -119,7 +119,7 @@ import com.google.common.collect.ImmutableMap; public class TemplateBuilderSpec { /** Parses a single value. */ - protected static interface ValueParser { + protected interface ValueParser { void parse(TemplateBuilderSpec spec, String key, @Nullable String value); } diff --git a/compute/src/main/java/org/jclouds/compute/functions/GroupNamingConvention.java b/compute/src/main/java/org/jclouds/compute/functions/GroupNamingConvention.java index 21f47edbca..a64b9247c1 100644 --- a/compute/src/main/java/org/jclouds/compute/functions/GroupNamingConvention.java +++ b/compute/src/main/java/org/jclouds/compute/functions/GroupNamingConvention.java @@ -108,7 +108,7 @@ import com.google.inject.ImplementedBy; public interface GroupNamingConvention { @ImplementedBy(FormatSharedNamesAndAppendUniqueStringToThoseWhichRepeat.Factory.class) - public static interface Factory { + public interface Factory { GroupNamingConvention create(); diff --git a/compute/src/main/java/org/jclouds/compute/functions/Sha512Crypt.java b/compute/src/main/java/org/jclouds/compute/functions/Sha512Crypt.java index e21b823c1b..7901fbca4d 100644 --- a/compute/src/main/java/org/jclouds/compute/functions/Sha512Crypt.java +++ b/compute/src/main/java/org/jclouds/compute/functions/Sha512Crypt.java @@ -327,7 +327,7 @@ public class Sha512Crypt { } } - private static final String b64_from_24bit(byte B2, byte B1, byte B0, int size) { + private static String b64_from_24bit(byte B2, byte B1, byte B0, int size) { int v = ((((int) B2) & 0xFF) << 16) | ((((int) B1) & 0xFF) << 8) | ((int) B0 & 0xff); StringBuilder result = new StringBuilder(); diff --git a/compute/src/main/java/org/jclouds/compute/strategy/CustomizeNodeAndAddToGoodMapOrPutExceptionIntoBadMap.java b/compute/src/main/java/org/jclouds/compute/strategy/CustomizeNodeAndAddToGoodMapOrPutExceptionIntoBadMap.java index 845685e280..5e7e3fab6f 100644 --- a/compute/src/main/java/org/jclouds/compute/strategy/CustomizeNodeAndAddToGoodMapOrPutExceptionIntoBadMap.java +++ b/compute/src/main/java/org/jclouds/compute/strategy/CustomizeNodeAndAddToGoodMapOrPutExceptionIntoBadMap.java @@ -53,7 +53,7 @@ import com.google.inject.assistedinject.AssistedInject; public class CustomizeNodeAndAddToGoodMapOrPutExceptionIntoBadMap implements Callable, Function, Void> { - public static interface Factory { + public interface Factory { Callable create(TemplateOptions options, AtomicReference node, Set goodNodes, Map badNodes, Multimap customizationResponses); diff --git a/core/src/main/java/org/jclouds/apis/ApiMetadata.java b/core/src/main/java/org/jclouds/apis/ApiMetadata.java index d309a2b4e5..05db9a11a5 100644 --- a/core/src/main/java/org/jclouds/apis/ApiMetadata.java +++ b/core/src/main/java/org/jclouds/apis/ApiMetadata.java @@ -39,7 +39,7 @@ import com.google.inject.Module; @Beta public interface ApiMetadata { - public static interface Builder> { + public interface Builder> { /** * @see ApiMetadata#getId() */ diff --git a/core/src/main/java/org/jclouds/date/DateCodec.java b/core/src/main/java/org/jclouds/date/DateCodec.java index 395e6149c1..3a93736b8b 100644 --- a/core/src/main/java/org/jclouds/date/DateCodec.java +++ b/core/src/main/java/org/jclouds/date/DateCodec.java @@ -33,8 +33,8 @@ public interface DateCodec { * @throws IllegalArgumentException * if the input is invalid */ - public Date toDate(String date) throws IllegalArgumentException; + Date toDate(String date) throws IllegalArgumentException; - public String toString(Date date); + String toString(Date date); } diff --git a/core/src/main/java/org/jclouds/http/functions/ParseSax.java b/core/src/main/java/org/jclouds/http/functions/ParseSax.java index a228f99698..f8808722ec 100644 --- a/core/src/main/java/org/jclouds/http/functions/ParseSax.java +++ b/core/src/main/java/org/jclouds/http/functions/ParseSax.java @@ -58,7 +58,7 @@ public class ParseSax implements Function, InvocationContext private final HandlerWithResult handler; private HttpRequest request; - public static interface Factory { + public interface Factory { ParseSax create(HandlerWithResult handler); } diff --git a/core/src/main/java/org/jclouds/io/ContentMetadataCodec.java b/core/src/main/java/org/jclouds/io/ContentMetadataCodec.java index 6433ef24c4..e277a52475 100644 --- a/core/src/main/java/org/jclouds/io/ContentMetadataCodec.java +++ b/core/src/main/java/org/jclouds/io/ContentMetadataCodec.java @@ -49,18 +49,18 @@ public interface ContentMetadataCodec { /** * Generates standard HTTP headers for the give metadata. */ - public Multimap toHeaders(ContentMetadata md); + Multimap toHeaders(ContentMetadata md); /** * Sets properties related to the http headers listed in {@link ContentMetadata#HTTP_HEADERS} */ - public void fromHeaders(MutableContentMetadata contentMetadata, Multimap headers); + void fromHeaders(MutableContentMetadata contentMetadata, Multimap headers); /** * Parses the 'Expires' header. * If invalid, returns a date in the past (in accordance with HTTP 1.1 client spec). */ - public Date parseExpires(String expires); + Date parseExpires(String expires); /** * Default implementation, in accordance with HTTP 1.1 spec. diff --git a/core/src/main/java/org/jclouds/json/config/GsonModule.java b/core/src/main/java/org/jclouds/json/config/GsonModule.java index 4be2fd6452..c1b6ec0e9b 100644 --- a/core/src/main/java/org/jclouds/json/config/GsonModule.java +++ b/core/src/main/java/org/jclouds/json/config/GsonModule.java @@ -141,7 +141,7 @@ public class GsonModule extends AbstractModule { } @ImplementedBy(NoExclusions.class) - public static interface DefaultExclusionStrategy extends ExclusionStrategy { + public interface DefaultExclusionStrategy extends ExclusionStrategy { } public static class NoExclusions implements DefaultExclusionStrategy { diff --git a/core/src/main/java/org/jclouds/location/suppliers/RegionIdToURISupplier.java b/core/src/main/java/org/jclouds/location/suppliers/RegionIdToURISupplier.java index 54a412c61a..891700e811 100644 --- a/core/src/main/java/org/jclouds/location/suppliers/RegionIdToURISupplier.java +++ b/core/src/main/java/org/jclouds/location/suppliers/RegionIdToURISupplier.java @@ -34,7 +34,7 @@ import com.google.inject.assistedinject.Assisted; */ @ImplementedBy(RegionIdToURIFromConfigurationOrDefaultToProvider.class) public interface RegionIdToURISupplier extends Supplier>> { - static interface Factory { + interface Factory { /** * * @param apiType diff --git a/core/src/main/java/org/jclouds/location/suppliers/ZoneIdToURISupplier.java b/core/src/main/java/org/jclouds/location/suppliers/ZoneIdToURISupplier.java index 38db39b3f8..dcfcf5022f 100644 --- a/core/src/main/java/org/jclouds/location/suppliers/ZoneIdToURISupplier.java +++ b/core/src/main/java/org/jclouds/location/suppliers/ZoneIdToURISupplier.java @@ -33,7 +33,7 @@ import com.google.inject.assistedinject.Assisted; */ @ImplementedBy(ZoneIdToURIFromConfigurationOrDefaultToProvider.class) public interface ZoneIdToURISupplier extends Supplier>> { - static interface Factory { + interface Factory { /** * * @param apiType diff --git a/core/src/main/java/org/jclouds/logging/Logger.java b/core/src/main/java/org/jclouds/logging/Logger.java index 5a8f5b9196..f56bad21ea 100644 --- a/core/src/main/java/org/jclouds/logging/Logger.java +++ b/core/src/main/java/org/jclouds/logging/Logger.java @@ -79,7 +79,7 @@ public interface Logger { * @author Adrian Cole * */ - public static interface LoggerFactory { + public interface LoggerFactory { Logger getLogger(String category); } } diff --git a/core/src/main/java/org/jclouds/providers/ProviderMetadata.java b/core/src/main/java/org/jclouds/providers/ProviderMetadata.java index 9fd0461a80..d49eb4da95 100644 --- a/core/src/main/java/org/jclouds/providers/ProviderMetadata.java +++ b/core/src/main/java/org/jclouds/providers/ProviderMetadata.java @@ -38,7 +38,7 @@ public interface ProviderMetadata { * @author Adrian Cole * @since 1.5 */ - public static interface Builder { + public interface Builder { /** * @see ProviderMetadata#getId() */ @@ -120,26 +120,26 @@ public interface ProviderMetadata { * * @return the provider's unique identifier (ex. aws-ec2, rackspace-cloudservers-us) */ - public String getId(); + String getId(); /** * * @return the name (display name) of the provider (ex. GoGrid) */ - public String getName(); + String getName(); /** * * @return the provider's api * @since 1.5 */ - public ApiMetadata getApiMetadata(); + ApiMetadata getApiMetadata(); /** * @see ApiMetadata#getEndpoint * @return the url for the provider's api */ - public String getEndpoint(); + String getEndpoint(); /** * Configuration Properties used when creating connections to this provider. diff --git a/core/src/main/java/org/jclouds/rest/HttpApiMetadata.java b/core/src/main/java/org/jclouds/rest/HttpApiMetadata.java index 7ee3dcc41e..c6172ee53d 100644 --- a/core/src/main/java/org/jclouds/rest/HttpApiMetadata.java +++ b/core/src/main/java/org/jclouds/rest/HttpApiMetadata.java @@ -29,7 +29,7 @@ import com.google.common.annotations.Beta; @Beta public interface HttpApiMetadata extends ApiMetadata { - public static interface Builder> extends ApiMetadata.Builder { + public interface Builder> extends ApiMetadata.Builder { /** * @see ApiMetadata#getApi() diff --git a/core/src/main/java/org/jclouds/rest/RestApiMetadata.java b/core/src/main/java/org/jclouds/rest/RestApiMetadata.java index 8c96d8c12f..4d3d7bb0a5 100644 --- a/core/src/main/java/org/jclouds/rest/RestApiMetadata.java +++ b/core/src/main/java/org/jclouds/rest/RestApiMetadata.java @@ -33,7 +33,7 @@ import com.google.common.util.concurrent.ListenableFuture; @Beta public interface RestApiMetadata extends ApiMetadata { - public static interface Builder> extends ApiMetadata.Builder { + public interface Builder> extends ApiMetadata.Builder { /** * @see ApiMetadata#getApi() diff --git a/core/src/main/java/org/jclouds/rest/binders/BindToJsonPayloadWrappedWith.java b/core/src/main/java/org/jclouds/rest/binders/BindToJsonPayloadWrappedWith.java index f2b80c5213..9a5e974a11 100644 --- a/core/src/main/java/org/jclouds/rest/binders/BindToJsonPayloadWrappedWith.java +++ b/core/src/main/java/org/jclouds/rest/binders/BindToJsonPayloadWrappedWith.java @@ -35,7 +35,7 @@ import com.google.inject.assistedinject.Assisted; */ public class BindToJsonPayloadWrappedWith implements MapBinder { - public static interface Factory { + public interface Factory { BindToJsonPayloadWrappedWith create(String envelope); } diff --git a/core/src/main/java/org/jclouds/xml/XMLParser.java b/core/src/main/java/org/jclouds/xml/XMLParser.java index 6c94ba787f..16781e9167 100644 --- a/core/src/main/java/org/jclouds/xml/XMLParser.java +++ b/core/src/main/java/org/jclouds/xml/XMLParser.java @@ -30,21 +30,21 @@ import com.google.inject.ImplementedBy; @ImplementedBy(JAXBParser.class) public interface XMLParser { /** The default xml header. */ - public static final String DEFAULT_XML_HEADER = ""; + static final String DEFAULT_XML_HEADER = ""; /** * Serialize the object into xml. */ - public String toXML(Object src) throws IOException; + String toXML(Object src) throws IOException; /** * Serialize the object into xml, as the declared type. */ - public String toXML(Object src, Class type) throws IOException; + String toXML(Object src, Class type) throws IOException; /** * Deserialize the object from xml. */ - public T fromXML(String xml, Class type) throws IOException; + T fromXML(String xml, Class type) throws IOException; } diff --git a/core/src/test/java/org/jclouds/rest/InputParamValidatorTest.java b/core/src/test/java/org/jclouds/rest/InputParamValidatorTest.java index 5fb8a7296e..3723035b1c 100644 --- a/core/src/test/java/org/jclouds/rest/InputParamValidatorTest.java +++ b/core/src/test/java/org/jclouds/rest/InputParamValidatorTest.java @@ -41,7 +41,7 @@ import com.google.inject.Injector; @Test(groups = "unit") public class InputParamValidatorTest { - private static interface InputParamValidatorForm { + private interface InputParamValidatorForm { @POST @ParamValidators(AllLowerCaseValidator.class) void allParamsValidated(@PathParam("param1") String param1, @PathParam("param2") String param2); @@ -91,7 +91,7 @@ public class InputParamValidatorTest { new AllLowerCaseValidator().validate(null); } - private static interface WrongValidator { + private interface WrongValidator { @POST @ParamValidators(AllLowerCaseValidator.class) void method(@PathParam("param1") Integer param1); diff --git a/core/src/test/java/org/jclouds/rest/annotationparsing/ClosableApiTest.java b/core/src/test/java/org/jclouds/rest/annotationparsing/ClosableApiTest.java index 67619d4086..15b1fa12ae 100644 --- a/core/src/test/java/org/jclouds/rest/annotationparsing/ClosableApiTest.java +++ b/core/src/test/java/org/jclouds/rest/annotationparsing/ClosableApiTest.java @@ -44,10 +44,10 @@ import com.google.inject.Module; @Test(groups = "unit", testName = "ClosableApiTest") public class ClosableApiTest { - static interface DelegatingApi extends Closeable { + interface DelegatingApi extends Closeable { } - static interface DelegatingAsyncApi extends Closeable { + interface DelegatingAsyncApi extends Closeable { } ProviderMetadata provider = forClientMappedToAsyncClientOnEndpoint(DelegatingApi.class, DelegatingAsyncApi.class, diff --git a/core/src/test/java/org/jclouds/rest/annotationparsing/DelegateAnnotationExpectTest.java b/core/src/test/java/org/jclouds/rest/annotationparsing/DelegateAnnotationExpectTest.java index 3388d328b0..f9eb2a5eff 100644 --- a/core/src/test/java/org/jclouds/rest/annotationparsing/DelegateAnnotationExpectTest.java +++ b/core/src/test/java/org/jclouds/rest/annotationparsing/DelegateAnnotationExpectTest.java @@ -50,7 +50,7 @@ import com.google.inject.Module; @Test(groups = "unit", testName = "DelegateAnnotationExpectTest") public class DelegateAnnotationExpectTest extends BaseRestClientExpectTest { - static interface DelegatingApi { + interface DelegatingApi { @Delegate DiskApi getDiskApiForProjectForm(@FormParam("project") String projectName); @@ -59,7 +59,7 @@ public class DelegateAnnotationExpectTest extends BaseRestClientExpectTest form(); diff --git a/core/src/test/java/org/jclouds/rest/annotationparsing/ProvidesAnnotationExpectTest.java b/core/src/test/java/org/jclouds/rest/annotationparsing/ProvidesAnnotationExpectTest.java index 9683e018e0..bbee6cfd75 100644 --- a/core/src/test/java/org/jclouds/rest/annotationparsing/ProvidesAnnotationExpectTest.java +++ b/core/src/test/java/org/jclouds/rest/annotationparsing/ProvidesAnnotationExpectTest.java @@ -49,7 +49,7 @@ import com.google.inject.name.Names; @Test(groups = "unit", testName = "ProvidesAnnotationExpectTest") public class ProvidesAnnotationExpectTest extends BaseRestClientExpectTest { - static interface ProvidingApi extends Closeable { + interface ProvidingApi extends Closeable { @Provides Set set(); @@ -66,7 +66,7 @@ public class ProvidesAnnotationExpectTest extends BaseRestClientExpectTest noSuchElementException(); } - static interface ProvidingAsyncApi extends Closeable { + interface ProvidingAsyncApi extends Closeable { @Provides Set set(); diff --git a/core/src/test/java/org/jclouds/rest/binders/BindMapToStringPayloadTest.java b/core/src/test/java/org/jclouds/rest/binders/BindMapToStringPayloadTest.java index bfd93ae885..8578f0687d 100644 --- a/core/src/test/java/org/jclouds/rest/binders/BindMapToStringPayloadTest.java +++ b/core/src/test/java/org/jclouds/rest/binders/BindMapToStringPayloadTest.java @@ -40,7 +40,7 @@ import com.google.common.reflect.Invokable; */ @Test(groups = "unit") public class BindMapToStringPayloadTest { - static interface TestPayload { + interface TestPayload { @org.jclouds.rest.annotations.Payload("name {fooble}") void testPayload(@PathParam("foo") String path); diff --git a/core/src/test/java/org/jclouds/rest/config/MappedHttpInvocationModuleTest.java b/core/src/test/java/org/jclouds/rest/config/MappedHttpInvocationModuleTest.java index 237336386e..3ea43c0739 100644 --- a/core/src/test/java/org/jclouds/rest/config/MappedHttpInvocationModuleTest.java +++ b/core/src/test/java/org/jclouds/rest/config/MappedHttpInvocationModuleTest.java @@ -42,11 +42,11 @@ import com.google.common.util.concurrent.ListenableFuture; */ @Test(groups = "unit") public class MappedHttpInvocationModuleTest { - static interface Sync { + interface Sync { String get(); } - private static interface Async { + private interface Async { ListenableFuture get(); } @@ -69,7 +69,7 @@ public class MappedHttpInvocationModuleTest { }); } - private static interface AsyncWithException { + private interface AsyncWithException { ListenableFuture get() throws IOException; } @@ -79,7 +79,7 @@ public class MappedHttpInvocationModuleTest { SyncToAsyncHttpInvocationModule.putInvokables(Sync.class, AsyncWithException.class, cache); } - private static interface AsyncWithMisnamedMethod { + private interface AsyncWithMisnamedMethod { ListenableFuture got(); } diff --git a/core/src/test/java/org/jclouds/rest/config/ReadAnnotationsAndPropertiesTest.java b/core/src/test/java/org/jclouds/rest/config/ReadAnnotationsAndPropertiesTest.java index f5c3975a18..bdc9dc9044 100644 --- a/core/src/test/java/org/jclouds/rest/config/ReadAnnotationsAndPropertiesTest.java +++ b/core/src/test/java/org/jclouds/rest/config/ReadAnnotationsAndPropertiesTest.java @@ -47,13 +47,13 @@ import com.google.inject.name.Names; @Test(groups = "unit", singleThreaded = true) public class ReadAnnotationsAndPropertiesTest { - public static interface ThingApi { + public interface ThingApi { HttpResponse get(); HttpResponse namedGet(); } - public static interface ThingAsyncApi { + public interface ThingAsyncApi { ListenableFuture get(); @Named("ns:get") diff --git a/core/src/test/java/org/jclouds/rest/functions/PresentWhenApiVersionLexicographicallyAtOrAfterSinceApiVersionTest.java b/core/src/test/java/org/jclouds/rest/functions/PresentWhenApiVersionLexicographicallyAtOrAfterSinceApiVersionTest.java index f5215ebcd2..50e2214116 100644 --- a/core/src/test/java/org/jclouds/rest/functions/PresentWhenApiVersionLexicographicallyAtOrAfterSinceApiVersionTest.java +++ b/core/src/test/java/org/jclouds/rest/functions/PresentWhenApiVersionLexicographicallyAtOrAfterSinceApiVersionTest.java @@ -45,21 +45,21 @@ import com.google.common.collect.ImmutableList; public class PresentWhenApiVersionLexicographicallyAtOrAfterSinceApiVersionTest { // feature present in base api - static interface KeyPairAsyncApi { + interface KeyPairAsyncApi { } @SinceApiVersion("2010-08-31") - static interface TagAsyncApi { + interface TagAsyncApi { } @SinceApiVersion("2011-01-01") - static interface VpcAsyncApi { + interface VpcAsyncApi { } - static interface EC2AsyncApi { + interface EC2AsyncApi { @Delegate Optional getTagApiForRegion(String region); diff --git a/core/src/test/java/org/jclouds/rest/internal/InvokeHttpMethodTest.java b/core/src/test/java/org/jclouds/rest/internal/InvokeHttpMethodTest.java index 9e2d0d072e..6945df1d09 100644 --- a/core/src/test/java/org/jclouds/rest/internal/InvokeHttpMethodTest.java +++ b/core/src/test/java/org/jclouds/rest/internal/InvokeHttpMethodTest.java @@ -54,7 +54,7 @@ import com.google.common.util.concurrent.TimeLimiter; @Test(groups = "unit", singleThreaded = true) public class InvokeHttpMethodTest { - public static interface ThingApi { + public interface ThingApi { @Named("ns:get") HttpResponse get(); } diff --git a/core/src/test/java/org/jclouds/rest/internal/InvokeMappedHttpMethodTest.java b/core/src/test/java/org/jclouds/rest/internal/InvokeMappedHttpMethodTest.java index 7fbe02a8fe..31e839e817 100644 --- a/core/src/test/java/org/jclouds/rest/internal/InvokeMappedHttpMethodTest.java +++ b/core/src/test/java/org/jclouds/rest/internal/InvokeMappedHttpMethodTest.java @@ -59,11 +59,11 @@ import com.google.common.util.concurrent.TimeLimiter; @Test(groups = "unit", singleThreaded = true) public class InvokeMappedHttpMethodTest { - public static interface ThingApi { + public interface ThingApi { HttpResponse get(); } - public static interface ThingAsyncApi { + public interface ThingAsyncApi { @Named("ns:get") ListenableFuture get(); } diff --git a/core/src/test/java/org/jclouds/rest/internal/RestAnnotationProcessorTest.java b/core/src/test/java/org/jclouds/rest/internal/RestAnnotationProcessorTest.java index 4e076666bb..35fb50877d 100644 --- a/core/src/test/java/org/jclouds/rest/internal/RestAnnotationProcessorTest.java +++ b/core/src/test/java/org/jclouds/rest/internal/RestAnnotationProcessorTest.java @@ -177,21 +177,21 @@ public class RestAnnotationProcessorTest extends BaseRestApiTest { } @Path("/client/{jclouds.api-version}") - public static interface AsyncCallee extends Closeable { + public interface AsyncCallee extends Closeable { @GET @Path("/{path}") ListenableFuture onePath(@PathParam("path") String path); } @Path("/client/{jclouds.api-version}") - public static interface AsyncCallee2 { + public interface AsyncCallee2 { @GET @Path("/{path}/2") ListenableFuture onePath(@PathParam("path") String path); } @Endpoint(Localhost2.class) - public static interface Caller extends Closeable { + public interface Caller extends Closeable { // tests that we can pull from suppliers @Provides @@ -215,15 +215,15 @@ public class RestAnnotationProcessorTest extends BaseRestApiTest { public Callee getCalleeWithPath(@EndpointParam URI endpoint, @PathParam("wibble") String wibble); } - public static interface Callee extends Closeable { + public interface Callee extends Closeable { void onePath(String path); } - public static interface Callee2 { + public interface Callee2 { void onePath(String path); } - public static interface AsyncCaller extends Closeable { + public interface AsyncCaller extends Closeable { @Provides @Localhost2 URI getURI(); @@ -920,7 +920,7 @@ public class RestAnnotationProcessorTest extends BaseRestApiTest { assertPayloadEquals(request, "name data", "text/plain", false); } - static interface TestMultipartForm { + interface TestMultipartForm { @POST void withStringPart(@PartParam(name = "fooble") String path); @@ -1357,7 +1357,7 @@ public class RestAnnotationProcessorTest extends BaseRestApiTest { } @RequestFilters(TestRequestFilter1.class) - static interface TestRequestFilter { + interface TestRequestFilter { @GET @RequestFilters(TestRequestFilter2.class) public void get(); diff --git a/core/src/test/java/org/jclouds/util/Optionals2Test.java b/core/src/test/java/org/jclouds/util/Optionals2Test.java index 0b1a211c74..c1aad83b0a 100644 --- a/core/src/test/java/org/jclouds/util/Optionals2Test.java +++ b/core/src/test/java/org/jclouds/util/Optionals2Test.java @@ -31,7 +31,7 @@ import com.google.common.reflect.Invokable; @Test public class Optionals2Test { - public static interface Test { + public interface Test { Optional getOptional(); String getNotOptional(); diff --git a/drivers/jsch/src/main/java/org/jclouds/ssh/jsch/JschSshClient.java b/drivers/jsch/src/main/java/org/jclouds/ssh/jsch/JschSshClient.java index 735c162f81..f18c06ec24 100644 --- a/drivers/jsch/src/main/java/org/jclouds/ssh/jsch/JschSshClient.java +++ b/drivers/jsch/src/main/java/org/jclouds/ssh/jsch/JschSshClient.java @@ -155,13 +155,13 @@ public class JschSshClient implements SshClient { "(%s) Session not connected!", toString())); } - public static interface Connection { + public interface Connection { void clear(); T create() throws Exception; } - public static interface ConnectionWithStreams extends Connection { + public interface ConnectionWithStreams extends Connection { InputStream getInputStream(); InputStream getErrStream(); } diff --git a/drivers/sshj/src/main/java/org/jclouds/sshj/SshjSshClient.java b/drivers/sshj/src/main/java/org/jclouds/sshj/SshjSshClient.java index dc9fb302c4..abfb82aa35 100644 --- a/drivers/sshj/src/main/java/org/jclouds/sshj/SshjSshClient.java +++ b/drivers/sshj/src/main/java/org/jclouds/sshj/SshjSshClient.java @@ -172,7 +172,7 @@ public class SshjSshClient implements SshClient { .format("(%s) ssh not connected!", toString())); } - public static interface Connection { + public interface Connection { void clear() throws Exception; T create() throws Exception; diff --git a/providers/azureblob/src/main/java/org/jclouds/azureblob/AzureBlobAsyncClient.java b/providers/azureblob/src/main/java/org/jclouds/azureblob/AzureBlobAsyncClient.java index 6f69739a0e..ad7704392e 100644 --- a/providers/azureblob/src/main/java/org/jclouds/azureblob/AzureBlobAsyncClient.java +++ b/providers/azureblob/src/main/java/org/jclouds/azureblob/AzureBlobAsyncClient.java @@ -99,7 +99,7 @@ import com.google.inject.Provides; @Path("/") public interface AzureBlobAsyncClient { @Provides - public org.jclouds.azureblob.domain.AzureBlob newBlob(); + org.jclouds.azureblob.domain.AzureBlob newBlob(); /** * @see AzureBlobClient#listContainers diff --git a/providers/azureblob/src/main/java/org/jclouds/azureblob/AzureBlobClient.java b/providers/azureblob/src/main/java/org/jclouds/azureblob/AzureBlobClient.java index 6a18881161..bcb1f2ab52 100644 --- a/providers/azureblob/src/main/java/org/jclouds/azureblob/AzureBlobClient.java +++ b/providers/azureblob/src/main/java/org/jclouds/azureblob/AzureBlobClient.java @@ -44,7 +44,7 @@ import org.jclouds.io.Payload; */ public interface AzureBlobClient { @Provides - public AzureBlob newBlob(); + AzureBlob newBlob(); /** * The List Containers operation returns a list of the containers under the specified identity. diff --git a/resources/checkstyle.xml b/resources/checkstyle.xml index 008f4ba91e..def73b35fd 100644 --- a/resources/checkstyle.xml +++ b/resources/checkstyle.xml @@ -35,6 +35,10 @@ --> + + + + diff --git a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/functionloader/FunctionLoader.java b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/functionloader/FunctionLoader.java index 54c8b42f80..c66239ec6d 100644 --- a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/functionloader/FunctionLoader.java +++ b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/functionloader/FunctionLoader.java @@ -30,6 +30,6 @@ public interface FunctionLoader { * @return The function as {@link String}. * @throws FunctionNotFoundException */ - public String loadFunction(String function, OsFamily family) throws FunctionNotFoundException; + String loadFunction(String function, OsFamily family) throws FunctionNotFoundException; } diff --git a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/AdminAccess.java b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/AdminAccess.java index 80375eafea..89fadd2942 100644 --- a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/AdminAccess.java +++ b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/AdminAccess.java @@ -80,7 +80,7 @@ public class AdminAccess implements Statement { return new Builder().build(); } - public static interface Configuration { + public interface Configuration { Supplier defaultAdminUsername(); Supplier> defaultAdminSshKeys(); diff --git a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/AdminAccessBuilderSpec.java b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/AdminAccessBuilderSpec.java index 1c3870d4fa..543b8eaee4 100644 --- a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/AdminAccessBuilderSpec.java +++ b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/AdminAccessBuilderSpec.java @@ -80,7 +80,7 @@ import com.google.common.collect.ImmutableMap; public class AdminAccessBuilderSpec { /** Parses a single value. */ - protected static interface ValueParser { + protected interface ValueParser { void parse(AdminAccessBuilderSpec spec, String key, @Nullable String value); }