Merge pull request #996 from jclouds/undo-serializable

undid Serializable and added checkstyle
This commit is contained in:
Adrian Cole 2012-11-19 17:45:04 -08:00
commit 9f95ff1476
220 changed files with 47 additions and 724 deletions

View File

@ -42,11 +42,7 @@ import com.google.inject.Module;
*/
public class AtmosApiMetadata extends BaseRestApiMetadata {
/** The serialVersionUID */
private static final long serialVersionUID = 8067252472547486854L;
public static final TypeToken<RestContext<AtmosClient, AtmosAsyncClient>> CONTEXT_TOKEN = new TypeToken<RestContext<AtmosClient, AtmosAsyncClient>>() {
private static final long serialVersionUID = -5070937833892503232L;
};

View File

@ -33,8 +33,6 @@ import org.jclouds.http.HttpResponseException;
*/
public class AtmosResponseException extends HttpResponseException {
private static final long serialVersionUID = 1L;
private AtmosError error;
public AtmosResponseException(HttpCommand command, HttpResponse response,

View File

@ -34,8 +34,6 @@ import com.google.common.collect.Iterables;
*/
public class BoundedLinkedHashSet<T> extends LinkedHashSet<T> implements BoundedSet<T> {
/** The serialVersionUID */
private static final long serialVersionUID = -7133632087734650835L;
protected final String token;
public BoundedLinkedHashSet(Iterable<T> contents, @Nullable String token) {

View File

@ -42,9 +42,6 @@ import com.google.inject.Module;
*/
public class BYONApiMetadata extends BaseApiMetadata {
/** The serialVersionUID */
private static final long serialVersionUID = -4059125995177393819L;
@Override
public Builder toBuilder() {
return new Builder().fromApiMetadata(this);

View File

@ -43,11 +43,7 @@ import com.google.inject.TypeLiteral;
*/
public class CloudFilesApiMetadata extends SwiftApiMetadata {
/** The serialVersionUID */
private static final long serialVersionUID = -1572520638079261710L;
public static final TypeToken<RestContext<CloudFilesClient, CloudFilesAsyncClient>> CONTEXT_TOKEN = new TypeToken<RestContext<CloudFilesClient, CloudFilesAsyncClient>>() {
private static final long serialVersionUID = -5070937833892503232L;
};
private static Builder builder() {

View File

@ -39,14 +39,9 @@ import com.google.inject.Module;
*/
public class CloudLoadBalancersApiMetadata extends BaseRestApiMetadata {
/** The serialVersionUID */
private static final long serialVersionUID = 6725672099385580694L;
public static final TypeToken<RestContext<CloudLoadBalancersClient, CloudLoadBalancersAsyncClient>> CONTEXT_TOKEN = new TypeToken<RestContext<CloudLoadBalancersClient, CloudLoadBalancersAsyncClient>>() {
private static final long serialVersionUID = -5070937833892503232L;
};
@Override
public Builder toBuilder() {
return new Builder().fromApiMetadata(this);

View File

@ -39,11 +39,7 @@ import com.google.inject.Module;
*/
public class CloudServersApiMetadata extends BaseRestApiMetadata {
/** The serialVersionUID */
private static final long serialVersionUID = 6725672099385580694L;
public static final TypeToken<RestContext<CloudServersClient, CloudServersAsyncClient>> CONTEXT_TOKEN = new TypeToken<RestContext<CloudServersClient, CloudServersAsyncClient>>() {
private static final long serialVersionUID = -5070937833892503232L;
};
@Override

View File

@ -41,11 +41,8 @@ import com.google.inject.Module;
* @author Adrian Cole
*/
public class CloudSigmaApiMetadata extends BaseRestApiMetadata {
/** The serialVersionUID */
private static final long serialVersionUID = 6725672099385580694L;
public static final TypeToken<RestContext<CloudSigmaClient, CloudSigmaAsyncClient>> CONTEXT_TOKEN = new TypeToken<RestContext<CloudSigmaClient, CloudSigmaAsyncClient>>() {
private static final long serialVersionUID = -5070937833892503232L;
};
@Override

View File

@ -23,8 +23,6 @@ package org.jclouds.cloudstack;
*/
public class AsyncJobException extends RuntimeException {
private static final long serialVersionUID = -9174243454135616477L;
public AsyncJobException() {
}

View File

@ -51,11 +51,7 @@ import com.google.inject.Module;
*/
public class CloudStackApiMetadata extends BaseRestApiMetadata {
/** The serialVersionUID */
private static final long serialVersionUID = -3936131452958663245L;
public static final TypeToken<RestContext<CloudStackClient, CloudStackAsyncClient>> CONTEXT_TOKEN = new TypeToken<RestContext<CloudStackClient, CloudStackAsyncClient>>() {
private static final long serialVersionUID = -5070937833892503232L;
};
@Override

View File

@ -68,7 +68,6 @@ public class BlockUntilJobCompletesAndReturnResult {
if (jobWithResult.getError() != null)
throw new UncheckedExecutionException(String.format("job %s failed with exception %s", job.getJobId(),
jobWithResult.getError().toString())) {
private static final long serialVersionUID = 4371112085613620239L;
};
return jobWithResult.getResult();
}

View File

@ -165,7 +165,6 @@ public class VirtualMachineClientLiveTest extends BaseCloudStackClientLiveTest {
if (jobWithResult.getError() != null)
Throwables.propagate(new ExecutionException(String.format("job %s failed with exception %s", job.getId(),
jobWithResult.getError().toString())) {
private static final long serialVersionUID = 4371112085613620239L;
});
VirtualMachine vm = jobWithResult.getResult();
if (vm.isPasswordEnabled()) {

View File

@ -38,11 +38,7 @@ import com.google.common.reflect.TypeToken;
*/
public class CloudWatchApiMetadata extends BaseRestApiMetadata {
/** The serialVersionUID */
private static final long serialVersionUID = 3450830053589179249L;
public static final TypeToken<RestContext<CloudWatchApi, CloudWatchAsyncApi>> CONTEXT_TOKEN = new TypeToken<RestContext<CloudWatchApi, CloudWatchAsyncApi>>() {
private static final long serialVersionUID = -5070937833892503232L;
};
@Override

View File

@ -39,11 +39,7 @@ import com.google.inject.Module;
*/
public class DeltacloudApiMetadata extends BaseRestApiMetadata {
/** The serialVersionUID */
private static final long serialVersionUID = 6725672099385580694L;
public static final TypeToken<RestContext<DeltacloudClient, DeltacloudAsyncClient>> CONTEXT_TOKEN = new TypeToken<RestContext<DeltacloudClient, DeltacloudAsyncClient>>() {
private static final long serialVersionUID = -5070937833892503232L;
};
@Override

View File

@ -20,16 +20,13 @@ package org.jclouds.deltacloud.domain;
import static com.google.common.base.Preconditions.checkNotNull;
import java.io.Serializable;
/**
*
* @author Adrian Cole
*/
public class KeyAuthentication implements Instance.Authentication, Serializable {
public class KeyAuthentication implements Instance.Authentication {
/** The serialVersionUID */
private static final long serialVersionUID = 7669076186483470376L;
private final String keyName;
public KeyAuthentication(String keyName) {

View File

@ -20,7 +20,6 @@ package org.jclouds.deltacloud.domain;
import static com.google.common.base.Preconditions.checkNotNull;
import java.io.Serializable;
import org.jclouds.domain.LoginCredentials;
@ -28,10 +27,8 @@ import org.jclouds.domain.LoginCredentials;
*
* @author Adrian Cole
*/
public class PasswordAuthentication implements Instance.Authentication, Serializable {
public class PasswordAuthentication implements Instance.Authentication {
/** The serialVersionUID */
private static final long serialVersionUID = 7669076186483470376L;
private final LoginCredentials login;
public PasswordAuthentication(LoginCredentials login) {

View File

@ -59,11 +59,7 @@ import com.google.inject.Module;
*/
public class EC2ApiMetadata extends BaseRestApiMetadata {
/** The serialVersionUID */
private static final long serialVersionUID = 4424763314988423886L;
public static final TypeToken<RestContext<? extends EC2Client, ? extends EC2AsyncClient>> CONTEXT_TOKEN = new TypeToken<RestContext<? extends EC2Client, ? extends EC2AsyncClient>>() {
private static final long serialVersionUID = -5070937833892503232L;
};
@Override

View File

@ -20,7 +20,6 @@ public class BaseEC2ApiLiveTest extends BaseContextLiveTest<RestContext<? extend
@Override
protected TypeToken<RestContext<? extends EC2Api, ? extends EC2AsyncApi>> contextType() {
return new TypeToken<RestContext<? extends EC2Api, ? extends EC2AsyncApi>>() {
private static final long serialVersionUID = -5070937833892503232L;
};
}

View File

@ -41,11 +41,7 @@ import com.google.inject.Module;
*/
public class ElasticStackApiMetadata extends BaseRestApiMetadata {
/** The serialVersionUID */
private static final long serialVersionUID = 6725672099385580694L;
public static final TypeToken<RestContext<ElasticStackClient, ElasticStackAsyncClient>> CONTEXT_TOKEN = new TypeToken<RestContext<ElasticStackClient, ElasticStackAsyncClient>>() {
private static final long serialVersionUID = -5070937833892503232L;
};
@Override

View File

@ -39,8 +39,6 @@ import com.google.inject.Module;
* @author Adrian Cole
*/
public class EucalyptusApiMetadata extends EC2ApiMetadata {
/** The serialVersionUID */
private static final long serialVersionUID = 3060225665040763827L;
private static Builder builder() {
return new Builder();

View File

@ -31,9 +31,6 @@ import org.jclouds.filesystem.config.FilesystemBlobStoreContextModule;
*/
public class FilesystemApiMetadata extends BaseApiMetadata {
/** The serialVersionUID */
private static final long serialVersionUID = -2625620001657309404L;
public static Builder builder() {
return new Builder();
}

View File

@ -39,11 +39,7 @@ import com.google.inject.Module;
*/
public class NovaApiMetadata extends BaseRestApiMetadata {
/** The serialVersionUID */
private static final long serialVersionUID = 6725672099385580694L;
public static final TypeToken<RestContext<NovaClient, NovaAsyncClient>> CONTEXT_TOKEN = new TypeToken<RestContext<NovaClient, NovaAsyncClient>>() {
private static final long serialVersionUID = -5070937833892503232L;
};
@Override

View File

@ -45,10 +45,7 @@ import com.google.inject.Module;
*/
public class CinderApiMetadata extends BaseRestApiMetadata {
private static final long serialVersionUID = 4525672099385581765L;
public static final TypeToken<RestContext<CinderApi, CinderAsyncApi>> CONTEXT_TOKEN = new TypeToken<RestContext<CinderApi, CinderAsyncApi>>() {
private static final long serialVersionUID = -2850937833892503251L;
};
@Override

View File

@ -45,12 +45,7 @@ import com.google.inject.Module;
*/
public class KeystoneApiMetadata extends BaseRestApiMetadata {
/** The serialVersionUID */
private static final long serialVersionUID = 6725672099385580694L;
public static final TypeToken<RestContext<? extends KeystoneApi,? extends KeystoneAsyncApi>> CONTEXT_TOKEN = new TypeToken<RestContext<? extends KeystoneApi,? extends KeystoneAsyncApi>>() {
private static final long serialVersionUID = -5070937833892503232L;
};
@Override

View File

@ -46,11 +46,7 @@ import com.google.inject.Module;
*/
public class NovaEC2ApiMetadata extends EC2ApiMetadata {
/** The serialVersionUID */
private static final long serialVersionUID = -8539835226183747429L;
public static final TypeToken<RestContext<NovaEC2Client, NovaEC2AsyncClient>> CONTEXT_TOKEN = new TypeToken<RestContext<NovaEC2Client, NovaEC2AsyncClient>>() {
private static final long serialVersionUID = -6449920293625658712L;
};
private static Builder builder() {

View File

@ -50,11 +50,7 @@ import com.google.inject.Module;
*/
public class NovaApiMetadata extends BaseRestApiMetadata {
/** The serialVersionUID */
private static final long serialVersionUID = 6725672099385580694L;
public static final TypeToken<RestContext<NovaApi, NovaAsyncApi>> CONTEXT_TOKEN = new TypeToken<RestContext<NovaApi, NovaAsyncApi>>() {
private static final long serialVersionUID = -5070937833892503232L;
};
@Override

View File

@ -46,11 +46,7 @@ import com.google.inject.Module;
*/
public class CloudIdentityApiMetadata extends KeystoneApiMetadata {
/** The serialVersionUID */
private static final long serialVersionUID = -1572520638079261710L;
public static final TypeToken<RestContext<KeystoneApi, KeystoneAsyncApi>> CONTEXT_TOKEN = new TypeToken<RestContext<KeystoneApi, KeystoneAsyncApi>>() {
private static final long serialVersionUID = -5070937833892503232L;
};
private static Builder builder() {

View File

@ -62,11 +62,7 @@ import com.google.inject.Module;
*/
public class S3ApiMetadata extends BaseRestApiMetadata {
/** The serialVersionUID */
private static final long serialVersionUID = 820062881469203616L;
public static final TypeToken<RestContext<? extends S3Client,? extends S3AsyncClient>> CONTEXT_TOKEN = new TypeToken<RestContext<? extends S3Client,? extends S3AsyncClient>>() {
private static final long serialVersionUID = -5070937833892503232L;
};
@Override

View File

@ -20,7 +20,6 @@ package org.jclouds.s3.domain.internal;
import static com.google.common.base.Preconditions.checkNotNull;
import java.io.Serializable;
import java.net.URI;
import java.util.Date;
import java.util.Map;
@ -37,10 +36,7 @@ import com.google.common.collect.ImmutableMap;
*
* @author Adrian Cole
*/
public class BucketListObjectMetadata implements Serializable, ObjectMetadata {
/** The serialVersionUID */
private static final long serialVersionUID = -4415449798024051115L;
public class BucketListObjectMetadata implements ObjectMetadata {
private final String key;
private final String bucket;

View File

@ -18,7 +18,6 @@
*/
package org.jclouds.s3.domain.internal;
import java.io.Serializable;
import java.net.URI;
import java.util.Date;
import java.util.Map;
@ -35,10 +34,7 @@ import com.google.common.collect.ImmutableMap;
*
* @author Adrian Cole
*/
public class CopyObjectResult implements Serializable, ObjectMetadata {
/** The serialVersionUID */
private static final long serialVersionUID = -4415449798024051115L;
public class CopyObjectResult implements ObjectMetadata {
private final Date lastModified;
private final String eTag;

View File

@ -32,8 +32,7 @@ import com.google.common.collect.Iterables;
*
*/
public class ListBucketResponseImpl extends LinkedHashSet<ObjectMetadata> implements ListBucketResponse {
/** The serialVersionUID */
private static final long serialVersionUID = -4475709781001190244L;
protected final String name;
protected final String prefix;
protected final int maxKeys;

View File

@ -18,7 +18,6 @@
*/
package org.jclouds.s3.domain.internal;
import java.io.Serializable;
import java.net.URI;
import java.util.Date;
import java.util.Map;
@ -37,10 +36,7 @@ import com.google.common.collect.Maps;
*
* @author Adrian Cole
*/
public class MutableObjectMetadataImpl implements Serializable, MutableObjectMetadata {
/** The serialVersionUID */
private static final long serialVersionUID = -4648755473986695062L;
public class MutableObjectMetadataImpl implements MutableObjectMetadata {
private String key;
private String bucket;

View File

@ -42,11 +42,7 @@ import com.google.inject.Module;
*/
public class SQSApiMetadata extends BaseRestApiMetadata {
/** The serialVersionUID */
private static final long serialVersionUID = -7077953935392202824L;
public static final TypeToken<RestContext<SQSApi, SQSAsyncApi>> CONTEXT_TOKEN = new TypeToken<RestContext<SQSApi, SQSAsyncApi>>() {
private static final long serialVersionUID = -5070937833892503232L;
};
@Override

View File

@ -53,7 +53,4 @@ public class CopyObjectException extends ResourceNotFoundException {
return destinationPath;
}
/** The serialVersionUID */
private static final long serialVersionUID = -2272965726680721281L;
}

View File

@ -43,11 +43,8 @@ import com.google.inject.Module;
* @author Adrian Cole
*/
public class SwiftApiMetadata extends BaseRestApiMetadata {
/** The serialVersionUID */
private static final long serialVersionUID = 6725672099385580694L;
public static final TypeToken<RestContext<SwiftClient, SwiftAsyncClient>> CONTEXT_TOKEN = new TypeToken<RestContext<SwiftClient, SwiftAsyncClient>>() {
private static final long serialVersionUID = -5070937833892503232L;
};
@Override

View File

@ -45,11 +45,7 @@ import com.google.inject.Module;
*/
public class SwiftKeystoneApiMetadata extends SwiftApiMetadata {
/** The serialVersionUID */
private static final long serialVersionUID = 820062881469203616L;
public static final TypeToken<RestContext<SwiftKeystoneClient, SwiftKeystoneAsyncClient>> CONTEXT_TOKEN = new TypeToken<RestContext<SwiftKeystoneClient, SwiftKeystoneAsyncClient>>() {
private static final long serialVersionUID = -5070937833892503232L;
};
private static Builder builder() {

View File

@ -33,8 +33,7 @@ import org.jclouds.openstack.swift.domain.ObjectInfo;
*/
public class DelegatingMutableObjectInfoWithMetadata extends BaseMutableContentMetadata implements
MutableObjectInfoWithMetadata {
/** The serialVersionUID */
private static final long serialVersionUID = 5280642704532078500L;
private final MutableObjectInfoWithMetadata delegate;
public DelegatingMutableObjectInfoWithMetadata(MutableObjectInfoWithMetadata delegate) {

View File

@ -27,8 +27,6 @@ import org.jclouds.vcloud.domain.Task;
*/
public class TaskInErrorStateException extends RuntimeException {
private static final long serialVersionUID = 1L;
private final Task task;
public TaskInErrorStateException(Task task) {

View File

@ -27,8 +27,6 @@ import org.jclouds.vcloud.domain.Task;
*/
public class TaskStillRunningException extends RuntimeException {
private static final long serialVersionUID = 1L;
private final Task task;
public TaskStillRunningException(Task task) {

View File

@ -48,11 +48,7 @@ import com.google.inject.Module;
*/
public class VCloudApiMetadata extends BaseRestApiMetadata {
/** The serialVersionUID */
private static final long serialVersionUID = 6725672099385580694L;
public static final TypeToken<RestContext<VCloudClient, VCloudAsyncClient>> CONTEXT_TOKEN = new TypeToken<RestContext<VCloudClient, VCloudAsyncClient>>() {
private static final long serialVersionUID = -5070937833892503232L;
};
@Override

View File

@ -31,8 +31,6 @@ import org.jclouds.vcloud.domain.VCloudError;
*/
public class VCloudResponseException extends HttpResponseException {
private static final long serialVersionUID = 1L;
private org.jclouds.vcloud.domain.VCloudError error;
public VCloudResponseException(HttpCommand command, HttpResponse response, VCloudError error) {

View File

@ -41,8 +41,6 @@ import com.google.common.collect.Lists;
*/
public class CatalogImpl extends LinkedHashMap<String, ReferenceType> implements Catalog {
/** The serialVersionUID */
private static final long serialVersionUID = 8464716396538298809L;
private final String name;
private final String type;
private final URI href;

View File

@ -39,8 +39,6 @@ import com.google.inject.Module;
* @author Adrian Cole
*/
public class WalrusApiMetadata extends S3ApiMetadata {
/** The serialVersionUID */
private static final long serialVersionUID = 820062881469203616L;
private static Builder builder() {
return new Builder();

View File

@ -41,11 +41,7 @@ import com.google.inject.Module;
*/
public class ${providerName}ApiMetadata extends BaseRestApiMetadata {
/** The serialVersionUID */
private static final long serialVersionUID = 6725672099385580694L;
public static final TypeToken<RestContext<${providerName}Api, ${providerName}AsyncApi>> CONTEXT_TOKEN = new TypeToken<RestContext<${providerName}Api, ${providerName}AsyncApi>>() {
private static final long serialVersionUID = -5070937833892503232L;
};
@Override

View File

@ -46,7 +46,4 @@ public class ContainerNotFoundException extends ResourceNotFoundException {
return container;
}
/** The serialVersionUID */
private static final long serialVersionUID = -2272965726680821281L;
}

View File

@ -50,7 +50,4 @@ public class KeyAlreadyExistsException extends RuntimeException {
return key;
}
/** The serialVersionUID */
private static final long serialVersionUID = -2272965726680821281L;
}

View File

@ -52,7 +52,4 @@ public class KeyNotFoundException extends ResourceNotFoundException {
return key;
}
/** The serialVersionUID */
private static final long serialVersionUID = -2272965726680821281L;
}

View File

@ -30,9 +30,6 @@ import org.jclouds.blobstore.config.TransientBlobStoreContextModule;
*/
public class TransientApiMetadata extends BaseApiMetadata {
/** The serialVersionUID */
private static final long serialVersionUID = -6541485071006878726L;
public static Builder builder() {
return new Builder();
}

View File

@ -20,7 +20,6 @@ package org.jclouds.blobstore.domain.internal;
import static com.google.common.base.Preconditions.checkNotNull;
import java.io.Serializable;
import java.net.URI;
import java.util.Date;
import java.util.Map;
@ -36,9 +35,8 @@ import org.jclouds.javax.annotation.Nullable;
*
* @author Adrian Cole
*/
public class BlobMetadataImpl extends StorageMetadataImpl implements Serializable, BlobMetadata {
/** The serialVersionUID */
private static final long serialVersionUID = -5932618957134612231L;
public class BlobMetadataImpl extends StorageMetadataImpl implements BlobMetadata {
private final URI publicUri;
private final String container;
private final ContentMetadata contentMetadata;

View File

@ -33,8 +33,7 @@ import org.jclouds.io.payloads.BaseMutableContentMetadata;
* @author Adrian Cole
*/
public class MutableBlobMetadataImpl extends MutableStorageMetadataImpl implements MutableBlobMetadata {
/** The serialVersionUID */
private static final long serialVersionUID = -5932618957134612231L;
private MutableContentMetadata contentMetadata;
private URI publicUri;
private String container;

View File

@ -18,7 +18,6 @@
*/
package org.jclouds.blobstore.domain.internal;
import java.io.Serializable;
import java.util.Date;
import org.jclouds.blobstore.domain.MutableStorageMetadata;
@ -32,10 +31,7 @@ import org.jclouds.domain.internal.MutableResourceMetadataImpl;
* @author Adrian Cole
*/
public class MutableStorageMetadataImpl extends MutableResourceMetadataImpl<StorageType> implements
MutableStorageMetadata, Serializable {
/** The serialVersionUID */
private static final long serialVersionUID = -280558162576368264L;
MutableStorageMetadata {
private String eTag;
private Date lastModified;

View File

@ -27,8 +27,6 @@ import com.google.common.collect.Iterables;
public class PageSetImpl<T> extends LinkedHashSet<T> implements PageSet<T> {
/** The serialVersionUID */
private static final long serialVersionUID = -7133632087734650835L;
protected final String marker;
public PageSetImpl(Iterable<? extends T> contents, @Nullable String nextMarker) {

View File

@ -20,7 +20,6 @@ package org.jclouds.blobstore.domain.internal;
import static com.google.common.base.Preconditions.checkNotNull;
import java.io.Serializable;
import java.net.URI;
import java.util.Date;
import java.util.Map;
@ -36,10 +35,7 @@ import org.jclouds.javax.annotation.Nullable;
*
* @author Adrian Cole
*/
public class StorageMetadataImpl extends ResourceMetadataImpl<StorageType> implements StorageMetadata, Serializable {
/** The serialVersionUID */
private static final long serialVersionUID = -280558162576368264L;
public class StorageMetadataImpl extends ResourceMetadataImpl<StorageType> implements StorageMetadata {
@Nullable
private final String eTag;

View File

@ -19,7 +19,6 @@
package org.jclouds.blobstore.internal;
public class BlobRuntimeException extends RuntimeException {
private static final long serialVersionUID = 1L;
public BlobRuntimeException(String s) {
super(s);

View File

@ -20,14 +20,8 @@ package org.jclouds.blobstore.util;
import static com.google.common.base.Preconditions.checkNotNull;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.ObjectInput;
import java.io.ObjectInputStream;
import java.io.ObjectOutput;
import java.io.ObjectOutputStream;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@ -41,6 +35,7 @@ import org.jclouds.blobstore.domain.Blob;
import org.jclouds.blobstore.domain.BlobMetadata;
import org.jclouds.blobstore.domain.MutableBlobMetadata;
import org.jclouds.blobstore.domain.StorageMetadata;
import org.jclouds.blobstore.domain.internal.MutableBlobMetadataImpl;
import org.jclouds.blobstore.functions.BlobName;
import org.jclouds.functions.ExceptionToValueOrPropagate;
import org.jclouds.http.HttpRequest;
@ -49,7 +44,6 @@ import org.jclouds.http.HttpUtils;
import org.jclouds.rest.internal.GeneratedHttpRequest;
import org.jclouds.util.Strings2;
import com.google.common.base.Throwables;
import com.google.common.collect.Maps;
import com.google.common.reflect.TypeToken;
import com.google.common.util.concurrent.Futures;
@ -171,19 +165,9 @@ public class BlobStoreUtils {
}
public static MutableBlobMetadata copy(MutableBlobMetadata in) {
ByteArrayOutputStream bout = new ByteArrayOutputStream();
ObjectOutput os;
try {
os = new ObjectOutputStream(bout);
os.writeObject(in);
ObjectInput is = new ObjectInputStream(new ByteArrayInputStream(bout.toByteArray()));
MutableBlobMetadata metadata = (MutableBlobMetadata) is.readObject();
MutableBlobMetadata metadata = new MutableBlobMetadataImpl(in);
convertUserMetadataKeysToLowercase(metadata);
HttpUtils.copy(in.getContentMetadata(), metadata.getContentMetadata());
return metadata;
} catch (Exception e) {
throw Throwables.propagate(e);
}
}
public static MutableBlobMetadata copy(MutableBlobMetadata in, String newKey) {

View File

@ -34,8 +34,6 @@ import org.jclouds.http.HttpResponseException;
*/
public class AWSResponseException extends HttpResponseException {
private static final long serialVersionUID = 1L;
private AWSError error = new AWSError();
public AWSResponseException(HttpCommand command, HttpResponse response, AWSError error) {

View File

@ -34,8 +34,6 @@ import org.jclouds.http.HttpResponseException;
*/
public class AzureStorageResponseException extends HttpResponseException {
private static final long serialVersionUID = 1L;
private AzureStorageError error = new AzureStorageError();
public AzureStorageResponseException(HttpCommand command, HttpResponse response, AzureStorageError error) {

View File

@ -32,8 +32,6 @@ import com.google.common.collect.Iterables;
*/
public class BoundedHashSet<T> extends HashSet<T> implements BoundedSet<T> {
/** The serialVersionUID */
private static final long serialVersionUID = -7133632087734650835L;
protected final URI url;
protected final String prefix;
protected final String marker;

View File

@ -31,8 +31,6 @@ import org.jclouds.trmk.vcloud_0_8.domain.VCloudError;
*/
public class VCloudResponseException extends HttpResponseException {
private static final long serialVersionUID = 1L;
private org.jclouds.trmk.vcloud_0_8.domain.VCloudError error;
public VCloudResponseException(HttpCommand command, HttpResponse response, VCloudError error) {

View File

@ -36,8 +36,6 @@ import org.jclouds.trmk.vcloud_0_8.domain.ReferenceType;
*/
public class CatalogImpl extends LinkedHashMap<String, ReferenceType> implements Catalog {
/** The serialVersionUID */
private static final long serialVersionUID = 8464716396538298809L;
private final String name;
private final String type;
private final URI href;

View File

@ -24,9 +24,6 @@ import org.jclouds.rest.internal.BaseRestApiMetadata;
*/
public abstract class TerremarkVCloudApiMetadata extends BaseRestApiMetadata {
/** The serialVersionUID */
private static final long serialVersionUID = 866164758867358381L;
protected TerremarkVCloudApiMetadata(Builder builder) {
super(builder);
}

View File

@ -33,8 +33,6 @@ import org.jclouds.compute.domain.Template;
*/
public class RunNodesException extends Exception {
/** The serialVersionUID */
private static final long serialVersionUID = -2272965726680821281L;
private final String group;
private final int count;
private final Template template;

View File

@ -35,8 +35,6 @@ import org.jclouds.scriptbuilder.domain.Statement;
*/
public class RunScriptOnNodesException extends Exception {
/** The serialVersionUID */
private static final long serialVersionUID = -2272965726680821281L;
private final Statement runScript;
private final RunScriptOptions options;
private final Map<NodeMetadata, ExecResponse> successfulNodes;

View File

@ -35,9 +35,6 @@ import com.google.common.util.concurrent.ListenableFuture;
*/
public class ScriptStillRunningException extends TimeoutException implements Supplier<ListenableFuture<ExecResponse>> {
/** The serialVersionUID */
private static final long serialVersionUID = -7265376839848564663L;
private final ListenableFuture<ExecResponse> delegate;
public ScriptStillRunningException(long timeout, TimeUnit unit, ListenableFuture<ExecResponse> delegate) {

View File

@ -22,7 +22,6 @@ import static com.google.common.base.Objects.equal;
import static com.google.common.base.Objects.toStringHelper;
import static com.google.common.base.Preconditions.checkArgument;
import java.io.Serializable;
import java.util.List;
import org.jclouds.compute.options.TemplateOptions;
@ -119,9 +118,7 @@ import com.google.common.collect.ImmutableMap;
* @since 1.5
*/
@Beta
public class TemplateBuilderSpec implements Serializable {
private static final long serialVersionUID = -379469670373111569L;
public class TemplateBuilderSpec {
/** Parses a single value. */
protected static interface ValueParser {

View File

@ -39,8 +39,7 @@ import com.google.common.collect.ImmutableSet;
* @author Ivan Meredith
*/
public class ComputeMetadataImpl extends ResourceMetadataImpl<ComputeType> implements ComputeMetadata {
/** The serialVersionUID */
private static final long serialVersionUID = 7374704415964898694L;
private final String id;
private final ComputeType type;
protected final Set<String> tags;

View File

@ -46,8 +46,6 @@ import com.google.common.collect.ImmutableList;
*/
public class HardwareImpl extends ComputeMetadataImpl implements Hardware {
/** The serialVersionUID */
private static final long serialVersionUID = 8994255275911717567L;
private final List<Processor> processors;
private final int ram;
private final List<Volume> volumes;

View File

@ -39,9 +39,6 @@ import com.google.common.base.Objects.ToStringHelper;
*/
public class ImageImpl extends ComputeMetadataImpl implements Image {
/** The serialVersionUID */
private static final long serialVersionUID = 7856744554191025307L;
private final OperatingSystem operatingSystem;
private final Status status;
private final String backendStatus;

View File

@ -42,9 +42,6 @@ import com.google.common.collect.ImmutableSet;
*/
public class NodeMetadataImpl extends ComputeMetadataImpl implements NodeMetadata {
/** The serialVersionUID */
private static final long serialVersionUID = 7924307572338157887L;
private final Status status;
private final String backendStatus;
private final int loginPort;

View File

@ -31,9 +31,6 @@ import org.jclouds.compute.stub.config.StubComputeServiceContextModule;
*/
public class StubApiMetadata extends BaseApiMetadata {
/** The serialVersionUID */
private static final long serialVersionUID = -4880642520937391337L;
public static Builder builder() {
return new Builder();
}

View File

@ -23,9 +23,6 @@ package org.jclouds.ssh;
*/
public class SshException extends RuntimeException {
/** The serialVersionUID */
private static final long serialVersionUID = 7271048517353750433L;
public SshException() {
super();
}

View File

@ -26,7 +26,6 @@ import static org.easymock.EasyMock.reportMatcher;
import static org.testng.Assert.assertEquals;
import java.io.IOException;
import java.io.Serializable;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ExecutionException;
@ -390,9 +389,7 @@ public class StubComputeServiceIntegrationTest extends BaseComputeServiceLiveTes
return null;
}
private static class PayloadEquals implements IArgumentMatcher, Serializable {
private static final long serialVersionUID = 583055160049982067L;
private static class PayloadEquals implements IArgumentMatcher {
private final Object expected;

View File

@ -18,7 +18,6 @@
*/
package org.jclouds.apis;
import java.io.Serializable;
import java.net.URI;
import java.util.Properties;
import java.util.Set;
@ -40,7 +39,7 @@ import com.google.inject.Module;
* @since 1.5
*/
@Beta
public interface ApiMetadata extends Serializable {
public interface ApiMetadata {
public static interface Builder {
/**

View File

@ -58,9 +58,6 @@ import com.google.inject.Module;
*/
public abstract class BaseApiMetadata implements ApiMetadata {
/** The serialVersionUID */
private static final long serialVersionUID = -8080028444066498110L;
public static Properties defaultProperties() {
Properties props = new Properties();
// TODO: move this to ApiMetadata
@ -268,8 +265,6 @@ public abstract class BaseApiMetadata implements ApiMetadata {
@Override
public ApiMetadata build() {
return new BaseApiMetadata(this) {
/** The serialVersionUID */
private static final long serialVersionUID = 3599854558038790678L;
};
}

View File

@ -21,7 +21,6 @@ package org.jclouds.collect;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Predicates.notNull;
import java.io.Serializable;
import java.util.Set;
import com.google.common.base.Function;
@ -33,9 +32,7 @@ import com.google.common.collect.FluentIterable;
*
* @author Adrian Cole
*/
public class TransformingSetSupplier<F, T> implements Supplier<Set<? extends T>>, Serializable {
/** The serialVersionUID */
private static final long serialVersionUID = -8747953419394840218L;
public class TransformingSetSupplier<F, T> implements Supplier<Set<? extends T>> {
private final Supplier<Iterable<F>> backingSupplier;
private final Function<F, T> converter;

View File

@ -95,7 +95,6 @@ public class DynamicThreadPoolExecutor extends ThreadPoolExecutor {
* @author kimchy (Shay Banon)
*/
public static class DynamicQueue<E> extends LinkedBlockingQueue<E> {
private static final long serialVersionUID = 1L;
/**
* The executor this Queue belongs to

View File

@ -31,9 +31,6 @@ import com.google.common.collect.Iterables;
*/
public final class TransformParallelException extends RuntimeException {
/** The serialVersionUID */
private static final long serialVersionUID = 1L;
private final Map<?, Future<?>> success;
private final Map<?, Exception> exceptions;

View File

@ -29,9 +29,8 @@ import org.jclouds.util.Patterns;
* @author Adrian Cole
* @see <a href="http://code.google.com/p/google-gson/issues/detail?id=326"/>
*/
public class JsonBall implements java.io.Serializable, Comparable<String>, CharSequence {
public class JsonBall implements Comparable<String>, CharSequence {
private static final long serialVersionUID = -8168997021767065199L;
private final String value;
@Override

View File

@ -21,7 +21,6 @@ package org.jclouds.domain.internal;
import static com.google.common.base.Objects.equal;
import static com.google.common.base.Preconditions.checkNotNull;
import java.io.Serializable;
import java.util.Map;
import java.util.Set;
@ -38,9 +37,7 @@ import com.google.common.collect.ImmutableSet;
*
* @author Adrian Cole
*/
public class LocationImpl implements Location, Serializable {
/** The serialVersionUID */
private static final long serialVersionUID = -280558162576368264L;
public class LocationImpl implements Location {
private final LocationScope scope;
private final String id;

View File

@ -18,7 +18,6 @@
*/
package org.jclouds.domain.internal;
import java.io.Serializable;
import java.net.URI;
import java.util.Map;
@ -33,11 +32,7 @@ import com.google.common.collect.Maps;
*
* @author Adrian Cole
*/
public class MutableResourceMetadataImpl<T extends Enum<T>> implements MutableResourceMetadata<T>,
Serializable {
/** The serialVersionUID */
private static final long serialVersionUID = -280558162576368264L;
public class MutableResourceMetadataImpl<T extends Enum<T>> implements MutableResourceMetadata<T> {
private T type;
private String id;

View File

@ -21,7 +21,6 @@ package org.jclouds.domain.internal;
import static com.google.common.base.Objects.equal;
import static com.google.common.base.Preconditions.checkNotNull;
import java.io.Serializable;
import java.net.URI;
import java.util.Map;
@ -38,10 +37,7 @@ import com.google.common.collect.Maps;
*
* @author Adrian Cole
*/
public abstract class ResourceMetadataImpl<T extends Enum<T>> implements ResourceMetadata<T>, Serializable {
/** The serialVersionUID */
private static final long serialVersionUID = -280558162576368264L;
public abstract class ResourceMetadataImpl<T extends Enum<T>> implements ResourceMetadata<T> {
@Nullable
private final String providerId;

View File

@ -25,8 +25,6 @@ package org.jclouds.http;
*/
public class HttpException extends RuntimeException {
private static final long serialVersionUID = 1L;
public HttpException(String s) {
super(s);
}

View File

@ -32,7 +32,6 @@ import org.jclouds.util.Strings2;
*/
public class HttpResponseException extends RuntimeException {
private static final long serialVersionUID = 1L;
protected final HttpCommand command;
protected final HttpResponse response;
private String content;

View File

@ -37,7 +37,6 @@ public class ParseContentMD5FromHeaders implements Function<HttpResponse, byte[]
public static class NoContentMD5Exception extends RuntimeException {
private static final long serialVersionUID = 1L;
private final HttpRequest request;
private final HttpResponse response;

View File

@ -18,7 +18,6 @@
*/
package org.jclouds.io;
import java.io.Serializable;
import java.util.Arrays;
import java.util.Date;
@ -30,9 +29,7 @@ import com.google.common.base.Objects;
/**
* @author Adrian Cole
*/
public class ContentMetadataBuilder implements Serializable {
/** The serialVersionUID */
private static final long serialVersionUID = -5279643002875371558L;
public class ContentMetadataBuilder {
public static ContentMetadataBuilder create() {
return new ContentMetadataBuilder();

View File

@ -18,7 +18,6 @@
*/
package org.jclouds.io.payloads;
import java.io.Serializable;
import java.util.Arrays;
import java.util.Date;
@ -30,10 +29,8 @@ import com.google.common.base.Objects;
/**
* @author Adrian Cole
*/
public class BaseImmutableContentMetadata implements ContentMetadata, Serializable {
public class BaseImmutableContentMetadata implements ContentMetadata {
/** The serialVersionUID */
private static final long serialVersionUID = -1445533440795766130L;
protected String contentType;
protected Long contentLength;
protected byte[] contentMD5;

View File

@ -18,7 +18,6 @@
*/
package org.jclouds.io.payloads;
import java.io.Serializable;
import java.util.Date;
import org.jclouds.io.ContentMetadata;
@ -29,9 +28,7 @@ import org.jclouds.javax.annotation.Nullable;
/**
* @author Adrian Cole
*/
public class BaseMutableContentMetadata extends ContentMetadataBuilder implements MutableContentMetadata, Serializable {
/** The serialVersionUID */
private static final long serialVersionUID = 8364286391963469370L;
public class BaseMutableContentMetadata extends ContentMetadataBuilder implements MutableContentMetadata {
/**
* {@inheritDoc}

View File

@ -42,9 +42,6 @@ public class Part extends DelegatingPayload {
private static class PartMap extends LinkedHashMap<String, String> {
/** The serialVersionUID */
private static final long serialVersionUID = -287387556008320212L;
static Part.PartMap create(String name) {
Part.PartMap map = new PartMap();
map.put("Content-Disposition", String.format("form-data; name=\"%s\"", checkNotNull(name,

View File

@ -31,9 +31,6 @@ import org.jclouds.rest.AnonymousRestApiMetadata;
*/
public class AnonymousProviderMetadata extends BaseProviderMetadata {
/** The serialVersionUID */
private static final long serialVersionUID = 3038298137724260273L;
public static ProviderMetadata forClientMappedToAsyncClientOnEndpoint(Class<?> client, Class<?> asyncClient,
String endpoint) {
return forApiWithEndpoint(AnonymousRestApiMetadata.forClientMappedToAsyncClient(client, asyncClient), endpoint);

View File

@ -18,7 +18,6 @@
*/
package org.jclouds.providers;
import java.io.Serializable;
import java.net.URI;
import java.util.Properties;
import java.util.Set;
@ -34,7 +33,7 @@ import com.google.common.base.Optional;
*
* @author Jeremy Whitlock <jwhitlock@apache.org>, Adrian Cole
*/
public interface ProviderMetadata extends Serializable {
public interface ProviderMetadata {
/**
*

View File

@ -46,9 +46,6 @@ import com.google.common.collect.ImmutableSet;
*/
public abstract class BaseProviderMetadata implements ProviderMetadata {
/** The serialVersionUID */
private static final long serialVersionUID = -6647397371073751922L;
@Override
public ProviderMetadata.Builder toBuilder() {
return new BaseProviderMetadata.Builder().fromProviderMetadata(this);
@ -196,8 +193,6 @@ public abstract class BaseProviderMetadata implements ProviderMetadata {
@Override
public ProviderMetadata build() {
return new BaseProviderMetadata(this) {
/** The serialVersionUID */
private static final long serialVersionUID = 562451792167711326L;
};
}
}

View File

@ -33,9 +33,6 @@ import com.google.common.annotations.Beta;
@Beta
public class AnonymousRestApiMetadata extends BaseRestApiMetadata {
/** The serialVersionUID */
private static final long serialVersionUID = 5297549599879474202L;
public static AnonymousRestApiMetadata forClientMappedToAsyncClient(Class<?> client, Class<?> asyncClient) {
return new AnonymousRestApiMetadata(client, asyncClient);
}

View File

@ -26,9 +26,6 @@ package org.jclouds.rest;
*/
public class AuthorizationException extends RuntimeException {
/** The serialVersionUID */
private static final long serialVersionUID = -2272965726680821281L;
public AuthorizationException() {
super();
}

View File

@ -25,9 +25,6 @@ package org.jclouds.rest;
*/
public class InsufficientResourcesException extends RuntimeException {
/** The serialVersionUID */
private static final long serialVersionUID = -2272965726680821281L;
public InsufficientResourcesException() {
super();
}

View File

@ -25,10 +25,6 @@ package org.jclouds.rest;
*/
public class ResourceNotFoundException extends RuntimeException {
/** The serialVersionUID */
private static final long serialVersionUID = -2272965726680821281L;
public ResourceNotFoundException() {
super();
}

View File

@ -26,7 +26,6 @@ import org.jclouds.http.HttpRequest;
* @author Ignasi Barrera
*/
public class BindException extends RuntimeException {
private static final long serialVersionUID = 1L;
private HttpRequest request;

View File

@ -42,10 +42,8 @@ public class RestClientModule<S, A> extends RestModule {
protected RestClientModule(Map<Class<?>, Class<?>> sync2Async) {
super(sync2Async);
this.syncClientType = TypeTokens2.checkBound(new TypeToken<S>(getClass()) {
private static final long serialVersionUID = 7519656925453755752L;
});
this.asyncClientType = TypeTokens2.checkBound(new TypeToken<A>(getClass()) {
private static final long serialVersionUID = -4420015967358511548L;
});
}

View File

@ -39,8 +39,6 @@ import com.google.common.reflect.TypeToken;
*/
@Beta
public class BaseRestApiMetadata extends BaseApiMetadata implements RestApiMetadata {
/** The serialVersionUID */
private static final long serialVersionUID = 564135477427872712L;
protected final Class<?> api;
protected final Class<?> asyncApi;
@ -69,7 +67,6 @@ public class BaseRestApiMetadata extends BaseApiMetadata implements RestApiMetad
public static <S, A> TypeToken<RestContext<S, A>> contextToken(TypeToken<S> apiToken, TypeToken<A> asyncApiToken) {
return new TypeToken<RestContext<S, A>>() {
private static final long serialVersionUID = 1L;
}.where(new TypeParameter<S>() {
}, apiToken).where(new TypeParameter<A>() {
}, asyncApiToken);

View File

@ -22,7 +22,6 @@ import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Throwables.propagate;
import static org.jclouds.util.Throwables2.getFirstThrowableOfType;
import java.io.Serializable;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
@ -57,22 +56,13 @@ import com.google.common.util.concurrent.UncheckedExecutionException;
* @author Adrian Cole
*/
public class MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier<T> extends ForwardingObject implements
Supplier<T>, Serializable {
/** The serialVersionUID */
private static final long serialVersionUID = 7626769175726919353L;
Supplier<T> {
static class NullValueException extends RuntimeException {
/** The serialVersionUID */
private static final long serialVersionUID = 5064521423206078374L;
}
static class SetAndThrowAuthorizationExceptionSupplierBackedLoader<V> extends CacheLoader<String, V> implements
Serializable {
/** The serialVersionUID */
private static final long serialVersionUID = -6129510622181946809L;
static class SetAndThrowAuthorizationExceptionSupplierBackedLoader<V> extends CacheLoader<String, V> {
private final Supplier<V> delegate;
private final AtomicReference<AuthorizationException> authException;

View File

@ -22,7 +22,6 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.io.IOException;
import java.io.OutputStream;
import java.io.Serializable;
import java.util.Map;
import com.google.common.annotations.Beta;
@ -162,9 +161,7 @@ public class Suppliers2 {
return new SupplierComposition<F, T>(function, supplier);
}
private static class SupplierComposition<F, T> implements Supplier<T>, Serializable {
/** The serialVersionUID */
private static final long serialVersionUID = 1023509665531743802L;
private static class SupplierComposition<F, T> implements Supplier<T> {
final Function<? super F, T> function;
final Supplier<F> supplier;

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