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

Merge pull request #1544 from maginatics/checkstyle 

Address Checkstyle violations
This commit is contained in:
Adrian Cole 2013-04-17 17:05:28 -07:00
parent ae3cafdeef fff2fa6e05
commit 47f6801612
146 changed files with 182 additions and 183 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apis/atmos/src/main/java/org/jclouds/atmos/blobstore/AtmosAsyncBlobStore.java
View File

@ -225,8 +225,8 @@ public class AtmosAsyncBlobStore extends BaseAsyncBlobStore {
ListenableFuture<BoundedSet<? extends DirectoryEntry>> returnVal = async.listDirectory(container, nativeOptions);
ListenableFuture<PageSet<? extends StorageMetadata>> list = transform(returnVal, container2ResourceList,
userExecutor);
return (options.isDetailed() ? transform(list,
fetchBlobMetadataProvider.get().setContainerName(container)) : list);
return options.isDetailed() ? transform(list,
fetchBlobMetadataProvider.get().setContainerName(container)) : list;
}
/**

3
apis/cloudservers/src/main/java/org/jclouds/cloudservers/compute/extensions/CloudServersImageExtension.java
View File

@ -48,6 +48,7 @@ import org.jclouds.logging.Logger;
import com.google.common.base.Predicate;
import com.google.common.base.Supplier;
import com.google.common.util.concurrent.Atomics;
import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.ListeningExecutorService;
import com.google.common.util.concurrent.UncheckedTimeoutException;
@ -97,7 +98,7 @@ public class CloudServersImageExtension implements ImageExtension {
org.jclouds.cloudservers.domain.Image csImage = client.createImageFromServer(cloneTemplate.getName(),
Integer.parseInt(cloneTemplate.getSourceNodeId()));
final AtomicReference<Image> image = new AtomicReference<Image>(new ImageBuilder()
final AtomicReference<Image> image = Atomics.newReference(new ImageBuilder()
.location(location.get())
.ids(csImage.getId() + "")
.description(cloneTemplate.getName())

2
apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/EncryptedPasswordAndPrivateKey.java
View File

@ -38,7 +38,7 @@ public final class EncryptedPasswordAndPrivateKey {
return builder().fromEncryptedPasswordAndPrivateKey(this);
}
public final static class Builder {
public static final class Builder {
protected String encryptedPassword;
protected String privateKey;

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

@ -93,7 +93,7 @@ public class EC2ApiMetadata extends BaseRestApiMetadata {
return properties;
}
public static abstract class Builder<T extends Builder<T>> extends BaseRestApiMetadata.Builder<T> {
public abstract static class Builder<T extends Builder<T>> extends BaseRestApiMetadata.Builder<T> {
@SuppressWarnings("deprecation")
protected Builder() {
this(EC2Client.class, EC2AsyncClient.class);

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

@ -50,4 +50,4 @@ public final class EC2Fallbacks {
throw propagate(t);
}
}
}
}

3
apis/ec2/src/main/java/org/jclouds/ec2/compute/extensions/EC2ImageExtension.java
View File

@ -55,6 +55,7 @@ import org.jclouds.logging.Logger;
import com.google.common.base.Predicate;
import com.google.common.base.Supplier;
import com.google.common.util.concurrent.Atomics;
import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.ListeningExecutorService;
import com.google.common.util.concurrent.UncheckedTimeoutException;
@ -110,7 +111,7 @@ public class EC2ImageExtension implements ImageExtension {
String imageId = ec2Client.getAMIServices().createImageInRegion(region, cloneTemplate.getName(), instanceId,
CreateImageOptions.NONE);
final AtomicReference<Image> image = new AtomicReference<Image>(new ImageBuilder()
final AtomicReference<Image> image = Atomics.newReference(new ImageBuilder()
.location(find(locations.get(), idEquals(region)))
.id(region + "/" + imageId)
.providerId(imageId)

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

@ -161,7 +161,7 @@ public final class Subnet {
return builder().from(this);
}
public final static class Builder {
public static final class Builder {
private String subnetId;
private State subnetState;
private String vpcId;

2
apis/ec2/src/test/java/org/jclouds/ec2/binders/BindResourceIdsToIndexedFormParamsTest.java
View File

@ -38,4 +38,4 @@ public class BindResourceIdsToIndexedFormParamsTest {
HttpRequest request = HttpRequest.builder().method("GET").endpoint("http://momma").build();
binder.bindToRequest(request, null);
}
}
}

2
apis/ec2/src/test/java/org/jclouds/ec2/binders/BindTagsToIndexedFormParamsTest.java
View File

@ -61,4 +61,4 @@ public class BindTagsToIndexedFormParamsTest {
HttpRequest request = HttpRequest.builder().method("GET").endpoint("http://momma").build();
binder.bindToRequest(request, null);
}
}
}

2
apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/predicates/SnapshotPredicates.java
View File

@ -135,4 +135,4 @@ public class SnapshotPredicates {
return snapshotApi.get(snapshot.getId()) == null;
}
}
}
}

2
apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/predicates/VolumePredicates.java
View File

@ -146,4 +146,4 @@ public class VolumePredicates {
return volumeApi.get(volume.getId()) == null;
}
}
}
}

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

@ -73,7 +73,7 @@ public class KeystoneApiMetadata extends BaseRestApiMetadata {
return properties;
}
public static abstract class Builder<T extends Builder<T>> extends BaseRestApiMetadata.Builder<T> {
public abstract static class Builder<T extends Builder<T>> extends BaseRestApiMetadata.Builder<T> {
@SuppressWarnings("deprecation")
protected Builder() {
this(KeystoneApi.class, KeystoneAsyncApi.class);

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

@ -48,4 +48,4 @@ public final class KeystoneFallbacks {
}
}
}
}

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

@ -178,4 +178,4 @@ public class ProviderModuleExpectTest extends BaseRestApiExpectTest<ProviderModu
return responseWithKeystoneAccess;
}
}
}
}

2
apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/binders/BindKeyPairToJsonPayload.java
View File

@ -46,4 +46,4 @@ public class BindKeyPairToJsonPayload extends BindToJsonPayload {
public <R extends HttpRequest> R bindToRequest(R request, Map<String, Object> postParams) {
return bindToRequest(request, (Object) ImmutableMap.of("keypair", ImmutableSortedMap.copyOf(postParams)));
}
}
}

3
apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/extensions/NovaImageExtension.java
View File

@ -53,6 +53,7 @@ import org.jclouds.openstack.nova.v2_0.domain.zonescoped.ZoneAndId;
import com.google.common.base.Predicate;
import com.google.common.base.Supplier;
import com.google.common.util.concurrent.Atomics;
import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.ListeningExecutorService;
import com.google.common.util.concurrent.UncheckedTimeoutException;
@ -109,7 +110,7 @@ public class NovaImageExtension implements ImageExtension {
logger.info(">> Registered new Image %s, waiting for it to become available.", newImageId);
final AtomicReference<Image> image = new AtomicReference<Image>(new ImageBuilder()
final AtomicReference<Image> image = Atomics.newReference(new ImageBuilder()
.location(find(locations.get(), idEquals(targetImageZoneAndId.getZone())))
.id(targetImageZoneAndId.slashEncode())
.providerId(targetImageZoneAndId.getId())

2
apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/ServerCreated.java
View File

@ -47,7 +47,7 @@ public class ServerCreated extends Resource {
return builder().fromServerCreated(this);
}
public final static class Builder extends Resource.Builder<Builder> {
public static final class Builder extends Resource.Builder<Builder> {
protected String adminPass;
/**

2
apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeAttachmentApi.java
View File

@ -86,4 +86,4 @@ public interface VolumeAttachmentApi {
* @return true if successful
*/
boolean detachVolumeFromServer(String volumeId, String serverId);
}
}

2
apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/functions/OverLimitParser.java
View File

@ -91,4 +91,4 @@ public class OverLimitParser implements Function<String, Map<String, String>> {
return ImmutableMap.of();
}
}
}
}

2
apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeAttachmentApiExpectTest.java
View File

@ -167,4 +167,4 @@ public class VolumeAttachmentApiExpectTest extends BaseNovaApiExpectTest {
protected VolumeAttachment testAttachment() {
return VolumeAttachment.builder().device("/dev/vdc").serverId("b4785058-cb80-491b-baa3-e4ee6546450e").id("1").volumeId("1").build();
}
}
}

2
apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeAttachmentApiLiveTest.java
View File

@ -155,4 +155,4 @@ public class VolumeAttachmentApiLiveTest extends BaseNovaApiLiveTest {
}
}
}
}

2
apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/SessionPersistence.java
View File

@ -30,4 +30,4 @@ public enum SessionPersistence {
return UNRECOGNIZED;
}
}
}
}

2
apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/AccessRuleApi.java
View File

@ -109,4 +109,4 @@ public interface AccessRuleApi {
@Path("/accesslist")
@Consumes("*/*")
boolean deleteAll();
}
}

2
apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ConnectionApi.java
View File

@ -118,4 +118,4 @@ public interface ConnectionApi {
@Payload("{\"connectionLogging\":{\"enabled\":false}}")
@Path("/connectionlogging")
void disableConnectionLogging();
}
}

2
apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ContentCachingApi.java
View File

@ -81,4 +81,4 @@ public interface ContentCachingApi {
@Payload("{\"contentCaching\":{\"enabled\":false}}")
@Path("/contentcaching")
void disable();
}
}

2
apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ErrorPageApi.java
View File

@ -81,4 +81,4 @@ public interface ErrorPageApi {
@Fallback(FalseOnNotFoundOr404.class)
@Path("/errorpage")
boolean delete();
}
}

2
apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/HealthMonitorApi.java
View File

@ -83,4 +83,4 @@ public interface HealthMonitorApi {
@Path("/healthmonitor")
@Consumes("*/*")
boolean delete();
}
}

2
apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ReportApi.java
View File

@ -167,4 +167,4 @@ public interface ReportApi {
@Fallback(NullOnNotFoundOr404.class)
@Path("/loadbalancers/algorithms")
Iterable<String> listAlgorithms();
}
}

2
apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/SSLTerminationApi.java
View File

@ -116,4 +116,4 @@ public interface SSLTerminationApi {
@Path("/ssltermination")
@Consumes("*/*")
boolean delete();
}
}

2
apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/SessionPersistenceApi.java
View File

@ -86,4 +86,4 @@ public interface SessionPersistenceApi {
@Fallback(VoidOnNotFoundOr404.class)
@Path("/sessionpersistence")
void delete();
}
}

2
apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/VirtualIPApi.java
View File

@ -102,4 +102,4 @@ public interface VirtualIPApi {
@Path("/virtualips")
@Consumes("*/*")
boolean delete(@QueryParam("id") Iterable<Integer> ids);
}
}

2
apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/predicates/LoadBalancerPredicates.java
View File

@ -135,4 +135,4 @@ public class LoadBalancerPredicates {
}
}
}
}
}

2
apis/route53/src/main/java/org/jclouds/route53/domain/ChangeBatch.java
View File

@ -133,7 +133,7 @@ public class ChangeBatch extends ForwardingList<ActionOnResourceRecordSet> {
return new Builder();
}
public final static class Builder {
public static final class Builder {
private Optional<String> comment = Optional.absent();
private ImmutableList.Builder<ActionOnResourceRecordSet> changes = ImmutableList.builder();

2
apis/route53/src/main/java/org/jclouds/route53/domain/HostedZone.java
View File

@ -108,7 +108,7 @@ public final class HostedZone {
return builder().from(this);
}
public final static class Builder {
public static final class Builder {
private String id;
private String name;
private String callerReference;

4
apis/route53/src/main/java/org/jclouds/route53/domain/ResourceRecordSet.java
View File

@ -95,7 +95,7 @@ public class ResourceRecordSet {
/**
* A portion of a RRs who share the same name and type
*/
public static abstract class RecordSubset extends ResourceRecordSet {
public abstract static class RecordSubset extends ResourceRecordSet {
public static final class Weighted extends RecordSubset {
private final int weight;
@ -261,7 +261,7 @@ public class ResourceRecordSet {
return builder().from(this);
}
public final static class Builder {
public static final class Builder {
private String id;
private String name;
private String type;

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

@ -94,7 +94,7 @@ public class S3ApiMetadata extends BaseRestApiMetadata {
return properties;
}
public static abstract class Builder<T extends Builder<T>> extends BaseRestApiMetadata.Builder<T> {
public abstract static class Builder<T extends Builder<T>> extends BaseRestApiMetadata.Builder<T> {
@SuppressWarnings("deprecation")
protected Builder() {
this(S3Client.class, S3AsyncClient.class);

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

@ -51,4 +51,4 @@ public final class S3Fallbacks {
throw propagate(t);
}
}
}
}

2
apis/sts/src/main/java/org/jclouds/aws/domain/SessionCredentials.java
View File

@ -109,7 +109,7 @@ public final class SessionCredentials extends Credentials {
return builder().from(this);
}
public final static class Builder extends Credentials.Builder<SessionCredentials> {
public static final class Builder extends Credentials.Builder<SessionCredentials> {
private String accessKeyId;
private String secretAccessKey;
private String sessionToken;

3
apis/sts/src/main/java/org/jclouds/aws/filters/FormSigner.java
View File

@ -26,7 +26,8 @@ import static com.google.common.io.BaseEncoding.base64;
import static com.google.common.io.ByteStreams.readBytes;
import static org.jclouds.aws.reference.FormParameters.ACTION;
import static org.jclouds.aws.reference.FormParameters.AWS_ACCESS_KEY_ID;
import static org.jclouds.aws.reference.FormParameters.*;
import static org.jclouds.aws.reference.FormParameters.SECURITY_TOKEN;
import static org.jclouds.aws.reference.FormParameters.SIGNATURE;
import static org.jclouds.aws.reference.FormParameters.SIGNATURE_METHOD;
import static org.jclouds.aws.reference.FormParameters.SIGNATURE_VERSION;
import static org.jclouds.aws.reference.FormParameters.TIMESTAMP;

2
apis/sts/src/main/java/org/jclouds/sts/domain/UserAndSessionCredentials.java
View File

@ -37,7 +37,7 @@ public final class UserAndSessionCredentials {
return builder().from(this);
}
public final static class Builder {
public static final class Builder {
private User user;
private SessionCredentials credentials;
private int packedPolicySize;

2
apis/swift/src/main/java/org/jclouds/openstack/swift/SwiftApiMetadata.java
View File

@ -78,7 +78,7 @@ public class SwiftApiMetadata extends BaseRestApiMetadata {
return properties;
}
public static abstract class Builder<T extends Builder<T>> extends BaseRestApiMetadata.Builder<T> {
public abstract static class Builder<T extends Builder<T>> extends BaseRestApiMetadata.Builder<T> {
@SuppressWarnings("deprecation")
protected Builder() {
this(SwiftClient.class, SwiftAsyncClient.class);

2
apis/swift/src/main/java/org/jclouds/openstack/swift/SwiftKeystoneApiMetadata.java
View File

@ -75,7 +75,7 @@ public class SwiftKeystoneApiMetadata extends SwiftApiMetadata {
return properties;
}
public static abstract class Builder<T extends Builder<T>> extends SwiftApiMetadata.Builder<T> {
public abstract static class Builder<T extends Builder<T>> extends SwiftApiMetadata.Builder<T> {
protected Builder() {
this(SwiftKeystoneClient.class, SwiftKeystoneAsyncClient.class);
}

2
apis/swift/src/test/java/org/jclouds/openstack/swift/internal/BasePayloadTest.java
View File

@ -53,4 +53,4 @@ public class BasePayloadTest {
throw Throwables.propagate(e);
}
}
}
}

2
apis/vcloud/src/test/java/org/jclouds/vcloud/internal/BasePayloadTest.java
View File

@ -50,4 +50,4 @@ public class BasePayloadTest {
throw Throwables.propagate(e);
}
}
}
}

2
common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/TerremarkVCloudFallbacks.java
View File

@ -63,4 +63,4 @@ public final class TerremarkVCloudFallbacks {
}
}
}
}

2
common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/internal/BasePayloadTest.java
View File

@ -39,4 +39,4 @@ public class BasePayloadTest {
throw Throwables.propagate(e);
}
}
}
}

3
compute/src/main/java/org/jclouds/compute/domain/OsFamily.java
View File

@ -20,7 +20,8 @@ package org.jclouds.compute.domain;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.CaseFormat.*;
import static com.google.common.base.CaseFormat.LOWER_HYPHEN;
import static com.google.common.base.CaseFormat.UPPER_UNDERSCORE;
/**
* Running Operating system

2
core/src/main/java/org/jclouds/Fallback.java
View File

@ -42,4 +42,4 @@ public interface Fallback<V> extends FutureFallback<V> {
* the exception that made the call fail.
*/
V createOrPropagate(Throwable t) throws Exception;
}
}

2
core/src/main/java/org/jclouds/Fallbacks.java
View File

@ -204,4 +204,4 @@ public final class Fallbacks {
return getFirstThrowableOfType(from, ResourceNotFoundException.class) != null;
}
}
}

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

@ -77,7 +77,7 @@ public abstract class BaseApiMetadata implements ApiMetadata {
return props;
}
public static abstract class Builder<T extends Builder<T>> implements ApiMetadata.Builder<T> {
public abstract static class Builder<T extends Builder<T>> implements ApiMetadata.Builder<T> {
protected abstract T self();
private String id;

2
core/src/main/java/org/jclouds/collect/IterableWithMarkers.java
View File

@ -88,7 +88,7 @@ public class IterableWithMarkers {
}
}
private static abstract class ForwardingIterableWithMarker<T> extends IterableWithMarker<T> {
private abstract static class ForwardingIterableWithMarker<T> extends IterableWithMarker<T> {
protected abstract IterableWithMarker<T> delegate();

2
core/src/main/java/org/jclouds/collect/internal/Arg0ToPagedIterable.java
View File

@ -97,7 +97,7 @@ public abstract class Arg0ToPagedIterable<T, I extends Arg0ToPagedIterable<T, I>
*
* @author Adrian Cole
*/
public static abstract class FromCaller<T, I extends FromCaller<T, I>> extends Arg0ToPagedIterable<T, I> {
public abstract static class FromCaller<T, I extends FromCaller<T, I>> extends Arg0ToPagedIterable<T, I> {
@Override
protected List<Object> getArgs(GeneratedHttpRequest request) {
return request.getCaller().get().getArgs();

2
core/src/main/java/org/jclouds/concurrent/config/WithSubmissionTrace.java
View File

@ -113,7 +113,7 @@ public class WithSubmissionTrace {
}
}
private final static Set<String> stackTracesToTrim = ImmutableSet.of(WithSubmissionTrace.class.getName(),
private static final Set<String> stackTracesToTrim = ImmutableSet.of(WithSubmissionTrace.class.getName(),
ListeningExecutorService.class.getName(), ListenableFuture.class.getName(),
ListeningScheduledExecutorService.class.getName(), ScheduledFuture.class.getName());

2
core/src/main/java/org/jclouds/fallbacks/HeaderToRetryAfterException.java
View File

@ -123,4 +123,4 @@ public final class HeaderToRetryAfterException implements PropagateIfRetryAfter
return Optional.absent();
}
}
}

2
core/src/main/java/org/jclouds/fallbacks/PropagateIfRetryAfter.java
View File

@ -37,4 +37,4 @@ public interface PropagateIfRetryAfter extends FutureFallback<Object> {
@Override
ListenableFuture<Object> create(Throwable t);
}
}

4
core/src/main/java/org/jclouds/http/UriTemplates.java
View File

@ -18,7 +18,7 @@
*/
package org.jclouds.http;
import static com.google.common.base.Preconditions.*;
import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Map;
@ -72,4 +72,4 @@ public class UriTemplates {
}
return builder.toString();
}
}
}

2
core/src/main/java/org/jclouds/json/internal/NamingStrategies.java
View File

@ -199,7 +199,7 @@ public class NamingStrategies {
/**
* Determines field naming from constructor annotations
*/
public final static class AnnotationConstructorNamingStrategy extends AnnotationBasedNamingStrategy {
public static final class AnnotationConstructorNamingStrategy extends AnnotationBasedNamingStrategy {
private final Predicate<Invokable<?, ?>> hasMarker;
private final Collection<? extends Class<? extends Annotation>> markers;

2
core/src/main/java/org/jclouds/proxy/ProxyConfig.java
View File

@ -59,4 +59,4 @@ public interface ProxyConfig {
*/
Optional<Credentials> getCredentials();
}
}

2
core/src/main/java/org/jclouds/reflect/FunctionalReflection.java
View File

@ -144,4 +144,4 @@ public final class FunctionalReflection {
return invocationFunction.toString();
}
}
}
}

6
core/src/main/java/org/jclouds/reflect/Reflection2.java
View File

@ -306,8 +306,8 @@ public class Reflection2 {
return false;
}
String packageName = clazzPackage.getName();
return (packageName.startsWith("com.sun.") || packageName.startsWith("java.")
|| packageName.startsWith("javax.") || packageName.startsWith("sun."));
return packageName.startsWith("com.sun.") || packageName.startsWith("java.")
|| packageName.startsWith("javax.") || packageName.startsWith("sun.");
}
/**
@ -322,4 +322,4 @@ public class Reflection2 {
throw propagate(e.getCause());
}
}
}
}

2
core/src/main/java/org/jclouds/reflect/Types2.java
View File

@ -42,4 +42,4 @@ public class Types2 {
"unbound type variable: %s, use ctor that explicitly assigns this", type);
return type;
}
}
}

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

@ -52,4 +52,4 @@ public interface InvocationConfig {
* fallback used for Sync or Async commands.
*/
Fallback<?> getFallback(Invocation invocation);
}
}

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

@ -115,4 +115,4 @@ public class ReadAnnotationsAndProperties implements InvocationConfig {
}
});
}
}
}

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

@ -147,4 +147,4 @@ public class SyncToAsyncHttpInvocationModule extends AbstractModule {
}
}), Class.class);
}
}
}

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

@ -61,7 +61,7 @@ public abstract class BaseHttpApiMetadata<A> extends BaseApiMetadata implements
}, apiToken);
}
public static abstract class Builder<A, T extends Builder<A, T>> extends BaseApiMetadata.Builder<T> implements
public abstract static class Builder<A, T extends Builder<A, T>> extends BaseApiMetadata.Builder<T> implements
HttpApiMetadata.Builder<A, T> {
protected Class<A> api;

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

@ -64,7 +64,7 @@ public abstract class BaseRestApiMetadata extends BaseApiMetadata implements Res
}, asyncApiToken);
}
public static abstract class Builder<T extends Builder<T>> extends BaseApiMetadata.Builder<T> implements RestApiMetadata.Builder<T> {
public abstract static class Builder<T extends Builder<T>> extends BaseApiMetadata.Builder<T> implements RestApiMetadata.Builder<T> {
protected Class<?> api;
protected Class<?> asyncApi;

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

@ -272,4 +272,4 @@ public class DelegatesToInvocationFunction<S, F extends Function<Invocation, Obj
return Objects.toStringHelper("").omitNullValues().add("ownerType", ownerType.getRawType().getSimpleName())
.add("methodInvoker", methodInvoker).toString();
}
}
}

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

@ -71,4 +71,4 @@ public final class DelegatesToPotentiallySyncToAsyncInvocationFunction<S, F exte
}
return super.methodInvokerFor(returnType);
}
}
}

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

@ -45,7 +45,7 @@ public final class GeneratedHttpRequest extends HttpRequest {
return new Builder().fromGeneratedHttpRequest(this);
}
public final static class Builder extends HttpRequest.Builder<Builder> {
public static final class Builder extends HttpRequest.Builder<Builder> {
private Invocation invocation;
private Optional<Invocation> caller = Optional.absent();

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

@ -36,4 +36,4 @@ class GetAcceptHeaders implements Function<Invocation, Set<String>> {
Optional.fromNullable(invocation.getInvokable().getOwnerType().getRawType().getAnnotation(Consumes.class)));
return (accept.isPresent()) ? ImmutableSet.copyOf(accept.get().value()) : ImmutableSet.<String> of();
}
}
}

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

@ -223,4 +223,4 @@ public class InvokeHttpMethod implements Function<Invocation, Object> {
public String toString() {
return Objects.toStringHelper("").omitNullValues().add("annotationParser", annotationProcessor).toString();
}
}
}

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

@ -274,4 +274,4 @@ public class InvokeSyncToAsyncHttpMethod implements Function<Invocation, Object>
public String toString() {
return Objects.toStringHelper("").omitNullValues().add("annotationParser", annotationProcessor).toString();
}
}
}

4
core/src/main/java/org/jclouds/rest/internal/RestAnnotationProcessor.java
View File

@ -572,8 +572,8 @@ public class RestAnnotationProcessor implements Function<Invocation, HttpRequest
}
private boolean shouldAddHostHeader(Invocation invocation) {
return (invocation.getInvokable().getOwnerType().getRawType().isAnnotationPresent(VirtualHost.class) || invocation
.getInvokable().isAnnotationPresent(VirtualHost.class));
return invocation.getInvokable().getOwnerType().getRawType().isAnnotationPresent(VirtualHost.class) || invocation
.getInvokable().isAnnotationPresent(VirtualHost.class);
}
private GeneratedHttpRequest decorateRequest(GeneratedHttpRequest request) throws NegativeArraySizeException {

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

@ -225,4 +225,4 @@ public class TransformerForRequest implements Function<HttpRequest, Function<Htt
}
return null;
}
}
}

4
core/src/test/java/org/jclouds/collect/internal/Arg0ToPagedIterableTest.java
View File

@ -41,7 +41,7 @@ import com.google.common.reflect.Invokable;
@Test(testName = "Arg0ToPagedIterableTest")
public class Arg0ToPagedIterableTest {
private static abstract class TestArg0 extends Arg0ToPagedIterable<String, TestArg0> {
private abstract static class TestArg0 extends Arg0ToPagedIterable<String, TestArg0> {
private TestArg0(GeneratedHttpRequest in) {
this.setContext(in);
}
@ -112,7 +112,7 @@ public class Arg0ToPagedIterableTest {
}
}
private static abstract class TestCallerArg0 extends Arg0ToPagedIterable.FromCaller<String, TestCallerArg0> {
private abstract static class TestCallerArg0 extends Arg0ToPagedIterable.FromCaller<String, TestCallerArg0> {
private TestCallerArg0(GeneratedHttpRequest in) {
this.setContext(in);
}

2
drivers/jsch/src/main/java/org/jclouds/ssh/jsch/SessionConnection.java
View File

@ -42,7 +42,7 @@ public final class SessionConnection implements Connection<Session> {
return new Builder();
}
public final static class Builder {
public static final class Builder {
private HostAndPort hostAndPort;
private LoginCredentials loginCredentials;

2
providers/dynect/src/main/java/org/jclouds/dynect/v3/DynECTApi.java
View File

@ -83,4 +83,4 @@ public interface DynECTApi extends Closeable {
*/
@Delegate
RecordApi getRecordApiForZone(@PathParam("zone") String zone);
}
}

2
providers/dynect/src/main/java/org/jclouds/dynect/v3/DynECTExceptions.java
View File

@ -46,4 +46,4 @@ public interface DynECTExceptions {
super(message, cause);
}
}
}
}

2
providers/dynect/src/main/java/org/jclouds/dynect/v3/binders/RecordIdBinder.java
View File

@ -42,4 +42,4 @@ public class RecordIdBinder implements Binder {
.put("id", valueToAppend.getId()).build());
return (R) request.toBuilder().endpoint(path).build();
}
}
}

2
providers/dynect/src/main/java/org/jclouds/dynect/v3/config/DynECTHttpApiModule.java
View File

@ -118,7 +118,7 @@ public class DynECTHttpApiModule extends HttpApiModule<DynECTApi> {
* synchronized to prevent multiple callers from overlapping requests on the same session
*/
@Override
synchronized protected HttpResponse invoke(HttpURLConnection connection) throws IOException, InterruptedException {
protected synchronized HttpResponse invoke(HttpURLConnection connection) throws IOException, InterruptedException {
HttpResponse response = super.invoke(connection);
if (response.getStatusCode() == 200) {
byte[] data = closeClientButKeepContentStream(response);

4
providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/CreatePrimaryZone.java
View File

@ -106,7 +106,7 @@ public final class CreatePrimaryZone {
return builder().from(this);
}
public final static class Builder {
public static final class Builder {
private String fqdn;
private String contact;
private int defaultTTL = 3600;
@ -158,4 +158,4 @@ public final class CreatePrimaryZone {
return CreatePrimaryZone.class.cast(in).getFQDN();
}
}
}
}

2
providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/CreateRecord.java
View File

@ -155,4 +155,4 @@ public class CreateRecord<D extends Map<String, Object>> {
return fqdn(in.getFQDN()).type(in.getType()).ttl(in.getTTL()).rdata(in.getRData());
}
}
}
}

2
providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Record.java
View File

@ -114,4 +114,4 @@ public class Record<D extends Map<String, Object>> extends RecordId {
return this;
}
}
}
}

2
providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/RecordId.java
View File

@ -163,4 +163,4 @@ public class RecordId {
return this;
}
}
}
}

4
providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/SOARecord.java
View File

@ -66,7 +66,7 @@ public final class SOARecord extends Record<SOAData> {
return builder().from(this);
}
public final static class Builder extends Record.Builder<SOAData, Builder> {
public static final class Builder extends Record.Builder<SOAData, Builder> {
private SerialStyle serialStyle;
@ -96,4 +96,4 @@ public final class SOARecord extends Record<SOAData> {
return this;
}
}
}
}

2
providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/SessionCredentials.java
View File

@ -26,7 +26,7 @@ public final class SessionCredentials extends Credentials {
return builder().from(this);
}
public final static class Builder extends Credentials.Builder<SessionCredentials> {
public static final class Builder extends Credentials.Builder<SessionCredentials> {
private String customerName;
private String userName;
private String password;

4
providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Zone.java
View File

@ -156,7 +156,7 @@ public final class Zone {
return builder().from(this);
}
public final static class Builder {
public static final class Builder {
private String fqdn;
private Type type;
private int serial;
@ -202,4 +202,4 @@ public final class Zone {
return this.fqdn(in.fqdn).type(in.type).serial(in.serial).serialStyle(in.serialStyle);
}
}
}
}

4
providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/rdata/AAAAData.java
View File

@ -73,7 +73,7 @@ public class AAAAData extends ForwardingMap<String, Object> {
return builder().from(this);
}
public final static class Builder {
public static final class Builder {
private String address;
/**
@ -92,4 +92,4 @@ public class AAAAData extends ForwardingMap<String, Object> {
return this.address(in.getAddress());
}
}
}
}

4
providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/rdata/AData.java
View File

@ -74,7 +74,7 @@ public class AData extends ForwardingMap<String, Object> {
return builder().from(this);
}
public final static class Builder {
public static final class Builder {
private String address;
/**
@ -93,4 +93,4 @@ public class AData extends ForwardingMap<String, Object> {
return this.address(in.getAddress());
}
}
}
}

4
providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/rdata/CNAMEData.java
View File

@ -75,7 +75,7 @@ public class CNAMEData extends ForwardingMap<String, Object> {
return builder().from(this);
}
public final static class Builder {
public static final class Builder {
private String cname;
/**
@ -94,4 +94,4 @@ public class CNAMEData extends ForwardingMap<String, Object> {
return this.cname(in.getCname());
}
}
}
}

4
providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/rdata/MXData.java
View File

@ -89,7 +89,7 @@ public class MXData extends ForwardingMap<String, Object> {
return builder().from(this);
}
public final static class Builder {
public static final class Builder {
private int preference = -1;
private String exchange;
@ -117,4 +117,4 @@ public class MXData extends ForwardingMap<String, Object> {
return this.preference(in.getPreference()).exchange(in.getExchange());
}
}
}
}

4
providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/rdata/NSData.java
View File

@ -75,7 +75,7 @@ public class NSData extends ForwardingMap<String, Object> {
return builder().from(this);
}
public final static class Builder {
public static final class Builder {
private String nsdname;
/**
@ -94,4 +94,4 @@ public class NSData extends ForwardingMap<String, Object> {
return this.nsdname(in.getNsdname());
}
}
}
}

4
providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/rdata/PTRData.java
View File

@ -74,7 +74,7 @@ public class PTRData extends ForwardingMap<String, Object> {
return builder().from(this);
}
public final static class Builder {
public static final class Builder {
private String ptrdname;
/**
@ -93,4 +93,4 @@ public class PTRData extends ForwardingMap<String, Object> {
return this.ptrdname(in.getPtrdname());
}
}
}
}

4
providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/rdata/SOAData.java
View File

@ -145,7 +145,7 @@ public class SOAData extends ForwardingMap<String, Object> {
return builder().from(this);
}
public final static class Builder {
public static final class Builder {
private String mname;
private String rname;
private int serial = -1;
@ -219,4 +219,4 @@ public class SOAData extends ForwardingMap<String, Object> {
.expire(in.getExpire()).minimum(in.getMinimum());
}
}
}
}

4
providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/rdata/SRVData.java
View File

@ -113,7 +113,7 @@ public class SRVData extends ForwardingMap<String, Object> {
return builder().from(this);
}
public final static class Builder {
public static final class Builder {
private int priority = -1;
private int weight = -1;
private int port = -1;
@ -159,4 +159,4 @@ public class SRVData extends ForwardingMap<String, Object> {
return this.priority(in.getPriority()).weight(in.getWeight()).port(in.getPort()).target(in.getTarget());
}
}
}
}

2
providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/rdata/SSHFPData.java
View File

@ -85,7 +85,7 @@ public class SSHFPData extends ForwardingMap<String, Object> {
return fingerprint;
}
public final static class Builder {
public static final class Builder {
private int algorithm;
private int fptype;
private String fingerprint;

4
providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/rdata/TXTData.java
View File

@ -74,7 +74,7 @@ public class TXTData extends ForwardingMap<String, Object> {
return builder().from(this);
}
public final static class Builder {
public static final class Builder {
private String txtdata;
/**
@ -93,4 +93,4 @@ public class TXTData extends ForwardingMap<String, Object> {
return this.txtdata(in.getTxtdata());
}
}
}
}

2
providers/dynect/src/main/java/org/jclouds/dynect/v3/features/RecordApi.java
View File

@ -379,4 +379,4 @@ public interface RecordApi {
@Nullable
Record<TXTData> getTXT(@PathParam("fqdn") String fqdn, @PathParam("id") long recordId)
throws JobStillRunningException;
}
}

2
providers/dynect/src/main/java/org/jclouds/dynect/v3/features/SessionApi.java
View File

@ -60,4 +60,4 @@ public interface SessionApi {
@Named("DELETE:Session")
@DELETE
void logout(@HeaderParam("Auth-Token") String token);
}
}

2
providers/dynect/src/main/java/org/jclouds/dynect/v3/features/ZoneApi.java
View File

@ -219,4 +219,4 @@ public interface ZoneApi {
@Payload("{\"thaw\":true}")
@Consumes(APPLICATION_JSON)
Job thaw(@PathParam("fqdn") String fqdn) throws JobStillRunningException;
}
}

Some files were not shown because too many files have changed in this diff Show More