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

Enable RedundantModifier for Checkstyle

This commit is contained in:
Andrew Gaul 2013-10-30 13:07:46 -07:00
parent cb9a6b9413
commit 17ce72794c
59 changed files with 108 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apis/atmos/src/main/java/org/jclouds/atmos/domain/MutableContentMetadata.java
View File

@ -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);
}

2
apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/StaticNATVirtualMachineInNetwork.java
View File

@ -39,7 +39,7 @@ import com.google.inject.assistedinject.Assisted;
*/
@Singleton
public class StaticNATVirtualMachineInNetwork implements Function<VirtualMachine, PublicIPAddress> {
public static interface Factory {
public interface Factory {
StaticNATVirtualMachineInNetwork create(Network in);
}

2
apis/ec2/src/main/java/org/jclouds/ec2/domain/Subnet.java
View File

@ -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);

2
apis/ec2/src/main/java/org/jclouds/ec2/domain/Tag.java
View File

@ -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";

2
apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/suppliers/LocationIdToURIFromAccessForTypeAndVersion.java
View File

@ -54,7 +54,7 @@ import com.google.inject.assistedinject.Assisted;
@Singleton
public class LocationIdToURIFromAccessForTypeAndVersion implements Supplier<Map<String, Supplier<URI>>> {
public static interface Factory {
public interface Factory {
/**
*
* @param apiType

2
apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/suppliers/RegionIdToAdminURISupplier.java
View File

@ -31,7 +31,7 @@ import com.google.inject.assistedinject.Assisted;
*/
@ImplementedBy(RegionIdToAdminURIFromAccessForTypeAndVersion.class)
public interface RegionIdToAdminURISupplier extends Supplier<Map<String, Supplier<URI>>> {
static interface Factory {
interface Factory {
/**
*
* @param apiType

2
apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/config/ProviderModuleExpectTest.java
View File

@ -91,7 +91,7 @@ public class ProviderModuleExpectTest extends BaseRestApiExpectTest<ProviderModu
}
@org.jclouds.rest.annotations.Endpoint(DNS.class)
static interface DNSApi extends Closeable {
interface DNSApi extends Closeable {
@HEAD
@Path("/zones/{zoneName}")
@Fallback(FalseOnNotFoundOr404.class)

6
apis/openstack-keystone/src/test/java/org/jclouds/openstack/v2_0/functions/PresentWhenExtensionAnnotationNamespaceEqualsAnyNamespaceInExtensionsSetTest.java
View File

@ -57,7 +57,7 @@ public class PresentWhenExtensionAnnotationNamespaceEqualsAnyNamespaceInExtensio
"Keypair Support").build();
@org.jclouds.openstack.v2_0.services.Extension(of = ServiceType.COMPUTE, namespace = "http://docs.openstack.org/ext/keypairs/api/v1.1")
static interface KeyPairAsyncApi {
interface KeyPairAsyncApi {
}
@ -67,11 +67,11 @@ public class PresentWhenExtensionAnnotationNamespaceEqualsAnyNamespaceInExtensio
"Floating IPs support").build();
@org.jclouds.openstack.v2_0.services.Extension(of = ServiceType.COMPUTE, namespace = "http://docs.openstack.org/ext/floating_ips/api/v1.1")
static interface FloatingIPAsyncApi {
interface FloatingIPAsyncApi {
}
static interface NovaAsyncApi {
interface NovaAsyncApi {
@Delegate
Optional<FloatingIPAsyncApi> getFloatingIPExtensionForZone(String zone);

2
apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ConvertLB.java
View File

@ -39,7 +39,7 @@ import com.google.inject.assistedinject.Assisted;
public class ConvertLB implements Function<LB, LoadBalancer> {
private static final String LOAD_BALANCERS = "loadbalancers";
public static interface Factory {
public interface Factory {
ConvertLB createForEndpointAndRegion(URI endpoint, String region);
}

4
apis/s3/src/main/java/org/jclouds/s3/S3AsyncClient.java
View File

@ -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

2
apis/s3/src/main/java/org/jclouds/s3/S3Client.java
View File

@ -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;

2
apis/s3/src/main/java/org/jclouds/s3/domain/AccessControlList.java
View File

@ -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";

4
apis/sqs/src/test/java/org/jclouds/sqs/features/PermissionApiLiveTest.java
View File

@ -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" })

2
common/openstack/src/main/java/org/jclouds/openstack/functions/URIFromAuthenticationResponseForService.java
View File

@ -28,7 +28,7 @@ import com.google.inject.assistedinject.Assisted;
@Singleton
public class URIFromAuthenticationResponseForService implements Supplier<URI> {
public static interface Factory {
public interface Factory {
URIFromAuthenticationResponseForService create(String service);
}

2
common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/suppliers/V1DefaultRegionIdSupplier.java
View File

@ -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

2
compute/src/main/java/org/jclouds/compute/callables/BlockUntilInitScriptStatusIsZeroThenReturnOutput.java
View File

@ -54,7 +54,7 @@ import com.google.inject.name.Named;
*/
public class BlockUntilInitScriptStatusIsZeroThenReturnOutput extends AbstractFuture<ExecResponse> implements Runnable {
public static interface Factory {
public interface Factory {
BlockUntilInitScriptStatusIsZeroThenReturnOutput create(SudoAwareInitManager commandRunner);
}

2
compute/src/main/java/org/jclouds/compute/config/BaseComputeServiceContextModule.java
View File

@ -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);

2
compute/src/main/java/org/jclouds/compute/domain/CloneImageTemplate.java
View File

@ -23,6 +23,6 @@ package org.jclouds.compute.domain;
*/
public interface CloneImageTemplate extends ImageTemplate {
public String getSourceNodeId();
String getSourceNodeId();
}

10
compute/src/main/java/org/jclouds/compute/domain/ComputeMetadata.java
View File

@ -34,21 +34,21 @@ public interface ComputeMetadata extends ResourceMetadata<ComputeType> {
* @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<ComputeType> {
*
* @return unique id within your account on the provider
*/
public String getId();
String getId();
/**
* @return tags describing this resource, if supported
*/
public Set<String> getTags();
Set<String> getTags();
}

4
compute/src/main/java/org/jclouds/compute/domain/ComputeMetadataIncludingStatus.java
View File

@ -28,7 +28,7 @@ public interface ComputeMetadataIncludingStatus<S extends Enum<S>> 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<S extends Enum<S>> extends Compu
* @since 1.5
*/
@Nullable
public String getBackendStatus();
String getBackendStatus();
}

2
compute/src/main/java/org/jclouds/compute/domain/ImageTemplate.java
View File

@ -27,6 +27,6 @@ public interface ImageTemplate {
/**
* @return the name of the new image
*/
public String getName();
String getName();
}

2
compute/src/main/java/org/jclouds/compute/domain/TemplateBuilder.java
View File

@ -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<Iterable<? extends Image>,Image> imageChooser);
TemplateBuilderImpl imageChooser(Function<Iterable<? extends Image>,Image> imageChooser);
/**
* Configure this template to require the minimum cores below

2
compute/src/main/java/org/jclouds/compute/domain/TemplateBuilderSpec.java
View File

@ -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);
}

2
compute/src/main/java/org/jclouds/compute/functions/GroupNamingConvention.java
View File

@ -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();

2
compute/src/main/java/org/jclouds/compute/functions/Sha512Crypt.java
View File

@ -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();

2
compute/src/main/java/org/jclouds/compute/strategy/CustomizeNodeAndAddToGoodMapOrPutExceptionIntoBadMap.java
View File

@ -53,7 +53,7 @@ import com.google.inject.assistedinject.AssistedInject;
public class CustomizeNodeAndAddToGoodMapOrPutExceptionIntoBadMap implements Callable<Void>,
Function<AtomicReference<NodeMetadata>, Void> {
public static interface Factory {
public interface Factory {
Callable<Void> create(TemplateOptions options, AtomicReference<NodeMetadata> node, Set<NodeMetadata> goodNodes,
Map<NodeMetadata, Exception> badNodes, Multimap<NodeMetadata, CustomizationResponse> customizationResponses);

2
core/src/main/java/org/jclouds/apis/ApiMetadata.java
View File

@ -39,7 +39,7 @@ import com.google.inject.Module;
@Beta
public interface ApiMetadata {
public static interface Builder<B extends Builder<B>> {
public interface Builder<B extends Builder<B>> {
/**
* @see ApiMetadata#getId()
*/

4
core/src/main/java/org/jclouds/date/DateCodec.java
View File

@ -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);
}

2
core/src/main/java/org/jclouds/http/functions/ParseSax.java
View File

@ -58,7 +58,7 @@ public class ParseSax<T> implements Function<HttpResponse, T>, InvocationContext
private final HandlerWithResult<T> handler;
private HttpRequest request;
public static interface Factory {
public interface Factory {
<T> ParseSax<T> create(HandlerWithResult<T> handler);
}

6
core/src/main/java/org/jclouds/io/ContentMetadataCodec.java
View File

@ -49,18 +49,18 @@ public interface ContentMetadataCodec {
/**
* Generates standard HTTP headers for the give metadata.
*/
public Multimap<String, String> toHeaders(ContentMetadata md);
Multimap<String, String> toHeaders(ContentMetadata md);
/**
* Sets properties related to the http headers listed in {@link ContentMetadata#HTTP_HEADERS}
*/
public void fromHeaders(MutableContentMetadata contentMetadata, Multimap<String, String> headers);
void fromHeaders(MutableContentMetadata contentMetadata, Multimap<String, String> 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.

2
core/src/main/java/org/jclouds/json/config/GsonModule.java
View File

@ -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 {

2
core/src/main/java/org/jclouds/location/suppliers/RegionIdToURISupplier.java
View File

@ -34,7 +34,7 @@ import com.google.inject.assistedinject.Assisted;
*/
@ImplementedBy(RegionIdToURIFromConfigurationOrDefaultToProvider.class)
public interface RegionIdToURISupplier extends Supplier<Map<String, Supplier<URI>>> {
static interface Factory {
interface Factory {
/**
*
* @param apiType

2
core/src/main/java/org/jclouds/location/suppliers/ZoneIdToURISupplier.java
View File

@ -33,7 +33,7 @@ import com.google.inject.assistedinject.Assisted;
*/
@ImplementedBy(ZoneIdToURIFromConfigurationOrDefaultToProvider.class)
public interface ZoneIdToURISupplier extends Supplier<Map<String, Supplier<URI>>> {
static interface Factory {
interface Factory {
/**
*
* @param apiType

2
core/src/main/java/org/jclouds/logging/Logger.java
View File

@ -79,7 +79,7 @@ public interface Logger {
* @author Adrian Cole
*
*/
public static interface LoggerFactory {
public interface LoggerFactory {
Logger getLogger(String category);
}
}

10
core/src/main/java/org/jclouds/providers/ProviderMetadata.java
View File

@ -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.

2
core/src/main/java/org/jclouds/rest/HttpApiMetadata.java
View File

@ -29,7 +29,7 @@ import com.google.common.annotations.Beta;
@Beta
public interface HttpApiMetadata<A> extends ApiMetadata {
public static interface Builder<A, T extends Builder<A, T>> extends ApiMetadata.Builder<T> {
public interface Builder<A, T extends Builder<A, T>> extends ApiMetadata.Builder<T> {
/**
* @see ApiMetadata#getApi()

2
core/src/main/java/org/jclouds/rest/RestApiMetadata.java
View File

@ -33,7 +33,7 @@ import com.google.common.util.concurrent.ListenableFuture;
@Beta
public interface RestApiMetadata extends ApiMetadata {
public static interface Builder<T extends Builder<T>> extends ApiMetadata.Builder<T> {
public interface Builder<T extends Builder<T>> extends ApiMetadata.Builder<T> {
/**
* @see ApiMetadata#getApi()

2
core/src/main/java/org/jclouds/rest/binders/BindToJsonPayloadWrappedWith.java
View File

@ -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);
}

8
core/src/main/java/org/jclouds/xml/XMLParser.java
View File

@ -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 = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>";
static final String DEFAULT_XML_HEADER = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>";
/**
* 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 <T> String toXML(Object src, Class<T> type) throws IOException;
<T> String toXML(Object src, Class<T> type) throws IOException;
/**
* Deserialize the object from xml.
*/
public <T> T fromXML(String xml, Class<T> type) throws IOException;
<T> T fromXML(String xml, Class<T> type) throws IOException;
}

4
core/src/test/java/org/jclouds/rest/InputParamValidatorTest.java
View File

@ -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);

4
core/src/test/java/org/jclouds/rest/annotationparsing/ClosableApiTest.java
View File

@ -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,

8
core/src/test/java/org/jclouds/rest/annotationparsing/DelegateAnnotationExpectTest.java
View File

@ -50,7 +50,7 @@ import com.google.inject.Module;
@Test(groups = "unit", testName = "DelegateAnnotationExpectTest")
public class DelegateAnnotationExpectTest extends BaseRestClientExpectTest<DelegateAnnotationExpectTest.DelegatingApi> {
static interface DelegatingApi {
interface DelegatingApi {
@Delegate
DiskApi getDiskApiForProjectForm(@FormParam("project") String projectName);
@ -59,7 +59,7 @@ public class DelegateAnnotationExpectTest extends BaseRestClientExpectTest<Deleg
DiskApi getDiskApiForProject(@PayloadParam("project") @PathParam("project") String projectName);
}
static interface DelegatingAsyncApi {
interface DelegatingAsyncApi {
@Delegate
DiskAsyncApi getDiskApiForProjectForm(@FormParam("project") String projectName);
@ -68,7 +68,7 @@ public class DelegateAnnotationExpectTest extends BaseRestClientExpectTest<Deleg
DiskAsyncApi getDiskApiForProject(@PayloadParam("project") @PathParam("project") String projectName);
}
static interface DiskApi {
interface DiskApi {
void form();
void syncAll();
@ -76,7 +76,7 @@ public class DelegateAnnotationExpectTest extends BaseRestClientExpectTest<Deleg
boolean exists(@PathParam("disk") String diskName);
}
static interface DiskAsyncApi {
interface DiskAsyncApi {
@POST
ListenableFuture<Void> form();

4
core/src/test/java/org/jclouds/rest/annotationparsing/ProvidesAnnotationExpectTest.java
View File

@ -49,7 +49,7 @@ import com.google.inject.name.Names;
@Test(groups = "unit", testName = "ProvidesAnnotationExpectTest")
public class ProvidesAnnotationExpectTest extends BaseRestClientExpectTest<ProvidesAnnotationExpectTest.ProvidingApi> {
static interface ProvidingApi extends Closeable {
interface ProvidingApi extends Closeable {
@Provides
Set<String> set();
@ -66,7 +66,7 @@ public class ProvidesAnnotationExpectTest extends BaseRestClientExpectTest<Provi
Set<String> noSuchElementException();
}
static interface ProvidingAsyncApi extends Closeable {
interface ProvidingAsyncApi extends Closeable {
@Provides
Set<String> set();

2
core/src/test/java/org/jclouds/rest/binders/BindMapToStringPayloadTest.java
View File

@ -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);

8
core/src/test/java/org/jclouds/rest/config/MappedHttpInvocationModuleTest.java
View File

@ -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<String> get();
}
@ -69,7 +69,7 @@ public class MappedHttpInvocationModuleTest {
});
}
private static interface AsyncWithException {
private interface AsyncWithException {
ListenableFuture<String> 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<String> got();
}

4
core/src/test/java/org/jclouds/rest/config/ReadAnnotationsAndPropertiesTest.java
View File

@ -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<HttpResponse> get();
@Named("ns:get")

8
core/src/test/java/org/jclouds/rest/functions/PresentWhenApiVersionLexicographicallyAtOrAfterSinceApiVersionTest.java
View File

@ -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<TagAsyncApi> getTagApiForRegion(String region);

2
core/src/test/java/org/jclouds/rest/internal/InvokeHttpMethodTest.java
View File

@ -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();
}

4
core/src/test/java/org/jclouds/rest/internal/InvokeMappedHttpMethodTest.java
View File

@ -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<HttpResponse> get();
}

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

@ -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<Void> onePath(@PathParam("path") String path);
}
@Path("/client/{jclouds.api-version}")
public static interface AsyncCallee2 {
public interface AsyncCallee2 {
@GET
@Path("/{path}/2")
ListenableFuture<Void> 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();

2
core/src/test/java/org/jclouds/util/Optionals2Test.java
View File

@ -31,7 +31,7 @@ import com.google.common.reflect.Invokable;
@Test
public class Optionals2Test {
public static interface Test {
public interface Test {
Optional<String> getOptional();
String getNotOptional();

4
drivers/jsch/src/main/java/org/jclouds/ssh/jsch/JschSshClient.java
View File

@ -155,13 +155,13 @@ public class JschSshClient implements SshClient {
"(%s) Session not connected!", toString()));
}
public static interface Connection<T> {
public interface Connection<T> {
void clear();
T create() throws Exception;
}
public static interface ConnectionWithStreams<T> extends Connection<T> {
public interface ConnectionWithStreams<T> extends Connection<T> {
InputStream getInputStream();
InputStream getErrStream();
}

2
drivers/sshj/src/main/java/org/jclouds/sshj/SshjSshClient.java
View File

@ -172,7 +172,7 @@ public class SshjSshClient implements SshClient {
.format("(%s) ssh not connected!", toString()));
}
public static interface Connection<T> {
public interface Connection<T> {
void clear() throws Exception;
T create() throws Exception;

2
providers/azureblob/src/main/java/org/jclouds/azureblob/AzureBlobAsyncClient.java
View File

@ -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

2
providers/azureblob/src/main/java/org/jclouds/azureblob/AzureBlobClient.java
View File

@ -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.

4
resources/checkstyle.xml
View File

@ -35,6 +35,10 @@
-->
<module name="ModifierOrder"/>
<module name="MultipleVariableDeclarations"/>
<module name="RedundantModifier">
<!-- VARIABLE_DEF disabled -->
<property name="tokens" value="METHOD_DEF, ANNOTATION_FIELD_DEF, INTERFACE_DEF"/>
</module>
<module name="SimplifyBooleanExpression"/>
<module name="UnnecessaryParentheses"/>
</module>

2
scriptbuilder/src/main/java/org/jclouds/scriptbuilder/functionloader/FunctionLoader.java
View File

@ -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;
}

2
scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/AdminAccess.java
View File

@ -80,7 +80,7 @@ public class AdminAccess implements Statement {
return new Builder().build();
}
public static interface Configuration {
public interface Configuration {
Supplier<String> defaultAdminUsername();
Supplier<Map<String, String>> defaultAdminSshKeys();

2
scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/AdminAccessBuilderSpec.java
View File

@ -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);
}