diff --git a/aws/core/pom.xml b/aws/core/pom.xml index 3e973af576..3098676c68 100644 --- a/aws/core/pom.xml +++ b/aws/core/pom.xml @@ -45,13 +45,4 @@ http://jclouds.googlecode.com/svn/trunk - - - xstream - xstream - 1.2 - test - - - diff --git a/aws/ec2/core/src/test/java/org/jclouds/aws/ec2/commands/options/BaseEC2RequestOptionsTest.java b/aws/ec2/core/src/test/java/org/jclouds/aws/ec2/commands/options/BaseEC2RequestOptionsTest.java index 68d0d1ad3f..cbce6df0a2 100644 --- a/aws/ec2/core/src/test/java/org/jclouds/aws/ec2/commands/options/BaseEC2RequestOptionsTest.java +++ b/aws/ec2/core/src/test/java/org/jclouds/aws/ec2/commands/options/BaseEC2RequestOptionsTest.java @@ -28,7 +28,7 @@ import static org.testng.Assert.assertEquals; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; -import org.jclouds.aws.util.DateService; +import org.jclouds.util.DateService; import org.joda.time.DateTime; import org.testng.annotations.Test; @@ -60,7 +60,7 @@ public class BaseEC2RequestOptionsTest { * @see MyRequestOptions#withId(String) */ public String getId() { - return parameters.get("id"); + return queryParameters.get("id"); } /** diff --git a/aws/pom.xml b/aws/pom.xml index ece91bbfb2..78c34d2f9c 100644 --- a/aws/pom.xml +++ b/aws/pom.xml @@ -41,8 +41,8 @@ s3 - - + ${jclouds.aws.accesskeyid} + ${jclouds.aws.secretaccesskey} @@ -70,53 +70,4 @@ test - - - live - - - - org.apache.maven.plugins - maven-surefire-plugin - - - integration - integration-test - - test - - - - - none - - - **/*IntegrationTest.java - **/*LiveTest.java - - - - file.encoding - UTF-8 - - - jclouds.aws.accesskeyid - ${jclouds.aws.accesskeyid} - - - jclouds.aws.secretaccesskey - ${jclouds.aws.secretaccesskey} - - - - - - - - - - diff --git a/aws/s3/core/pom.xml b/aws/s3/core/pom.xml index 3196683f26..a37681abe3 100644 --- a/aws/s3/core/pom.xml +++ b/aws/s3/core/pom.xml @@ -40,11 +40,6 @@ http://jclouds.googlecode.com/svn/trunk - - http://apache.multihomed.net/maven/binaries/apache-maven-2.2.0-bin.zip - 132bcde2aeca20acb0b16c1c66b74984 - - googlecode.java-xmlbuilder @@ -53,22 +48,11 @@ - - xstream - xstream - 1.2 - test - com.jamesmurty.utils java-xmlbuilder 0.3 - - ${project.groupId} - jclouds-httpnio - ${project.version} - diff --git a/aws/s3/core/src/main/java/org/jclouds/aws/s3/S3Connection.java b/aws/s3/core/src/main/java/org/jclouds/aws/s3/S3BlobStore.java similarity index 73% rename from aws/s3/core/src/main/java/org/jclouds/aws/s3/S3Connection.java rename to aws/s3/core/src/main/java/org/jclouds/aws/s3/S3BlobStore.java index afd4844e58..37320509d8 100644 --- a/aws/s3/core/src/main/java/org/jclouds/aws/s3/S3Connection.java +++ b/aws/s3/core/src/main/java/org/jclouds/aws/s3/S3BlobStore.java @@ -37,19 +37,15 @@ import javax.ws.rs.PathParam; import org.jclouds.aws.s3.binders.AccessControlListBinder; import org.jclouds.aws.s3.binders.S3ObjectBinder; import org.jclouds.aws.s3.domain.AccessControlList; -import org.jclouds.aws.s3.domain.S3Bucket; +import org.jclouds.aws.s3.domain.BucketMetadata; +import org.jclouds.aws.s3.domain.ListBucketResponse; +import org.jclouds.aws.s3.domain.ObjectMetadata; import org.jclouds.aws.s3.domain.S3Object; import org.jclouds.aws.s3.filters.RequestAuthorizeSignature; -import org.jclouds.aws.s3.functions.ParseMetadataFromHeaders; import org.jclouds.aws.s3.functions.ParseObjectFromHeadersAndHttpContent; -import org.jclouds.aws.s3.functions.ReturnNotFoundIfBucketDoesntExist; -import org.jclouds.aws.s3.functions.ReturnNotFoundIfObjectDoesntExist; -import org.jclouds.aws.s3.functions.ReturnS3BucketNotFoundOn404; -import org.jclouds.aws.s3.functions.ReturnS3ObjectMetadataNotFoundOn404; -import org.jclouds.aws.s3.functions.ReturnS3ObjectNotFoundOn404; +import org.jclouds.aws.s3.functions.ParseObjectMetadataFromHeaders; import org.jclouds.aws.s3.functions.ReturnTrueIfBucketAlreadyOwnedByYou; import org.jclouds.aws.s3.functions.ReturnTrueOn404FalseIfNotEmpty; -import org.jclouds.aws.s3.functions.S3ObjectKey; import org.jclouds.aws.s3.options.CopyObjectOptions; import org.jclouds.aws.s3.options.ListBucketOptions; import org.jclouds.aws.s3.options.PutBucketOptions; @@ -58,22 +54,29 @@ import org.jclouds.aws.s3.xml.AccessControlListHandler; import org.jclouds.aws.s3.xml.CopyObjectHandler; import org.jclouds.aws.s3.xml.ListAllMyBucketsHandler; import org.jclouds.aws.s3.xml.ListBucketHandler; +import org.jclouds.blobstore.BlobStore; +import org.jclouds.blobstore.domain.Blob; +import org.jclouds.blobstore.functions.BlobKey; +import org.jclouds.blobstore.functions.ThrowContainerNotFoundOn404; +import org.jclouds.blobstore.functions.ThrowKeyNotFoundOn404; import org.jclouds.http.functions.ParseETagHeader; import org.jclouds.http.functions.ReturnFalseOn404; import org.jclouds.http.options.GetOptions; import org.jclouds.rest.EntityParam; import org.jclouds.rest.ExceptionParser; -import org.jclouds.rest.Header; +import org.jclouds.rest.Headers; import org.jclouds.rest.HostPrefixParam; import org.jclouds.rest.HttpRequestOptionsBinder; import org.jclouds.rest.ParamParser; -import org.jclouds.rest.Query; +import org.jclouds.rest.QueryParams; import org.jclouds.rest.RequestFilters; import org.jclouds.rest.ResponseParser; import org.jclouds.rest.SkipEncoding; import org.jclouds.rest.VirtualHost; import org.jclouds.rest.XMLResponseParser; +import com.google.inject.internal.Nullable; + /** * Provides access to S3 via their REST API. *

@@ -87,34 +90,16 @@ import org.jclouds.rest.XMLResponseParser; @VirtualHost @SkipEncoding('/') @RequestFilters(RequestAuthorizeSignature.class) -public interface S3Connection { +public interface S3BlobStore extends BlobStore { /** - * Retrieves the S3Object associated with the Key or {@link S3Object#NOT_FOUND} if not available; + * Retrieves the S3Object associated with the Key or {@link Blob #NOT_FOUND} if + * not available; * *

* To use GET, you must have READ access to the object. If READ access is granted to the * anonymous user, you can request the object without an authorization header. * - * @param bucketName - * namespace of the object you are retrieving - * @param key - * unique key in the s3Bucket identifying the object - * @return Future reference to a fully populated S3Object including data stored in S3 or - * {@link S3Object#NOT_FOUND} if not present. - * @see - */ - @GET - @Path("{key}") - @ExceptionParser(ReturnS3ObjectNotFoundOn404.class) - @ResponseParser(ParseObjectFromHeadersAndHttpContent.class) - Future getObject(@HostPrefixParam String bucketName, @PathParam("key") String key); - - /** - * Like {@link #getObject(String, String)} except you can use {@link GetObjectOptions} to control - * delivery. *

* This command allows you to specify {@link GetObjectOptions} to control delivery of content. * @@ -125,24 +110,35 @@ public interface S3Connection { *

  • {@link GetObjectOptions#tail}
    • * * - * @return S3Object containing data relevant to the options specified or + * @param bucketName + * namespace of the object you are retrieving + * @param key + * unique key in the s3Bucket identifying the object + * @return Future reference to a fully populated S3Object including data stored in S3 or * {@link S3Object#NOT_FOUND} if not present. + * * @throws org.jclouds.http.HttpResponseException * if the conditions requested set were not satisfied by the object on the server. - * @see #getObject(String, String) + * @see #getBlob(String, String) * @see GetObjectOptions */ @GET @Path("{key}") - @ExceptionParser(ReturnS3ObjectNotFoundOn404.class) + @ExceptionParser(ThrowKeyNotFoundOn404.class) @ResponseParser(ParseObjectFromHeadersAndHttpContent.class) - Future getObject(@HostPrefixParam String bucketName, @PathParam("key") String key, + Future getBlob(@HostPrefixParam String bucketName, @PathParam("key") String key); + + @GET + @Path("{key}") + @ExceptionParser(ThrowKeyNotFoundOn404.class) + @ResponseParser(ParseObjectFromHeadersAndHttpContent.class) + Future getBlob(@HostPrefixParam String bucketName, @PathParam("key") String key, GetOptions options); /** - * Retrieves the {@link org.jclouds.aws.s3.domain.S3Object.Metadata metadata} of the object - * associated with the key or {@link org.jclouds.aws.s3.domain.S3Object.Metadata#NOT_FOUND} if - * not available. + * Retrieves the {@link org.jclouds.aws.s3.domain.ObjectMetadata metadata} of the object + * associated with the key or {@link org.jclouds.aws.s3.domain.ObjectMetadata#NOT_FOUND} if not + * available. * *

    + * you can use {@link PutBucketOptions} to create the bucket in EU. *

    * The PUT request operation with a bucket URI creates a new bucket. Depending on your latency * and legal requirements, you can specify a location constraint that will affect where your data @@ -262,6 +235,8 @@ public interface S3Connection { * * @param options * for creating your bucket + * @return true, if the bucket was created or already exists + * * @see PutBucketOptions * @see putBucketIfNotExists(@HostPrefixParam String bucketName, - @EntityParam(HttpRequestOptionsBinder.class) PutBucketOptions options); + Future createContainer(@HostPrefixParam String bucketName, + @Nullable @EntityParam(HttpRequestOptionsBinder.class) PutBucketOptions options); + + @PUT + @Path("/") + @ExceptionParser(ReturnTrueIfBucketAlreadyOwnedByYou.class) + Future createContainer(@HostPrefixParam String bucketName); /** * Deletes the bucket, if it is empty. @@ -294,7 +274,59 @@ public interface S3Connection { @DELETE @Path("/") @ExceptionParser(ReturnTrueOn404FalseIfNotEmpty.class) - boolean deleteBucketIfEmpty(@HostPrefixParam String bucketName); + Future deleteContainer(@HostPrefixParam String bucketName); + + /** + * Issues a HEAD command to determine if the bucket exists or not. + */ + @HEAD + @Path("/") + @QueryParams(keys = "max-keys", values = "0") + @ExceptionParser(ReturnFalseOn404.class) + boolean containerExists(@HostPrefixParam String bucketName); + + /** + * Retrieve a S3Bucket listing. A GET request operation using a bucket URI lists + * information about the objects in the bucket. You can use {@link ListBucketOptions} to control + * the amount of S3Objects to return. + *

    + * To list the keys of a bucket, you must have READ access to the bucket. + *

    + * + * @param bucketName + * namespace of the objects you wish to list + * @return Future reference to a fully populated S3Bucket including metadata of the S3Objects it + * contains or {@link BoundedList#NOT_FOUND} if not present. + * @see ListBucketOptions + * + * @see + */ + @GET + @Path("/") + @XMLResponseParser(ListBucketHandler.class) + Future listBlobs(@HostPrefixParam String bucketName, + @Nullable ListBucketOptions options); + + @GET + @Path("/") + @XMLResponseParser(ListBucketHandler.class) + Future listBlobs(@HostPrefixParam String bucketName); + + /** + * Returns a list of all of the buckets owned by the authenticated sender of the request. + * + * @return list of all of the buckets owned by the authenticated sender of the request. + * @see + * + */ + @GET + @XMLResponseParser(ListAllMyBucketsHandler.class) + @Path("/") + List listContainers(); /** * Copies one object to another bucket, retaining UserMetadata from the source. The destination @@ -313,97 +345,30 @@ public interface S3Connection { * @see + * @throws org.jclouds.http.HttpResponseException + * if the conditions requested set are not satisfied by the object on the server. * @see CopyObjectOptions * @see org.jclouds.aws.s3.domain.CannedAccessPolicy */ @PUT @Path("{destinationObject}") - @Header(key = "x-amz-copy-source", value = "/{sourceBucket}/{sourceObject}") + @Headers(keys = "x-amz-copy-source", values = "/{sourceBucket}/{sourceObject}") @XMLResponseParser(CopyObjectHandler.class) - Future copyObject(@PathParam("sourceBucket") String sourceBucket, + Future copyBlob(@PathParam("sourceBucket") String sourceBucket, + @PathParam("sourceObject") String sourceObject, + @HostPrefixParam String destinationBucket, + @PathParam("destinationObject") String destinationObject, + @Nullable CopyObjectOptions options); + + @PUT + @Path("{destinationObject}") + @Headers(keys = "x-amz-copy-source", values = "/{sourceBucket}/{sourceObject}") + @XMLResponseParser(CopyObjectHandler.class) + Future copyBlob(@PathParam("sourceBucket") String sourceBucket, @PathParam("sourceObject") String sourceObject, @HostPrefixParam String destinationBucket, @PathParam("destinationObject") String destinationObject); - /** - * Like {@link #putObject(String, S3Object)} except you can use {@link PutObjectOptions} to - * specify an alternate {@link org.jclouds.aws.s3.domain.CannedAccessPolicy acl}. - * - * @param options - * options for creating the object - * @throws org.jclouds.http.HttpResponseException - * if the conditions requested set are not satisfied by the object on the server. - * @see S3Connection#putObject(String, S3Object) - * @see PutObjectOptions - */ - @PUT - @Path("{destinationObject}") - @Header(key = "x-amz-copy-source", value = "/{sourceBucket}/{sourceObject}") - @XMLResponseParser(CopyObjectHandler.class) - Future copyObject(@PathParam("sourceBucket") String sourceBucket, - @PathParam("sourceObject") String sourceObject, - @HostPrefixParam String destinationBucket, - @PathParam("destinationObject") String destinationObject, CopyObjectOptions options); - - /** - * Issues a HEAD command to determine if the bucket exists or not. - */ - @HEAD - @Path("/") - @Query(key = "max-keys", value = "0") - @ExceptionParser(ReturnFalseOn404.class) - boolean bucketExists(@HostPrefixParam String bucketName); - - /** - * Retrieve a complete S3Bucket listing. A GET request operation using a bucket URI - * lists information about the objects in the bucket. - *

    - * To list the keys of a bucket, you must have READ access to the bucket. - *

    - * - * @param bucketName - * namespace of the objects you wish to list - * @return Future reference to a fully populated S3Bucket including metadata of the S3Objects it - * contains or {@link S3Bucket#NOT_FOUND} if not present. - * @see - */ - @GET - @Path("/") - @XMLResponseParser(ListBucketHandler.class) - @ExceptionParser(ReturnS3BucketNotFoundOn404.class) - Future listBucket(@HostPrefixParam String bucketName); - - /** - * Like {@link #listBucket(String)} except you can use {@link ListBucketOptions} to control the - * amount of S3Objects to return. - * - * @return S3Bucket containing a subset of {@link org.jclouds.aws.s3.domain.S3Object.Metadata} - * depending on - * options specified or {@link S3Bucket#NOT_FOUND} if not present. - * @see #listBucket(String) - * @see ListBucketOptions - */ - @GET - @Path("/") - @XMLResponseParser(ListBucketHandler.class) - Future listBucket(@HostPrefixParam String bucketName, ListBucketOptions options); - - /** - * Returns a list of all of the buckets owned by the authenticated sender of the request. - * - * @return list of all of the buckets owned by the authenticated sender of the request. - * @see - * - */ - @GET - @XMLResponseParser(ListAllMyBucketsHandler.class) - @Path("/") - List listOwnedBuckets(); - /** * * A GET request operation directed at an object or bucket URI with the "acl" parameter retrieves @@ -416,11 +381,11 @@ public interface S3Connection { * @see */ @GET - @Query(key = "acl") + @QueryParams(keys = "acl") @XMLResponseParser(AccessControlListHandler.class) - @ExceptionParser(ReturnNotFoundIfBucketDoesntExist.class) + @ExceptionParser(ThrowContainerNotFoundOn404.class) @Path("/") - Future getBucketACL(@HostPrefixParam String bucketName); + Future getContainerACL(@HostPrefixParam String bucketName); /** * Update a bucket's Access Control List settings. @@ -441,8 +406,8 @@ public interface S3Connection { */ @PUT @Path("/") - @Query(key = "acl") - Future putBucketACL(@HostPrefixParam String bucketName, + @QueryParams(keys = "acl") + Future putContainerACL(@HostPrefixParam String bucketName, @EntityParam(AccessControlListBinder.class) AccessControlList acl); /** @@ -456,11 +421,11 @@ public interface S3Connection { * @see */ @GET - @Query(key = "acl") + @QueryParams(keys = "acl") @Path("{key}") @XMLResponseParser(AccessControlListHandler.class) - @ExceptionParser(ReturnNotFoundIfObjectDoesntExist.class) - Future getObjectACL(@HostPrefixParam String bucketName, + @ExceptionParser(ThrowKeyNotFoundOn404.class) + Future getBlobACL(@HostPrefixParam String bucketName, @PathParam("key") String key); /** @@ -483,9 +448,9 @@ public interface S3Connection { * @see */ @PUT - @Query(key = "acl") + @QueryParams(keys = "acl") @Path("{key}") - Future putObjectACL(@HostPrefixParam String bucketName, @PathParam("key") String key, + Future putBlobACL(@HostPrefixParam String bucketName, @PathParam("key") String key, @EntityParam(AccessControlListBinder.class) AccessControlList acl); } diff --git a/aws/s3/core/src/main/java/org/jclouds/aws/s3/S3Context.java b/aws/s3/core/src/main/java/org/jclouds/aws/s3/S3Context.java index 087732f211..d4dcef7695 100644 --- a/aws/s3/core/src/main/java/org/jclouds/aws/s3/S3Context.java +++ b/aws/s3/core/src/main/java/org/jclouds/aws/s3/S3Context.java @@ -23,8 +23,9 @@ */ package org.jclouds.aws.s3; -import org.jclouds.cloud.CloudContext; -import org.jclouds.objectstore.ObjectStoreContext; +import org.jclouds.aws.s3.domain.ObjectMetadata; +import org.jclouds.aws.s3.domain.S3Object; +import org.jclouds.blobstore.BlobStoreContext; /** * Represents an authenticated context to S3. @@ -33,19 +34,11 @@ import org.jclouds.objectstore.ObjectStoreContext; * release resources. * * - * @see S3Connection - * @see S3InputStreamMap - * @see S3ObjectMap + * @see S3BlobStore + * @see BlobStoreContext * @author Adrian Cole * */ -public interface S3Context extends CloudContext, ObjectStoreContext { - - /** - * Creates a Map view of the specified bucket. - * - * @param bucket - */ - S3ObjectMap createS3ObjectMap(String bucket); +public interface S3Context extends BlobStoreContext { } \ No newline at end of file diff --git a/aws/s3/core/src/main/java/org/jclouds/aws/s3/S3ContextBuilder.java b/aws/s3/core/src/main/java/org/jclouds/aws/s3/S3ContextBuilder.java index 07111cc02b..17f1617f41 100644 --- a/aws/s3/core/src/main/java/org/jclouds/aws/s3/S3ContextBuilder.java +++ b/aws/s3/core/src/main/java/org/jclouds/aws/s3/S3ContextBuilder.java @@ -26,6 +26,7 @@ package org.jclouds.aws.s3; import static com.google.common.base.Preconditions.checkNotNull; import static org.jclouds.aws.reference.AWSConstants.PROPERTY_AWS_ACCESSKEYID; import static org.jclouds.aws.reference.AWSConstants.PROPERTY_AWS_SECRETACCESSKEY; +import static org.jclouds.blobstore.reference.BlobStoreConstants.PROPERTY_USER_METADATA_PREFIX; import static org.jclouds.http.HttpConstants.PROPERTY_HTTP_ADDRESS; import static org.jclouds.http.HttpConstants.PROPERTY_HTTP_MAX_REDIRECTS; import static org.jclouds.http.HttpConstants.PROPERTY_HTTP_MAX_RETRIES; @@ -63,7 +64,7 @@ import com.google.inject.Module; * @author Adrian Cole, Andrew Newdigate * @see S3Context */ -public class S3ContextBuilder extends CloudContextBuilder { +public class S3ContextBuilder extends CloudContextBuilder { public S3ContextBuilder(Properties props) { super(props); @@ -73,6 +74,7 @@ public class S3ContextBuilder extends CloudContextBuilder modules) { modules.add(new S3ParserModule()); } diff --git a/aws/s3/core/src/main/java/org/jclouds/aws/s3/binders/S3ObjectBinder.java b/aws/s3/core/src/main/java/org/jclouds/aws/s3/binders/S3ObjectBinder.java index b4e1dae707..32c576ebd8 100644 --- a/aws/s3/core/src/main/java/org/jclouds/aws/s3/binders/S3ObjectBinder.java +++ b/aws/s3/core/src/main/java/org/jclouds/aws/s3/binders/S3ObjectBinder.java @@ -24,50 +24,45 @@ package org.jclouds.aws.s3.binders; import static com.google.common.base.Preconditions.checkArgument; -import static com.google.common.base.Preconditions.checkNotNull; +import static org.jclouds.blobstore.reference.BlobStoreConstants.PROPERTY_USER_METADATA_PREFIX; import javax.ws.rs.core.HttpHeaders; import org.jclouds.aws.s3.domain.S3Object; +import org.jclouds.blobstore.binders.BlobBinder; +import org.jclouds.blobstore.domain.Blob; import org.jclouds.http.HttpRequest; -import org.jclouds.http.HttpUtils; -import org.jclouds.rest.EntityBinder; -public class S3ObjectBinder implements EntityBinder { +import com.google.inject.Inject; +import com.google.inject.name.Named; - public void addEntityToRequest(Object entity, HttpRequest request) { - S3Object object = (S3Object) entity; - checkArgument(object.getMetadata().getSize() >= 0, "size must be set"); - - request.setEntity(checkNotNull(object.getData(), "object.getContent()")); - - request.getHeaders() - .put( - HttpHeaders.CONTENT_TYPE, - checkNotNull(object.getMetadata().getContentType(), - "object.metadata.contentType()")); - - request.getHeaders().put(HttpHeaders.CONTENT_LENGTH, object.getMetadata().getSize() + ""); - - if (object.getMetadata().getCacheControl() != null) { - request.getHeaders() - .put(HttpHeaders.CACHE_CONTROL, object.getMetadata().getCacheControl()); - } - if (object.getMetadata().getContentDisposition() != null) { - request.getHeaders().put("Content-Disposition", - object.getMetadata().getContentDisposition()); - } - if (object.getMetadata().getContentEncoding() != null) { - request.getHeaders().put(HttpHeaders.CONTENT_ENCODING, - object.getMetadata().getContentEncoding()); - } - - if (object.getMetadata().getETag() != null) { - request.getHeaders().put("Content-MD5", - HttpUtils.toBase64String(object.getMetadata().getETag())); - } - - request.getHeaders().putAll(object.getMetadata().getUserMetadata()); +public class S3ObjectBinder extends BlobBinder { + @Inject + public S3ObjectBinder(@Named(PROPERTY_USER_METADATA_PREFIX) String metadataPrefix) { + super(metadataPrefix); } + public void addEntityToRequest(Object entity, HttpRequest request) { + Blob object = (Blob) entity; + checkArgument(object.getMetadata().getSize() >= 0, "size must be set"); + + if (object instanceof S3Object) { + S3Object s3Object = (S3Object) object; + if (s3Object.getMetadata().getCacheControl() != null) { + request.getHeaders().put(HttpHeaders.CACHE_CONTROL, + s3Object.getMetadata().getCacheControl()); + } + + if (s3Object.getMetadata().getContentDisposition() != null) { + request.getHeaders().put("Content-Disposition", + s3Object.getMetadata().getContentDisposition()); + } + + if (s3Object.getMetadata().getContentEncoding() != null) { + request.getHeaders().put(HttpHeaders.CONTENT_ENCODING, + s3Object.getMetadata().getContentEncoding()); + } + } + super.addEntityToRequest(entity, request); + } } diff --git a/aws/s3/core/src/main/java/org/jclouds/aws/s3/config/RestS3ConnectionModule.java b/aws/s3/core/src/main/java/org/jclouds/aws/s3/config/RestS3ConnectionModule.java index 3a267f82e5..b96402a156 100644 --- a/aws/s3/core/src/main/java/org/jclouds/aws/s3/config/RestS3ConnectionModule.java +++ b/aws/s3/core/src/main/java/org/jclouds/aws/s3/config/RestS3ConnectionModule.java @@ -28,7 +28,7 @@ import java.net.URI; import javax.annotation.Resource; -import org.jclouds.aws.s3.S3Connection; +import org.jclouds.aws.s3.S3BlobStore; import org.jclouds.aws.s3.filters.RequestAuthorizeSignature; import org.jclouds.aws.s3.handlers.AWSClientErrorRetryHandler; import org.jclouds.aws.s3.handlers.AWSRedirectionRetryHandler; @@ -85,8 +85,8 @@ public class RestS3ConnectionModule extends AbstractModule { @Provides @Singleton - protected S3Connection provideS3Connection(URI uri, RestClientFactory factory) { - return factory.create(uri, S3Connection.class); + protected S3BlobStore provideS3Connection(URI uri, RestClientFactory factory) { + return factory.create(uri, S3BlobStore.class); } protected void bindErrorHandlers() { diff --git a/aws/s3/core/src/main/java/org/jclouds/aws/s3/config/S3ContextModule.java b/aws/s3/core/src/main/java/org/jclouds/aws/s3/config/S3ContextModule.java index 6d1885b85f..0ea9398fd2 100644 --- a/aws/s3/core/src/main/java/org/jclouds/aws/s3/config/S3ContextModule.java +++ b/aws/s3/core/src/main/java/org/jclouds/aws/s3/config/S3ContextModule.java @@ -23,31 +23,47 @@ */ package org.jclouds.aws.s3.config; -import org.jclouds.aws.s3.S3Connection; +import org.jclouds.aws.s3.S3BlobStore; import org.jclouds.aws.s3.S3Context; +import org.jclouds.aws.s3.domain.ObjectMetadata; +import org.jclouds.aws.s3.domain.S3Object; import org.jclouds.aws.s3.internal.GuiceS3Context; import org.jclouds.aws.s3.internal.LiveS3InputStreamMap; import org.jclouds.aws.s3.internal.LiveS3ObjectMap; +import org.jclouds.blobstore.functions.ParseBlobFromHeadersAndHttpContent.BlobFactory; +import org.jclouds.blobstore.functions.ParseBlobMetadataFromHeaders.BlobMetadataFactory; import com.google.inject.AbstractModule; +import com.google.inject.TypeLiteral; import com.google.inject.assistedinject.FactoryProvider; /** - * Configures the {@link S3Context}; requires {@link S3Connection} bound. + * Configures the {@link S3Context}; requires {@link S3BlobStore} bound. * * @author Adrian Cole */ public class S3ContextModule extends AbstractModule { + protected final TypeLiteral> objectMetadataFactoryLiteral = new TypeLiteral>() { + }; + protected final TypeLiteral> objectFactoryLiteral = new TypeLiteral>() { + }; @Override protected void configure() { - this.requireBinding(S3Connection.class); + this.requireBinding(S3BlobStore.class); bind(GuiceS3Context.S3ObjectMapFactory.class).toProvider( FactoryProvider.newFactory(GuiceS3Context.S3ObjectMapFactory.class, LiveS3ObjectMap.class)); bind(GuiceS3Context.S3InputStreamMapFactory.class).toProvider( FactoryProvider.newFactory(GuiceS3Context.S3InputStreamMapFactory.class, LiveS3InputStreamMap.class)); + bind(objectMetadataFactoryLiteral).toProvider( + FactoryProvider.newFactory(objectMetadataFactoryLiteral, + new TypeLiteral() { + })); + bind(objectFactoryLiteral).toProvider( + FactoryProvider.newFactory(objectFactoryLiteral, new TypeLiteral() { + })); bind(S3Context.class).to(GuiceS3Context.class); } diff --git a/aws/s3/core/src/main/java/org/jclouds/aws/s3/domain/AccessControlList.java b/aws/s3/core/src/main/java/org/jclouds/aws/s3/domain/AccessControlList.java index 88e80c95d3..a89bb8a721 100644 --- a/aws/s3/core/src/main/java/org/jclouds/aws/s3/domain/AccessControlList.java +++ b/aws/s3/core/src/main/java/org/jclouds/aws/s3/domain/AccessControlList.java @@ -31,7 +31,6 @@ import java.util.Set; import java.util.SortedSet; import java.util.TreeSet; - import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Function; import com.google.common.base.Predicate; @@ -50,7 +49,6 @@ import com.google.common.collect.Collections2; * @see */ public class AccessControlList { - public static final AccessControlList NOT_FOUND = new AccessControlList(); private CanonicalUser owner; private final List grants = new ArrayList(); diff --git a/aws/s3/core/src/main/java/org/jclouds/aws/s3/domain/ArrayListBucketResponse.java b/aws/s3/core/src/main/java/org/jclouds/aws/s3/domain/ArrayListBucketResponse.java new file mode 100644 index 0000000000..af9d71beaa --- /dev/null +++ b/aws/s3/core/src/main/java/org/jclouds/aws/s3/domain/ArrayListBucketResponse.java @@ -0,0 +1,72 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.aws.s3.domain; + +import java.util.List; +import java.util.SortedSet; + +/** + * + * @author Adrian Cole + * + */ +public class ArrayListBucketResponse extends org.jclouds.rest.ArrayBoundedList + implements ListBucketResponse { + /** The serialVersionUID */ + private static final long serialVersionUID = -4475709781001190244L; + private final String bucketName; + private final String delimiter; + private final SortedSet commonPrefixes; + private final boolean truncated; + + public ArrayListBucketResponse(String bucketName, List contents, String prefix, + String marker, int maxResults, String delimiter, boolean isTruncated, + SortedSet commonPrefixes) { + super(contents, prefix, marker, maxResults); + this.delimiter = delimiter; + this.bucketName = bucketName; + this.commonPrefixes = commonPrefixes; + this.truncated = isTruncated; + } + + /** + * {@inheritDoc} + */ + public SortedSet getCommonPrefixes() { + return commonPrefixes; + } + + public String getBucketName() { + return bucketName; + } + + public String getDelimiter() { + return delimiter; + } + + public boolean isTruncated() { + return truncated; + } + +} diff --git a/aws/s3/core/src/main/java/org/jclouds/aws/s3/domain/BucketMetadata.java b/aws/s3/core/src/main/java/org/jclouds/aws/s3/domain/BucketMetadata.java new file mode 100644 index 0000000000..dbfbe1804d --- /dev/null +++ b/aws/s3/core/src/main/java/org/jclouds/aws/s3/domain/BucketMetadata.java @@ -0,0 +1,132 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.aws.s3.domain; + +import org.jclouds.blobstore.domain.ContainerMetadata; +import org.joda.time.DateTime; + +/** + * System metadata of the S3Bucket + * + * @author Adrian Cole + */ +public class BucketMetadata extends ContainerMetadata { + protected DateTime creationDate; + + public DateTime getCreationDate() { + return creationDate; + } + + public void setCreationDate(DateTime creationDate) { + this.creationDate = creationDate; + } + + /** + * Location constraint of the bucket. + * + * @author Adrian Cole + * @see + */ + public static enum LocationConstraint { + EU + } + + private CanonicalUser canonicalUser; + + public BucketMetadata(String name) { + super(name); + } + + public BucketMetadata() { + super(); + } + + /** + * To comply with Amazon S3 requirements, bucket names must: + *

    + * Contain lowercase letters, numbers, periods (.), underscores (_), and dashes (-) + *

    + * Start with a number or letter + *

    + * Be between 3 and 255 characters long + *

    + * Not be in an IP address style (e.g., "192.168.5.4") + */ + @Override + public void setName(String name) { + // note that we cannot enforce this, as invalid buckets may already exist + super.setName(name); + } + + @Override + public String toString() { + StringBuilder builder = new StringBuilder(); + builder.append("Metadata [canonicalUser=").append(canonicalUser).append("]"); + return builder.toString(); + } + + public String getName() { + return name; + } + + /** + * Every bucket and object in Amazon S3 has an owner, the user that created the bucket or + * object. The owner of a bucket or object cannot be changed. However, if the object is + * overwritten by another user (deleted and rewritten), the new object will have a new owner. + */ + public CanonicalUser getOwner() { + return canonicalUser; + } + + public void setOwner(CanonicalUser canonicalUser) { + this.canonicalUser = canonicalUser; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = super.hashCode(); + result = prime * result + ((canonicalUser == null) ? 0 : canonicalUser.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (!super.equals(obj)) + return false; + if (getClass() != obj.getClass()) + return false; + BucketMetadata other = (BucketMetadata) obj; + if (canonicalUser == null) { + if (other.canonicalUser != null) + return false; + } else if (!canonicalUser.equals(other.canonicalUser)) + return false; + return true; + } + +} \ No newline at end of file diff --git a/aws/s3/core/src/main/java/org/jclouds/aws/s3/domain/CanonicalUser.java b/aws/s3/core/src/main/java/org/jclouds/aws/s3/domain/CanonicalUser.java index b38861c321..c4d9f2e387 100644 --- a/aws/s3/core/src/main/java/org/jclouds/aws/s3/domain/CanonicalUser.java +++ b/aws/s3/core/src/main/java/org/jclouds/aws/s3/domain/CanonicalUser.java @@ -54,8 +54,8 @@ public class CanonicalUser { /** * To locate the CanonicalUser ID for a user, the user must perform the - * {@link org.jclouds.aws.s3.S3Connection#listBucket(String)} and retrieve - * {@link S3Bucket.Metadata#getOwner()} + * {@link org.jclouds.aws.s3.S3BlobStore#listBlobs(String)} and retrieve + * {@link BucketMetadata#getOwner()} */ public String getId() { return id; diff --git a/aws/s3/core/src/main/java/org/jclouds/aws/s3/domain/ListBucketResponse.java b/aws/s3/core/src/main/java/org/jclouds/aws/s3/domain/ListBucketResponse.java new file mode 100644 index 0000000000..c144f4deda --- /dev/null +++ b/aws/s3/core/src/main/java/org/jclouds/aws/s3/domain/ListBucketResponse.java @@ -0,0 +1,76 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.aws.s3.domain; + +import java.util.SortedSet; + +/** + * A container that provides namespace, access control and aggregation of {@link S3Object}s + *

    + *

    + * Every object stored in Amazon S3 is contained in a bucket. Buckets partition the namespace of + * objects stored in Amazon S3 at the top level. Within a bucket, you can use any names for your + * objects, but bucket names must be unique across all of Amazon S3. + *

    + * Buckets are similar to Internet domain names. Just as Amazon is the only owner of the domain name + * Amazon.com, only one person or organization can own a bucket within Amazon S3. Once you create a + * uniquely named bucket in Amazon S3, you can organize and name the objects within the bucket in + * any way you like and the bucket will remain yours for as long as you like and as long as you have + * the Amazon S3 account. + *

    + * The similarities between buckets and domain names is not a coincidencethere is a direct mapping + * between Amazon S3 buckets and subdomains of s3.amazonaws.com. Objects stored in Amazon S3 are + * addressable using the REST API under the domain bucketname.s3.amazonaws.com. For example, if the + * object homepage.html?is stored in the Amazon S3 bucket mybucket its address would be + * http://mybucket.s3.amazonaws.com/homepage.html? + * + * @author Adrian Cole + * @see + */ +public interface ListBucketResponse extends org.jclouds.rest.BoundedList { + + /** + * Example: + *

    + * if the following keys are in the bucket + *

    + * a/1/a
    + * a/1/b
    + * a/2/a
    + * a/2/b
    + *

    + * and prefix is set to a/ and delimiter is set to / then + * commonprefixes would return 1,2 + * + * @see org.jclouds.aws.s3.options.ListBucketOptions#getPrefix() + */ + public SortedSet getCommonPrefixes(); + + public String getBucketName(); + + public String getDelimiter(); + + public boolean isTruncated(); + +} \ No newline at end of file diff --git a/aws/s3/core/src/main/java/org/jclouds/aws/s3/domain/ObjectMetadata.java b/aws/s3/core/src/main/java/org/jclouds/aws/s3/domain/ObjectMetadata.java new file mode 100644 index 0000000000..b2041c6393 --- /dev/null +++ b/aws/s3/core/src/main/java/org/jclouds/aws/s3/domain/ObjectMetadata.java @@ -0,0 +1,208 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.aws.s3.domain; + +import java.io.Serializable; +import java.util.Arrays; + +import org.jclouds.blobstore.domain.BlobMetadata; + +/** + * /** Amazon S3 is designed to store objects. Objects are stored in {@link S3BucketListing buckets} + * and consist of a {@link org.jclouds.aws.s3.domain.S3Object#getData() value}, a + * {@link S3Object#getKey key}, {@link ObjectMetadata#getUserMetadata() metadata}, and an access + * control policy. + * + * @author Adrian Cole + * @see + */ +public class ObjectMetadata extends BlobMetadata implements Serializable { + + /** The serialVersionUID */ + private static final long serialVersionUID = -4415449798024051115L; + + @Override + public String toString() { + StringBuilder builder = new StringBuilder(); + builder.append("Metadata [accessControlList=").append(accessControlList).append( + ", cacheControl=").append(cacheControl).append(", dataDisposition=").append( + dataDisposition).append(", owner=").append(owner).append(", storageClass=").append( + storageClass).append(", allHeaders=").append(allHeaders).append(", dataEncoding=") + .append(dataEncoding).append(", dataType=").append(dataType).append(", eTag=") + .append(Arrays.toString(eTag)).append(", key=").append(key) + .append(", lastModified=").append(lastModified).append(", size=").append(size) + .append(", userMetadata=").append(userMetadata).append("]"); + return builder.toString(); + } + + private String cacheControl; + private String dataDisposition; + private AccessControlList accessControlList; + + // only parsed on list + private CanonicalUser owner = null; + private String storageClass = null; + protected String dataEncoding; + + public ObjectMetadata() { + super(); + } + + /** + * @param key + * @see #getKey() + */ + public ObjectMetadata(String key) { + super(key); + } + + public void setOwner(CanonicalUser owner) { + this.owner = owner; + } + + /** + * Every bucket and object in Amazon S3 has an owner, the user that created the bucket or object. + * The owner of a bucket or object cannot be changed. However, if the object is overwritten by + * another user (deleted and rewritten), the new object will have a new owner. + */ + public CanonicalUser getOwner() { + return owner; + } + + public void setStorageClass(String storageClass) { + this.storageClass = storageClass; + } + + /** + * Currently defaults to 'STANDARD' and not used. + */ + public String getStorageClass() { + return storageClass; + } + + public void setCacheControl(String cacheControl) { + this.cacheControl = cacheControl; + } + + /** + * Can be used to specify caching behavior along the request/reply chain. + * + * @link http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html?sec14.9. + */ + public String getCacheControl() { + return cacheControl; + } + + public void setContentDisposition(String dataDisposition) { + this.dataDisposition = dataDisposition; + } + + /** + * Specifies presentational information for the object. + * + * @see + */ + public String getContentDisposition() { + return dataDisposition; + } + + public void setAccessControlList(AccessControlList acl) { + this.accessControlList = acl; + } + + public AccessControlList getAccessControlList() { + return this.accessControlList; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = super.hashCode(); + result = prime * result + ((accessControlList == null) ? 0 : accessControlList.hashCode()); + result = prime * result + ((cacheControl == null) ? 0 : cacheControl.hashCode()); + result = prime * result + ((dataDisposition == null) ? 0 : dataDisposition.hashCode()); + result = prime * result + ((owner == null) ? 0 : owner.hashCode()); + result = prime * result + ((storageClass == null) ? 0 : storageClass.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (!super.equals(obj)) + return false; + if (getClass() != obj.getClass()) + return false; + ObjectMetadata other = (ObjectMetadata) obj; + if (accessControlList == null) { + if (other.accessControlList != null) + return false; + } else if (!accessControlList.equals(other.accessControlList)) + return false; + if (cacheControl == null) { + if (other.cacheControl != null) + return false; + } else if (!cacheControl.equals(other.cacheControl)) + return false; + if (dataDisposition == null) { + if (other.dataDisposition != null) + return false; + } else if (!dataDisposition.equals(other.dataDisposition)) + return false; + if (owner == null) { + if (other.owner != null) + return false; + } else if (!owner.equals(other.owner)) + return false; + if (storageClass == null) { + if (other.storageClass != null) + return false; + } else if (!storageClass.equals(other.storageClass)) + return false; + return true; + } + + public int compareTo(ObjectMetadata o) { + return (this == o) ? 0 : getKey().compareTo(o.getKey()); + } + + public void setContentEncoding(String dataEncoding) { + this.dataEncoding = dataEncoding; + } + + /** + * Specifies what content encodings have been applied to the object and thus what decoding + * mechanisms must be applied in order to obtain the media-type referenced by the Content-Type + * header field. + * + * @see + */ + public String getContentEncoding() { + return dataEncoding; + } + +} \ No newline at end of file diff --git a/aws/s3/core/src/main/java/org/jclouds/aws/s3/domain/S3Bucket.java b/aws/s3/core/src/main/java/org/jclouds/aws/s3/domain/S3Bucket.java deleted file mode 100644 index 62e2d9b410..0000000000 --- a/aws/s3/core/src/main/java/org/jclouds/aws/s3/domain/S3Bucket.java +++ /dev/null @@ -1,341 +0,0 @@ -/** - * - * Copyright (C) 2009 Global Cloud Specialists, Inc. - * - * ==================================================================== - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * ==================================================================== - */ -package org.jclouds.aws.s3.domain; - -import static com.google.common.base.Preconditions.checkNotNull; -import org.joda.time.DateTime; - -import java.util.SortedSet; -import java.util.TreeSet; - -/** - * A container that provides namespace, access control and aggregation of {@link S3Object}s - *

    - *

    - * Every object stored in Amazon S3 is contained in a bucket. Buckets partition the namespace of - * objects stored in Amazon S3 at the top level. Within a bucket, you can use any names for your - * objects, but bucket names must be unique across all of Amazon S3. - *

    - * Buckets are similar to Internet domain names. Just as Amazon is the only owner of the domain name - * Amazon.com, only one person or organization can own a bucket within Amazon S3. Once you create a - * uniquely named bucket in Amazon S3, you can organize and name the objects within the bucket in - * any way you like and the bucket will remain yours for as long as you like and as long as you have - * the Amazon S3 account. - *

    - * The similarities between buckets and domain names is not a coincidencethere is a direct mapping - * between Amazon S3 buckets and subdomains of s3.amazonaws.com. Objects stored in Amazon S3 are - * addressable using the REST API under the domain bucketname.s3.amazonaws.com. For example, if the - * object homepage.html?is stored in the Amazon S3 bucket mybucket its address would be - * http://mybucket.s3.amazonaws.com/homepage.html? - * - * @author Adrian Cole - * @see - */ -public class S3Bucket { - @Override - public String toString() { - final StringBuilder sb = new StringBuilder(); - sb.append("S3Bucket"); - sb.append("{metadata=").append(metadata); - sb.append(", isTruncated=").append(isTruncated); - sb.append('}'); - return sb.toString(); - } - - @Override - public boolean equals(Object o) { - if (this == o) - return true; - if (!(o instanceof S3Bucket)) - return false; - - S3Bucket s3Bucket = (S3Bucket) o; - - if (isTruncated != s3Bucket.isTruncated) - return false; - if (!metadata.equals(s3Bucket.metadata)) - return false; - if (objects != null ? !objects.equals(s3Bucket.objects) : s3Bucket.objects != null) - return false; - - return true; - } - - @Override - public int hashCode() { - int result = objects != null ? objects.hashCode() : 0; - result = 31 * result + metadata.hashCode(); - result = 31 * result + (isTruncated ? 1 : 0); - return result; - } - - /** - * System metadata of the S3Bucket - * - * @author Adrian Cole - */ - public static class Metadata { - @Override - public String toString() { - final StringBuilder sb = new StringBuilder(); - sb.append("Metadata"); - sb.append("{name='").append(name).append('\''); - sb.append(", creationDate=").append(creationDate); - sb.append(", canonicalUser=").append(canonicalUser); - sb.append('}'); - return sb.toString(); - } - - @Override - public boolean equals(Object o) { - if (this == o) - return true; - if (!(o instanceof Metadata)) - return false; - - Metadata metadata = (Metadata) o; - if (canonicalUser != null ? !canonicalUser.equals(metadata.canonicalUser) - : metadata.canonicalUser != null) - return false; - if (!name.equals(metadata.name)) - return false; - - return true; - } - - @Override - public int hashCode() { - int result = name.hashCode(); - result = 31 * result + (canonicalUser != null ? canonicalUser.hashCode() : 0); - return result; - } - - /** - * Location constraint of the bucket. - * - * @author Adrian Cole - * @see - */ - public static enum LocationConstraint { - EU - } - - private String name; - private DateTime creationDate; - private CanonicalUser canonicalUser; - - /** - * @see #getName() - */ - public Metadata(String name) { - this.name = checkNotNull(name, "name"); - } - - public Metadata() { - super(); - } - - /** - * To comply with Amazon S3 requirements, bucket names must: - *

    - * Contain lowercase letters, numbers, periods (.), underscores (_), and dashes (-) - *

    - * Start with a number or letter - *

    - * Be between 3 and 255 characters long - *

    - * Not be in an IP address style (e.g., "192.168.5.4") - */ - public void setName(String name) { - this.name = checkNotNull(name, "name"); - } - - public String getName() { - return name; - } - - public DateTime getCreationDate() { - return creationDate; - } - - public void setCreationDate(DateTime creationDate) { - this.creationDate = creationDate; - } - - /** - * Every bucket and object in Amazon S3 has an owner, the user that created the bucket or - * object. The owner of a bucket or object cannot be changed. However, if the object is - * overwritten by another user (deleted and rewritten), the new object will have a new owner. - */ - public CanonicalUser getOwner() { - return canonicalUser; - } - - public void setOwner(CanonicalUser canonicalUser) { - this.canonicalUser = canonicalUser; - } - - } - - public static final S3Bucket NOT_FOUND = new S3Bucket("NOT_FOUND"); - - private SortedSet objects = new TreeSet(); - private SortedSet commonPrefixes = new TreeSet(); - private String prefix; - private String marker; - private String delimiter; - private long maxKeys; - private final Metadata metadata; - - private boolean isTruncated; - - public S3Bucket() { - this.metadata = new Metadata(); - } - - public S3Bucket(String name) { - this.metadata = new Metadata(name); - } - - public String getName() { - return this.metadata.getName(); - } - - public S3Bucket(Metadata metadata) { - this.metadata = checkNotNull(metadata, "metadata"); - } - - public void setName(String name) { - this.metadata.setName(name); - } - - /** - * @see org.jclouds.aws.s3.S3Connection#listBucket(String) - */ - public SortedSet getContents() { - return objects; - } - - public long getSize() { - return objects.size(); - } - - public void setContents(SortedSet objects) { - this.objects = objects; - } - - /** - * @return true, if the list contains all objects. - */ - public boolean isTruncated() { - return isTruncated; - } - - public void setTruncated(boolean truncated) { - isTruncated = truncated; - } - - public Metadata getMetadata() { - return metadata; - } - - public void setCommonPrefixes(SortedSet commonPrefixes) { - this.commonPrefixes = commonPrefixes; - } - - /** - * Example: - *

    - * if the following keys are in the bucket - *

    - * a/1/a
    - * a/1/b
    - * a/2/a
    - * a/2/b
    - *

    - * and prefix is set to a/ and delimiter is set to / then - * commonprefixes would return 1,2 - * - * @see org.jclouds.aws.s3.options.ListBucketOptions#getPrefix() - */ - public SortedSet getCommonPrefixes() { - return commonPrefixes; - } - - public void setPrefix(String prefix) { - this.prefix = prefix; - } - - /** - * return keys that start with this. - * - * @see org.jclouds.aws.s3.options.ListBucketOptions#getPrefix() - */ - public String getPrefix() { - return prefix; - } - - public void setMaxKeys(long maxKeys) { - this.maxKeys = maxKeys; - } - - /** - * @return maximum results of the bucket. - * @see org.jclouds.aws.s3.options.ListBucketOptions#getMaxKeys() - */ - public long getMaxKeys() { - return maxKeys; - } - - public void setMarker(String marker) { - this.marker = marker; - } - - /** - * when set, bucket contains results whose keys are lexigraphically after marker. - * - * @see org.jclouds.aws.s3.options.ListBucketOptions#getMarker() - */ - public String getMarker() { - return marker; - } - - public void setDelimiter(String delimiter) { - this.delimiter = delimiter; - } - - /** - * when set, bucket results will not contain keys that have text following this delimiter. - *

    - * note that delimiter has no effect on prefix. prefix can contain the delimiter many times, or - * not at all. delimiter only restricts after the prefix. - * - * @see org.jclouds.aws.s3.options.ListBucketOptions#getMarker() - */ - public String getDelimiter() { - return delimiter; - } - -} diff --git a/aws/s3/core/src/main/java/org/jclouds/aws/s3/domain/S3Object.java b/aws/s3/core/src/main/java/org/jclouds/aws/s3/domain/S3Object.java index f18fdebdd3..b8ac36a26f 100644 --- a/aws/s3/core/src/main/java/org/jclouds/aws/s3/domain/S3Object.java +++ b/aws/s3/core/src/main/java/org/jclouds/aws/s3/domain/S3Object.java @@ -23,22 +23,10 @@ */ package org.jclouds.aws.s3.domain; -import static com.google.common.base.Preconditions.checkArgument; -import static com.google.common.base.Preconditions.checkNotNull; -import static com.google.common.base.Preconditions.checkState; +import org.jclouds.blobstore.domain.Blob; -import java.io.IOException; -import java.io.InputStream; -import java.util.Arrays; - -import javax.ws.rs.core.MediaType; - -import org.jclouds.http.HttpUtils; -import org.jclouds.http.HttpUtils.ETagInputStreamResult; -import org.joda.time.DateTime; - -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; +import com.google.inject.Inject; +import com.google.inject.assistedinject.Assisted; /** * Amazon S3 is designed to store objects. Objects are stored in {@link S3Bucket buckets} and @@ -50,413 +38,23 @@ import com.google.common.collect.Multimap; * @see */ -public class S3Object { - public static final S3Object NOT_FOUND = new S3Object(Metadata.NOT_FOUND); +public class S3Object extends Blob { - private Object data; - private final Metadata metadata; - private long contentLength = -1; - private String contentRange; - - public S3Object(String key) { - this(new Metadata(key)); + public S3Object(ObjectMetadata metadata, Object data) { + super(metadata, data); } - public S3Object(Metadata metadata) { - this.metadata = metadata; - } - - public S3Object(Metadata metadata, Object data) { - this(metadata); - setData(data); + @Inject + public S3Object(@Assisted ObjectMetadata metadata) { + super(metadata); } public S3Object(String key, Object data) { - this(key); - setData(data); + this(new ObjectMetadata(key), data); } - /** - * System and user Metadata for the {@link S3Object}. - * - * @author Adrian Cole - * @see - */ - public static class Metadata implements Comparable { - public static final Metadata NOT_FOUND = new Metadata("NOT_FOUND"); - - // parsed during list, head, or get - private String key; - private byte[] eTag; - private volatile long size = -1; - - // only parsed during head or get - private Multimap allHeaders = HashMultimap.create(); - private Multimap userMetadata = HashMultimap.create(); - private DateTime lastModified; - private String dataType = MediaType.APPLICATION_OCTET_STREAM; - private String cacheControl; - private String dataDisposition; - private String dataEncoding; - private AccessControlList accessControlList; - - // only parsed on list - private CanonicalUser owner = null; - private String storageClass = null; - - public Metadata() { - super(); - } - - /** - * @param key - * @see #getKey() - */ - public Metadata(String key) { - setKey(key); - } - - public void setKey(String key) { - checkNotNull(key, "key"); - checkArgument(!key.startsWith("/"), "keys cannot start with /"); - this.key = key; - } - - @Override - public String toString() { - final StringBuilder sb = new StringBuilder(); - sb.append("Metadata"); - sb.append("{key='").append(key).append('\''); - sb.append(", lastModified=").append(lastModified); - sb.append(", eTag=").append( - getETag() == null ? "null" : Arrays.asList(getETag()).toString()); - sb.append(", size=").append(size); - sb.append(", dataType='").append(dataType).append('\''); - sb.append('}'); - return sb.toString(); - } - - @Override - public boolean equals(Object o) { - if (this == o) - return true; - if (!(o instanceof Metadata)) - return false; - - Metadata metadata = (Metadata) o; - - if (size != metadata.size) - return false; - if (dataType != null ? !dataType.equals(metadata.dataType) : metadata.dataType != null) - return false; - if (!key.equals(metadata.key)) - return false; - if (lastModified != null ? !lastModified.equals(metadata.lastModified) - : metadata.lastModified != null) - return false; - if (!Arrays.equals(getETag(), metadata.getETag())) - return false; - return true; - } - - @Override - public int hashCode() { - int result = key.hashCode(); - result = 31 * result + (lastModified != null ? lastModified.hashCode() : 0); - result = 31 * result + (getETag() != null ? Arrays.hashCode(getETag()) : 0); - result = 31 * result + (int) (size ^ (size >>> 32)); - result = 31 * result + (dataType != null ? dataType.hashCode() : 0); - return result; - } - - /** - * The key is the handle that you assign to an object that allows you retrieve it later. A key - * is a sequence of Unicode characters whose UTF-8 encoding is at most 1024 bytes long. Each - * object in a bucket must have a unique key. - * - * @see - */ - public String getKey() { - return key; - } - - public DateTime getLastModified() { - return lastModified; - } - - public void setLastModified(DateTime lastModified) { - this.lastModified = lastModified; - } - - /** - * The size of the object, in bytes. - * - * @see - */ - public long getSize() { - return size; - } - - public void setSize(long size) { - this.size = size; - } - - /** - * A standard MIME type describing the format of the contents. If none is provided, the - * default is binary/octet-stream. - * - * @see - */ - public String getContentType() { - return dataType; - } - - public void setContentType(String dataType) { - this.dataType = dataType; - } - - public void setETag(byte[] eTag) { - this.eTag = new byte[eTag.length]; - System.arraycopy(eTag, 0, this.eTag, 0, eTag.length); - } - - /** - * @return the eTag value stored in the Etag header returned by S3. - */ - public byte[] getETag() { - if (eTag != null) { - byte[] retval = new byte[eTag.length]; - System.arraycopy(this.eTag, 0, retval, 0, eTag.length); - return retval; - } else { - return null; - } - } - - public void setUserMetadata(Multimap userMetadata) { - this.userMetadata = userMetadata; - } - - /** - * Any header starting with x-amz-meta- is considered user metadata. It will be - * stored with the object and returned when you retrieve the object. The total size of the - * HTTP request, not including the body, must be less than 8 KB. - */ - public Multimap getUserMetadata() { - return userMetadata; - } - - public void setOwner(CanonicalUser owner) { - this.owner = owner; - } - - /** - * Every bucket and object in Amazon S3 has an owner, the user that created the bucket or - * object. The owner of a bucket or object cannot be changed. However, if the object is - * overwritten by another user (deleted and rewritten), the new object will have a new owner. - */ - public CanonicalUser getOwner() { - return owner; - } - - public void setStorageClass(String storageClass) { - this.storageClass = storageClass; - } - - /** - * Currently defaults to 'STANDARD' and not used. - */ - public String getStorageClass() { - return storageClass; - } - - public void setCacheControl(String cacheControl) { - this.cacheControl = cacheControl; - } - - /** - * Can be used to specify caching behavior along the request/reply chain. - * - * @link http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html?sec14.9. - */ - public String getCacheControl() { - return cacheControl; - } - - public void setContentDisposition(String dataDisposition) { - this.dataDisposition = dataDisposition; - } - - /** - * Specifies presentational information for the object. - * - * @see - */ - public String getContentDisposition() { - return dataDisposition; - } - - public void setContentEncoding(String dataEncoding) { - this.dataEncoding = dataEncoding; - } - - /** - * Specifies what content encodings have been applied to the object and thus what decoding - * mechanisms must be applied in order to obtain the media-type referenced by the Content-Type - * header field. - * - * @see - */ - public String getContentEncoding() { - return dataEncoding; - } - - public void setAllHeaders(Multimap allHeaders) { - this.allHeaders = allHeaders; - } - - public void setAccessControlList(AccessControlList acl) { - this.accessControlList = acl; - } - - public AccessControlList getAccessControlList() { - return this.accessControlList; - } - - /** - * @return all http response headers associated with this S3Object - */ - public Multimap getAllHeaders() { - return allHeaders; - } - - public int compareTo(Metadata o) { - return (this == o) ? 0 : getKey().compareTo(o.getKey()); - } - } - - /** - * @see Metadata#getKey() - */ - public String getKey() { - return metadata.getKey(); - } - - /** - * Sets entity for the request or the content from the response. If size isn't set, this will - * attempt to discover it. - * - * @param data - * typically InputStream for downloads, or File, byte [], String, or InputStream for - * uploads. - */ - public void setData(Object data) { - this.data = checkNotNull(data, "data"); - if (getMetadata().getSize() == -1) - this.getMetadata().setSize(HttpUtils.calculateSize(data)); - } - - /** - * generate an MD5 Hash for the current data. - *

    - *

    Note

    - *

    - * If this is an InputStream, it will be converted to a byte array first. - * - * @throws IOException - * if there is a problem generating the hash. - */ - public void generateETag() throws IOException { - checkState(data != null, "data"); - if (data instanceof InputStream) { - ETagInputStreamResult result = HttpUtils.generateETagResult((InputStream) data); - getMetadata().setSize(result.length); - getMetadata().setETag(result.eTag); - setData(result.data); - } else { - getMetadata().setETag(HttpUtils.eTag(data)); - } - } - - /** - * @return InputStream, if downloading, or whatever was set during {@link #setData(Object)} - */ - public Object getData() { - return data; - } - - /** - * @return System and User metadata relevant to this object. - */ - public Metadata getMetadata() { - return metadata; - } - - @Override - public String toString() { - final StringBuilder sb = new StringBuilder(); - sb.append("S3Object"); - sb.append("{metadata=").append(metadata); - sb.append('}'); - return sb.toString(); - } - - @Override - public boolean equals(Object o) { - if (this == o) - return true; - if (!(o instanceof S3Object)) - return false; - - S3Object s3Object = (S3Object) o; - - if (data != null ? !data.equals(s3Object.data) : s3Object.data != null) - return false; - if (!metadata.equals(s3Object.metadata)) - return false; - - return true; - } - - @Override - public int hashCode() { - int result = data != null ? data.hashCode() : 0; - result = 31 * result + metadata.hashCode(); - return result; - } - - public void setContentLength(long contentLength) { - this.contentLength = contentLength; - } - - /** - * Returns the total size of the downloaded object, or the chunk that's available. - *

    - * Chunking is only used when - * {@link org.jclouds.aws.s3.S3Connection#getObject(String, String, org.jclouds.aws.s3.commands.options.GetObjectOptions) } - * is called with options like tail, range, or startAt. - * - * @return the length in bytes that can be be obtained from {@link #getData()} - * @see org.jclouds.http.HttpHeaders#CONTENT_LENGTH - * @see GetObjectOptions - */ - public long getContentLength() { - return contentLength; - } - - public void setContentRange(String contentRange) { - this.contentRange = contentRange; - } - - /** - * If this is not-null, {@link #getContentLength() } will the size of chunk of the S3Object - * available via {@link #getData()} - * - * @see org.jclouds.http.HttpHeaders#CONTENT_RANGE - * @see GetObjectOptions - */ - public String getContentRange() { - return contentRange; + public S3Object(String key) { + this(new ObjectMetadata(key)); } } diff --git a/aws/s3/core/src/main/java/org/jclouds/aws/s3/filters/RequestAuthorizeSignature.java b/aws/s3/core/src/main/java/org/jclouds/aws/s3/filters/RequestAuthorizeSignature.java index 5c41120bbf..66cd421f44 100644 --- a/aws/s3/core/src/main/java/org/jclouds/aws/s3/filters/RequestAuthorizeSignature.java +++ b/aws/s3/core/src/main/java/org/jclouds/aws/s3/filters/RequestAuthorizeSignature.java @@ -150,7 +150,7 @@ public class RequestAuthorizeSignature implements HttpRequestFilter { Set headers = new TreeSet(request.getHeaders().keySet()); for (String header : headers) { if (header.startsWith("x-amz-")) { - toSign.append(header).append(":"); + toSign.append(header.toLowerCase()).append(":"); for (String value : request.getHeaders().get(header)) toSign.append(value.replaceAll("\r?\n", "")).append(","); toSign.deleteCharAt(toSign.lastIndexOf(",")); diff --git a/aws/s3/core/src/main/java/org/jclouds/aws/s3/functions/ParseObjectFromHeadersAndHttpContent.java b/aws/s3/core/src/main/java/org/jclouds/aws/s3/functions/ParseObjectFromHeadersAndHttpContent.java index ee06caa552..fd798b38ad 100644 --- a/aws/s3/core/src/main/java/org/jclouds/aws/s3/functions/ParseObjectFromHeadersAndHttpContent.java +++ b/aws/s3/core/src/main/java/org/jclouds/aws/s3/functions/ParseObjectFromHeadersAndHttpContent.java @@ -23,14 +23,10 @@ */ package org.jclouds.aws.s3.functions; -import javax.ws.rs.core.HttpHeaders; - +import org.jclouds.aws.s3.domain.ObjectMetadata; import org.jclouds.aws.s3.domain.S3Object; -import org.jclouds.http.HttpException; -import org.jclouds.http.HttpResponse; +import org.jclouds.blobstore.functions.ParseBlobFromHeadersAndHttpContent; -import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Function; import com.google.inject.Inject; /** @@ -39,45 +35,13 @@ import com.google.inject.Inject; * @see ParseMetadataFromHeaders * @author Adrian Cole */ -public class ParseObjectFromHeadersAndHttpContent implements Function { - private final ParseMetadataFromHeaders metadataParser; +public class ParseObjectFromHeadersAndHttpContent extends ParseBlobFromHeadersAndHttpContent { @Inject - public ParseObjectFromHeadersAndHttpContent(ParseMetadataFromHeaders metadataParser) { - this.metadataParser = metadataParser; + public ParseObjectFromHeadersAndHttpContent( + ParseObjectMetadataFromHeaders metadataParser, + BlobFactory blobFactory) { + super(metadataParser, blobFactory); } - - /** - * First, calls {@link ParseMetadataFromHeaders}. - * - * Then, sets the object size based on the Content-Length header and adds the content to the - * {@link S3Object} result. - * - * @throws org.jclouds.http.HttpException - */ - public S3Object apply(HttpResponse from) { - S3Object.Metadata metadata = metadataParser.apply(from); - S3Object object = new S3Object(metadata, from.getContent()); - parseContentLengthOrThrowException(from, object); - return object; - } - - @VisibleForTesting - void parseContentLengthOrThrowException(HttpResponse from, S3Object object) throws HttpException { - String contentLength = from.getFirstHeaderOrNull(HttpHeaders.CONTENT_LENGTH); - String contentRange = from.getFirstHeaderOrNull("Content-Range"); - if (contentLength == null) - throw new HttpException(HttpHeaders.CONTENT_LENGTH + " header not present in headers: " - + from.getHeaders()); - object.setContentLength(Long.parseLong(contentLength)); - - if (contentRange == null) { - object.getMetadata().setSize(object.getContentLength()); - } else { - object.setContentRange(contentRange); - object.getMetadata().setSize( - Long.parseLong(contentRange.substring(contentRange.lastIndexOf('/') + 1))); - } - } - + } \ No newline at end of file diff --git a/aws/s3/core/src/main/java/org/jclouds/aws/s3/functions/ParseObjectMetadataFromHeaders.java b/aws/s3/core/src/main/java/org/jclouds/aws/s3/functions/ParseObjectMetadataFromHeaders.java new file mode 100644 index 0000000000..a703d89ff1 --- /dev/null +++ b/aws/s3/core/src/main/java/org/jclouds/aws/s3/functions/ParseObjectMetadataFromHeaders.java @@ -0,0 +1,84 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.aws.s3.functions; + +import static org.jclouds.blobstore.reference.BlobStoreConstants.PROPERTY_USER_METADATA_PREFIX; + +import javax.ws.rs.core.HttpHeaders; + +import org.jclouds.aws.s3.domain.ObjectMetadata; +import org.jclouds.aws.s3.reference.S3Headers; +import org.jclouds.blobstore.functions.ParseBlobMetadataFromHeaders; +import org.jclouds.http.HttpResponse; +import org.jclouds.http.HttpUtils; +import org.jclouds.util.DateService; + +import com.google.common.annotations.VisibleForTesting; +import com.google.inject.Inject; +import com.google.inject.name.Named; + +/** + * This parses @{link {@link org.jclouds.aws.s3.domain.ObjectMetadata} from HTTP headers. + * + * @see + * @author Adrian Cole + */ +public class ParseObjectMetadataFromHeaders extends ParseBlobMetadataFromHeaders { + + @Inject + public ParseObjectMetadataFromHeaders(DateService dateParser, + @Named(PROPERTY_USER_METADATA_PREFIX) String metadataPrefix, + BlobMetadataFactory metadataFactory) { + super(dateParser, metadataPrefix, metadataFactory); + } + + /** + * parses the http response headers to create a new + * {@link org.jclouds.aws.s3.domain.ObjectMetadata} object. + */ + @Override + public ObjectMetadata apply(HttpResponse from) { + ObjectMetadata to = super.apply(from); + to.setCacheControl(from.getFirstHeaderOrNull(HttpHeaders.CACHE_CONTROL)); + to.setContentDisposition(from.getFirstHeaderOrNull("Content-Disposition")); + to.setContentEncoding(from.getFirstHeaderOrNull(HttpHeaders.CONTENT_ENCODING)); + return to; + } + + /** + * ETag == Content-MD5 + */ + @VisibleForTesting + protected void addETagTo(HttpResponse from, ObjectMetadata metadata) { + super.addETagTo(from, metadata); + if (metadata.getETag() == null) { + String eTagHeader = from.getFirstHeaderOrNull(S3Headers.AMZ_MD5); + if (eTagHeader != null) { + metadata.setETag(HttpUtils.fromHexString(eTagHeader)); + } + } + metadata.setContentMD5(metadata.getETag()); + } + +} \ No newline at end of file diff --git a/aws/s3/core/src/main/java/org/jclouds/aws/s3/functions/ReturnNotFoundIfBucketDoesntExist.java b/aws/s3/core/src/main/java/org/jclouds/aws/s3/functions/ReturnNotFoundIfBucketDoesntExist.java deleted file mode 100644 index e16d8a945e..0000000000 --- a/aws/s3/core/src/main/java/org/jclouds/aws/s3/functions/ReturnNotFoundIfBucketDoesntExist.java +++ /dev/null @@ -1,42 +0,0 @@ -/** - * - * Copyright (C) 2009 Global Cloud Specialists, Inc. - * - * ==================================================================== - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * ==================================================================== - */ -package org.jclouds.aws.s3.functions; - -import org.jclouds.aws.AWSResponseException; -import org.jclouds.aws.s3.domain.AccessControlList; - -import com.google.common.base.Function; - -public class ReturnNotFoundIfBucketDoesntExist implements Function { - - public AccessControlList apply(Exception from) { - if (from != null && from instanceof AWSResponseException) { - AWSResponseException responseException = (AWSResponseException) from; - if ("NoSuchBucket".equals(responseException.getError().getCode())) { - return AccessControlList.NOT_FOUND; - } - } - return null; - } -} diff --git a/aws/s3/core/src/main/java/org/jclouds/aws/s3/functions/ReturnNotFoundIfObjectDoesntExist.java b/aws/s3/core/src/main/java/org/jclouds/aws/s3/functions/ReturnNotFoundIfObjectDoesntExist.java deleted file mode 100644 index e60949bc83..0000000000 --- a/aws/s3/core/src/main/java/org/jclouds/aws/s3/functions/ReturnNotFoundIfObjectDoesntExist.java +++ /dev/null @@ -1,43 +0,0 @@ -/** - * - * Copyright (C) 2009 Global Cloud Specialists, Inc. - * - * ==================================================================== - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * ==================================================================== - */ -package org.jclouds.aws.s3.functions; - -import org.jclouds.aws.AWSResponseException; -import org.jclouds.aws.s3.domain.AccessControlList; - -import com.google.common.base.Function; - -public class ReturnNotFoundIfObjectDoesntExist implements Function { - - public AccessControlList apply(Exception from) { - if (from != null && from instanceof AWSResponseException) { - AWSResponseException responseException = (AWSResponseException) from; - if ("NoSuchKey".equals(responseException.getError().getCode())) { - return AccessControlList.NOT_FOUND; - } - } - return null; - } - -} diff --git a/aws/s3/core/src/main/java/org/jclouds/aws/s3/functions/ReturnS3ObjectMetadataNotFoundOn404.java b/aws/s3/core/src/main/java/org/jclouds/aws/s3/functions/ReturnS3ObjectMetadataNotFoundOn404.java deleted file mode 100644 index d829a3f5a5..0000000000 --- a/aws/s3/core/src/main/java/org/jclouds/aws/s3/functions/ReturnS3ObjectMetadataNotFoundOn404.java +++ /dev/null @@ -1,43 +0,0 @@ -/** - * - * Copyright (C) 2009 Global Cloud Specialists, Inc. - * - * ==================================================================== - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * ==================================================================== - */ -package org.jclouds.aws.s3.functions; - -import org.jclouds.aws.s3.domain.S3Object.Metadata; -import org.jclouds.http.HttpResponseException; - -import com.google.common.base.Function; - -public class ReturnS3ObjectMetadataNotFoundOn404 implements Function { - - public Metadata apply(Exception from) { - if (from instanceof HttpResponseException) { - HttpResponseException responseException = (HttpResponseException) from; - if (responseException.getResponse().getStatusCode() == 404) { - return Metadata.NOT_FOUND; - } - } - return null; - } - -} diff --git a/aws/s3/core/src/main/java/org/jclouds/aws/s3/internal/BaseS3Map.java b/aws/s3/core/src/main/java/org/jclouds/aws/s3/internal/BaseS3Map.java deleted file mode 100644 index 235280315a..0000000000 --- a/aws/s3/core/src/main/java/org/jclouds/aws/s3/internal/BaseS3Map.java +++ /dev/null @@ -1,255 +0,0 @@ -/** - * - * Copyright (C) 2009 Global Cloud Specialists, Inc. - * - * ==================================================================== - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * ==================================================================== - */ -package org.jclouds.aws.s3.internal; - -import static com.google.common.base.Preconditions.checkNotNull; - -import java.io.FileNotFoundException; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.Future; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; - -import org.jclouds.aws.s3.S3Connection; -import org.jclouds.aws.s3.S3Map; -import org.jclouds.aws.s3.domain.S3Bucket; -import org.jclouds.aws.s3.domain.S3Object; -import org.jclouds.aws.s3.reference.S3Constants; -import org.jclouds.util.Utils; - -import com.google.common.annotations.VisibleForTesting; -import com.google.inject.Inject; -import com.google.inject.assistedinject.Assisted; -import com.google.inject.name.Named; - -/** - * Implements core Map functionality with an {@link S3Connection} - *

    - * All commands will wait a maximum of ${jclouds.s3.map.timeout} milliseconds to complete before - * throwing an exception. - * - * @author Adrian Cole - * @param - * value of the map - */ -public abstract class BaseS3Map implements S3Map { - - protected final S3Connection connection; - protected final String bucket; - - /** - * maximum duration of an S3 Request - */ - @Inject(optional = true) - @Named(S3Constants.PROPERTY_OBJECTMAP_TIMEOUT) - protected long requestTimeoutMilliseconds = 10000; - - /** - * time to pause before retrying a transient failure - */ - @Inject(optional = true) - @Named(S3Constants.PROPERTY_OBJECTMAP_RETRY) - protected long requestRetryMilliseconds = 10; - - @Inject - public BaseS3Map(S3Connection connection, @Assisted String bucket) { - this.connection = checkNotNull(connection, "connection"); - this.bucket = checkNotNull(bucket, "bucketName"); - } - - /** - * {@inheritDoc} - *

    - * This returns the number of keys in the {@link S3Bucket} - * - * @see S3Bucket#getContents() - */ - public int size() { - try { - S3Bucket bucket = refreshBucket(); - Set contents = bucket.getContents(); - return contents.size(); - } catch (Exception e) { - Utils. rethrowIfRuntimeOrSameType(e); - throw new S3RuntimeException("Error getting size of bucketName" + bucket, e); - } - } - - protected boolean containsETag(byte[] eTag) throws InterruptedException, ExecutionException, - TimeoutException { - for (S3Object.Metadata metadata : refreshBucket().getContents()) { - if (Arrays.equals(eTag, metadata.getETag())) - return true; - } - return false; - } - - protected byte[] getETag(Object value) throws IOException, FileNotFoundException, - InterruptedException, ExecutionException, TimeoutException { - S3Object object = null; - if (value instanceof S3Object) { - object = (S3Object) value; - } else { - object = new S3Object("dummy", value); - } - if (object.getMetadata().getETag() == null) - object.generateETag(); - return object.getMetadata().getETag(); - } - - /** - * attempts asynchronous gets on all objects. - * - * @see S3Connection#getObject(String, String) - */ - protected Set getAllObjects() { - Set objects = new HashSet(); - Set> futureObjects = new HashSet>(); - for (String key : keySet()) { - futureObjects.add(connection.getObject(bucket, key)); - } - for (Future futureObject : futureObjects) { - try { - ifNotFoundRetryOtherwiseAddToSet(futureObject, objects); - } catch (Exception e) { - Utils. rethrowIfRuntimeOrSameType(e); - throw new S3RuntimeException(String.format("Error getting value from bucket %1$s", - bucket), e); - } - - } - return objects; - } - - @VisibleForTesting - void ifNotFoundRetryOtherwiseAddToSet(Future futureObject, Set objects) - throws InterruptedException, ExecutionException, TimeoutException { - for (int i = 0; i < 3; i++) { - S3Object object = futureObject.get(requestTimeoutMilliseconds, TimeUnit.MILLISECONDS); - if (object != S3Object.NOT_FOUND) { - objects.add(object); - break; - } else { - Thread.sleep(requestRetryMilliseconds); - } - } - } - - /** - * {@inheritDoc} - *

    - * Note that if value is an instance of InputStream, it will be read and closed following this - * method. To reuse data from InputStreams, pass {@link java.io.InputStream}s inside - * {@link S3Object}s - */ - public boolean containsValue(Object value) { - try { - byte[] eTag = getETag(value); - return containsETag(eTag); - } catch (Exception e) { - Utils. rethrowIfRuntimeOrSameType(e); - throw new S3RuntimeException(String.format( - "Error searching for ETAG of value: [%2$s] in bucketName:%1$s", bucket, value), e); - } - } - - public static class S3RuntimeException extends RuntimeException { - private static final long serialVersionUID = 1L; - - S3RuntimeException(String s) { - super(s); - } - - public S3RuntimeException(String s, Throwable throwable) { - super(s, throwable); - } - } - - public void clear() { - try { - List> deletes = new ArrayList>(); - for (String key : keySet()) { - deletes.add(connection.deleteObject(bucket, key)); - } - for (Future isdeleted : deletes) - if (!isdeleted.get(requestTimeoutMilliseconds, TimeUnit.MILLISECONDS)) { - throw new S3RuntimeException("failed to delete entry"); - } - } catch (Exception e) { - Utils. rethrowIfRuntimeOrSameType(e); - throw new S3RuntimeException("Error clearing bucketName" + bucket, e); - } - } - - protected S3Bucket refreshBucket() throws InterruptedException, ExecutionException, - TimeoutException { - S3Bucket currentBucket = connection.listBucket(bucket).get(requestTimeoutMilliseconds, - TimeUnit.MILLISECONDS); - if (currentBucket == S3Bucket.NOT_FOUND) - throw new S3RuntimeException("bucketName not found: " + bucket); - else - return currentBucket; - } - - public Set keySet() { - try { - Set keys = new HashSet(); - for (S3Object.Metadata object : refreshBucket().getContents()) - keys.add(object.getKey()); - return keys; - } catch (Exception e) { - Utils. rethrowIfRuntimeOrSameType(e); - throw new S3RuntimeException("Error getting keys in bucketName: " + bucket, e); - } - } - - public boolean containsKey(Object key) { - try { - return connection.headObject(bucket, key.toString()) != S3Object.Metadata.NOT_FOUND; - } catch (Exception e) { - Utils. rethrowIfRuntimeOrSameType(e); - throw new S3RuntimeException(String.format("Error searching for %1$s:%2$s", bucket, key), - e); - } - } - - public boolean isEmpty() { - return keySet().size() == 0; - } - - public S3Bucket getBucket() { - try { - return refreshBucket(); - } catch (Exception e) { - Utils. rethrowIfRuntimeOrSameType(e); - throw new S3RuntimeException("Error getting bucketName" + bucket, e); - } - } -} \ No newline at end of file diff --git a/aws/s3/core/src/main/java/org/jclouds/aws/s3/internal/GuiceS3Context.java b/aws/s3/core/src/main/java/org/jclouds/aws/s3/internal/GuiceS3Context.java index ad3224044b..9607109658 100644 --- a/aws/s3/core/src/main/java/org/jclouds/aws/s3/internal/GuiceS3Context.java +++ b/aws/s3/core/src/main/java/org/jclouds/aws/s3/internal/GuiceS3Context.java @@ -24,18 +24,23 @@ package org.jclouds.aws.s3.internal; import java.io.IOException; +import java.net.URI; import javax.annotation.Resource; -import org.jclouds.aws.s3.S3Connection; +import org.jclouds.aws.s3.S3BlobStore; import org.jclouds.aws.s3.S3Context; -import org.jclouds.aws.s3.S3InputStreamMap; -import org.jclouds.aws.s3.S3ObjectMap; +import org.jclouds.aws.s3.domain.ObjectMetadata; +import org.jclouds.aws.s3.domain.S3Object; +import org.jclouds.aws.s3.reference.S3Constants; +import org.jclouds.blobstore.BlobMap; +import org.jclouds.blobstore.InputStreamMap; import org.jclouds.lifecycle.Closer; import org.jclouds.logging.Logger; import com.google.inject.Inject; import com.google.inject.Injector; +import com.google.inject.name.Named; /** * Uses a Guice Injector to configure the objects served by S3Context methods. @@ -45,11 +50,11 @@ import com.google.inject.Injector; */ public class GuiceS3Context implements S3Context { public interface S3ObjectMapFactory { - S3ObjectMap createMapView(String bucket); + BlobMap createMapView(String bucket); } public interface S3InputStreamMapFactory { - S3InputStreamMap createMapView(String bucket); + InputStreamMap createMapView(String bucket); } @Resource @@ -58,36 +63,41 @@ public class GuiceS3Context implements S3Context { private final S3InputStreamMapFactory s3InputStreamMapFactory; private final S3ObjectMapFactory s3ObjectMapFactory; private final Closer closer; + private final String account; + private final URI endPoint; @Inject private GuiceS3Context(Injector injector, Closer closer, S3ObjectMapFactory s3ObjectMapFactory, - S3InputStreamMapFactory s3InputStreamMapFactory) { + S3InputStreamMapFactory s3InputStreamMapFactory, + @Named(S3Constants.PROPERTY_AWS_ACCESSKEYID) String accessKey, URI endPoint) { this.injector = injector; this.s3InputStreamMapFactory = s3InputStreamMapFactory; this.s3ObjectMapFactory = s3ObjectMapFactory; this.closer = closer; + this.account = accessKey; + this.endPoint = endPoint; } /** * {@inheritDoc} */ - public S3Connection getConnection() { - return injector.getInstance(S3Connection.class); + public S3BlobStore getApi() { + return injector.getInstance(S3BlobStore.class); } /** * {@inheritDoc} */ - public S3InputStreamMap createInputStreamMap(String bucket) { - getConnection().putBucketIfNotExists(bucket); + public InputStreamMap createInputStreamMap(String bucket) { + getApi().createContainer(bucket); return s3InputStreamMapFactory.createMapView(bucket); } /** * {@inheritDoc} */ - public S3ObjectMap createS3ObjectMap(String bucket) { - getConnection().putBucketIfNotExists(bucket); + public BlobMap createBlobMap(String bucket) { + getApi().createContainer(bucket); return s3ObjectMapFactory.createMapView(bucket); } @@ -104,4 +114,48 @@ public class GuiceS3Context implements S3Context { } } + @Override + public String toString() { + return "GuiceS3Context [account=" + account + ", endPoint=" + endPoint + "]"; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((account == null) ? 0 : account.hashCode()); + result = prime * result + ((endPoint == null) ? 0 : endPoint.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + GuiceS3Context other = (GuiceS3Context) obj; + if (account == null) { + if (other.account != null) + return false; + } else if (!account.equals(other.account)) + return false; + if (endPoint == null) { + if (other.endPoint != null) + return false; + } else if (!endPoint.equals(other.endPoint)) + return false; + return true; + } + + public String getAccount() { + return account; + } + + public URI getEndPoint() { + return endPoint; + } + } diff --git a/aws/s3/core/src/main/java/org/jclouds/aws/s3/internal/LiveS3InputStreamMap.java b/aws/s3/core/src/main/java/org/jclouds/aws/s3/internal/LiveS3InputStreamMap.java index 3ec38d6b71..c35f04074f 100644 --- a/aws/s3/core/src/main/java/org/jclouds/aws/s3/internal/LiveS3InputStreamMap.java +++ b/aws/s3/core/src/main/java/org/jclouds/aws/s3/internal/LiveS3InputStreamMap.java @@ -23,259 +23,33 @@ */ package org.jclouds.aws.s3.internal; -import java.io.File; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.Future; -import java.util.concurrent.TimeUnit; - -import org.jclouds.aws.s3.S3Connection; -import org.jclouds.aws.s3.S3InputStreamMap; +import org.jclouds.aws.s3.S3BlobStore; +import org.jclouds.aws.s3.domain.BucketMetadata; +import org.jclouds.aws.s3.domain.ObjectMetadata; import org.jclouds.aws.s3.domain.S3Object; -import org.jclouds.util.Utils; +import org.jclouds.blobstore.LiveInputStreamMap; -import com.google.common.annotations.VisibleForTesting; import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; /** - * Map representation of a live connection to S3. All put operations will result - * in ETag calculation. If this is not desired, use {@link LiveS3ObjectMap} - * instead. - * + * Map representation of a live connection to S3. All put operations will result in ETag + * calculation. If this is not desired, use {@link LiveS3ObjectMap} instead. + * * @author Adrian Cole * @see S3Connection * @see BaseS3Map */ -public class LiveS3InputStreamMap extends BaseS3Map implements - S3InputStreamMap { +public class LiveS3InputStreamMap extends + LiveInputStreamMap { - @Inject - public LiveS3InputStreamMap(S3Connection connection, @Assisted String bucket) { - super(connection, bucket); - } - - /** - * {@inheritDoc} - * - * @see S3Connection#getObject(String, String) - */ - public InputStream get(Object o) { - try { - return (InputStream) (connection.getObject(bucket, o.toString()) - .get(requestTimeoutMilliseconds, TimeUnit.MILLISECONDS)) - .getData(); - } catch (Exception e) { - Utils.rethrowIfRuntimeOrSameType(e); - throw new S3RuntimeException(String.format( - "Error geting object %1$s:%2$s", bucket, o), e); - } - } - - /** - * {@inheritDoc} - * - * @see S3Connection#deleteObject(String, String) - */ - public InputStream remove(Object o) { - InputStream old = get(o); - try { - connection.deleteObject(bucket, o.toString()).get( - requestTimeoutMilliseconds, TimeUnit.MILLISECONDS); - } catch (Exception e) { - Utils.rethrowIfRuntimeOrSameType(e); - throw new S3RuntimeException(String.format( - "Error removing object %1$s:%2$s", bucket, o), e); - } - return old; - } - - /** - * {@inheritDoc} - * - * @see #getAllObjects() - */ - public Collection values() { - Collection values = new LinkedList(); - Set objects = getAllObjects(); - for (S3Object object : objects) { - values.add((InputStream) object.getData()); - } - return values; - } - - /** - * {@inheritDoc} - * - * @see #getAllObjects() - */ - public Set> entrySet() { - Set> entrySet = new HashSet>(); - for (S3Object object : getAllObjects()) { - entrySet.add(new Entry(object.getKey(), (InputStream) object - .getData())); - } - return entrySet; - } - - public class Entry implements java.util.Map.Entry { - - private InputStream value; - private String key; - - Entry(String key, InputStream value) { - this.key = key; - this.value = value; - } - - public String getKey() { - return key; - } - - public InputStream getValue() { - return value; - } - - /** - * {@inheritDoc} - * - * @see LiveS3InputStreamMap#put(String, InputStream) - */ - public InputStream setValue(InputStream value) { - return put(key, value); - } - - } - - /** - * {@inheritDoc} - * - * @see #putAllInternal(Map) - */ - public void putAll(Map map) { - putAllInternal(map); - } - - /** - * {@inheritDoc} - * - * @see #putAllInternal(Map) - */ - public void putAllBytes(Map map) { - putAllInternal(map); - } - - /** - * {@inheritDoc} - * - * @see #putAllInternal(Map) - */ - public void putAllFiles(Map map) { - putAllInternal(map); - } - - /** - * {@inheritDoc} - * - * @see #putAllInternal(Map) - */ - public void putAllStrings(Map map) { - putAllInternal(map); - } - - /** - * submits requests to add all objects and collects the results later. All - * values will have eTag calculated first. As a side-effect of this, the - * content will be copied into a byte []. - * - * @see S3Connection#putObject(String, S3Object) - */ - @VisibleForTesting - void putAllInternal(Map map) { - try { - List> puts = new ArrayList>(); - for (Map.Entry entry : map.entrySet()) { - S3Object object = new S3Object(entry.getKey()); - object.setData(entry.getValue()); - object.generateETag(); - puts.add(connection.putObject(bucket, object)); - /// ParamExtractor Funcion - /// response transformer set key on the way out. - /// ExceptionHandler convert 404 to NOT_FOUND - } - for (Future put : puts) - // this will throw an exception if there was a problem - put.get(requestTimeoutMilliseconds, TimeUnit.MILLISECONDS); - } catch (Exception e) { - Utils.rethrowIfRuntimeOrSameType(e); - throw new S3RuntimeException("Error putting into bucketName" + bucket, - e); - } - } - - /** - * {@inheritDoc} - * - * @see #putInternal(String, Object) - */ - public InputStream putString(String key, String value) { - return putInternal(key, value); - } - - /** - * {@inheritDoc} - * - * @see #putInternal(String, Object) - */ - public InputStream putFile(String key, File value) { - return putInternal(key, value); - } - - /** - * {@inheritDoc} - * - * @see #putInternal(String, Object) - */ - public InputStream putBytes(String key, byte[] value) { - return putInternal(key, value); - } - - /** - * {@inheritDoc} - * - * @see #putInternal(String, Object) - */ - public InputStream put(String key, InputStream value) { - return putInternal(key, value); - } - - /** - * calculates eTag before adding the object to s3. As a side-effect of this, - * the content will be copied into a byte []. * - * - * @see S3Connection#putObject(String, S3Object) - */ - @VisibleForTesting - InputStream putInternal(String s, Object o) { - S3Object object = new S3Object(s); - try { - InputStream returnVal = containsKey(s) ? get(s) : null; - object.setData(o); - object.generateETag(); - connection.putObject(bucket, object).get( - requestTimeoutMilliseconds, TimeUnit.MILLISECONDS); - return returnVal; - } catch (Exception e) { - Utils.rethrowIfRuntimeOrSameType(e); - throw new S3RuntimeException(String.format( - "Error adding object %1$s:%2$s", bucket, object), e); - } - } + @Inject + public LiveS3InputStreamMap(S3BlobStore connection, @Assisted String container) { + super(connection, container); + } + @Override + protected S3Object createBlob(String s) { + return new S3Object(s); + } } diff --git a/aws/s3/core/src/main/java/org/jclouds/aws/s3/internal/LiveS3ObjectMap.java b/aws/s3/core/src/main/java/org/jclouds/aws/s3/internal/LiveS3ObjectMap.java index ed28fc1192..c9df3a4253 100644 --- a/aws/s3/core/src/main/java/org/jclouds/aws/s3/internal/LiveS3ObjectMap.java +++ b/aws/s3/core/src/main/java/org/jclouds/aws/s3/internal/LiveS3ObjectMap.java @@ -23,19 +23,11 @@ */ package org.jclouds.aws.s3.internal; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.Future; -import java.util.concurrent.TimeUnit; - -import org.jclouds.aws.s3.S3Connection; -import org.jclouds.aws.s3.S3ObjectMap; +import org.jclouds.aws.s3.S3BlobStore; +import org.jclouds.aws.s3.domain.BucketMetadata; +import org.jclouds.aws.s3.domain.ObjectMetadata; import org.jclouds.aws.s3.domain.S3Object; -import org.jclouds.util.Utils; +import org.jclouds.blobstore.LiveBlobMap; import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; @@ -48,137 +40,11 @@ import com.google.inject.assistedinject.Assisted; * * @author Adrian Cole */ -public class LiveS3ObjectMap extends BaseS3Map implements S3ObjectMap { +public class LiveS3ObjectMap extends LiveBlobMap { - @Inject - public LiveS3ObjectMap(S3Connection connection, @Assisted String bucket) { - super(connection, bucket); - } - - /** - * {@inheritDoc} - * - * @see #values() - */ - public Set> entrySet() { - Set> entrySet = new HashSet>(); - for (S3Object value : values()) { - Map.Entry entry = new Entry(value.getKey(), value); - entrySet.add(entry); - } - return entrySet; - } - - public class Entry implements java.util.Map.Entry { - - private S3Object value; - private String key; - - Entry(String key, S3Object value) { - this.key = key; - this.value = value; - } - - public String getKey() { - return key; - } - - public S3Object getValue() { - return value; - } - - /** - * {@inheritDoc} - * - * @see LiveS3ObjectMap#put(String, S3Object) - */ - public S3Object setValue(S3Object value) { - return put(key, value); - } - - } - - /** - * {@inheritDoc} - * - * @see S3Connection#getObject(String, String) - */ - public S3Object get(Object key) { - try { - return connection.getObject(bucket, key.toString()).get( - requestTimeoutMilliseconds, TimeUnit.MILLISECONDS); - } catch (Exception e) { - Utils. rethrowIfRuntimeOrSameType(e); - throw new S3RuntimeException(String.format( - "Error geting object %1$s:%2$s", bucket, key), e); - } - } - - /** - * {@inheritDoc} - * - * @see S3Connection#putObject(String, S3Object) - */ - public S3Object put(String key, S3Object value) { - S3Object returnVal = get(key); - try { - connection.putObject(bucket, value).get(requestTimeoutMilliseconds, - TimeUnit.MILLISECONDS); - } catch (Exception e) { - Utils. rethrowIfRuntimeOrSameType(e); - throw new S3RuntimeException( - String.format("Error putting object %1$s:%2$s%n%3$s", - bucket, key, value), e); - } - return returnVal; - } - - /** - * {@inheritDoc} attempts to put all objects asynchronously. - * - * @see S3Connection#putObject(String, S3Object) - */ - public void putAll(Map map) { - try { - List> puts = new ArrayList>(); - for (S3Object object : map.values()) { - puts.add(connection.putObject(bucket, object)); - } - for (Future put : puts) - // this will throw an exception if there was a problem - put.get(requestTimeoutMilliseconds, TimeUnit.MILLISECONDS); - } catch (Exception e) { - Utils. rethrowIfRuntimeOrSameType(e); - throw new S3RuntimeException("Error putting into bucketName" + bucket, - e); - } - } - - /** - * {@inheritDoc} - * - * @see S3Connection#deleteObject(String, String) - */ - public S3Object remove(Object key) { - S3Object old = get(key); - try { - connection.deleteObject(bucket, key.toString()).get( - requestTimeoutMilliseconds, TimeUnit.MILLISECONDS); - } catch (Exception e) { - Utils. rethrowIfRuntimeOrSameType(e); - throw new S3RuntimeException(String.format( - "Error removing object %1$s:%2$s", bucket, key), e); - } - return old; - } - - /** - * {@inheritDoc} - * - * @see #getAllObjects() - */ - public Collection values() { - return getAllObjects(); - } + @Inject + public LiveS3ObjectMap(S3BlobStore connection, @Assisted String container) { + super(connection, container); + } } diff --git a/aws/s3/core/src/main/java/org/jclouds/aws/s3/options/CopyObjectOptions.java b/aws/s3/core/src/main/java/org/jclouds/aws/s3/options/CopyObjectOptions.java index 5fab528074..ac8c2605a3 100644 --- a/aws/s3/core/src/main/java/org/jclouds/aws/s3/options/CopyObjectOptions.java +++ b/aws/s3/core/src/main/java/org/jclouds/aws/s3/options/CopyObjectOptions.java @@ -23,9 +23,9 @@ */ package org.jclouds.aws.s3.options; -import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; +import static org.jclouds.blobstore.reference.BlobStoreConstants.PROPERTY_USER_METADATA_PREFIX; import java.io.UnsupportedEncodingException; @@ -39,6 +39,8 @@ import org.joda.time.DateTime; import com.google.common.base.Preconditions; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; +import com.google.inject.Inject; +import com.google.inject.name.Named; /** * Contains options supported in the REST API for the COPY object operation. @@ -78,6 +80,13 @@ public class CopyObjectOptions extends BaseHttpRequestOptions { private CannedAccessPolicy acl = CannedAccessPolicy.PRIVATE; + private String metadataPrefix; + + @Inject + public void setMetadataPrefix(@Named(PROPERTY_USER_METADATA_PREFIX) String metadataPrefix) { + this.metadataPrefix = metadataPrefix; + } + /** * Override the default ACL (private) with the specified one. * @@ -245,10 +254,14 @@ public class CopyObjectOptions extends BaseHttpRequestOptions { @Override public Multimap buildRequestHeaders() { + checkState(metadataPrefix != null, "metadataPrefix should have been injected!"); Multimap returnVal = HashMultimap.create(); returnVal.putAll(headers); if (metadata != null) { - returnVal.putAll(metadata); + for (String key : metadata.keySet()) { + returnVal.putAll(key.startsWith(metadataPrefix) ? key : metadataPrefix + key, metadata + .get(key)); + } returnVal.put("x-amz-metadata-directive", "REPLACE"); } return returnVal; @@ -259,10 +272,6 @@ public class CopyObjectOptions extends BaseHttpRequestOptions { */ public CopyObjectOptions overrideMetadataWith(Multimap metadata) { checkNotNull(metadata, "metadata"); - for (String header : metadata.keySet()) { - checkArgument(header.startsWith("x-amz-meta-"), - "Metadata keys must start with x-amz-meta-"); - } this.metadata = metadata; return this; } diff --git a/aws/s3/core/src/main/java/org/jclouds/aws/s3/options/PutBucketOptions.java b/aws/s3/core/src/main/java/org/jclouds/aws/s3/options/PutBucketOptions.java index 83e1e80e08..f2050ea3c7 100644 --- a/aws/s3/core/src/main/java/org/jclouds/aws/s3/options/PutBucketOptions.java +++ b/aws/s3/core/src/main/java/org/jclouds/aws/s3/options/PutBucketOptions.java @@ -26,7 +26,7 @@ package org.jclouds.aws.s3.options; import static com.google.common.base.Preconditions.checkNotNull; import org.jclouds.aws.s3.domain.CannedAccessPolicy; -import org.jclouds.aws.s3.domain.S3Bucket.Metadata.LocationConstraint; +import org.jclouds.aws.s3.domain.BucketMetadata.LocationConstraint; import org.jclouds.aws.s3.reference.S3Headers; import org.jclouds.http.options.BaseHttpRequestOptions; @@ -88,7 +88,7 @@ public class PutBucketOptions extends BaseHttpRequestOptions { } /** - * @see PutBucketOptions#createIn(org.jclouds.aws.s3.domain.S3Bucket.Metadata.LocationConstraint) + * @see PutBucketOptions#createIn(org.jclouds.aws.s3.domain.BucketMetadata.LocationConstraint) */ public LocationConstraint getLocationConstraint() { return constraint; @@ -96,7 +96,7 @@ public class PutBucketOptions extends BaseHttpRequestOptions { public static class Builder { /** - * @see PutBucketOptions#createIn(org.jclouds.aws.s3.domain.S3Bucket.Metadata.LocationConstraint) + * @see PutBucketOptions#createIn(org.jclouds.aws.s3.domain.BucketMetadata.LocationConstraint) */ public static PutBucketOptions createIn(LocationConstraint constraint) { PutBucketOptions options = new PutBucketOptions(); diff --git a/aws/s3/core/src/main/java/org/jclouds/aws/s3/reference/S3Constants.java b/aws/s3/core/src/main/java/org/jclouds/aws/s3/reference/S3Constants.java index 1a3e9051bd..6d2dd1ed7e 100644 --- a/aws/s3/core/src/main/java/org/jclouds/aws/s3/reference/S3Constants.java +++ b/aws/s3/core/src/main/java/org/jclouds/aws/s3/reference/S3Constants.java @@ -24,14 +24,14 @@ package org.jclouds.aws.s3.reference; import org.jclouds.aws.reference.AWSConstants; -import org.jclouds.keyvaluestore.reference.ObjectStoreConstants; +import org.jclouds.blobstore.reference.BlobStoreConstants; /** * Configuration properties and constants used in S3 connections. * * @author Adrian Cole */ -public interface S3Constants extends AWSConstants, S3Headers, ObjectStoreConstants { +public interface S3Constants extends AWSConstants, S3Headers, BlobStoreConstants { /** * S3 service's XML Namespace, as used in XML request and response documents. diff --git a/aws/s3/core/src/main/java/org/jclouds/aws/s3/reference/S3Headers.java b/aws/s3/core/src/main/java/org/jclouds/aws/s3/reference/S3Headers.java index 9def3dd743..c2ea629316 100644 --- a/aws/s3/core/src/main/java/org/jclouds/aws/s3/reference/S3Headers.java +++ b/aws/s3/core/src/main/java/org/jclouds/aws/s3/reference/S3Headers.java @@ -40,12 +40,6 @@ public interface S3Headers { * Policy. */ public static final String CANNED_ACL = "x-amz-acl"; - /** - * Any header starting with this prefix is considered user metadata. It will be stored with the - * object and returned when you retrieve the object. The total size of the HTTP request, not - * including the body, must be less than 8 KB. - */ - public static final String USER_METADATA_PREFIX = "x-amz-meta-"; public static final String AMZ_MD5 = "x-amz-meta-object-eTag"; public static final String REQUEST_ID = "x-amz-request-id"; public static final String REQUEST_TOKEN = "x-amz-id-2"; diff --git a/aws/s3/core/src/main/java/org/jclouds/aws/s3/util/S3Utils.java b/aws/s3/core/src/main/java/org/jclouds/aws/s3/util/S3Utils.java index 3c79ca6743..46512af7a9 100644 --- a/aws/s3/core/src/main/java/org/jclouds/aws/s3/util/S3Utils.java +++ b/aws/s3/core/src/main/java/org/jclouds/aws/s3/util/S3Utils.java @@ -27,19 +27,17 @@ import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; import java.io.ByteArrayInputStream; -import java.io.IOException; import java.io.InputStream; import org.jclouds.aws.domain.AWSError; -import org.jclouds.aws.s3.domain.S3Object; import org.jclouds.aws.s3.filters.RequestAuthorizeSignature; import org.jclouds.aws.s3.reference.S3Headers; import org.jclouds.aws.s3.xml.S3ParserFactory; +import org.jclouds.blobstore.util.BlobStoreUtils; import org.jclouds.http.HttpCommand; import org.jclouds.http.HttpException; import org.jclouds.http.HttpResponse; import org.jclouds.http.HttpUtils; -import org.jclouds.util.Utils; import com.google.inject.Inject; @@ -48,7 +46,7 @@ import com.google.inject.Inject; * * @author Adrian Cole */ -public class S3Utils { +public class S3Utils extends BlobStoreUtils { @Inject RequestAuthorizeSignature signer; @@ -86,19 +84,4 @@ public class S3Utils { return bucketName; } - public static String getContentAsStringAndClose(S3Object object) throws IOException { - checkNotNull(object, "s3Object"); - checkNotNull(object.getData(), "s3Object.content"); - Object o = object.getData(); - - if (o instanceof InputStream) { - String returnVal = Utils.toStringAndClose((InputStream) o); - if (object.getMetadata().getContentType().indexOf("xml") >= 0) { - - } - return returnVal; - } else { - throw new IllegalArgumentException("Object type not supported: " + o.getClass().getName()); - } - } } \ No newline at end of file diff --git a/aws/s3/core/src/main/java/org/jclouds/aws/s3/xml/CopyObjectHandler.java b/aws/s3/core/src/main/java/org/jclouds/aws/s3/xml/CopyObjectHandler.java index 8042e7f3d8..585411a801 100644 --- a/aws/s3/core/src/main/java/org/jclouds/aws/s3/xml/CopyObjectHandler.java +++ b/aws/s3/core/src/main/java/org/jclouds/aws/s3/xml/CopyObjectHandler.java @@ -23,7 +23,7 @@ */ package org.jclouds.aws.s3.xml; -import org.jclouds.aws.s3.domain.S3Object; +import org.jclouds.aws.s3.domain.ObjectMetadata; import org.jclouds.http.HttpUtils; import org.jclouds.http.functions.ParseSax; import org.jclouds.util.DateService; @@ -38,14 +38,14 @@ import com.google.inject.Inject; * @see * @author Adrian Cole */ -public class CopyObjectHandler extends ParseSax.HandlerWithResult { +public class CopyObjectHandler extends ParseSax.HandlerWithResult { - private S3Object.Metadata metadata = new S3Object.Metadata(); + private ObjectMetadata metadata = new ObjectMetadata(); private StringBuilder currentText = new StringBuilder(); @Inject private DateService dateParser; - public S3Object.Metadata getResult() { + public ObjectMetadata getResult() { return metadata; } diff --git a/aws/s3/core/src/main/java/org/jclouds/aws/s3/xml/ListAllMyBucketsHandler.java b/aws/s3/core/src/main/java/org/jclouds/aws/s3/xml/ListAllMyBucketsHandler.java index 6a0fa988da..28023658b8 100644 --- a/aws/s3/core/src/main/java/org/jclouds/aws/s3/xml/ListAllMyBucketsHandler.java +++ b/aws/s3/core/src/main/java/org/jclouds/aws/s3/xml/ListAllMyBucketsHandler.java @@ -27,7 +27,7 @@ import java.util.ArrayList; import java.util.List; import org.jclouds.aws.s3.domain.CanonicalUser; -import org.jclouds.aws.s3.domain.S3Bucket; +import org.jclouds.aws.s3.domain.BucketMetadata; import org.jclouds.http.functions.ParseSax; import org.jclouds.util.DateService; @@ -43,10 +43,10 @@ import com.google.inject.Inject; * /> * @author Adrian Cole */ -public class ListAllMyBucketsHandler extends ParseSax.HandlerWithResult> { +public class ListAllMyBucketsHandler extends ParseSax.HandlerWithResult> { - private List buckets = new ArrayList(); - private S3Bucket.Metadata currentS3Bucket; + private List buckets = new ArrayList(); + private BucketMetadata currentS3Bucket; private CanonicalUser currentOwner; private StringBuilder currentText = new StringBuilder(); @@ -57,7 +57,7 @@ public class ListAllMyBucketsHandler extends ParseSax.HandlerWithResult getResult() { + public List getResult() { return buckets; } @@ -70,7 +70,7 @@ public class ListAllMyBucketsHandler extends ParseSax.HandlerWithResult */ -public class ListBucketHandler extends ParseSax.HandlerWithResult { - private S3Bucket s3Bucket; - private S3Object.Metadata currentObjectMetadata; +public class ListBucketHandler extends ParseSax.HandlerWithResult { + private List contents; + private SortedSet commonPrefixes; + private ObjectMetadata currentObjectMetadata; private CanonicalUser currentOwner; private StringBuilder currentText = new StringBuilder(); private final DateService dateParser; + private String bucketName; + private String prefix; + private String marker; + private int maxResults; + private String delimiter; + private boolean isTruncated; @Inject public ListBucketHandler(DateService dateParser) { this.dateParser = dateParser; - this.s3Bucket = new S3Bucket(); + this.contents = Lists.newArrayList(); + this.commonPrefixes = new TreeSet(); } - public S3Bucket getResult() { - return s3Bucket; + public ListBucketResponse getResult() { + return new ArrayListBucketResponse(bucketName, contents, prefix, marker, maxResults, + delimiter, isTruncated, commonPrefixes); } private boolean inCommonPrefixes; @@ -75,7 +90,7 @@ public class ListBucketHandler extends ParseSax.HandlerWithResult { } else if (qName.equals("DisplayName")) { currentOwner.setDisplayName(currentText.toString()); } else if (qName.equals("Key")) { // content stuff - currentObjectMetadata = new S3Object.Metadata(currentText.toString()); + currentObjectMetadata = new ObjectMetadata(currentText.toString()); } else if (qName.equals("LastModified")) { currentObjectMetadata.setLastModified(dateParser.iso8601DateParse(currentText.toString())); } else if (qName.equals("ETag")) { @@ -88,26 +103,25 @@ public class ListBucketHandler extends ParseSax.HandlerWithResult { } else if (qName.equals("StorageClass")) { currentObjectMetadata.setStorageClass(currentText.toString()); } else if (qName.equals("Contents")) { - s3Bucket.getContents().add(currentObjectMetadata); + contents.add(currentObjectMetadata); } else if (qName.equals("Name")) { - s3Bucket.setName(currentText.toString()); + this.bucketName = currentText.toString(); } else if (qName.equals("Prefix")) { String prefix = currentText.toString().trim(); if (inCommonPrefixes) - s3Bucket.getCommonPrefixes().add(prefix); + commonPrefixes.add(prefix); else - s3Bucket.setPrefix(prefix); + this.prefix = prefix; } else if (qName.equals("Delimiter")) { if (!currentText.toString().equals("")) - s3Bucket.setDelimiter(currentText.toString().trim()); + this.delimiter = currentText.toString().trim(); } else if (qName.equals("Marker")) { if (!currentText.toString().equals("")) - s3Bucket.setMarker(currentText.toString()); + this.marker = currentText.toString(); } else if (qName.equals("MaxKeys")) { - s3Bucket.setMaxKeys(Long.parseLong(currentText.toString())); + this.maxResults = Integer.parseInt(currentText.toString()); } else if (qName.equals("IsTruncated")) { - boolean isTruncated = Boolean.parseBoolean(currentText.toString()); - s3Bucket.setTruncated(isTruncated); + this.isTruncated = Boolean.parseBoolean(currentText.toString()); } currentText = new StringBuilder(); } diff --git a/aws/s3/core/src/main/java/org/jclouds/aws/s3/xml/S3ParserFactory.java b/aws/s3/core/src/main/java/org/jclouds/aws/s3/xml/S3ParserFactory.java index 170cf2b6f5..66ccff09a0 100644 --- a/aws/s3/core/src/main/java/org/jclouds/aws/s3/xml/S3ParserFactory.java +++ b/aws/s3/core/src/main/java/org/jclouds/aws/s3/xml/S3ParserFactory.java @@ -27,8 +27,9 @@ import java.util.List; import org.jclouds.aws.domain.AWSError; import org.jclouds.aws.s3.domain.AccessControlList; -import org.jclouds.aws.s3.domain.S3Bucket; -import org.jclouds.aws.s3.domain.S3Object; +import org.jclouds.aws.s3.domain.BucketMetadata; +import org.jclouds.aws.s3.domain.ListBucketResponse; +import org.jclouds.aws.s3.domain.ObjectMetadata; import org.jclouds.aws.xml.ErrorHandler; import org.jclouds.http.functions.ParseSax; @@ -46,7 +47,7 @@ import com.google.inject.Provider; public class S3ParserFactory { @Inject - private GenericParseFactory> parseListAllMyBucketsFactory; + private GenericParseFactory> parseListAllMyBucketsFactory; @VisibleForTesting public static interface GenericParseFactory { @@ -59,12 +60,12 @@ public class S3ParserFactory { /** * @return a parser used to handle {@link org.jclouds.aws.s3.commands.ListOwnedBuckets} responses */ - public ParseSax> createListBucketsParser() { + public ParseSax> createListBucketsParser() { return parseListAllMyBucketsFactory.create(ListAllMyBucketsHandlerprovider.get()); } @Inject - private GenericParseFactory parseListBucketFactory; + private GenericParseFactory parseListBucketFactory; @Inject Provider ListBucketHandlerprovider; @@ -72,12 +73,12 @@ public class S3ParserFactory { /** * @return a parser used to handle {@link org.jclouds.aws.s3.commands.ListBucket} responses */ - public ParseSax createListBucketParser() { + public ParseSax createListBucketParser() { return parseListBucketFactory.create(ListBucketHandlerprovider.get()); } @Inject - private GenericParseFactory parseCopyObjectFactory; + private GenericParseFactory parseCopyObjectFactory; @Inject Provider copyObjectHandlerProvider; @@ -85,7 +86,7 @@ public class S3ParserFactory { /** * @return a parser used to handle {@link org.jclouds.aws.s3.commands.CopyObject} responses */ - public ParseSax createCopyObjectParser() { + public ParseSax createCopyObjectParser() { return parseCopyObjectFactory.create(copyObjectHandlerProvider.get()); } diff --git a/aws/s3/core/src/main/java/org/jclouds/aws/s3/xml/config/S3ParserModule.java b/aws/s3/core/src/main/java/org/jclouds/aws/s3/xml/config/S3ParserModule.java index bc6a3606f4..c465bfd05b 100644 --- a/aws/s3/core/src/main/java/org/jclouds/aws/s3/xml/config/S3ParserModule.java +++ b/aws/s3/core/src/main/java/org/jclouds/aws/s3/xml/config/S3ParserModule.java @@ -27,8 +27,9 @@ import java.util.List; import org.jclouds.aws.domain.AWSError; import org.jclouds.aws.s3.domain.AccessControlList; -import org.jclouds.aws.s3.domain.S3Bucket; -import org.jclouds.aws.s3.domain.S3Object; +import org.jclouds.aws.s3.domain.BucketMetadata; +import org.jclouds.aws.s3.domain.ListBucketResponse; +import org.jclouds.aws.s3.domain.ObjectMetadata; import org.jclouds.aws.s3.xml.AccessControlListHandler; import org.jclouds.aws.s3.xml.CopyObjectHandler; import org.jclouds.aws.s3.xml.ListAllMyBucketsHandler; @@ -51,11 +52,11 @@ import com.google.inject.assistedinject.FactoryProvider; public class S3ParserModule extends AbstractModule { protected final TypeLiteral> errorTypeLiteral = new TypeLiteral>() { }; - protected final TypeLiteral>> listBucketsTypeLiteral = new TypeLiteral>>() { + protected final TypeLiteral>> listBucketsTypeLiteral = new TypeLiteral>>() { }; - protected final TypeLiteral> bucketTypeLiteral = new TypeLiteral>() { + protected final TypeLiteral> bucketTypeLiteral = new TypeLiteral>() { }; - protected final TypeLiteral> objectMetadataTypeLiteral = new TypeLiteral>() { + protected final TypeLiteral> objectMetadataTypeLiteral = new TypeLiteral>() { }; protected final TypeLiteral> accessControlListTypeLiteral = new TypeLiteral>() { }; @@ -73,11 +74,11 @@ public class S3ParserModule extends AbstractModule { } private void bindParserImplementationsToReturnTypes() { - bind(new TypeLiteral>>() { + bind(new TypeLiteral>>() { }).to(ListAllMyBucketsHandler.class); - bind(new TypeLiteral>() { + bind(new TypeLiteral>() { }).to(ListBucketHandler.class); - bind(new TypeLiteral>() { + bind(new TypeLiteral>() { }).to(CopyObjectHandler.class); bind(new TypeLiteral>() { }).to(AccessControlListHandler.class); @@ -86,14 +87,15 @@ public class S3ParserModule extends AbstractModule { private void bindCallablesThatReturnParseResults() { bind(listBucketsTypeLiteral).toProvider( FactoryProvider.newFactory(listBucketsTypeLiteral, - new TypeLiteral>>() { + new TypeLiteral>>() { })); bind(bucketTypeLiteral).toProvider( - FactoryProvider.newFactory(bucketTypeLiteral, new TypeLiteral>() { + FactoryProvider.newFactory(bucketTypeLiteral, + new TypeLiteral>() { })); bind(objectMetadataTypeLiteral).toProvider( FactoryProvider.newFactory(objectMetadataTypeLiteral, - new TypeLiteral>() { + new TypeLiteral>() { })); bind(accessControlListTypeLiteral).toProvider( FactoryProvider.newFactory(accessControlListTypeLiteral, diff --git a/aws/s3/core/src/test/java/org/jclouds/aws/s3/S3ContextBuilderTest.java b/aws/s3/core/src/test/java/org/jclouds/aws/s3/S3ContextBuilderTest.java index 755f952369..a4fd2b064c 100644 --- a/aws/s3/core/src/test/java/org/jclouds/aws/s3/S3ContextBuilderTest.java +++ b/aws/s3/core/src/test/java/org/jclouds/aws/s3/S3ContextBuilderTest.java @@ -25,21 +25,29 @@ package org.jclouds.aws.s3; import static org.jclouds.aws.reference.AWSConstants.PROPERTY_AWS_ACCESSKEYID; import static org.jclouds.aws.reference.AWSConstants.PROPERTY_AWS_SECRETACCESSKEY; +import static org.jclouds.blobstore.reference.BlobStoreConstants.PROPERTY_USER_METADATA_PREFIX; import static org.jclouds.http.HttpConstants.PROPERTY_HTTP_ADDRESS; import static org.testng.Assert.assertEquals; +import java.net.URI; import java.util.ArrayList; import java.util.List; import org.jclouds.aws.s3.config.RestS3ConnectionModule; import org.jclouds.aws.s3.config.S3ContextModule; +import org.jclouds.aws.s3.domain.ObjectMetadata; +import org.jclouds.aws.s3.domain.S3Object; import org.jclouds.aws.s3.internal.GuiceS3Context; import org.jclouds.aws.s3.xml.config.S3ParserModule; +import org.jclouds.blobstore.functions.ParseBlobFromHeadersAndHttpContent.BlobFactory; +import org.jclouds.blobstore.functions.ParseBlobMetadataFromHeaders.BlobMetadataFactory; import org.jclouds.cloud.CloudContext; import org.testng.annotations.Test; import com.google.inject.Injector; +import com.google.inject.Key; import com.google.inject.Module; +import com.google.inject.TypeLiteral; /** * Tests behavior of modules configured in S3ContextBuilder @@ -51,20 +59,31 @@ public class S3ContextBuilderTest { public void testNewBuilder() { S3ContextBuilder builder = S3ContextBuilder.newBuilder("id", "secret"); + assertEquals(builder.getProperties().getProperty(PROPERTY_USER_METADATA_PREFIX), + "x-amz-meta-"); assertEquals(builder.getProperties().getProperty(PROPERTY_HTTP_ADDRESS), "s3.amazonaws.com"); assertEquals(builder.getProperties().getProperty(PROPERTY_AWS_ACCESSKEYID), "id"); assertEquals(builder.getProperties().getProperty(PROPERTY_AWS_SECRETACCESSKEY), "secret"); } public void testBuildContext() { - CloudContext context = S3ContextBuilder.newBuilder("id", "secret") + CloudContext context = S3ContextBuilder.newBuilder("id", "secret") .buildContext(); assertEquals(context.getClass(), GuiceS3Context.class); + assertEquals(context.getAccount(), "id"); + assertEquals(context.getEndPoint(), URI.create("https://s3.amazonaws.com:443")); } public void testBuildInjector() { Injector i = S3ContextBuilder.newBuilder("id", "secret").buildInjector(); assert i.getInstance(S3Context.class) != null; + + assert i.getInstance(GuiceS3Context.S3ObjectMapFactory.class) != null; + assert i.getInstance(GuiceS3Context.S3InputStreamMapFactory.class) != null; + assert i.getInstance(Key.get(new TypeLiteral>() { + })) != null; + assert i.getInstance(Key.get(new TypeLiteral>() { + })) != null; } protected void testAddParserModule() { diff --git a/aws/s3/core/src/test/java/org/jclouds/aws/s3/S3IntegrationTest.java b/aws/s3/core/src/test/java/org/jclouds/aws/s3/S3IntegrationTest.java deleted file mode 100644 index 2e9164d385..0000000000 --- a/aws/s3/core/src/test/java/org/jclouds/aws/s3/S3IntegrationTest.java +++ /dev/null @@ -1,355 +0,0 @@ -/** - * - * Copyright (C) 2009 Global Cloud Specialists, Inc. - * - * ==================================================================== - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * ==================================================================== - */ -package org.jclouds.aws.s3; - -import static org.jclouds.aws.s3.options.PutBucketOptions.Builder.createIn; -import static org.testng.Assert.assertEquals; - -import java.io.IOException; -import java.io.InputStream; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.ArrayBlockingQueue; -import java.util.concurrent.BlockingQueue; -import java.util.concurrent.CancellationException; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; - -import org.jclouds.aws.s3.config.StubS3ConnectionModule; -import org.jclouds.aws.s3.domain.S3Bucket; -import org.jclouds.aws.s3.domain.S3Object; -import org.jclouds.aws.s3.domain.S3Bucket.Metadata; -import org.jclouds.aws.s3.domain.S3Bucket.Metadata.LocationConstraint; -import org.jclouds.aws.s3.reference.S3Constants; -import org.jclouds.aws.s3.util.S3Utils; -import org.jclouds.http.HttpUtils; -import org.jclouds.http.config.JavaUrlHttpCommandExecutorServiceModule; -import org.jclouds.logging.log4j.config.Log4JLoggingModule; -import org.jclouds.util.Utils; -import org.testng.ITestContext; -import org.testng.annotations.AfterGroups; -import org.testng.annotations.BeforeGroups; -import org.testng.annotations.Optional; -import org.testng.annotations.Parameters; - -import com.google.common.base.Predicate; -import com.google.common.collect.Iterables; -import com.google.inject.Module; - -public class S3IntegrationTest { - protected static final String LOCAL_ENCODING = System.getProperty("file.encoding"); - protected static final String TEST_STRING = " "; - protected static final String sysAWSAccessKeyId = System - .getProperty(S3Constants.PROPERTY_AWS_ACCESSKEYID); - protected static final String sysAWSSecretAccessKey = System - .getProperty(S3Constants.PROPERTY_AWS_SECRETACCESSKEY); - - public static long INCONSISTENCY_WINDOW = 1000; - protected static int bucketCount = 20; - protected static volatile int bucketIndex = 0; - - protected byte[] goodETag; - protected byte[] badETag; - protected S3Connection client; - protected S3Context context = null; - protected boolean SANITY_CHECK_RETURNED_BUCKET_NAME = false; - private String bucketPrefix = System.getProperty("user.name") + ".s3int"; - - /** - * two test groups integration and live. - */ - private static final BlockingQueue bucketNames = new ArrayBlockingQueue( - bucketCount); - - /** - * Due to eventual consistency, bucket commands may not return correctly immediately. Hence, we - * will try up to the inconsistency window to see if the assertion completes. - */ - protected void assertEventually(Runnable assertion) throws InterruptedException { - AssertionError error = null; - for (int i = 0; i < 5; i++) { - try { - assertion.run(); - return; - } catch (AssertionError e) { - error = e; - } - Thread.sleep(INCONSISTENCY_WINDOW / 5); - } - if (error != null) - throw error; - } - - protected void createBucketAndEnsureEmpty(String bucketName) throws InterruptedException, - ExecutionException, TimeoutException { - client.putBucketIfNotExists(bucketName).get(10, TimeUnit.SECONDS); - emptyBucket(bucketName); - } - - protected void addObjectToBucket(String sourceBucket, String key) throws InterruptedException, - ExecutionException, TimeoutException, IOException { - S3Object sourceObject = new S3Object(key); - sourceObject.getMetadata().setContentType("text/xml"); - sourceObject.setData(TEST_STRING); - addObjectToBucket(sourceBucket, sourceObject); - } - - protected void addObjectToBucket(String sourceBucket, S3Object object) - throws InterruptedException, ExecutionException, TimeoutException, IOException { - client.putObject(sourceBucket, object).get(10, TimeUnit.SECONDS); - } - - protected S3Object validateContent(String sourceBucket, String key) throws InterruptedException, - ExecutionException, TimeoutException, IOException { - assertEventuallyBucketSize(sourceBucket, 1); - S3Object newObject = client.getObject(sourceBucket, key).get(10, TimeUnit.SECONDS); - assert newObject != S3Object.NOT_FOUND; - assertEquals(S3Utils.getContentAsStringAndClose(newObject), TEST_STRING); - return newObject; - } - - protected void assertEventuallyBucketSize(final String bucketName, final int count) - throws InterruptedException { - assertEventually(new Runnable() { - public void run() { - try { - assertEquals(client.listBucket(bucketName).get(10, TimeUnit.SECONDS).getContents() - .size(), count); - } catch (Exception e) { - Utils. rethrowIfRuntimeOrSameType(e); - } - } - }); - } - - @BeforeGroups(groups = { "integration", "live" }) - @Parameters( { S3Constants.PROPERTY_AWS_ACCESSKEYID, S3Constants.PROPERTY_AWS_SECRETACCESSKEY }) - public void setUpCredentials(@Optional String AWSAccessKeyId, - @Optional String AWSSecretAccessKey, ITestContext testContext) throws Exception { - AWSAccessKeyId = AWSAccessKeyId != null ? AWSAccessKeyId : sysAWSAccessKeyId; - AWSSecretAccessKey = AWSSecretAccessKey != null ? AWSSecretAccessKey : sysAWSSecretAccessKey; - if (AWSAccessKeyId != null) - testContext.setAttribute(S3Constants.PROPERTY_AWS_ACCESSKEYID, AWSAccessKeyId); - if (AWSSecretAccessKey != null) - testContext.setAttribute(S3Constants.PROPERTY_AWS_SECRETACCESSKEY, AWSSecretAccessKey); - } - - @BeforeGroups(dependsOnMethods = { "setUpCredentials" }, groups = { "integration", "live" }) - public void setUpClient(ITestContext testContext) throws Exception { - if (testContext.getAttribute(S3Constants.PROPERTY_AWS_ACCESSKEYID) != null) { - String AWSAccessKeyId = (String) testContext - .getAttribute(S3Constants.PROPERTY_AWS_ACCESSKEYID); - String AWSSecretAccessKey = (String) testContext - .getAttribute(S3Constants.PROPERTY_AWS_SECRETACCESSKEY); - createLiveS3Context(AWSAccessKeyId, AWSSecretAccessKey); - } else { - createStubS3Context(); - } - client = context.getConnection(); - assert client != null; - goodETag = HttpUtils.eTag(TEST_STRING); - badETag = HttpUtils.eTag("alf"); - } - - protected void createStubS3Context() { - context = S3ContextFactory.createS3Context("stub", "stub", new StubS3ConnectionModule()); - SANITY_CHECK_RETURNED_BUCKET_NAME = true; - } - - protected void createLiveS3Context(String AWSAccessKeyId, String AWSSecretAccessKey) { - context = buildS3ContextFactory(AWSAccessKeyId, AWSSecretAccessKey).buildContext(); - } - - public String getBucketName() throws InterruptedException, ExecutionException, TimeoutException { - String bucketName = bucketNames.poll(30, TimeUnit.SECONDS); - assert bucketName != null : "unable to get a bucket for the test"; - emptyBucket(bucketName); - return bucketName; - } - - /** - * a bucket that should be deleted and recreated after the test is complete. This is due to - * having an ACL or otherwise that makes it not compatible with normal buckets - */ - public String getScratchBucketName() throws InterruptedException, ExecutionException, - TimeoutException { - return getBucketName(); - } - - public void returnBucket(final String bucketName) throws InterruptedException, - ExecutionException, TimeoutException { - if (bucketName != null) { - bucketNames.add(bucketName); - /* - * Ensure that any returned bucket name actually exists on the server. Return of a - * non-existent bucket introduces subtle testing bugs, where later unrelated tests will - * fail. - * - * NOTE: This sanity check should only be run for Stub-based Integration testing -- it will - * *substantially* slow down tests on a real server over a network. - */ - if (SANITY_CHECK_RETURNED_BUCKET_NAME) { - if (!Iterables.any(client.listOwnedBuckets(), new Predicate() { - public boolean apply(Metadata md) { - return bucketName.equals(md.getName()); - } - })) { - throw new IllegalStateException("Test returned the name of a non-existent bucket: " - + bucketName); - } - } - } - } - - /** - * abandon old bucket name instead of waiting for the bucket to be created. - */ - public void returnScratchBucket(String scratchBucket) throws InterruptedException, - ExecutionException, TimeoutException { - if (scratchBucket != null) { - deleteBucket(scratchBucket); - String newScratchBucket = bucketPrefix + (++bucketIndex); - createBucketAndEnsureEmpty(newScratchBucket); - returnBucket(newScratchBucket); - } - } - - /** - * There are a lot of retries here mainly from experience running inside amazon EC2. - */ - @BeforeGroups(dependsOnMethods = { "setUpClient" }, groups = { "integration", "live" }) - public void setUpBuckets(ITestContext context) throws Exception { - synchronized (bucketNames) { - if (bucketNames.peek() == null) { - deleteEverything(); - for (; bucketIndex < bucketCount; bucketIndex++) { - String bucketName = bucketPrefix + bucketIndex; - try { - createBucketAndEnsureEmpty(bucketName); - bucketNames.put(bucketName); - } catch (AssertionError e) { - // throw away the bucket and try again with the next index - deleteBucket(bucketName); - bucketCount++; - } - } - } - } - } - - protected S3ContextBuilder buildS3ContextFactory(String AWSAccessKeyId, String AWSSecretAccessKey) { - return (S3ContextBuilder) S3ContextBuilder.newBuilder(AWSAccessKeyId, AWSSecretAccessKey) - .withSaxDebug().relaxSSLHostname().withModule(new Log4JLoggingModule()); - } - - protected Module createHttpModule() { - return new JavaUrlHttpCommandExecutorServiceModule(); - } - - protected void deleteEverything() throws Exception { - try { - List metadata = client.listOwnedBuckets(); - for (S3Bucket.Metadata metaDatum : metadata) { - if (metaDatum.getName().startsWith(bucketPrefix.toLowerCase())) { - deleteBucket(metaDatum.getName()); - } - } - } catch (CancellationException e) { - throw e; - } - } - - /** - * Remove any objects in a bucket, leaving it empty. - */ - protected void emptyBucket(final String name) throws InterruptedException, ExecutionException, - TimeoutException { - if (client.bucketExists(name)) { - // This can fail to be zero length because of stale bucket lists. Ex. client.listBucket() - // could return 9 keys, when there are 10. When all the deletions finish, one entry would - // be left in this case. Instead of failing, we will attempt this entire bucket deletion - // operation multiple times to ensure we can acheive a zero length bucket. - assertEventually(new Runnable() { - public void run() { - try { - Map map = context.createInputStreamMap(name); - Set keys = map.keySet(); - if (keys.size() > 0) { - map.clear(); - assertEquals(map.size(), 0, String.format( - "deleting %s, we still have %s left in bucket %s, using encoding %s", - keys, map.keySet(), name, LOCAL_ENCODING)); - } - } catch (Exception e) { - Utils. rethrowIfRuntimeOrSameType(e); - } - } - }); - - } - } - - protected String createScratchBucketInEU() throws InterruptedException, ExecutionException, - TimeoutException { - String bucketName = getScratchBucketName(); - deleteBucket(bucketName); - client.putBucketIfNotExists(bucketName, createIn(LocationConstraint.EU)).get(10, - TimeUnit.SECONDS); - return bucketName; - } - - /** - * Empty and delete a bucket. - * - * @param name - * @throws InterruptedException - * @throws ExecutionException - * @throws TimeoutException - */ - protected void deleteBucket(final String name) throws InterruptedException, ExecutionException, - TimeoutException { - if (client.bucketExists(name)) { - emptyBucket(name); - client.deleteBucketIfEmpty(name); - assertEventually(new Runnable() { - public void run() { - try { - assert !client.bucketExists(name) : "bucket " + name + " still exists"; - } catch (Exception e) { - Utils. rethrowIfRuntimeOrSameType(e); - } - } - }); - } - } - - @AfterGroups(groups = { "integration", "live" }) - protected void tearDownClient() throws Exception { - context.close(); - context = null; - } - -} \ No newline at end of file diff --git a/aws/s3/core/src/test/java/org/jclouds/aws/s3/commands/CopyObjectIntegrationTest.java b/aws/s3/core/src/test/java/org/jclouds/aws/s3/commands/CopyObjectIntegrationTest.java deleted file mode 100644 index a66368cfd7..0000000000 --- a/aws/s3/core/src/test/java/org/jclouds/aws/s3/commands/CopyObjectIntegrationTest.java +++ /dev/null @@ -1,219 +0,0 @@ -/** - * - * Copyright (C) 2009 Global Cloud Specialists, Inc. - * - * ==================================================================== - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * ==================================================================== - */ -package org.jclouds.aws.s3.commands; - -import static org.jclouds.aws.s3.options.CopyObjectOptions.Builder.ifSourceETagDoesntMatch; -import static org.jclouds.aws.s3.options.CopyObjectOptions.Builder.ifSourceETagMatches; -import static org.jclouds.aws.s3.options.CopyObjectOptions.Builder.ifSourceModifiedSince; -import static org.jclouds.aws.s3.options.CopyObjectOptions.Builder.ifSourceUnmodifiedSince; -import static org.jclouds.aws.s3.options.CopyObjectOptions.Builder.overrideMetadataWith; -import static org.testng.Assert.assertEquals; - -import java.io.IOException; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; - -import org.jclouds.aws.s3.S3IntegrationTest; -import org.jclouds.aws.s3.domain.S3Object; -import org.jclouds.aws.s3.reference.S3Headers; -import org.jclouds.http.HttpResponseException; -import org.joda.time.DateTime; -import org.testng.annotations.Test; - -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; - -/** - * Tests integrated functionality of all copyObject commands. - *

    - * Each test uses a different bucket name, so it should be perfectly fine to run in parallel. - * - * @author Adrian Cole - */ -@Test(testName = "s3.CopyObjectIntegrationTest") -public class CopyObjectIntegrationTest extends S3IntegrationTest { - String sourceKey = "apples"; - String destinationKey = "pears"; - - @Test(groups = { "integration", "live" }) - void testCopyObject() throws Exception { - String bucketName = getBucketName(); - String destinationBucket = getScratchBucketName(); - - try { - addToBucketAndValidate(bucketName, sourceKey); - - client.copyObject(bucketName, sourceKey, destinationBucket, destinationKey).get(10, - TimeUnit.SECONDS); - - validateContent(destinationBucket, destinationKey); - } finally { - returnBucket(bucketName); - returnScratchBucket(destinationBucket); - - } - } - - private void addToBucketAndValidate(String bucketName, String sourceKey) - throws InterruptedException, ExecutionException, TimeoutException, IOException { - addObjectToBucket(bucketName, sourceKey); - validateContent(bucketName, sourceKey); - } - - @Test(enabled = false, groups = { "integration", "live" }) - // TODO: fails on linux and windows - void testCopyIfModifiedSince() throws InterruptedException, ExecutionException, - TimeoutException, IOException { - String bucketName = getBucketName(); - String destinationBucket = getScratchBucketName(); - try { - DateTime before = new DateTime(); - addToBucketAndValidate(bucketName, sourceKey); - DateTime after = new DateTime().plusSeconds(1); - - client.copyObject(bucketName, sourceKey, destinationBucket, destinationKey, - ifSourceModifiedSince(before)).get(10, TimeUnit.SECONDS); - validateContent(destinationBucket, destinationKey); - - try { - client.copyObject(bucketName, sourceKey, destinationBucket, destinationKey, - ifSourceModifiedSince(after)).get(10, TimeUnit.SECONDS); - } catch (ExecutionException e) { - HttpResponseException ex = (HttpResponseException) e.getCause(); - assertEquals(ex.getResponse().getStatusCode(), 412); - } - } finally { - returnBucket(bucketName); - returnScratchBucket(destinationBucket); - - } - } - - @Test(enabled = false, groups = { "integration", "live" }) - // TODO: fails on linux and windows - void testCopyIfUnmodifiedSince() throws InterruptedException, ExecutionException, - TimeoutException, IOException { - String bucketName = getBucketName(); - String destinationBucket = getScratchBucketName(); - try { - DateTime before = new DateTime(); - addToBucketAndValidate(bucketName, sourceKey); - DateTime after = new DateTime().plusSeconds(1); - - client.copyObject(bucketName, sourceKey, destinationBucket, destinationKey, - ifSourceUnmodifiedSince(after)).get(10, TimeUnit.SECONDS); - validateContent(destinationBucket, destinationKey); - - try { - client.copyObject(bucketName, sourceKey, destinationBucket, destinationKey, - ifSourceModifiedSince(before)).get(10, TimeUnit.SECONDS); - } catch (ExecutionException e) { - HttpResponseException ex = (HttpResponseException) e.getCause(); - assertEquals(ex.getResponse().getStatusCode(), 412); - } - } finally { - returnBucket(bucketName); - returnScratchBucket(destinationBucket); - } - } - - @Test(groups = { "integration", "live" }) - void testCopyIfMatch() throws InterruptedException, ExecutionException, TimeoutException, - IOException { - String bucketName = getBucketName(); - String destinationBucket = getScratchBucketName(); - try { - addToBucketAndValidate(bucketName, sourceKey); - - client.copyObject(bucketName, sourceKey, destinationBucket, destinationKey, - ifSourceETagMatches(goodETag)).get(10, TimeUnit.SECONDS); - validateContent(destinationBucket, destinationKey); - - try { - client.copyObject(bucketName, sourceKey, destinationBucket, destinationKey, - ifSourceETagMatches(badETag)).get(10, TimeUnit.SECONDS); - } catch (ExecutionException e) { - HttpResponseException ex = (HttpResponseException) e.getCause(); - assertEquals(ex.getResponse().getStatusCode(), 412); - } - } finally { - returnBucket(bucketName); - returnScratchBucket(destinationBucket); - } - } - - @Test(groups = { "integration", "live" }) - void testCopyIfNoneMatch() throws IOException, InterruptedException, ExecutionException, - TimeoutException { - String bucketName = getBucketName(); - String destinationBucket = getScratchBucketName(); - try { - addToBucketAndValidate(bucketName, sourceKey); - - client.copyObject(bucketName, sourceKey, destinationBucket, destinationKey, - ifSourceETagDoesntMatch(badETag)).get(10, TimeUnit.SECONDS); - validateContent(destinationBucket, destinationKey); - - try { - client.copyObject(bucketName, sourceKey, destinationBucket, destinationKey, - ifSourceETagDoesntMatch(goodETag)).get(10, TimeUnit.SECONDS); - } catch (ExecutionException e) { - HttpResponseException ex = (HttpResponseException) e.getCause(); - assertEquals(ex.getResponse().getStatusCode(), 412); - } - } finally { - returnBucket(bucketName); - returnScratchBucket(destinationBucket); - - } - } - - @Test(groups = { "integration", "live" }) - void testCopyWithMetadata() throws InterruptedException, ExecutionException, TimeoutException, - IOException { - String bucketName = getBucketName(); - String destinationBucket = getScratchBucketName(); - try { - addToBucketAndValidate(bucketName, sourceKey); - - Multimap metadata = HashMultimap.create(); - metadata.put(S3Headers.USER_METADATA_PREFIX + "adrian", "cole"); - - client.copyObject(bucketName, sourceKey, destinationBucket, destinationKey, - overrideMetadataWith(metadata)).get(10, TimeUnit.SECONDS); - - validateContent(destinationBucket, destinationKey); - - S3Object.Metadata objectMeta = client.headObject(destinationBucket, destinationKey); - - assertEquals(objectMeta.getUserMetadata(), metadata); - } finally { - returnBucket(bucketName); - returnScratchBucket(destinationBucket); - - } - } - -} \ No newline at end of file diff --git a/aws/s3/core/src/test/java/org/jclouds/aws/s3/commands/DeleteBucketIntegrationTest.java b/aws/s3/core/src/test/java/org/jclouds/aws/s3/commands/DeleteBucketIntegrationTest.java deleted file mode 100644 index 977506ce37..0000000000 --- a/aws/s3/core/src/test/java/org/jclouds/aws/s3/commands/DeleteBucketIntegrationTest.java +++ /dev/null @@ -1,79 +0,0 @@ -/** - * - * Copyright (C) 2009 Global Cloud Specialists, Inc. - * - * ==================================================================== - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * ==================================================================== - */ -package org.jclouds.aws.s3.commands; - -import org.jclouds.aws.s3.S3IntegrationTest; -import org.jclouds.util.Utils; -import org.testng.annotations.Test; - -/** - * Tests integrated functionality of all deleteBucket commands. - *

    - * Each test uses a different bucket name, so it should be perfectly fine to run in parallel. - * - * @author Adrian Cole - */ -@Test(groups = { "integration", "live" }, testName = "s3.DeleteBucketIntegrationTest") -public class DeleteBucketIntegrationTest extends S3IntegrationTest { - - /** - * this method overrides bucketName to ensure it isn't found - */ - @Test - void deleteBucketIfEmptyNotFound() throws Exception { - assert client.deleteBucketIfEmpty("dbienf"); - } - - @Test - void deleteBucketIfEmptyButHasContents() throws Exception { - String bucketName = getBucketName(); - try { - addObjectToBucket(bucketName, "test"); - assert !client.deleteBucketIfEmpty(bucketName); - } finally { - returnBucket(bucketName); - } - } - - @Test - void deleteBucketIfEmpty() throws Exception { - final String bucketName = getScratchBucketName(); - try { - assert client.deleteBucketIfEmpty(bucketName); - - assertEventually(new Runnable() { - public void run() { - try { - assert !client.bucketExists(bucketName) : "bucket " + bucketName - + " still exists"; - } catch (Exception e) { - Utils. rethrowIfRuntimeOrSameType(e); - } - } - }); - } finally { - returnScratchBucket(bucketName); - } - } -} \ No newline at end of file diff --git a/aws/s3/core/src/test/java/org/jclouds/aws/s3/commands/DeleteObjectIntegrationTest.java b/aws/s3/core/src/test/java/org/jclouds/aws/s3/commands/DeleteObjectIntegrationTest.java deleted file mode 100644 index 897abc1bbc..0000000000 --- a/aws/s3/core/src/test/java/org/jclouds/aws/s3/commands/DeleteObjectIntegrationTest.java +++ /dev/null @@ -1,94 +0,0 @@ -/** - * - * Copyright (C) 2009 Global Cloud Specialists, Inc. - * - * ==================================================================== - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * ==================================================================== - */ -package org.jclouds.aws.s3.commands; - -import static org.testng.Assert.assertEquals; - -import java.util.concurrent.ExecutionException; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; - -import org.jclouds.aws.AWSResponseException; -import org.jclouds.aws.s3.S3IntegrationTest; -import org.jclouds.aws.s3.domain.S3Bucket; -import org.testng.annotations.DataProvider; -import org.testng.annotations.Test; - -/** - * Tests integrated functionality of all deleteObject commands. - *

    - * Each test uses a different bucket name, so it should be perfectly fine to run in parallel. - * - * @author Adrian Cole - */ -@Test(groups = { "integration", "live" }, testName = "s3.DeleteObjectIntegrationTest") -public class DeleteObjectIntegrationTest extends S3IntegrationTest { - - @Test - void deleteObjectNotFound() throws Exception { - String bucketName = getBucketName(); - String key = "test"; - try { - assert client.deleteObject(bucketName, key).get(10, TimeUnit.SECONDS); - } finally { - returnBucket(bucketName); - } - } - - @DataProvider(name = "delete") - public Object[][] createData() { - return new Object[][] { { "sp ace" }, { "unicde" }, { "qu?stion" } }; - } - - @Test(dataProvider = "delete") - void deleteObject(String key) throws Exception { - String bucketName = getBucketName(); - try { - addObjectToBucket(bucketName, key); - assert client.deleteObject(bucketName, key).get(10, TimeUnit.SECONDS); - assertBucketEmptyDeleting(bucketName, key); - } finally { - returnBucket(bucketName); - } - } - - private void assertBucketEmptyDeleting(String bucketName, String key) - throws InterruptedException, ExecutionException, TimeoutException { - S3Bucket listing = client.listBucket(bucketName).get(10, TimeUnit.SECONDS); - assertEquals(listing.getContents().size(), 0, String.format( - "deleting %s, we still have %s left in bucket %s, using encoding %s", key, listing - .getContents().size(), bucketName, LOCAL_ENCODING)); - } - - @Test - void deleteObjectNoBucket() throws Exception { - try { - client.deleteObject("donb", "test").get(10, TimeUnit.SECONDS); - } catch (ExecutionException e) { - assert e.getCause() instanceof AWSResponseException; - assertEquals(((AWSResponseException) e.getCause()).getResponse().getStatusCode(), 404); - } - } - -} \ No newline at end of file diff --git a/aws/s3/core/src/test/java/org/jclouds/aws/s3/commands/GetAccessControlListIntegrationTest.java b/aws/s3/core/src/test/java/org/jclouds/aws/s3/commands/GetAccessControlListIntegrationTest.java deleted file mode 100644 index 984e52d1cf..0000000000 --- a/aws/s3/core/src/test/java/org/jclouds/aws/s3/commands/GetAccessControlListIntegrationTest.java +++ /dev/null @@ -1,159 +0,0 @@ -/** - * - * Copyright (C) 2009 Global Cloud Specialists, Inc. - * - * ==================================================================== - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * ==================================================================== - */ -package org.jclouds.aws.s3.commands; - -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertFalse; -import static org.testng.Assert.assertTrue; - -import java.io.IOException; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; - -import org.jclouds.aws.s3.S3IntegrationTest; -import org.jclouds.aws.s3.domain.AccessControlList; -import org.jclouds.aws.s3.domain.CannedAccessPolicy; -import org.jclouds.aws.s3.domain.S3Object; -import org.jclouds.aws.s3.domain.AccessControlList.GroupGranteeURI; -import org.jclouds.aws.s3.domain.AccessControlList.Permission; -import org.jclouds.aws.s3.options.PutObjectOptions; -import org.jclouds.util.Utils; -import org.testng.annotations.Test; - -/** - * Tests integrated functionality of all commands that retrieve Access Control Lists (ACLs). - * - * @author James Murty - * @author Adrian Cole - */ -@Test(groups = { "integration", "live" }, testName = "s3.GetAccessControlListIntegrationTest") -public class GetAccessControlListIntegrationTest extends S3IntegrationTest { - - @Test - void testPrivateAclIsDefaultForBucket() throws InterruptedException, ExecutionException, - TimeoutException, IOException { - String bucketName = getBucketName(); - try { - AccessControlList acl = client.getBucketACL(bucketName).get(10, TimeUnit.SECONDS); - assertEquals(acl.getGrants().size(), 1); - assertTrue(acl.getOwner() != null); - String ownerId = acl.getOwner().getId(); - assertTrue(acl.hasPermission(ownerId, Permission.FULL_CONTROL)); - } finally { - returnBucket(bucketName); - } - - } - - @Test - void testPrivateAclIsDefaultForObject() throws InterruptedException, ExecutionException, - TimeoutException, IOException { - String privateObjectKey = "private-acl"; - String bucketName = getBucketName(); - try { - // Private object - addObjectToBucket(bucketName, privateObjectKey); - AccessControlList acl = client.getObjectACL(bucketName, privateObjectKey).get(10, - TimeUnit.SECONDS); - - assertEquals(acl.getGrants().size(), 1); - assertTrue(acl.getOwner() != null); - String ownerId = acl.getOwner().getId(); - assertTrue(acl.hasPermission(ownerId, Permission.FULL_CONTROL)); - } finally { - returnBucket(bucketName); - } - - } - - @Test - void testPublicReadOnObject() throws InterruptedException, ExecutionException, TimeoutException, - IOException { - final String publicReadObjectKey = "public-read-acl"; - final String bucketName = getBucketName(); - try { - client.putObject(bucketName, new S3Object(publicReadObjectKey, ""), new PutObjectOptions() - .withAcl(CannedAccessPolicy.PUBLIC_READ)); - - assertEventually(new Runnable() { - public void run() { - try { - AccessControlList acl = client.getObjectACL(bucketName, publicReadObjectKey).get( - 10, TimeUnit.SECONDS); - - assertEquals(acl.getGrants().size(), 2); - assertEquals(acl.getPermissions(GroupGranteeURI.ALL_USERS).size(), 1); - assertTrue(acl.getOwner() != null); - String ownerId = acl.getOwner().getId(); - assertTrue(acl.hasPermission(ownerId, Permission.FULL_CONTROL)); - assertTrue(acl.hasPermission(GroupGranteeURI.ALL_USERS, Permission.READ)); - } catch (Exception e) { - Utils. rethrowIfRuntimeOrSameType(e); - } - } - }); - - } finally { - returnBucket(bucketName); - } - - } - - @Test - void testPublicWriteOnObject() throws InterruptedException, ExecutionException, - TimeoutException, IOException { - final String publicReadWriteObjectKey = "public-read-write-acl"; - final String bucketName = getBucketName(); - try { - // Public Read-Write object - client.putObject(bucketName, new S3Object(publicReadWriteObjectKey, ""), - new PutObjectOptions().withAcl(CannedAccessPolicy.PUBLIC_READ_WRITE)); - - assertEventually(new Runnable() { - public void run() { - try { - AccessControlList acl = client.getObjectACL(bucketName, publicReadWriteObjectKey) - .get(10, TimeUnit.SECONDS); - assertEquals(acl.getGrants().size(), 3); - assertEquals(acl.getPermissions(GroupGranteeURI.ALL_USERS).size(), 2); - assertTrue(acl.getOwner() != null); - String ownerId = acl.getOwner().getId(); - assertTrue(acl.hasPermission(ownerId, Permission.FULL_CONTROL)); - assertTrue(acl.hasPermission(GroupGranteeURI.ALL_USERS, Permission.READ)); - assertTrue(acl.hasPermission(GroupGranteeURI.ALL_USERS, Permission.WRITE)); - assertFalse(acl.hasPermission(GroupGranteeURI.ALL_USERS, Permission.READ_ACP)); - assertFalse(acl.hasPermission(GroupGranteeURI.ALL_USERS, Permission.WRITE_ACP)); - assertFalse(acl.hasPermission(GroupGranteeURI.ALL_USERS, Permission.FULL_CONTROL)); - } catch (Exception e) { - Utils. rethrowIfRuntimeOrSameType(e); - } - } - }); - } finally { - returnBucket(bucketName); - } - - } -} \ No newline at end of file diff --git a/aws/s3/core/src/test/java/org/jclouds/aws/s3/commands/GetObjectIntegrationTest.java b/aws/s3/core/src/test/java/org/jclouds/aws/s3/commands/GetObjectIntegrationTest.java deleted file mode 100644 index afa25747e1..0000000000 --- a/aws/s3/core/src/test/java/org/jclouds/aws/s3/commands/GetObjectIntegrationTest.java +++ /dev/null @@ -1,265 +0,0 @@ -/** - * - * Copyright (C) 2009 Global Cloud Specialists, Inc. - * - * ==================================================================== - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * ==================================================================== - */ -package org.jclouds.aws.s3.commands; - -import static org.jclouds.http.options.GetOptions.Builder.ifETagDoesntMatch; -import static org.jclouds.http.options.GetOptions.Builder.ifETagMatches; -import static org.jclouds.http.options.GetOptions.Builder.ifModifiedSince; -import static org.jclouds.http.options.GetOptions.Builder.ifUnmodifiedSince; -import static org.jclouds.http.options.GetOptions.Builder.range; -import static org.jclouds.http.options.GetOptions.Builder.startAt; -import static org.jclouds.http.options.GetOptions.Builder.tail; -import static org.testng.Assert.assertEquals; - -import java.io.IOException; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; - -import org.jclouds.aws.s3.S3IntegrationTest; -import org.jclouds.aws.s3.domain.S3Object; -import org.jclouds.aws.s3.util.S3Utils; -import org.jclouds.http.HttpResponseException; -import org.joda.time.DateTime; -import org.testng.annotations.Test; - -/** - * Tests integrated functionality of all GetObject commands. - *

    - * Each test uses a different bucket name, so it should be perfectly fine to run in parallel. - * - * @author Adrian Cole - */ -@Test(groups = { "integration", "live" }, testName = "s3.GetObjectIntegrationTest") -public class GetObjectIntegrationTest extends S3IntegrationTest { - - @Test - void testGetIfModifiedSince() throws InterruptedException, ExecutionException, TimeoutException, - IOException { - String bucketName = getBucketName(); - try { - String key = "apples"; - - DateTime before = new DateTime(); - addObjectAndValidateContent(bucketName, key); - DateTime after = new DateTime().plusSeconds(1); - - client.getObject(bucketName, key, ifModifiedSince(before)).get(10, TimeUnit.SECONDS); - validateContent(bucketName, key); - - try { - client.getObject(bucketName, key, ifModifiedSince(after)).get(10, TimeUnit.SECONDS); - validateContent(bucketName, key); - } catch (ExecutionException e) { - if (e.getCause() instanceof HttpResponseException) { - HttpResponseException ex = (HttpResponseException) e.getCause(); - assertEquals(ex.getResponse().getStatusCode(), 304); - } else if (e.getCause() instanceof RuntimeException) { - // TODO enhance stub connection so that it throws the correct error - } else { - throw e; - } - } - } finally { - returnBucket(bucketName); - } - - } - - @Test - void testGetIfUnmodifiedSince() throws InterruptedException, ExecutionException, - TimeoutException, IOException { - String bucketName = getBucketName(); - try { - - String key = "apples"; - - DateTime before = new DateTime(); - addObjectAndValidateContent(bucketName, key); - DateTime after = new DateTime().plusSeconds(1); - - client.getObject(bucketName, key, ifUnmodifiedSince(after)).get(10, TimeUnit.SECONDS); - validateContent(bucketName, key); - - try { - client.getObject(bucketName, key, ifUnmodifiedSince(before)).get(10, TimeUnit.SECONDS); - validateContent(bucketName, key); - } catch (ExecutionException e) { - if (e.getCause() instanceof HttpResponseException) { - HttpResponseException ex = (HttpResponseException) e.getCause(); - assertEquals(ex.getResponse().getStatusCode(), 412); - } else if (e.getCause() instanceof RuntimeException) { - // TODO enhance stub connection so that it throws the correct error - } else { - throw e; - } - } - } finally { - returnBucket(bucketName); - } - } - - @Test - void testGetIfMatch() throws InterruptedException, ExecutionException, TimeoutException, - IOException { - String bucketName = getBucketName(); - try { - - String key = "apples"; - - addObjectAndValidateContent(bucketName, key); - - client.getObject(bucketName, key, ifETagMatches(goodETag)).get(10, TimeUnit.SECONDS); - validateContent(bucketName, key); - - try { - client.getObject(bucketName, key, ifETagMatches(badETag)).get(10, TimeUnit.SECONDS); - validateContent(bucketName, key); - } catch (ExecutionException e) { - if (e.getCause() instanceof HttpResponseException) { - HttpResponseException ex = (HttpResponseException) e.getCause(); - assertEquals(ex.getResponse().getStatusCode(), 412); - } else if (e.getCause() instanceof RuntimeException) { - // TODO enhance stub connection so that it throws the correct error - } else { - throw e; - } - } - } finally { - returnBucket(bucketName); - } - } - - @Test - void testGetIfNoneMatch() throws InterruptedException, ExecutionException, TimeoutException, - IOException { - String bucketName = getBucketName(); - try { - - String key = "apples"; - - addObjectAndValidateContent(bucketName, key); - - client.getObject(bucketName, key, ifETagDoesntMatch(badETag)).get(10, TimeUnit.SECONDS); - validateContent(bucketName, key); - - try { - client.getObject(bucketName, key, ifETagDoesntMatch(goodETag)).get(10, TimeUnit.SECONDS); - validateContent(bucketName, key); - } catch (ExecutionException e) { - if (e.getCause() instanceof HttpResponseException) { - HttpResponseException ex = (HttpResponseException) e.getCause(); - assertEquals(ex.getResponse().getStatusCode(), 304); - } else { - throw e; - } - } - } finally { - returnBucket(bucketName); - } - } - - @Test - void testGetRange() throws InterruptedException, ExecutionException, TimeoutException, - IOException { - String bucketName = getBucketName(); - try { - - String key = "apples"; - - addObjectAndValidateContent(bucketName, key); - S3Object object1 = client.getObject(bucketName, key, range(0, 5)) - .get(10, TimeUnit.SECONDS); - assertEquals(S3Utils.getContentAsStringAndClose(object1), TEST_STRING.substring(0, 6)); - - S3Object object2 = client.getObject(bucketName, key, range(6, TEST_STRING.length())).get( - 10, TimeUnit.SECONDS); - assertEquals(S3Utils.getContentAsStringAndClose(object2), TEST_STRING.substring(6, - TEST_STRING.length())); - } finally { - returnBucket(bucketName); - } - } - - @Test - void testGetTwoRanges() throws InterruptedException, ExecutionException, TimeoutException, - IOException { - String bucketName = getBucketName(); - try { - - String key = "apples"; - - addObjectAndValidateContent(bucketName, key); - S3Object object = client.getObject(bucketName, key, - range(0, 5).range(6, TEST_STRING.length())).get(10, TimeUnit.SECONDS); - - assertEquals(S3Utils.getContentAsStringAndClose(object), TEST_STRING); - } finally { - returnBucket(bucketName); - } - } - - @Test - void testGetTail() throws InterruptedException, ExecutionException, TimeoutException, - IOException { - String bucketName = getBucketName(); - try { - - String key = "apples"; - - addObjectAndValidateContent(bucketName, key); - S3Object object = client.getObject(bucketName, key, tail(5)).get(10, TimeUnit.SECONDS); - assertEquals(S3Utils.getContentAsStringAndClose(object), TEST_STRING.substring(TEST_STRING - .length() - 5)); - assertEquals(object.getContentLength(), 5); - assertEquals(object.getMetadata().getSize(), TEST_STRING.length()); - } finally { - returnBucket(bucketName); - } - } - - @Test - void testGetStartAt() throws InterruptedException, ExecutionException, TimeoutException, - IOException { - String bucketName = getBucketName(); - try { - String key = "apples"; - - addObjectAndValidateContent(bucketName, key); - S3Object object = client.getObject(bucketName, key, startAt(5)).get(10, TimeUnit.SECONDS); - assertEquals(S3Utils.getContentAsStringAndClose(object), TEST_STRING.substring(5, - TEST_STRING.length())); - assertEquals(object.getContentLength(), TEST_STRING.length() - 5); - assertEquals(object.getMetadata().getSize(), TEST_STRING.length()); - } finally { - returnBucket(bucketName); - } - } - - private void addObjectAndValidateContent(String sourcebucketName, String sourceKey) - throws InterruptedException, ExecutionException, TimeoutException, IOException { - addObjectToBucket(sourcebucketName, sourceKey); - validateContent(sourcebucketName, sourceKey); - } -} \ No newline at end of file diff --git a/aws/s3/core/src/test/java/org/jclouds/aws/s3/commands/ListBucketIntegrationTest.java b/aws/s3/core/src/test/java/org/jclouds/aws/s3/commands/ListBucketIntegrationTest.java deleted file mode 100644 index e1b49a1d9d..0000000000 --- a/aws/s3/core/src/test/java/org/jclouds/aws/s3/commands/ListBucketIntegrationTest.java +++ /dev/null @@ -1,157 +0,0 @@ -/** - * - * Copyright (C) 2009 Global Cloud Specialists, Inc. - * - * ==================================================================== - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * ==================================================================== - */ -package org.jclouds.aws.s3.commands; - -import org.jclouds.aws.s3.S3IntegrationTest; - -import static org.jclouds.aws.s3.options.ListBucketOptions.Builder.*; - -import org.jclouds.aws.s3.domain.S3Bucket; -import org.jclouds.aws.s3.domain.S3Object; -import static org.testng.Assert.assertEquals; -import org.testng.annotations.Test; - -import java.io.UnsupportedEncodingException; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; - -/** - * Tests integrated functionality of all getBucket commands. - *

    - * Each test uses a different bucket name, so it should be perfectly fine to run in parallel. - * - * @author Adrian Cole - */ -@Test(groups = { "integration", "live" }, testName = "s3.ListBucketIntegrationTest") -public class ListBucketIntegrationTest extends S3IntegrationTest { - - @Test() - void testListBucketDelimiter() throws InterruptedException, ExecutionException, - TimeoutException, UnsupportedEncodingException { - String bucketName = getBucketName(); - try { - String prefix = "apps"; - addTenObjectsUnderPrefix(bucketName, prefix); - add15UnderRoot(bucketName); - S3Bucket bucket = client.listBucket(bucketName, delimiter("/")).get(10, TimeUnit.SECONDS); - assertEquals(bucket.getDelimiter(), "/"); - assert !bucket.isTruncated(); - assertEquals(bucket.getContents().size(), 15); - assertEquals(bucket.getCommonPrefixes().size(), 1); - } finally { - returnBucket(bucketName); - } - - } - - private void addAlphabetUnderRoot(String bucketName) throws InterruptedException, - ExecutionException, TimeoutException { - for (char letter = 'a'; letter <= 'z'; letter++) { - client.putObject(bucketName, new S3Object(letter + "", letter + "content")).get(10, - TimeUnit.SECONDS); - } - } - - @Test - void testListBucketMarker() throws InterruptedException, ExecutionException, TimeoutException, - UnsupportedEncodingException { - String bucketName = getBucketName(); - try { - addAlphabetUnderRoot(bucketName); - S3Bucket bucket = client.listBucket(bucketName, afterMarker("y")) - .get(10, TimeUnit.SECONDS); - assertEquals(bucket.getMarker(), "y"); - assert !bucket.isTruncated(); - assertEquals(bucket.getContents().size(), 1); - } finally { - returnBucket(bucketName); - } - } - - @Test - void testListBucketMaxResults() throws InterruptedException, ExecutionException, - TimeoutException, UnsupportedEncodingException { - String bucketName = getBucketName(); - try { - addAlphabetUnderRoot(bucketName); - S3Bucket bucket = client.listBucket(bucketName, maxResults(5)).get(10, TimeUnit.SECONDS); - assertEquals(bucket.getMaxKeys(), 5); - assert bucket.isTruncated(); - assertEquals(bucket.getContents().size(), 5); - } finally { - returnBucket(bucketName); - } - } - - @Test() - void testListBucketPrefix() throws InterruptedException, ExecutionException, TimeoutException, - UnsupportedEncodingException { - String bucketName = getBucketName(); - try { - String prefix = "apps"; - addTenObjectsUnderPrefix(bucketName, prefix); - add15UnderRoot(bucketName); - - S3Bucket bucket = client.listBucket(bucketName, withPrefix("apps/")).get(10, - TimeUnit.SECONDS); - assert !bucket.isTruncated(); - assertEquals(bucket.getContents().size(), 10); - assertEquals(bucket.getPrefix(), "apps/"); - } finally { - returnBucket(bucketName); - } - - } - - @Test() - void testListBucket() throws InterruptedException, ExecutionException, TimeoutException, - UnsupportedEncodingException { - String bucketName = getBucketName(); - try { - String prefix = "apps"; - addTenObjectsUnderPrefix(bucketName, prefix); - S3Bucket bucket = client.listBucket(bucketName).get(10, TimeUnit.SECONDS); - assertEquals(bucket.getContents().size(), 10); - } finally { - returnBucket(bucketName); - } - - } - - private void add15UnderRoot(String bucketName) throws InterruptedException, ExecutionException, - TimeoutException { - for (int i = 0; i < 15; i++) - client.putObject(bucketName, new S3Object(i + "", i + "content")) - .get(10, TimeUnit.SECONDS); - } - - private void addTenObjectsUnderPrefix(String bucketName, String prefix) - throws InterruptedException, ExecutionException, TimeoutException { - for (int i = 0; i < 10; i++) - client.putObject(bucketName, new S3Object(prefix + "/" + i, i + "content")).get(10, - TimeUnit.SECONDS); - } - -} \ No newline at end of file diff --git a/aws/s3/core/src/test/java/org/jclouds/aws/s3/commands/PutAccessControlListIntegrationTest.java b/aws/s3/core/src/test/java/org/jclouds/aws/s3/commands/PutAccessControlListIntegrationTest.java deleted file mode 100644 index cb8211424a..0000000000 --- a/aws/s3/core/src/test/java/org/jclouds/aws/s3/commands/PutAccessControlListIntegrationTest.java +++ /dev/null @@ -1,143 +0,0 @@ -/** - * - * Copyright (C) 2009 Global Cloud Specialists, Inc. - * - * ==================================================================== - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * ==================================================================== - */ -package org.jclouds.aws.s3.commands; - -import static org.jclouds.aws.s3.internal.StubS3Connection.TEST_ACL_EMAIL; -import static org.jclouds.aws.s3.internal.StubS3Connection.TEST_ACL_ID; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertTrue; - -import java.io.IOException; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; - -import org.jclouds.aws.s3.S3IntegrationTest; -import org.jclouds.aws.s3.domain.AccessControlList; -import org.jclouds.aws.s3.domain.AccessControlList.CanonicalUserGrantee; -import org.jclouds.aws.s3.domain.AccessControlList.EmailAddressGrantee; -import org.jclouds.aws.s3.domain.AccessControlList.GroupGranteeURI; -import org.jclouds.aws.s3.domain.AccessControlList.Permission; -import org.testng.annotations.Test; - -/** - * Tests integrated functionality of all commands that retrieve Access Control Lists (ACLs). - * - * @author James Murty - */ -@Test(groups = { "integration", "live" }, testName = "s3.PutAccessControlListIntegrationTest") -public class PutAccessControlListIntegrationTest extends S3IntegrationTest { - - @Test - void testUpdateBucketACL() throws InterruptedException, ExecutionException, TimeoutException, - IOException, Exception { - String bucketName = getScratchBucketName(); - try { - // Confirm the bucket is private - AccessControlList acl = client.getBucketACL(bucketName).get(10, TimeUnit.SECONDS); - String ownerId = acl.getOwner().getId(); - assertEquals(acl.getGrants().size(), 1); - assertTrue(acl.hasPermission(ownerId, Permission.FULL_CONTROL)); - - addGrantsToACL(acl); - assertEquals(acl.getGrants().size(), 4); - assertTrue(client.putBucketACL(bucketName, acl).get(10, TimeUnit.SECONDS)); - - // Confirm that the updated ACL has stuck. - acl = client.getBucketACL(bucketName).get(10, TimeUnit.SECONDS); - checkGrants(acl); - } finally { - returnScratchBucket(bucketName); - } - - } - - @Test - void testUpdateObjectACL() throws InterruptedException, ExecutionException, TimeoutException, - IOException { - String bucketName = getBucketName(); - try { - String objectKey = "private-acl"; - - // Private object - addObjectToBucket(bucketName, objectKey); - AccessControlList acl = client.getObjectACL(bucketName, objectKey).get(10, - TimeUnit.SECONDS); - String ownerId = acl.getOwner().getId(); - - assertEquals(acl.getGrants().size(), 1); - assertTrue(acl.hasPermission(ownerId, Permission.FULL_CONTROL)); - - addGrantsToACL(acl); - assertEquals(acl.getGrants().size(), 4); - assertTrue(client.putObjectACL(bucketName, objectKey, acl).get(10, TimeUnit.SECONDS)); - - // Confirm that the updated ACL has stuck. - acl = client.getObjectACL(bucketName, objectKey).get(10, TimeUnit.SECONDS); - checkGrants(acl); - - /* - * Revoke all of owner's permissions! - */ - acl.revokeAllPermissions(new CanonicalUserGrantee(ownerId)); - if (!ownerId.equals(TEST_ACL_ID)) - acl.revokeAllPermissions(new CanonicalUserGrantee(TEST_ACL_ID)); - assertEquals(acl.getGrants().size(), 1); - // Only public read permission should remain... - assertTrue(acl.hasPermission(GroupGranteeURI.ALL_USERS, Permission.READ)); - - // Update the object's ACL settings - assertTrue(client.putObjectACL(bucketName, objectKey, acl).get(10, TimeUnit.SECONDS)); - - // Confirm that the updated ACL has stuck - acl = client.getObjectACL(bucketName, objectKey).get(10, TimeUnit.SECONDS); - assertEquals(acl.getGrants().size(), 1); - assertEquals(acl.getPermissions(ownerId).size(), 0); - assertTrue(acl.hasPermission(GroupGranteeURI.ALL_USERS, Permission.READ), acl.toString()); - } finally { - returnBucket(bucketName); - } - - } - - private void checkGrants(AccessControlList acl) { - String ownerId = acl.getOwner().getId(); - - assertEquals(acl.getGrants().size(), 4, acl.toString()); - - assertTrue(acl.hasPermission(ownerId, Permission.FULL_CONTROL), acl.toString()); - assertTrue(acl.hasPermission(GroupGranteeURI.ALL_USERS, Permission.READ), acl.toString()); - assertTrue(acl.hasPermission(ownerId, Permission.WRITE_ACP), acl.toString()); - // EmailAddressGrantee is replaced by a CanonicalUserGrantee, so we cannot test by email addr - assertTrue(acl.hasPermission(TEST_ACL_ID, Permission.READ_ACP), acl.toString()); - } - - private void addGrantsToACL(AccessControlList acl) { - String ownerId = acl.getOwner().getId(); - acl.addPermission(GroupGranteeURI.ALL_USERS, Permission.READ); - acl.addPermission(new EmailAddressGrantee(TEST_ACL_EMAIL), Permission.READ_ACP); - acl.addPermission(new CanonicalUserGrantee(ownerId), Permission.WRITE_ACP); - } - -} \ No newline at end of file diff --git a/aws/s3/core/src/test/java/org/jclouds/aws/s3/commands/PutObjectIntegrationTest.java b/aws/s3/core/src/test/java/org/jclouds/aws/s3/commands/PutObjectIntegrationTest.java deleted file mode 100644 index bf163f59bf..0000000000 --- a/aws/s3/core/src/test/java/org/jclouds/aws/s3/commands/PutObjectIntegrationTest.java +++ /dev/null @@ -1,116 +0,0 @@ -/** - * - * Copyright (C) 2009 Global Cloud Specialists, Inc. - * - * ==================================================================== - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * ==================================================================== - */ -package org.jclouds.aws.s3.commands; - -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNotNull; - -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.util.concurrent.TimeUnit; - -import org.apache.commons.io.IOUtils; -import org.jclouds.aws.s3.S3IntegrationTest; -import org.jclouds.aws.s3.domain.S3Object; -import org.jclouds.aws.s3.reference.S3Headers; -import org.jclouds.aws.s3.util.S3Utils; -import org.jclouds.http.HttpUtils; -import org.testng.annotations.DataProvider; -import org.testng.annotations.Test; - -/** - * Tests integrated functionality of all PutObject commands. - *

    - * Each test uses a different bucket name, so it should be perfectly fine to run in parallel. - * - * @author Adrian Cole - */ -@Test(testName = "s3.PutObjectIntegrationTest") -public class PutObjectIntegrationTest extends S3IntegrationTest { - @DataProvider(name = "putTests") - public Object[][] createData1() throws IOException { - - String realObject = IOUtils.toString(new FileInputStream("pom.xml")); - - return new Object[][] { { "file", "text/xml", new File("pom.xml"), realObject }, - { "string", "text/xml", realObject, realObject }, - { "bytes", "application/octet-stream", realObject.getBytes(), realObject } }; - } - - @Test(dataProvider = "putTests", groups = { "integration", "live" }) - void testPutObject(String key, String type, Object content, Object realObject) throws Exception { - S3Object object = new S3Object(key); - object.getMetadata().setContentType(type); - object.setData(content); - if (content instanceof InputStream) { - object.generateETag(); - } - String bucketName = getBucketName(); - try { - assertNotNull(client.putObject(bucketName, object).get(10, TimeUnit.SECONDS)); - object = client.getObject(bucketName, object.getKey()).get(10, TimeUnit.SECONDS); - String returnedString = S3Utils.getContentAsStringAndClose(object); - assertEquals(returnedString, realObject); - assertEquals(client.listBucket(bucketName).get(10, TimeUnit.SECONDS).getContents().size(), - 1); - } finally { - returnBucket(bucketName); - } - } - - @Test(groups = { "integration", "live" }) - void testMetadata() throws Exception { - String key = "hello"; - - S3Object object = new S3Object(key, TEST_STRING); - object.getMetadata().setCacheControl("no-cache"); - object.getMetadata().setContentType("text/plain"); - object.getMetadata().setContentEncoding("x-compress"); - object.getMetadata().setSize(TEST_STRING.length()); - object.getMetadata().setContentDisposition("attachment; filename=hello.txt"); - object.getMetadata().getUserMetadata().put(S3Headers.USER_METADATA_PREFIX + "adrian", - "powderpuff"); - object.getMetadata().setETag(HttpUtils.eTag(TEST_STRING.getBytes())); - String bucketName = getBucketName(); - try { - addObjectToBucket(bucketName, object); - S3Object newObject = validateContent(bucketName, key); - - assertEquals(newObject.getMetadata().getContentType(), "text/plain"); - assertEquals(newObject.getMetadata().getContentEncoding(), "x-compress"); - assertEquals(newObject.getMetadata().getContentDisposition(), - "attachment; filename=hello.txt"); - assertEquals(newObject.getMetadata().getCacheControl(), "no-cache"); - assertEquals(newObject.getMetadata().getSize(), TEST_STRING.length()); - assertEquals(newObject.getMetadata().getUserMetadata().values().iterator().next(), - "powderpuff"); - assertEquals(newObject.getMetadata().getETag(), HttpUtils.eTag(TEST_STRING.getBytes())); - } finally { - returnBucket(bucketName); - } - } - -} \ No newline at end of file diff --git a/aws/s3/core/src/test/java/org/jclouds/aws/s3/commands/PutObjectLiveTest.java b/aws/s3/core/src/test/java/org/jclouds/aws/s3/commands/PutObjectLiveTest.java deleted file mode 100644 index 41ab55fbd4..0000000000 --- a/aws/s3/core/src/test/java/org/jclouds/aws/s3/commands/PutObjectLiveTest.java +++ /dev/null @@ -1,65 +0,0 @@ -/** - * - * Copyright (C) 2009 Global Cloud Specialists, Inc. - * - * ==================================================================== - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * ==================================================================== - */ -package org.jclouds.aws.s3.commands; - -import static org.jclouds.aws.s3.options.PutObjectOptions.Builder.withAcl; - -import java.net.URL; -import java.util.concurrent.TimeUnit; - -import org.jclouds.aws.s3.S3IntegrationTest; -import org.jclouds.aws.s3.domain.CannedAccessPolicy; -import org.jclouds.aws.s3.domain.S3Object; -import org.jclouds.util.Utils; -import org.testng.annotations.Test; - -/** - * Tests integrated functionality of all PutObject commands. - *

    - * Each test uses a different bucket name, so it should be perfectly fine to run in parallel. - * - * @author Adrian Cole - */ -@Test(testName = "s3.PutObjectLiveTest") -public class PutObjectLiveTest extends S3IntegrationTest { - - @Test(groups = { "live" }) - void testCannedAccessPolicyPublic() throws Exception { - String bucketName = getBucketName(); - try { - String key = "hello"; - - client.putObject(bucketName, new S3Object(key, TEST_STRING), - - withAcl(CannedAccessPolicy.PUBLIC_READ)).get(10, TimeUnit.SECONDS); - - URL url = new URL(String.format("http://%1$s.s3.amazonaws.com/%2$s", bucketName, key)); - Utils.toStringAndClose(url.openStream()); - } finally { - returnBucket(bucketName); - } - - } - -} \ No newline at end of file diff --git a/aws/s3/core/src/test/java/org/jclouds/aws/s3/config/StubS3ConnectionModule.java b/aws/s3/core/src/test/java/org/jclouds/aws/s3/config/StubS3BlobStoreModule.java old mode 100644 new mode 100755 similarity index 87% rename from aws/s3/core/src/test/java/org/jclouds/aws/s3/config/StubS3ConnectionModule.java rename to aws/s3/core/src/test/java/org/jclouds/aws/s3/config/StubS3BlobStoreModule.java index f4f8b4af83..49ea2501d9 --- a/aws/s3/core/src/test/java/org/jclouds/aws/s3/config/StubS3ConnectionModule.java +++ b/aws/s3/core/src/test/java/org/jclouds/aws/s3/config/StubS3BlobStoreModule.java @@ -25,8 +25,8 @@ package org.jclouds.aws.s3.config; import java.net.URI; -import org.jclouds.aws.s3.S3Connection; -import org.jclouds.aws.s3.internal.StubS3Connection; +import org.jclouds.aws.s3.S3BlobStore; +import org.jclouds.aws.s3.internal.StubS3BlobStore; import org.jclouds.cloud.ConfiguresCloudConnection; import org.jclouds.http.functions.config.ParserModule; @@ -38,10 +38,10 @@ import com.google.inject.AbstractModule; * @author Adrian Cole */ @ConfiguresCloudConnection -public class StubS3ConnectionModule extends AbstractModule { +public class StubS3BlobStoreModule extends AbstractModule { protected void configure() { install(new ParserModule()); - bind(S3Connection.class).to(StubS3Connection.class); + bind(S3BlobStore.class).to(StubS3BlobStore.class); bind(URI.class).toInstance(URI.create("http://localhost:8080")); } } diff --git a/aws/s3/core/src/test/java/org/jclouds/aws/s3/filters/RequestAuthorizeSignatureTest.java b/aws/s3/core/src/test/java/org/jclouds/aws/s3/filters/RequestAuthorizeSignatureTest.java index e68adc5cfd..6bafc536fc 100644 --- a/aws/s3/core/src/test/java/org/jclouds/aws/s3/filters/RequestAuthorizeSignatureTest.java +++ b/aws/s3/core/src/test/java/org/jclouds/aws/s3/filters/RequestAuthorizeSignatureTest.java @@ -111,6 +111,16 @@ public class RequestAuthorizeSignatureTest { assertEquals(builder.toString(), ""); } + + @Test + void testHeadersGoLowercase() { + URI host = URI.create("http://s3.amazonaws.com:80"); + HttpRequest request = new HttpRequest(HttpMethod.GET, host); + request.getHeaders().put("x-amz-adrian", "s3.amazonaws.com"); + StringBuilder builder = new StringBuilder(); + filter.appendBucketName(request, builder); + assertEquals(builder.toString(), ""); + } @Test void testAppendBucketNameURIHost() { URI host = URI.create("http://adriancole.s3int5.s3-external-3.amazonaws.com:80"); diff --git a/aws/s3/core/src/test/java/org/jclouds/aws/s3/functions/ListBucketHandlerTest.java b/aws/s3/core/src/test/java/org/jclouds/aws/s3/functions/ListBucketHandlerTest.java index 4581ab790b..eb7d4cc658 100644 --- a/aws/s3/core/src/test/java/org/jclouds/aws/s3/functions/ListBucketHandlerTest.java +++ b/aws/s3/core/src/test/java/org/jclouds/aws/s3/functions/ListBucketHandlerTest.java @@ -26,7 +26,7 @@ package org.jclouds.aws.s3.functions; import static org.testng.Assert.assertEquals; import org.apache.commons.io.IOUtils; -import org.jclouds.aws.s3.domain.S3Bucket; +import org.jclouds.aws.s3.domain.ListBucketResponse; import org.jclouds.http.HttpException; import org.jclouds.http.functions.ParseSax; import org.testng.annotations.BeforeMethod; @@ -38,15 +38,15 @@ public class ListBucketHandlerTest extends BaseHandlerTest { public static final String listBucketWithSlashDelimiterAndCommonPrefixApps = " / apps/"; @BeforeMethod - ParseSax createParser() { - ParseSax parser = parserFactory.createListBucketParser(); + ParseSax createParser() { + ParseSax parser = parserFactory.createListBucketParser(); return parser; } @Test public void testListMyBucketsWithDelimiterSlashAndCommonPrefixesAppsSlash() throws HttpException { - S3Bucket bucket = createParser().parse( + ListBucketResponse bucket = createParser().parse( IOUtils.toInputStream(listBucketWithSlashDelimiterAndCommonPrefixApps)); assertEquals(bucket.getCommonPrefixes().iterator().next(), "apps/"); assertEquals(bucket.getDelimiter(), "/"); @@ -56,9 +56,9 @@ public class ListBucketHandlerTest extends BaseHandlerTest { @Test public void testListMyBucketsWithPrefixAppsSlash() throws HttpException { - S3Bucket bucket = createParser().parse(IOUtils.toInputStream(listBucketWithPrefixAppsSlash)); + ListBucketResponse bucket = createParser().parse(IOUtils.toInputStream(listBucketWithPrefixAppsSlash)); assertEquals(bucket.getPrefix(), "apps/"); - assertEquals(bucket.getMaxKeys(), 1000); + assertEquals(bucket.getMaxResults(), 1000); assert bucket.getMarker() == null; } diff --git a/aws/s3/core/src/test/java/org/jclouds/aws/s3/commands/ReturnTrueIfBucketAlreadyOwnedByYouTest.java b/aws/s3/core/src/test/java/org/jclouds/aws/s3/functions/ReturnTrueIfBucketAlreadyOwnedByYouTest.java old mode 100644 new mode 100755 similarity index 98% rename from aws/s3/core/src/test/java/org/jclouds/aws/s3/commands/ReturnTrueIfBucketAlreadyOwnedByYouTest.java rename to aws/s3/core/src/test/java/org/jclouds/aws/s3/functions/ReturnTrueIfBucketAlreadyOwnedByYouTest.java index 19e0aea812..d4a31cf082 --- a/aws/s3/core/src/test/java/org/jclouds/aws/s3/commands/ReturnTrueIfBucketAlreadyOwnedByYouTest.java +++ b/aws/s3/core/src/test/java/org/jclouds/aws/s3/functions/ReturnTrueIfBucketAlreadyOwnedByYouTest.java @@ -21,7 +21,7 @@ * under the License. * ==================================================================== */ -package org.jclouds.aws.s3.commands; +package org.jclouds.aws.s3.functions; import static org.easymock.EasyMock.expect; import static org.easymock.classextension.EasyMock.createMock; diff --git a/aws/s3/core/src/test/java/org/jclouds/aws/s3/integration/S3BlobIntegrationTest.java b/aws/s3/core/src/test/java/org/jclouds/aws/s3/integration/S3BlobIntegrationTest.java new file mode 100755 index 0000000000..c751762e3f --- /dev/null +++ b/aws/s3/core/src/test/java/org/jclouds/aws/s3/integration/S3BlobIntegrationTest.java @@ -0,0 +1,424 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.aws.s3.integration; + +import static org.jclouds.aws.s3.internal.StubS3BlobStore.TEST_ACL_EMAIL; +import static org.jclouds.aws.s3.internal.StubS3BlobStore.TEST_ACL_ID; +import static org.jclouds.aws.s3.options.CopyObjectOptions.Builder.ifSourceETagDoesntMatch; +import static org.jclouds.aws.s3.options.CopyObjectOptions.Builder.ifSourceETagMatches; +import static org.jclouds.aws.s3.options.CopyObjectOptions.Builder.ifSourceModifiedSince; +import static org.jclouds.aws.s3.options.CopyObjectOptions.Builder.ifSourceUnmodifiedSince; +import static org.jclouds.aws.s3.options.CopyObjectOptions.Builder.overrideMetadataWith; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertFalse; +import static org.testng.Assert.assertTrue; + +import java.io.IOException; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; + +import org.jclouds.aws.s3.S3BlobStore; +import org.jclouds.aws.s3.domain.AccessControlList; +import org.jclouds.aws.s3.domain.BucketMetadata; +import org.jclouds.aws.s3.domain.CannedAccessPolicy; +import org.jclouds.aws.s3.domain.ObjectMetadata; +import org.jclouds.aws.s3.domain.S3Object; +import org.jclouds.aws.s3.domain.AccessControlList.CanonicalUserGrantee; +import org.jclouds.aws.s3.domain.AccessControlList.EmailAddressGrantee; +import org.jclouds.aws.s3.domain.AccessControlList.GroupGranteeURI; +import org.jclouds.aws.s3.domain.AccessControlList.Permission; +import org.jclouds.aws.s3.options.PutObjectOptions; +import org.jclouds.blobstore.integration.internal.BaseBlobIntegrationTest; +import org.jclouds.http.HttpResponseException; +import org.jclouds.util.Utils; +import org.joda.time.DateTime; +import org.testng.annotations.Test; + +import com.google.common.collect.HashMultimap; +import com.google.common.collect.Multimap; + +/** + * + * @author James Murty + * @author Adrian Cole + */ +@Test(groups = { "integration", "live" }, testName = "s3.S3BlobIntegrationTest") +public class S3BlobIntegrationTest extends + BaseBlobIntegrationTest { + String sourceKey = "apples"; + String destinationKey = "pears"; + + public void testPublicWriteOnObject() throws InterruptedException, ExecutionException, + TimeoutException, IOException { + final String publicReadWriteObjectKey = "public-read-write-acl"; + final String containerName = getContainerName(); + try { + // Public Read-Write object + client.putBlob(containerName, new S3Object(publicReadWriteObjectKey, ""), + new PutObjectOptions().withAcl(CannedAccessPolicy.PUBLIC_READ_WRITE)).get(10, + TimeUnit.SECONDS); + + assertEventually(new Runnable() { + public void run() { + try { + AccessControlList acl = client + .getBlobACL(containerName, publicReadWriteObjectKey).get(10, + TimeUnit.SECONDS); + assertEquals(acl.getGrants().size(), 3); + assertEquals(acl.getPermissions(GroupGranteeURI.ALL_USERS).size(), 2); + assertTrue(acl.getOwner() != null); + String ownerId = acl.getOwner().getId(); + assertTrue(acl.hasPermission(ownerId, Permission.FULL_CONTROL)); + assertTrue(acl.hasPermission(GroupGranteeURI.ALL_USERS, Permission.READ)); + assertTrue(acl.hasPermission(GroupGranteeURI.ALL_USERS, Permission.WRITE)); + assertFalse(acl.hasPermission(GroupGranteeURI.ALL_USERS, Permission.READ_ACP)); + assertFalse(acl.hasPermission(GroupGranteeURI.ALL_USERS, Permission.WRITE_ACP)); + assertFalse(acl.hasPermission(GroupGranteeURI.ALL_USERS, Permission.FULL_CONTROL)); + } catch (Exception e) { + Utils. rethrowIfRuntimeOrSameType(e); + } + } + }); + } finally { + returnContainer(containerName); + } + + } + + public void testUpdateObjectACL() throws InterruptedException, ExecutionException, + TimeoutException, IOException { + String containerName = getContainerName(); + try { + String objectKey = "private-acl"; + + // Private object + addBlobToContainer(containerName, objectKey); + AccessControlList acl = client.getBlobACL(containerName, objectKey).get(10, + TimeUnit.SECONDS); + String ownerId = acl.getOwner().getId(); + + assertEquals(acl.getGrants().size(), 1); + assertTrue(acl.hasPermission(ownerId, Permission.FULL_CONTROL)); + + addGrantsToACL(acl); + assertEquals(acl.getGrants().size(), 4); + assertTrue(client.putBlobACL(containerName, objectKey, acl).get(10, TimeUnit.SECONDS)); + + // Confirm that the updated ACL has stuck. + acl = client.getBlobACL(containerName, objectKey).get(10, TimeUnit.SECONDS); + checkGrants(acl); + + /* + * Revoke all of owner's permissions! + */ + acl.revokeAllPermissions(new CanonicalUserGrantee(ownerId)); + if (!ownerId.equals(TEST_ACL_ID)) + acl.revokeAllPermissions(new CanonicalUserGrantee(TEST_ACL_ID)); + assertEquals(acl.getGrants().size(), 1); + // Only public read permission should remain... + assertTrue(acl.hasPermission(GroupGranteeURI.ALL_USERS, Permission.READ)); + + // Update the object's ACL settings + assertTrue(client.putBlobACL(containerName, objectKey, acl).get(10, TimeUnit.SECONDS)); + + // Confirm that the updated ACL has stuck + acl = client.getBlobACL(containerName, objectKey).get(10, TimeUnit.SECONDS); + assertEquals(acl.getGrants().size(), 1); + assertEquals(acl.getPermissions(ownerId).size(), 0); + assertTrue(acl.hasPermission(GroupGranteeURI.ALL_USERS, Permission.READ), acl.toString()); + } finally { + returnContainer(containerName); + } + + } + + private void checkGrants(AccessControlList acl) { + String ownerId = acl.getOwner().getId(); + + assertEquals(acl.getGrants().size(), 4, acl.toString()); + + assertTrue(acl.hasPermission(ownerId, Permission.FULL_CONTROL), acl.toString()); + assertTrue(acl.hasPermission(GroupGranteeURI.ALL_USERS, Permission.READ), acl.toString()); + assertTrue(acl.hasPermission(ownerId, Permission.WRITE_ACP), acl.toString()); + // EmailAddressGrantee is replaced by a CanonicalUserGrantee, so we cannot test by email addr + assertTrue(acl.hasPermission(TEST_ACL_ID, Permission.READ_ACP), acl.toString()); + } + + private void addGrantsToACL(AccessControlList acl) { + String ownerId = acl.getOwner().getId(); + acl.addPermission(GroupGranteeURI.ALL_USERS, Permission.READ); + acl.addPermission(new EmailAddressGrantee(TEST_ACL_EMAIL), Permission.READ_ACP); + acl.addPermission(new CanonicalUserGrantee(ownerId), Permission.WRITE_ACP); + } + + public void testPrivateAclIsDefaultForObject() throws InterruptedException, ExecutionException, + TimeoutException, IOException { + String privateObjectKey = "private-acl"; + String containerName = getContainerName(); + try { + // Private object + addBlobToContainer(containerName, privateObjectKey); + AccessControlList acl = client.getBlobACL(containerName, privateObjectKey).get(10, + TimeUnit.SECONDS); + + assertEquals(acl.getGrants().size(), 1); + assertTrue(acl.getOwner() != null); + String ownerId = acl.getOwner().getId(); + assertTrue(acl.hasPermission(ownerId, Permission.FULL_CONTROL)); + } finally { + returnContainer(containerName); + } + + } + + public void testPublicReadOnObject() throws InterruptedException, ExecutionException, + TimeoutException, IOException { + final String publicReadObjectKey = "public-read-acl"; + final String containerName = getContainerName(); + try { + client.putBlob(containerName, new S3Object(publicReadObjectKey, ""), + new PutObjectOptions().withAcl(CannedAccessPolicy.PUBLIC_READ)).get(10, + TimeUnit.SECONDS); + + assertEventually(new Runnable() { + public void run() { + try { + AccessControlList acl = client.getBlobACL(containerName, publicReadObjectKey) + .get(10, TimeUnit.SECONDS); + + assertEquals(acl.getGrants().size(), 2); + assertEquals(acl.getPermissions(GroupGranteeURI.ALL_USERS).size(), 1); + assertTrue(acl.getOwner() != null); + String ownerId = acl.getOwner().getId(); + assertTrue(acl.hasPermission(ownerId, Permission.FULL_CONTROL)); + assertTrue(acl.hasPermission(GroupGranteeURI.ALL_USERS, Permission.READ)); + } catch (Exception e) { + Utils. rethrowIfRuntimeOrSameType(e); + } + } + }); + + } finally { + returnContainer(containerName); + } + + } + + public void testMetadataWithCacheControlAndContentDisposition() throws Exception { + String key = "hello"; + + S3Object object = objectFactory.createBlob(key); + object.setData(TEST_STRING); + object.getMetadata().setCacheControl("no-cache"); + object.getMetadata().setContentDisposition("attachment; filename=hello.txt"); + String containerName = getContainerName(); + try { + addBlobToContainer(containerName, object); + S3Object newObject = validateContent(containerName, key); + + assertEquals(newObject.getMetadata().getCacheControl(), "no-cache"); + assertEquals(newObject.getMetadata().getContentDisposition(), + "attachment; filename=hello.txt"); + } finally { + returnContainer(containerName); + } + } + + @Test(groups = { "integration", "live" }) + public void testMetadataContentEncoding() throws Exception { + String key = "hello"; + + S3Object object = objectFactory.createBlob(key); + object.setData(TEST_STRING); + object.getMetadata().setContentEncoding("x-compress"); + String containerName = getContainerName(); + try { + addBlobToContainer(containerName, object); + S3Object newObject = validateContent(containerName, key); + + assertEquals(newObject.getMetadata().getContentEncoding(), "x-compress"); + } finally { + returnContainer(containerName); + } + } + + public void testCopyObject() throws Exception { + String containerName = getContainerName(); + String destinationContainer = getContainerName(); + + try { + addToContainerAndValidate(containerName, sourceKey); + + client.copyBlob(containerName, sourceKey, destinationContainer, destinationKey).get(10, + TimeUnit.SECONDS); + + validateContent(destinationContainer, destinationKey); + } finally { + returnContainer(containerName); + returnContainer(destinationContainer); + + } + } + + private void addToContainerAndValidate(String containerName, String sourceKey) + throws InterruptedException, ExecutionException, TimeoutException, IOException { + addBlobToContainer(containerName, sourceKey); + validateContent(containerName, sourceKey); + } + + // TODO: fails on linux and windows + public void testCopyIfModifiedSince() throws InterruptedException, ExecutionException, + TimeoutException, IOException { + String containerName = getContainerName(); + String destinationContainer = getContainerName(); + try { + DateTime before = new DateTime(); + addToContainerAndValidate(containerName, sourceKey + "mod"); + DateTime after = new DateTime().plusSeconds(1); + + client.copyBlob(containerName, sourceKey + "mod", destinationContainer, destinationKey, + ifSourceModifiedSince(before)).get(10, TimeUnit.SECONDS); + validateContent(destinationContainer, destinationKey); + + try { + client.copyBlob(containerName, sourceKey + "mod", destinationContainer, destinationKey, + ifSourceModifiedSince(after)).get(10, TimeUnit.SECONDS); + } catch (ExecutionException e) { + if (e.getCause() instanceof HttpResponseException) { + HttpResponseException ex = (HttpResponseException) e.getCause(); + assertEquals(ex.getResponse().getStatusCode(), 412); + } else { + throw e; + } + } + } finally { + returnContainer(containerName); + returnContainer(destinationContainer); + + } + } + + // TODO: fails on linux and windows + public void testCopyIfUnmodifiedSince() throws InterruptedException, ExecutionException, + TimeoutException, IOException { + String containerName = getContainerName(); + String destinationContainer = getContainerName(); + try { + DateTime before = new DateTime(); + addToContainerAndValidate(containerName, sourceKey + "un"); + DateTime after = new DateTime().plusSeconds(1); + + client.copyBlob(containerName, sourceKey + "un", destinationContainer, destinationKey, + ifSourceUnmodifiedSince(after)).get(10, TimeUnit.SECONDS); + validateContent(destinationContainer, destinationKey); + + try { + client.copyBlob(containerName, sourceKey + "un", destinationContainer, destinationKey, + ifSourceModifiedSince(before)).get(10, TimeUnit.SECONDS); + } catch (ExecutionException e) { + HttpResponseException ex = (HttpResponseException) e.getCause(); + assertEquals(ex.getResponse().getStatusCode(), 412); + } + } finally { + returnContainer(containerName); + returnContainer(destinationContainer); + } + } + + public void testCopyIfMatch() throws InterruptedException, ExecutionException, TimeoutException, + IOException { + String containerName = getContainerName(); + String destinationContainer = getContainerName(); + try { + addToContainerAndValidate(containerName, sourceKey); + + client.copyBlob(containerName, sourceKey, destinationContainer, destinationKey, + ifSourceETagMatches(goodETag)).get(10, TimeUnit.SECONDS); + validateContent(destinationContainer, destinationKey); + + try { + client.copyBlob(containerName, sourceKey, destinationContainer, destinationKey, + ifSourceETagMatches(badETag)).get(10, TimeUnit.SECONDS); + } catch (ExecutionException e) { + HttpResponseException ex = (HttpResponseException) e.getCause(); + assertEquals(ex.getResponse().getStatusCode(), 412); + } + } finally { + returnContainer(containerName); + returnContainer(destinationContainer); + } + } + + public void testCopyIfNoneMatch() throws IOException, InterruptedException, ExecutionException, + TimeoutException { + String containerName = getContainerName(); + String destinationContainer = getContainerName(); + try { + addToContainerAndValidate(containerName, sourceKey); + + client.copyBlob(containerName, sourceKey, destinationContainer, destinationKey, + ifSourceETagDoesntMatch(badETag)).get(10, TimeUnit.SECONDS); + validateContent(destinationContainer, destinationKey); + + try { + client.copyBlob(containerName, sourceKey, destinationContainer, destinationKey, + ifSourceETagDoesntMatch(goodETag)).get(10, TimeUnit.SECONDS); + } catch (ExecutionException e) { + HttpResponseException ex = (HttpResponseException) e.getCause(); + assertEquals(ex.getResponse().getStatusCode(), 412); + } + } finally { + returnContainer(containerName); + returnContainer(destinationContainer); + + } + } + + public void testCopyWithMetadata() throws InterruptedException, ExecutionException, + TimeoutException, IOException { + String containerName = getContainerName(); + String destinationContainer = getContainerName(); + try { + addToContainerAndValidate(containerName, sourceKey); + + Multimap metadata = HashMultimap.create(); + metadata.put("adrian", "cole"); + + client.copyBlob(containerName, sourceKey, destinationContainer, destinationKey, + overrideMetadataWith(metadata)).get(10, TimeUnit.SECONDS); + + validateContent(destinationContainer, destinationKey); + + ObjectMetadata objectMeta = client.blobMetadata(destinationContainer, destinationKey); + + assertEquals(objectMeta.getUserMetadata(), metadata); + } finally { + returnContainer(containerName); + returnContainer(destinationContainer); + + } + } + +} \ No newline at end of file diff --git a/aws/s3/core/src/test/java/org/jclouds/aws/s3/commands/CopyObjectLiveTest.java b/aws/s3/core/src/test/java/org/jclouds/aws/s3/integration/S3BlobLiveTest.java similarity index 50% rename from aws/s3/core/src/test/java/org/jclouds/aws/s3/commands/CopyObjectLiveTest.java rename to aws/s3/core/src/test/java/org/jclouds/aws/s3/integration/S3BlobLiveTest.java index 297b958d32..846f0d19cc 100644 --- a/aws/s3/core/src/test/java/org/jclouds/aws/s3/commands/CopyObjectLiveTest.java +++ b/aws/s3/core/src/test/java/org/jclouds/aws/s3/integration/S3BlobLiveTest.java @@ -21,51 +21,71 @@ * under the License. * ==================================================================== */ -package org.jclouds.aws.s3.commands; +package org.jclouds.aws.s3.integration; import static org.jclouds.aws.s3.options.CopyObjectOptions.Builder.overrideAcl; +import static org.jclouds.aws.s3.options.PutObjectOptions.Builder.withAcl; import java.net.URL; import java.util.concurrent.TimeUnit; -import org.jclouds.aws.s3.S3IntegrationTest; +import org.jclouds.aws.s3.S3BlobStore; +import org.jclouds.aws.s3.domain.BucketMetadata; import org.jclouds.aws.s3.domain.CannedAccessPolicy; +import org.jclouds.aws.s3.domain.ObjectMetadata; +import org.jclouds.aws.s3.domain.S3Object; +import org.jclouds.blobstore.integration.internal.BaseBlobLiveTest; import org.jclouds.util.Utils; import org.testng.annotations.Test; /** - * Tests integrated functionality of all copyObject commands. - *

    - * Each test uses a different bucket name, so it should be perfectly fine to run in parallel. * + * @author James Murty * @author Adrian Cole */ -@Test(testName = "s3.CopyObjectLiveTest") -public class CopyObjectLiveTest extends S3IntegrationTest { +@Test(groups = { "live" }, testName = "s3.S3BlobLiveTest") +public class S3BlobLiveTest extends + BaseBlobLiveTest { + + public void testPutCannedAccessPolicyPublic() throws Exception { + String containerName = getContainerName(); + try { + String key = "hello"; + + client.putBlob(containerName, new S3Object(key, TEST_STRING), + + withAcl(CannedAccessPolicy.PUBLIC_READ)).get(10, TimeUnit.SECONDS); + + URL url = new URL(String.format("http://%1$s.s3.amazonaws.com/%2$s", containerName, key)); + Utils.toStringAndClose(url.openStream()); + } finally { + returnContainer(containerName); + } + + } + String sourceKey = "apples"; String destinationKey = "pears"; - @Test(groups = "live") - void testCannedAccessPolicyPublic() throws Exception { - String bucketName = getBucketName(); - String destinationBucket = getScratchBucketName(); + public void testCopyCannedAccessPolicyPublic() throws Exception { + String containerName = getContainerName(); + String destinationContainer = getContainerName(); try { - addObjectToBucket(bucketName, sourceKey); - validateContent(bucketName, sourceKey); + addBlobToContainer(containerName, sourceKey); + validateContent(containerName, sourceKey); - client.copyObject(bucketName, sourceKey, destinationBucket, destinationKey, + client.copyBlob(containerName, sourceKey, destinationContainer, destinationKey, overrideAcl(CannedAccessPolicy.PUBLIC_READ)).get(10, TimeUnit.SECONDS); - validateContent(destinationBucket, destinationKey); + validateContent(destinationContainer, destinationKey); - URL url = new URL(String.format("http://%1$s.s3.amazonaws.com/%2$s", destinationBucket, + URL url = new URL(String.format("http://%1$s.s3.amazonaws.com/%2$s", destinationContainer, destinationKey)); Utils.toStringAndClose(url.openStream()); } finally { - returnBucket(bucketName); - returnScratchBucket(destinationBucket); - + returnContainer(containerName); + returnContainer(destinationContainer); } } diff --git a/aws/s3/core/src/test/java/org/jclouds/aws/s3/SecureS3ConnectionLiveTest.java b/aws/s3/core/src/test/java/org/jclouds/aws/s3/integration/S3BlobMapIntegrationTest.java similarity index 66% rename from aws/s3/core/src/test/java/org/jclouds/aws/s3/SecureS3ConnectionLiveTest.java rename to aws/s3/core/src/test/java/org/jclouds/aws/s3/integration/S3BlobMapIntegrationTest.java index 277a2236ec..f04c7df1b4 100644 --- a/aws/s3/core/src/test/java/org/jclouds/aws/s3/SecureS3ConnectionLiveTest.java +++ b/aws/s3/core/src/test/java/org/jclouds/aws/s3/integration/S3BlobMapIntegrationTest.java @@ -21,21 +21,20 @@ * under the License. * ==================================================================== */ -package org.jclouds.aws.s3; +package org.jclouds.aws.s3.integration; +import org.jclouds.aws.s3.S3BlobStore; +import org.jclouds.aws.s3.domain.BucketMetadata; +import org.jclouds.aws.s3.domain.ObjectMetadata; +import org.jclouds.aws.s3.domain.S3Object; +import org.jclouds.blobstore.integration.internal.BaseBlobMapIntegrationTest; import org.testng.annotations.Test; /** - * This performs the same test as {@link S3ConnectionLiveTest}, except using SSL. - * * @author Adrian Cole */ -@Test(groups = { "live" }, testName = "s3.SecureS3ConnectionLiveTest") -public class SecureS3ConnectionLiveTest extends S3ConnectionLiveTest { - @Override - protected S3ContextBuilder buildS3ContextFactory(String AWSAccessKeyId, String AWSSecretAccessKey) { - return (S3ContextBuilder) S3ContextBuilder.newBuilder(AWSAccessKeyId, AWSSecretAccessKey) - .withHttpSecure(true).relaxSSLHostname().withHttpPort(443); - } +@Test(groups = { "integration", "live" }, testName = "s3.S3BlobMapIntegrationTest") +public class S3BlobMapIntegrationTest extends + BaseBlobMapIntegrationTest { -} +} \ No newline at end of file diff --git a/aws/s3/core/src/test/java/org/jclouds/aws/s3/integration/S3ContainerIntegrationTest.java b/aws/s3/core/src/test/java/org/jclouds/aws/s3/integration/S3ContainerIntegrationTest.java new file mode 100755 index 0000000000..64983b3c22 --- /dev/null +++ b/aws/s3/core/src/test/java/org/jclouds/aws/s3/integration/S3ContainerIntegrationTest.java @@ -0,0 +1,187 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.aws.s3.integration; + +import static org.jclouds.aws.s3.internal.StubS3BlobStore.TEST_ACL_EMAIL; +import static org.jclouds.aws.s3.internal.StubS3BlobStore.TEST_ACL_ID; +import static org.jclouds.aws.s3.options.ListBucketOptions.Builder.afterMarker; +import static org.jclouds.aws.s3.options.ListBucketOptions.Builder.delimiter; +import static org.jclouds.aws.s3.options.ListBucketOptions.Builder.maxResults; +import static org.jclouds.aws.s3.options.ListBucketOptions.Builder.withPrefix; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertTrue; + +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; + +import org.jclouds.aws.s3.S3BlobStore; +import org.jclouds.aws.s3.domain.AccessControlList; +import org.jclouds.aws.s3.domain.BucketMetadata; +import org.jclouds.aws.s3.domain.ListBucketResponse; +import org.jclouds.aws.s3.domain.ObjectMetadata; +import org.jclouds.aws.s3.domain.S3Object; +import org.jclouds.aws.s3.domain.AccessControlList.CanonicalUserGrantee; +import org.jclouds.aws.s3.domain.AccessControlList.EmailAddressGrantee; +import org.jclouds.aws.s3.domain.AccessControlList.GroupGranteeURI; +import org.jclouds.aws.s3.domain.AccessControlList.Permission; +import org.jclouds.blobstore.integration.internal.BaseContainerIntegrationTest; +import org.testng.annotations.Test; + +/** + * @author James Murty + * @author Adrian Cole + */ +@Test(groups = { "integration", "live" }, testName = "s3.S3ContainerIntegrationTest") +public class S3ContainerIntegrationTest extends + BaseContainerIntegrationTest { + + public void testListContainerDelimiter() throws InterruptedException, ExecutionException, + TimeoutException, UnsupportedEncodingException { + String containerName = getContainerName(); + try { + String prefix = "apps"; + addTenObjectsUnderPrefix(containerName, prefix); + add15UnderRoot(containerName); + ListBucketResponse container = client.listBlobs(containerName, delimiter("/")).get(10, + TimeUnit.SECONDS); + assertEquals(container.getDelimiter(), "/"); + assert !container.isTruncated(); + assertEquals(container.size(), 15); + assertEquals(container.getCommonPrefixes().size(), 1); + } finally { + returnContainer(containerName); + } + + } + + public void testListContainerPrefix() throws InterruptedException, ExecutionException, + TimeoutException, UnsupportedEncodingException { + String containerName = getContainerName(); + try { + String prefix = "apps"; + addTenObjectsUnderPrefix(containerName, prefix); + add15UnderRoot(containerName); + + ListBucketResponse container = client.listBlobs(containerName, withPrefix("apps/")).get( + 10, TimeUnit.SECONDS); + assert !container.isTruncated(); + assertEquals(container.size(), 10); + assertEquals(container.getPrefix(), "apps/"); + } finally { + returnContainer(containerName); + } + + } + + public void testPrivateAclIsDefaultForContainer() throws InterruptedException, + ExecutionException, TimeoutException, IOException { + String containerName = getContainerName(); + try { + AccessControlList acl = client.getContainerACL(containerName).get(10, TimeUnit.SECONDS); + assertEquals(acl.getGrants().size(), 1); + assertTrue(acl.getOwner() != null); + String ownerId = acl.getOwner().getId(); + assertTrue(acl.hasPermission(ownerId, Permission.FULL_CONTROL)); + } finally { + returnContainer(containerName); + } + + } + + public void testUpdateContainerACL() throws InterruptedException, ExecutionException, + TimeoutException, IOException, Exception { + String containerName = getContainerName(); + try { + // Confirm the container is private + AccessControlList acl = client.getContainerACL(containerName).get(10, TimeUnit.SECONDS); + String ownerId = acl.getOwner().getId(); + assertEquals(acl.getGrants().size(), 1); + assertTrue(acl.hasPermission(ownerId, Permission.FULL_CONTROL)); + + addGrantsToACL(acl); + assertEquals(acl.getGrants().size(), 4); + assertTrue(client.putContainerACL(containerName, acl).get(10, TimeUnit.SECONDS)); + + // Confirm that the updated ACL has stuck. + acl = client.getContainerACL(containerName).get(10, TimeUnit.SECONDS); + checkGrants(acl); + } finally { + destroyContainer(containerName); + } + + } + + private void checkGrants(AccessControlList acl) { + String ownerId = acl.getOwner().getId(); + + assertEquals(acl.getGrants().size(), 4, acl.toString()); + + assertTrue(acl.hasPermission(ownerId, Permission.FULL_CONTROL), acl.toString()); + assertTrue(acl.hasPermission(GroupGranteeURI.ALL_USERS, Permission.READ), acl.toString()); + assertTrue(acl.hasPermission(ownerId, Permission.WRITE_ACP), acl.toString()); + // EmailAddressGrantee is replaced by a CanonicalUserGrantee, so we cannot test by email addr + assertTrue(acl.hasPermission(TEST_ACL_ID, Permission.READ_ACP), acl.toString()); + } + + private void addGrantsToACL(AccessControlList acl) { + String ownerId = acl.getOwner().getId(); + acl.addPermission(GroupGranteeURI.ALL_USERS, Permission.READ); + acl.addPermission(new EmailAddressGrantee(TEST_ACL_EMAIL), Permission.READ_ACP); + acl.addPermission(new CanonicalUserGrantee(ownerId), Permission.WRITE_ACP); + } + + public void testListContainerMarker() throws InterruptedException, ExecutionException, + TimeoutException, UnsupportedEncodingException { + String containerName = getContainerName(); + try { + addAlphabetUnderRoot(containerName); + ListBucketResponse container = client.listBlobs(containerName, afterMarker("y")).get(10, + TimeUnit.SECONDS); + assertEquals(container.getMarker(), "y"); + assert !container.isTruncated(); + assertEquals(container.size(), 1); + } finally { + returnContainer(containerName); + } + } + + public void testListContainerMaxResults() throws InterruptedException, ExecutionException, + TimeoutException, UnsupportedEncodingException { + String containerName = getContainerName(); + try { + addAlphabetUnderRoot(containerName); + ListBucketResponse container = client.listBlobs(containerName, maxResults(5)).get(10, + TimeUnit.SECONDS); + assertEquals(container.getMaxResults(), 5); + assert container.isTruncated(); + assertEquals(container.size(), 5); + } finally { + returnContainer(containerName); + } + } + +} \ No newline at end of file diff --git a/aws/s3/core/src/test/java/org/jclouds/aws/s3/commands/PutBucketLiveTest.java b/aws/s3/core/src/test/java/org/jclouds/aws/s3/integration/S3ContainerLiveTest.java similarity index 59% rename from aws/s3/core/src/test/java/org/jclouds/aws/s3/commands/PutBucketLiveTest.java rename to aws/s3/core/src/test/java/org/jclouds/aws/s3/integration/S3ContainerLiveTest.java index 4ff79e69ee..3ec881ec42 100644 --- a/aws/s3/core/src/test/java/org/jclouds/aws/s3/commands/PutBucketLiveTest.java +++ b/aws/s3/core/src/test/java/org/jclouds/aws/s3/integration/S3ContainerLiveTest.java @@ -21,7 +21,7 @@ * under the License. * ==================================================================== */ -package org.jclouds.aws.s3.commands; +package org.jclouds.aws.s3.integration; import static org.jclouds.aws.s3.options.PutBucketOptions.Builder.createIn; import static org.jclouds.aws.s3.options.PutBucketOptions.Builder.withBucketAcl; @@ -31,81 +31,71 @@ import java.io.IOException; import java.net.URL; import java.util.concurrent.TimeUnit; -import org.jclouds.aws.s3.S3IntegrationTest; +import org.jclouds.aws.s3.S3BlobStore; import org.jclouds.aws.s3.domain.AccessControlList; +import org.jclouds.aws.s3.domain.BucketMetadata; import org.jclouds.aws.s3.domain.CannedAccessPolicy; +import org.jclouds.aws.s3.domain.ObjectMetadata; +import org.jclouds.aws.s3.domain.S3Object; import org.jclouds.aws.s3.domain.AccessControlList.GroupGranteeURI; import org.jclouds.aws.s3.domain.AccessControlList.Permission; -import org.jclouds.aws.s3.domain.S3Bucket.Metadata.LocationConstraint; +import org.jclouds.aws.s3.domain.BucketMetadata.LocationConstraint; +import org.jclouds.blobstore.integration.internal.BaseContainerLiveTest; import org.jclouds.util.Utils; import org.testng.annotations.Test; /** - * Tests integrated functionality of all PutBucket commands. - *

    - * Each test uses a different bucket name, so it should be perfectly fine to run in parallel. - * + * @author James Murty * @author Adrian Cole */ -@Test(testName = "s3.PutBucketLiveTest") -public class PutBucketLiveTest extends S3IntegrationTest { +@Test(groups = { "live" }, testName = "s3.S3ContainerLiveTest") +public class S3ContainerLiveTest extends + BaseContainerLiveTest { - @Test(groups = { "live" }) - void testPublicReadAccessPolicy() throws Exception { - String bucketName = getScratchBucketName(); + public void testPublicReadAccessPolicy() throws Exception { + String containerName = getScratchContainerName(); try { - deleteBucket(bucketName); - client.putBucketIfNotExists(bucketName, withBucketAcl(CannedAccessPolicy.PUBLIC_READ)) - .get(10, TimeUnit.SECONDS); - AccessControlList acl = client.getBucketACL(bucketName).get(10, TimeUnit.SECONDS); + client.createContainer(containerName, withBucketAcl(CannedAccessPolicy.PUBLIC_READ)).get( + 10, TimeUnit.SECONDS); + AccessControlList acl = client.getContainerACL(containerName).get(10, TimeUnit.SECONDS); assertTrue(acl.hasPermission(GroupGranteeURI.ALL_USERS, Permission.READ), acl.toString()); // TODO: I believe that the following should work based on the above acl assertion passing. // However, it fails on 403 - // URL url = new URL(String.format("https://%s.s3.amazonaws.com", bucketName)); + // URL url = new URL(String.format("http://%s.s3.amazonaws.com", containerName)); // Utils.toStringAndClose(url.openStream()); } finally { - returnScratchBucket(bucketName); + destroyContainer(containerName); } } - @Test(groups = { "live" }) - void testPutTwiceIsOk() throws Exception { - String bucketName = getBucketName(); + @Test(expectedExceptions = IOException.class) + public void testDefaultAccessPolicy() throws Exception { + String containerName = getContainerName(); try { - client.putBucketIfNotExists(bucketName).get(10, TimeUnit.SECONDS); - } finally { - returnBucket(bucketName); - } - } - - @Test(expectedExceptions = IOException.class, groups = { "live" }) - void testDefaultAccessPolicy() throws Exception { - String bucketName = getBucketName(); - try { - URL url = new URL(String.format("https://%s.s3.amazonaws.com", bucketName)); + URL url = new URL(String.format("https://%s.s3.amazonaws.com", containerName)); Utils.toStringAndClose(url.openStream()); } finally { - returnBucket(bucketName); + returnContainer(containerName); } } /** - * using scratch bucketName as we are changing location + * using scratch containerName as we are changing location */ - @Test(groups = "live") - void testEu() throws Exception { - final String bucketName = getScratchBucketName(); + public void testEu() throws Exception { + final String containerName = getScratchContainerName(); try { - deleteBucket(bucketName); - client.putBucketIfNotExists(bucketName, + client.createContainer(containerName + "eu", createIn(LocationConstraint.EU).withBucketAcl(CannedAccessPolicy.PUBLIC_READ)) .get(30, TimeUnit.SECONDS); assertEventually(new Runnable() { public void run() { try { - AccessControlList acl = client.getBucketACL(bucketName).get(10, TimeUnit.SECONDS); - assertTrue(acl.hasPermission(GroupGranteeURI.ALL_USERS, Permission.READ), acl.toString()); + AccessControlList acl = client.getContainerACL(containerName + "eu").get(30, + TimeUnit.SECONDS); + assertTrue(acl.hasPermission(GroupGranteeURI.ALL_USERS, Permission.READ), acl + .toString()); } catch (Exception e) { Utils. rethrowIfRuntimeOrSameType(e); } @@ -113,10 +103,10 @@ public class PutBucketLiveTest extends S3IntegrationTest { }); // TODO: I believe that the following should work based on the above acl assertion passing. // However, it fails on 403 - // URL url = new URL(String.format("https://%s.s3.amazonaws.com", bucketName)); + // URL url = new URL(String.format("http://%s.s3.amazonaws.com", containerName)); // Utils.toStringAndClose(url.openStream()); } finally { - returnScratchBucket(bucketName); + destroyContainer(containerName + "eu"); } } } \ No newline at end of file diff --git a/aws/s3/core/src/test/java/org/jclouds/aws/s3/integration/S3InputStreamMapIntegrationTest.java b/aws/s3/core/src/test/java/org/jclouds/aws/s3/integration/S3InputStreamMapIntegrationTest.java new file mode 100644 index 0000000000..4d03edb4f1 --- /dev/null +++ b/aws/s3/core/src/test/java/org/jclouds/aws/s3/integration/S3InputStreamMapIntegrationTest.java @@ -0,0 +1,40 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.aws.s3.integration; + +import org.jclouds.aws.s3.S3BlobStore; +import org.jclouds.aws.s3.domain.BucketMetadata; +import org.jclouds.aws.s3.domain.ObjectMetadata; +import org.jclouds.aws.s3.domain.S3Object; +import org.jclouds.blobstore.integration.internal.BaseInputStreamMapIntegrationTest; +import org.testng.annotations.Test; + +/** + * @author Adrian Cole + */ +@Test(groups = { "integration", "live" }, testName = "s3.S3InputStreamMapIntegrationTest") +public class S3InputStreamMapIntegrationTest extends + BaseInputStreamMapIntegrationTest { + +} \ No newline at end of file diff --git a/aws/s3/core/src/test/java/org/jclouds/aws/s3/commands/ListOwnedBucketsIntegrationTest.java b/aws/s3/core/src/test/java/org/jclouds/aws/s3/integration/S3ServiceIntegrationTest.java similarity index 54% rename from aws/s3/core/src/test/java/org/jclouds/aws/s3/commands/ListOwnedBucketsIntegrationTest.java rename to aws/s3/core/src/test/java/org/jclouds/aws/s3/integration/S3ServiceIntegrationTest.java index 0cc492bc64..a29306e4b8 100644 --- a/aws/s3/core/src/test/java/org/jclouds/aws/s3/commands/ListOwnedBucketsIntegrationTest.java +++ b/aws/s3/core/src/test/java/org/jclouds/aws/s3/integration/S3ServiceIntegrationTest.java @@ -21,41 +21,34 @@ * under the License. * ==================================================================== */ -package org.jclouds.aws.s3.commands; +package org.jclouds.aws.s3.integration; import java.util.List; -import org.jclouds.aws.s3.S3IntegrationTest; -import org.jclouds.aws.s3.domain.S3Bucket; +import org.jclouds.aws.s3.S3BlobStore; +import org.jclouds.aws.s3.domain.BucketMetadata; +import org.jclouds.aws.s3.domain.ObjectMetadata; +import org.jclouds.aws.s3.domain.S3Object; +import org.jclouds.blobstore.integration.internal.BaseServiceIntegrationTest; import org.testng.annotations.Test; /** - * Tests integrated functionality of all listOwnedBucket commands. - *

    - * Each test uses a different bucket name, so it should be perfectly fine to run in parallel. - * * @author Adrian Cole */ -@Test(groups = { "integration", "live" }, testName = "s3.ListOwnedBucketsIntegrationTest") -public class ListOwnedBucketsIntegrationTest extends S3IntegrationTest { +@Test(groups = { "integration", "live" }, testName = "s3.S3ServiceIntegrationTest") +public class S3ServiceIntegrationTest extends + BaseServiceIntegrationTest { - @Test() - void bucketDoesntExist() throws Exception { - List list = client.listOwnedBuckets(); - assert !list.contains(new S3Bucket("shouldntexist")); - } - - @Test() - void bucketExists() throws Exception { - String bucketName = getBucketName(); + void containerExists() throws Exception { + String containerName = getContainerName(); try { - List list = client.listOwnedBuckets(); - S3Bucket.Metadata firstBucket = list.get(0); - S3Bucket.Metadata toMatch = new S3Bucket.Metadata(bucketName); - toMatch.setOwner(firstBucket.getOwner()); + List list = client.listContainers(); + BucketMetadata firstContainer = list.get(0); + BucketMetadata toMatch = objectFactory.createContainerMetadata(containerName); + toMatch.setOwner(firstContainer.getOwner()); assert list.contains(toMatch); } finally { - returnBucket(bucketName); + returnContainer(containerName); } } } \ No newline at end of file diff --git a/aws/s3/core/src/test/java/org/jclouds/aws/s3/integration/S3TestInitializer.java b/aws/s3/core/src/test/java/org/jclouds/aws/s3/integration/S3TestInitializer.java new file mode 100644 index 0000000000..f76fb0e5f5 --- /dev/null +++ b/aws/s3/core/src/test/java/org/jclouds/aws/s3/integration/S3TestInitializer.java @@ -0,0 +1,128 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.aws.s3.integration; + +import org.jclouds.aws.s3.S3BlobStore; +import org.jclouds.aws.s3.S3Context; +import org.jclouds.aws.s3.S3ContextBuilder; +import org.jclouds.aws.s3.S3ContextFactory; +import org.jclouds.aws.s3.config.StubS3BlobStoreModule; +import org.jclouds.aws.s3.domain.BucketMetadata; +import org.jclouds.aws.s3.domain.ObjectMetadata; +import org.jclouds.aws.s3.domain.S3Object; +import org.jclouds.blobstore.BlobStoreContext; +import org.jclouds.blobstore.integration.internal.BaseBlobStoreIntegrationTest; +import org.jclouds.blobstore.integration.internal.BaseBlobStoreIntegrationTest.BlobStoreObjectFactory; +import org.jclouds.logging.log4j.config.Log4JLoggingModule; +import org.testng.ITestContext; + +import com.google.inject.Module; + +/** + * + * @author Adrian Cole + */ +public class S3TestInitializer + implements + BaseBlobStoreIntegrationTest.TestInitializer { + + public BaseBlobStoreIntegrationTest.TestInitializer.Result init( + Module configurationModule, ITestContext testContext) throws Exception { + String account = System.getProperty("jclouds.test.user"); + String key = System.getProperty("jclouds.test.key"); + if (account != null) + testContext.setAttribute("jclouds.test.user", account); + if (key != null) + testContext.setAttribute("jclouds.test.key", key); + + final S3Context context; + if (account != null) { + context = createLiveS3Context(configurationModule, account, key); + } else { + context = createStubS3Context(); + } + assert context != null; + + final S3BlobStore client = context.getApi(); + assert client != null; + + final BlobStoreObjectFactory objectFactory = new BaseBlobStoreIntegrationTest.BlobStoreObjectFactory() { + + public S3Object createBlob(String key) { + return new S3Object(key); + + } + + public BucketMetadata createContainerMetadata(String key) { + return new BucketMetadata(key); + } + + }; + assert objectFactory != null; + + return new BaseBlobStoreIntegrationTest.TestInitializer.Result() { + + public S3BlobStore getClient() { + return client; + } + + public BlobStoreContext getContext() { + return context; + } + + public BlobStoreObjectFactory getObjectFactory() { + return objectFactory; + } + + }; + } + + protected S3Context createStubS3Context() { + BaseBlobStoreIntegrationTest.SANITY_CHECK_RETURNED_BUCKET_NAME = true; + return S3ContextFactory.createS3Context("stub", "stub", new StubS3BlobStoreModule()); + } + + protected S3Context createLiveS3Context(Module configurationModule, String AWSAccessKeyId, + String AWSSecretAccessKey) { + return buildS3ContextFactory(configurationModule, AWSAccessKeyId, AWSSecretAccessKey) + .buildContext(); + } + + // protected String createScratchContainerInEU() throws InterruptedException, ExecutionException, + // TimeoutException { + // String containerName = getScratchContainerName(); + // deleteContainer(containerName); + // client.createContainer(containerName, PutBucketOptions.Builder + // .createIn(LocationConstraint.EU)); + // return containerName; + // } + + protected S3ContextBuilder buildS3ContextFactory(Module configurationModule, + String AWSAccessKeyId, String AWSSecretAccessKey) { + return (S3ContextBuilder) S3ContextBuilder.newBuilder(AWSAccessKeyId, AWSSecretAccessKey) + .withSaxDebug().relaxSSLHostname().withModules(configurationModule, + new Log4JLoggingModule()); + } + +} \ No newline at end of file diff --git a/aws/s3/core/src/test/java/org/jclouds/aws/s3/internal/StubS3BlobStore.java b/aws/s3/core/src/test/java/org/jclouds/aws/s3/internal/StubS3BlobStore.java new file mode 100755 index 0000000000..52455dbb43 --- /dev/null +++ b/aws/s3/core/src/test/java/org/jclouds/aws/s3/internal/StubS3BlobStore.java @@ -0,0 +1,346 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.aws.s3.internal; + +import java.util.Arrays; +import java.util.Map; +import java.util.SortedSet; +import java.util.TreeSet; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.Future; + +import org.jclouds.aws.s3.S3BlobStore; +import org.jclouds.aws.s3.domain.AccessControlList; +import org.jclouds.aws.s3.domain.ArrayListBucketResponse; +import org.jclouds.aws.s3.domain.BucketMetadata; +import org.jclouds.aws.s3.domain.CannedAccessPolicy; +import org.jclouds.aws.s3.domain.ListBucketResponse; +import org.jclouds.aws.s3.domain.ObjectMetadata; +import org.jclouds.aws.s3.domain.S3Object; +import org.jclouds.aws.s3.domain.AccessControlList.CanonicalUserGrantee; +import org.jclouds.aws.s3.domain.AccessControlList.EmailAddressGrantee; +import org.jclouds.aws.s3.domain.AccessControlList.Grant; +import org.jclouds.aws.s3.options.CopyObjectOptions; +import org.jclouds.aws.s3.options.ListBucketOptions; +import org.jclouds.aws.s3.options.PutBucketOptions; +import org.jclouds.aws.s3.options.PutObjectOptions; +import org.jclouds.aws.s3.reference.S3Constants; +import org.jclouds.blobstore.ContainerNotFoundException; +import org.jclouds.blobstore.KeyNotFoundException; +import org.jclouds.blobstore.integration.internal.StubBlobStore; +import org.jclouds.http.HttpUtils; +import org.jclouds.http.options.GetOptions; +import org.joda.time.DateTime; + +import com.google.common.base.Function; +import com.google.common.base.Predicate; +import com.google.common.collect.Iterables; +import com.google.common.collect.Lists; +import com.google.common.collect.Sets; +import com.google.inject.internal.Nullable; + +/** + * Implementation of {@link S3BlobStore} which keeps all data in a local Map object. + * + * @author Adrian Cole + * @author James Murty + */ +public class StubS3BlobStore extends StubBlobStore + implements S3BlobStore { + public static final String TEST_ACL_ID = "1a405254c932b52e5b5caaa88186bc431a1bacb9ece631f835daddaf0c47677c"; + public static final String TEST_ACL_EMAIL = "james@misterm.org"; + private static Map bucketToLocation = new ConcurrentHashMap(); + + /** + * An S3 item's "ACL" may be a {@link CannedAccessPolicy} or an {@link AccessControlList}. + */ + private static Map keyToAcl = new ConcurrentHashMap(); + + public static final String DEFAULT_OWNER_ID = "abc123"; + + public Future createContainer(String name, @Nullable PutBucketOptions nullableOptions) { + final PutBucketOptions options = (nullableOptions == null) ? new PutBucketOptions() + : nullableOptions; + if (options.getLocationConstraint() != null) + bucketToLocation.put(name, options.getLocationConstraint()); + keyToAcl.put(name, options.getAcl()); + return super.createContainer(name); + } + + public Future listBlobs(final String name, final ListBucketOptions options) { + return new FutureBase() { + public ListBucketResponse get() throws InterruptedException, ExecutionException { + final Map realContents = getContainerToBlobs().get(name); + + if (realContents == null) + throw new ContainerNotFoundException("name"); + SortedSet contents = Sets.newTreeSet(Iterables.transform(realContents + .keySet(), new Function() { + public ObjectMetadata apply(String key) { + return realContents.get(key).getMetadata(); + } + })); + + String marker = getFirstQueryOrNull(S3Constants.MARKER, options); + if (marker != null) { + final String finalMarker = marker; + ObjectMetadata lastMarkerMetadata = Iterables.find(contents, + new Predicate() { + public boolean apply(ObjectMetadata metadata) { + return metadata.getKey().equals(finalMarker); + } + }); + contents = contents.tailSet(lastMarkerMetadata); + // amazon spec means after the marker, not including it. + contents.remove(lastMarkerMetadata); + } + final String prefix = getFirstQueryOrNull(S3Constants.PREFIX, options); + if (prefix != null) { + contents = Sets.newTreeSet(Iterables.filter(contents, + new Predicate() { + public boolean apply(ObjectMetadata o) { + return (o != null && o.getKey().startsWith(prefix)); + } + })); + } + + final String delimiter = getFirstQueryOrNull(S3Constants.DELIMITER, options); + SortedSet commonPrefixes = null; + if (delimiter != null) { + Iterable iterable = Iterables.transform(contents, new CommonPrefixes( + prefix != null ? prefix : null, delimiter)); + commonPrefixes = iterable != null ? Sets.newTreeSet(iterable) + : new TreeSet(); + commonPrefixes.remove(CommonPrefixes.NO_PREFIX); + + contents = Sets.newTreeSet(Iterables.filter(contents, new DelimiterFilter( + prefix != null ? prefix : null, delimiter))); + } + + final String maxKeysString = getFirstQueryOrNull(S3Constants.MAX_KEYS, options); + int maxResults = contents.size(); + boolean truncated = false; + if (maxKeysString != null) { + int maxKeys = Integer.parseInt(maxKeysString); + SortedSet contentsSlice = firstSliceOfSize(contents, maxKeys); + maxResults = maxKeys; + if (!contentsSlice.contains(contents.last())) { + // Partial listing + truncated = true; + marker = contentsSlice.last().getKey(); + } else { + marker = null; + } + contents = contentsSlice; + } + return new ArrayListBucketResponse(name, Lists.newArrayList(contents), prefix, marker, + maxResults, delimiter, truncated, commonPrefixes); + } + }; + } + + public Future copyBlob(final String sourceBucket, final String sourceObject, + final String destinationBucket, final String destinationObject, + @Nullable CopyObjectOptions nullableOptions) { + final CopyObjectOptions options = (nullableOptions == null) ? new CopyObjectOptions() + : nullableOptions; + return new FutureBase() { + public ObjectMetadata get() throws InterruptedException, ExecutionException { + Map source = getContainerToBlobs().get(sourceBucket); + Map dest = getContainerToBlobs().get(destinationBucket); + if (source.containsKey(sourceObject)) { + S3Object object = source.get(sourceObject); + if (options.getIfMatch() != null) { + if (!Arrays.equals(object.getMetadata().getETag(), HttpUtils + .fromHexString(options.getIfMatch().replaceAll("\"", "")))) + throwResponseException(412); + + } + if (options.getIfNoneMatch() != null) { + if (Arrays.equals(object.getMetadata().getETag(), HttpUtils.fromHexString(options + .getIfNoneMatch().replaceAll("\"", "")))) + throwResponseException(412); + } + if (options.getIfModifiedSince() != null) { + DateTime modifiedSince = dateService + .rfc822DateParse(options.getIfModifiedSince()); + if (modifiedSince.isAfter(object.getMetadata().getLastModified())) + throwResponseException(412); + + } + if (options.getIfUnmodifiedSince() != null) { + DateTime unmodifiedSince = dateService.rfc822DateParse(options + .getIfUnmodifiedSince()); + if (unmodifiedSince.isBefore(object.getMetadata().getLastModified())) + throwResponseException(412); + } + S3Object sourceS3 = source.get(sourceObject); + ObjectMetadata newMd = copy(sourceS3.getMetadata(), destinationObject); + if (options.getAcl() != null) + keyToAcl.put(destinationBucket + "/" + destinationObject, options.getAcl()); + if (options.getMetadata() != null) { + newMd.setUserMetadata(options.getMetadata()); + } + newMd.setLastModified(new DateTime()); + dest.put(destinationObject, new S3Object(newMd, sourceS3.getData())); + return copy(newMd); + } + throw new KeyNotFoundException(sourceBucket, sourceObject); + } + }; + } + + public Future putBlob(final String bucketName, final S3Object object, + @Nullable PutObjectOptions nullableOptions) { + final PutObjectOptions options = (nullableOptions == null) ? new PutObjectOptions() + : nullableOptions; + if (options.getAcl() != null) + keyToAcl.put(bucketName + "/" + object.getKey(), options.getAcl()); + return super.putBlob(bucketName, object); + } + + protected AccessControlList getACLforS3Item(String bucketAndObjectKey) { + AccessControlList acl = null; + Object aclObj = keyToAcl.get(bucketAndObjectKey); + if (aclObj instanceof AccessControlList) { + acl = (AccessControlList) aclObj; + } else if (aclObj instanceof CannedAccessPolicy) { + acl = AccessControlList.fromCannedAccessPolicy((CannedAccessPolicy) aclObj, + DEFAULT_OWNER_ID); + } else if (aclObj == null) { + // Default to private access policy + acl = AccessControlList.fromCannedAccessPolicy(CannedAccessPolicy.PRIVATE, + DEFAULT_OWNER_ID); + } + return acl; + } + + public Future getContainerACL(final String bucket) { + return new FutureBase() { + public AccessControlList get() throws InterruptedException, ExecutionException { + return getACLforS3Item(bucket); + } + }; + } + + public Future getBlobACL(final String bucket, final String objectKey) { + return new FutureBase() { + public AccessControlList get() throws InterruptedException, ExecutionException { + return getACLforS3Item(bucket + "/" + objectKey); + } + }; + } + + /** + * Replace any AmazonCustomerByEmail grantees with a somewhat-arbitrary canonical user grantee, + * to match S3 which substitutes each email address grantee with that user's corresponding ID. In + * short, although you can PUT email address grantees, these are actually subsequently returned + * by S3 as canonical user grantees. + * + * @param acl + * @return + */ + protected AccessControlList sanitizeUploadedACL(AccessControlList acl) { + // Replace any email address grantees with canonical user grantees, using + // the acl's owner ID as the surrogate replacement. + for (Grant grant : acl.getGrants()) { + if (grant.getGrantee() instanceof EmailAddressGrantee) { + EmailAddressGrantee emailGrantee = (EmailAddressGrantee) grant.getGrantee(); + String id = emailGrantee.getEmailAddress().equals(TEST_ACL_EMAIL) ? TEST_ACL_ID : acl + .getOwner().getId(); + grant.setGrantee(new CanonicalUserGrantee(id, acl.getOwner().getDisplayName())); + } + } + return acl; + } + + public Future putContainerACL(final String bucket, final AccessControlList acl) { + return new FutureBase() { + public Boolean get() throws InterruptedException, ExecutionException { + keyToAcl.put(bucket, sanitizeUploadedACL(acl)); + return true; + } + }; + } + + public Future putBlobACL(final String bucket, final String objectKey, + final AccessControlList acl) { + return new FutureBase() { + public Boolean get() throws InterruptedException, ExecutionException { + keyToAcl.put(bucket + "/" + objectKey, sanitizeUploadedACL(acl)); + return true; + } + }; + } + + public Future copyBlob(String sourceBucket, String sourceObject, + String destinationBucket, String destinationObject) { + return copyBlob(sourceBucket, sourceObject, destinationBucket, destinationObject, + CopyObjectOptions.NONE); + } + + public Future createContainer(String bucketName) { + return createContainer(bucketName, PutBucketOptions.NONE); + } + + @Override + public Future getBlob(String bucketName, String key) { + return getBlob(bucketName, key, GetOptions.NONE); + } + + public Future listBlobs(String bucketName) { + return listBlobs(bucketName, ListBucketOptions.NONE); + } + + public Future putBlob(String bucketName, S3Object object) { + return putBlob(bucketName, object, PutObjectOptions.NONE); + } + + @Override + protected S3Object createBlob(String name) { + return new S3Object(name); + } + + @Override + protected S3Object createBlob(ObjectMetadata metadata) { + return new S3Object(metadata); + } + + @Override + protected BucketMetadata createContainerMetadata(String name) { + return new BucketMetadata(name); + } + + /** + * note this must be final and static so that tests coming from multiple threads will pass. + */ + private static final Map> containerToBlobs = new ConcurrentHashMap>(); + + @Override + public Map> getContainerToBlobs() { + return containerToBlobs; + } + +} diff --git a/aws/s3/core/src/test/java/org/jclouds/aws/s3/internal/StubS3Connection.java b/aws/s3/core/src/test/java/org/jclouds/aws/s3/internal/StubS3Connection.java deleted file mode 100644 index 77bfffb6ec..0000000000 --- a/aws/s3/core/src/test/java/org/jclouds/aws/s3/internal/StubS3Connection.java +++ /dev/null @@ -1,613 +0,0 @@ -/** - * - * Copyright (C) 2009 Global Cloud Specialists, Inc. - * - * ==================================================================== - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * ==================================================================== - */ -package org.jclouds.aws.s3.internal; - -import static com.google.common.base.Preconditions.checkNotNull; -import static org.easymock.classextension.EasyMock.createNiceMock; - -import java.io.ByteArrayInputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.Arrays; -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.SortedSet; -import java.util.TreeSet; -import java.util.Map.Entry; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.Future; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; - -import javax.ws.rs.core.HttpHeaders; - -import org.apache.commons.io.IOUtils; -import org.apache.commons.io.output.ByteArrayOutputStream; -import org.jclouds.aws.s3.S3Connection; -import org.jclouds.aws.s3.domain.AccessControlList; -import org.jclouds.aws.s3.domain.CannedAccessPolicy; -import org.jclouds.aws.s3.domain.S3Bucket; -import org.jclouds.aws.s3.domain.S3Object; -import org.jclouds.aws.s3.domain.AccessControlList.CanonicalUserGrantee; -import org.jclouds.aws.s3.domain.AccessControlList.EmailAddressGrantee; -import org.jclouds.aws.s3.domain.AccessControlList.Grant; -import org.jclouds.aws.s3.domain.S3Bucket.Metadata; -import org.jclouds.aws.s3.options.CopyObjectOptions; -import org.jclouds.aws.s3.options.ListBucketOptions; -import org.jclouds.aws.s3.options.PutBucketOptions; -import org.jclouds.aws.s3.options.PutObjectOptions; -import org.jclouds.aws.s3.reference.S3Constants; -import org.jclouds.http.HttpCommand; -import org.jclouds.http.HttpResponse; -import org.jclouds.http.HttpResponseException; -import org.jclouds.http.HttpUtils; -import org.jclouds.http.options.GetOptions; -import org.jclouds.http.options.HttpRequestOptions; -import org.jclouds.util.DateService; -import org.joda.time.DateTime; - -import com.google.common.base.Function; -import com.google.common.base.Predicate; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; -import com.google.common.collect.Sets; -import com.thoughtworks.xstream.XStream; - -/** - * Implementation of {@link S3Connection} which keeps all data in a local Map object. - * - * @author Adrian Cole - * @author James Murty - */ -public class StubS3Connection implements S3Connection { - public static final String TEST_ACL_ID = "1a405254c932b52e5b5caaa88186bc431a1bacb9ece631f835daddaf0c47677c"; - public static final String TEST_ACL_EMAIL = "james@misterm.org"; - - private static Map> bucketToContents = new ConcurrentHashMap>(); - private static Map bucketToLocation = new ConcurrentHashMap(); - - /** - * An S3 item's "ACL" may be a {@link CannedAccessPolicy} or an {@link AccessControlList}. - */ - private static Map keyToAcl = new ConcurrentHashMap(); - - public static final String DEFAULT_OWNER_ID = "abc123"; - - /** - * @throws java.io.IOException - */ - public static byte[] toByteArray(Object data) throws IOException { - checkNotNull(data, "data must be set before calling generateETag()"); - byte[] bytes = null; - if (data == null || data instanceof byte[]) { - bytes = (byte[]) data; - } else if (data instanceof String) { - bytes = ((String) data).getBytes(); - } else if (data instanceof File || data instanceof InputStream) { - InputStream io = (data instanceof InputStream) ? (InputStream) data : new FileInputStream( - (File) data); - bytes = IOUtils.toByteArray(io); - IOUtils.closeQuietly(io); - } else { - throw new UnsupportedOperationException("Content not supported " + data.getClass()); - } - return bytes; - - } - - public Future getObject(final String s3Bucket, final String key) { - return getObject(s3Bucket, key, new GetOptions()); - - } - - public S3Object.Metadata copy(S3Object.Metadata in) { - return (S3Object.Metadata) xstream.fromXML(xstream.toXML(in)); - } - - public S3Object.Metadata copy(S3Object.Metadata in, String newKey) { - return (S3Object.Metadata) xstream.fromXML(xstream.toXML(in).replaceAll(in.getKey(), newKey)); - } - - public S3Object.Metadata headObject(final String s3Bucket, final String key) { - if (!bucketToContents.containsKey(s3Bucket)) - return S3Object.Metadata.NOT_FOUND; - Map realContents = bucketToContents.get(s3Bucket); - if (!realContents.containsKey(key)) - return S3Object.Metadata.NOT_FOUND; - return realContents.get(key).getMetadata(); - } - - public Future deleteObject(final String s3Bucket, final String key) { - return new FutureBase() { - public Boolean get() throws InterruptedException, ExecutionException { - if (bucketToContents.containsKey(s3Bucket)) { - bucketToContents.get(s3Bucket).remove(key); - } - return true; - } - }; - } - - public Future putObject(final String s3Bucket, final S3Object object) { - return putObject(s3Bucket, object, new PutObjectOptions()); - } - - public Future putBucketIfNotExists(final String s3Bucket) { - return new FutureBase() { - public Boolean get() throws InterruptedException, ExecutionException { - if (!bucketToContents.containsKey(s3Bucket)) { - bucketToContents.put(s3Bucket, new ConcurrentHashMap()); - } - return bucketToContents.containsKey(s3Bucket); - } - }; - } - - public boolean deleteBucketIfEmpty(final String s3Bucket) { - if (bucketToContents.containsKey(s3Bucket)) { - if (bucketToContents.get(s3Bucket).size() == 0) - bucketToContents.remove(s3Bucket); - else - return false; - } - return true; - } - - XStream xstream = new XStream(); - - public Future copyObject(final String sourceBucket, - final String sourceObject, final String destinationBucket, - final String destinationObject) { - return copyObject(sourceBucket, sourceObject, destinationBucket, destinationObject, - new CopyObjectOptions()); - } - - public boolean bucketExists(final String s3Bucket) { - return bucketToContents.containsKey(s3Bucket); - } - - public Future listBucket(final String s3Bucket) { - return listBucket(s3Bucket, new ListBucketOptions()); - } - - private abstract class FutureBase implements Future { - public boolean cancel(boolean b) { - return false; - } - - public boolean isCancelled() { - return false; - } - - public boolean isDone() { - return true; - } - - public V get(long l, TimeUnit timeUnit) throws InterruptedException, ExecutionException, - TimeoutException { - return get(); - } - } - - public List listOwnedBuckets() { - return Lists.newArrayList(Iterables.transform(bucketToContents.keySet(), - new Function() { - public Metadata apply(String name) { - return new S3Bucket.Metadata(name); - } - })); - } - - public Future putBucketIfNotExists(String name, PutBucketOptions options) { - if (options.getLocationConstraint() != null) - bucketToLocation.put(name, options.getLocationConstraint()); - keyToAcl.put(name, options.getAcl()); - return putBucketIfNotExists(name); - } - - class DelimiterFilter implements Predicate { - private final String prefix; - private final String delimiter; - - DelimiterFilter(String prefix, String delimiter) { - this.prefix = prefix; - this.delimiter = delimiter; - } - - public boolean apply(S3Object.Metadata metadata) { - if (prefix == null) - return metadata.getKey().indexOf(delimiter) == -1; - if (metadata.getKey().startsWith(prefix)) - return metadata.getKey().replaceFirst(prefix, "").indexOf(delimiter) == -1; - return false; - } - } - - class CommonPrefixes implements Function { - private final String prefix; - private final String delimiter; - static final String NO_PREFIX = "NO_PREFIX"; - - CommonPrefixes(String prefix, String delimiter) { - this.prefix = prefix; - this.delimiter = delimiter; - } - - public String apply(S3Object.Metadata metadata) { - String working = metadata.getKey(); - - if (prefix != null) { - if (working.startsWith(prefix)) { - working = working.replaceFirst(prefix, ""); - } - } - if (working.contains(delimiter)) { - return working.substring(0, working.indexOf(delimiter)); - } - return NO_PREFIX; - } - } - - public String getFirstQueryOrNull(String string, HttpRequestOptions options) { - Collection values = options.buildQueryParameters().get(string); - return (values != null && values.size() >= 1) ? values.iterator().next() : null; - } - - public Future listBucket(final String name, final ListBucketOptions options) { - return new FutureBase() { - public S3Bucket get() throws InterruptedException, ExecutionException { - final Map realContents = bucketToContents.get(name); - - if (realContents == null) - return S3Bucket.NOT_FOUND; - SortedSet contents = Sets.newTreeSet(Iterables.transform( - realContents.keySet(), new Function() { - public S3Object.Metadata apply(String key) { - return realContents.get(key).getMetadata(); - } - })); - S3Bucket returnVal = new S3Bucket(name); - - final String marker = getFirstQueryOrNull(S3Constants.MARKER, options); - if (marker != null) { - S3Object.Metadata lastMarkerMetadata = Iterables.find(contents, - new Predicate() { - public boolean apply(S3Object.Metadata metadata) { - return metadata.getKey().equals(marker); - } - }); - contents = contents.tailSet(lastMarkerMetadata); - // amazon spec means after the marker, not including it. - contents.remove(lastMarkerMetadata); - returnVal.setMarker(marker); - } - final String prefix = getFirstQueryOrNull(S3Constants.PREFIX, options); - if (prefix != null) { - contents = Sets.newTreeSet(Iterables.filter(contents, - new Predicate() { - public boolean apply(S3Object.Metadata o) { - return (o != null && o.getKey().startsWith(prefix)); - } - })); - returnVal.setPrefix(prefix); - } - - final String delimiter = getFirstQueryOrNull(S3Constants.DELIMITER, options); - if (delimiter != null) { - Iterable iterable = Iterables.transform(contents, new CommonPrefixes( - prefix != null ? prefix : null, delimiter)); - SortedSet commonPrefixes = iterable != null ? Sets.newTreeSet(iterable) - : new TreeSet(); - commonPrefixes.remove(CommonPrefixes.NO_PREFIX); - - contents = Sets.newTreeSet(Iterables.filter(contents, new DelimiterFilter( - prefix != null ? prefix : null, delimiter))); - - returnVal.setCommonPrefixes(commonPrefixes); - returnVal.setDelimiter(delimiter); - } - - final String maxKeysString = getFirstQueryOrNull(S3Constants.MAX_KEYS, options); - if (maxKeysString != null) { - int maxKeys = Integer.parseInt(maxKeysString); - SortedSet contentsSlice = firstSliceOfSize(contents, maxKeys); - returnVal.setMaxKeys(maxKeys); - if (!contentsSlice.contains(contents.last())) { - // Partial listing - returnVal.setTruncated(true); - returnVal.setMarker(contentsSlice.last().getKey()); - } else { - returnVal.setTruncated(false); - returnVal.setMarker(null); - } - contents = contentsSlice; - } - - returnVal.setContents(contents); - return returnVal; - } - }; - } - - public static > SortedSet firstSliceOfSize(Iterable elements, - int size) { - List> slices = Lists.partition(Lists.newArrayList(elements), size); - return Sets.newTreeSet(slices.get(0)); - } - - public Future copyObject(final String sourceBucket, - final String sourceObject, final String destinationBucket, - final String destinationObject, final CopyObjectOptions options) { - - return new FutureBase() { - public S3Object.Metadata get() throws InterruptedException, ExecutionException { - Map source = bucketToContents.get(sourceBucket); - Map dest = bucketToContents.get(destinationBucket); - if (source.containsKey(sourceObject)) { - S3Object object = source.get(sourceObject); - if (options.getIfMatch() != null) { - if (!Arrays.equals(object.getMetadata().getETag(), HttpUtils - .fromHexString(options.getIfMatch().replaceAll("\"", "")))) - throwResponseException(412); - - } - if (options.getIfNoneMatch() != null) { - if (Arrays.equals(object.getMetadata().getETag(), HttpUtils.fromHexString(options - .getIfNoneMatch().replaceAll("\"", "")))) - throwResponseException(412); - } - if (options.getIfModifiedSince() != null) { - DateTime modifiedSince = dateService - .rfc822DateParse(options.getIfModifiedSince()); - if (modifiedSince.isAfter(object.getMetadata().getLastModified())) - throw new ExecutionException(new RuntimeException("after")); - - } - if (options.getIfUnmodifiedSince() != null) { - DateTime unmodifiedSince = dateService.rfc822DateParse(options - .getIfUnmodifiedSince()); - if (unmodifiedSince.isAfter(object.getMetadata().getLastModified())) - throw new ExecutionException(new RuntimeException("after")); - } - S3Object sourceS3 = source.get(sourceObject); - S3Object.Metadata newMd = copy(sourceS3.getMetadata(), destinationObject); - if (options.getAcl() != null) - keyToAcl.put(destinationBucket + "/" + destinationObject, options.getAcl()); - if (options.getMetadata() != null) { - newMd.setUserMetadata(options.getMetadata()); - } - newMd.setLastModified(new DateTime()); - dest.put(destinationObject, new S3Object(newMd, sourceS3.getData())); - return copy(newMd); - } - return S3Object.Metadata.NOT_FOUND; - } - }; - } - - private void throwResponseException(int code) throws ExecutionException { - HttpResponse response = null; - try { - response = new HttpResponse(new URL("file:///unused")); // TODO: Get real object URL? - } catch (MalformedURLException e) { - // This shouldn't ever happen. - e.printStackTrace(); - assert false; - } - response.setStatusCode(code); - throw new ExecutionException(new HttpResponseException(createNiceMock(HttpCommand.class), - response)); - } - - public Future putObject(final String bucketName, final S3Object object, - final PutObjectOptions options) { - if (!bucketToContents.containsKey(bucketName)) { - new RuntimeException("bucketName not found: " + bucketName); - } - try { - S3Object.Metadata newMd = copy(object.getMetadata()); - newMd.setLastModified(new DateTime()); - byte[] data = toByteArray(object.getData()); - final byte[] eTag = HttpUtils.eTag(data); - newMd.setETag(eTag); - newMd.setContentType(object.getMetadata().getContentType()); - if (options.getAcl() != null) - keyToAcl.put(bucketName + "/" + object.getKey(), options.getAcl()); - bucketToContents.get(bucketName).put(object.getKey(), new S3Object(newMd, data)); - - // Set HTTP headers to match metadata - newMd.getAllHeaders().put(HttpHeaders.LAST_MODIFIED, - dateService.rfc822DateFormat(newMd.getLastModified())); - newMd.getAllHeaders().put(HttpHeaders.ETAG, HttpUtils.toHexString(eTag)); - newMd.getAllHeaders().put(HttpHeaders.CONTENT_TYPE, newMd.getContentType()); - newMd.getAllHeaders().put(HttpHeaders.CONTENT_LENGTH, newMd.getSize() + ""); - for (Entry userMD : newMd.getUserMetadata().entries()) { - newMd.getAllHeaders().put(userMD.getKey(), userMD.getValue()); - } - - return new FutureBase() { - public byte[] get() throws InterruptedException, ExecutionException { - return eTag; - } - }; - } catch (IOException e) { - throw new RuntimeException(e); - } - - } - - DateService dateService = new DateService(); - - public Future getObject(final String bucketName, final String key, - final GetOptions options) { - return new FutureBase() { - public S3Object get() throws InterruptedException, ExecutionException { - if (!bucketToContents.containsKey(bucketName)) - return S3Object.NOT_FOUND; - Map realContents = bucketToContents.get(bucketName); - if (!realContents.containsKey(key)) - return S3Object.NOT_FOUND; - - S3Object object = realContents.get(key); - - if (options.getIfMatch() != null) { - if (!Arrays.equals(object.getMetadata().getETag(), HttpUtils.fromHexString(options - .getIfMatch().replaceAll("\"", "")))) - throwResponseException(412); - } - if (options.getIfNoneMatch() != null) { - if (Arrays.equals(object.getMetadata().getETag(), HttpUtils.fromHexString(options - .getIfNoneMatch().replaceAll("\"", "")))) - throwResponseException(304); - } - if (options.getIfModifiedSince() != null) { - DateTime modifiedSince = dateService.rfc822DateParse(options.getIfModifiedSince()); - if (object.getMetadata().getLastModified().isBefore(modifiedSince)) - throw new ExecutionException(new RuntimeException(String.format( - "%1$s is before %2$s", object.getMetadata().getLastModified(), - modifiedSince))); - - } - if (options.getIfUnmodifiedSince() != null) { - DateTime unmodifiedSince = dateService.rfc822DateParse(options - .getIfUnmodifiedSince()); - if (object.getMetadata().getLastModified().isAfter(unmodifiedSince)) - throw new ExecutionException(new RuntimeException(String.format( - "%1$s is after %2$s", object.getMetadata().getLastModified(), - unmodifiedSince))); - } - S3Object returnVal = new S3Object(copy(object.getMetadata()), object.getData()); - if (options.getRange() != null) { - byte[] data = (byte[]) returnVal.getData(); - ByteArrayOutputStream out = new ByteArrayOutputStream(); - for (String s : options.getRange().replaceAll("bytes=", "").split(",")) { - if (s.startsWith("-")) { - int length = Integer.parseInt(s.replaceAll("\\-", "")); - out.write(data, data.length - length, length); - } else if (s.endsWith("-")) { - int offset = Integer.parseInt(s.replaceAll("\\-", "")); - out.write(data, offset, data.length - offset); - } else if (s.contains("-")) { - String[] firstLast = s.split("\\-"); - int offset = Integer.parseInt(firstLast[0]); - int last = Integer.parseInt(firstLast[1]); - int length = (last < data.length) ? last + 1 : data.length - offset; - - out.write(data, offset, length); - } else { - throw new IllegalArgumentException("first and last were null!"); - } - - } - returnVal.setData(out.toByteArray()); - returnVal.setContentLength(out.size()); - returnVal.getMetadata().setSize(data.length); - } - returnVal.setData(new ByteArrayInputStream((byte[]) returnVal.getData())); - return returnVal; - } - }; - } - - protected AccessControlList getACLforS3Item(String bucketAndObjectKey) { - AccessControlList acl = null; - Object aclObj = keyToAcl.get(bucketAndObjectKey); - if (aclObj instanceof AccessControlList) { - acl = (AccessControlList) aclObj; - } else if (aclObj instanceof CannedAccessPolicy) { - acl = AccessControlList.fromCannedAccessPolicy((CannedAccessPolicy) aclObj, - DEFAULT_OWNER_ID); - } else if (aclObj == null) { - // Default to private access policy - acl = AccessControlList.fromCannedAccessPolicy(CannedAccessPolicy.PRIVATE, - DEFAULT_OWNER_ID); - } - return acl; - } - - public Future getBucketACL(final String bucket) { - return new FutureBase() { - public AccessControlList get() throws InterruptedException, ExecutionException { - return getACLforS3Item(bucket); - } - }; - } - - public Future getObjectACL(final String bucket, final String objectKey) { - return new FutureBase() { - public AccessControlList get() throws InterruptedException, ExecutionException { - return getACLforS3Item(bucket + "/" + objectKey); - } - }; - } - - /** - * Replace any AmazonCustomerByEmail grantees with a somewhat-arbitrary canonical user grantee, - * to match S3 which substitutes each email address grantee with that user's corresponding ID. In - * short, although you can PUT email address grantees, these are actually subsequently returned - * by S3 as canonical user grantees. - * - * @param acl - * @return - */ - protected AccessControlList sanitizeUploadedACL(AccessControlList acl) { - // Replace any email address grantees with canonical user grantees, using - // the acl's owner ID as the surrogate replacement. - for (Grant grant : acl.getGrants()) { - if (grant.getGrantee() instanceof EmailAddressGrantee) { - EmailAddressGrantee emailGrantee = (EmailAddressGrantee) grant.getGrantee(); - String id = emailGrantee.getEmailAddress().equals(TEST_ACL_EMAIL) ? TEST_ACL_ID : acl - .getOwner().getId(); - grant.setGrantee(new CanonicalUserGrantee(id, acl.getOwner().getDisplayName())); - } - } - return acl; - } - - public Future putBucketACL(final String bucket, final AccessControlList acl) { - return new FutureBase() { - public Boolean get() throws InterruptedException, ExecutionException { - keyToAcl.put(bucket, sanitizeUploadedACL(acl)); - return true; - } - }; - } - - public Future putObjectACL(final String bucket, final String objectKey, - final AccessControlList acl) { - return new FutureBase() { - public Boolean get() throws InterruptedException, ExecutionException { - keyToAcl.put(bucket + "/" + objectKey, sanitizeUploadedACL(acl)); - return true; - } - }; - } - -} diff --git a/aws/s3/core/src/test/java/org/jclouds/aws/s3/options/CopyObjectOptionsTest.java b/aws/s3/core/src/test/java/org/jclouds/aws/s3/options/CopyObjectOptionsTest.java index 4756f466d9..ff3a68f2ca 100644 --- a/aws/s3/core/src/test/java/org/jclouds/aws/s3/options/CopyObjectOptionsTest.java +++ b/aws/s3/core/src/test/java/org/jclouds/aws/s3/options/CopyObjectOptionsTest.java @@ -36,7 +36,6 @@ import static org.testng.Assert.assertTrue; import java.io.UnsupportedEncodingException; import org.jclouds.aws.s3.domain.CannedAccessPolicy; -import org.jclouds.aws.s3.options.CopyObjectOptions; import org.jclouds.aws.s3.reference.S3Headers; import org.jclouds.http.HttpUtils; import org.jclouds.util.DateService; @@ -76,6 +75,8 @@ public class CopyObjectOptionsTest { @Test void testGoodMetaStatic() { CopyObjectOptions options = overrideMetadataWith(goodMeta); + options.setMetadataPrefix("x-amz-meta-"); + assertGoodMeta(options); } @@ -84,16 +85,6 @@ public class CopyObjectOptionsTest { overrideMetadataWith(null); } - @Test(expectedExceptions = IllegalArgumentException.class) - public void testBadMeta() { - overrideMetadataWith(badMeta); - } - - @Test(expectedExceptions = IllegalArgumentException.class) - public void testBadMetaStatic() { - overrideMetadataWith(badMeta); - } - private void assertGoodMeta(CopyObjectOptions options) { assert options != null; assert options.getMetadata() != null; @@ -108,6 +99,7 @@ public class CopyObjectOptionsTest { @Test void testGoodMeta() { CopyObjectOptions options = new CopyObjectOptions(); + options.setMetadataPrefix("x-amz-meta-"); options.overrideMetadataWith(goodMeta); assertGoodMeta(options); } @@ -283,14 +275,18 @@ public class CopyObjectOptionsTest { @Test void testBuildRequestHeadersWhenMetadataNull() throws UnsupportedEncodingException { - assert new CopyObjectOptions().buildRequestHeaders() != null; + CopyObjectOptions options = new CopyObjectOptions(); + options.setMetadataPrefix("x-amz-meta-"); + assert options.buildRequestHeaders() != null; } @Test void testBuildRequestHeaders() throws UnsupportedEncodingException { + CopyObjectOptions options = ifSourceModifiedSince(now).ifSourceETagDoesntMatch(testBytes) + .overrideMetadataWith(goodMeta); + options.setMetadataPrefix("x-amz-meta-"); - Multimap headers = ifSourceModifiedSince(now).ifSourceETagDoesntMatch( - testBytes).overrideMetadataWith(goodMeta).buildRequestHeaders(); + Multimap headers = options.buildRequestHeaders(); assertEquals(headers.get("x-amz-copy-source-if-modified-since").iterator().next(), new DateService().rfc822DateFormat(now)); assertEquals(headers.get("x-amz-copy-source-if-none-match").iterator().next(), "\"" @@ -314,9 +310,11 @@ public class CopyObjectOptionsTest { @Test void testBuildRequestHeadersACL() throws UnsupportedEncodingException { + CopyObjectOptions options = overrideAcl(CannedAccessPolicy.AUTHENTICATED_READ); + options.setMetadataPrefix("x-amz-meta-"); + + Multimap headers = options.buildRequestHeaders(); - Multimap headers = overrideAcl(CannedAccessPolicy.AUTHENTICATED_READ) - .buildRequestHeaders(); assertEquals(headers.get(S3Headers.CANNED_ACL).iterator().next(), CannedAccessPolicy.AUTHENTICATED_READ.toString()); } diff --git a/aws/s3/core/src/test/java/org/jclouds/aws/s3/options/PutBucketOptionsTest.java b/aws/s3/core/src/test/java/org/jclouds/aws/s3/options/PutBucketOptionsTest.java index 6038935482..a2fd9aa271 100644 --- a/aws/s3/core/src/test/java/org/jclouds/aws/s3/options/PutBucketOptionsTest.java +++ b/aws/s3/core/src/test/java/org/jclouds/aws/s3/options/PutBucketOptionsTest.java @@ -29,7 +29,7 @@ import static org.jclouds.aws.s3.options.PutBucketOptions.Builder.createIn; import static org.jclouds.aws.s3.options.PutBucketOptions.Builder.withBucketAcl; import org.jclouds.aws.s3.domain.CannedAccessPolicy; -import org.jclouds.aws.s3.domain.S3Bucket.Metadata.LocationConstraint; +import org.jclouds.aws.s3.domain.BucketMetadata.LocationConstraint; import org.jclouds.aws.s3.options.PutBucketOptions; import org.jclouds.aws.s3.reference.S3Headers; import static org.testng.Assert.assertEquals; diff --git a/aws/s3/core/src/test/java/org/jclouds/aws/s3/commands/S3ParserTest.java b/aws/s3/core/src/test/java/org/jclouds/aws/s3/xml/S3ParserTest.java old mode 100644 new mode 100755 similarity index 62% rename from aws/s3/core/src/test/java/org/jclouds/aws/s3/commands/S3ParserTest.java rename to aws/s3/core/src/test/java/org/jclouds/aws/s3/xml/S3ParserTest.java index 5e28e02d0e..cf81e713a8 --- a/aws/s3/core/src/test/java/org/jclouds/aws/s3/commands/S3ParserTest.java +++ b/aws/s3/core/src/test/java/org/jclouds/aws/s3/xml/S3ParserTest.java @@ -21,7 +21,7 @@ * under the License. * ==================================================================== */ -package org.jclouds.aws.s3.commands; +package org.jclouds.aws.s3.xml; import static org.testng.Assert.assertEquals; @@ -35,9 +35,10 @@ import java.util.concurrent.ExecutorCompletionService; import org.apache.commons.io.IOUtils; import org.jclouds.PerformanceTest; +import org.jclouds.aws.s3.domain.BucketMetadata; import org.jclouds.aws.s3.domain.CanonicalUser; -import org.jclouds.aws.s3.domain.S3Bucket; -import org.jclouds.aws.s3.domain.S3Object; +import org.jclouds.aws.s3.domain.ListBucketResponse; +import org.jclouds.aws.s3.domain.ObjectMetadata; import org.jclouds.aws.s3.xml.S3ParserFactory; import org.jclouds.aws.s3.xml.config.S3ParserModule; import org.jclouds.http.HttpException; @@ -62,7 +63,7 @@ import com.google.inject.Injector; public class S3ParserTest extends PerformanceTest { Injector injector = null; - public static final String listAllMyBucketsResultOn200 = "e1a5f66a480ca99a4fdfe8e318c3020446c9989d7004e7778029fbcc5d990fa0adrianjbosstest2009-03-12T02:00:07.000Zadrianjbosstest22009-03-12T02:00:09.000Z"; + public static final String listAllMyBucketsResultOn200 = "e1a5f66a480ca99a4fdfe8e318c3020446c9989d7004e7778029fbcc5d990fa0adrianjbosstest2009-03-12T02:00:07.000Zadrianjbosstest22009-03-12T02:00:09.000Z"; S3ParserFactory parserFactory = null; @@ -85,7 +86,7 @@ public class S3ParserTest extends PerformanceTest { runParseListAllMyBuckets(); } - private List runParseListAllMyBuckets() throws HttpException { + private List runParseListAllMyBuckets() throws HttpException { return parserFactory.createListBucketsParser().parse( IOUtils.toInputStream(listAllMyBucketsResultOn200)); } @@ -93,11 +94,11 @@ public class S3ParserTest extends PerformanceTest { @Test void testParseListAllMyBucketsParallelResponseTime() throws InterruptedException, ExecutionException { - CompletionService> completer = new ExecutorCompletionService>( + CompletionService> completer = new ExecutorCompletionService>( exec); for (int i = 0; i < LOOP_COUNT; i++) - completer.submit(new Callable>() { - public List call() throws IOException, SAXException, HttpException { + completer.submit(new Callable>() { + public List call() throws IOException, SAXException, HttpException { return runParseListAllMyBuckets(); } }); @@ -107,32 +108,32 @@ public class S3ParserTest extends PerformanceTest { @Test public void testCanParseListAllMyBuckets() throws HttpException { - List s3Buckets = runParseListAllMyBuckets(); - S3Bucket.Metadata bucket1 = s3Buckets.get(0); - assert bucket1.getName().equals("adrianjbosstest"); + List s3Buckets = runParseListAllMyBuckets(); + BucketMetadata container1 = s3Buckets.get(0); + assert container1.getName().equals("adrianjbosstest"); DateTime expectedDate1 = new DateTime("2009-03-12T02:00:07.000Z"); - DateTime date1 = bucket1.getCreationDate(); + DateTime date1 = container1.getCreationDate(); assert date1.equals(expectedDate1); - S3Bucket.Metadata bucket2 = s3Buckets.get(1); - assert bucket2.getName().equals("adrianjbosstest2"); + BucketMetadata container2 = s3Buckets.get(1); + assert container2.getName().equals("adrianjbosstest2"); DateTime expectedDate2 = new DateTime("2009-03-12T02:00:09.000Z"); - DateTime date2 = bucket2.getCreationDate(); + DateTime date2 = container2.getCreationDate(); assert date2.equals(expectedDate2); assert s3Buckets.size() == 2; CanonicalUser owner = new CanonicalUser( "e1a5f66a480ca99a4fdfe8e318c3020446c9989d7004e7778029fbcc5d990fa0"); - assert bucket1.getOwner().equals(owner); - assert bucket2.getOwner().equals(owner); + assert container1.getOwner().equals(owner); + assert container2.getOwner().equals(owner); } - public static final String listBucketResult = "adrianjbosstest1000false33662009-03-12T02:00:13.000Z"9d7bb64e8e18ee34eec06dd2cf37b766"136e1a5f66a480ca99a4fdfe8e318c3020446c9989d7004e7778029fbcc5d990fa0ferncamSTANDARD"; + public static final String listContainerResult = "adrianjbosstest1000false33662009-03-12T02:00:13.000Z"9d7bb64e8e18ee34eec06dd2cf37b766"136e1a5f66a480ca99a4fdfe8e318c3020446c9989d7004e7778029fbcc5d990fa0ferncamSTANDARD"; - public void testCanParseListBucketResult() throws HttpException, UnsupportedEncodingException { - S3Bucket bucket = runParseListBucketResult(); - assert !bucket.isTruncated(); - assert bucket.getName().equals("adrianjbosstest"); - assert bucket.getContents().size() == 1; - S3Object.Metadata object = bucket.getContents().iterator().next(); + public void testCanParseListContainerResult() throws HttpException, UnsupportedEncodingException { + ListBucketResponse container = runParseListContainerResult(); + assert !container.isTruncated(); + assert container.getBucketName().equals("adrianjbosstest"); + assert container.size() == 1; + ObjectMetadata object = container.iterator().next(); assert object.getKey().equals("3366"); DateTime expected = new DateTime("2009-03-12T02:00:13.000Z"); assert object.getLastModified().equals(expected) : String.format( @@ -146,39 +147,40 @@ public class S3ParserTest extends PerformanceTest { assert object.getStorageClass().equals("STANDARD"); } - private S3Bucket runParseListBucketResult() throws HttpException { - ParseSax parser = parserFactory.createListBucketParser(); - return parser.parse(IOUtils.toInputStream(listBucketResult)); + private ListBucketResponse runParseListContainerResult() throws HttpException { + ParseSax parser = parserFactory.createListBucketParser(); + return parser.parse(IOUtils.toInputStream(listContainerResult)); } public static final String successfulCopyObject200 = "2009-03-19T13:23:27.000Z\"92836a3ea45a6984d1b4d23a747d46bb\""; - private S3Object.Metadata runParseCopyObjectResult() throws HttpException { - ParseSax parser = parserFactory.createCopyObjectParser(); + private ObjectMetadata runParseCopyObjectResult() throws HttpException { + ParseSax parser = parserFactory.createCopyObjectParser(); return parser.parse(IOUtils.toInputStream(successfulCopyObject200)); } public void testCanParseCopyObjectResult() throws HttpException, UnsupportedEncodingException { - S3Object.Metadata metadata = runParseCopyObjectResult(); + ObjectMetadata metadata = runParseCopyObjectResult(); DateTime expected = new DateTime("2009-03-19T13:23:27.000Z"); assertEquals(metadata.getLastModified(), expected); assertEquals(HttpUtils.toHexString(metadata.getETag()), "92836a3ea45a6984d1b4d23a747d46bb"); } @Test - void testParseListBucketResultSerialResponseTime() throws HttpException { + void testParseListContainerResultSerialResponseTime() throws HttpException { for (int i = 0; i < LOOP_COUNT; i++) - runParseListBucketResult(); + runParseListContainerResult(); } @Test - void testParseListBucketResultParallelResponseTime() throws InterruptedException, + void testParseListContainerResultParallelResponseTime() throws InterruptedException, ExecutionException { - CompletionService completer = new ExecutorCompletionService(exec); + CompletionService completer = new ExecutorCompletionService( + exec); for (int i = 0; i < LOOP_COUNT; i++) - completer.submit(new Callable() { - public S3Bucket call() throws IOException, SAXException, HttpException { - return runParseListBucketResult(); + completer.submit(new Callable() { + public ListBucketResponse call() throws IOException, SAXException, HttpException { + return runParseListContainerResult(); } }); for (int i = 0; i < LOOP_COUNT; i++) diff --git a/aws/s3/extensions/jets3t/src/main/java/org/jclouds/aws/s3/jets3t/JCloudsS3Service.java b/aws/s3/extensions/jets3t/src/main/java/org/jclouds/aws/s3/jets3t/JCloudsS3Service.java index 606876dd13..c6505c80eb 100644 --- a/aws/s3/extensions/jets3t/src/main/java/org/jclouds/aws/s3/jets3t/JCloudsS3Service.java +++ b/aws/s3/extensions/jets3t/src/main/java/org/jclouds/aws/s3/jets3t/JCloudsS3Service.java @@ -31,9 +31,10 @@ import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; -import org.jclouds.aws.s3.S3Connection; +import org.jclouds.aws.s3.S3BlobStore; import org.jclouds.aws.s3.S3Context; import org.jclouds.aws.s3.S3ContextBuilder; +import org.jclouds.aws.s3.domain.ListBucketResponse; import org.jclouds.aws.s3.options.CopyObjectOptions; import org.jclouds.aws.s3.options.ListBucketOptions; import org.jclouds.aws.s3.options.PutObjectOptions; @@ -62,7 +63,7 @@ public class JCloudsS3Service extends S3Service { private static final long serialVersionUID = 1L; private final S3Context context; - private final S3Connection connection; + private final S3BlobStore connection; private final long requestTimeoutMilliseconds = 10000; @@ -81,7 +82,7 @@ public class JCloudsS3Service extends S3Service { super(awsCredentials); context = S3ContextBuilder.newBuilder(awsCredentials.getAccessKey(), awsCredentials.getSecretKey()).withModules(modules).buildContext(); - connection = context.getConnection(); + connection = context.getApi(); } @Override @@ -102,7 +103,7 @@ public class JCloudsS3Service extends S3Service { try { CopyObjectOptions options = Util.convertCopyObjectOptions(acl, destinationMetadata, ifModifiedSince, ifUnmodifiedSince, ifMatchTags, ifNoneMatchTags); - org.jclouds.aws.s3.domain.S3Object.Metadata jcObjectMetadata = connection.copyObject( + org.jclouds.aws.s3.domain.ObjectMetadata jcObjectMetadata = connection.copyBlob( sourceBucketName, sourceObjectKey, destinationBucketName, destinationObjectKey, options).get(requestTimeoutMilliseconds, TimeUnit.MILLISECONDS); @@ -126,7 +127,7 @@ public class JCloudsS3Service extends S3Service { throw new UnsupportedOperationException("Bucket ACL is not yet supported"); try { - if (connection.putBucketIfNotExists(bucketName).get(requestTimeoutMilliseconds, + if (connection.createContainer(bucketName).get(requestTimeoutMilliseconds, TimeUnit.MILLISECONDS)) { // Bucket created. } @@ -140,12 +141,13 @@ public class JCloudsS3Service extends S3Service { /** * {@inheritDoc} * - * @see S3Connection#deleteBucketIfEmpty(String) + * @see S3BlobStore#deleteContainer(String) */ @Override protected void deleteBucketImpl(String bucketName) throws S3ServiceException { try { - connection.deleteBucketIfEmpty(bucketName); + connection.deleteContainer(bucketName).get(requestTimeoutMilliseconds, + TimeUnit.MILLISECONDS); } catch (Exception e) { Utils. rethrowIfRuntimeOrSameType(e); throw new S3ServiceException("error deleting bucket: " + bucketName, e); @@ -155,12 +157,12 @@ public class JCloudsS3Service extends S3Service { /** * {@inheritDoc} * - * @see S3Connection#deleteObject(String, String) + * @see S3BlobStore#removeBlob(String, String) */ @Override protected void deleteObjectImpl(String bucketName, String objectKey) throws S3ServiceException { try { - connection.deleteObject(bucketName, objectKey).get(requestTimeoutMilliseconds, + connection.removeBlob(bucketName, objectKey).get(requestTimeoutMilliseconds, TimeUnit.MILLISECONDS); } catch (Exception e) { Utils. rethrowIfRuntimeOrSameType(e); @@ -172,7 +174,7 @@ public class JCloudsS3Service extends S3Service { @Override protected AccessControlList getBucketAclImpl(String bucketName) throws S3ServiceException { try { - org.jclouds.aws.s3.domain.AccessControlList jcACL = connection.getBucketACL(bucketName) + org.jclouds.aws.s3.domain.AccessControlList jcACL = connection.getContainerACL(bucketName) .get(requestTimeoutMilliseconds, TimeUnit.MILLISECONDS); return Util.convertAccessControlList(jcACL); } catch (Exception e) { @@ -198,7 +200,7 @@ public class JCloudsS3Service extends S3Service { protected AccessControlList getObjectAclImpl(String bucketName, String objectKey) throws S3ServiceException { try { - org.jclouds.aws.s3.domain.AccessControlList jcACL = connection.getObjectACL(bucketName, + org.jclouds.aws.s3.domain.AccessControlList jcACL = connection.getBlobACL(bucketName, objectKey).get(requestTimeoutMilliseconds, TimeUnit.MILLISECONDS); return Util.convertAccessControlList(jcACL); } catch (Exception e) { @@ -221,7 +223,7 @@ public class JCloudsS3Service extends S3Service { if (ifNoneMatchTags != null) throw new IllegalArgumentException("ifNoneMatchTags"); - return Util.convertObjectHead(connection.headObject(bucketName, objectKey)); + return Util.convertObjectHead(connection.blobMetadata(bucketName, objectKey)); } catch (Exception e) { Utils. rethrowIfRuntimeOrSameType(e); throw new S3ServiceException(String.format("error retrieving object head: %1$s:%2$s", @@ -236,7 +238,8 @@ public class JCloudsS3Service extends S3Service { try { GetOptions options = Util.convertGetObjectOptions(ifModifiedSince, ifUnmodifiedSince, ifMatchTags, ifNoneMatchTags); - return Util.convertObject(connection.getObject(bucketName, objectKey, options).get()); + return Util.convertObject(connection.getBlob(bucketName, objectKey, options).get( + requestTimeoutMilliseconds, TimeUnit.MILLISECONDS)); } catch (Exception e) { Utils. rethrowIfRuntimeOrSameType(e); throw new S3ServiceException(String.format("error retrieving object: %1$s:%2$s", @@ -259,8 +262,7 @@ public class JCloudsS3Service extends S3Service { @Override protected S3Bucket[] listAllBucketsImpl() throws S3ServiceException { try { - List jcBucketList = connection - .listOwnedBuckets(); + List jcBucketList = connection.listContainers(); return Util.convertBuckets(jcBucketList); } catch (Exception e) { Utils. rethrowIfRuntimeOrSameType(e); @@ -275,15 +277,15 @@ public class JCloudsS3Service extends S3Service { try { List jsObjects = new ArrayList(); List commonPrefixes = new ArrayList(); - org.jclouds.aws.s3.domain.S3Bucket jcBucket = null; + ListBucketResponse jcBucket = null; do { ListBucketOptions options = Util.convertListObjectOptions(prefix, priorLastKey, delimiter, maxListingLength); - jcBucket = connection.listBucket(bucketName, options).get(requestTimeoutMilliseconds, + jcBucket = connection.listBlobs(bucketName, options).get(requestTimeoutMilliseconds, TimeUnit.MILLISECONDS); - jsObjects.addAll(Arrays.asList(Util.convertObjectHeads(jcBucket.getContents()))); + jsObjects.addAll(Arrays.asList(Util.convertObjectHeads(jcBucket))); commonPrefixes.addAll(jcBucket.getCommonPrefixes()); if (jcBucket.isTruncated()) { priorLastKey = jsObjects.get(jsObjects.size() - 1).getKey(); @@ -320,7 +322,7 @@ public class JCloudsS3Service extends S3Service { throws S3ServiceException { try { org.jclouds.aws.s3.domain.AccessControlList jcACL = Util.convertAccessControlList(jsACL); - connection.putBucketACL(bucketName, jcACL).get(requestTimeoutMilliseconds, + connection.putContainerACL(bucketName, jcACL).get(requestTimeoutMilliseconds, TimeUnit.MILLISECONDS); } catch (Exception e) { Utils. rethrowIfRuntimeOrSameType(e); @@ -333,7 +335,7 @@ public class JCloudsS3Service extends S3Service { throws S3ServiceException { try { org.jclouds.aws.s3.domain.AccessControlList jcACL = Util.convertAccessControlList(jsACL); - connection.putObjectACL(bucketName, objectKey, jcACL).get(requestTimeoutMilliseconds, + connection.putBlobACL(bucketName, objectKey, jcACL).get(requestTimeoutMilliseconds, TimeUnit.MILLISECONDS); } catch (Exception e) { Utils. rethrowIfRuntimeOrSameType(e); @@ -346,7 +348,7 @@ public class JCloudsS3Service extends S3Service { try { PutObjectOptions options = Util.convertPutObjectOptions(jsObject.getAcl()); org.jclouds.aws.s3.domain.S3Object jcObject = Util.convertObject(jsObject); - byte eTag[] = connection.putObject(bucketName, jcObject, options).get( + byte eTag[] = connection.putBlob(bucketName, jcObject, options).get( requestTimeoutMilliseconds, TimeUnit.MILLISECONDS); jsObject.setMd5Hash(eTag); return jsObject; diff --git a/aws/s3/extensions/jets3t/src/main/java/org/jclouds/aws/s3/jets3t/Util.java b/aws/s3/extensions/jets3t/src/main/java/org/jclouds/aws/s3/jets3t/Util.java index 097bb4f03f..d3f9a6f022 100644 --- a/aws/s3/extensions/jets3t/src/main/java/org/jclouds/aws/s3/jets3t/Util.java +++ b/aws/s3/extensions/jets3t/src/main/java/org/jclouds/aws/s3/jets3t/Util.java @@ -32,17 +32,16 @@ import java.util.Date; import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.Set; import java.util.Map.Entry; import javax.ws.rs.core.MediaType; import org.jclouds.aws.s3.domain.CannedAccessPolicy; import org.jclouds.aws.s3.domain.CanonicalUser; +import org.jclouds.aws.s3.domain.ListBucketResponse; import org.jclouds.aws.s3.options.CopyObjectOptions; import org.jclouds.aws.s3.options.ListBucketOptions; import org.jclouds.aws.s3.options.PutObjectOptions; -import org.jclouds.aws.s3.reference.S3Constants; import org.jclouds.http.HttpUtils; import org.jclouds.http.options.GetOptions; import org.jclouds.util.DateService; @@ -72,7 +71,7 @@ import com.google.common.collect.Multimap; */ public class Util { - public static S3Bucket convertBucket(org.jclouds.aws.s3.domain.S3Bucket.Metadata jcBucketMD) { + public static S3Bucket convertBucket(org.jclouds.aws.s3.domain.BucketMetadata jcBucketMD) { S3Bucket jsBucket = new S3Bucket(jcBucketMD.getName()); if (jcBucketMD.getOwner() != null) { jsBucket.setOwner(new S3Owner(jcBucketMD.getOwner().getId(), jcBucketMD.getOwner() @@ -82,24 +81,23 @@ public class Util { } public static S3Bucket[] convertBuckets( - List jcBucketMDs) { + List jcBucketMDs) { List jsBuckets = new ArrayList(jcBucketMDs.size()); - for (org.jclouds.aws.s3.domain.S3Bucket.Metadata jcBucketMD : jcBucketMDs) { + for (org.jclouds.aws.s3.domain.BucketMetadata jcBucketMD : jcBucketMDs) { jsBuckets.add(convertBucket(jcBucketMD)); } return (S3Bucket[]) jsBuckets.toArray(new S3Bucket[jsBuckets.size()]); } - public static S3Object[] convertObjectHeads( - Set jcObjectMDs) { - List jsObjects = new ArrayList(jcObjectMDs.size()); - for (org.jclouds.aws.s3.domain.S3Object.Metadata jcObjectMD : jcObjectMDs) { + public static S3Object[] convertObjectHeads(ListBucketResponse jcBucket) { + List jsObjects = new ArrayList(jcBucket.size()); + for (org.jclouds.aws.s3.domain.ObjectMetadata jcObjectMD : jcBucket) { jsObjects.add(convertObjectHead(jcObjectMD)); } return (S3Object[]) jsObjects.toArray(new S3Object[jsObjects.size()]); } - public static S3Object convertObjectHead(org.jclouds.aws.s3.domain.S3Object.Metadata jcObjectMD) { + public static S3Object convertObjectHead(org.jclouds.aws.s3.domain.ObjectMetadata jcObjectMD) { S3Object jsObject = new S3Object(jcObjectMD.getKey()); if (jcObjectMD.getOwner() != null) { jsObject.setOwner(new S3Owner(jcObjectMD.getOwner().getId(), jcObjectMD.getOwner() @@ -119,8 +117,8 @@ public class Util { value = dateService.rfc822DateParse(value.toString()).toDate(); } - if (key.startsWith(S3Constants.USER_METADATA_PREFIX)) { - key = key.substring(S3Constants.USER_METADATA_PREFIX.length()); + if (key.startsWith("x-amz-meta-")) { + key = key.substring("x-amz-meta-".length()); } jsObject.addMetadata(key, value); diff --git a/aws/s3/extensions/jets3t/src/test/java/org/jclouds/aws/s3/jets3t/JCloudsS3ServiceIntegrationTest.java b/aws/s3/extensions/jets3t/src/test/java/org/jclouds/aws/s3/jets3t/JCloudsS3ServiceLiveTest.java old mode 100644 new mode 100755 similarity index 81% rename from aws/s3/extensions/jets3t/src/test/java/org/jclouds/aws/s3/jets3t/JCloudsS3ServiceIntegrationTest.java rename to aws/s3/extensions/jets3t/src/test/java/org/jclouds/aws/s3/jets3t/JCloudsS3ServiceLiveTest.java index 8b0019dc86..bfdcea924d --- a/aws/s3/extensions/jets3t/src/test/java/org/jclouds/aws/s3/jets3t/JCloudsS3ServiceIntegrationTest.java +++ b/aws/s3/extensions/jets3t/src/test/java/org/jclouds/aws/s3/jets3t/JCloudsS3ServiceLiveTest.java @@ -44,11 +44,13 @@ import java.util.concurrent.TimeoutException; import javax.ws.rs.core.MediaType; import org.apache.commons.io.IOUtils; -import org.jclouds.aws.s3.S3IntegrationTest; -import org.jclouds.aws.s3.config.StubS3ConnectionModule; +import org.jclouds.aws.s3.S3BlobStore; +import org.jclouds.aws.s3.domain.BucketMetadata; +import org.jclouds.aws.s3.domain.ListBucketResponse; +import org.jclouds.aws.s3.domain.ObjectMetadata; import org.jclouds.aws.s3.domain.AccessControlList.GroupGranteeURI; import org.jclouds.aws.s3.domain.AccessControlList.Permission; -import org.jclouds.aws.s3.reference.S3Constants; +import org.jclouds.blobstore.integration.internal.BaseBlobStoreIntegrationTest; import org.jclouds.http.HttpUtils; import org.jets3t.service.S3ObjectsChunk; import org.jets3t.service.S3Service; @@ -63,7 +65,8 @@ import org.jets3t.service.multithread.S3ServiceEventAdaptor; import org.jets3t.service.multithread.S3ServiceEventListener; import org.jets3t.service.multithread.S3ServiceMulti; import org.jets3t.service.security.AWSCredentials; -import org.testng.annotations.BeforeMethod; +import org.testng.ITestContext; +import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; import com.google.common.base.Predicate; @@ -76,125 +79,119 @@ import com.google.common.collect.Iterators; * @author James Murty * @author Adrian Cole */ -@Test(groups = { "integration", "live" }, testName = "s3.JCloudsS3ServiceIntegrationTest") -public class JCloudsS3ServiceIntegrationTest extends S3IntegrationTest { +@Test(groups = { "live" }, testName = "jets3t.JCloudsS3ServiceIntegrationTest") +public class JCloudsS3ServiceLiveTest + extends + BaseBlobStoreIntegrationTest { AWSCredentials credentials; S3Service service; /** * overridden only to get access to the amazon credentials used for jets3t initialization. - */ - @Override - protected void createLiveS3Context(String AWSAccessKeyId, String AWSSecretAccessKey) { - credentials = new AWSCredentials(AWSAccessKeyId, AWSSecretAccessKey); - super.createLiveS3Context(AWSAccessKeyId, AWSSecretAccessKey); - } - - /** - * initialize a new JCloudsS3Service, but passing JavaUrlHttpCommandExecutorServiceModule(), as - * it is easier to debug in unit tests. * * @throws S3ServiceException */ - @BeforeMethod - public void testJCloudsS3Service() throws S3ServiceException { - service = (credentials != null) ? new JCloudsS3Service(credentials) : new JCloudsS3Service( - new AWSCredentials("foo", "bar"), new StubS3ConnectionModule()); - assert service != null; + @BeforeClass(groups = { "live" }, dependsOnMethods = "setUpResourcesOnThisThread") + protected void createLiveS3Context(ITestContext testContext) throws S3ServiceException { + + String account = System.getProperty("jclouds.test.user"); + String key = System.getProperty("jclouds.test.key"); + + if (account != null) { + credentials = new AWSCredentials(account, key); + service = new JCloudsS3Service(credentials); + } else { + assert false : "credentials not present"; + } } @Test public void testCreateBucketImpl() throws S3ServiceException, InterruptedException, ExecutionException, TimeoutException { - String bucketName = getScratchBucketName(); + String bucketName = getContainerName(); try { S3Bucket bucket = service.createBucket(new S3Bucket(bucketName)); assertEquals(bucket.getName(), bucketName); - assertTrue(client.bucketExists(bucketName)); + assertTrue(client.containerExists(bucketName)); } finally { - returnScratchBucket(bucketName); + returnContainer(bucketName); } } @Test public void testDeleteBucketImpl() throws S3ServiceException, InterruptedException, ExecutionException, TimeoutException { - String bucketName = getScratchBucketName(); + String bucketName = getContainerName(); try { service.deleteBucket(bucketName); - assertFalse(client.bucketExists(bucketName)); + assertFalse(client.containerExists(bucketName)); } finally { - returnScratchBucket(bucketName); + returnContainer(bucketName); } } @Test public void testDeleteObjectImpl() throws InterruptedException, ExecutionException, TimeoutException, S3ServiceException, IOException { - String bucketName = getBucketName(); + String bucketName = getContainerName(); try { String objectKey = "key-testDeleteObjectImpl"; String objectValue = "test"; org.jclouds.aws.s3.domain.S3Object s3Object = new org.jclouds.aws.s3.domain.S3Object( objectKey, objectValue); - addObjectToBucket(bucketName, s3Object); + addBlobToContainer(bucketName, s3Object); service.deleteObject(bucketName, objectKey); - - assertEquals(client.headObject(bucketName, objectKey), - org.jclouds.aws.s3.domain.S3Object.Metadata.NOT_FOUND); } finally { - returnBucket(bucketName); + returnContainer(bucketName); } } @Test public void testGetObjectDetailsImpl() throws InterruptedException, ExecutionException, TimeoutException, S3ServiceException, IOException { - String bucketName = getBucketName(); + String bucketName = getContainerName(); try { - String objectKey = "key-testGetObjectDetailsImpl"; + String objectKey = "key-testGetObjectDetailsImpl".toLowerCase(); String objectValue = "test"; String metadataName = "metadata-name-1"; String metadataValue = "metadata-value-1"; org.jclouds.aws.s3.domain.S3Object s3Object = new org.jclouds.aws.s3.domain.S3Object( objectKey, objectValue); - s3Object.getMetadata().getUserMetadata().put( - S3Constants.USER_METADATA_PREFIX + metadataName, metadataValue); - addObjectToBucket(bucketName, s3Object); + s3Object.getMetadata().getUserMetadata().put("x-amz-meta-" + metadataName, metadataValue); + addBlobToContainer(bucketName, s3Object); S3Object objectDetails = service.getObjectDetails(new S3Bucket(bucketName), objectKey); - assertEquals(objectDetails.getKey(), objectKey); + // TODO null keys from s3object! assertEquals(objectDetails.getKey(), objectKey); assertEquals(objectDetails.getContentLength(), 4); assertNull(objectDetails.getDataInputStream()); assertEquals(objectDetails.getMetadata(metadataName), metadataValue); } finally { - returnBucket(bucketName); + returnContainer(bucketName); } } @Test public void testGetObjectImpl() throws InterruptedException, ExecutionException, TimeoutException, S3ServiceException, IOException { - String bucketName = getBucketName(); + String bucketName = getContainerName(); try { - String objectKey = "key-testGetObjectImpl"; + String objectKey = "key-testGetObjectImpl".toLowerCase(); String objectValue = "test"; String metadataName = "metadata-name-2"; String metadataValue = "metadata-value-2"; org.jclouds.aws.s3.domain.S3Object s3Object = new org.jclouds.aws.s3.domain.S3Object( objectKey, objectValue); - s3Object.getMetadata().getUserMetadata().put( - S3Constants.USER_METADATA_PREFIX + metadataName, metadataValue); - addObjectToBucket(bucketName, s3Object); + s3Object.getMetadata().getUserMetadata().put("x-amz-meta-" + metadataName, metadataValue); + addBlobToContainer(bucketName, s3Object); S3Object object = service.getObject(new S3Bucket(bucketName), objectKey); - assertEquals(object.getKey(), objectKey); + // TODO null keys from s3object! assertEquals(object.getKey(), objectKey); assertNotNull(object.getDataInputStream()); assertEquals(IOUtils.toString(object.getDataInputStream()), objectValue); assertEquals(object.getContentLength(), objectValue.length()); @@ -202,43 +199,43 @@ public class JCloudsS3ServiceIntegrationTest extends S3IntegrationTest { // TODO: Test conditional gets } finally { - returnBucket(bucketName); + returnContainer(bucketName); } } @Test public void testListAllBucketsImpl() throws InterruptedException, ExecutionException, TimeoutException, S3ServiceException { - String bucketName = getBucketName(); + String bucketName = getContainerName(); try { // Ensure there is at least 1 bucket in S3 account to list and compare. S3Bucket[] jsBuckets = service.listAllBuckets(); - List jcBuckets = client.listOwnedBuckets(); + List jcBuckets = client.listContainers(); assert jsBuckets.length == jcBuckets.size(); - Iterator jcBucketsIter = jcBuckets.iterator(); + Iterator jcBucketsIter = jcBuckets.iterator(); for (S3Bucket jsBucket : jsBuckets) { assert jcBucketsIter.hasNext(); - org.jclouds.aws.s3.domain.S3Bucket.Metadata jcBucket = jcBucketsIter.next(); + org.jclouds.aws.s3.domain.BucketMetadata jcBucket = jcBucketsIter.next(); assert jsBucket.getName().equals(jcBucket.getName()); } } finally { - returnBucket(bucketName); + returnContainer(bucketName); } } @Test public void testListObjectsChunkedImpl() throws InterruptedException, ExecutionException, TimeoutException, IOException, S3ServiceException { - String bucketName = getBucketName(); + String bucketName = getContainerName(); try { - addObjectToBucket(bucketName, "item1/subobject2"); - addObjectToBucket(bucketName, "item2"); - addObjectToBucket(bucketName, "object1"); - addObjectToBucket(bucketName, "object2/subobject1"); + addBlobToContainer(bucketName, "item1/subobject2"); + addBlobToContainer(bucketName, "item2"); + addBlobToContainer(bucketName, "object1"); + addBlobToContainer(bucketName, "object2/subobject1"); S3ObjectsChunk chunk; @@ -306,7 +303,7 @@ public class JCloudsS3ServiceIntegrationTest extends S3IntegrationTest { assertEquals(chunk.getPrefix(), "item"); assertNull(chunk.getPriorLastKey()); } finally { - returnBucket(bucketName); + returnContainer(bucketName); } } @@ -315,11 +312,11 @@ public class JCloudsS3ServiceIntegrationTest extends S3IntegrationTest { TimeoutException, IOException, S3ServiceException { String bucketName = null; try { - bucketName = getScratchBucketName(); - addObjectToBucket(bucketName, "item1/subobject2"); - addObjectToBucket(bucketName, "item2"); - addObjectToBucket(bucketName, "object1"); - addObjectToBucket(bucketName, "object2/subobject1"); + bucketName = getContainerName(); + addBlobToContainer(bucketName, "item1/subobject2"); + addBlobToContainer(bucketName, "item2"); + addBlobToContainer(bucketName, "object1"); + addBlobToContainer(bucketName, "object2/subobject1"); S3Object[] objects; @@ -348,14 +345,14 @@ public class JCloudsS3ServiceIntegrationTest extends S3IntegrationTest { assertEquals(objects.length, 1); assertEquals(objects[0].getKey(), "item2"); } finally { - returnBucket(bucketName); + returnContainer(bucketName); } } @Test public void testPutObjectImpl() throws S3ServiceException, InterruptedException, ExecutionException, TimeoutException, NoSuchAlgorithmException, IOException { - String bucketName = getBucketName(); + String bucketName = getContainerName(); try { String objectKey = "putObject"; @@ -365,8 +362,8 @@ public class JCloudsS3ServiceIntegrationTest extends S3IntegrationTest { // Upload empty object requestObject = new S3Object(objectKey); jsResultObject = service.putObject(new S3Bucket(bucketName), requestObject); - jcObject = client.getObject(bucketName, objectKey).get(10, TimeUnit.SECONDS); - assertEquals(jcObject.getKey(), objectKey); + jcObject = client.getBlob(bucketName, objectKey).get(10, TimeUnit.SECONDS); + // TODO null keys from s3object! assertEquals(jcObject.getKey(), objectKey); assertEquals(jcObject.getMetadata().getSize(), 0); assertEquals(jcObject.getMetadata().getContentType(), MediaType.APPLICATION_OCTET_STREAM); assertEquals(jsResultObject.getKey(), requestObject.getKey()); @@ -376,8 +373,8 @@ public class JCloudsS3ServiceIntegrationTest extends S3IntegrationTest { // Upload unicode-named object requestObject = new S3Object("nd-object"); jsResultObject = service.putObject(new S3Bucket(bucketName), requestObject); - jcObject = client.getObject(bucketName, requestObject.getKey()).get(10, TimeUnit.SECONDS); - assertEquals(jcObject.getKey(), requestObject.getKey()); + jcObject = client.getBlob(bucketName, requestObject.getKey()).get(10, TimeUnit.SECONDS); + // TODO null keys from s3object! assertEquals(jcObject.getKey(), requestObject.getKey()); assertEquals(jcObject.getMetadata().getSize(), 0); assertEquals(jcObject.getMetadata().getContentType(), MediaType.APPLICATION_OCTET_STREAM); assertEquals(jsResultObject.getKey(), requestObject.getKey()); @@ -388,7 +385,7 @@ public class JCloudsS3ServiceIntegrationTest extends S3IntegrationTest { String data = "This is my nd data"; requestObject = new S3Object(objectKey, data); jsResultObject = service.putObject(new S3Bucket(bucketName), requestObject); - jcObject = client.getObject(bucketName, objectKey).get(10, TimeUnit.SECONDS); + jcObject = client.getBlob(bucketName, objectKey).get(10, TimeUnit.SECONDS); assertEquals(jcObject.getMetadata().getSize(), data.getBytes("UTF-8").length); assertTrue(jcObject.getMetadata().getContentType().startsWith("text/plain")); assertEquals(jsResultObject.getContentLength(), data.getBytes("UTF-8").length); @@ -396,19 +393,18 @@ public class JCloudsS3ServiceIntegrationTest extends S3IntegrationTest { // Upload object with metadata requestObject = new S3Object(objectKey); - requestObject.addMetadata(S3Constants.USER_METADATA_PREFIX + "my-metadata-1", "value-1"); + requestObject.addMetadata("x-amz-meta-" + "my-metadata-1", "value-1"); jsResultObject = service.putObject(new S3Bucket(bucketName), requestObject); - jcObject = client.getObject(bucketName, objectKey).get(10, TimeUnit.SECONDS); + jcObject = client.getBlob(bucketName, objectKey).get(10, TimeUnit.SECONDS); assertEquals(Iterables.getLast(jcObject.getMetadata().getUserMetadata().get( - S3Constants.USER_METADATA_PREFIX + "my-metadata-1")), "value-1"); - assertEquals(jsResultObject - .getMetadata(S3Constants.USER_METADATA_PREFIX + "my-metadata-1"), "value-1"); + "my-metadata-1")), "value-1"); + assertEquals(jsResultObject.getMetadata("x-amz-meta-" + "my-metadata-1"), "value-1"); // Upload object with canned public-read ACL requestObject = new S3Object(objectKey); requestObject.setAcl(AccessControlList.REST_CANNED_PUBLIC_READ); jsResultObject = service.putObject(new S3Bucket(bucketName), requestObject); - org.jclouds.aws.s3.domain.AccessControlList jcACL = client.getObjectACL(bucketName, + org.jclouds.aws.s3.domain.AccessControlList jcACL = client.getBlobACL(bucketName, objectKey).get(10, TimeUnit.SECONDS); assertTrue(jcACL.hasPermission(GroupGranteeURI.ALL_USERS, Permission.READ)); assertTrue(jcACL.hasPermission(jcACL.getOwner().getId(), Permission.FULL_CONTROL)); @@ -424,12 +420,12 @@ public class JCloudsS3ServiceIntegrationTest extends S3IntegrationTest { data = "Here is some dt for you"; requestObject.setDataInputStream(new ByteArrayInputStream(data.getBytes("UTF-8"))); jsResultObject = service.putObject(new S3Bucket(bucketName), requestObject); - jcObject = client.getObject(bucketName, objectKey).get(10, TimeUnit.SECONDS); + jcObject = client.getBlob(bucketName, objectKey).get(10, TimeUnit.SECONDS); assertTrue(jsResultObject.verifyData(data.getBytes("UTF-8"))); assertEquals(jsResultObject.getMd5HashAsHex(), HttpUtils.toHexString(jcObject .getMetadata().getETag())); } finally { - returnBucket(bucketName); + returnContainer(bucketName); } } @@ -437,7 +433,7 @@ public class JCloudsS3ServiceIntegrationTest extends S3IntegrationTest { @SuppressWarnings("unchecked") public void testCopyObjectImpl() throws InterruptedException, ExecutionException, TimeoutException, IOException, S3ServiceException { - String bucketName = getBucketName(); + String bucketName = getContainerName(); try { String data = "This is my data"; String sourceObjectKey = "riginalObject"; // Notice the use of non-ASCII @@ -448,9 +444,9 @@ public class JCloudsS3ServiceIntegrationTest extends S3IntegrationTest { org.jclouds.aws.s3.domain.S3Object sourceObject = new org.jclouds.aws.s3.domain.S3Object( sourceObjectKey, data); - sourceObject.getMetadata().getUserMetadata().put( - S3Constants.USER_METADATA_PREFIX + metadataName, sourceMetadataValue); - addObjectToBucket(bucketName, sourceObject); + sourceObject.getMetadata().getUserMetadata().put("x-amz-meta-" + metadataName, + sourceMetadataValue); + addBlobToContainer(bucketName, sourceObject); S3Object destinationObject; Map copyResult; @@ -460,33 +456,32 @@ public class JCloudsS3ServiceIntegrationTest extends S3IntegrationTest { destinationObject = new S3Object(destinationObjectKey); copyResult = service.copyObject(bucketName, sourceObjectKey, bucketName, destinationObject, false); - jcDestinationObject = client.getObject(bucketName, destinationObject.getKey()).get(10, + jcDestinationObject = client.getBlob(bucketName, destinationObject.getKey()).get(10, TimeUnit.SECONDS); - assertEquals(jcDestinationObject.getKey(), destinationObjectKey); + // TODO null keys from s3object! assertEquals(jcDestinationObject.getKey(), + // destinationObjectKey); assertEquals(Iterators.getLast(jcDestinationObject.getMetadata().getUserMetadata().get( - S3Constants.USER_METADATA_PREFIX + metadataName).iterator()), sourceMetadataValue); + metadataName).iterator()), sourceMetadataValue); assertEquals(copyResult.get("ETag"), HttpUtils.toHexString(jcDestinationObject .getMetadata().getETag())); // Test destination ACL is unchanged (ie private) - org.jclouds.aws.s3.domain.AccessControlList jcACL = client.getObjectACL(bucketName, + org.jclouds.aws.s3.domain.AccessControlList jcACL = client.getBlobACL(bucketName, destinationObject.getKey()).get(10, TimeUnit.SECONDS); assertEquals(jcACL.getGrants().size(), 1); assertTrue(jcACL.hasPermission(jcACL.getOwner().getId(), Permission.FULL_CONTROL)); // Copy with metadata replaced destinationObject = new S3Object(destinationObjectKey); - destinationObject.addMetadata(S3Constants.USER_METADATA_PREFIX + metadataName, - destinationMetadataValue); + destinationObject.addMetadata("x-amz-meta-" + metadataName, destinationMetadataValue); copyResult = service.copyObject(bucketName, sourceObjectKey, bucketName, destinationObject, true); - jcDestinationObject = client.getObject(bucketName, destinationObject.getKey()).get(10, + jcDestinationObject = client.getBlob(bucketName, destinationObject.getKey()).get(10, TimeUnit.SECONDS); assertEquals(Iterators.getLast(jcDestinationObject.getMetadata().getUserMetadata().get( - S3Constants.USER_METADATA_PREFIX + metadataName).iterator()), - destinationMetadataValue); + metadataName).iterator()), destinationMetadataValue); // Test destination ACL is unchanged (ie private) - jcACL = client.getObjectACL(bucketName, destinationObject.getKey()).get(10, - TimeUnit.SECONDS); + jcACL = client.getBlobACL(bucketName, destinationObject.getKey()) + .get(10, TimeUnit.SECONDS); assertEquals(jcACL.getGrants().size(), 1); assertTrue(jcACL.hasPermission(jcACL.getOwner().getId(), Permission.FULL_CONTROL)); @@ -496,14 +491,14 @@ public class JCloudsS3ServiceIntegrationTest extends S3IntegrationTest { copyResult = service.copyObject(bucketName, sourceObjectKey, bucketName, destinationObject, false); // Test destination ACL is changed (ie public-read) - jcACL = client.getObjectACL(bucketName, destinationObject.getKey()).get(10, - TimeUnit.SECONDS); + jcACL = client.getBlobACL(bucketName, destinationObject.getKey()) + .get(10, TimeUnit.SECONDS); assertEquals(jcACL.getGrants().size(), 2); assertTrue(jcACL.hasPermission(jcACL.getOwner().getId(), Permission.FULL_CONTROL)); assertTrue(jcACL.hasPermission(GroupGranteeURI.ALL_USERS, Permission.READ)); } finally { - returnBucket(bucketName); + returnContainer(bucketName); } } @@ -511,7 +506,7 @@ public class JCloudsS3ServiceIntegrationTest extends S3IntegrationTest { @SuppressWarnings("unchecked") public void testPutAndGetBucketAclImpl() throws InterruptedException, ExecutionException, TimeoutException, S3ServiceException { - String bucketName = getScratchBucketName(); + String bucketName = getContainerName(); try { S3Bucket bucket = new S3Bucket(bucketName); AccessControlList acl = null; @@ -563,7 +558,8 @@ public class JCloudsS3ServiceIntegrationTest extends S3IntegrationTest { }); assertEquals(gap.getPermission(), org.jets3t.service.acl.Permission.PERMISSION_READ_ACP); } finally { - returnScratchBucket(bucketName); + // need to delete this container as we've modified its acls + destroyContainer(bucketName); } } @@ -571,7 +567,7 @@ public class JCloudsS3ServiceIntegrationTest extends S3IntegrationTest { @SuppressWarnings("unchecked") public void testGetAndPutObjectAclImpl() throws InterruptedException, ExecutionException, TimeoutException, S3ServiceException, NoSuchAlgorithmException, IOException { - String bucketName = getBucketName(); + String bucketName = getContainerName(); try { S3Bucket bucket = new S3Bucket(bucketName); S3Object object = new S3Object("testGetAndPutObjectAclImpl", "my data"); @@ -627,7 +623,7 @@ public class JCloudsS3ServiceIntegrationTest extends S3IntegrationTest { }); assertEquals(gap.getPermission(), org.jets3t.service.acl.Permission.PERMISSION_READ_ACP); } finally { - returnBucket(bucketName); + returnContainer(bucketName); } } @@ -639,7 +635,7 @@ public class JCloudsS3ServiceIntegrationTest extends S3IntegrationTest { byte[] dataBuffer = new byte[OBJECT_SIZE]; - String bucketName = getBucketName(); + String bucketName = getContainerName(); try { S3Bucket bucket = new S3Bucket(bucketName); S3Object[] objects = new S3Object[OBJECT_COUNT]; @@ -675,12 +671,11 @@ public class JCloudsS3ServiceIntegrationTest extends S3IntegrationTest { multiService.putObjects(bucket, objects); assertEquals(countOfUploadCompletions[0], OBJECT_COUNT); - org.jclouds.aws.s3.domain.S3Bucket theBucket = client.listBucket(bucketName).get(10, - TimeUnit.SECONDS); - assertEquals(theBucket.getSize(), OBJECT_COUNT); + ListBucketResponse theBucket = client.listBlobs(bucketName).get(10, TimeUnit.SECONDS); + assertEquals(theBucket.size(), OBJECT_COUNT); } finally { - returnBucket(bucketName); + returnContainer(bucketName); } } diff --git a/aws/s3/perftest/pom.xml b/aws/s3/perftest/pom.xml index 27dd8d0700..da2c0c02a7 100644 --- a/aws/s3/perftest/pom.xml +++ b/aws/s3/perftest/pom.xml @@ -126,9 +126,21 @@ org.apache.maven.plugins maven-surefire-plugin - - classes - + + + integration + integration-test + + test + + + + pertest + classes + 1 + + + diff --git a/aws/s3/perftest/src/test/java/com/amazon/s3/S3ParserTest.java b/aws/s3/perftest/src/test/java/com/amazon/s3/S3ParserTest.java index d7e8cb5473..0848417c9c 100644 --- a/aws/s3/perftest/src/test/java/com/amazon/s3/S3ParserTest.java +++ b/aws/s3/perftest/src/test/java/com/amazon/s3/S3ParserTest.java @@ -43,127 +43,123 @@ import java.util.concurrent.ExecutorCompletionService; * @author Adrian Cole */ @Test(sequential = true, timeOut = 2 * 60 * 1000, testName = "s3.S3ParserTest") -public class S3ParserTest extends org.jclouds.aws.s3.commands.S3ParserTest { +public class S3ParserTest extends org.jclouds.aws.s3.xml.S3ParserTest { - class MockHttpURLConnection extends HttpURLConnection { - private String content; + class MockHttpURLConnection extends HttpURLConnection { + private String content; - @Override - public InputStream getInputStream() throws IOException { - return IOUtils.toInputStream(content); - } + @Override + public InputStream getInputStream() throws IOException { + return IOUtils.toInputStream(content); + } - protected MockHttpURLConnection(String content) { - super(null); - this.content = content; - } + protected MockHttpURLConnection(String content) { + super(null); + this.content = content; + } - public void disconnect() { - } + public void disconnect() { + } - public boolean usingProxy() { - return false; - } + public boolean usingProxy() { + return false; + } - @Override - public int getResponseCode() throws IOException { - return 200; - } + @Override + public int getResponseCode() throws IOException { + return 200; + } - public void connect() throws IOException { - } - } + public void connect() throws IOException { + } + } - @Test - void testAmazonParseListAllMyBucketsSerialResponseTime() throws IOException { - for (int i = 0; i < LOOP_COUNT; i++) - runAmazonParseListAllMyBuckets(); - } + @Test + void testAmazonParseListAllMyBucketsSerialResponseTime() throws IOException { + for (int i = 0; i < LOOP_COUNT; i++) + runAmazonParseListAllMyBuckets(); + } - @Test - void testAmazonParseListAllMyBucketsParallelResponseTime() - throws InterruptedException, ExecutionException { - CompletionService completer = new ExecutorCompletionService( - exec); + @Test + void testAmazonParseListAllMyBucketsParallelResponseTime() throws InterruptedException, + ExecutionException { + CompletionService completer = new ExecutorCompletionService(exec); - for (int i = 0; i < LOOP_COUNT; i++) - completer.submit(new Callable() { - public Boolean call() throws IOException { - runAmazonParseListAllMyBuckets(); - return true; - } - }); - for (int i = 0; i < LOOP_COUNT; i++) - assert completer.take().get(); - } + for (int i = 0; i < LOOP_COUNT; i++) + completer.submit(new Callable() { + public Boolean call() throws IOException { + runAmazonParseListAllMyBuckets(); + return true; + } + }); + for (int i = 0; i < LOOP_COUNT; i++) + assert completer.take().get(); + } - @SuppressWarnings("unchecked") - @Test(enabled = false) - public void testAmazonCanParseListAllMyBuckets() throws IOException { - ListAllMyBucketsResponse response = runAmazonParseListAllMyBuckets(); - List buckets = response.entries; - Bucket bucket1 = (Bucket) buckets.get(0); - assert bucket1.name.equals("adrianjbosstest"); - Date expectedDate1 = new DateTime("2009-03-12T02:00:07.000Z").toDate(); - Date date1 = bucket1.creationDate; - assert date1.toString().equals(expectedDate1.toString()); - Bucket bucket2 = (Bucket) buckets.get(1); - assert bucket2.name.equals("adrianjbosstest2"); - Date expectedDate2 = new DateTime("2009-03-12T02:00:09.000Z").toDate(); - Date date2 = bucket2.creationDate; - assert date2.toString().equals(expectedDate2.toString()); - assert buckets.size() == 2; - } + @SuppressWarnings("unchecked") + @Test(enabled = false) + public void testAmazonCanParseListAllMyBuckets() throws IOException { + ListAllMyBucketsResponse response = runAmazonParseListAllMyBuckets(); + List buckets = response.entries; + Bucket bucket1 = (Bucket) buckets.get(0); + assert bucket1.name.equals("adrianjbosstest"); + Date expectedDate1 = new DateTime("2009-03-12T02:00:07.000Z").toDate(); + Date date1 = bucket1.creationDate; + assert date1.toString().equals(expectedDate1.toString()); + Bucket bucket2 = (Bucket) buckets.get(1); + assert bucket2.name.equals("adrianjbosstest2"); + Date expectedDate2 = new DateTime("2009-03-12T02:00:09.000Z").toDate(); + Date date2 = bucket2.creationDate; + assert date2.toString().equals(expectedDate2.toString()); + assert buckets.size() == 2; + } - private ListAllMyBucketsResponse runAmazonParseListAllMyBuckets() - throws IOException { - ListAllMyBucketsResponse response = new ListAllMyBucketsResponse( - new MockHttpURLConnection(listAllMyBucketsResultOn200)); - return response; - } + private ListAllMyBucketsResponse runAmazonParseListAllMyBuckets() throws IOException { + ListAllMyBucketsResponse response = new ListAllMyBucketsResponse(new MockHttpURLConnection( + listAllMyBucketsResultOn200)); + return response; + } - public void testAmazonCanParseListBucketResult() throws IOException { - ListBucketResponse response = runAmazonParseListBucketResult(); - ListEntry content = (ListEntry) response.entries.get(0); - assert content.key.equals("3366"); - assert content.lastModified.equals(new DateTime( - "2009-03-12T02:00:13.000Z").toDate()); - assert content.eTag.equals("\"9d7bb64e8e18ee34eec06dd2cf37b766\""); - assert content.size == 136; - assert content.owner.id - .equals("e1a5f66a480ca99a4fdfe8e318c3020446c9989d7004e7778029fbcc5d990fa0"); - assert content.owner.displayName.equals("ferncam"); - assert content.storageClass.equals("STANDARD"); - } + @Test(enabled = false) + public void testAmazonCanParseListBucketResult() throws IOException { + ListBucketResponse response = runAmazonParseListBucketResult(); + ListEntry content = (ListEntry) response.entries.get(0); + assert content.key.equals("3366"); + assert content.lastModified.equals(new DateTime("2009-03-12T02:00:13.000Z").toDate()); + assert content.eTag.equals("\"9d7bb64e8e18ee34eec06dd2cf37b766\""); + assert content.size == 136; + assert content.owner.id + .equals("e1a5f66a480ca99a4fdfe8e318c3020446c9989d7004e7778029fbcc5d990fa0"); + assert content.owner.displayName.equals("ferncam"); + assert content.storageClass.equals("STANDARD"); + } - private ListBucketResponse runAmazonParseListBucketResult() - throws IOException { - ListBucketResponse response = new ListBucketResponse( - new MockHttpURLConnection(listBucketResult)); - return response; - } + private ListBucketResponse runAmazonParseListBucketResult() throws IOException { + ListBucketResponse response = new ListBucketResponse(new MockHttpURLConnection( + listAllMyBucketsResultOn200)); + return response; + } - @Test - void testAmazonParseListBucketResultSerialResponseTime() throws IOException { - for (int i = 0; i < LOOP_COUNT; i++) - runAmazonParseListBucketResult(); - } + @Test(enabled = false) + void testAmazonParseListBucketResultSerialResponseTime() throws IOException { + for (int i = 0; i < LOOP_COUNT; i++) + runAmazonParseListBucketResult(); + } - @Test - void testAmazonParseListBucketResultParallelResponseTime() - throws InterruptedException, ExecutionException { - CompletionService completer = new ExecutorCompletionService( - exec); + @Test(enabled = false) + void testAmazonParseListBucketResultParallelResponseTime() throws InterruptedException, + ExecutionException { + CompletionService completer = new ExecutorCompletionService(exec); - for (int i = 0; i < LOOP_COUNT; i++) - completer.submit(new Callable() { - public Boolean call() throws IOException { - runAmazonParseListBucketResult(); - return true; - } - }); - for (int i = 0; i < LOOP_COUNT; i++) - assert completer.take().get(); - } + for (int i = 0; i < LOOP_COUNT; i++) + completer.submit(new Callable() { + public Boolean call() throws IOException { + runAmazonParseListBucketResult(); + return true; + } + }); + for (int i = 0; i < LOOP_COUNT; i++) + assert completer.take().get(); + } } diff --git a/aws/s3/perftest/src/test/java/org/jclouds/aws/s3/AmazonPerformanceLiveTest.java b/aws/s3/perftest/src/test/java/org/jclouds/aws/s3/AmazonPerformanceLiveTest.java index ad4105a43d..588458994c 100644 --- a/aws/s3/perftest/src/test/java/org/jclouds/aws/s3/AmazonPerformanceLiveTest.java +++ b/aws/s3/perftest/src/test/java/org/jclouds/aws/s3/AmazonPerformanceLiveTest.java @@ -23,8 +23,6 @@ */ package org.jclouds.aws.s3; -import static com.google.common.base.Preconditions.checkNotNull; - import java.io.File; import java.io.InputStream; import java.util.Arrays; @@ -33,11 +31,9 @@ import java.util.Map; import java.util.TreeMap; import java.util.concurrent.ExecutionException; -import org.jclouds.aws.s3.reference.S3Constants; import org.jets3t.service.S3ServiceException; +import org.testng.ITestContext; import org.testng.annotations.BeforeClass; -import org.testng.annotations.Optional; -import org.testng.annotations.Parameters; import org.testng.annotations.Test; import com.amazon.s3.AWSAuthConnection; @@ -47,18 +43,18 @@ import com.amazon.s3.AWSAuthConnection; * * @author Adrian Cole */ -@Test(sequential = true, timeOut = 2 * 60 * 1000, testName = "s3.AmazonPerformanceLiveTest", groups = { "live" }) -public class AmazonPerformanceLiveTest extends BasePerformance { +@Test(sequential = true, timeOut = 2 * 60 * 1000, testName = "perftest.AmazonPerformanceLiveTest", groups = { "live" }) +public class AmazonPerformanceLiveTest extends BasePerformanceLiveTest { private AWSAuthConnection amzClient; - @BeforeClass(inheritGroups = false, groups = { "live" }) - @Parameters( { S3Constants.PROPERTY_AWS_ACCESSKEYID, S3Constants.PROPERTY_AWS_SECRETACCESSKEY }) - public void setUpAmazon(@Optional String AWSAccessKeyId, @Optional String AWSSecretAccessKey) - throws S3ServiceException { - AWSAccessKeyId = AWSAccessKeyId != null ? AWSAccessKeyId : sysAWSAccessKeyId; - AWSSecretAccessKey = AWSSecretAccessKey != null ? AWSSecretAccessKey : sysAWSSecretAccessKey; - amzClient = new AWSAuthConnection(checkNotNull(AWSAccessKeyId, "AWSAccessKeyId"), - checkNotNull(AWSSecretAccessKey, "AWSSecretAccessKey"), false); + @BeforeClass(groups = { "live" }, dependsOnMethods = "setUpResourcesOnThisThread") + protected void createLiveS3Context(ITestContext testContext) throws S3ServiceException { + if (testContext.getAttribute("jclouds.test.user") != null) { + amzClient = new AWSAuthConnection((String) testContext.getAttribute("jclouds.test.user"), + (String) testContext.getAttribute("jclouds.test.key"), false); + } else { + throw new RuntimeException("not configured properly"); + } } @Override diff --git a/aws/s3/perftest/src/test/java/org/jclouds/aws/s3/BaseJCloudsPerformance.java b/aws/s3/perftest/src/test/java/org/jclouds/aws/s3/BaseJCloudsPerformanceLiveTest.java similarity index 88% rename from aws/s3/perftest/src/test/java/org/jclouds/aws/s3/BaseJCloudsPerformance.java rename to aws/s3/perftest/src/test/java/org/jclouds/aws/s3/BaseJCloudsPerformanceLiveTest.java index 643e4e9a5a..19a2e6ae63 100644 --- a/aws/s3/perftest/src/test/java/org/jclouds/aws/s3/BaseJCloudsPerformance.java +++ b/aws/s3/perftest/src/test/java/org/jclouds/aws/s3/BaseJCloudsPerformanceLiveTest.java @@ -32,7 +32,7 @@ import java.util.concurrent.TimeUnit; * * @author Adrian Cole */ -public abstract class BaseJCloudsPerformance extends BasePerformance { +public abstract class BaseJCloudsPerformanceLiveTest extends BasePerformanceLiveTest { // boolean get // ( // int id) throws Exception { @@ -57,7 +57,7 @@ public abstract class BaseJCloudsPerformance extends BasePerformance { org.jclouds.aws.s3.domain.S3Object object = new org.jclouds.aws.s3.domain.S3Object(key); object.getMetadata().setContentType(contentType); object.setData(data); - return client.putObject(bucket, object).get(120, TimeUnit.SECONDS) != null; + return client.putBlob(bucket, object).get(120, TimeUnit.SECONDS) != null; } @Override @@ -66,7 +66,7 @@ public abstract class BaseJCloudsPerformance extends BasePerformance { org.jclouds.aws.s3.domain.S3Object object = new org.jclouds.aws.s3.domain.S3Object(key); object.getMetadata().setContentType(contentType); object.setData(data); - return client.putObject(bucket, object).get(120, TimeUnit.SECONDS) != null; + return client.putBlob(bucket, object).get(120, TimeUnit.SECONDS) != null; } @Override @@ -76,7 +76,7 @@ public abstract class BaseJCloudsPerformance extends BasePerformance { object.getMetadata().setContentType(contentType); object.setData(data); object.getMetadata().setSize(data.available()); - return client.putObject(bucket, object).get(120, TimeUnit.SECONDS) != null; + return client.putBlob(bucket, object).get(120, TimeUnit.SECONDS) != null; } @Override @@ -85,6 +85,6 @@ public abstract class BaseJCloudsPerformance extends BasePerformance { org.jclouds.aws.s3.domain.S3Object object = new org.jclouds.aws.s3.domain.S3Object(key); object.getMetadata().setContentType(contentType); object.setData(data); - return client.putObject(bucket, object).get(120, TimeUnit.SECONDS) != null; + return client.putBlob(bucket, object).get(120, TimeUnit.SECONDS) != null; } } diff --git a/aws/s3/perftest/src/test/java/org/jclouds/aws/s3/BasePerformance.java b/aws/s3/perftest/src/test/java/org/jclouds/aws/s3/BasePerformanceLiveTest.java old mode 100644 new mode 100755 similarity index 76% rename from aws/s3/perftest/src/test/java/org/jclouds/aws/s3/BasePerformance.java rename to aws/s3/perftest/src/test/java/org/jclouds/aws/s3/BasePerformanceLiveTest.java index d16ea368ef..d0e8360994 --- a/aws/s3/perftest/src/test/java/org/jclouds/aws/s3/BasePerformance.java +++ b/aws/s3/perftest/src/test/java/org/jclouds/aws/s3/BasePerformanceLiveTest.java @@ -23,6 +23,8 @@ */ package org.jclouds.aws.s3; +import static org.jclouds.aws.s3.options.PutBucketOptions.Builder.createIn; + import java.io.ByteArrayInputStream; import java.io.File; import java.io.InputStream; @@ -36,8 +38,13 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicInteger; -import org.testng.annotations.AfterGroups; -import org.testng.annotations.BeforeGroups; +import org.jclouds.aws.s3.domain.BucketMetadata; +import org.jclouds.aws.s3.domain.ObjectMetadata; +import org.jclouds.aws.s3.domain.S3Object; +import org.jclouds.aws.s3.domain.BucketMetadata.LocationConstraint; +import org.jclouds.blobstore.integration.internal.BaseBlobStoreIntegrationTest; +import org.testng.annotations.AfterClass; +import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; import com.google.inject.Provider; @@ -47,127 +54,144 @@ import com.google.inject.Provider; * * @author Adrian Cole */ -@Test(groups = { "live" }, testName = "s3.S3Performance") -public abstract class BasePerformance extends S3IntegrationTest { +public abstract class BasePerformanceLiveTest extends + BaseBlobStoreIntegrationTest { protected int timeoutSeconds = 10; protected int loopCount = 100; protected ExecutorService exec; protected CompletionService completer; - @BeforeGroups(groups = { "live" }) + @BeforeClass(groups = { "live" }, dependsOnMethods = "setUpResourcesOnThisThread") public void setUpCallables() throws InterruptedException, ExecutionException, TimeoutException { exec = Executors.newCachedThreadPool(); completer = new ExecutorCompletionService(exec); } - @AfterGroups(groups = { "live" }) + @AfterClass(groups = { "live" }) public void tearDownExecutor() throws Exception { exec.shutdownNow(); exec = null; } - @Test + // too slow... + @Test(enabled = false) public void testPutBytesSerialEU() throws Exception { - String euBucketName = createScratchBucketInEU(); + String euContainerName = createScratchContainerInEU(); try { - doSerial(new PutBytesCallable(euBucketName), loopCount); + doSerial(new PutBytesCallable(euContainerName), loopCount); } finally { - returnBucket(euBucketName); + destroyContainer(euContainerName); } } - @Test + /** + * using scratch containerName as we are changing location + * + * @throws TimeoutException + * @throws ExecutionException + * @throws InterruptedException + */ + protected String createScratchContainerInEU() throws InterruptedException, ExecutionException, + TimeoutException { + String containerName = getScratchContainerName(); + client.createContainer(containerName, createIn(LocationConstraint.EU)).get(30, + TimeUnit.SECONDS); + return containerName; + } + + // too slow... + @Test(enabled = false) public void testPutBytesParallelEU() throws InterruptedException, ExecutionException, TimeoutException { - String euBucketName = createScratchBucketInEU(); + String euContainerName = createScratchContainerInEU(); try { - doParallel(new PutBytesCallable(euBucketName), loopCount); + doParallel(new PutBytesCallable(euContainerName), loopCount); } finally { - returnBucket(euBucketName); + destroyContainer(euContainerName); } } @Test public void testPutBytesSerial() throws Exception { - String bucketName = getBucketName(); + String bucketName = getContainerName(); try { doSerial(new PutBytesCallable(bucketName), loopCount / 10); } finally { - returnBucket(bucketName); + returnContainer(bucketName); } } @Test public void testPutBytesParallel() throws InterruptedException, ExecutionException, TimeoutException { - String bucketName = getBucketName(); + String bucketName = getContainerName(); try { doParallel(new PutBytesCallable(bucketName), loopCount); } finally { - returnBucket(bucketName); + returnContainer(bucketName); } } @Test public void testPutFileSerial() throws Exception { - String bucketName = getBucketName(); + String bucketName = getContainerName(); try { doSerial(new PutFileCallable(bucketName), loopCount / 10); } finally { - returnBucket(bucketName); + returnContainer(bucketName); } } @Test public void testPutFileParallel() throws InterruptedException, ExecutionException, TimeoutException { - String bucketName = getBucketName(); + String bucketName = getContainerName(); try { doParallel(new PutFileCallable(bucketName), loopCount); } finally { - returnBucket(bucketName); + returnContainer(bucketName); } } @Test public void testPutInputStreamSerial() throws Exception { - String bucketName = getBucketName(); + String bucketName = getContainerName(); try { doSerial(new PutInputStreamCallable(bucketName), loopCount / 10); } finally { - returnBucket(bucketName); + returnContainer(bucketName); } } @Test public void testPutInputStreamParallel() throws InterruptedException, ExecutionException, TimeoutException { - String bucketName = getBucketName(); + String bucketName = getContainerName(); try { doParallel(new PutInputStreamCallable(bucketName), loopCount); } finally { - returnBucket(bucketName); + returnContainer(bucketName); } } @Test public void testPutStringSerial() throws Exception { - String bucketName = getBucketName(); + String bucketName = getContainerName(); try { doSerial(new PutStringCallable(bucketName), loopCount / 10); } finally { - returnBucket(bucketName); + returnContainer(bucketName); } } @Test public void testPutStringParallel() throws InterruptedException, ExecutionException, TimeoutException { - String bucketName = getBucketName(); + String bucketName = getContainerName(); try { doParallel(new PutStringCallable(bucketName), loopCount); } finally { - returnBucket(bucketName); + returnContainer(bucketName); } } diff --git a/aws/s3/perftest/src/test/java/org/jclouds/aws/s3/JCloudsGaePerformanceLiveTest.java b/aws/s3/perftest/src/test/java/org/jclouds/aws/s3/JCloudsGaePerformanceLiveTest.java index 7f56b0de2f..759580d852 100644 --- a/aws/s3/perftest/src/test/java/org/jclouds/aws/s3/JCloudsGaePerformanceLiveTest.java +++ b/aws/s3/perftest/src/test/java/org/jclouds/aws/s3/JCloudsGaePerformanceLiveTest.java @@ -25,12 +25,14 @@ package org.jclouds.aws.s3; import java.io.File; import java.io.InputStream; +import java.util.Map; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeoutException; import org.jclouds.gae.config.GaeHttpCommandExecutorServiceModule; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; +import org.testng.v6.Maps; import com.google.appengine.tools.development.ApiProxyLocalImpl; import com.google.apphosting.api.ApiProxy; @@ -42,8 +44,8 @@ import com.google.inject.Module; * * @author Adrian Cole */ -@Test(enabled = false, sequential = true, testName = "s3.JCloudsGaePerformanceLiveTest", groups = { "disabled" }) -public class JCloudsGaePerformanceLiveTest extends BaseJCloudsPerformance { +@Test(enabled = false, sequential = true, testName = "perftest.JCloudsGaePerformanceLiveTest", groups = { "disabled" }) +public class JCloudsGaePerformanceLiveTest extends BaseJCloudsPerformanceLiveTest { @Override @Test(enabled = false) @@ -146,12 +148,6 @@ public class JCloudsGaePerformanceLiveTest extends BaseJCloudsPerformance { return super.putString(bucket, key, data, contentType); } - @Override - protected void deleteEverything() throws Exception { - setupApiProxy(); - super.deleteEverything(); - } - @BeforeMethod void setupApiProxy() { ApiProxy.setEnvironmentForCurrentThread(new TestEnvironment()); @@ -194,6 +190,10 @@ public class JCloudsGaePerformanceLiveTest extends BaseJCloudsPerformance { public boolean isAdmin() { return false; } + + public Map getAttributes() { + return Maps.newHashMap(); + } } @Override diff --git a/aws/s3/perftest/src/test/java/org/jclouds/aws/s3/JCloudsNioPerformanceLiveTest.java b/aws/s3/perftest/src/test/java/org/jclouds/aws/s3/JCloudsNioPerformanceLiveTest.java index 06b15f3503..37400ece0e 100644 --- a/aws/s3/perftest/src/test/java/org/jclouds/aws/s3/JCloudsNioPerformanceLiveTest.java +++ b/aws/s3/perftest/src/test/java/org/jclouds/aws/s3/JCloudsNioPerformanceLiveTest.java @@ -28,8 +28,8 @@ import org.testng.annotations.Test; import com.google.inject.Module; -@Test(sequential = true, testName = "s3.JCloudsNioPerformanceLiveTest", groups = { "live" }) -public class JCloudsNioPerformanceLiveTest extends BaseJCloudsPerformance { +@Test(sequential = true, testName = "perftest.JCloudsNioPerformanceLiveTest", groups = { "live" }) +public class JCloudsNioPerformanceLiveTest extends BaseJCloudsPerformanceLiveTest { @Override protected Module createHttpModule() { diff --git a/aws/s3/perftest/src/test/java/org/jclouds/aws/s3/JCloudsPerformanceLiveTest.java b/aws/s3/perftest/src/test/java/org/jclouds/aws/s3/JCloudsPerformanceLiveTest.java index b8be780c01..237dfc5ee9 100644 --- a/aws/s3/perftest/src/test/java/org/jclouds/aws/s3/JCloudsPerformanceLiveTest.java +++ b/aws/s3/perftest/src/test/java/org/jclouds/aws/s3/JCloudsPerformanceLiveTest.java @@ -22,15 +22,21 @@ * ==================================================================== */ package org.jclouds.aws.s3; +import org.jclouds.http.config.JavaUrlHttpCommandExecutorServiceModule; import org.testng.annotations.Test; +import com.google.inject.Module; + /** * Tests the default JClouds client. * * @author Adrian Cole * */ -@Test(sequential = true, timeOut = 2 * 60 * 1000, testName = "s3.JCloudsPerformanceLiveTest", groups = {"live"}) -public class JCloudsPerformanceLiveTest extends BaseJCloudsPerformance { - +@Test(sequential = true, timeOut = 2 * 60 * 1000, testName = "perftest.JCloudsPerformanceLiveTest", groups = { "live" }) +public class JCloudsPerformanceLiveTest extends BaseJCloudsPerformanceLiveTest { + @Override + protected Module createHttpModule() { + return new JavaUrlHttpCommandExecutorServiceModule(); + } } \ No newline at end of file diff --git a/aws/s3/perftest/src/test/java/org/jclouds/aws/s3/Jets3tPerformanceLiveTest.java b/aws/s3/perftest/src/test/java/org/jclouds/aws/s3/Jets3tPerformanceLiveTest.java index 645f5d3e7a..7928907405 100644 --- a/aws/s3/perftest/src/test/java/org/jclouds/aws/s3/Jets3tPerformanceLiveTest.java +++ b/aws/s3/perftest/src/test/java/org/jclouds/aws/s3/Jets3tPerformanceLiveTest.java @@ -46,21 +46,17 @@ package org.jclouds.aws.s3; * under the License. * ==================================================================== */ -import static com.google.common.base.Preconditions.checkNotNull; - import java.io.File; import java.io.InputStream; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeoutException; -import org.jclouds.aws.s3.reference.S3Constants; import org.jets3t.service.S3Service; import org.jets3t.service.S3ServiceException; import org.jets3t.service.impl.rest.httpclient.RestS3Service; import org.jets3t.service.security.AWSCredentials; +import org.testng.ITestContext; import org.testng.annotations.BeforeClass; -import org.testng.annotations.Optional; -import org.testng.annotations.Parameters; import org.testng.annotations.Test; /** @@ -68,18 +64,20 @@ import org.testng.annotations.Test; * * @author Adrian Cole */ -@Test(sequential = true, timeOut = 2 * 60 * 1000, testName = "s3.Jets3tPerformanceLiveTest", groups = { "live" }) -public class Jets3tPerformanceLiveTest extends BasePerformance { +@Test(sequential = true, timeOut = 2 * 60 * 1000, testName = "perftest.Jets3tPerformanceLiveTest", groups = { "live" }) +public class Jets3tPerformanceLiveTest extends BasePerformanceLiveTest { private S3Service jetClient; - @BeforeClass(inheritGroups = false, groups = { "live" }) - @Parameters( { S3Constants.PROPERTY_AWS_ACCESSKEYID, S3Constants.PROPERTY_AWS_SECRETACCESSKEY }) - public void setUpJetS3t(@Optional String AWSAccessKeyId, @Optional String AWSSecretAccessKey) - throws S3ServiceException { - AWSAccessKeyId = AWSAccessKeyId != null ? AWSAccessKeyId : sysAWSAccessKeyId; - AWSSecretAccessKey = AWSSecretAccessKey != null ? AWSSecretAccessKey : sysAWSSecretAccessKey; - jetClient = new RestS3Service(new AWSCredentials(checkNotNull(AWSAccessKeyId, - "AWSAccessKeyId"), checkNotNull(AWSSecretAccessKey, "AWSSecretAccessKey"))); + @BeforeClass(groups = { "live" }, dependsOnMethods = "setUpResourcesOnThisThread") + protected void createLiveS3Context(ITestContext testContext) throws S3ServiceException { + if (testContext.getAttribute("jclouds.test.user") != null) { + AWSCredentials credentials = new AWSCredentials((String) testContext + .getAttribute("jclouds.test.user"), (String) testContext + .getAttribute("jclouds.test.key")); + jetClient = new RestS3Service(credentials); + } else { + throw new RuntimeException("not configured properly"); + } } @Override diff --git a/aws/s3/pom.xml b/aws/s3/pom.xml index e672239359..02173cbc8f 100644 --- a/aws/s3/pom.xml +++ b/aws/s3/pom.xml @@ -42,17 +42,34 @@ extensions samples + + org.jclouds.aws.s3.integration.S3TestInitializer + ${project.groupId} - jclouds-keyvaluestore-core + jclouds-blobstore-core ${project.version} + + ${project.groupId} + jclouds-blobstore-core + ${project.version} + test-jar + test + ${project.groupId} jclouds-aws-core ${project.version} + + + ${project.groupId} + jclouds-httpnio + ${project.version} + test + ${project.groupId} jclouds-aws-core @@ -61,112 +78,4 @@ test - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.4.3 - - - integration - integration-test - - test - - - - - **/*LiveTest.java - - - **/*IntegrationTest.java - - - - jclouds.s3.httpstream.url - ${jclouds.s3.httpstream.url} - - - jclouds.s3.httpstream.md5 - ${jclouds.s3.httpstream.md5} - - - - - - - - - **/*IntegrationTest.java - **/*LiveTest.java - - - - - - - - live - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.4.3 - - - integration - integration-test - - test - - - - - none - - - **/*IntegrationTest.java - **/*LiveTest.java - - - - file.encoding - UTF-8 - - - jclouds.aws.accesskeyid - ${jclouds.aws.accesskeyid} - - - jclouds.aws.secretaccesskey - ${jclouds.aws.secretaccesskey} - - - jclouds.s3.httpstream.url - ${jclouds.s3.httpstream.url} - - - jclouds.s3.httpstream.md5 - ${jclouds.s3.httpstream.md5} - - - - - - - - - - diff --git a/aws/s3/samples/createandlistbuckets/src/main/java/org/jclouds/aws/s3/CreateListOwnedBuckets.java b/aws/s3/samples/createandlistbuckets/src/main/java/org/jclouds/aws/s3/CreateListOwnedBuckets.java index b72194589c..3ebcc998b8 100644 --- a/aws/s3/samples/createandlistbuckets/src/main/java/org/jclouds/aws/s3/CreateListOwnedBuckets.java +++ b/aws/s3/samples/createandlistbuckets/src/main/java/org/jclouds/aws/s3/CreateListOwnedBuckets.java @@ -28,7 +28,7 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import org.jclouds.aws.s3.domain.S3Bucket; +import org.jclouds.aws.s3.domain.BucketMetadata; /** * CreateListOwnedBuckets is a class contaning operations to creates a bucket if it doesn't exist @@ -44,13 +44,13 @@ public class CreateListOwnedBuckets { this.s3Context = context; } - public List list() throws InterruptedException, ExecutionException, + public List list() throws InterruptedException, ExecutionException, TimeoutException { - return s3Context.getConnection().listOwnedBuckets(); + return s3Context.getApi().listContainers(); } public Boolean createBucket(String bucketName) throws InterruptedException, ExecutionException, TimeoutException { - return s3Context.getConnection().putBucketIfNotExists(bucketName).get(10, TimeUnit.SECONDS); + return s3Context.getApi().createContainer(bucketName).get(10, TimeUnit.SECONDS); } } diff --git a/aws/s3/samples/createandlistbuckets/src/main/java/org/jclouds/aws/s3/samples/MainApp.java b/aws/s3/samples/createandlistbuckets/src/main/java/org/jclouds/aws/s3/samples/MainApp.java index 207b62c933..97d085f7e5 100644 --- a/aws/s3/samples/createandlistbuckets/src/main/java/org/jclouds/aws/s3/samples/MainApp.java +++ b/aws/s3/samples/createandlistbuckets/src/main/java/org/jclouds/aws/s3/samples/MainApp.java @@ -32,7 +32,7 @@ import javax.annotation.Resource; import org.jclouds.aws.s3.CreateListOwnedBuckets; import org.jclouds.aws.s3.S3Context; import org.jclouds.aws.s3.S3ContextFactory; -import org.jclouds.aws.s3.domain.S3Bucket; +import org.jclouds.aws.s3.domain.BucketMetadata; import org.jclouds.logging.Logger; /** @@ -60,7 +60,7 @@ public class MainApp { // Variables S3Context context = null; CreateListOwnedBuckets listMyOwnBuckets = null; - List myBuckets = null; + List myBuckets = null; // Args String accesskeyid = args[0]; @@ -79,7 +79,7 @@ public class MainApp { // List bucket myBuckets = listMyOwnBuckets.list(); - for (S3Bucket.Metadata bucketObj : myBuckets) { + for (BucketMetadata bucketObj : myBuckets) { System.out.println(String.format(" %1$s", bucketObj)); System.out.println(String.format(": %1$s entries%n", context.createInputStreamMap( bucketObj.getName()).size())); diff --git a/aws/s3/samples/createandlistbuckets/src/test/java/org/jclouds/aws/s3/samples/test/CreateListOwnedBucketsIntegrationTest.java b/aws/s3/samples/createandlistbuckets/src/test/java/org/jclouds/aws/s3/samples/test/CreateListOwnedBucketsIntegrationTest.java index 35702284e3..ea8d029429 100644 --- a/aws/s3/samples/createandlistbuckets/src/test/java/org/jclouds/aws/s3/samples/test/CreateListOwnedBucketsIntegrationTest.java +++ b/aws/s3/samples/createandlistbuckets/src/test/java/org/jclouds/aws/s3/samples/test/CreateListOwnedBucketsIntegrationTest.java @@ -23,11 +23,15 @@ */ package org.jclouds.aws.s3.samples.test; +import java.util.concurrent.TimeUnit; + import org.jclouds.aws.s3.CreateListOwnedBuckets; import org.jclouds.aws.s3.S3Context; +import org.jclouds.aws.s3.S3ContextBuilder; import org.jclouds.aws.s3.S3ContextFactory; -import org.jclouds.aws.s3.config.StubS3ConnectionModule; +import org.jclouds.aws.s3.config.StubS3BlobStoreModule; import org.jclouds.aws.s3.reference.S3Constants; +import org.jclouds.logging.log4j.config.Log4JLoggingModule; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Optional; @@ -58,9 +62,10 @@ public class CreateListOwnedBucketsIntegrationTest { AWSSecretAccessKey = AWSSecretAccessKey != null ? AWSSecretAccessKey : sysAWSSecretAccessKey; if ((AWSAccessKeyId != null) && (AWSSecretAccessKey != null)) - context = S3ContextFactory.createS3Context(AWSAccessKeyId, AWSSecretAccessKey); + context = S3ContextBuilder.newBuilder(AWSAccessKeyId, AWSSecretAccessKey).withSaxDebug() + .relaxSSLHostname().withModules(new Log4JLoggingModule()).buildContext(); else - context = S3ContextFactory.createS3Context("stub", "stub", new StubS3ConnectionModule()); + context = S3ContextFactory.createS3Context("stub", "stub", new StubS3BlobStoreModule()); } @@ -89,7 +94,8 @@ public class CreateListOwnedBucketsIntegrationTest { public void tearDownClient() throws Exception { // Removes the bucket created for test purposes only - assert context.getConnection().deleteBucketIfEmpty(bucketPrefix + "needstoexist"); + assert context.getApi().deleteContainer(bucketPrefix + "needstoexist").get(10, + TimeUnit.SECONDS); context.close(); context = null; diff --git a/aws/s3/samples/createandlistbuckets/src/test/java/org/jclouds/aws/s3/samples/test/CreateListOwnedBucketsLiveTest.java b/aws/s3/samples/createandlistbuckets/src/test/java/org/jclouds/aws/s3/samples/test/CreateListOwnedBucketsLiveTest.java index c07b393520..ecf7eea529 100644 --- a/aws/s3/samples/createandlistbuckets/src/test/java/org/jclouds/aws/s3/samples/test/CreateListOwnedBucketsLiveTest.java +++ b/aws/s3/samples/createandlistbuckets/src/test/java/org/jclouds/aws/s3/samples/test/CreateListOwnedBucketsLiveTest.java @@ -25,12 +25,10 @@ package org.jclouds.aws.s3.samples.test; import org.jclouds.aws.s3.CreateListOwnedBuckets; import org.jclouds.aws.s3.S3Context; -import org.jclouds.aws.s3.S3ContextFactory; -import org.jclouds.aws.s3.reference.S3Constants; +import org.jclouds.aws.s3.S3ContextBuilder; +import org.jclouds.logging.log4j.config.Log4JLoggingModule; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; -import org.testng.annotations.Optional; -import org.testng.annotations.Parameters; import org.testng.annotations.Test; /** @@ -41,22 +39,17 @@ import org.testng.annotations.Test; @Test(testName = "s3.createListOwnedBucketsLiveTest") public class CreateListOwnedBucketsLiveTest { - private S3Context context; - private final String sysAWSAccessKeyId = System - .getProperty(S3Constants.PROPERTY_AWS_ACCESSKEYID); - private final String sysAWSSecretAccessKey = System - .getProperty(S3Constants.PROPERTY_AWS_SECRETACCESSKEY); private String bucketPrefix = (System.getProperty("user.name") + "." + this.getClass() .getSimpleName()).toLowerCase(); + private S3Context context; @BeforeClass(inheritGroups = false, groups = { "live" }) - @Parameters( { S3Constants.PROPERTY_AWS_ACCESSKEYID, S3Constants.PROPERTY_AWS_SECRETACCESSKEY }) - public void setUpTest(@Optional String AWSAccessKeyId, @Optional String AWSSecretAccessKey) { + public void setUpTest() { + String account = System.getProperty("jclouds.test.user"); + String key = System.getProperty("jclouds.test.key"); - AWSAccessKeyId = AWSAccessKeyId != null ? AWSAccessKeyId : sysAWSAccessKeyId; - AWSSecretAccessKey = AWSSecretAccessKey != null ? AWSSecretAccessKey : sysAWSSecretAccessKey; - - context = S3ContextFactory.createS3Context(AWSAccessKeyId, AWSSecretAccessKey); + context = S3ContextBuilder.newBuilder(account, key).withSaxDebug().relaxSSLHostname() + .withModules(new Log4JLoggingModule()).buildContext(); } @@ -82,7 +75,7 @@ public class CreateListOwnedBucketsLiveTest { public void tearDownClient() throws Exception { // Removes the bucket created for test purposes only - context.getConnection().deleteBucketIfEmpty(bucketPrefix + "needstoexist"); + context.getApi().deleteContainer(bucketPrefix + "needstoexist"); context.close(); context = null; diff --git a/aws/s3/samples/googleappengine/pom.xml b/aws/s3/samples/googleappengine/pom.xml index 7f6bfe7300..c4266ba4db 100644 --- a/aws/s3/samples/googleappengine/pom.xml +++ b/aws/s3/samples/googleappengine/pom.xml @@ -194,11 +194,11 @@ - jclouds.aws.accesskeyid + jclouds.test.user ${jclouds.aws.accesskeyid} - jclouds.aws.secretaccesskey + jclouds.test.key ${jclouds.aws.secretaccesskey} diff --git a/aws/s3/samples/googleappengine/src/main/java/org/jclouds/samples/googleappengine/GetAllBucketsController.java b/aws/s3/samples/googleappengine/src/main/java/org/jclouds/samples/googleappengine/GetAllBucketsController.java index c797a0d033..775f0395f3 100644 --- a/aws/s3/samples/googleappengine/src/main/java/org/jclouds/samples/googleappengine/GetAllBucketsController.java +++ b/aws/s3/samples/googleappengine/src/main/java/org/jclouds/samples/googleappengine/GetAllBucketsController.java @@ -36,7 +36,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.jclouds.aws.s3.S3Context; -import org.jclouds.aws.s3.domain.S3Bucket; +import org.jclouds.aws.s3.domain.BucketMetadata; import org.jclouds.logging.Logger; import org.jclouds.samples.googleappengine.domain.BucketResult; import org.jclouds.samples.googleappengine.functions.MetadataToBucketResult; @@ -84,7 +84,8 @@ public class GetAllBucketsController extends HttpServlet { private void addMyBucketsToRequest(HttpServletRequest request) throws InterruptedException, ExecutionException, TimeoutException { - List myBucketMetadata = context.getConnection().listOwnedBuckets(); + System.err.println(context.getAccount() + ":" + context.getEndPoint()); + List myBucketMetadata = context.getApi().listContainers(); List myBuckets = Lists.transform(myBucketMetadata, metadataToBucketResultProvider.get()); request.setAttribute("buckets", myBuckets); diff --git a/aws/s3/samples/googleappengine/src/main/java/org/jclouds/samples/googleappengine/JCloudsServlet.java b/aws/s3/samples/googleappengine/src/main/java/org/jclouds/samples/googleappengine/JCloudsServlet.java index 384d248fcd..cdca94adb9 100644 --- a/aws/s3/samples/googleappengine/src/main/java/org/jclouds/samples/googleappengine/JCloudsServlet.java +++ b/aws/s3/samples/googleappengine/src/main/java/org/jclouds/samples/googleappengine/JCloudsServlet.java @@ -36,7 +36,9 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.jclouds.aws.s3.S3Context; -import org.jclouds.aws.s3.domain.S3Bucket; +import org.jclouds.aws.s3.domain.BucketMetadata; +import org.jclouds.aws.s3.domain.ListBucketResponse; +import org.jclouds.blobstore.ContainerNotFoundException; import org.jclouds.logging.Logger; import com.google.inject.Inject; @@ -102,18 +104,18 @@ public class JCloudsServlet extends HttpServlet { protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { try { - List myBucketMetadata = context.getConnection().listOwnedBuckets(); + List myBucketMetadata = context.getApi().listContainers(); List myBuckets = new ArrayList(); - for (S3Bucket.Metadata metadata : myBucketMetadata) { + for (BucketMetadata metadata : myBucketMetadata) { BucketResult result = new BucketResult(); result.setName(metadata.getName()); try { - S3Bucket bucket = context.getConnection().listBucket(metadata.getName()).get(10, - TimeUnit.SECONDS); - if (bucket == S3Bucket.NOT_FOUND) { + try { + ListBucketResponse bucket = context.getApi().listBlobs(metadata.getName()).get( + 10, TimeUnit.SECONDS); + result.setSize(bucket.size() + ""); + } catch (ContainerNotFoundException ex) { result.setStatus("not found"); - } else { - result.setSize(bucket.getSize() + ""); } } catch (Exception e) { logger.error(e, "Error listing bucket %1$s", result.getName()); diff --git a/aws/s3/samples/googleappengine/src/main/java/org/jclouds/samples/googleappengine/functions/MetadataToBucketResult.java b/aws/s3/samples/googleappengine/src/main/java/org/jclouds/samples/googleappengine/functions/MetadataToBucketResult.java index bc9e5c9f8e..d0ba37538d 100644 --- a/aws/s3/samples/googleappengine/src/main/java/org/jclouds/samples/googleappengine/functions/MetadataToBucketResult.java +++ b/aws/s3/samples/googleappengine/src/main/java/org/jclouds/samples/googleappengine/functions/MetadataToBucketResult.java @@ -27,35 +27,37 @@ import java.util.concurrent.TimeUnit; import javax.annotation.Resource; -import org.jclouds.aws.s3.S3Connection; -import org.jclouds.aws.s3.domain.S3Bucket; -import org.jclouds.aws.s3.domain.S3Bucket.Metadata; +import org.jclouds.aws.s3.S3BlobStore; +import org.jclouds.aws.s3.domain.BucketMetadata; +import org.jclouds.aws.s3.domain.ListBucketResponse; +import org.jclouds.blobstore.ContainerNotFoundException; import org.jclouds.logging.Logger; import org.jclouds.samples.googleappengine.domain.BucketResult; import com.google.common.base.Function; import com.google.inject.Inject; -public class MetadataToBucketResult implements Function { - private final S3Connection connection; +public class MetadataToBucketResult implements Function { + private final S3BlobStore connection; @Resource protected Logger logger = Logger.NULL; @Inject - public MetadataToBucketResult(S3Connection connection) { + public MetadataToBucketResult(S3BlobStore connection) { this.connection = connection; } - public BucketResult apply(Metadata from) { + public BucketResult apply(BucketMetadata from) { BucketResult result = new BucketResult(); result.setName(from.getName()); try { - S3Bucket bucket = connection.listBucket(from.getName()).get(10, TimeUnit.SECONDS); - if (bucket == S3Bucket.NOT_FOUND) { + try { + ListBucketResponse bucket = connection.listBlobs(from.getName()).get(10, + TimeUnit.SECONDS); + result.setSize(bucket.size() + ""); + } catch (ContainerNotFoundException ex) { result.setStatus("not found"); - } else { - result.setSize(bucket.getSize() + ""); } } catch (Exception e) { logger.error(e, "Error listing bucket %1$s", result.getName()); diff --git a/aws/s3/samples/googleappengine/src/test/java/org/jclouds/samples/googleappengine/functest/GoogleAppEngineLiveTest.java b/aws/s3/samples/googleappengine/src/test/java/org/jclouds/samples/googleappengine/functest/GoogleAppEngineLiveTest.java index b90424c0b1..c8400954dc 100644 --- a/aws/s3/samples/googleappengine/src/test/java/org/jclouds/samples/googleappengine/functest/GoogleAppEngineLiveTest.java +++ b/aws/s3/samples/googleappengine/src/test/java/org/jclouds/samples/googleappengine/functest/GoogleAppEngineLiveTest.java @@ -24,81 +24,68 @@ package org.jclouds.samples.googleappengine.functest; import static com.google.common.base.Preconditions.checkNotNull; -import org.apache.commons.io.IOUtils; -import org.jclouds.aws.s3.reference.S3Constants; -import org.testng.annotations.BeforeTest; -import org.testng.annotations.Optional; -import org.testng.annotations.Parameters; -import org.testng.annotations.Test; import java.io.IOException; import java.io.InputStream; import java.net.URL; import java.util.Properties; +import org.apache.commons.io.IOUtils; +import org.jclouds.aws.s3.reference.S3Constants; +import org.testng.annotations.BeforeTest; +import org.testng.annotations.Parameters; +import org.testng.annotations.Test; /** - * Starts up the Google App Engine for Java Development environment and deploys - * an application which tests S3. - * + * Starts up the Google App Engine for Java Development environment and deploys an application which + * tests S3. + * * @author Adrian Cole */ @Test(groups = "live", sequential = true, testName = "functionalTests") public class GoogleAppEngineLiveTest { - GoogleDevServer server; - private static final String sysAWSAccessKeyId = System - .getProperty(S3Constants.PROPERTY_AWS_ACCESSKEYID); - private static final String sysAWSSecretAccessKey = System - .getProperty(S3Constants.PROPERTY_AWS_SECRETACCESSKEY); - private URL url; + GoogleDevServer server; + private URL url; - @BeforeTest - @Parameters({"warfile", "devappserver.address", "devappserver.port", - S3Constants.PROPERTY_AWS_ACCESSKEYID, - S3Constants.PROPERTY_AWS_SECRETACCESSKEY}) - public void startDevAppServer(final String warfile, final String address, - final String port, @Optional String AWSAccessKeyId, - @Optional String AWSSecretAccessKey) throws Exception { - url = new URL(String.format("http://%1$s:%2$s", address, port)); + @BeforeTest + @Parameters( { "warfile", "devappserver.address", "devappserver.port" }) + public void startDevAppServer(final String warfile, final String address, final String port) + throws Exception { + url = new URL(String.format("http://%1$s:%2$s", address, port)); + String account = System.getProperty("jclouds.test.user"); + String key = System.getProperty("jclouds.test.key"); - AWSAccessKeyId = AWSAccessKeyId != null ? AWSAccessKeyId - : sysAWSAccessKeyId; - AWSSecretAccessKey = AWSSecretAccessKey != null ? AWSSecretAccessKey - : sysAWSSecretAccessKey; + checkNotNull(account, "account"); + checkNotNull(key, "key"); - checkNotNull(AWSAccessKeyId, "AWSAccessKeyId"); - checkNotNull(AWSSecretAccessKey, "AWSSecretAccessKey"); + Properties props = new Properties(); + props.put(S3Constants.PROPERTY_AWS_ACCESSKEYID, account); + props.put(S3Constants.PROPERTY_AWS_SECRETACCESSKEY, key); + server = new GoogleDevServer(); + server.writePropertiesAndStartServer(address, port, warfile, props); + } - Properties props = new Properties(); - props.put(S3Constants.PROPERTY_AWS_ACCESSKEYID, AWSAccessKeyId); - props.put(S3Constants.PROPERTY_AWS_SECRETACCESSKEY, AWSSecretAccessKey); - server = new GoogleDevServer(); - server.writePropertiesAndStartServer(address, port, warfile, props); - } + @Test + public void shouldPass() throws InterruptedException, IOException { + InputStream i = url.openStream(); + String string = IOUtils.toString(i); + assert string.indexOf("Welcome") >= 0 : string; + } - @Test - public void shouldPass() throws InterruptedException, IOException { - InputStream i = url.openStream(); - String string = IOUtils.toString(i); - assert string.indexOf("Welcome") >= 0 : string; - } + @Test(invocationCount = 5, enabled = true) + public void testGuiceJCloudsSerial() throws InterruptedException, IOException { + URL gurl = new URL(url, "/guice/listbuckets.s3"); + InputStream i = gurl.openStream(); + String string = IOUtils.toString(i); + assert string.indexOf("List") >= 0 : string; + } - @Test(invocationCount = 5, enabled = true) - public void testGuiceJCloudsSerial() throws InterruptedException, - IOException { - URL gurl = new URL(url, "/guice/listbuckets.s3"); - InputStream i = gurl.openStream(); - String string = IOUtils.toString(i); - assert string.indexOf("List") >= 0 : string; - } - - @Test(invocationCount = 50, enabled = true, threadPoolSize = 10) - public void testGuiceJCloudsParallel() throws InterruptedException, - IOException { - URL gurl = new URL(url, "/guice/listbuckets.s3"); - InputStream i = gurl.openStream(); - String string = IOUtils.toString(i); - assert string.indexOf("List") >= 0 : string; - } + @Test(invocationCount = 50, enabled = true, threadPoolSize = 10) + public void testGuiceJCloudsParallel() throws InterruptedException, IOException { + URL gurl = new URL(url, "/guice/listbuckets.s3"); + InputStream i = gurl.openStream(); + String string = IOUtils.toString(i); + assert string.indexOf("List") >= 0 : string; + } } diff --git a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/AzureBlobConnection.java b/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/AzureBlobConnection.java deleted file mode 100644 index 98e405d6d6..0000000000 --- a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/AzureBlobConnection.java +++ /dev/null @@ -1,137 +0,0 @@ -/** - * - * Copyright (C) 2009 Global Cloud Specialists, Inc. - * - * ==================================================================== - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * ==================================================================== - */ -package org.jclouds.azure.storage.blob; - -import java.util.concurrent.ExecutionException; -import java.util.concurrent.Future; - -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; - -import org.jclouds.azure.storage.blob.domain.ContainerMetadata; -import org.jclouds.azure.storage.blob.options.CreateContainerOptions; -import org.jclouds.azure.storage.blob.xml.AccountNameEnumerationResultsHandler; -import org.jclouds.azure.storage.domain.MetadataList; -import org.jclouds.azure.storage.filters.SharedKeyAuthentication; -import org.jclouds.azure.storage.options.CreateOptions; -import org.jclouds.azure.storage.options.ListOptions; -import org.jclouds.azure.storage.reference.AzureStorageHeaders; -import org.jclouds.rest.Header; -import org.jclouds.rest.Query; -import org.jclouds.rest.RequestFilters; -import org.jclouds.rest.SkipEncoding; -import org.jclouds.rest.XMLResponseParser; - -/** - * Provides access to Azure Blob via their REST API. - *

    - * All commands return a Future of the result from Azure Blob. Any exceptions incurred during - * processing will be wrapped in an {@link ExecutionException} as documented in {@link Future#get()}. - * - * @see - * @author Adrian Cole - */ -@SkipEncoding('/') -@RequestFilters(SharedKeyAuthentication.class) -@Header(key = AzureStorageHeaders.VERSION, value = "2009-07-17") -public interface AzureBlobConnection { - - /** - * The List Containers operation returns a list of the containers under the specified account. - *

    - * The 2009-07-17 version of the List Containers operation times out after 30 seconds. - * - * @param listOptions - * controls the number or type of results requested - * @see ListOptions - */ - @GET - @XMLResponseParser(AccountNameEnumerationResultsHandler.class) - @Path("/") - @Query(key = "comp", value = "list") - MetadataList listContainers(ListOptions... listOptions); - - /** - * The Create Container operation creates a new container under the specified account. If the - * container with the same name already exists, the operation fails. - *

    - * The container resource includes metadata and properties for that container. It does not - * include a list of the blobs contained by the container. - * - * @see CreateContainerOptions - * - */ - @PUT - @Path("{container}") - @Query(key = "restype", value = "container") - boolean createContainer(@PathParam("container") String container, - CreateContainerOptions... options); - - /** - * The Delete Container operation marks the specified container for deletion. The container and - * any blobs contained within it are later deleted during garbage collection. - *

    - * When a container is deleted, a container with the same name cannot be created for at least 30 - * seconds; the container may not be available for more than 30 seconds if the service is still - * processing the request. While the container is being deleted, attempts to create a container - * of the same name will fail with status code 409 (Conflict), with the service returning - * additional error information indicating that the container is being deleted. All other - * operations, including operations on any blobs under the container, will fail with status code - * 404 (Not Found) while the container is being deleted. - * - */ - @DELETE - @Path("{container}") - @Query(key = "restype", value = "container") - boolean deleteContainer(@PathParam("container") String container); - - /** - * The root container is a default container that may be inferred from a URL requesting a blob - * resource. The root container makes it possible to reference a blob from the top level of the - * storage account hierarchy, without referencing the container name. - *

    - * The container resource includes metadata and properties for that container. It does not - * include a list of the blobs contained by the container. - * - * @see CreateContainerOptions - * - */ - @PUT - @Path("$root") - @Query(key = "restype", value = "container") - boolean createRootContainer(CreateOptions... options); - - /** - * - * @see deleteContainer(String) - * @see createRootContainer(CreateContainerOptions) - */ - @DELETE - @Path("$root") - @Query(key = "restype", value = "container") - boolean deleteRootContainer(); -} diff --git a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/AzureBlobContext.java b/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/AzureBlobContext.java index 18fb5a959d..2c086dbffd 100644 --- a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/AzureBlobContext.java +++ b/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/AzureBlobContext.java @@ -1,16 +1,42 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ package org.jclouds.azure.storage.blob; +import org.jclouds.azure.storage.blob.domain.Blob; +import org.jclouds.azure.storage.blob.domain.BlobMetadata; +import org.jclouds.blobstore.BlobStoreContext; import org.jclouds.cloud.CloudContext; /** * Represents an authenticated context to Azure Blob Service. * * @see - * @see AzureBlobConnection + * @see AzureBlobStore * @see CloudContext * @author Adrian Cole * */ -public interface AzureBlobContext extends CloudContext { +public interface AzureBlobContext extends BlobStoreContext { } \ No newline at end of file diff --git a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/AzureBlobContextBuilder.java b/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/AzureBlobContextBuilder.java index ccc15b7d84..5f507b4f27 100755 --- a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/AzureBlobContextBuilder.java +++ b/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/AzureBlobContextBuilder.java @@ -24,6 +24,7 @@ package org.jclouds.azure.storage.blob; import static com.google.common.base.Preconditions.checkNotNull; +import static org.jclouds.blobstore.reference.BlobStoreConstants.PROPERTY_USER_METADATA_PREFIX; import static org.jclouds.http.HttpConstants.PROPERTY_HTTP_ADDRESS; import static org.jclouds.http.HttpConstants.PROPERTY_HTTP_MAX_REDIRECTS; import static org.jclouds.http.HttpConstants.PROPERTY_HTTP_MAX_RETRIES; @@ -39,9 +40,9 @@ import java.util.List; import java.util.Properties; import org.jclouds.azure.storage.blob.config.AzureBlobContextModule; -import org.jclouds.azure.storage.blob.config.RestAzureBlobConnectionModule; +import org.jclouds.azure.storage.blob.config.RestAzureBlobStoreModule; +import org.jclouds.azure.storage.blob.xml.config.AzureBlobParserModule; import org.jclouds.azure.storage.reference.AzureStorageConstants; -import org.jclouds.azure.storage.xml.config.AzureStorageParserModule; import org.jclouds.cloud.CloudContextBuilder; import org.jclouds.http.config.JavaUrlHttpCommandExecutorServiceModule; import org.jclouds.logging.jdk.config.JDKLoggingModule; @@ -62,8 +63,7 @@ import com.google.inject.Module; * @author Adrian Cole * @see AzureBlobContext */ -public class AzureBlobContextBuilder extends - CloudContextBuilder { +public class AzureBlobContextBuilder extends CloudContextBuilder { public AzureBlobContextBuilder(Properties props) { super(props); @@ -71,7 +71,7 @@ public class AzureBlobContextBuilder extends public static AzureBlobContextBuilder newBuilder(String id, String secret) { Properties properties = new Properties(); - + properties.setProperty(PROPERTY_USER_METADATA_PREFIX, "x-ms-meta-"); properties.setProperty(PROPERTY_HTTP_ADDRESS, id + ".blob.core.windows.net"); properties.setProperty(PROPERTY_HTTP_SECURE, "true"); properties.setProperty(PROPERTY_SAX_DEBUG, "false"); @@ -100,7 +100,7 @@ public class AzureBlobContextBuilder extends } protected void addParserModule(List modules) { - modules.add(new AzureStorageParserModule()); + modules.add(new AzureBlobParserModule()); } protected void addContextModule(List modules) { @@ -108,7 +108,7 @@ public class AzureBlobContextBuilder extends } protected void addConnectionModule(List modules) { - modules.add(new RestAzureBlobConnectionModule()); + modules.add(new RestAzureBlobStoreModule()); } } diff --git a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/AzureBlobStore.java b/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/AzureBlobStore.java new file mode 100644 index 0000000000..fff4026713 --- /dev/null +++ b/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/AzureBlobStore.java @@ -0,0 +1,238 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.azure.storage.blob; + +import java.util.List; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.Future; + +import javax.ws.rs.DELETE; +import javax.ws.rs.GET; +import javax.ws.rs.HEAD; +import javax.ws.rs.PUT; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; + +import org.jclouds.azure.storage.blob.domain.Blob; +import org.jclouds.azure.storage.blob.domain.BlobMetadata; +import org.jclouds.azure.storage.blob.domain.ContainerMetadata; +import org.jclouds.azure.storage.blob.domain.ListBlobsResponse; +import org.jclouds.azure.storage.blob.functions.ParseBlobFromHeadersAndHttpContent; +import org.jclouds.azure.storage.blob.functions.ParseBlobMetadataFromHeaders; +import org.jclouds.azure.storage.blob.functions.ReturnTrueIfContainerAlreadyExists; +import org.jclouds.azure.storage.blob.options.CreateContainerOptions; +import org.jclouds.azure.storage.blob.xml.AccountNameEnumerationResultsHandler; +import org.jclouds.azure.storage.blob.xml.ContainerNameEnumerationResultsHandler; +import org.jclouds.azure.storage.domain.BoundedList; +import org.jclouds.azure.storage.filters.SharedKeyAuthentication; +import org.jclouds.azure.storage.options.CreateOptions; +import org.jclouds.azure.storage.options.ListOptions; +import org.jclouds.azure.storage.reference.AzureStorageHeaders; +import org.jclouds.blobstore.BlobStore; +import org.jclouds.blobstore.binders.BlobBinder; +import org.jclouds.blobstore.functions.BlobKey; +import org.jclouds.blobstore.functions.ThrowKeyNotFoundOn404; +import org.jclouds.http.functions.ParseETagHeader; +import org.jclouds.http.functions.ReturnFalseOn404; +import org.jclouds.http.functions.ReturnTrueOn404; +import org.jclouds.http.options.GetOptions; +import org.jclouds.rest.EntityParam; +import org.jclouds.rest.ExceptionParser; +import org.jclouds.rest.Headers; +import org.jclouds.rest.ParamParser; +import org.jclouds.rest.QueryParams; +import org.jclouds.rest.RequestFilters; +import org.jclouds.rest.ResponseParser; +import org.jclouds.rest.SkipEncoding; +import org.jclouds.rest.XMLResponseParser; + +/** + * Provides access to Azure Blob via their REST API. + *

    + * All commands return a Future of the result from Azure Blob. Any exceptions incurred during + * processing will be wrapped in an {@link ExecutionException} as documented in {@link Future#get()}. + * + * @see + * @author Adrian Cole + */ +@SkipEncoding('/') +@RequestFilters(SharedKeyAuthentication.class) +@Headers(keys = AzureStorageHeaders.VERSION, values = "2009-07-17") +public interface AzureBlobStore extends BlobStore { + + /** + * The List Containers operation returns a list of the containers under the specified account. + *

    + * The 2009-07-17 version of the List Containers operation times out after 30 seconds. + * + * @param listOptions + * controls the number or type of results requested + * @see ListOptions + */ + @GET + @XMLResponseParser(AccountNameEnumerationResultsHandler.class) + @Path("/") + @QueryParams(keys = "comp", values = "list") + List listContainers(); + + @GET + @XMLResponseParser(AccountNameEnumerationResultsHandler.class) + @Path("/") + @QueryParams(keys = "comp", values = "list") + BoundedList listContainers(ListOptions listOptions); + + @HEAD + @Path("{container}") + @ExceptionParser(ReturnFalseOn404.class) + @QueryParams(keys = "restype", values = "container") + boolean containerExists(@PathParam("container") String container); + + /** + * The Create Container operation creates a new container under the specified account. If the + * container with the same name already exists, the operation fails. + *

    + * The container resource includes metadata and properties for that container. It does not + * include a list of the blobs contained by the container. + * + * @see CreateContainerOptions + * + */ + @PUT + @Path("{container}") + @ExceptionParser(ReturnTrueIfContainerAlreadyExists.class) + @QueryParams(keys = "restype", values = "container") + Future createContainer(@PathParam("container") String container); + + @PUT + @Path("{container}") + @QueryParams(keys = "restype", values = "container") + @ExceptionParser(ReturnTrueIfContainerAlreadyExists.class) + Future createContainer(@PathParam("container") String container, + CreateContainerOptions options); + + /** + * The Delete Container operation marks the specified container for deletion. The container and + * any blobs contained within it are later deleted during garbage collection. + *

    + * When a container is deleted, a container with the same name cannot be created for at least 30 + * seconds; the container may not be available for more than 30 seconds if the service is still + * processing the request. While the container is being deleted, attempts to create a container + * of the same name will fail with status code 409 (Conflict), with the service returning + * additional error information indicating that the container is being deleted. All other + * operations, including operations on any blobs under the container, will fail with status code + * 404 (Not Found) while the container is being deleted. + * + */ + @DELETE + @Path("{container}") + @ExceptionParser(ReturnTrueOn404.class) + @QueryParams(keys = "restype", values = "container") + Future deleteContainer(@PathParam("container") String container); + + /** + * The root container is a default container that may be inferred from a URL requesting a blob + * resource. The root container makes it possible to reference a blob from the top level of the + * storage account hierarchy, without referencing the container name. + *

    + * The container resource includes metadata and properties for that container. It does not + * include a list of the blobs contained by the container. + * + * @see CreateContainerOptions + * + */ + @PUT + @Path("$root") + @ExceptionParser(ReturnTrueIfContainerAlreadyExists.class) + @QueryParams(keys = "restype", values = "container") + Future createRootContainer(); + + @PUT + @Path("$root") + @ExceptionParser(ReturnTrueIfContainerAlreadyExists.class) + @QueryParams(keys = "restype", values = "container") + Future createRootContainer(CreateOptions options); + + /** + * + * @see deleteContainer(String) + * @see createRootContainer(CreateContainerOptions) + */ + @DELETE + @Path("$root") + @ExceptionParser(ReturnTrueOn404.class) + @QueryParams(keys = "restype", values = "container") + Future deleteRootContainer(); + + @GET + @XMLResponseParser(ContainerNameEnumerationResultsHandler.class) + @Path("{container}") + @QueryParams(keys = { "restype", "comp" }, values = { "container", "list" }) + Future listBlobs(@PathParam("container") String container); + + @GET + @XMLResponseParser(ContainerNameEnumerationResultsHandler.class) + @Path("$root") + @QueryParams(keys = { "restype", "comp" }, values = { "container", "list" }) + Future listBlobs(); + + // @GET + // @XMLResponseParser(ContainerNameEnumerationResultsHandler.class) + // @Path("{container}") + // @QueryParams(keys = { "restype", "comp" }, values = { "container", "list" }) + // Future listBlobs(@PathParam("container") String container, + // ListBlobsOptions options); + + @PUT + @Path("{container}/{key}") + @ResponseParser(ParseETagHeader.class) + Future putBlob(@PathParam("container") String container, + @PathParam("key") @ParamParser(BlobKey.class) @EntityParam(BlobBinder.class) Blob object); + + @GET + @ResponseParser(ParseBlobFromHeadersAndHttpContent.class) + @ExceptionParser(ThrowKeyNotFoundOn404.class) + @Path("{container}/{key}") + Future getBlob(@PathParam("container") String container, @PathParam("key") String key); + + @GET + @ResponseParser(ParseBlobFromHeadersAndHttpContent.class) + @ExceptionParser(ThrowKeyNotFoundOn404.class) + @Path("{container}/{key}") + Future getBlob(@PathParam("container") String container, @PathParam("key") String key, + GetOptions options); + + @GET + @Headers(keys = "Range", values = "bytes=0-0") + // should use HEAD, this is a hack per http://code.google.com/p/jclouds/issues/detail?id=92 + @ResponseParser(ParseBlobMetadataFromHeaders.class) + @ExceptionParser(ThrowKeyNotFoundOn404.class) + @Path("{container}/{key}") + BlobMetadata blobMetadata(@PathParam("container") String container, @PathParam("key") String key); + + @DELETE + @ExceptionParser(ReturnTrueOn404.class) + @Path("{container}/{key}") + Future removeBlob(@PathParam("container") String container, @PathParam("key") String key); + +} diff --git a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/binders/BlobBinder.java b/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/binders/BlobBinder.java new file mode 100644 index 0000000000..9e7d01d312 --- /dev/null +++ b/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/binders/BlobBinder.java @@ -0,0 +1,61 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.azure.storage.blob.binders; + +import static com.google.common.base.Preconditions.checkArgument; +import static org.jclouds.blobstore.reference.BlobStoreConstants.PROPERTY_USER_METADATA_PREFIX; + +import javax.ws.rs.core.HttpHeaders; + +import org.jclouds.azure.storage.blob.domain.BlobMetadata; +import org.jclouds.blobstore.domain.Blob; +import org.jclouds.http.HttpRequest; + +import com.google.inject.Inject; +import com.google.inject.name.Named; + +public class BlobBinder extends org.jclouds.blobstore.binders.BlobBinder { + @Inject + public BlobBinder(@Named(PROPERTY_USER_METADATA_PREFIX) String metadataPrefix) { + super(metadataPrefix); + } + + public void addEntityToRequest(Object entity, HttpRequest request) { + Blob object = (Blob) entity; + checkArgument(object.getMetadata().getSize() >= 0, "size must be set"); + + if (object.getMetadata() instanceof BlobMetadata) { + BlobMetadata md = (BlobMetadata) object.getMetadata(); + + if (md.getContentLanguage() != null) { + request.getHeaders().put(HttpHeaders.CONTENT_LANGUAGE, md.getContentLanguage()); + } + + if (md.getContentEncoding() != null) { + request.getHeaders().put(HttpHeaders.CONTENT_ENCODING, md.getContentEncoding()); + } + } + super.addEntityToRequest(entity, request); + } +} diff --git a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/config/AzureBlobContextModule.java b/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/config/AzureBlobContextModule.java index 5d386290a2..14640545e9 100644 --- a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/config/AzureBlobContextModule.java +++ b/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/config/AzureBlobContextModule.java @@ -1,22 +1,71 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ package org.jclouds.azure.storage.blob.config; -import org.jclouds.azure.storage.blob.AzureBlobConnection; import org.jclouds.azure.storage.blob.AzureBlobContext; +import org.jclouds.azure.storage.blob.AzureBlobStore; +import org.jclouds.azure.storage.blob.domain.Blob; +import org.jclouds.azure.storage.blob.domain.BlobMetadata; import org.jclouds.azure.storage.blob.internal.GuiceAzureBlobContext; +import org.jclouds.azure.storage.blob.internal.LiveAzureBlobInputStreamMap; +import org.jclouds.azure.storage.blob.internal.LiveAzureBlobObjectMap; +import org.jclouds.blobstore.functions.ParseBlobFromHeadersAndHttpContent.BlobFactory; +import org.jclouds.blobstore.functions.ParseBlobMetadataFromHeaders.BlobMetadataFactory; import com.google.inject.AbstractModule; +import com.google.inject.TypeLiteral; +import com.google.inject.assistedinject.FactoryProvider; /** - * Configures the {@link AzureBlobContext}; requires {@link AzureBlobConnection} bound. + * Configures the {@link AzureBlobContext}; requires {@link AzureBlobStore} bound. * * @author Adrian Cole */ public class AzureBlobContextModule extends AbstractModule { + protected final TypeLiteral> objectMetadataFactoryLiteral = new TypeLiteral>() { + }; + protected final TypeLiteral> objectFactoryLiteral = new TypeLiteral>() { + }; @Override protected void configure() { - this.requireBinding(AzureBlobConnection.class); + this.requireBinding(AzureBlobStore.class); + bind(GuiceAzureBlobContext.AzureBlobObjectMapFactory.class).toProvider( + FactoryProvider.newFactory(GuiceAzureBlobContext.AzureBlobObjectMapFactory.class, + LiveAzureBlobObjectMap.class)); + bind(GuiceAzureBlobContext.AzureBlobInputStreamMapFactory.class).toProvider( + FactoryProvider.newFactory( + GuiceAzureBlobContext.AzureBlobInputStreamMapFactory.class, + LiveAzureBlobInputStreamMap.class)); bind(AzureBlobContext.class).to(GuiceAzureBlobContext.class); + bind(objectMetadataFactoryLiteral).toProvider( + FactoryProvider.newFactory(objectMetadataFactoryLiteral, + new TypeLiteral() { + })); + bind(objectFactoryLiteral).toProvider( + FactoryProvider.newFactory(objectFactoryLiteral, new TypeLiteral() { + })); } } diff --git a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/config/RestAzureBlobConnectionModule.java b/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/config/RestAzureBlobConnectionModule.java deleted file mode 100644 index 809036e36e..0000000000 --- a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/config/RestAzureBlobConnectionModule.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.jclouds.azure.storage.blob.config; - -import java.net.URI; - -import org.jclouds.azure.storage.blob.AzureBlobConnection; -import org.jclouds.azure.storage.config.RestAzureStorageConnectionModule; -import org.jclouds.cloud.ConfiguresCloudConnection; -import org.jclouds.http.RequiresHttp; -import org.jclouds.rest.RestClientFactory; - -import com.google.inject.Provides; -import com.google.inject.Singleton; - -/** - * Configures the Azure Blob Service connection, including logging and http transport. - * - * @author Adrian Cole - */ -@ConfiguresCloudConnection -@RequiresHttp -public class RestAzureBlobConnectionModule extends RestAzureStorageConnectionModule { - - @Provides - @Singleton - protected AzureBlobConnection provideAzureStorageConnection(URI uri, RestClientFactory factory) { - return factory.create(uri, AzureBlobConnection.class); - } - -} \ No newline at end of file diff --git a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/config/RestAzureBlobStoreModule.java b/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/config/RestAzureBlobStoreModule.java new file mode 100644 index 0000000000..1f76217cb8 --- /dev/null +++ b/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/config/RestAzureBlobStoreModule.java @@ -0,0 +1,57 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.azure.storage.blob.config; + +import java.net.URI; + +import org.jclouds.azure.storage.blob.AzureBlobStore; +import org.jclouds.azure.storage.config.RestAzureStorageConnectionModule; +import org.jclouds.cloud.ConfiguresCloudConnection; +import org.jclouds.http.RequiresHttp; +import org.jclouds.rest.RestClientFactory; + +import com.google.inject.Provides; +import com.google.inject.Singleton; + +/** + * Configures the Azure Blob Service connection, including logging and http transport. + * + * @author Adrian Cole + */ +@ConfiguresCloudConnection +@RequiresHttp +public class RestAzureBlobStoreModule extends RestAzureStorageConnectionModule { + + @Override + protected void configure() { + super.configure(); + } + + @Provides + @Singleton + protected AzureBlobStore provideAzureBlobStore(URI uri, RestClientFactory factory) { + return factory.create(uri, AzureBlobStore.class); + } + +} \ No newline at end of file diff --git a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/domain/ArrayListBlobsResponse.java b/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/domain/ArrayListBlobsResponse.java new file mode 100644 index 0000000000..4b1585f921 --- /dev/null +++ b/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/domain/ArrayListBlobsResponse.java @@ -0,0 +1,108 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.azure.storage.blob.domain; + +import java.net.URI; +import java.util.List; + +import org.jclouds.azure.storage.domain.ArrayBoundedList; + +/** + * + * @author Adrian Cole + * + */ +public class ArrayListBlobsResponse extends ArrayBoundedList implements + ListBlobsResponse { + /** The serialVersionUID */ + private static final long serialVersionUID = -4475709781001190244L; + protected final URI containerUrl; + protected final String blobPrefix; + protected final String delimiter; + + @Override + public String toString() { + return "ArrayListBlobsResponse [blobPrefix=" + blobPrefix + ", containerUrl=" + containerUrl + + ", delimiter=" + delimiter + ", nextMarker=" + nextMarker + ", marker=" + marker + + ", maxResults=" + maxResults + ", prefix=" + prefix + "]"; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = super.hashCode(); + result = prime * result + ((blobPrefix == null) ? 0 : blobPrefix.hashCode()); + result = prime * result + ((containerUrl == null) ? 0 : containerUrl.hashCode()); + result = prime * result + ((delimiter == null) ? 0 : delimiter.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (!super.equals(obj)) + return false; + if (getClass() != obj.getClass()) + return false; + ArrayListBlobsResponse other = (ArrayListBlobsResponse) obj; + if (blobPrefix == null) { + if (other.blobPrefix != null) + return false; + } else if (!blobPrefix.equals(other.blobPrefix)) + return false; + if (containerUrl == null) { + if (other.containerUrl != null) + return false; + } else if (!containerUrl.equals(other.containerUrl)) + return false; + if (delimiter == null) { + if (other.delimiter != null) + return false; + } else if (!delimiter.equals(other.delimiter)) + return false; + return true; + } + + public ArrayListBlobsResponse(URI containerUrl, List contents, String prefix, + String marker, int maxResults, String nextMarker, String delimiter, String blobPrefix) { + super(contents, prefix, marker, maxResults, nextMarker); + this.containerUrl = containerUrl; + this.delimiter = delimiter; + this.blobPrefix = blobPrefix; + } + + public String getBlobPrefix() { + return blobPrefix; + } + + public String getDelimiter() { + return delimiter; + } + + public URI getContainerUrl() { + return containerUrl; + } + +} diff --git a/keyvaluestore/core/src/main/java/org/jclouds/keyvaluestore/reference/ObjectStoreConstants.java b/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/domain/Blob.java old mode 100755 new mode 100644 similarity index 66% rename from keyvaluestore/core/src/main/java/org/jclouds/keyvaluestore/reference/ObjectStoreConstants.java rename to azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/domain/Blob.java index 85e7a0ecd6..100b516ac7 --- a/keyvaluestore/core/src/main/java/org/jclouds/keyvaluestore/reference/ObjectStoreConstants.java +++ b/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/domain/Blob.java @@ -21,22 +21,31 @@ * under the License. * ==================================================================== */ -package org.jclouds.keyvaluestore.reference; +package org.jclouds.azure.storage.blob.domain; + +import com.google.inject.Inject; +import com.google.inject.assistedinject.Assisted; /** - * Configuration properties and constants used in ObjectStore connections. - * * @author Adrian Cole */ -public interface ObjectStoreConstants { +public class Blob extends org.jclouds.blobstore.domain.Blob { - /** - * longest time a single Map operation can take before throwing an exception. - */ - public static final String PROPERTY_OBJECTMAP_TIMEOUT = "jclouds.objectmap.timeout"; - /** - * time to pause before retrying a transient failure - */ - public static final String PROPERTY_OBJECTMAP_RETRY = "jclouds.objectmap.retry"; + public Blob(BlobMetadata metadata, BlobMetadata data) { + super(metadata, data); + } + + @Inject + public Blob(@Assisted BlobMetadata metadata) { + super(metadata); + } + + public Blob(String key, BlobMetadata data) { + this(new BlobMetadata(key), data); + } + + public Blob(String key) { + this(new BlobMetadata(key)); + } } diff --git a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/domain/BlobMetadata.java b/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/domain/BlobMetadata.java new file mode 100644 index 0000000000..e3b9a39e26 --- /dev/null +++ b/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/domain/BlobMetadata.java @@ -0,0 +1,97 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.azure.storage.blob.domain; + +import java.net.URI; + +import org.joda.time.DateTime; + +import com.google.inject.internal.Nullable; + +/** + * + * @author Adrian Cole + * + */ +public class BlobMetadata extends org.jclouds.blobstore.domain.BlobMetadata { + /** The serialVersionUID */ + private static final long serialVersionUID = 1L; + private URI url; + private String contentLanguage; + protected String dataEncoding; + + public BlobMetadata() { + super(); + } + + public BlobMetadata(String key) { + super(key); + } + + public BlobMetadata(String currentName, URI currentUrl, DateTime currentLastModified, + byte[] currentETag, long currentSize, String currentContentType, + @Nullable byte[] contentMD5, @Nullable String currentContentEncoding, + @Nullable String currentContentLanguage) { + this(currentName); + setUrl(currentUrl); + setLastModified(currentLastModified); + setETag(currentETag); + setSize(currentSize); + setContentType(currentContentType); + setContentMD5(contentMD5); + setContentEncoding(currentContentEncoding); + setContentLanguage(currentContentLanguage); + } + + public void setUrl(URI url) { + this.url = url; + } + + public URI getUrl() { + return url; + } + + public void setContentLanguage(String contentLanguage) { + this.contentLanguage = contentLanguage; + } + + public String getContentLanguage() { + return contentLanguage; + } + + public void setContentEncoding(String dataEncoding) { + this.dataEncoding = dataEncoding; + } + + /** + * Specifies what content encodings have been applied to the object and thus what decoding + * mechanisms must be applied in order to obtain the media-type referenced by the Content-Type + * header field. + * + * @see + */ + public String getContentEncoding() { + return dataEncoding; + } +} diff --git a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/domain/ContainerMetadata.java b/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/domain/ContainerMetadata.java index b8202b70a8..50339ee831 100755 --- a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/domain/ContainerMetadata.java +++ b/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/domain/ContainerMetadata.java @@ -33,38 +33,32 @@ import org.joda.time.DateTime; * @author Adrian Cole * */ -public class ContainerMetadata { +public class ContainerMetadata extends org.jclouds.blobstore.domain.ContainerMetadata { private URI url; private DateTime lastModified; private byte[] eTag; - @Override - public String toString() { - return "ContainerMetadata [eTag=" + Arrays.toString(eTag) + ", lastModified=" + lastModified - + ", url=" + url + "]"; - } - - public ContainerMetadata(URI url, DateTime lastModified, byte[] eTag) { - this.url = url; - this.lastModified = lastModified; - this.eTag = eTag; - } - @Override public int hashCode() { final int prime = 31; - int result = 1; + int result = super.hashCode(); result = prime * result + Arrays.hashCode(eTag); result = prime * result + ((lastModified == null) ? 0 : lastModified.hashCode()); result = prime * result + ((url == null) ? 0 : url.hashCode()); return result; } + @Override + public String toString() { + return "ContainerMetadata [eTag=" + Arrays.toString(eTag) + ", lastModified=" + lastModified + + ", url=" + url + ", name=" + name + "]"; + } + @Override public boolean equals(Object obj) { if (this == obj) return true; - if (obj == null) + if (!super.equals(obj)) return false; if (getClass() != obj.getClass()) return false; @@ -84,6 +78,17 @@ public class ContainerMetadata { return true; } + public ContainerMetadata(URI url, DateTime lastModified, byte[] eTag) { + super(url.getPath().substring(1)); + this.url = url; + this.lastModified = lastModified; + this.eTag = eTag; + } + + public ContainerMetadata(String name) { + super(name); + } + public URI getUrl() { return url; } diff --git a/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/functions/ReturnTrueOn204FalseOtherwise.java b/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/domain/ListBlobsResponse.java similarity index 76% rename from rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/functions/ReturnTrueOn204FalseOtherwise.java rename to azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/domain/ListBlobsResponse.java index 7dc979dc0e..b35332d0fa 100644 --- a/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/functions/ReturnTrueOn204FalseOtherwise.java +++ b/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/domain/ListBlobsResponse.java @@ -21,16 +21,20 @@ * under the License. * ==================================================================== */ -package org.jclouds.rackspace.cloudfiles.functions; +package org.jclouds.azure.storage.blob.domain; -import org.jclouds.http.HttpResponse; +import java.net.URI; -import com.google.common.base.Function; +import org.jclouds.azure.storage.domain.BoundedList; -public class ReturnTrueOn204FalseOtherwise implements Function { +/** + * + * @author Adrian Cole + */ +public interface ListBlobsResponse extends BoundedList { + public URI getContainerUrl(); - public Boolean apply(HttpResponse from) { - return (from.getStatusCode() == 204); - } + public String getBlobPrefix(); -} + public String getDelimiter(); +} \ No newline at end of file diff --git a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/functions/ParseBlobFromHeadersAndHttpContent.java b/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/functions/ParseBlobFromHeadersAndHttpContent.java new file mode 100644 index 0000000000..8a3575aeef --- /dev/null +++ b/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/functions/ParseBlobFromHeadersAndHttpContent.java @@ -0,0 +1,46 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.azure.storage.blob.functions; + +import org.jclouds.azure.storage.blob.domain.Blob; +import org.jclouds.azure.storage.blob.domain.BlobMetadata; +import org.jclouds.blobstore.functions.ParseBlobMetadataFromHeaders; + +import com.google.inject.Inject; + +/** + * Parses response headers and creates a new Azure Blob from them and the HTTP content. + * + * @see ParseBlobMetadataFromHeaders + * @author Adrian Cole + */ +public class ParseBlobFromHeadersAndHttpContent extends + org.jclouds.blobstore.functions.ParseBlobFromHeadersAndHttpContent { + @Inject + public ParseBlobFromHeadersAndHttpContent( + ParseBlobMetadataFromHeaders metadataParser, + BlobFactory blobFactory) { + super(metadataParser, blobFactory); + } +} \ No newline at end of file diff --git a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/functions/ParseBlobMetadataFromHeaders.java b/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/functions/ParseBlobMetadataFromHeaders.java new file mode 100644 index 0000000000..19c40d5a64 --- /dev/null +++ b/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/functions/ParseBlobMetadataFromHeaders.java @@ -0,0 +1,64 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.azure.storage.blob.functions; + +import static org.jclouds.blobstore.reference.BlobStoreConstants.PROPERTY_USER_METADATA_PREFIX; + +import javax.ws.rs.core.HttpHeaders; + +import org.jclouds.azure.storage.blob.domain.BlobMetadata; +import org.jclouds.http.HttpResponse; +import org.jclouds.util.DateService; + +import com.google.inject.Inject; +import com.google.inject.name.Named; + +/** + * This parses @{link {@link org.jclouds.azure.storage.blob.domain.BlobMetadata} from HTTP headers. + * + * + * @author Adrian Cole + */ +public class ParseBlobMetadataFromHeaders extends org.jclouds.blobstore.functions.ParseBlobMetadataFromHeaders { + + @Inject + public ParseBlobMetadataFromHeaders(DateService dateParser, + @Named(PROPERTY_USER_METADATA_PREFIX) String metadataPrefix, + BlobMetadataFactory metadataFactory) { + super(dateParser, metadataPrefix, metadataFactory); + } + + /** + * parses the http response headers to create a new + * {@link org.jclouds.azure.storage.blob.domain.BlobMetadata} object. + */ + @Override + public BlobMetadata apply(HttpResponse from) { + BlobMetadata to = super.apply(from); + to.setContentLanguage(from.getFirstHeaderOrNull(HttpHeaders.CONTENT_LANGUAGE)); + to.setContentEncoding(from.getFirstHeaderOrNull(HttpHeaders.CONTENT_ENCODING)); + return to; + } + +} \ No newline at end of file diff --git a/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/functions/ReturnTrueOn404FalseOtherwise.java b/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/functions/ReturnTrueIfContainerAlreadyExists.java similarity index 68% rename from rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/functions/ReturnTrueOn404FalseOtherwise.java rename to azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/functions/ReturnTrueIfContainerAlreadyExists.java index 28e141e5d8..361909ce04 100644 --- a/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/functions/ReturnTrueOn404FalseOtherwise.java +++ b/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/functions/ReturnTrueIfContainerAlreadyExists.java @@ -21,19 +21,26 @@ * under the License. * ==================================================================== */ -package org.jclouds.rackspace.cloudfiles.functions; +package org.jclouds.azure.storage.blob.functions; -import org.jclouds.http.HttpResponseException; +import org.jclouds.azure.storage.AzureStorageResponseException; import com.google.common.base.Function; -public class ReturnTrueOn404FalseOtherwise implements Function { +/** + * + * @author Adrian Cole + */ +public class ReturnTrueIfContainerAlreadyExists implements Function { public Boolean apply(Exception from) { - if (from instanceof HttpResponseException) { - return (404 == ((HttpResponseException)from).getResponse().getStatusCode()); + if (from instanceof AzureStorageResponseException) { + AzureStorageResponseException responseException = (AzureStorageResponseException) from; + if ("ContainerAlreadyExists".equals(responseException.getError().getCode())) { + return true; + } } - return false; + return null; } } diff --git a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/internal/GuiceAzureBlobContext.java b/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/internal/GuiceAzureBlobContext.java index 91facf008e..4858827114 100644 --- a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/internal/GuiceAzureBlobContext.java +++ b/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/internal/GuiceAzureBlobContext.java @@ -1,16 +1,46 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ package org.jclouds.azure.storage.blob.internal; import java.io.IOException; +import java.net.URI; import javax.annotation.Resource; -import org.jclouds.azure.storage.blob.AzureBlobConnection; import org.jclouds.azure.storage.blob.AzureBlobContext; +import org.jclouds.azure.storage.blob.AzureBlobStore; +import org.jclouds.azure.storage.blob.domain.Blob; +import org.jclouds.azure.storage.blob.domain.BlobMetadata; +import org.jclouds.azure.storage.reference.AzureStorageConstants; +import org.jclouds.blobstore.BlobMap; +import org.jclouds.blobstore.InputStreamMap; import org.jclouds.lifecycle.Closer; import org.jclouds.logging.Logger; import com.google.inject.Inject; import com.google.inject.Injector; +import com.google.inject.name.Named; /** * Uses a Guice Injector to configure the objects served by AzureBlobContext methods. @@ -19,26 +49,36 @@ import com.google.inject.Injector; * @see Injector */ public class GuiceAzureBlobContext implements AzureBlobContext { + public interface AzureBlobObjectMapFactory { + BlobMap createMapView(String container); + } + + public interface AzureBlobInputStreamMapFactory { + InputStreamMap createMapView(String container); + } @Resource private Logger logger = Logger.NULL; private final Injector injector; private final Closer closer; + private final AzureBlobInputStreamMapFactory azureInputStreamMapFactory; + private final AzureBlobObjectMapFactory azureObjectMapFactory; + private final URI endPoint; + private final String account; @Inject - private GuiceAzureBlobContext(Injector injector, Closer closer) { + private GuiceAzureBlobContext(Injector injector, Closer closer, + AzureBlobObjectMapFactory azureObjectMapFactory, + AzureBlobInputStreamMapFactory azureInputStreamMapFactory, + @Named(AzureStorageConstants.PROPERTY_AZURESTORAGE_ACCOUNT) String account, URI endPoint) { this.injector = injector; this.closer = closer; + this.azureInputStreamMapFactory = azureInputStreamMapFactory; + this.azureObjectMapFactory = azureObjectMapFactory; + this.endPoint = endPoint; + this.account = account; } - /** - * {@inheritDoc} - */ - public AzureBlobConnection getConnection() { - return injector.getInstance(AzureBlobConnection.class); - } - - /** * {@inheritDoc} * @@ -52,4 +92,25 @@ public class GuiceAzureBlobContext implements AzureBlobContext { } } + public String getAccount() { + return account; + } + + public AzureBlobStore getApi() { + return injector.getInstance(AzureBlobStore.class); + } + + public URI getEndPoint() { + return endPoint; + } + + public BlobMap createBlobMap(String container) { + getApi().createContainer(container); + return azureObjectMapFactory.createMapView(container); + } + + public InputStreamMap createInputStreamMap(String container) { + getApi().createContainer(container); + return azureInputStreamMapFactory.createMapView(container); + } } diff --git a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/internal/LiveAzureBlobInputStreamMap.java b/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/internal/LiveAzureBlobInputStreamMap.java new file mode 100644 index 0000000000..fe14e37881 --- /dev/null +++ b/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/internal/LiveAzureBlobInputStreamMap.java @@ -0,0 +1,61 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.azure.storage.blob.internal; + +import org.jclouds.azure.storage.blob.AzureBlobStore; +import org.jclouds.azure.storage.blob.domain.Blob; +import org.jclouds.azure.storage.blob.domain.BlobMetadata; +import org.jclouds.azure.storage.blob.domain.ContainerMetadata; +import org.jclouds.blobstore.LiveInputStreamMap; + +import com.google.inject.Inject; +import com.google.inject.assistedinject.Assisted; + +/** + * Map representation of a live connection to AzureBlob. All put operations will result in ETag + * calculation. If this is not desired, use {@link LiveAzureBlobObjectMap} instead. + * + * @author Adrian Cole + * @see AzureBlobStore + * @see LiveInputStreamMap + */ +public class LiveAzureBlobInputStreamMap extends + LiveInputStreamMap { + + @Override + public boolean containsValue(Object value) { + throw new UnsupportedOperationException( + "http://code.google.com/p/jclouds/issues/detail?id=90"); + } + + @Inject + public LiveAzureBlobInputStreamMap(AzureBlobStore connection, @Assisted String container) { + super(connection, container); + } + + @Override + protected Blob createBlob(String s) { + return new Blob(s); + } +} diff --git a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/internal/LiveAzureBlobObjectMap.java b/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/internal/LiveAzureBlobObjectMap.java new file mode 100644 index 0000000000..cc58957408 --- /dev/null +++ b/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/internal/LiveAzureBlobObjectMap.java @@ -0,0 +1,55 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.azure.storage.blob.internal; + +import org.jclouds.azure.storage.blob.AzureBlobStore; +import org.jclouds.azure.storage.blob.domain.Blob; +import org.jclouds.azure.storage.blob.domain.BlobMetadata; +import org.jclouds.azure.storage.blob.domain.ContainerMetadata; +import org.jclouds.blobstore.LiveBlobMap; + +import com.google.inject.Inject; +import com.google.inject.assistedinject.Assisted; + +/** + * Map representation of a live connection to AzureBlob. + * + * @see AzureBlobStore + * @see LiveBlobMap + * + * @author Adrian Cole + */ +public class LiveAzureBlobObjectMap extends LiveBlobMap { + + @Inject + public LiveAzureBlobObjectMap(AzureBlobStore connection, @Assisted String container) { + super(connection, container); + } + + @Override + public boolean containsValue(Object value) { + throw new UnsupportedOperationException( + "http://code.google.com/p/jclouds/issues/detail?id=90"); + } +} diff --git a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/options/CreateContainerOptions.java b/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/options/CreateContainerOptions.java index 8b38cb0ce5..87e5c9ea5c 100644 --- a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/options/CreateContainerOptions.java +++ b/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/options/CreateContainerOptions.java @@ -1,3 +1,26 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ package org.jclouds.azure.storage.blob.options; import org.jclouds.azure.storage.options.CreateOptions; diff --git a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/options/ListBlobsOptions.java b/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/options/ListBlobsOptions.java new file mode 100644 index 0000000000..317bbd5e55 --- /dev/null +++ b/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/options/ListBlobsOptions.java @@ -0,0 +1,71 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.azure.storage.blob.options; + +import org.jclouds.azure.storage.options.ListOptions; + +/** + * Contains options supported in the REST API for the List Blobs operation.

    + * Usage

    The recommended way to instantiate a ListBlobsOptions object is to statically import + * ListBlobsOptions.* and invoke a static creation method followed by an instance mutator (if + * needed): + *

    + * + * import static org.jclouds.azure.storage.blob.options.ListBlobsOptions.Builder.* + * import org.jclouds.azure.storage.blob.AzureBlobConnection; + *

    + * AzureBlobConnection connection = // get connection + * Set blobs = connection.listBlobs("containerName", delimiter("/")); + * * + * + * @see + * @author Adrian Cole + */ +public class ListBlobsOptions extends ListOptions { + + /** + * When the request includes this parameter, the operation returns a {@code BlobPrefix} element + * in the response body that acts as a placeholder for all blobs whose names begin with the same + * substring up to the appearance of the delimiter character. + * + * @param delimiter + * a single character or a string. + */ + public ListBlobsOptions delimiter(String delimiter) { + this.queryParameters.put("delimiter", delimiter); + return this; + } + + public static class Builder { + + /** + * @see ListBlobsOptions#delimiter(String) + */ + public static ListBlobsOptions delimiter(String delimiter) { + ListBlobsOptions options = new ListBlobsOptions(); + return options.delimiter(delimiter); + } + + } +} diff --git a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/xml/AccountNameEnumerationResultsHandler.java b/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/xml/AccountNameEnumerationResultsHandler.java index 37df62a5a4..ad1c3c64e6 100755 --- a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/xml/AccountNameEnumerationResultsHandler.java +++ b/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/xml/AccountNameEnumerationResultsHandler.java @@ -28,7 +28,8 @@ import java.util.ArrayList; import java.util.List; import org.jclouds.azure.storage.blob.domain.ContainerMetadata; -import org.jclouds.azure.storage.domain.MetadataList; +import org.jclouds.azure.storage.domain.ArrayBoundedList; +import org.jclouds.azure.storage.domain.BoundedList; import org.jclouds.http.HttpUtils; import org.jclouds.http.functions.ParseSax; import org.jclouds.util.DateService; @@ -45,7 +46,7 @@ import com.google.inject.Inject; * @author Adrian Cole */ public class AccountNameEnumerationResultsHandler extends - ParseSax.HandlerWithResult> { + ParseSax.HandlerWithResult> { private List containerMetadata = new ArrayList(); private String prefix; @@ -65,8 +66,8 @@ public class AccountNameEnumerationResultsHandler extends this.dateParser = dateParser; } - public MetadataList getResult() { - return new MetadataList(prefix, marker, maxResults, containerMetadata, + public BoundedList getResult() { + return new ArrayBoundedList(containerMetadata, prefix, marker, maxResults, nextMarker); } diff --git a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/xml/AzureBlobParserFactory.java b/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/xml/AzureBlobParserFactory.java index ae8b83ca20..65107877d2 100644 --- a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/xml/AzureBlobParserFactory.java +++ b/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/xml/AzureBlobParserFactory.java @@ -1,7 +1,31 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ package org.jclouds.azure.storage.blob.xml; import org.jclouds.azure.storage.blob.domain.ContainerMetadata; -import org.jclouds.azure.storage.domain.MetadataList; +import org.jclouds.azure.storage.blob.domain.ListBlobsResponse; +import org.jclouds.azure.storage.domain.BoundedList; import org.jclouds.azure.storage.xml.AzureStorageParserFactory; import org.jclouds.http.functions.ParseSax; @@ -18,12 +42,22 @@ import com.google.inject.Provider; public class AzureBlobParserFactory extends AzureStorageParserFactory { @Inject - private GenericParseFactory> parseContainerMetadataListFactory; + private GenericParseFactory> parseContainerMetadataListFactory; @Inject Provider containerMetaListHandlerProvider; - public ParseSax> createContainerMetadataListParser() { + public ParseSax> createContainerMetadataListParser() { return parseContainerMetadataListFactory.create(containerMetaListHandlerProvider.get()); } + + @Inject + private GenericParseFactory parseListBlobsResponseFactory; + + @Inject + Provider listBlobsResponseHandlerProvider; + + public ParseSax createListBlobsResponseParser() { + return parseListBlobsResponseFactory.create(listBlobsResponseHandlerProvider.get()); + } } \ No newline at end of file diff --git a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/xml/ContainerNameEnumerationResultsHandler.java b/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/xml/ContainerNameEnumerationResultsHandler.java new file mode 100644 index 0000000000..aaa283eeaf --- /dev/null +++ b/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/xml/ContainerNameEnumerationResultsHandler.java @@ -0,0 +1,158 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.azure.storage.blob.xml; + +import java.net.URI; +import java.util.ArrayList; +import java.util.List; + +import org.jclouds.azure.storage.blob.domain.ArrayListBlobsResponse; +import org.jclouds.azure.storage.blob.domain.BlobMetadata; +import org.jclouds.azure.storage.blob.domain.ListBlobsResponse; +import org.jclouds.http.HttpUtils; +import org.jclouds.http.functions.ParseSax; +import org.jclouds.util.DateService; +import org.joda.time.DateTime; +import org.xml.sax.Attributes; +import org.xml.sax.SAXException; + +import com.google.inject.Inject; + +/** + * Parses the following XML document: + *

    + * EnumerationResults ContainerName="http://myaccount.blob.core.windows.net/mycontainer" + * + * @see + * @author Adrian Cole + */ +public class ContainerNameEnumerationResultsHandler extends + ParseSax.HandlerWithResult { + + private List blobMetadata = new ArrayList(); + private String prefix; + private String marker; + private int maxResults; + private String nextMarker; + private URI currentUrl; + private URI containerUrl; + private DateTime currentLastModified; + private byte[] currentETag; + + private StringBuilder currentText = new StringBuilder(); + + private final DateService dateParser; + private String delimiter; + private String blobPrefix; + private String currentName; + private long currentSize; + private String currentContentType; + private String currentContentEncoding; + private String currentContentLanguage; + private boolean inBlob; + private boolean inBlobPrefix; + + @Inject + public ContainerNameEnumerationResultsHandler(DateService dateParser) { + this.dateParser = dateParser; + } + + public ListBlobsResponse getResult() { + return new ArrayListBlobsResponse(containerUrl, blobMetadata, prefix, marker, maxResults, + nextMarker, delimiter, blobPrefix); + } + + @Override + public void startElement(String uri, String localName, String qName, Attributes attributes) + throws SAXException { + if (qName.equals("Blob")) { + inBlob = true; + inBlobPrefix = false; + } else if (qName.equals("BlobPrefix")) { + inBlob = false; + inBlobPrefix = true; + } else if (qName.equals("EnumerationResults")) { + containerUrl = URI.create(attributes.getValue("ContainerName").toString().trim()); + } + } + + public void endElement(String uri, String name, String qName) { + if (qName.equals("MaxResults")) { + maxResults = Integer.parseInt(currentText.toString().trim()); + } else if (qName.equals("Marker")) { + marker = currentText.toString().trim(); + marker = (marker.equals("")) ? null : marker; + } else if (qName.equals("Prefix")) { + prefix = currentText.toString().trim(); + prefix = (prefix.equals("")) ? null : prefix; + } else if (qName.equals("Delimiter")) { + delimiter = currentText.toString().trim(); + delimiter = (prefix.equals("")) ? null : delimiter; + } else if (qName.equals("NextMarker")) { + nextMarker = currentText.toString().trim(); + nextMarker = (nextMarker.equals("")) ? null : nextMarker; + } else if (qName.equals("Blob")) { + BlobMetadata md = new BlobMetadata(currentName, currentUrl, currentLastModified, + currentETag, currentSize, currentContentType, null, currentContentEncoding, + currentContentLanguage); + blobMetadata.add(md); + currentName = null; + currentUrl = null; + currentLastModified = null; + currentETag = null; + currentSize = -1; + currentContentType = null; + currentContentEncoding = null; + currentContentLanguage = null; + } else if (qName.equals("Url")) { + currentUrl = URI.create(currentText.toString().trim()); + } else if (qName.equals("LastModified")) { + currentLastModified = dateParser.rfc822DateParse(currentText.toString().trim()); + } else if (qName.equals("Etag")) { + currentETag = HttpUtils.fromHexString(currentText.toString().trim()); + } else if (qName.equals("Name")) { + if (inBlob) + currentName = currentText.toString().trim(); + else if (inBlobPrefix) + blobPrefix = currentText.toString().trim(); + } else if (qName.equals("Size")) { + currentSize = Long.parseLong(currentText.toString().trim()); + } else if (qName.equals("ContentType")) { + currentContentType = currentText.toString().trim(); + } else if (qName.equals("ContentEncoding")) { + currentContentEncoding = currentText.toString().trim(); + if (currentContentEncoding.equals("")) + currentContentEncoding = null; + } else if (qName.equals("ContentLanguage")) { + currentContentLanguage = currentText.toString().trim(); + if (currentContentLanguage.equals("")) + currentContentLanguage = null; + } + currentText = new StringBuilder(); + } + + public void characters(char ch[], int start, int length) { + currentText.append(ch, start, length); + } +} diff --git a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/xml/config/AzureBlobParserModule.java b/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/xml/config/AzureBlobParserModule.java index 2ccf39878b..002d25c4d0 100644 --- a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/xml/config/AzureBlobParserModule.java +++ b/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/xml/config/AzureBlobParserModule.java @@ -1,8 +1,33 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ package org.jclouds.azure.storage.blob.xml.config; import org.jclouds.azure.storage.blob.domain.ContainerMetadata; +import org.jclouds.azure.storage.blob.domain.ListBlobsResponse; import org.jclouds.azure.storage.blob.xml.AccountNameEnumerationResultsHandler; -import org.jclouds.azure.storage.domain.MetadataList; +import org.jclouds.azure.storage.blob.xml.ContainerNameEnumerationResultsHandler; +import org.jclouds.azure.storage.domain.BoundedList; import org.jclouds.azure.storage.xml.AzureStorageParserFactory; import org.jclouds.azure.storage.xml.config.AzureStorageParserModule; import org.jclouds.command.ConfiguresResponseTransformer; @@ -18,14 +43,19 @@ import com.google.inject.assistedinject.FactoryProvider; */ @ConfiguresResponseTransformer public class AzureBlobParserModule extends AzureStorageParserModule { - protected final TypeLiteral>> accountNameEnumerationResultsHandler = new TypeLiteral>>() { + protected final TypeLiteral>> accountNameEnumerationResultsHandler = new TypeLiteral>>() { + }; + + protected final TypeLiteral> containerNameEnumerationResultsHandler = new TypeLiteral>() { }; @Override protected void bindParserImplementationsToReturnTypes() { super.bindParserImplementationsToReturnTypes(); - bind(new TypeLiteral>>() { + bind(new TypeLiteral>>() { }).to(AccountNameEnumerationResultsHandler.class); + bind(new TypeLiteral>() { + }).to(ContainerNameEnumerationResultsHandler.class); } @Override @@ -33,7 +63,11 @@ public class AzureBlobParserModule extends AzureStorageParserModule { super.bindCallablesThatReturnParseResults(); bind(accountNameEnumerationResultsHandler).toProvider( FactoryProvider.newFactory(accountNameEnumerationResultsHandler, - new TypeLiteral>>() { + new TypeLiteral>>() { + })); + bind(containerNameEnumerationResultsHandler).toProvider( + FactoryProvider.newFactory(containerNameEnumerationResultsHandler, + new TypeLiteral>() { })); } diff --git a/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/AzureBlobConnectionLiveTest.java b/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/AzureBlobConnectionLiveTest.java deleted file mode 100644 index fc9490e86b..0000000000 --- a/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/AzureBlobConnectionLiveTest.java +++ /dev/null @@ -1,154 +0,0 @@ -package org.jclouds.azure.storage.blob; - -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertTrue; - -import java.lang.reflect.UndeclaredThrowableException; -import java.net.URL; -import java.security.SecureRandom; - -import org.jclouds.azure.storage.AzureStorageResponseException; -import org.jclouds.azure.storage.blob.domain.ContainerMetadata; -import org.jclouds.azure.storage.blob.options.CreateContainerOptions; -import org.jclouds.azure.storage.domain.MetadataList; -import org.jclouds.azure.storage.options.ListOptions; -import org.jclouds.azure.storage.reference.AzureStorageConstants; -import org.jclouds.http.HttpResponseException; -import org.jclouds.logging.log4j.config.Log4JLoggingModule; -import org.jclouds.util.Utils; -import org.testng.annotations.BeforeGroups; -import org.testng.annotations.Test; - -import com.google.common.collect.ImmutableMultimap; -import com.google.inject.Injector; - -/** - * Tests behavior of {@code AzureBlobConnection} - * - * @author Adrian Cole - */ -@Test(groups = "live", sequential = true, testName = "cloudservers.AzureBlobConnectionLiveTest") -public class AzureBlobConnectionLiveTest { - - protected static final String sysAzureStorageAccount = System - .getProperty(AzureStorageConstants.PROPERTY_AZURESTORAGE_ACCOUNT); - protected static final String sysAzureStorageKey = System - .getProperty(AzureStorageConstants.PROPERTY_AZURESTORAGE_KEY); - protected AzureBlobConnection connection; - - private String containerPrefix = System.getProperty("user.name") + "-azureblob"; - - @BeforeGroups(groups = { "live" }) - public void setupConnection() { - Injector injector = AzureBlobContextBuilder.newBuilder(sysAzureStorageAccount, - sysAzureStorageKey).withModules(new Log4JLoggingModule()).withSaxDebug() - .buildInjector(); - connection = injector.getInstance(AzureBlobConnection.class); - } - - @Test - public void testListContainers() throws Exception { - - MetadataList response = connection.listContainers(); - assert null != response; - long initialContainerCount = response.getMetadata().size(); - assertTrue(initialContainerCount >= 0); - - } - - String privateContainer; - String publicContainer; - - @Test(timeOut = 5 * 60 * 1000) - public void testCreateContainer() throws Exception { - boolean created = false; - while (!created) { - privateContainer = containerPrefix + new SecureRandom().nextInt(); - try { - created = connection.createContainer(privateContainer, CreateContainerOptions.Builder - .withMetadata(ImmutableMultimap.of("foo", "bar"))); - } catch (UndeclaredThrowableException e) { - HttpResponseException htpe = (HttpResponseException) e.getCause().getCause(); - if (htpe.getResponse().getStatusCode() == 409) - continue; - throw e; - } - } - MetadataList response = connection.listContainers(); - assert null != response; - long containerCount = response.getMetadata().size(); - assertTrue(containerCount >= 1); - // TODO ... check to see the container actually exists - } - - @Test(timeOut = 5 * 60 * 1000) - public void testCreatePublicContainer() throws Exception { - boolean created = false; - while (!created) { - publicContainer = containerPrefix + new SecureRandom().nextInt(); - try { - created = connection.createContainer(publicContainer, CreateContainerOptions.Builder - .withPublicAcl()); - } catch (UndeclaredThrowableException e) { - HttpResponseException htpe = (HttpResponseException) e.getCause().getCause(); - if (htpe.getResponse().getStatusCode() == 409) - continue; - throw e; - } - } - - URL url = new URL(String.format("http://%s.blob.core.windows.net/%s", sysAzureStorageAccount, - publicContainer)); - Utils.toStringAndClose(url.openStream()); - } - - @Test(timeOut = 5 * 60 * 1000) - public void testCreatePublicRootContainer() throws Exception { - try { - connection.deleteRootContainer(); - } catch (Exception e) { - // don't care.. we wish to recreate it. - } - boolean created = false; - while (!created) { - try { - created = connection.createRootContainer(); - } catch (UndeclaredThrowableException e) { - AzureStorageResponseException htpe = (AzureStorageResponseException) e.getCause() - .getCause(); - if (htpe.getResponse().getStatusCode() == 409) {// TODO look for specific message - Thread.sleep(5000); - continue; - } - throw e; - } - } - // TODO check if it really exists. - } - - @Test - public void testListContainersWithOptions() throws Exception { - - MetadataList response = connection.listContainers(ListOptions.Builder - .prefix(privateContainer).maxResults(1)); - assert null != response; - long initialContainerCount = response.getMetadata().size(); - assertTrue(initialContainerCount >= 0); - assertEquals(privateContainer, response.getPrefix()); - assertEquals(1, response.getMaxResults()); - } - - @Test(timeOut = 5 * 60 * 1000, dependsOnMethods = { "testCreateContainer", - "testCreatePublicContainer" }) - public void testDeleteContainer() throws Exception { - assert connection.deleteContainer(privateContainer); - assert connection.deleteContainer(publicContainer); - // TODO loop for up to 30 seconds checking if they are really gone - } - - @Test(timeOut = 5 * 60 * 1000, dependsOnMethods = { "testCreatePublicRootContainer" }) - public void testDeleteRootContainer() throws Exception { - assert connection.deleteRootContainer(); - // TODO loop for up to 30 seconds checking if they are really gone - } -} diff --git a/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/AzureBlobContextBuilderTest.java b/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/AzureBlobContextBuilderTest.java new file mode 100644 index 0000000000..8a048ef0be --- /dev/null +++ b/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/AzureBlobContextBuilderTest.java @@ -0,0 +1,104 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.azure.storage.blob; + +import static org.jclouds.blobstore.reference.BlobStoreConstants.PROPERTY_USER_METADATA_PREFIX; +import static org.jclouds.http.HttpConstants.PROPERTY_HTTP_ADDRESS; +import static org.testng.Assert.assertEquals; + +import java.net.URI; +import java.util.ArrayList; +import java.util.List; + +import org.jclouds.azure.storage.blob.config.AzureBlobContextModule; +import org.jclouds.azure.storage.blob.config.RestAzureBlobStoreModule; +import org.jclouds.azure.storage.blob.domain.Blob; +import org.jclouds.azure.storage.blob.domain.BlobMetadata; +import org.jclouds.azure.storage.blob.internal.GuiceAzureBlobContext; +import org.jclouds.azure.storage.reference.AzureStorageConstants; +import org.jclouds.blobstore.functions.ParseBlobFromHeadersAndHttpContent.BlobFactory; +import org.jclouds.blobstore.functions.ParseBlobMetadataFromHeaders.BlobMetadataFactory; +import org.jclouds.cloud.CloudContext; +import org.testng.annotations.Test; + +import com.google.inject.Injector; +import com.google.inject.Key; +import com.google.inject.Module; +import com.google.inject.TypeLiteral; + +/** + * Tests behavior of modules configured in AzureBlobContextBuilder + * + * @author Adrian Cole + */ +@Test(groups = "unit", testName = "azureblob.AzureBlobContextBuilderTest") +public class AzureBlobContextBuilderTest { + + public void testNewBuilder() { + AzureBlobContextBuilder builder = AzureBlobContextBuilder.newBuilder("id", "secret"); + assertEquals(builder.getProperties().getProperty(PROPERTY_USER_METADATA_PREFIX), "x-ms-meta-"); + assertEquals(builder.getProperties().getProperty(PROPERTY_HTTP_ADDRESS), + "id.blob.core.windows.net"); + assertEquals(builder.getProperties().getProperty( + AzureStorageConstants.PROPERTY_AZURESTORAGE_ACCOUNT), "id"); + assertEquals(builder.getProperties().getProperty( + AzureStorageConstants.PROPERTY_AZURESTORAGE_KEY), "secret"); + } + + public void testBuildContext() { + CloudContext context = AzureBlobContextBuilder.newBuilder("id", "secret") + .buildContext(); + assertEquals(context.getClass(), GuiceAzureBlobContext.class); + assertEquals(context.getAccount(), "id"); + assertEquals(context.getEndPoint(), URI.create("https://id.blob.core.windows.net:443")); + } + + public void testBuildInjector() { + Injector i = AzureBlobContextBuilder.newBuilder("id", "secret").buildInjector(); + assert i.getInstance(AzureBlobContext.class) != null; + assert i.getInstance(GuiceAzureBlobContext.AzureBlobObjectMapFactory.class) != null; + assert i.getInstance(GuiceAzureBlobContext.AzureBlobInputStreamMapFactory.class) != null; + assert i.getInstance(Key.get(new TypeLiteral>() { + })) != null; + assert i.getInstance(Key.get(new TypeLiteral>() { + })) != null; + } + + protected void testAddContextModule() { + List modules = new ArrayList(); + AzureBlobContextBuilder builder = AzureBlobContextBuilder.newBuilder("id", "secret"); + builder.addContextModule(modules); + assertEquals(modules.size(), 1); + assertEquals(modules.get(0).getClass(), AzureBlobContextModule.class); + } + + protected void addConnectionModule() { + List modules = new ArrayList(); + AzureBlobContextBuilder builder = AzureBlobContextBuilder.newBuilder("id", "secret"); + builder.addConnectionModule(modules); + assertEquals(modules.size(), 1); + assertEquals(modules.get(0).getClass(), RestAzureBlobStoreModule.class); + } + +} diff --git a/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/AzureBlobStoreLiveTest.java b/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/AzureBlobStoreLiveTest.java new file mode 100644 index 0000000000..63f4b3a098 --- /dev/null +++ b/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/AzureBlobStoreLiveTest.java @@ -0,0 +1,354 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.azure.storage.blob; + +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertTrue; + +import java.io.ByteArrayInputStream; +import java.io.InputStream; +import java.lang.reflect.UndeclaredThrowableException; +import java.net.URI; +import java.net.URL; +import java.security.SecureRandom; +import java.util.List; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.TimeUnit; + +import org.apache.commons.io.IOUtils; +import org.jclouds.azure.storage.AzureStorageResponseException; +import org.jclouds.azure.storage.blob.domain.Blob; +import org.jclouds.azure.storage.blob.domain.BlobMetadata; +import org.jclouds.azure.storage.blob.domain.ContainerMetadata; +import org.jclouds.azure.storage.blob.domain.ListBlobsResponse; +import org.jclouds.azure.storage.blob.options.CreateContainerOptions; +import org.jclouds.azure.storage.domain.BoundedList; +import org.jclouds.azure.storage.options.ListOptions; +import org.jclouds.http.HttpResponseException; +import org.jclouds.http.HttpUtils; +import org.jclouds.http.options.GetOptions; +import org.jclouds.logging.log4j.config.Log4JLoggingModule; +import org.jclouds.util.Utils; +import org.testng.annotations.BeforeGroups; +import org.testng.annotations.Test; + +import com.google.common.collect.ImmutableMultimap; +import com.google.common.collect.Iterables; +import com.google.inject.Injector; + +/** + * Tests behavior of {@code AzureBlobConnection} + * + * @author Adrian Cole + */ +@Test(groups = "live", sequential = true, testName = "cloudservers.AzureBlobStoreLiveTest") +public class AzureBlobStoreLiveTest { + + protected AzureBlobStore connection; + + private String containerPrefix = System.getProperty("user.name") + "-azureblob"; + + @BeforeGroups(groups = { "live" }) + public void setupConnection() { + account = System.getProperty("jclouds.test.user"); + String key = System.getProperty("jclouds.test.key"); + Injector injector = AzureBlobContextBuilder.newBuilder(account, key).withModules( + new Log4JLoggingModule()).withSaxDebug().buildInjector(); + connection = injector.getInstance(AzureBlobStore.class); + } + + @Test + public void testListContainers() throws Exception { + + List response = connection.listContainers(); + assert null != response; + long initialContainerCount = response.size(); + assertTrue(initialContainerCount >= 0); + + } + + String privateContainer; + String publicContainer; + String account; + + @Test(timeOut = 5 * 60 * 1000) + public void testCreateContainer() throws Exception { + boolean created = false; + while (!created) { + privateContainer = containerPrefix + new SecureRandom().nextInt(); + try { + created = connection.createContainer( + privateContainer, + CreateContainerOptions.Builder + .withMetadata(ImmutableMultimap.of("foo", "bar"))).get(10, + TimeUnit.SECONDS); + } catch (UndeclaredThrowableException e) { + HttpResponseException htpe = (HttpResponseException) e.getCause().getCause(); + if (htpe.getResponse().getStatusCode() == 409) + continue; + throw e; + } + } + List response = connection.listContainers(); + assert null != response; + long containerCount = response.size(); + assertTrue(containerCount >= 1); + ListBlobsResponse list = connection.listBlobs(privateContainer).get(10, TimeUnit.SECONDS); + assertEquals(list.getContainerUrl(), URI.create(String.format( + "https://%s.blob.core.windows.net/%s", account, privateContainer))); + // TODO ... check to see the container actually exists + } + + @Test(timeOut = 5 * 60 * 1000) + public void testCreatePublicContainer() throws Exception { + boolean created = false; + while (!created) { + publicContainer = containerPrefix + new SecureRandom().nextInt(); + try { + created = connection.createContainer(publicContainer, + CreateContainerOptions.Builder.withPublicAcl()).get(10, TimeUnit.SECONDS); + } catch (UndeclaredThrowableException e) { + HttpResponseException htpe = (HttpResponseException) e.getCause().getCause(); + if (htpe.getResponse().getStatusCode() == 409) + continue; + throw e; + } + } + + URL url = new URL(String.format("http://%s.blob.core.windows.net/%s", account, + publicContainer)); + Utils.toStringAndClose(url.openStream()); + } + + @Test(timeOut = 5 * 60 * 1000) + public void testCreatePublicRootContainer() throws Exception { + try { + connection.deleteRootContainer().get(10, TimeUnit.SECONDS); + } catch (ExecutionException e) { + sleepIfWaitingForDeleteToFinish(e); + } + boolean created = false; + while (!created) { + try { + created = connection.createRootContainer().get(10, TimeUnit.SECONDS); + } catch (ExecutionException e) { + AzureStorageResponseException htpe = (AzureStorageResponseException) e.getCause() + .getCause(); + if (htpe.getResponse().getStatusCode() == 409) {// TODO look for specific message + Thread.sleep(5000); + continue; + } + throw e; + } + } + ListBlobsResponse list = connection.listBlobs().get(10, TimeUnit.SECONDS); + assertEquals(list.getContainerUrl(), URI.create(String.format( + "https://%s.blob.core.windows.net/%%24root", account))); + } + + private void sleepIfWaitingForDeleteToFinish(ExecutionException e) throws InterruptedException { + if (e.getCause() instanceof AzureStorageResponseException) { + if (((AzureStorageResponseException) e.getCause()).getResponse().getStatusCode() == 409) { + Thread.sleep(5000); + } + } + } + + @Test + public void testListContainersWithOptions() throws Exception { + + BoundedList response = connection.listContainers(ListOptions.Builder + .prefix(privateContainer).maxResults(1)); + assert null != response; + long initialContainerCount = response.size(); + assertTrue(initialContainerCount >= 0); + assertEquals(privateContainer, response.getPrefix()); + assertEquals(1, response.getMaxResults()); + } + + @Test(timeOut = 5 * 60 * 1000, dependsOnMethods = { "testCreatePublicRootContainer" }) + public void testDeleteRootContainer() throws Exception { + assert connection.deleteRootContainer().get(10, TimeUnit.SECONDS); + // TODO loop for up to 30 seconds checking if they are really gone + } + + @Test(timeOut = 5 * 60 * 1000, dependsOnMethods = { "testCreateContainer", + "testCreatePublicContainer" }) + public void testListOwnedContainers() throws Exception { + + // Test default listing + List response = connection.listContainers(); + // assertEquals(response.size(), initialContainerCount + 2);// if the containers already + // exist, this will fail + + // Test listing with options + response = connection.listContainers(ListOptions.Builder.prefix( + privateContainer.substring(0, privateContainer.length() - 1)).maxResults(1)); + assertEquals(response.size(), 1); + assertEquals(response.get(0).getName(), privateContainer); + + response = connection.listContainers(ListOptions.Builder.prefix(publicContainer) + .maxResults(1)); + assertEquals(response.size(), 1); + assertEquals(response.get(0).getName(), publicContainer); + + } + + @Test + public void testDeleteOneContainer() throws Exception { + assertTrue(connection.deleteContainer("does-not-exist").get(10, TimeUnit.SECONDS)); + } + + @Test(timeOut = 5 * 60 * 1000, dependsOnMethods = { "testListOwnedContainers", + "testObjectOperations" }) + public void testDeleteContainer() throws Exception { + assert connection.deleteContainer(privateContainer).get(10, TimeUnit.SECONDS); + assert connection.deleteContainer(publicContainer).get(10, TimeUnit.SECONDS); + // TODO loop for up to 30 seconds checking if they are really gone + } + + @Test(timeOut = 5 * 60 * 1000, dependsOnMethods = { "testCreateContainer", + "testCreatePublicContainer" }) + public void testObjectOperations() throws Exception { + String data = "Here is my data"; + + // Test PUT with string data, ETag hash, and a piece of metadata + Blob object = new Blob("object"); + object.setData(data); + object.setContentLength(data.length()); + object.generateMD5(); + object.getMetadata().setContentType("text/plain"); + object.getMetadata().getUserMetadata().put("Metadata", "metadata-value"); + byte[] md5 = object.getMetadata().getContentMD5(); + byte[] newEtag = connection.putBlob(privateContainer, object).get(10, TimeUnit.SECONDS); + assertEquals(HttpUtils.toHexString(md5), HttpUtils.toHexString(object.getMetadata() + .getContentMD5())); + + // Test HEAD of missing object + try { + connection.blobMetadata(privateContainer, "non-existent-object"); + assert false; + } catch (Exception e) { + e.printStackTrace(); + } + + // Test HEAD of object + BlobMetadata metadata = connection.blobMetadata(privateContainer, object.getKey()); + // TODO assertEquals(metadata.getKey(), object.getKey()); + // we can't check this while hacking around lack of content-md5, as GET of the first byte will + // show incorrect length 1, the returned size, as opposed to the real length. This is an ok + // tradeoff, as a container list will contain the correct size of the objects in an + // inexpensive fashion + // http://code.google.com/p/jclouds/issues/detail?id=92 + // assertEquals(metadata.getSize(), data.length()); + assertEquals(metadata.getContentType(), "text/plain"); + // Azure doesn't return the Content-MD5 on head request... + assertEquals(HttpUtils.toHexString(md5), HttpUtils.toHexString(object.getMetadata() + .getContentMD5())); + assertEquals(metadata.getETag(), newEtag); + assertEquals(metadata.getUserMetadata().entries().size(), 1); + assertEquals(Iterables.getLast(metadata.getUserMetadata().get("metadata")), "metadata-value"); + + // // Test POST to update object's metadata + // Multimap userMetadata = HashMultimap.create(); + // userMetadata.put("New-Metadata-1", "value-1"); + // userMetadata.put("New-Metadata-2", "value-2"); + // assertTrue(connection.setObjectMetadata(privateContainer, object.getKey(), userMetadata)); + + // Test GET of missing object + try { + connection.getBlob(privateContainer, "non-existent-object").get(10, TimeUnit.SECONDS); + assert false; + } catch (Exception e) { + e.printStackTrace(); + } + // Test GET of object (including updated metadata) + Blob getBlob = connection.getBlob(privateContainer, object.getKey()).get(120, + TimeUnit.SECONDS); + assertEquals(IOUtils.toString((InputStream) getBlob.getData()), data); + // TODO assertEquals(getBlob.getKey(), object.getKey()); + assertEquals(getBlob.getContentLength(), data.length()); + assertEquals(getBlob.getMetadata().getContentType(), "text/plain"); + assertEquals(HttpUtils.toHexString(md5), HttpUtils.toHexString(getBlob.getMetadata() + .getContentMD5())); + assertEquals(newEtag, getBlob.getMetadata().getETag()); + // wait until we can update metadata + // assertEquals(getBlob.getMetadata().getUserMetadata().entries().size(), 2); + // assertEquals( + // Iterables.getLast(getBlob.getMetadata().getUserMetadata().get("New-Metadata-1")), + // "value-1"); + // assertEquals( + // Iterables.getLast(getBlob.getMetadata().getUserMetadata().get("New-Metadata-2")), + // "value-2"); + assertEquals(metadata.getUserMetadata().entries().size(), 1); + assertEquals(Iterables.getLast(metadata.getUserMetadata().get("metadata")), "metadata-value"); + + // Test PUT with invalid ETag (as if object's data was corrupted in transit) + String correctEtag = HttpUtils.toHexString(newEtag); + String incorrectEtag = "0" + correctEtag.substring(1); + object.getMetadata().setETag(HttpUtils.fromHexString(incorrectEtag)); + try { + connection.putBlob(privateContainer, object).get(10, TimeUnit.SECONDS); + } catch (Throwable e) { + assertEquals(e.getCause().getClass(), HttpResponseException.class); + assertEquals(((HttpResponseException) e.getCause()).getResponse().getStatusCode(), 422); + } + + // Test PUT chunked/streamed upload with data of "unknown" length + ByteArrayInputStream bais = new ByteArrayInputStream(data.getBytes("UTF-8")); + object = new Blob("chunked-object"); + object.setData(bais); + newEtag = connection.putBlob(privateContainer, object).get(10, TimeUnit.SECONDS); + assertEquals(HttpUtils.toHexString(md5), HttpUtils.toHexString(getBlob.getMetadata() + .getContentMD5())); + + // Test GET with options + // Non-matching ETag + try { + connection.getBlob(privateContainer, object.getKey(), + GetOptions.Builder.ifETagDoesntMatch(newEtag)).get(120, TimeUnit.SECONDS); + } catch (Exception e) { + assertEquals(e.getCause().getClass(), HttpResponseException.class); + assertEquals(((HttpResponseException) e.getCause()).getResponse().getStatusCode(), 304); + } + + // Matching ETag + getBlob = connection.getBlob(privateContainer, object.getKey(), + GetOptions.Builder.ifETagMatches(newEtag)).get(120, TimeUnit.SECONDS); + assertEquals(getBlob.getMetadata().getETag(), newEtag); + + // Range + // doesn't work per + // http://social.msdn.microsoft.com/Forums/en-US/windowsazure/thread/479fa63f-51df-4b66-96b5-33ae362747b6 + // getBlob = connection + // .getBlob(privateContainer, object.getKey(), GetOptions.Builder.startAt(8)).get(120, + // TimeUnit.SECONDS); + // assertEquals(IOUtils.toString((InputStream) getBlob.getData()), data.substring(8)); + + assertTrue(connection.removeBlob(privateContainer, "object").get(10, TimeUnit.SECONDS)); + assertTrue(connection.removeBlob(privateContainer, "chunked-object") + .get(10, TimeUnit.SECONDS)); + } + +} diff --git a/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/AzureBlobConnectionTest.java b/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/AzureBlobStoreTest.java similarity index 60% rename from azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/AzureBlobConnectionTest.java rename to azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/AzureBlobStoreTest.java index 1d28ba5f3d..8e2289b01f 100644 --- a/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/AzureBlobConnectionTest.java +++ b/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/AzureBlobStoreTest.java @@ -1,3 +1,26 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ package org.jclouds.azure.storage.blob; import static org.jclouds.azure.storage.blob.options.CreateContainerOptions.Builder.withPublicAcl; @@ -10,6 +33,7 @@ import java.util.Collections; import javax.ws.rs.HttpMethod; +import org.jclouds.azure.storage.blob.functions.ReturnTrueIfContainerAlreadyExists; import org.jclouds.azure.storage.blob.options.CreateContainerOptions; import org.jclouds.azure.storage.blob.xml.config.AzureBlobParserModule; import org.jclouds.azure.storage.options.CreateOptions; @@ -22,6 +46,7 @@ import org.jclouds.http.HttpUtils; import org.jclouds.http.config.JavaUrlHttpCommandExecutorServiceModule; import org.jclouds.http.functions.ParseSax; import org.jclouds.http.functions.ReturnTrueIf2xx; +import org.jclouds.http.functions.ReturnTrueOn404; import org.jclouds.rest.JaxrsAnnotationProcessor; import org.jclouds.rest.config.JaxrsModule; import org.testng.annotations.BeforeClass; @@ -33,28 +58,20 @@ import com.google.inject.Guice; import com.google.inject.name.Names; /** - * Tests behavior of {@code AzureBlobConnection} + * Tests behavior of {@code AzureBlobStore} * * @author Adrian Cole */ -@Test(groups = "unit", testName = "cloudservers.AzureBlobConnectionTest") -public class AzureBlobConnectionTest { +@Test(groups = "unit", testName = "cloudservers.AzureBlobStoreTest") +public class AzureBlobStoreTest { JaxrsAnnotationProcessor.Factory factory; - private static final Class listOptionsVarargsClass = new ListOptions[] {} - .getClass(); - private static final Class createContainerOptionsVarargsClass = new CreateContainerOptions[] {} - .getClass(); - private static final Class createOptionsVarargsClass = new CreateOptions[] {} - .getClass(); - public void testListContainers() throws SecurityException, NoSuchMethodException { - Method method = AzureBlobConnection.class - .getMethod("listContainers", listOptionsVarargsClass); - URI endpoint = URI.create("http://localhost"); + Method method = AzureBlobStore.class.getMethod("listContainers"); + URI endpoint = URI.create("http://myaccount.blob.core.windows.net"); HttpRequest httpMethod = processor.createRequest(endpoint, method, new Object[] {}); - assertEquals(httpMethod.getEndpoint().getHost(), "localhost"); + assertEquals(httpMethod.getEndpoint().getHost(), "myaccount.blob.core.windows.net"); assertEquals(httpMethod.getEndpoint().getPath(), "/"); assertEquals(httpMethod.getEndpoint().getQuery(), "comp=list"); assertEquals(httpMethod.getMethod(), HttpMethod.GET); @@ -67,15 +84,16 @@ public class AzureBlobConnectionTest { } public void testListContainersOptions() throws SecurityException, NoSuchMethodException { - Method method = AzureBlobConnection.class - .getMethod("listContainers", listOptionsVarargsClass); - URI endpoint = URI.create("http://localhost"); + Method method = AzureBlobStore.class.getMethod("listContainers", ListOptions.class); + URI endpoint = URI.create("http://myaccount.blob.core.windows.net"); HttpRequest httpMethod = processor.createRequest(endpoint, method, new Object[] { maxResults( 1).marker("marker").prefix("prefix") }); - assertEquals(httpMethod.getEndpoint().getHost(), "localhost"); + assertEquals(httpMethod.getEndpoint().getHost(), "myaccount.blob.core.windows.net"); assertEquals(httpMethod.getEndpoint().getPath(), "/"); - assertEquals(httpMethod.getEndpoint().getQuery(), - "comp=list&marker=marker&maxresults=1&prefix=prefix"); + assert httpMethod.getEndpoint().getQuery().contains("comp=list"); + assert httpMethod.getEndpoint().getQuery().contains("marker=marker"); + assert httpMethod.getEndpoint().getQuery().contains("maxresults=1"); + assert httpMethod.getEndpoint().getQuery().contains("prefix=prefix"); assertEquals(httpMethod.getMethod(), HttpMethod.GET); assertEquals(httpMethod.getHeaders().size(), 1); assertEquals(httpMethod.getHeaders().get("x-ms-version"), Collections @@ -86,12 +104,11 @@ public class AzureBlobConnectionTest { } public void testCreateContainer() throws SecurityException, NoSuchMethodException { - Method method = AzureBlobConnection.class.getMethod("createContainer", String.class, - createContainerOptionsVarargsClass); - URI endpoint = URI.create("http://localhost"); + Method method = AzureBlobStore.class.getMethod("createContainer", String.class); + URI endpoint = URI.create("http://myaccount.blob.core.windows.net"); HttpRequest httpMethod = processor.createRequest(endpoint, method, new Object[] { "container" }); - assertEquals(httpMethod.getEndpoint().getHost(), "localhost"); + assertEquals(httpMethod.getEndpoint().getHost(), "myaccount.blob.core.windows.net"); assertEquals(httpMethod.getEndpoint().getPath(), "/container"); assertEquals(httpMethod.getEndpoint().getQuery(), "restype=container"); assertEquals(httpMethod.getMethod(), HttpMethod.PUT); @@ -101,15 +118,16 @@ public class AzureBlobConnectionTest { assertEquals(httpMethod.getHeaders().get("Content-Length"), Collections.singletonList("0")); assertEquals(processor.createResponseParser(method).getClass(), ReturnTrueIf2xx.class); // TODO check generic type of response parser - assertEquals(processor.createExceptionParserOrNullIfNotFound(method), null); + assertEquals(processor.createExceptionParserOrNullIfNotFound(method).getClass(), + ReturnTrueIfContainerAlreadyExists.class); } public void testDeleteContainer() throws SecurityException, NoSuchMethodException { - Method method = AzureBlobConnection.class.getMethod("deleteContainer", String.class); - URI endpoint = URI.create("http://localhost"); + Method method = AzureBlobStore.class.getMethod("deleteContainer", String.class); + URI endpoint = URI.create("http://myaccount.blob.core.windows.net"); HttpRequest httpMethod = processor.createRequest(endpoint, method, new Object[] { "container" }); - assertEquals(httpMethod.getEndpoint().getHost(), "localhost"); + assertEquals(httpMethod.getEndpoint().getHost(), "myaccount.blob.core.windows.net"); assertEquals(httpMethod.getEndpoint().getPath(), "/container"); assertEquals(httpMethod.getEndpoint().getQuery(), "restype=container"); assertEquals(httpMethod.getMethod(), HttpMethod.DELETE); @@ -118,16 +136,17 @@ public class AzureBlobConnectionTest { .singletonList("2009-07-17")); assertEquals(processor.createResponseParser(method).getClass(), ReturnTrueIf2xx.class); // TODO check generic type of response parser - assertEquals(processor.createExceptionParserOrNullIfNotFound(method), null); + assertEquals(processor.createExceptionParserOrNullIfNotFound(method).getClass(), + ReturnTrueOn404.class); } public void testCreateContainerOptions() throws SecurityException, NoSuchMethodException { - Method method = AzureBlobConnection.class.getMethod("createContainer", String.class, - createContainerOptionsVarargsClass); - URI endpoint = URI.create("http://localhost"); + Method method = AzureBlobStore.class.getMethod("createContainer", String.class, + CreateContainerOptions.class); + URI endpoint = URI.create("http://myaccount.blob.core.windows.net"); HttpRequest httpMethod = processor.createRequest(endpoint, method, new Object[] { "container", withPublicAcl().withMetadata(ImmutableMultimap.of("foo", "bar")) }); - assertEquals(httpMethod.getEndpoint().getHost(), "localhost"); + assertEquals(httpMethod.getEndpoint().getHost(), "myaccount.blob.core.windows.net"); assertEquals(httpMethod.getEndpoint().getPath(), "/container"); assertEquals(httpMethod.getEndpoint().getQuery(), "restype=container"); assertEquals(httpMethod.getMethod(), HttpMethod.PUT); @@ -140,15 +159,15 @@ public class AzureBlobConnectionTest { assertEquals(httpMethod.getHeaders().get("Content-Length"), Collections.singletonList("0")); assertEquals(processor.createResponseParser(method).getClass(), ReturnTrueIf2xx.class); // TODO check generic type of response parser - assertEquals(processor.createExceptionParserOrNullIfNotFound(method), null); + assertEquals(processor.createExceptionParserOrNullIfNotFound(method).getClass(), + ReturnTrueIfContainerAlreadyExists.class); } public void testCreateRootContainer() throws SecurityException, NoSuchMethodException { - Method method = AzureBlobConnection.class.getMethod("createRootContainer", - createOptionsVarargsClass); - URI endpoint = URI.create("http://localhost"); + Method method = AzureBlobStore.class.getMethod("createRootContainer"); + URI endpoint = URI.create("http://myaccount.blob.core.windows.net"); HttpRequest httpMethod = processor.createRequest(endpoint, method, new Object[] {}); - assertEquals(httpMethod.getEndpoint().getHost(), "localhost"); + assertEquals(httpMethod.getEndpoint().getHost(), "myaccount.blob.core.windows.net"); assertEquals(httpMethod.getEndpoint().getPath(), "/$root"); assertEquals(httpMethod.getEndpoint().getQuery(), "restype=container"); assertEquals(httpMethod.getMethod(), HttpMethod.PUT); @@ -158,14 +177,15 @@ public class AzureBlobConnectionTest { assertEquals(httpMethod.getHeaders().get("Content-Length"), Collections.singletonList("0")); assertEquals(processor.createResponseParser(method).getClass(), ReturnTrueIf2xx.class); // TODO check generic type of response parser - assertEquals(processor.createExceptionParserOrNullIfNotFound(method), null); + assertEquals(processor.createExceptionParserOrNullIfNotFound(method).getClass(), + ReturnTrueIfContainerAlreadyExists.class); } public void testDeleteRootContainer() throws SecurityException, NoSuchMethodException { - Method method = AzureBlobConnection.class.getMethod("deleteRootContainer"); - URI endpoint = URI.create("http://localhost"); + Method method = AzureBlobStore.class.getMethod("deleteRootContainer"); + URI endpoint = URI.create("http://myaccount.blob.core.windows.net"); HttpRequest httpMethod = processor.createRequest(endpoint, method, new Object[] {}); - assertEquals(httpMethod.getEndpoint().getHost(), "localhost"); + assertEquals(httpMethod.getEndpoint().getHost(), "myaccount.blob.core.windows.net"); assertEquals(httpMethod.getEndpoint().getPath(), "/$root"); assertEquals(httpMethod.getEndpoint().getQuery(), "restype=container"); assertEquals(httpMethod.getMethod(), HttpMethod.DELETE); @@ -174,16 +194,16 @@ public class AzureBlobConnectionTest { .singletonList("2009-07-17")); assertEquals(processor.createResponseParser(method).getClass(), ReturnTrueIf2xx.class); // TODO check generic type of response parser - assertEquals(processor.createExceptionParserOrNullIfNotFound(method), null); + assertEquals(processor.createExceptionParserOrNullIfNotFound(method).getClass(), + ReturnTrueOn404.class); } public void testCreateRootContainerOptions() throws SecurityException, NoSuchMethodException { - Method method = AzureBlobConnection.class.getMethod("createRootContainer", - createOptionsVarargsClass); - URI endpoint = URI.create("http://localhost"); + Method method = AzureBlobStore.class.getMethod("createRootContainer", CreateOptions.class); + URI endpoint = URI.create("http://myaccount.blob.core.windows.net"); HttpRequest httpMethod = processor.createRequest(endpoint, method, new Object[] { withPublicAcl().withMetadata(ImmutableMultimap.of("foo", "bar")) }); - assertEquals(httpMethod.getEndpoint().getHost(), "localhost"); + assertEquals(httpMethod.getEndpoint().getHost(), "myaccount.blob.core.windows.net"); assertEquals(httpMethod.getEndpoint().getPath(), "/$root"); assertEquals(httpMethod.getEndpoint().getQuery(), "restype=container"); assertEquals(httpMethod.getMethod(), HttpMethod.PUT); @@ -196,6 +216,40 @@ public class AzureBlobConnectionTest { assertEquals(httpMethod.getHeaders().get("Content-Length"), Collections.singletonList("0")); assertEquals(processor.createResponseParser(method).getClass(), ReturnTrueIf2xx.class); // TODO check generic type of response parser + assertEquals(processor.createExceptionParserOrNullIfNotFound(method).getClass(), + ReturnTrueIfContainerAlreadyExists.class); + } + + public void testListBlobs() throws SecurityException, NoSuchMethodException { + Method method = AzureBlobStore.class.getMethod("listBlobs", String.class); + URI endpoint = URI.create("http://myaccount.blob.core.windows.net"); + HttpRequest httpMethod = processor.createRequest(endpoint, method, + new Object[] { "container" }); + assertEquals(httpMethod.getEndpoint().getHost(), "myaccount.blob.core.windows.net"); + assertEquals(httpMethod.getEndpoint().getPath(), "/container"); + assertEquals(httpMethod.getEndpoint().getQuery(), "restype=container&comp=list"); + assertEquals(httpMethod.getMethod(), HttpMethod.GET); + assertEquals(httpMethod.getHeaders().size(), 1); + assertEquals(httpMethod.getHeaders().get("x-ms-version"), Collections + .singletonList("2009-07-17")); + assertEquals(processor.createResponseParser(method).getClass(), ParseSax.class); + // TODO check generic type of response parser + assertEquals(processor.createExceptionParserOrNullIfNotFound(method), null); + } + + public void testListRootBlobs() throws SecurityException, NoSuchMethodException { + Method method = AzureBlobStore.class.getMethod("listBlobs"); + URI endpoint = URI.create("http://myaccount.blob.core.windows.net"); + HttpRequest httpMethod = processor.createRequest(endpoint, method, new Object[] {}); + assertEquals(httpMethod.getEndpoint().getHost(), "myaccount.blob.core.windows.net"); + assertEquals(httpMethod.getEndpoint().getPath(), "/$root"); + assertEquals(httpMethod.getEndpoint().getQuery(), "restype=container&comp=list"); + assertEquals(httpMethod.getMethod(), HttpMethod.GET); + assertEquals(httpMethod.getHeaders().size(), 1); + assertEquals(httpMethod.getHeaders().get("x-ms-version"), Collections + .singletonList("2009-07-17")); + assertEquals(processor.createResponseParser(method).getClass(), ParseSax.class); + // TODO check generic type of response parser assertEquals(processor.createExceptionParserOrNullIfNotFound(method), null); } @@ -208,10 +262,10 @@ public class AzureBlobConnectionTest { new AbstractModule() { @Override protected void configure() { - bind(URI.class).toInstance(URI.create("http://localhost:8080")); + bind(URI.class).toInstance(URI.create("http://blob.core.windows.net")); bindConstant().annotatedWith( Names.named(AzureStorageConstants.PROPERTY_AZURESTORAGE_ACCOUNT)).to( - "user"); + "myaccount"); bindConstant().annotatedWith( Names.named(AzureStorageConstants.PROPERTY_AZURESTORAGE_KEY)).to( HttpUtils.toBase64String("key".getBytes())); @@ -220,7 +274,7 @@ public class AzureBlobConnectionTest { }, new JaxrsModule(), new ExecutorServiceModule(new WithinThreadExecutorService()), new JavaUrlHttpCommandExecutorServiceModule()).getInstance( JaxrsAnnotationProcessor.Factory.class); - processor = factory.create(AzureBlobConnection.class); + processor = factory.create(AzureBlobStore.class); } } diff --git a/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/config/StubAzureBlobStoreModule.java b/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/config/StubAzureBlobStoreModule.java new file mode 100644 index 0000000000..94d12d073b --- /dev/null +++ b/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/config/StubAzureBlobStoreModule.java @@ -0,0 +1,47 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.azure.storage.blob.config; + +import java.net.URI; + +import org.jclouds.azure.storage.blob.AzureBlobStore; +import org.jclouds.azure.storage.blob.internal.StubAzureBlobStore; +import org.jclouds.cloud.ConfiguresCloudConnection; +import org.jclouds.http.functions.config.ParserModule; + +import com.google.inject.AbstractModule; + +/** + * adds a stub alternative to invoking AzureBlob + * + * @author Adrian Cole + */ +@ConfiguresCloudConnection +public class StubAzureBlobStoreModule extends AbstractModule { + protected void configure() { + install(new ParserModule()); + bind(AzureBlobStore.class).to(StubAzureBlobStore.class); + bind(URI.class).toInstance(URI.create("http://localhost:8080")); + } +} \ No newline at end of file diff --git a/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/integration/AzureBlobContainerIntegrationTest.java b/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/integration/AzureBlobContainerIntegrationTest.java new file mode 100755 index 0000000000..a95bfe68dc --- /dev/null +++ b/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/integration/AzureBlobContainerIntegrationTest.java @@ -0,0 +1,43 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.azure.storage.blob.integration; + +import org.jclouds.azure.storage.blob.AzureBlobStore; +import org.jclouds.azure.storage.blob.domain.Blob; +import org.jclouds.azure.storage.blob.domain.BlobMetadata; +import org.jclouds.azure.storage.blob.domain.ContainerMetadata; +import org.jclouds.blobstore.integration.internal.BaseContainerIntegrationTest; +import org.testng.annotations.Test; + +/** + * @author Adrian Cole + */ +@Test(groups = { "integration", "live" }, testName = "cloudfiles.AzureBlobContainerIntegrationTest") +public class AzureBlobContainerIntegrationTest extends + BaseContainerIntegrationTest { + @Test(groups = { "integration", "live" }, enabled = false) + public void deleteContainerIfEmptyButHasContents() throws Exception { + // azure recursively deletes containers in the background. + } +} \ No newline at end of file diff --git a/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/integration/AzureBlobContainerLiveTest.java b/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/integration/AzureBlobContainerLiveTest.java new file mode 100644 index 0000000000..197e990f65 --- /dev/null +++ b/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/integration/AzureBlobContainerLiveTest.java @@ -0,0 +1,40 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.azure.storage.blob.integration; + +import org.jclouds.azure.storage.blob.AzureBlobStore; +import org.jclouds.azure.storage.blob.domain.Blob; +import org.jclouds.azure.storage.blob.domain.BlobMetadata; +import org.jclouds.azure.storage.blob.domain.ContainerMetadata; +import org.jclouds.blobstore.integration.internal.BaseContainerLiveTest; +import org.testng.annotations.Test; + +/** + * @author Adrian Cole + */ +@Test(groups = { "live" }, testName = "cloudfiles.AzureBlobContainerLiveTest") +public class AzureBlobContainerLiveTest extends + BaseContainerLiveTest { + +} \ No newline at end of file diff --git a/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/integration/AzureBlobInputStreamMapIntegrationTest.java b/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/integration/AzureBlobInputStreamMapIntegrationTest.java new file mode 100644 index 0000000000..3a2766b9ba --- /dev/null +++ b/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/integration/AzureBlobInputStreamMapIntegrationTest.java @@ -0,0 +1,66 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.azure.storage.blob.integration; + +import java.util.concurrent.ExecutionException; +import java.util.concurrent.TimeoutException; + +import org.jclouds.azure.storage.blob.AzureBlobStore; +import org.jclouds.azure.storage.blob.domain.Blob; +import org.jclouds.azure.storage.blob.domain.BlobMetadata; +import org.jclouds.azure.storage.blob.domain.ContainerMetadata; +import org.jclouds.blobstore.integration.internal.BaseInputStreamMapIntegrationTest; +import org.testng.annotations.Test; + +/** + * @author Adrian Cole + */ +@Test(groups = { "integration", "live" }, testName = "cloudfiles.AzureBlobInputStreamMapIntegrationTest") +public class AzureBlobInputStreamMapIntegrationTest extends + BaseInputStreamMapIntegrationTest { + + @Override + public void testContainsBytesValue() throws InterruptedException, ExecutionException, + TimeoutException { + // http://code.google.com/p/jclouds/issues/detail?id=90 + } + + @Override + public void testContainsFileValue() throws InterruptedException, ExecutionException, + TimeoutException { + // http://code.google.com/p/jclouds/issues/detail?id=90 + } + + @Override + public void testContainsInputStreamValue() throws InterruptedException, ExecutionException, + TimeoutException { + // http://code.google.com/p/jclouds/issues/detail?id=90 + } + + @Override + public void testContainsStringValue() throws InterruptedException, ExecutionException, + TimeoutException { + // http://code.google.com/p/jclouds/issues/detail?id=90 + } +} \ No newline at end of file diff --git a/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/integration/AzureBlobIntegrationTest.java b/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/integration/AzureBlobIntegrationTest.java new file mode 100755 index 0000000000..25657c82ab --- /dev/null +++ b/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/integration/AzureBlobIntegrationTest.java @@ -0,0 +1,75 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.azure.storage.blob.integration; + +import static org.testng.Assert.assertEquals; + +import java.io.IOException; +import java.util.Collections; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.TimeoutException; + +import org.jclouds.azure.storage.blob.AzureBlobStore; +import org.jclouds.azure.storage.blob.domain.Blob; +import org.jclouds.azure.storage.blob.domain.BlobMetadata; +import org.jclouds.azure.storage.blob.domain.ContainerMetadata; +import org.jclouds.blobstore.integration.internal.BaseBlobIntegrationTest; +import org.jclouds.http.HttpUtils; +import org.testng.annotations.Test; + +/** + * @author Adrian Cole + */ +@Test(groups = { "integration", "live" }, testName = "cloudfiles.AzureBlobIntegrationTest") +public class AzureBlobIntegrationTest extends + BaseBlobIntegrationTest { + + @Override + @Test(enabled = false) + public void testGetStartAt() throws InterruptedException, ExecutionException, TimeoutException, + IOException { + // http://code.google.com/p/jclouds/issues/detail?id=91 + } + + @Override + @Test(enabled = false) + public void testGetTail() throws InterruptedException, ExecutionException, TimeoutException, + IOException { + // http://code.google.com/p/jclouds/issues/detail?id=91 + } + + protected void validateMetadata(BlobMetadata metadata) { + assertEquals(metadata.getContentType(), "text/plain"); + // we can't check this while hacking around lack of content-md5, as GET of the first byte will + // show incorrect length 1, the returned size, as opposed to the real length. This is an ok + // tradeoff, as a container list will contain the correct size of the objects in an + // inexpensive fashion + // http://code.google.com/p/jclouds/issues/detail?id=92 + // assertEquals(metadata.getSize(), TEST_STRING.length()); + assertEquals(metadata.getUserMetadata().get("adrian"), Collections + .singletonList("powderpuff")); + assertEquals(metadata.getContentMD5(), HttpUtils.md5(TEST_STRING.getBytes())); + } + +} \ No newline at end of file diff --git a/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/integration/AzureBlobLiveTest.java b/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/integration/AzureBlobLiveTest.java new file mode 100644 index 0000000000..0c8629cac2 --- /dev/null +++ b/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/integration/AzureBlobLiveTest.java @@ -0,0 +1,40 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.azure.storage.blob.integration; + +import org.jclouds.azure.storage.blob.AzureBlobStore; +import org.jclouds.azure.storage.blob.domain.Blob; +import org.jclouds.azure.storage.blob.domain.BlobMetadata; +import org.jclouds.azure.storage.blob.domain.ContainerMetadata; +import org.jclouds.blobstore.integration.internal.BaseBlobLiveTest; +import org.testng.annotations.Test; + +/** + * @author Adrian Cole + */ +@Test(groups = { "live" }, testName = "cloudfiles.AzureBlobLiveTest") +public class AzureBlobLiveTest extends + BaseBlobLiveTest { + +} \ No newline at end of file diff --git a/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/integration/AzureBlobMapIntegrationTest.java b/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/integration/AzureBlobMapIntegrationTest.java new file mode 100644 index 0000000000..2539741eaa --- /dev/null +++ b/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/integration/AzureBlobMapIntegrationTest.java @@ -0,0 +1,47 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.azure.storage.blob.integration; + +import java.util.concurrent.ExecutionException; +import java.util.concurrent.TimeoutException; + +import org.jclouds.azure.storage.blob.AzureBlobStore; +import org.jclouds.azure.storage.blob.domain.Blob; +import org.jclouds.azure.storage.blob.domain.BlobMetadata; +import org.jclouds.azure.storage.blob.domain.ContainerMetadata; +import org.jclouds.blobstore.integration.internal.BaseBlobMapIntegrationTest; +import org.testng.annotations.Test; + +/** + * @author Adrian Cole + */ +@Test(groups = { "integration", "live" }, testName = "cloudfiles.AzureBlobMapIntegrationTest") +public class AzureBlobMapIntegrationTest extends + BaseBlobMapIntegrationTest { + + @Override + public void testContains() throws InterruptedException, ExecutionException, TimeoutException { + // http://code.google.com/p/jclouds/issues/detail?id=90 + } +} \ No newline at end of file diff --git a/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/integration/AzureBlobServiceIntegrationTest.java b/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/integration/AzureBlobServiceIntegrationTest.java new file mode 100644 index 0000000000..1065056199 --- /dev/null +++ b/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/integration/AzureBlobServiceIntegrationTest.java @@ -0,0 +1,40 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.azure.storage.blob.integration; + +import org.jclouds.azure.storage.blob.AzureBlobStore; +import org.jclouds.azure.storage.blob.domain.Blob; +import org.jclouds.azure.storage.blob.domain.BlobMetadata; +import org.jclouds.azure.storage.blob.domain.ContainerMetadata; +import org.jclouds.blobstore.integration.internal.BaseServiceIntegrationTest; +import org.testng.annotations.Test; + +/** + * @author Adrian Cole + */ +@Test(groups = { "integration", "live" }, testName = "cloudfiles.AzureBlobServiceIntegrationTest") +public class AzureBlobServiceIntegrationTest extends + BaseServiceIntegrationTest { + +} \ No newline at end of file diff --git a/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/integration/AzureBlobTestInitializer.java b/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/integration/AzureBlobTestInitializer.java new file mode 100644 index 0000000000..90798f123b --- /dev/null +++ b/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/integration/AzureBlobTestInitializer.java @@ -0,0 +1,116 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.azure.storage.blob.integration; + +import org.jclouds.azure.storage.blob.AzureBlobContext; +import org.jclouds.azure.storage.blob.AzureBlobContextBuilder; +import org.jclouds.azure.storage.blob.AzureBlobStore; +import org.jclouds.azure.storage.blob.config.StubAzureBlobStoreModule; +import org.jclouds.azure.storage.blob.domain.Blob; +import org.jclouds.azure.storage.blob.domain.BlobMetadata; +import org.jclouds.azure.storage.blob.domain.ContainerMetadata; +import org.jclouds.blobstore.BlobStoreContext; +import org.jclouds.blobstore.integration.internal.BaseBlobStoreIntegrationTest; +import org.jclouds.blobstore.integration.internal.BaseBlobStoreIntegrationTest.BlobStoreObjectFactory; +import org.jclouds.logging.log4j.config.Log4JLoggingModule; +import org.testng.ITestContext; + +import com.google.inject.Module; + +/** + * + * @author Adrian Cole + */ +public class AzureBlobTestInitializer + implements + BaseBlobStoreIntegrationTest.TestInitializer { + + public BaseBlobStoreIntegrationTest.TestInitializer.Result init( + Module configurationModule, ITestContext testContext) throws Exception { + String account = System.getProperty("jclouds.test.user"); + String key = System.getProperty("jclouds.test.key"); + if (account != null) + testContext.setAttribute("jclouds.test.user", account); + if (key != null) + testContext.setAttribute("jclouds.test.key", key); + + final AzureBlobContext context; + if (account != null) { + context = createLiveAzureBlobContext(configurationModule, account, key); + } else { + context = createStubAzureBlobContext(); + } + assert context != null; + + final AzureBlobStore client = context.getApi(); + assert client != null; + + final BlobStoreObjectFactory objectFactory = new BaseBlobStoreIntegrationTest.BlobStoreObjectFactory() { + + public Blob createBlob(String key) { + return new Blob(key); + + } + + public ContainerMetadata createContainerMetadata(String key) { + return new ContainerMetadata(key); + } + + }; + assert objectFactory != null; + + return new BaseBlobStoreIntegrationTest.TestInitializer.Result() { + + public AzureBlobStore getClient() { + return client; + } + + public BlobStoreContext getContext() { + return (BlobStoreContext) context; + } + + public BlobStoreObjectFactory getObjectFactory() { + return objectFactory; + } + + }; + } + + protected AzureBlobContext createStubAzureBlobContext() { + return AzureBlobContextBuilder.newBuilder("stub", "stub").withModules( + new StubAzureBlobStoreModule()).buildContext(); + } + + protected AzureBlobContext createLiveAzureBlobContext(Module configurationModule, + String account, String key) { + return buildAzureBlobContextFactory(configurationModule, account, key).buildContext(); + } + + protected AzureBlobContextBuilder buildAzureBlobContextFactory(Module configurationModule, + String account, String key) { + return (AzureBlobContextBuilder) AzureBlobContextBuilder.newBuilder(account, key) + .relaxSSLHostname().withModules(configurationModule, new Log4JLoggingModule()); + } + +} \ No newline at end of file diff --git a/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/internal/StubAzureBlobStore.java b/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/internal/StubAzureBlobStore.java new file mode 100644 index 0000000000..443d03588c --- /dev/null +++ b/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/internal/StubAzureBlobStore.java @@ -0,0 +1,128 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.azure.storage.blob.internal; + +import java.net.URI; +import java.util.Map; +import java.util.SortedSet; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.Future; + +import org.jclouds.azure.storage.blob.AzureBlobStore; +import org.jclouds.azure.storage.blob.domain.ArrayListBlobsResponse; +import org.jclouds.azure.storage.blob.domain.Blob; +import org.jclouds.azure.storage.blob.domain.BlobMetadata; +import org.jclouds.azure.storage.blob.domain.ContainerMetadata; +import org.jclouds.azure.storage.blob.domain.ListBlobsResponse; +import org.jclouds.azure.storage.blob.options.CreateContainerOptions; +import org.jclouds.azure.storage.domain.BoundedList; +import org.jclouds.azure.storage.options.CreateOptions; +import org.jclouds.azure.storage.options.ListOptions; +import org.jclouds.blobstore.ContainerNotFoundException; +import org.jclouds.blobstore.integration.internal.StubBlobStore; + +import com.google.common.base.Function; +import com.google.common.collect.Iterables; +import com.google.common.collect.Lists; +import com.google.common.collect.Sets; + +/** + * Implementation of {@link AzureBlobStore} which keeps all data in a local Map object. + * + * @author Adrian Cole + */ +public class StubAzureBlobStore extends StubBlobStore + implements AzureBlobStore { + + @Override + protected Blob createBlob(String name) { + return new Blob(name); + } + + @Override + protected Blob createBlob(BlobMetadata metadata) { + return new Blob(metadata); + } + + @Override + protected ContainerMetadata createContainerMetadata(String name) { + return new ContainerMetadata(name); + } + + /** + * note this must be final and static so that tests coming from multiple threads will pass. + */ + private static final Map> containerToBlobs = new ConcurrentHashMap>(); + + @Override + public Map> getContainerToBlobs() { + return containerToBlobs; + } + + public BoundedList listContainers(ListOptions options) { + return null; + } + + public Future createContainer(String container, CreateContainerOptions options) { + return null; + } + + public Future createRootContainer() { + return null; + } + + public Future createRootContainer(CreateOptions options) { + return null; + } + + public Future deleteRootContainer() { + return null; + } + + public Future listBlobs() { + return null; + } + + public Future listBlobs(final String name) { + return new FutureBase() { + public ListBlobsResponse get() throws InterruptedException, ExecutionException { + final Map realContents = getContainerToBlobs().get(name); + + if (realContents == null) + throw new ContainerNotFoundException(name); + SortedSet contents = Sets.newTreeSet(Iterables.transform(realContents + .keySet(), new Function() { + public BlobMetadata apply(String key) { + return realContents.get(key).getMetadata(); + } + })); + + return new ArrayListBlobsResponse(URI.create("http://localhost"), Lists + .newArrayList(contents), null, null, 5000, null, null, null); + } + }; + } + +} diff --git a/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/options/CreateContainerOptionsTest.java b/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/options/CreateContainerOptionsTest.java index 8ecf05a6af..45fe78e682 100644 --- a/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/options/CreateContainerOptionsTest.java +++ b/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/options/CreateContainerOptionsTest.java @@ -1,3 +1,26 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ package org.jclouds.azure.storage.blob.options; import static org.testng.Assert.assertEquals; diff --git a/aws/s3/core/src/test/java/org/jclouds/aws/s3/commands/BucketExistsIntegrationTest.java b/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/options/ListBlobsOptionsTest.java similarity index 61% rename from aws/s3/core/src/test/java/org/jclouds/aws/s3/commands/BucketExistsIntegrationTest.java rename to azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/options/ListBlobsOptionsTest.java index 64050f6b64..4e55fe9be3 100644 --- a/aws/s3/core/src/test/java/org/jclouds/aws/s3/commands/BucketExistsIntegrationTest.java +++ b/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/options/ListBlobsOptionsTest.java @@ -21,33 +21,30 @@ * under the License. * ==================================================================== */ -package org.jclouds.aws.s3.commands; +package org.jclouds.azure.storage.blob.options; + +import static org.testng.Assert.assertEquals; -import org.jclouds.aws.s3.S3IntegrationTest; import org.testng.annotations.Test; +import com.google.common.collect.ImmutableList; + /** - * Tests integrated functionality of all bucketExists commands. - *

    - * Each test uses a different bucket name, so it should be perfectly fine to run in parallel. + * Tests behavior of {@code ListBlobsOptions} * * @author Adrian Cole */ -@Test(groups = { "integration", "live" }, testName = "s3.BucketExistsIntegrationTest") -public class BucketExistsIntegrationTest extends S3IntegrationTest { +@Test(groups = "unit", testName = "azurestorage.ListBlobsOptionsTest") +public class ListBlobsOptionsTest { - @Test - void bucketDoesntExist() throws Exception { - assert !client.bucketExists("be"); + public void testDelimiter() { + ListBlobsOptions options = new ListBlobsOptions().delimiter("/"); + assertEquals(ImmutableList.of("/"), options.buildQueryParameters().get("delimiter")); } - @Test - void bucketExists() throws Exception { - String bucketName = getBucketName(); - try { - assert client.bucketExists(bucketName); - } finally { - returnBucket(bucketName); - } + public void testDelimiterStatic() { + ListBlobsOptions options = ListBlobsOptions.Builder.delimiter("/"); + assertEquals(ImmutableList.of("/"), options.buildQueryParameters().get("delimiter")); } -} \ No newline at end of file + +} diff --git a/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/xml/AccountNameEnumerationResultsHandlerTest.java b/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/xml/AccountNameEnumerationResultsHandlerTest.java index 43221b39ee..6282314489 100644 --- a/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/xml/AccountNameEnumerationResultsHandlerTest.java +++ b/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/xml/AccountNameEnumerationResultsHandlerTest.java @@ -29,7 +29,8 @@ import java.io.InputStream; import java.net.URI; import org.jclouds.azure.storage.blob.domain.ContainerMetadata; -import org.jclouds.azure.storage.domain.MetadataList; +import org.jclouds.azure.storage.domain.ArrayBoundedList; +import org.jclouds.azure.storage.domain.BoundedList; import org.jclouds.http.HttpUtils; import org.jclouds.http.functions.ParseSax; import org.testng.annotations.Test; @@ -46,11 +47,11 @@ public class AccountNameEnumerationResultsHandlerTest extends BaseHandlerTest { public void testApplyInputStream() { InputStream is = getClass().getResourceAsStream("/test_list_containers.xml"); - MetadataList list = new MetadataList(null, null, 3, - ImmutableList.of(new ContainerMetadata(URI - .create("http://myaccount.blob.core.windows.net/audio"), dateService - .rfc822DateParse("Wed, 13 Aug 2008 20:39:39 GMT"), HttpUtils - .fromHexString("0x8CACB9BD7C6B1B2")), new ContainerMetadata(URI + BoundedList list = new ArrayBoundedList(ImmutableList + .of(new ContainerMetadata( + URI.create("http://myaccount.blob.core.windows.net/audio"), dateService + .rfc822DateParse("Wed, 13 Aug 2008 20:39:39 GMT"), HttpUtils + .fromHexString("0x8CACB9BD7C6B1B2")), new ContainerMetadata(URI .create("http://myaccount.blob.core.windows.net/images"), dateService .rfc822DateParse("Wed, 14 Aug 2008 20:39:39 GMT"), HttpUtils .fromHexString("0x8CACB9BD7C1EEEC")), new ContainerMetadata(URI @@ -58,20 +59,20 @@ public class AccountNameEnumerationResultsHandlerTest extends BaseHandlerTest { .rfc822DateParse("Wed, 15 Aug 2008 20:39:39 GMT"), HttpUtils .fromHexString("0x8CACB9BD7BACAC3")) - ), "video"); - ParseSax> parser = parserFactory + ), null, null, 3, "video"); + ParseSax> parser = parserFactory .createContainerMetadataListParser(); - MetadataList result = parser.parse(is); + BoundedList result = parser.parse(is); assertEquals(result, list); } public void testApplyInputStreamWithOptions() { InputStream is = getClass().getResourceAsStream("/test_list_containers_options.xml"); - MetadataList list = new MetadataList("prefix", - "marker", 1, ImmutableList.of(new ContainerMetadata(URI - .create("http://myaccount.blob.core.windows.net/audio"), dateService - .rfc822DateParse("Wed, 13 Aug 2008 20:39:39 GMT"), HttpUtils - .fromHexString("0x8CACB9BD7C6B1B2")), new ContainerMetadata(URI + BoundedList list = new ArrayBoundedList(ImmutableList + .of(new ContainerMetadata( + URI.create("http://myaccount.blob.core.windows.net/audio"), dateService + .rfc822DateParse("Wed, 13 Aug 2008 20:39:39 GMT"), HttpUtils + .fromHexString("0x8CACB9BD7C6B1B2")), new ContainerMetadata(URI .create("http://myaccount.blob.core.windows.net/images"), dateService .rfc822DateParse("Wed, 14 Aug 2008 20:39:39 GMT"), HttpUtils .fromHexString("0x8CACB9BD7C1EEEC")), new ContainerMetadata(URI @@ -79,10 +80,10 @@ public class AccountNameEnumerationResultsHandlerTest extends BaseHandlerTest { .rfc822DateParse("Wed, 15 Aug 2008 20:39:39 GMT"), HttpUtils .fromHexString("0x8CACB9BD7BACAC3")) - ), "video"); - ParseSax> parser = parserFactory + ), "prefix", "marker", 1, "video"); + ParseSax> parser = parserFactory .createContainerMetadataListParser(); - MetadataList result = parser.parse(is); + BoundedList result = parser.parse(is); assertEquals(result, list); } } diff --git a/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/xml/BaseHandlerTest.java b/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/xml/BaseHandlerTest.java index 795775adbf..f0ae6a61e3 100644 --- a/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/xml/BaseHandlerTest.java +++ b/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/xml/BaseHandlerTest.java @@ -1,3 +1,26 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ package org.jclouds.azure.storage.blob.xml; import org.jclouds.azure.storage.blob.xml.AzureBlobParserFactory; diff --git a/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/xml/ContainerNameEnumerationResultsHandlerTest.java b/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/xml/ContainerNameEnumerationResultsHandlerTest.java new file mode 100644 index 0000000000..af9a577d77 --- /dev/null +++ b/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/xml/ContainerNameEnumerationResultsHandlerTest.java @@ -0,0 +1,72 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.azure.storage.blob.xml; + +import static org.testng.Assert.assertEquals; + +import java.io.InputStream; +import java.net.URI; + +import org.jclouds.azure.storage.blob.domain.ArrayListBlobsResponse; +import org.jclouds.azure.storage.blob.domain.BlobMetadata; +import org.jclouds.azure.storage.blob.domain.ListBlobsResponse; +import org.jclouds.http.HttpUtils; +import org.jclouds.http.functions.ParseSax; +import org.testng.annotations.Test; + +import com.google.common.collect.ImmutableList; + +/** + * Tests behavior of {@code ContainerNameEnumerationResultsHandlerTest} + * + * @author Adrian Cole + */ +@Test(groups = "unit", testName = "azureblob.ContainerNameEnumerationResultsHandlerTest") +public class ContainerNameEnumerationResultsHandlerTest extends BaseHandlerTest { + + public void testApplyInputStream() { + InputStream is = getClass().getResourceAsStream("/test_list_blobs.xml"); + ListBlobsResponse list = new ArrayListBlobsResponse(URI + .create("http://myaccount.blob.core.windows.net/mycontainer"), ImmutableList.of( + new BlobMetadata("blob1.txt", URI + .create("http://myaccount.blob.core.windows.net/mycontainer/blob1.txt"), + dateService.rfc822DateParse("Thu, 18 Sep 2008 18:41:57 GMT"), HttpUtils + .fromHexString("0x8CAE7D55D050B8B"), 8, + "text/plain; charset=UTF-8", null, null, null), new BlobMetadata("blob2.txt", URI + .create("http://myaccount.blob.core.windows.net/mycontainer/blob2.txt"), + dateService.rfc822DateParse("Thu, 18 Sep 2008 18:41:57 GMT"), HttpUtils + .fromHexString("0x8CAE7D55CF6C339"), 14, + "text/plain; charset=UTF-8", null, null, null), + new BlobMetadata("newblob1.txt", URI + .create("http://myaccount.blob.core.windows.net/mycontainer/newblob1.txt"), + dateService.rfc822DateParse("Thu, 18 Sep 2008 18:41:57 GMT"), HttpUtils + .fromHexString("0x8CAE7D55CF6C339"), 25, + "text/plain; charset=UTF-8", null, null, null) + + ), null, null, 4, "newblob2.txt", null, "myfolder/"); + ParseSax parser = parserFactory.createListBlobsResponseParser(); + ListBlobsResponse result = parser.parse(is); + assertEquals(result, list); + } +} diff --git a/azure/storage/blob/core/src/test/resources/test_list_blobs.xml b/azure/storage/blob/core/src/test/resources/test_list_blobs.xml new file mode 100644 index 0000000000..154df4e910 --- /dev/null +++ b/azure/storage/blob/core/src/test/resources/test_list_blobs.xml @@ -0,0 +1,65 @@ + + + + 4 + + + blob1.txt + http://myaccount.blob.core.windows.net/mycontainer/blob1.txt + Thu, 18 Sep 2008 18:41:57 GMT + 0x8CAE7D55D050B8B + 8 + text/plain; charset=UTF-8 + + + + + blob2.txt + http://myaccount.blob.core.windows.net/mycontainer/blob2.txt + Thu, 18 Sep 2008 18:41:57 GMT + 0x8CAE7D55CF6C339 + 14 + text/plain; charset=UTF-8 + + + + + myfolder/ + + + newblob1.txt + http://myaccount.blob.core.windows.net/mycontainer/newblob1.txt + Thu, 18 Sep 2008 18:41:57 GMT + 0x8CAE7D55CF6C339 + 25 + text/plain; charset=UTF-8 + + + + + newblob2.txt + \ No newline at end of file diff --git a/azure/storage/blob/core/src/test/resources/test_list_containers.xml b/azure/storage/blob/core/src/test/resources/test_list_containers.xml index e92b4fd2a1..5211582440 100644 --- a/azure/storage/blob/core/src/test/resources/test_list_containers.xml +++ b/azure/storage/blob/core/src/test/resources/test_list_containers.xml @@ -1,4 +1,29 @@ + 3 diff --git a/azure/storage/blob/core/src/test/resources/test_list_containers_options.xml b/azure/storage/blob/core/src/test/resources/test_list_containers_options.xml index 115b6a85da..4cc58ab3ce 100644 --- a/azure/storage/blob/core/src/test/resources/test_list_containers_options.xml +++ b/azure/storage/blob/core/src/test/resources/test_list_containers_options.xml @@ -1,4 +1,29 @@ + prefix marker diff --git a/azure/storage/blob/pom.xml b/azure/storage/blob/pom.xml index 8fbc2494fd..697327b5f2 100644 --- a/azure/storage/blob/pom.xml +++ b/azure/storage/blob/pom.xml @@ -39,15 +39,18 @@ core + + org.jclouds.azure.storage.blob.integration.AzureBlobTestInitializer + ${project.groupId} - jclouds-keyvaluestore-core + jclouds-blobstore-core ${project.version} ${project.groupId} - jclouds-keyvaluestore-core + jclouds-blobstore-core ${project.version} test-jar test diff --git a/azure/storage/core/src/main/java/org/jclouds/azure/storage/AzureStorageResponseException.java b/azure/storage/core/src/main/java/org/jclouds/azure/storage/AzureStorageResponseException.java index 5a6296d0b3..f6327f1d22 100644 --- a/azure/storage/core/src/main/java/org/jclouds/azure/storage/AzureStorageResponseException.java +++ b/azure/storage/core/src/main/java/org/jclouds/azure/storage/AzureStorageResponseException.java @@ -1,3 +1,26 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ package org.jclouds.azure.storage; import org.jclouds.azure.storage.domain.AzureStorageError; diff --git a/azure/storage/core/src/main/java/org/jclouds/azure/storage/config/RestAzureStorageConnectionModule.java b/azure/storage/core/src/main/java/org/jclouds/azure/storage/config/RestAzureStorageConnectionModule.java index f82c1664c2..c067794095 100644 --- a/azure/storage/core/src/main/java/org/jclouds/azure/storage/config/RestAzureStorageConnectionModule.java +++ b/azure/storage/core/src/main/java/org/jclouds/azure/storage/config/RestAzureStorageConnectionModule.java @@ -1,3 +1,26 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ package org.jclouds.azure.storage.config; import java.net.MalformedURLException; diff --git a/azure/storage/core/src/main/java/org/jclouds/azure/storage/domain/MetadataList.java b/azure/storage/core/src/main/java/org/jclouds/azure/storage/domain/ArrayBoundedList.java similarity index 52% rename from azure/storage/core/src/main/java/org/jclouds/azure/storage/domain/MetadataList.java rename to azure/storage/core/src/main/java/org/jclouds/azure/storage/domain/ArrayBoundedList.java index 0a928fcc95..17f40ab773 100644 --- a/azure/storage/core/src/main/java/org/jclouds/azure/storage/domain/MetadataList.java +++ b/azure/storage/core/src/main/java/org/jclouds/azure/storage/domain/ArrayBoundedList.java @@ -30,22 +30,18 @@ import java.util.List; * @author Adrian Cole * */ -public class MetadataList { - private final String prefix; - private final String marker; - private final int maxResults; - private final List metadata; - private final String nextMarker; +public class ArrayBoundedList extends org.jclouds.rest.ArrayBoundedList implements + BoundedList { + /** The serialVersionUID */ + private static final long serialVersionUID = -4475709781001190244L; + + protected final String nextMarker; @Override public int hashCode() { final int prime = 31; - int result = 1; - result = prime * result + ((marker == null) ? 0 : marker.hashCode()); - result = prime * result + maxResults; - result = prime * result + ((metadata == null) ? 0 : metadata.hashCode()); + int result = super.hashCode(); result = prime * result + ((nextMarker == null) ? 0 : nextMarker.hashCode()); - result = prime * result + ((prefix == null) ? 0 : prefix.hashCode()); return result; } @@ -53,67 +49,31 @@ public class MetadataList { public boolean equals(Object obj) { if (this == obj) return true; - if (obj == null) + if (!super.equals(obj)) return false; if (getClass() != obj.getClass()) return false; - MetadataList other = (MetadataList) obj; - if (marker == null) { - if (other.marker != null) - return false; - } else if (!marker.equals(other.marker)) - return false; - if (maxResults != other.maxResults) - return false; - if (metadata == null) { - if (other.metadata != null) - return false; - } else if (!metadata.equals(other.metadata)) - return false; + ArrayBoundedList other = (ArrayBoundedList) obj; if (nextMarker == null) { if (other.nextMarker != null) return false; } else if (!nextMarker.equals(other.nextMarker)) return false; - if (prefix == null) { - if (other.prefix != null) - return false; - } else if (!prefix.equals(other.prefix)) - return false; return true; } @Override public String toString() { - return "MetadataList [metadata=" + metadata + ", marker=" + marker + ", maxResults=" - + maxResults + ", nextMarker=" + nextMarker + ", prefix=" + prefix + "]"; + return "ArrayBoundedList [nextMarker=" + nextMarker + ", marker=" + marker + ", maxResults=" + + maxResults + ", prefix=" + prefix + "]"; } - public MetadataList(String prefix, String marker, int maxResults, List metadata, + public ArrayBoundedList(List contents, String prefix, String marker, int maxResults, String nextMarker) { - this.prefix = prefix; - this.marker = marker; - this.maxResults = maxResults; - this.metadata = metadata; + super(contents, prefix, marker, maxResults); this.nextMarker = nextMarker; } - public String getPrefix() { - return prefix; - } - - public String getMarker() { - return marker; - } - - public int getMaxResults() { - return maxResults; - } - - public List getMetadata() { - return metadata; - } - public String getNextMarker() { return nextMarker; } diff --git a/azure/storage/core/src/main/java/org/jclouds/azure/storage/domain/AzureStorageError.java b/azure/storage/core/src/main/java/org/jclouds/azure/storage/domain/AzureStorageError.java index d7c0c72855..4e3c6d97f4 100644 --- a/azure/storage/core/src/main/java/org/jclouds/azure/storage/domain/AzureStorageError.java +++ b/azure/storage/core/src/main/java/org/jclouds/azure/storage/domain/AzureStorageError.java @@ -1,3 +1,26 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ package org.jclouds.azure.storage.domain; import java.util.Map; diff --git a/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/functions/CFObjectKey.java b/azure/storage/core/src/main/java/org/jclouds/azure/storage/domain/BoundedList.java similarity index 77% rename from rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/functions/CFObjectKey.java rename to azure/storage/core/src/main/java/org/jclouds/azure/storage/domain/BoundedList.java index eaf6700e26..fa0dfbf773 100644 --- a/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/functions/CFObjectKey.java +++ b/azure/storage/core/src/main/java/org/jclouds/azure/storage/domain/BoundedList.java @@ -21,16 +21,15 @@ * under the License. * ==================================================================== */ -package org.jclouds.rackspace.cloudfiles.functions; +package org.jclouds.azure.storage.domain; -import org.jclouds.rackspace.cloudfiles.domain.CFObject; +/** + * + * @author Adrian Cole + * + */ +public interface BoundedList extends org.jclouds.rest.BoundedList { -import com.google.common.base.Function; + String getNextMarker(); -public class CFObjectKey implements Function { - - public String apply(Object from) { - return ((CFObject) from).getKey(); - } - -} +} \ No newline at end of file diff --git a/azure/storage/core/src/main/java/org/jclouds/azure/storage/filters/SharedKeyAuthentication.java b/azure/storage/core/src/main/java/org/jclouds/azure/storage/filters/SharedKeyAuthentication.java index 1b22157170..437e1e3400 100644 --- a/azure/storage/core/src/main/java/org/jclouds/azure/storage/filters/SharedKeyAuthentication.java +++ b/azure/storage/core/src/main/java/org/jclouds/azure/storage/filters/SharedKeyAuthentication.java @@ -1,9 +1,32 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ package org.jclouds.azure.storage.filters; import java.util.Collection; import java.util.Collections; import java.util.Set; -import java.util.SortedSet; +import java.util.TreeSet; import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicReference; @@ -17,10 +40,6 @@ import org.jclouds.http.HttpUtils; import org.jclouds.util.DateService; import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Function; -import com.google.common.base.Predicate; -import com.google.common.collect.Iterables; -import com.google.common.collect.Sets; import com.google.inject.Inject; import com.google.inject.Singleton; import com.google.inject.name.Named; @@ -126,42 +145,51 @@ public class SharedKeyAuthentication implements HttpRequestFilter { } private void appendCanonicalizedHeaders(HttpRequest request, StringBuilder toSign) { - - // Retrieve all headers for the resource that begin with x-ms-, including the x-ms-date - // header. - Set matchingHeaders = Sets.filter(request.getHeaders().keySet(), - new Predicate() { - public boolean apply(String input) { - return input.startsWith("x-ms-"); - } - }); - - // Convert each HTTP header name to lowercase. - // Sort the container of headers lexicographically by header name, in ascending order. - SortedSet lowercaseHeaders = Sets.newTreeSet(Iterables.transform(matchingHeaders, - new Function() { - public String apply(String from) { - return from.toLowerCase(); - } - })); - - for (String header : lowercaseHeaders) { - // Combine headers with the same name into one header. The resulting header should be a - // name-value pair of the format "header-name:comma-separated-value-list", without any - // white - // space between values. - toSign.append(header).append(":"); - // Trim any white space around the colon in the header. - // TODO: not sure why there would be... - for (String value : request.getHeaders().get(header)) - // Replace any breaking white space with a single space. - toSign.append(value.replaceAll("\r?\n", " ")).append(","); - toSign.deleteCharAt(toSign.lastIndexOf(",")); - // Finally, append a new line character to each canonicalized header in the resulting list. - // Construct the CanonicalizedHeaders string by concatenating all headers in this list into - // a - // single string. - toSign.append("\n"); + Set headers = new TreeSet(request.getHeaders().keySet()); + for (String header : headers) { + if (header.startsWith("x-ms-")) { + toSign.append(header.toLowerCase()).append(":"); + for (String value : request.getHeaders().get(header)) + toSign.append(value.replaceAll("\r?\n", "")).append(","); + toSign.deleteCharAt(toSign.lastIndexOf(",")); + toSign.append("\n"); + } +// } +// // Retrieve all headers for the resource that begin with x-ms-, including the x-ms-date +// // header. +// Set matchingHeaders = Sets.filter(request.getHeaders().keySet(), +// new Predicate() { +// public boolean apply(String input) { +// return input.startsWith("x-ms-"); +// } +// }); +// +// // Convert each HTTP header name to lowercase. +// // Sort the container of headers lexicographically by header name, in ascending order. +// SortedSet lowercaseHeaders = Sets.newTreeSet(Iterables.transform(matchingHeaders, +// new Function() { +// public String apply(String from) { +// return from.toLowerCase(); +// } +// })); +// +// for (String header : lowercaseHeaders) { +// // Combine headers with the same name into one header. The resulting header should be a +// // name-value pair of the format "header-name:comma-separated-value-list", without any +// // white +// // space between values. +// toSign.append(header).append(":"); +// // Trim any white space around the colon in the header. +// // TODO: not sure why there would be... +// for (String value : request.getHeaders().get(header)) +// // Replace any breaking white space with a single space. +// toSign.append(value.replaceAll("\r?\n", " ")).append(","); +// toSign.deleteCharAt(toSign.lastIndexOf(",")); +// // Finally, append a new line character to each canonicalized header in the resulting list. +// // Construct the CanonicalizedHeaders string by concatenating all headers in this list into +// // a +// // single string. +// toSign.append("\n"); } } diff --git a/azure/storage/core/src/main/java/org/jclouds/azure/storage/handlers/ParseAzureStorageErrorFromXmlContent.java b/azure/storage/core/src/main/java/org/jclouds/azure/storage/handlers/ParseAzureStorageErrorFromXmlContent.java index 6100d7c1a1..c66c94a75c 100644 --- a/azure/storage/core/src/main/java/org/jclouds/azure/storage/handlers/ParseAzureStorageErrorFromXmlContent.java +++ b/azure/storage/core/src/main/java/org/jclouds/azure/storage/handlers/ParseAzureStorageErrorFromXmlContent.java @@ -1,3 +1,26 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ package org.jclouds.azure.storage.handlers; import javax.annotation.Resource; diff --git a/azure/storage/core/src/main/java/org/jclouds/azure/storage/options/CreateOptions.java b/azure/storage/core/src/main/java/org/jclouds/azure/storage/options/CreateOptions.java index fd0d084364..9272d0aed8 100644 --- a/azure/storage/core/src/main/java/org/jclouds/azure/storage/options/CreateOptions.java +++ b/azure/storage/core/src/main/java/org/jclouds/azure/storage/options/CreateOptions.java @@ -1,3 +1,26 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ package org.jclouds.azure.storage.options; import java.util.Map.Entry; diff --git a/azure/storage/core/src/main/java/org/jclouds/azure/storage/options/ListOptions.java b/azure/storage/core/src/main/java/org/jclouds/azure/storage/options/ListOptions.java index c88366ba39..63ed58bb37 100644 --- a/azure/storage/core/src/main/java/org/jclouds/azure/storage/options/ListOptions.java +++ b/azure/storage/core/src/main/java/org/jclouds/azure/storage/options/ListOptions.java @@ -1,3 +1,26 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ package org.jclouds.azure.storage.options; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/azure/storage/core/src/main/java/org/jclouds/azure/storage/reference/AzureStorageConstants.java b/azure/storage/core/src/main/java/org/jclouds/azure/storage/reference/AzureStorageConstants.java index a9ea2d7f0a..6b5b6a4de7 100644 --- a/azure/storage/core/src/main/java/org/jclouds/azure/storage/reference/AzureStorageConstants.java +++ b/azure/storage/core/src/main/java/org/jclouds/azure/storage/reference/AzureStorageConstants.java @@ -1,3 +1,26 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ package org.jclouds.azure.storage.reference; /** diff --git a/azure/storage/core/src/main/java/org/jclouds/azure/storage/reference/AzureStorageHeaders.java b/azure/storage/core/src/main/java/org/jclouds/azure/storage/reference/AzureStorageHeaders.java index 9fea389a9f..7d5f62eca3 100644 --- a/azure/storage/core/src/main/java/org/jclouds/azure/storage/reference/AzureStorageHeaders.java +++ b/azure/storage/core/src/main/java/org/jclouds/azure/storage/reference/AzureStorageHeaders.java @@ -1,3 +1,26 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ package org.jclouds.azure.storage.reference; /** diff --git a/azure/storage/core/src/main/java/org/jclouds/azure/storage/util/AzureStorageUtils.java b/azure/storage/core/src/main/java/org/jclouds/azure/storage/util/AzureStorageUtils.java index f219253bcf..f6f1c1057e 100644 --- a/azure/storage/core/src/main/java/org/jclouds/azure/storage/util/AzureStorageUtils.java +++ b/azure/storage/core/src/main/java/org/jclouds/azure/storage/util/AzureStorageUtils.java @@ -1,3 +1,26 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ package org.jclouds.azure.storage.util; import java.io.ByteArrayInputStream; diff --git a/azure/storage/core/src/main/java/org/jclouds/azure/storage/xml/AzureStorageParserFactory.java b/azure/storage/core/src/main/java/org/jclouds/azure/storage/xml/AzureStorageParserFactory.java index 0571d4805c..f8aac51249 100644 --- a/azure/storage/core/src/main/java/org/jclouds/azure/storage/xml/AzureStorageParserFactory.java +++ b/azure/storage/core/src/main/java/org/jclouds/azure/storage/xml/AzureStorageParserFactory.java @@ -1,3 +1,26 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ package org.jclouds.azure.storage.xml; import org.jclouds.azure.storage.domain.AzureStorageError; diff --git a/azure/storage/core/src/main/java/org/jclouds/azure/storage/xml/ErrorHandler.java b/azure/storage/core/src/main/java/org/jclouds/azure/storage/xml/ErrorHandler.java index b046149517..2667ef83f8 100644 --- a/azure/storage/core/src/main/java/org/jclouds/azure/storage/xml/ErrorHandler.java +++ b/azure/storage/core/src/main/java/org/jclouds/azure/storage/xml/ErrorHandler.java @@ -1,3 +1,26 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ package org.jclouds.azure.storage.xml; import org.jclouds.azure.storage.domain.AzureStorageError; @@ -23,9 +46,9 @@ public class ErrorHandler extends ParseSax.HandlerWithResult public void endElement(String uri, String name, String qName) { if (qName.equals("Code")) { - error.setCode(currentText.toString()); + error.setCode(currentText.toString().trim()); } else if (qName.equals("Message")) { - error.setMessage(currentText.toString()); + error.setMessage(currentText.toString().trim()); } else if (!qName.equals("Error")) { error.getDetails().put(qName, currentText.toString()); } diff --git a/azure/storage/core/src/main/java/org/jclouds/azure/storage/xml/config/AzureStorageParserModule.java b/azure/storage/core/src/main/java/org/jclouds/azure/storage/xml/config/AzureStorageParserModule.java index cc382e8e66..3a0bc27ca1 100644 --- a/azure/storage/core/src/main/java/org/jclouds/azure/storage/xml/config/AzureStorageParserModule.java +++ b/azure/storage/core/src/main/java/org/jclouds/azure/storage/xml/config/AzureStorageParserModule.java @@ -1,3 +1,26 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ package org.jclouds.azure.storage.xml.config; import org.jclouds.azure.storage.domain.AzureStorageError; diff --git a/azure/storage/core/src/test/java/org/jclouds/azure/storage/filters/SharedKeyAuthenticationLiveTest.java b/azure/storage/core/src/test/java/org/jclouds/azure/storage/filters/SharedKeyAuthenticationLiveTest.java index 7104e6ac36..3f658b42d0 100644 --- a/azure/storage/core/src/test/java/org/jclouds/azure/storage/filters/SharedKeyAuthenticationLiveTest.java +++ b/azure/storage/core/src/test/java/org/jclouds/azure/storage/filters/SharedKeyAuthenticationLiveTest.java @@ -1,16 +1,41 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ package org.jclouds.azure.storage.filters; +import static org.testng.Assert.assertTrue; + import java.net.URI; import javax.ws.rs.GET; import javax.ws.rs.Path; -import static org.testng.Assert.assertTrue; + import org.jclouds.azure.storage.reference.AzureStorageConstants; import org.jclouds.concurrent.WithinThreadExecutorService; import org.jclouds.concurrent.config.ExecutorServiceModule; import org.jclouds.http.config.JavaUrlHttpCommandExecutorServiceModule; import org.jclouds.logging.log4j.config.Log4JLoggingModule; -import org.jclouds.rest.Query; +import org.jclouds.rest.QueryParams; import org.jclouds.rest.RequestFilters; import org.jclouds.rest.RestClientFactory; import org.jclouds.rest.config.JaxrsModule; @@ -35,15 +60,11 @@ public class SharedKeyAuthenticationLiveTest { @GET @Path("/") - @Query(key = "comp", value = "list") + @QueryParams(keys = "comp", values = "list") String authenticate(); } - protected static final String sysAzureStorageAccount = System - .getProperty(AzureStorageConstants.PROPERTY_AZURESTORAGE_ACCOUNT); - protected static final String sysAzureStorageKey = System - .getProperty(AzureStorageConstants.PROPERTY_AZURESTORAGE_KEY); private Injector injector; private IntegrationTestClient client; private String uri; @@ -56,22 +77,23 @@ public class SharedKeyAuthenticationLiveTest { @BeforeClass void setupFactory() { + final String account = System.getProperty("jclouds.test.user"); + final String key = System.getProperty("jclouds.test.key"); + injector = Guice.createInjector(new AbstractModule() { @Override protected void configure() { bindConstant().annotatedWith( - Names.named(AzureStorageConstants.PROPERTY_AZURESTORAGE_ACCOUNT)).to( - sysAzureStorageAccount); + Names.named(AzureStorageConstants.PROPERTY_AZURESTORAGE_ACCOUNT)).to(account); bindConstant().annotatedWith( - Names.named(AzureStorageConstants.PROPERTY_AZURESTORAGE_KEY)).to( - sysAzureStorageKey); + Names.named(AzureStorageConstants.PROPERTY_AZURESTORAGE_KEY)).to(key); } }, new JaxrsModule(), new Log4JLoggingModule(), new ExecutorServiceModule( new WithinThreadExecutorService()), new JavaUrlHttpCommandExecutorServiceModule()); RestClientFactory factory = injector.getInstance(RestClientFactory.class); - uri = "http://" + sysAzureStorageAccount + ".blob.core.windows.net"; + uri = "http://" + account + ".blob.core.windows.net"; client = factory.create(URI.create(uri), IntegrationTestClient.class); } } diff --git a/azure/storage/core/src/test/java/org/jclouds/azure/storage/options/CreateOptionsTest.java b/azure/storage/core/src/test/java/org/jclouds/azure/storage/options/CreateOptionsTest.java index a90dbf5c55..cb7def5f2d 100644 --- a/azure/storage/core/src/test/java/org/jclouds/azure/storage/options/CreateOptionsTest.java +++ b/azure/storage/core/src/test/java/org/jclouds/azure/storage/options/CreateOptionsTest.java @@ -1,3 +1,26 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ package org.jclouds.azure.storage.options; import static org.testng.Assert.assertEquals; diff --git a/azure/storage/core/src/test/java/org/jclouds/azure/storage/options/ListOptionsTest.java b/azure/storage/core/src/test/java/org/jclouds/azure/storage/options/ListOptionsTest.java index 863d7ea238..4db01f7944 100644 --- a/azure/storage/core/src/test/java/org/jclouds/azure/storage/options/ListOptionsTest.java +++ b/azure/storage/core/src/test/java/org/jclouds/azure/storage/options/ListOptionsTest.java @@ -1,3 +1,26 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ package org.jclouds.azure.storage.options; import static org.testng.Assert.assertEquals; diff --git a/azure/storage/core/src/test/java/org/jclouds/azure/storage/xml/BaseHandlerTest.java b/azure/storage/core/src/test/java/org/jclouds/azure/storage/xml/BaseHandlerTest.java index 249a966021..f350ed3357 100644 --- a/azure/storage/core/src/test/java/org/jclouds/azure/storage/xml/BaseHandlerTest.java +++ b/azure/storage/core/src/test/java/org/jclouds/azure/storage/xml/BaseHandlerTest.java @@ -1,3 +1,26 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ package org.jclouds.azure.storage.xml; import org.jclouds.azure.storage.xml.config.AzureStorageParserModule; diff --git a/azure/storage/core/src/test/resources/test_error.xml b/azure/storage/core/src/test/resources/test_error.xml index 8b15ae1cca..28e140da01 100644 --- a/azure/storage/core/src/test/resources/test_error.xml +++ b/azure/storage/core/src/test/resources/test_error.xml @@ -1,7 +1,15 @@ -AuthenticationFailedServer failed to authenticate the request. Make sure the value of Authorization header is formed correctly including the signature. -RequestId:7859e884-e8b9-4ed0-aa62-ac6963b91bf6 -Time:2009-09-02T23:32:36.7507749ZThe MAC signature found in the HTTP request 'XEv0NqP+zePZxlrHmxy2F6MiyoRD8LIJt1f/Swgzn1U=' is not the same as any computed signature. Server used following string to sign: 'GET + + + AuthenticationFailed + Server failed to authenticate the request. Make sure the value + of Authorization header is formed correctly including the signature. + RequestId:7859e884-e8b9-4ed0-aa62-ac6963b91bf6 + Time:2009-09-02T23:32:36.7507749Z + The MAC signature found in the HTTP request + 'XEv0NqP+zePZxlrHmxy2F6MiyoRD8LIJt1f/Swgzn1U=' is not the same as any + computed signature. Server used following string to sign: 'GET -Wed, 02 Sep 2009 23:32:34 GMT -/jclouds/?comp=list'. \ No newline at end of file + Wed, 02 Sep 2009 23:32:34 GMT + /jclouds/?comp=list'. + \ No newline at end of file diff --git a/azure/storage/pom.xml b/azure/storage/pom.xml index b4d0050b8f..a9b49dc340 100644 --- a/azure/storage/pom.xml +++ b/azure/storage/pom.xml @@ -43,57 +43,7 @@ table - - + ${jclouds.azure.storage.account} + ${jclouds.azure.storage.key} - - - live - - - - org.apache.maven.plugins - maven-surefire-plugin - - - integration - integration-test - - test - - - - - none - - - **/*IntegrationTest.java - **/*LiveTest.java - - - - file.encoding - UTF-8 - - - jclouds.azure.storage.account - ${jclouds.azure.storage.account} - - - jclouds.azure.storage.key - ${jclouds.azure.storage.key} - - - - - - - - - - - diff --git a/azure/storage/queue/core/src/main/java/org/jclouds/azure/storage/queue/AzureQueueConnection.java b/azure/storage/queue/core/src/main/java/org/jclouds/azure/storage/queue/AzureQueueConnection.java index da3f821e67..a5cd64732a 100644 --- a/azure/storage/queue/core/src/main/java/org/jclouds/azure/storage/queue/AzureQueueConnection.java +++ b/azure/storage/queue/core/src/main/java/org/jclouds/azure/storage/queue/AzureQueueConnection.java @@ -32,15 +32,15 @@ import javax.ws.rs.PUT; import javax.ws.rs.Path; import javax.ws.rs.PathParam; -import org.jclouds.azure.storage.domain.MetadataList; +import org.jclouds.azure.storage.domain.BoundedList; import org.jclouds.azure.storage.filters.SharedKeyAuthentication; import org.jclouds.azure.storage.options.CreateOptions; import org.jclouds.azure.storage.options.ListOptions; import org.jclouds.azure.storage.queue.domain.QueueMetadata; import org.jclouds.azure.storage.queue.xml.AccountNameEnumerationResultsHandler; import org.jclouds.azure.storage.reference.AzureStorageHeaders; -import org.jclouds.rest.Header; -import org.jclouds.rest.Query; +import org.jclouds.rest.Headers; +import org.jclouds.rest.QueryParams; import org.jclouds.rest.RequestFilters; import org.jclouds.rest.SkipEncoding; import org.jclouds.rest.XMLResponseParser; @@ -66,7 +66,7 @@ import org.jclouds.rest.XMLResponseParser; */ @SkipEncoding('/') @RequestFilters(SharedKeyAuthentication.class) -@Header(key = AzureStorageHeaders.VERSION, value = "2009-07-17") +@Headers(keys = AzureStorageHeaders.VERSION, values = "2009-07-17") public interface AzureQueueConnection { /** @@ -81,8 +81,8 @@ public interface AzureQueueConnection { @GET @XMLResponseParser(AccountNameEnumerationResultsHandler.class) @Path("/") - @Query(key = "comp", value = "list") - MetadataList listQueues(ListOptions... listOptions); + @QueryParams(keys = "comp", values = "list") + BoundedList listQueues(ListOptions... listOptions); /** * The Create Queue operation creates a new queue under the specified account. @@ -103,7 +103,7 @@ public interface AzureQueueConnection { */ @PUT @Path("{queue}") - @Query(key = "restype", value = "queue") + @QueryParams(keys = "restype", values = "queue") boolean createQueue(@PathParam("queue") String queue, CreateOptions... options); /** @@ -117,7 +117,7 @@ public interface AzureQueueConnection { */ @DELETE @Path("{queue}") - @Query(key = "restype", value = "queue") + @QueryParams(keys = "restype", values = "queue") boolean deleteQueue(@PathParam("queue") String queue); } diff --git a/azure/storage/queue/core/src/main/java/org/jclouds/azure/storage/queue/AzureQueueContext.java b/azure/storage/queue/core/src/main/java/org/jclouds/azure/storage/queue/AzureQueueContext.java index 510db9c725..0c71a1b6c9 100644 --- a/azure/storage/queue/core/src/main/java/org/jclouds/azure/storage/queue/AzureQueueContext.java +++ b/azure/storage/queue/core/src/main/java/org/jclouds/azure/storage/queue/AzureQueueContext.java @@ -1,3 +1,26 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ package org.jclouds.azure.storage.queue; import org.jclouds.cloud.CloudContext; diff --git a/azure/storage/queue/core/src/main/java/org/jclouds/azure/storage/queue/AzureQueueContextBuilder.java b/azure/storage/queue/core/src/main/java/org/jclouds/azure/storage/queue/AzureQueueContextBuilder.java index 49a25e6d79..6037060748 100755 --- a/azure/storage/queue/core/src/main/java/org/jclouds/azure/storage/queue/AzureQueueContextBuilder.java +++ b/azure/storage/queue/core/src/main/java/org/jclouds/azure/storage/queue/AzureQueueContextBuilder.java @@ -63,7 +63,7 @@ import com.google.inject.Module; * @see AzureQueueContext */ public class AzureQueueContextBuilder extends - CloudContextBuilder { + CloudContextBuilder { public AzureQueueContextBuilder(Properties props) { super(props); diff --git a/azure/storage/queue/core/src/main/java/org/jclouds/azure/storage/queue/config/AzureQueueContextModule.java b/azure/storage/queue/core/src/main/java/org/jclouds/azure/storage/queue/config/AzureQueueContextModule.java index ecc3563c96..3b1843ecf3 100644 --- a/azure/storage/queue/core/src/main/java/org/jclouds/azure/storage/queue/config/AzureQueueContextModule.java +++ b/azure/storage/queue/core/src/main/java/org/jclouds/azure/storage/queue/config/AzureQueueContextModule.java @@ -1,3 +1,26 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ package org.jclouds.azure.storage.queue.config; import org.jclouds.azure.storage.queue.AzureQueueConnection; diff --git a/azure/storage/queue/core/src/main/java/org/jclouds/azure/storage/queue/config/RestAzureQueueConnectionModule.java b/azure/storage/queue/core/src/main/java/org/jclouds/azure/storage/queue/config/RestAzureQueueConnectionModule.java index 323b6a2273..0d248670a2 100644 --- a/azure/storage/queue/core/src/main/java/org/jclouds/azure/storage/queue/config/RestAzureQueueConnectionModule.java +++ b/azure/storage/queue/core/src/main/java/org/jclouds/azure/storage/queue/config/RestAzureQueueConnectionModule.java @@ -1,3 +1,26 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ package org.jclouds.azure.storage.queue.config; import java.net.URI; diff --git a/azure/storage/queue/core/src/main/java/org/jclouds/azure/storage/queue/internal/GuiceAzureQueueContext.java b/azure/storage/queue/core/src/main/java/org/jclouds/azure/storage/queue/internal/GuiceAzureQueueContext.java index f9e45ca952..42eac8b4ea 100644 --- a/azure/storage/queue/core/src/main/java/org/jclouds/azure/storage/queue/internal/GuiceAzureQueueContext.java +++ b/azure/storage/queue/core/src/main/java/org/jclouds/azure/storage/queue/internal/GuiceAzureQueueContext.java @@ -1,16 +1,42 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ package org.jclouds.azure.storage.queue.internal; import java.io.IOException; +import java.net.URI; import javax.annotation.Resource; import org.jclouds.azure.storage.queue.AzureQueueConnection; import org.jclouds.azure.storage.queue.AzureQueueContext; +import org.jclouds.azure.storage.reference.AzureStorageConstants; import org.jclouds.lifecycle.Closer; import org.jclouds.logging.Logger; import com.google.inject.Inject; import com.google.inject.Injector; +import com.google.inject.name.Named; /** * Uses a Guice Injector to configure the objects served by AzureQueueContext methods. @@ -24,21 +50,18 @@ public class GuiceAzureQueueContext implements AzureQueueContext { private Logger logger = Logger.NULL; private final Injector injector; private final Closer closer; + private final URI endPoint; + private final String account; @Inject - private GuiceAzureQueueContext(Injector injector, Closer closer) { + private GuiceAzureQueueContext(Injector injector, Closer closer, + @Named(AzureStorageConstants.PROPERTY_AZURESTORAGE_ACCOUNT) String account, URI endPoint) { this.injector = injector; this.closer = closer; + this.endPoint = endPoint; + this.account = account; } - /** - * {@inheritDoc} - */ - public AzureQueueConnection getConnection() { - return injector.getInstance(AzureQueueConnection.class); - } - - /** * {@inheritDoc} * @@ -52,4 +75,16 @@ public class GuiceAzureQueueContext implements AzureQueueContext { } } + public String getAccount() { + return account; + } + + public AzureQueueConnection getApi() { + return injector.getInstance(AzureQueueConnection.class); + } + + public URI getEndPoint() { + return endPoint; + } + } diff --git a/azure/storage/queue/core/src/main/java/org/jclouds/azure/storage/queue/xml/AccountNameEnumerationResultsHandler.java b/azure/storage/queue/core/src/main/java/org/jclouds/azure/storage/queue/xml/AccountNameEnumerationResultsHandler.java index d51506c2fb..c2a02d46ea 100755 --- a/azure/storage/queue/core/src/main/java/org/jclouds/azure/storage/queue/xml/AccountNameEnumerationResultsHandler.java +++ b/azure/storage/queue/core/src/main/java/org/jclouds/azure/storage/queue/xml/AccountNameEnumerationResultsHandler.java @@ -27,7 +27,8 @@ import java.net.URI; import java.util.ArrayList; import java.util.List; -import org.jclouds.azure.storage.domain.MetadataList; +import org.jclouds.azure.storage.domain.ArrayBoundedList; +import org.jclouds.azure.storage.domain.BoundedList; import org.jclouds.azure.storage.queue.domain.QueueMetadata; import org.jclouds.http.functions.ParseSax; @@ -42,7 +43,7 @@ import com.google.inject.Inject; * @author Adrian Cole */ public class AccountNameEnumerationResultsHandler extends - ParseSax.HandlerWithResult> { + ParseSax.HandlerWithResult> { private List metadata = new ArrayList(); private String prefix; @@ -58,8 +59,8 @@ public class AccountNameEnumerationResultsHandler extends public AccountNameEnumerationResultsHandler() { } - public MetadataList getResult() { - return new MetadataList(prefix, marker, maxResults, metadata, nextMarker); + public BoundedList getResult() { + return new ArrayBoundedList(metadata, prefix, marker, maxResults, nextMarker); } public void endElement(String uri, String name, String qName) { diff --git a/azure/storage/queue/core/src/main/java/org/jclouds/azure/storage/queue/xml/AzureQueueParserFactory.java b/azure/storage/queue/core/src/main/java/org/jclouds/azure/storage/queue/xml/AzureQueueParserFactory.java index 1bae214097..5b5fd1078e 100644 --- a/azure/storage/queue/core/src/main/java/org/jclouds/azure/storage/queue/xml/AzureQueueParserFactory.java +++ b/azure/storage/queue/core/src/main/java/org/jclouds/azure/storage/queue/xml/AzureQueueParserFactory.java @@ -1,6 +1,29 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ package org.jclouds.azure.storage.queue.xml; -import org.jclouds.azure.storage.domain.MetadataList; +import org.jclouds.azure.storage.domain.BoundedList; import org.jclouds.azure.storage.queue.domain.QueueMetadata; import org.jclouds.azure.storage.xml.AzureStorageParserFactory; import org.jclouds.http.functions.ParseSax; @@ -18,12 +41,12 @@ import com.google.inject.Provider; public class AzureQueueParserFactory extends AzureStorageParserFactory { @Inject - private GenericParseFactory> parseContainerMetadataListFactory; + private GenericParseFactory> parseContainerMetadataListFactory; @Inject Provider containerMetaListHandlerProvider; - public ParseSax> createContainerMetadataListParser() { + public ParseSax> createContainerMetadataListParser() { return parseContainerMetadataListFactory.create(containerMetaListHandlerProvider.get()); } } \ No newline at end of file diff --git a/azure/storage/queue/core/src/main/java/org/jclouds/azure/storage/queue/xml/config/AzureQueueParserModule.java b/azure/storage/queue/core/src/main/java/org/jclouds/azure/storage/queue/xml/config/AzureQueueParserModule.java index c9844e2b76..1896472572 100644 --- a/azure/storage/queue/core/src/main/java/org/jclouds/azure/storage/queue/xml/config/AzureQueueParserModule.java +++ b/azure/storage/queue/core/src/main/java/org/jclouds/azure/storage/queue/xml/config/AzureQueueParserModule.java @@ -1,6 +1,29 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ package org.jclouds.azure.storage.queue.xml.config; -import org.jclouds.azure.storage.domain.MetadataList; +import org.jclouds.azure.storage.domain.BoundedList; import org.jclouds.azure.storage.queue.domain.QueueMetadata; import org.jclouds.azure.storage.queue.xml.AccountNameEnumerationResultsHandler; import org.jclouds.azure.storage.xml.AzureStorageParserFactory; @@ -18,13 +41,13 @@ import com.google.inject.assistedinject.FactoryProvider; */ @ConfiguresResponseTransformer public class AzureQueueParserModule extends AzureStorageParserModule { - protected final TypeLiteral>> accountNameEnumerationResultsHandler = new TypeLiteral>>() { + protected final TypeLiteral>> accountNameEnumerationResultsHandler = new TypeLiteral>>() { }; @Override protected void bindParserImplementationsToReturnTypes() { super.bindParserImplementationsToReturnTypes(); - bind(new TypeLiteral>>() { + bind(new TypeLiteral>>() { }).to(AccountNameEnumerationResultsHandler.class); } @@ -33,7 +56,7 @@ public class AzureQueueParserModule extends AzureStorageParserModule { super.bindCallablesThatReturnParseResults(); bind(accountNameEnumerationResultsHandler).toProvider( FactoryProvider.newFactory(accountNameEnumerationResultsHandler, - new TypeLiteral>>() { + new TypeLiteral>>() { })); } diff --git a/azure/storage/queue/core/src/test/java/org/jclouds/azure/storage/queue/AzureQueueConnectionLiveTest.java b/azure/storage/queue/core/src/test/java/org/jclouds/azure/storage/queue/AzureQueueConnectionLiveTest.java index 3e5fea268f..8336fb9c17 100644 --- a/azure/storage/queue/core/src/test/java/org/jclouds/azure/storage/queue/AzureQueueConnectionLiveTest.java +++ b/azure/storage/queue/core/src/test/java/org/jclouds/azure/storage/queue/AzureQueueConnectionLiveTest.java @@ -1,3 +1,26 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ package org.jclouds.azure.storage.queue; import static org.testng.Assert.assertEquals; @@ -6,7 +29,7 @@ import static org.testng.Assert.assertTrue; import java.lang.reflect.UndeclaredThrowableException; import java.security.SecureRandom; -import org.jclouds.azure.storage.domain.MetadataList; +import org.jclouds.azure.storage.domain.BoundedList; import org.jclouds.azure.storage.options.CreateOptions; import org.jclouds.azure.storage.options.ListOptions; import org.jclouds.azure.storage.queue.domain.QueueMetadata; @@ -46,9 +69,9 @@ public class AzureQueueConnectionLiveTest { @Test public void testListQueues() throws Exception { - MetadataList response = connection.listQueues(); + BoundedList response = connection.listQueues(); assert null != response; - long initialQueueCount = response.getMetadata().size(); + long initialQueueCount = response.size(); assertTrue(initialQueueCount >= 0); } @@ -70,9 +93,9 @@ public class AzureQueueConnectionLiveTest { throw e; } } - MetadataList response = connection.listQueues(); + BoundedList response = connection.listQueues(); assert null != response; - long queueCount = response.getMetadata().size(); + long queueCount = response.size(); assertTrue(queueCount >= 1); // TODO ... check to see the queue actually exists } @@ -80,10 +103,10 @@ public class AzureQueueConnectionLiveTest { @Test public void testListQueuesWithOptions() throws Exception { - MetadataList response = connection.listQueues(ListOptions.Builder.prefix( + BoundedList response = connection.listQueues(ListOptions.Builder.prefix( privateQueue).maxResults(1)); assert null != response; - long initialQueueCount = response.getMetadata().size(); + long initialQueueCount = response.size(); assertTrue(initialQueueCount >= 0); assertEquals(privateQueue, response.getPrefix()); assertEquals(1, response.getMaxResults()); diff --git a/azure/storage/queue/core/src/test/java/org/jclouds/azure/storage/queue/AzureQueueConnectionTest.java b/azure/storage/queue/core/src/test/java/org/jclouds/azure/storage/queue/AzureQueueConnectionTest.java index 1f17d1b69b..b6a553f43c 100644 --- a/azure/storage/queue/core/src/test/java/org/jclouds/azure/storage/queue/AzureQueueConnectionTest.java +++ b/azure/storage/queue/core/src/test/java/org/jclouds/azure/storage/queue/AzureQueueConnectionTest.java @@ -1,3 +1,26 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ package org.jclouds.azure.storage.queue; import static org.jclouds.azure.storage.options.CreateOptions.Builder.withMetadata; @@ -69,8 +92,10 @@ public class AzureQueueConnectionTest { 1).marker("marker").prefix("prefix") }); assertEquals(httpMethod.getEndpoint().getHost(), "localhost"); assertEquals(httpMethod.getEndpoint().getPath(), "/"); - assertEquals(httpMethod.getEndpoint().getQuery(), - "comp=list&marker=marker&maxresults=1&prefix=prefix"); + assert httpMethod.getEndpoint().getQuery().contains("comp=list"); + assert httpMethod.getEndpoint().getQuery().contains("marker=marker"); + assert httpMethod.getEndpoint().getQuery().contains("maxresults=1"); + assert httpMethod.getEndpoint().getQuery().contains("prefix=prefix"); assertEquals(httpMethod.getMethod(), HttpMethod.GET); assertEquals(httpMethod.getHeaders().size(), 1); assertEquals(httpMethod.getHeaders().get("x-ms-version"), Collections diff --git a/azure/storage/queue/core/src/test/java/org/jclouds/azure/storage/queue/xml/AccountNameEnumerationResultsHandlerTest.java b/azure/storage/queue/core/src/test/java/org/jclouds/azure/storage/queue/xml/AccountNameEnumerationResultsHandlerTest.java index 375c72ddb3..7bd842681c 100644 --- a/azure/storage/queue/core/src/test/java/org/jclouds/azure/storage/queue/xml/AccountNameEnumerationResultsHandlerTest.java +++ b/azure/storage/queue/core/src/test/java/org/jclouds/azure/storage/queue/xml/AccountNameEnumerationResultsHandlerTest.java @@ -28,7 +28,8 @@ import static org.testng.Assert.assertEquals; import java.io.InputStream; import java.net.URI; -import org.jclouds.azure.storage.domain.MetadataList; +import org.jclouds.azure.storage.domain.ArrayBoundedList; +import org.jclouds.azure.storage.domain.BoundedList; import org.jclouds.azure.storage.queue.domain.QueueMetadata; import org.jclouds.http.functions.ParseSax; import org.testng.annotations.Test; @@ -45,31 +46,26 @@ public class AccountNameEnumerationResultsHandlerTest extends BaseHandlerTest { public void testApplyInputStream() { InputStream is = getClass().getResourceAsStream("/test_list_queues.xml"); - MetadataList list = new MetadataList("q", null, 3, - ImmutableList.of(new QueueMetadata("q1", URI - .create("http://myaccount.queue.core.windows.net/q1")), new QueueMetadata( - "q2", URI.create("http://myaccount.queue.core.windows.net/q2")), - new QueueMetadata("q3", URI - .create("http://myaccount.queue.core.windows.net/q3"))) - - , "q4"); - ParseSax> parser = parserFactory + BoundedList list = new ArrayBoundedList(ImmutableList.of( + new QueueMetadata("q1", URI.create("http://myaccount.queue.core.windows.net/q1")), + new QueueMetadata("q2", URI.create("http://myaccount.queue.core.windows.net/q2")), + new QueueMetadata("q3", URI.create("http://myaccount.queue.core.windows.net/q3"))), + "q", null, 3, "q4"); + ParseSax> parser = parserFactory .createContainerMetadataListParser(); - MetadataList result = parser.parse(is); + BoundedList result = parser.parse(is); assertEquals(result, list); } public void testApplyInputStreamWithOptions() { InputStream is = getClass().getResourceAsStream("/test_list_queues_options.xml"); - MetadataList list = new MetadataList("q", "q4", 3, - ImmutableList.of(new QueueMetadata("q4", URI - .create("http://myaccount.queue.core.windows.net/q4")), new QueueMetadata( - "q5", URI.create("http://myaccount.queue.core.windows.net/q5"))) - - , null); - ParseSax> parser = parserFactory + BoundedList list = new ArrayBoundedList(ImmutableList.of( + new QueueMetadata("q4", URI.create("http://myaccount.queue.core.windows.net/q4")), + new QueueMetadata("q5", URI.create("http://myaccount.queue.core.windows.net/q5"))), + "q", "q4", 3, null); + ParseSax> parser = parserFactory .createContainerMetadataListParser(); - MetadataList result = parser.parse(is); + BoundedList result = parser.parse(is); assertEquals(result, list); } } diff --git a/azure/storage/queue/core/src/test/java/org/jclouds/azure/storage/queue/xml/BaseHandlerTest.java b/azure/storage/queue/core/src/test/java/org/jclouds/azure/storage/queue/xml/BaseHandlerTest.java index 84ab104976..cec707e9d4 100644 --- a/azure/storage/queue/core/src/test/java/org/jclouds/azure/storage/queue/xml/BaseHandlerTest.java +++ b/azure/storage/queue/core/src/test/java/org/jclouds/azure/storage/queue/xml/BaseHandlerTest.java @@ -1,3 +1,26 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ package org.jclouds.azure.storage.queue.xml; import org.jclouds.azure.storage.queue.xml.AzureQueueParserFactory; diff --git a/azure/storage/queue/core/src/test/resources/test_list_queues.xml b/azure/storage/queue/core/src/test/resources/test_list_queues.xml index 5b17209c1e..bd9c2b0f4a 100644 --- a/azure/storage/queue/core/src/test/resources/test_list_queues.xml +++ b/azure/storage/queue/core/src/test/resources/test_list_queues.xml @@ -1,4 +1,29 @@ + q 3 diff --git a/azure/storage/queue/core/src/test/resources/test_list_queues_options.xml b/azure/storage/queue/core/src/test/resources/test_list_queues_options.xml index 46affdd4fa..da379d3f68 100644 --- a/azure/storage/queue/core/src/test/resources/test_list_queues_options.xml +++ b/azure/storage/queue/core/src/test/resources/test_list_queues_options.xml @@ -1,4 +1,29 @@ + q q4 diff --git a/keyvaluestore/core/pom.xml b/blobstore/core/pom.xml similarity index 62% rename from keyvaluestore/core/pom.xml rename to blobstore/core/pom.xml index 5ee1f4fc1d..d5db09f285 100755 --- a/keyvaluestore/core/pom.xml +++ b/blobstore/core/pom.xml @@ -28,21 +28,35 @@ org.jclouds - jclouds-keyvaluestore-project + jclouds-blobstore-project 1.0-SNAPSHOT ../pom.xml 4.0.0 org.jclouds - jclouds-keyvaluestore-core - jclouds keyvaluestore Components Core + jclouds-blobstore-core + jclouds blobstore Components Core jar - jclouds Core components to access keyvaluestores + jclouds Core components to access blobstores - scm:svn:http://jclouds.googlecode.com/svn/trunk/keyvaluestore/core - scm:svn:https://jclouds.googlecode.com/svn/trunk/keyvaluestore/core - http://jclouds.googlecode.com/svn/trunk/keyvaluestore/core + scm:svn:http://jclouds.googlecode.com/svn/trunk/blobstore/core + scm:svn:https://jclouds.googlecode.com/svn/trunk/blobstore/core + http://jclouds.googlecode.com/svn/trunk/blobstore/core + + http://apache.multihomed.net/maven/binaries/apache-maven-2.2.0-bin.zip + 132bcde2aeca20acb0b16c1c66b74984 + + + + ${project.groupId} + jclouds-httpnio + ${project.version} + test + + + + diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/BaseBlobMap.java b/blobstore/core/src/main/java/org/jclouds/blobstore/BaseBlobMap.java new file mode 100755 index 0000000000..7b8dc75f6a --- /dev/null +++ b/blobstore/core/src/main/java/org/jclouds/blobstore/BaseBlobMap.java @@ -0,0 +1,266 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.blobstore; + +import static com.google.common.base.Preconditions.checkArgument; +import static com.google.common.base.Preconditions.checkNotNull; + +import java.io.FileNotFoundException; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.Map.Entry; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.Future; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; + +import org.jclouds.blobstore.domain.Blob; +import org.jclouds.blobstore.domain.BlobMetadata; +import org.jclouds.blobstore.domain.ContainerMetadata; +import org.jclouds.blobstore.reference.BlobStoreConstants; +import org.jclouds.rest.BoundedList; +import org.jclouds.util.Utils; + +import com.google.common.annotations.VisibleForTesting; +import com.google.common.collect.Maps; +import com.google.inject.Inject; +import com.google.inject.assistedinject.Assisted; +import com.google.inject.name.Named; + +/** + * Implements core Map functionality with an {@link BlobStore} + *

    + * All commands will wait a maximum of ${jclouds.blobstore.timeout} milliseconds to complete before + * throwing an exception. + * + * @author Adrian Cole + * @param + * value of the map + */ +public abstract class BaseBlobMap, V> { + + protected final BlobStore connection; + protected final String container; + + /** + * maximum duration of an blob Request + */ + @Inject(optional = true) + @Named(BlobStoreConstants.PROPERTY_BLOBSTORE_TIMEOUT) + protected long requestTimeoutMilliseconds = 30000; + + /** + * time to pause before retrying a transient failure + */ + @Inject(optional = true) + @Named(BlobStoreConstants.PROPERTY_BLOBSTORE_RETRY) + protected long requestRetryMilliseconds = 10; + + @Inject + public BaseBlobMap(BlobStore connection, @Assisted String containerName) { + this.connection = checkNotNull(connection, "connection"); + this.container = checkNotNull(containerName, "container"); + checkArgument(!container.equals(""), "container name must not be a blank string!"); + } + + /** + * {@inheritDoc} + *

    + * This returns the number of keys in the {@link BoundedList} + * + * @see BoundedList#getContents() + */ + public int size() { + try { + return refreshContainer().size(); + } catch (Exception e) { + Utils. rethrowIfRuntimeOrSameType(e); + throw new BlobRuntimeException("Error getting size of container" + container, e); + } + } + + protected boolean containsETag(byte[] eTag) throws InterruptedException, ExecutionException, + TimeoutException { + for (BlobMetadata metadata : refreshContainer()) { + if (Arrays.equals(eTag, metadata.getETag())) + return true; + } + return false; + } + + protected byte[] getMD5(Object value) throws IOException, FileNotFoundException, + InterruptedException, ExecutionException, TimeoutException { + Blob object; + if (value instanceof Blob) { + object = (Blob) value; + } else { + object = new Blob("dummy", value); + } + if (object.getMetadata().getContentMD5() == null) + object.generateMD5(); + return object.getMetadata().getContentMD5(); + } + + /** + * attempts asynchronous gets on all objects. + * + * @see BlobStore#getBlob(String, String) + */ + protected Set getAllObjects() { + Set objects = new HashSet(); + Map> futureObjects = Maps.newHashMap(); + for (String key : keySet()) { + futureObjects.put(key, connection.getBlob(container, key)); + } + for (Entry> futureObjectEntry : futureObjects.entrySet()) { + try { + ifNotFoundRetryOtherwiseAddToSet(futureObjectEntry.getKey(), futureObjectEntry + .getValue(), objects); + } catch (Exception e) { + Utils. rethrowIfRuntimeOrSameType(e); + throw new BlobRuntimeException(String.format("Error getting value from blob %1$s", + container), e); + } + + } + return objects; + } + + @VisibleForTesting + void ifNotFoundRetryOtherwiseAddToSet(String key, Future value, Set objects) + throws InterruptedException, ExecutionException, TimeoutException { + for (int i = 0; i < 3; i++) { + try { + B object = value.get(requestTimeoutMilliseconds, TimeUnit.MILLISECONDS); + object.getMetadata().setKey(key); + objects.add(object); + return; + } catch (KeyNotFoundException e) { + Thread.sleep(requestRetryMilliseconds); + } + } + } + + /** + * {@inheritDoc} + *

    + * Note that if value is an instance of InputStream, it will be read and closed following this + * method. To reuse data from InputStreams, pass {@link java.io.InputStream}s inside {@link Blob}s + */ + public boolean containsValue(Object value) { + return eTagExistsMatchingMD5Of(value); + } + + private boolean eTagExistsMatchingMD5Of(Object value) { + try { + byte[] eTag = getMD5(value); + return containsETag(eTag); + } catch (Exception e) { + Utils. rethrowIfRuntimeOrSameType(e); + throw new BlobRuntimeException(String.format( + "Error searching for ETAG of value: [%2$s] in container:%1$s", container, value), + e); + } + } + + public static class BlobRuntimeException extends RuntimeException { + private static final long serialVersionUID = 1L; + + BlobRuntimeException(String s) { + super(s); + } + + public BlobRuntimeException(String s, Throwable throwable) { + super(s, throwable); + } + } + + public void clear() { + try { + List> deletes = new ArrayList>(); + for (String key : keySet()) { + deletes.add(connection.removeBlob(container, key)); + } + for (Future isdeleted : deletes) + if (!isdeleted.get(requestTimeoutMilliseconds, TimeUnit.MILLISECONDS)) { + throw new BlobRuntimeException("failed to delete entry"); + } + } catch (Exception e) { + Utils. rethrowIfRuntimeOrSameType(e); + throw new BlobRuntimeException("Error clearing container" + container, e); + } + } + + /** + * + * @throws ContainerNotFoundException + * when the container doesn't exist + */ + protected List refreshContainer() throws InterruptedException, ExecutionException, + TimeoutException { + return connection.listBlobs(container).get(requestTimeoutMilliseconds, TimeUnit.MILLISECONDS); + } + + public Set keySet() { + try { + Set keys = new HashSet(); + for (BlobMetadata object : refreshContainer()) + keys.add(object.getKey()); + return keys; + } catch (Exception e) { + Utils. rethrowIfRuntimeOrSameType(e); + throw new BlobRuntimeException("Error getting keys in container: " + container, e); + } + } + + public boolean containsKey(Object key) { + try { + return connection.blobMetadata(container, key.toString()) != null; + } catch (KeyNotFoundException e) { + return false; + } catch (Exception e) { + Utils. rethrowIfRuntimeOrSameType(e); + throw new BlobRuntimeException(String.format("Error searching for %1$s:%2$s", container, + key), e); + } + } + + public boolean isEmpty() { + return keySet().size() == 0; + } + + public List listContainer() { + try { + return refreshContainer(); + } catch (Exception e) { + Utils. rethrowIfRuntimeOrSameType(e); + throw new BlobRuntimeException("Error getting container" + container, e); + } + } +} \ No newline at end of file diff --git a/aws/s3/core/src/main/java/org/jclouds/aws/s3/S3ObjectMap.java b/blobstore/core/src/main/java/org/jclouds/blobstore/BlobMap.java similarity index 74% rename from aws/s3/core/src/main/java/org/jclouds/aws/s3/S3ObjectMap.java rename to blobstore/core/src/main/java/org/jclouds/blobstore/BlobMap.java index 5959ac36f0..444c69d552 100644 --- a/aws/s3/core/src/main/java/org/jclouds/aws/s3/S3ObjectMap.java +++ b/blobstore/core/src/main/java/org/jclouds/blobstore/BlobMap.java @@ -21,21 +21,18 @@ * under the License. * ==================================================================== */ -package org.jclouds.aws.s3; +package org.jclouds.blobstore; -import org.jclouds.aws.s3.domain.S3Bucket; -import org.jclouds.aws.s3.domain.S3Object; +import org.jclouds.blobstore.domain.Blob; +import org.jclouds.blobstore.domain.BlobMetadata; /** - * Map view of an {@link S3Bucket}. - * - *

    - * This allows you to acces the underlying {@link S3Object} so that you can - * manually set metadata such as length, content-type, or eTag hash. + * This allows you to access the underlying {@link Blob} so that you can manually set metadata such + * as length, content-type, or eTag hash. * * @author Adrian Cole * */ -public interface S3ObjectMap extends S3Map { +public interface BlobMap> extends ListableMap { } \ No newline at end of file diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/BlobStore.java b/blobstore/core/src/main/java/org/jclouds/blobstore/BlobStore.java new file mode 100644 index 0000000000..2e4c9ca740 --- /dev/null +++ b/blobstore/core/src/main/java/org/jclouds/blobstore/BlobStore.java @@ -0,0 +1,65 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.blobstore; + +import java.util.List; +import java.util.concurrent.Future; + +import org.jclouds.blobstore.domain.Blob; +import org.jclouds.blobstore.domain.BlobMetadata; +import org.jclouds.blobstore.domain.ContainerMetadata; +import org.jclouds.http.options.GetOptions; + +/** + * Provides hooks needed to run a blob store + */ +public interface BlobStore> { + List listContainers(); + + boolean containerExists(String container); + + Future createContainer(String container); + + /** + * if supported, this will delete a container recursively. Otherwise, it will return false, if + * the container could not be deleted because it is not empty. + * + * @param container + * @return false if container cannot be deleted because it is not empty + */ + Future deleteContainer(String container); + + Future> listBlobs(String container); + + Future putBlob(String container, B blob); + + Future getBlob(String container, String key); + + Future getBlob(String container, String key, GetOptions options); + + M blobMetadata(String container, String key); + + Future removeBlob(String container, String key); + +} diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/BlobStoreContext.java b/blobstore/core/src/main/java/org/jclouds/blobstore/BlobStoreContext.java new file mode 100644 index 0000000000..15b3c88df2 --- /dev/null +++ b/blobstore/core/src/main/java/org/jclouds/blobstore/BlobStoreContext.java @@ -0,0 +1,54 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.blobstore; + +import org.jclouds.blobstore.domain.Blob; +import org.jclouds.blobstore.domain.BlobMetadata; +import org.jclouds.cloud.CloudContext; + +/** + * Represents a cloud that has key-value storage functionality. + * + * + * @author Adrian Cole + * + */ +public interface BlobStoreContext, M extends BlobMetadata, B extends Blob> + extends CloudContext { + + /** + * Creates a Map view of the specified container. + * + * @param container + */ + InputStreamMap createInputStreamMap(String container); + + /** + * Creates a Map view of the specified container. + * + * @param container + */ + BlobMap createBlobMap(String container); + +} \ No newline at end of file diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/ContainerNotFoundException.java b/blobstore/core/src/main/java/org/jclouds/blobstore/ContainerNotFoundException.java new file mode 100644 index 0000000000..12d3c461c3 --- /dev/null +++ b/blobstore/core/src/main/java/org/jclouds/blobstore/ContainerNotFoundException.java @@ -0,0 +1,55 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.blobstore; + +/** + * Thrown when a container cannot be located. + * + * @author Adrian Cole + */ +public class ContainerNotFoundException extends RuntimeException { + + private String container; + + public ContainerNotFoundException() { + super(); + } + + public ContainerNotFoundException(String container) { + super(String.format("%s not found", container)); + this.container = container; + } + + public ContainerNotFoundException(Exception from) { + super(from); + } + + public String getContainer() { + return container; + } + + /** The serialVersionUID */ + private static final long serialVersionUID = -2272965726680821281L; + +} diff --git a/aws/s3/core/src/main/java/org/jclouds/aws/s3/S3InputStreamMap.java b/blobstore/core/src/main/java/org/jclouds/blobstore/InputStreamMap.java old mode 100644 new mode 100755 similarity index 64% rename from aws/s3/core/src/main/java/org/jclouds/aws/s3/S3InputStreamMap.java rename to blobstore/core/src/main/java/org/jclouds/blobstore/InputStreamMap.java index 1364daa769..236695169c --- a/aws/s3/core/src/main/java/org/jclouds/aws/s3/S3InputStreamMap.java +++ b/blobstore/core/src/main/java/org/jclouds/blobstore/InputStreamMap.java @@ -21,35 +21,37 @@ * under the License. * ==================================================================== */ -package org.jclouds.aws.s3; +package org.jclouds.blobstore; import java.io.File; import java.io.InputStream; import java.util.Map; +import org.jclouds.blobstore.domain.BlobMetadata; + /** - * Map view of an {@link org.jclouds.aws.s3.domain.S3Bucket}. Provides additional methods for inserting - * common object types. + * Map view of an {@link org.jclouds.aws.s3.domain.S3Bucket}. Provides additional methods for + * inserting common object types. *

    *

    Note

    All put operations will invoke - * {@link org.jclouds.aws.s3.domain.S3Object#generateETag}. By extension, {@link #put(Object, Object)} - * will result in the InputStream being converted to a byte array. For this - * reason, do not use {@link #put(Object, Object)} to store files. Use + * {@link org.jclouds.aws.s3.domain.S3Object#generateETag}. By extension, + * {@link #put(Object, Object)} will result in the InputStream being converted to a byte array. For + * this reason, do not use {@link #put(Object, Object)} to store files. Use * {@link #putFile(String, File)} or {@link S3ObjectMap} instead. - * + * * @author Adrian Cole */ -public interface S3InputStreamMap extends S3Map { - InputStream putString(String key, String value); +public interface InputStreamMap extends ListableMap { + InputStream putString(String key, String value); - InputStream putFile(String key, File value); + InputStream putFile(String key, File value); - InputStream putBytes(String key, byte[] value); + InputStream putBytes(String key, byte[] value); - void putAllStrings(Map map); + void putAllStrings(Map map); - void putAllBytes(Map map); + void putAllBytes(Map map); - void putAllFiles(Map map); + void putAllFiles(Map map); } \ No newline at end of file diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/KeyNotFoundException.java b/blobstore/core/src/main/java/org/jclouds/blobstore/KeyNotFoundException.java new file mode 100644 index 0000000000..3a022a0830 --- /dev/null +++ b/blobstore/core/src/main/java/org/jclouds/blobstore/KeyNotFoundException.java @@ -0,0 +1,61 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.blobstore; + +/** + * Thrown when a blob cannot be located in the container. + * + * @author Adrian Cole + */ +public class KeyNotFoundException extends RuntimeException { + + private String container; + private String key; + + public KeyNotFoundException() { + super(); + } + + public KeyNotFoundException(String container, String key) { + super(String.format("%s not found in container %s", key, container)); + this.container = container; + this.key = key; + } + + public KeyNotFoundException(Exception from) { + super(from); + } + + public String getContainer() { + return container; + } + + public String getKey() { + return key; + } + + /** The serialVersionUID */ + private static final long serialVersionUID = -2272965726680821281L; + +} diff --git a/aws/s3/core/src/main/java/org/jclouds/aws/s3/S3Map.java b/blobstore/core/src/main/java/org/jclouds/blobstore/ListableMap.java old mode 100644 new mode 100755 similarity index 74% rename from aws/s3/core/src/main/java/org/jclouds/aws/s3/S3Map.java rename to blobstore/core/src/main/java/org/jclouds/blobstore/ListableMap.java index a995d2e506..74a5d63f90 --- a/aws/s3/core/src/main/java/org/jclouds/aws/s3/S3Map.java +++ b/blobstore/core/src/main/java/org/jclouds/blobstore/ListableMap.java @@ -21,25 +21,25 @@ * under the License. * ==================================================================== */ -package org.jclouds.aws.s3; +package org.jclouds.blobstore; +import java.util.List; import java.util.Map; -import org.jclouds.aws.s3.domain.S3Bucket; +import org.jclouds.blobstore.domain.BlobMetadata; /** - * All Map views of {@link S3Bucket}s provide means to access the underlying S3 - * object. + * All Map views of {@link ContainerListing}s provide means to access the underlying Blob. * * @author Adrian Cole * */ -public interface S3Map extends Map { +public interface ListableMap extends Map { - /** - * - * @return s3 bucket listing that this map represents - */ - S3Bucket getBucket(); + /** + * + * @return blob listing that this map represents + */ + List listContainer(); } \ No newline at end of file diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/LiveBlobMap.java b/blobstore/core/src/main/java/org/jclouds/blobstore/LiveBlobMap.java new file mode 100755 index 0000000000..e374e3fba3 --- /dev/null +++ b/blobstore/core/src/main/java/org/jclouds/blobstore/LiveBlobMap.java @@ -0,0 +1,195 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.blobstore; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.Future; +import java.util.concurrent.TimeUnit; + +import org.jclouds.blobstore.domain.Blob; +import org.jclouds.blobstore.domain.BlobMetadata; +import org.jclouds.blobstore.domain.ContainerMetadata; +import org.jclouds.util.Utils; + +import com.google.inject.Inject; +import com.google.inject.assistedinject.Assisted; + +/** + * Map representation of a live connection to a Blob Service. + * + * @see BlobStore + * @see BaseBlobMap + * + * @author Adrian Cole + */ +public class LiveBlobMap> + extends BaseBlobMap implements BlobMap { + + @Inject + public LiveBlobMap(BlobStore connection, @Assisted String containerName) { + super(connection, containerName); + } + + /** + * {@inheritDoc} + * + * @see #values() + */ + public Set> entrySet() { + Set> entrySet = new HashSet>(); + for (B value : values()) { + Map.Entry entry = new Entry(value.getKey(), value); + entrySet.add(entry); + } + return entrySet; + } + + public class Entry implements java.util.Map.Entry { + + private B value; + private String key; + + Entry(String key, B value) { + this.key = key; + this.value = value; + } + + public String getKey() { + return key; + } + + public B getValue() { + return value; + } + + /** + * {@inheritDoc} + * + * @see LiveBMap#put(String, B) + */ + public B setValue(B value) { + return put(key, value); + } + + } + + /** + * {@inheritDoc} + * + * @see S3Connection#getBlob(String, String) + */ + public B get(Object key) { + try { + return connection.getBlob(container, key.toString()).get(requestTimeoutMilliseconds, + TimeUnit.MILLISECONDS); + } catch (KeyNotFoundException e) { + return null; + } catch (Exception e) { + Utils. rethrowIfRuntimeOrSameType(e); + throw new BlobRuntimeException(String.format("Error geting object %1$s:%2$s", container, + key), e); + } + } + + /** + * {@inheritDoc} + * + * @see S3Connection#put(String, B) + */ + public B put(String key, B value) { + B returnVal = getLastValue(key); + try { + connection.putBlob(container, value) + .get(requestTimeoutMilliseconds, TimeUnit.MILLISECONDS); + } catch (Exception e) { + Utils. rethrowIfRuntimeOrSameType(e); + throw new BlobRuntimeException(String.format("Error putting object %1$s:%2$s%n%3$s", + container, key, value), e); + } + return returnVal; + } + + /** + * {@inheritDoc} attempts to put all objects asynchronously. + * + * @see S3Connection#put(String, B) + */ + public void putAll(Map map) { + try { + List> puts = new ArrayList>(); + for (B object : map.values()) { + puts.add(connection.putBlob(container, object)); + } + for (Future put : puts) + // this will throw an exception if there was a problem + put.get(requestTimeoutMilliseconds, TimeUnit.MILLISECONDS); + } catch (Exception e) { + Utils. rethrowIfRuntimeOrSameType(e); + throw new BlobRuntimeException("Error putting into containerName" + container, e); + } + } + + /** + * {@inheritDoc} + * + * @see S3Connection#removeBlob(String, String) + */ + public B remove(Object key) { + B old = getLastValue(key); + try { + connection.removeBlob(container, key.toString()).get(requestTimeoutMilliseconds, + TimeUnit.MILLISECONDS); + } catch (Exception e) { + Utils. rethrowIfRuntimeOrSameType(e); + throw new BlobRuntimeException(String.format("Error removing object %1$s:%2$s", container, + key), e); + } + return old; + } + + private B getLastValue(Object key) { + B old; + try { + old = get(key); + } catch (KeyNotFoundException e) { + old = null; + } + return old; + } + + /** + * {@inheritDoc} + * + * @see #getAllObjects() + */ + public Collection values() { + return getAllObjects(); + } + +} diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/LiveInputStreamMap.java b/blobstore/core/src/main/java/org/jclouds/blobstore/LiveInputStreamMap.java new file mode 100755 index 0000000000..9144b14c0d --- /dev/null +++ b/blobstore/core/src/main/java/org/jclouds/blobstore/LiveInputStreamMap.java @@ -0,0 +1,291 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.blobstore; + +import java.io.File; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.Future; +import java.util.concurrent.TimeUnit; + +import org.jclouds.blobstore.domain.Blob; +import org.jclouds.blobstore.domain.BlobMetadata; +import org.jclouds.blobstore.domain.ContainerMetadata; +import org.jclouds.util.Utils; + +import com.google.common.annotations.VisibleForTesting; +import com.google.inject.Inject; +import com.google.inject.assistedinject.Assisted; + +/** + * Map representation of a live connection to S3. All put operations will result in ETag + * calculation. If this is not desired, use {@link LiveBMap} instead. + * + * @author Adrian Cole + * @see BlobStore + * @see InputStreamMap + * @see BaseBlobMap + */ +public abstract class LiveInputStreamMap> + extends BaseBlobMap implements InputStreamMap { + + @Inject + public LiveInputStreamMap(BlobStore connection, @Assisted String container) { + super(connection, container); + } + + /** + * {@inheritDoc} + * + * @see S3Connection#getBlob(String, String) + */ + public InputStream get(Object o) { + try { + return (InputStream) (connection.getBlob(container, o.toString()).get( + requestTimeoutMilliseconds, TimeUnit.MILLISECONDS)).getData(); + } catch (KeyNotFoundException e) { + return null; + } catch (Exception e) { + Utils. rethrowIfRuntimeOrSameType(e); + throw new BlobRuntimeException(String + .format("Error geting object %1$s:%2$s", container, o), e); + } + } + + /** + * {@inheritDoc} + * + * @see S3Connection#removeBlob(String, String) + */ + public InputStream remove(Object o) { + InputStream old = getLastValue(o); + try { + connection.removeBlob(container, o.toString()).get(requestTimeoutMilliseconds, + TimeUnit.MILLISECONDS); + } catch (Exception e) { + Utils. rethrowIfRuntimeOrSameType(e); + throw new BlobRuntimeException(String.format("Error removing object %1$s:%2$s", container, + o), e); + } + return old; + } + + private InputStream getLastValue(Object o) { + InputStream old; + try { + old = get(o); + } catch (KeyNotFoundException e) { + old = null; + } + return old; + } + + /** + * {@inheritDoc} + * + * @see #getAllObjects() + */ + public Collection values() { + Collection values = new LinkedList(); + Set objects = getAllObjects(); + for (B object : objects) { + values.add((InputStream) object.getData()); + } + return values; + } + + /** + * {@inheritDoc} + * + * @see #getAllObjects() + */ + public Set> entrySet() { + Set> entrySet = new HashSet>(); + for (B object : getAllObjects()) { + entrySet.add(new Entry(object.getKey(), (InputStream) object.getData())); + } + return entrySet; + } + + public class Entry implements java.util.Map.Entry { + + private InputStream value; + private String key; + + Entry(String key, InputStream value) { + this.key = key; + this.value = value; + } + + public String getKey() { + return key; + } + + public InputStream getValue() { + return value; + } + + /** + * {@inheritDoc} + * + * @see LiveInputStreamMap#put(String, InputStream) + */ + public InputStream setValue(InputStream value) { + return put(key, value); + } + + } + + /** + * {@inheritDoc} + * + * @see #putAllInternal(Map) + */ + public void putAll(Map map) { + putAllInternal(map); + } + + /** + * {@inheritDoc} + * + * @see #putAllInternal(Map) + */ + public void putAllBytes(Map map) { + putAllInternal(map); + } + + /** + * {@inheritDoc} + * + * @see #putAllInternal(Map) + */ + public void putAllFiles(Map map) { + putAllInternal(map); + } + + /** + * {@inheritDoc} + * + * @see #putAllInternal(Map) + */ + public void putAllStrings(Map map) { + putAllInternal(map); + } + + /** + * submits requests to add all objects and collects the results later. All values will have eTag + * calculated first. As a side-effect of this, the content will be copied into a byte []. + * + * @see S3Connection#put(String, B) + */ + @VisibleForTesting + void putAllInternal(Map map) { + try { + List> puts = new ArrayList>(); + for (Map.Entry entry : map.entrySet()) { + B object = createBlob(entry.getKey()); + object.setData(entry.getValue()); + object.generateMD5(); + puts.add(connection.putBlob(container, object)); + // / ParamExtractor Funcion + // / response transformer set key on the way out. + // / ExceptionHandler convert 404 to NOT_FOUND + } + for (Future put : puts) + // this will throw an exception if there was a problem + put.get(requestTimeoutMilliseconds, TimeUnit.MILLISECONDS); + } catch (Exception e) { + Utils. rethrowIfRuntimeOrSameType(e); + throw new BlobRuntimeException("Error putting into containerName" + container, e); + } + } + + /** + * {@inheritDoc} + * + * @see #putInternal(String, Object) + */ + public InputStream putString(String key, String value) { + return putInternal(key, value); + } + + /** + * {@inheritDoc} + * + * @see #putInternal(String, Object) + */ + public InputStream putFile(String key, File value) { + return putInternal(key, value); + } + + /** + * {@inheritDoc} + * + * @see #putInternal(String, Object) + */ + public InputStream putBytes(String key, byte[] value) { + return putInternal(key, value); + } + + /** + * {@inheritDoc} + * + * @see #putInternal(String, Object) + */ + public InputStream put(String key, InputStream value) { + return putInternal(key, value); + } + + /** + * calculates eTag before adding the object to s3. As a side-effect of this, the content will be + * copied into a byte []. * + * + * @see S3Connection#put(String, B) + */ + @VisibleForTesting + InputStream putInternal(String s, Object o) { + B object = createBlob(s); + try { + InputStream returnVal = containsKey(s) ? get(s) : null; + object.setData(o); + object.generateMD5(); + connection.putBlob(container, object).get(requestTimeoutMilliseconds, + TimeUnit.MILLISECONDS); + return returnVal; + } catch (Exception e) { + Utils. rethrowIfRuntimeOrSameType(e); + throw new BlobRuntimeException(String.format("Error adding object %1$s:%2$s", container, + object), e); + } + } + + protected abstract B createBlob(String s); + +} diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/binders/BlobBinder.java b/blobstore/core/src/main/java/org/jclouds/blobstore/binders/BlobBinder.java new file mode 100644 index 0000000000..10c3e74058 --- /dev/null +++ b/blobstore/core/src/main/java/org/jclouds/blobstore/binders/BlobBinder.java @@ -0,0 +1,68 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.blobstore.binders; + +import static com.google.common.base.Preconditions.checkNotNull; +import static org.jclouds.blobstore.reference.BlobStoreConstants.PROPERTY_USER_METADATA_PREFIX; + +import javax.ws.rs.core.HttpHeaders; + +import org.jclouds.blobstore.domain.Blob; +import org.jclouds.http.HttpRequest; +import org.jclouds.http.HttpUtils; +import org.jclouds.rest.EntityBinder; + +import com.google.inject.Inject; +import com.google.inject.name.Named; + +public class BlobBinder implements EntityBinder { + private final String metadataPrefix; + + @Inject + public BlobBinder(@Named(PROPERTY_USER_METADATA_PREFIX) String metadataPrefix) { + this.metadataPrefix = metadataPrefix; + } + + public void addEntityToRequest(Object entity, HttpRequest request) { + Blob object = (Blob) entity; + for (String key : object.getMetadata().getUserMetadata().keySet()) { + request.getHeaders().putAll(key.startsWith(metadataPrefix) ? key : metadataPrefix + key, + object.getMetadata().getUserMetadata().get(key)); + } + request.setEntity(checkNotNull(object.getData(), "object.getContent()")); + request.getHeaders() + .put( + HttpHeaders.CONTENT_TYPE, + checkNotNull(object.getMetadata().getContentType(), + "object.metadata.contentType()")); + + request.getHeaders().put(HttpHeaders.CONTENT_LENGTH, object.getMetadata().getSize() + ""); + + if (object.getMetadata().getContentMD5() != null) { + request.getHeaders().put("Content-MD5", + HttpUtils.toBase64String(object.getMetadata().getContentMD5())); + } + + } +} diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/binders/UserMetadataBinder.java b/blobstore/core/src/main/java/org/jclouds/blobstore/binders/UserMetadataBinder.java new file mode 100644 index 0000000000..842d479d3f --- /dev/null +++ b/blobstore/core/src/main/java/org/jclouds/blobstore/binders/UserMetadataBinder.java @@ -0,0 +1,58 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.blobstore.binders; + +import static org.jclouds.blobstore.reference.BlobStoreConstants.PROPERTY_USER_METADATA_PREFIX; + +import java.util.Map.Entry; + +import org.jclouds.http.HttpRequest; +import org.jclouds.rest.EntityBinder; + +import com.google.common.collect.Multimap; +import com.google.inject.Inject; +import com.google.inject.name.Named; + +public class UserMetadataBinder implements EntityBinder { + private final String metadataPrefix; + + @Inject + public UserMetadataBinder(@Named(PROPERTY_USER_METADATA_PREFIX) String metadataPrefix) { + this.metadataPrefix = metadataPrefix; + } + + @SuppressWarnings("unchecked") + public void addEntityToRequest(Object entity, HttpRequest request) { + Multimap userMetadata = (Multimap) entity; + for (Entry entry : userMetadata.entries()) { + if (entry.getKey().startsWith(metadataPrefix)) { + request.getHeaders().put(entry.getKey().toLowerCase(), entry.getValue()); + } else { + request.getHeaders().put((metadataPrefix + entry.getKey()).toLowerCase(), + entry.getValue()); + } + } + } + +} diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/domain/Blob.java b/blobstore/core/src/main/java/org/jclouds/blobstore/domain/Blob.java new file mode 100644 index 0000000000..8a643bac4d --- /dev/null +++ b/blobstore/core/src/main/java/org/jclouds/blobstore/domain/Blob.java @@ -0,0 +1,212 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.blobstore.domain; + +import static com.google.common.base.Preconditions.checkNotNull; +import static com.google.common.base.Preconditions.checkState; + +import java.awt.Container; +import java.io.IOException; +import java.io.InputStream; + +import org.jclouds.http.HttpUtils; +import org.jclouds.http.HttpUtils.MD5InputStreamResult; + +import com.google.inject.Inject; +import com.google.inject.assistedinject.Assisted; + +/** + * Value type for an HTTP Blob service. Blobs are stored in {@link Container containers} and consist + * of a {@link org.jclouds.blobstore.domain.Value#getData() value}, a {@link Blob#getKey key and + * + * @link Blob.Metadata#getUserMetadata() metadata} + * + * @author Adrian Cole + */ +public class Blob { + + @SuppressWarnings("unchecked") + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + Blob other = (Blob) obj; + if (contentLength != other.contentLength) + return false; + if (contentRange == null) { + if (other.contentRange != null) + return false; + } else if (!contentRange.equals(other.contentRange)) + return false; + if (data == null) { + if (other.data != null) + return false; + } else if (!data.equals(other.data)) + return false; + if (metadata == null) { + if (other.metadata != null) + return false; + } else if (!metadata.equals(other.metadata)) + return false; + return true; + } + + @Override + public String toString() { + return "Blob [contentLength=" + contentLength + ", contentRange=" + contentRange + ", data=" + + data + ", metadata=" + metadata + "]"; + } + + protected Object data; + protected final M metadata; + protected long contentLength = -1; + protected String contentRange; + + @SuppressWarnings("unchecked") + public Blob(String key) { + // TODO: why are we getting a generic warning here? + this((M) new BlobMetadata(key)); + } + + @Inject + public Blob(@Assisted M metadata) { + this.metadata = metadata; + } + + public Blob(M metadata, Object data) { + this(metadata); + setData(data); + } + + public Blob(String key, Object data) { + this(key); + setData(data); + } + + /** + * @see BlobMetadata#getKey() + */ + public String getKey() { + return metadata.getKey(); + } + + /** + * Sets entity for the request or the content from the response. If size isn't set, this will + * attempt to discover it. + * + * @param data + * typically InputStream for downloads, or File, byte [], String, or InputStream for + * uploads. + */ + public void setData(Object data) { + this.data = checkNotNull(data, "data"); + if (getMetadata().getSize() == -1) + this.getMetadata().setSize(HttpUtils.calculateSize(data)); + } + + /** + * generate an MD5 Hash for the current data. + *

    + *

    Note

    + *

    + * If this is an InputStream, it will be converted to a byte array first. + * + * @throws IOException + * if there is a problem generating the hash. + */ + public void generateMD5() throws IOException { + checkState(data != null, "data"); + if (data instanceof InputStream) { + MD5InputStreamResult result = HttpUtils.generateMD5Result((InputStream) data); + getMetadata().setSize(result.length); + getMetadata().setContentMD5(result.eTag); + setData(result.data); + } else { + getMetadata().setContentMD5(HttpUtils.md5(data)); + } + } + + /** + * @return InputStream, if downloading, or whatever was set during {@link #setData(Object)} + */ + public Object getData() { + return data; + } + + /** + * @return System and User metadata relevant to this object. + */ + public M getMetadata() { + return metadata; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + (int) (contentLength ^ (contentLength >>> 32)); + result = prime * result + ((contentRange == null) ? 0 : contentRange.hashCode()); + result = prime * result + ((data == null) ? 0 : data.hashCode()); + result = prime * result + ((metadata == null) ? 0 : metadata.hashCode()); + return result; + } + + public void setContentLength(long contentLength) { + this.contentLength = contentLength; + } + + /** + * Returns the total size of the downloaded object, or the chunk that's available. + *

    + * Each test uses a different container name, so it should be perfectly fine to run in parallel. * * @author Adrian Cole */ -@Test(groups = { "live" }, testName = "s3.S3ConnectionLiveTest") -public class S3ConnectionLiveTest extends S3IntegrationTest { +@Test(groups = { "live" }, testName = "blobstore.BlobLiveTest") +public class BaseBlobLiveTest, C extends ContainerMetadata, M extends BlobMetadata, B extends Blob> + extends BaseBlobStoreIntegrationTest { - private static final String sysHttpStreamUrl = System.getProperty("jclouds.s3.httpstream.url"); - private static final String sysHttpStreamETag = System.getProperty("jclouds.s3.httpstream.md5"); + private static final String sysHttpStreamUrl = System + .getProperty("jclouds.blobstore.httpstream.url"); + private static final String sysHttpStreamETag = System + .getProperty("jclouds.blobstore.httpstream.md5"); @Test - @Parameters( { "jclouds.s3.httpstream.url", "jclouds.s3.httpstream.md5" }) + @Parameters( { "jclouds.blobstore.httpstream.url", "jclouds.blobstore.httpstream.md5" }) public void testCopyUrl(@Optional String httpStreamUrl, @Optional String httpStreamETag) throws Exception { httpStreamUrl = checkNotNull(httpStreamUrl != null ? httpStreamUrl : sysHttpStreamUrl, @@ -61,22 +69,23 @@ public class S3ConnectionLiveTest extends S3IntegrationTest { String key = "hello"; URL url = new URL(httpStreamUrl); - byte[] eTag = HttpUtils.fromHexString(httpStreamETag); + byte[] md5 = HttpUtils.fromHexString(httpStreamETag); URLConnection connection = url.openConnection(); int length = connection.getContentLength(); InputStream input = connection.getInputStream(); - S3Object object = new S3Object(key, input); + B object = objectFactory.createBlob(key); + object.setData(input); object.setContentLength(length); - object.getMetadata().setETag(eTag); + object.getMetadata().setContentMD5(md5); object.getMetadata().setSize(length); - String bucketName = getBucketName(); + String bucketName = getContainerName(); try { - byte[] newETag = client.putObject(bucketName, object).get(180, TimeUnit.SECONDS); - assertEquals(newETag, eTag); + client.putBlob(bucketName, object).get(180, TimeUnit.SECONDS); + assertEquals(client.blobMetadata(bucketName, key).getContentMD5(), md5); } finally { - returnBucket(bucketName); + returnContainer(bucketName); } } } \ No newline at end of file diff --git a/aws/s3/core/src/test/java/org/jclouds/aws/s3/S3ObjectMapIntegrationTest.java b/blobstore/core/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobMapIntegrationTest.java old mode 100644 new mode 100755 similarity index 56% rename from aws/s3/core/src/test/java/org/jclouds/aws/s3/S3ObjectMapIntegrationTest.java rename to blobstore/core/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobMapIntegrationTest.java index 68fbf1e783..674b7ce632 --- a/aws/s3/core/src/test/java/org/jclouds/aws/s3/S3ObjectMapIntegrationTest.java +++ b/blobstore/core/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobMapIntegrationTest.java @@ -21,7 +21,7 @@ * under the License. * ==================================================================== */ -package org.jclouds.aws.s3; +package org.jclouds.blobstore.integration.internal; import static org.testng.Assert.assertEquals; @@ -37,9 +37,12 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeoutException; import org.apache.commons.io.IOUtils; -import org.jclouds.aws.s3.domain.S3Object; -import org.jclouds.aws.s3.internal.BaseS3Map; -import org.jclouds.aws.s3.util.S3Utils; +import org.jclouds.blobstore.BlobStore; +import org.jclouds.blobstore.BlobStoreContext; +import org.jclouds.blobstore.domain.Blob; +import org.jclouds.blobstore.domain.BlobMetadata; +import org.jclouds.blobstore.domain.ContainerMetadata; +import org.jclouds.blobstore.util.BlobStoreUtils; import org.testng.annotations.Test; /** @@ -47,60 +50,54 @@ import org.testng.annotations.Test; * * @author Adrian Cole */ -@Test(testName = "s3.S3ObjectMapIntegrationTest") -public class S3ObjectMapIntegrationTest extends BaseS3MapIntegrationTest { - - @SuppressWarnings("unchecked") - protected BaseS3Map createMap(S3Context context, String bucket) { - S3ObjectMap map = context.createS3ObjectMap(bucket); - return (BaseS3Map) map; - } +public class BaseBlobMapIntegrationTest, C extends ContainerMetadata, M extends BlobMetadata, B extends Blob> + extends BaseMapIntegrationTest { @Override @Test(groups = { "integration", "live" }) public void testValues() throws IOException, InterruptedException, ExecutionException, TimeoutException { - String bucketName = getBucketName(); + String bucketName = getContainerName(); try { - BaseS3Map map = createMap(context, bucketName); + Map map = createMap(context, bucketName); putFiveStrings(map); - Collection values = map.values(); + Collection values = map.values(); assertEventuallyMapSize(map, 5); Set valuesAsString = new HashSet(); - for (S3Object object : values) { - valuesAsString.add(S3Utils.getContentAsStringAndClose(object)); + for (B object : values) { + valuesAsString.add(BlobStoreUtils.getContentAsStringAndClose(object)); } valuesAsString.removeAll(fiveStrings.values()); assert valuesAsString.size() == 0; } finally { - returnBucket(bucketName); + returnContainer(bucketName); } } @Test(groups = { "integration", "live" }) public void testRemove() throws InterruptedException, ExecutionException, TimeoutException { - String bucketName = getBucketName(); + String bucketName = getContainerName(); try { - BaseS3Map map = createMap(context, bucketName); + Map map = createMap(context, bucketName); putString(map, "one", "two"); assertEventuallyContentEquals(map, "one", "two"); // TODO track how often this occurs and potentially update map implementation - assertEventuallyRemoveEquals(map, "one", S3Object.NOT_FOUND); - assertEventuallyGetEquals(map, "one", S3Object.NOT_FOUND); + assertEventuallyRemoveEquals(map, "one", null); + assertEventuallyGetEquals(map, "one", null); assertEventuallyKeySize(map, 0); } finally { - returnBucket(bucketName); + returnContainer(bucketName); } } - private void assertEventuallyContentEquals(final BaseS3Map map, final String key, + private void assertEventuallyContentEquals(final Map map, final String key, final String value) throws InterruptedException { assertEventually(new Runnable() { public void run() { - S3Object old = map.remove(key); + B old = map.remove(key); try { - assertEquals(S3Utils.getContentAsStringAndClose(old), value); + assertEquals(BlobStoreUtils.getContentAsStringAndClose(old), value); } catch (IOException e) { throw new RuntimeException(e); } @@ -112,85 +109,85 @@ public class S3ObjectMapIntegrationTest extends BaseS3MapIntegrationTest map = createMap(context, bucketName); + Map map = createMap(context, bucketName); putFiveStrings(map); - Set> entries = map.entrySet(); + Set> entries = map.entrySet(); assertEquals(entries.size(), 5); - for (Entry entry : entries) { - assertEquals(S3Utils.getContentAsStringAndClose(entry.getValue()), fiveStrings - .get(entry.getKey())); - S3Object value = entry.getValue(); + for (Entry entry : entries) { + assertEquals(fiveStrings.get(entry.getKey()), BlobStoreUtils + .getContentAsStringAndClose(entry.getValue())); + B value = entry.getValue(); value.setData(""); - value.generateETag(); + value.generateMD5(); entry.setValue(value); } assertEventuallyMapSize(map, 5); - for (S3Object value : map.values()) { - assertEquals(S3Utils.getContentAsStringAndClose(value), ""); + for (B value : map.values()) { + assertEquals(BlobStoreUtils.getContentAsStringAndClose(value), ""); } } finally { - returnBucket(bucketName); + returnContainer(bucketName); } } @Test(groups = { "integration", "live" }) public void testContains() throws InterruptedException, ExecutionException, TimeoutException { - String bucketName = getBucketName(); + String bucketName = getContainerName(); try { - BaseS3Map map = createMap(context, bucketName); + Map map = createMap(context, bucketName); putString(map, "one", "apple"); - S3Object object = new S3Object("one"); + B object = objectFactory.createBlob("one"); object.setData("apple"); assertEventuallyContainsValue(map, object); } finally { - returnBucket(bucketName); + returnContainer(bucketName); } } - void getOneReturnsAppleAndOldValueIsNull(BaseS3Map map, S3Object old) - throws IOException, InterruptedException { - assert old == S3Object.NOT_FOUND; - assertEquals(S3Utils.getContentAsStringAndClose(map.get("one")), "apple"); + void getOneReturnsAppleAndOldValueIsNull(Map map, B old) throws IOException, + InterruptedException { + assert old == null; + assertEquals(BlobStoreUtils.getContentAsStringAndClose(map.get("one")), "apple"); assertEventuallyMapSize(map, 1); } - void getOneReturnsBearAndOldValueIsApple(BaseS3Map map, S3Object oldValue) - throws IOException, InterruptedException { - assertEquals(S3Utils.getContentAsStringAndClose(map.get("one")), "bear"); - assertEquals(S3Utils.getContentAsStringAndClose(oldValue), "apple"); + void getOneReturnsBearAndOldValueIsApple(Map map, B oldValue) throws IOException, + InterruptedException { + assertEquals(BlobStoreUtils.getContentAsStringAndClose(map.get("one")), "bear"); + assertEquals(BlobStoreUtils.getContentAsStringAndClose(oldValue), "apple"); assertEventuallyMapSize(map, 1); } @Test(groups = { "integration", "live" }) public void testPut() throws IOException, InterruptedException, ExecutionException, TimeoutException { - String bucketName = getBucketName(); + String bucketName = getContainerName(); try { - BaseS3Map map = createMap(context, bucketName); - S3Object object = new S3Object("one"); + Map map = createMap(context, bucketName); + B object = objectFactory.createBlob("one"); object.setData(IOUtils.toInputStream("apple")); - object.generateETag(); - S3Object old = map.put(object.getKey(), object); + object.generateMD5(); + B old = map.put(object.getKey(), object); getOneReturnsAppleAndOldValueIsNull(map, old); object.setData(IOUtils.toInputStream("bear")); - object.generateETag(); - S3Object apple = map.put(object.getKey(), object); + object.generateMD5(); + B apple = map.put(object.getKey(), object); getOneReturnsBearAndOldValueIsApple(map, apple); } finally { - returnBucket(bucketName); + returnContainer(bucketName); } } @Test(groups = { "integration", "live" }) public void testPutAll() throws InterruptedException, ExecutionException, TimeoutException { - String bucketName = getBucketName(); + String bucketName = getContainerName(); try { - BaseS3Map map = createMap(context, bucketName); - Map newMap = new HashMap(); + Map map = createMap(context, bucketName); + Map newMap = new HashMap(); for (String key : fiveInputs.keySet()) { - S3Object object = new S3Object(key); + B object = objectFactory.createBlob(key); object.setData(fiveInputs.get(key)); object.getMetadata().setSize(fiveBytes.get(key).length); newMap.put(key, object); @@ -200,25 +197,30 @@ public class S3ObjectMapIntegrationTest extends BaseS3MapIntegrationTest(fiveInputs.keySet())); fourLeftRemovingOne(map); } finally { - returnBucket(bucketName); + returnContainer(bucketName); } } @Override - protected void putString(BaseS3Map map, String key, String value) { - S3Object object = new S3Object(key); + protected void putString(Map map, String key, String value) { + B object = objectFactory.createBlob(key); object.setData(value); map.put(key, object); } - protected void putFiveStrings(BaseS3Map map) { - Map newMap = new HashMap(); + protected void putFiveStrings(Map map) { + Map newMap = new HashMap(); for (Map.Entry entry : fiveStrings.entrySet()) { - S3Object object = new S3Object(entry.getKey()); + B object = objectFactory.createBlob(entry.getKey()); object.setData(entry.getValue()); newMap.put(entry.getKey(), object); } map.putAll(newMap); } + @SuppressWarnings("unchecked") + protected Map createMap(BlobStoreContext context, String bucket) { + return context.createBlobMap(bucket); + } + } diff --git a/blobstore/core/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobStoreIntegrationTest.java b/blobstore/core/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobStoreIntegrationTest.java new file mode 100644 index 0000000000..b7b15bd2a1 --- /dev/null +++ b/blobstore/core/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobStoreIntegrationTest.java @@ -0,0 +1,480 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.blobstore.integration.internal; + +import static com.google.common.base.Preconditions.checkNotNull; +import static org.testng.Assert.assertEquals; + +import java.io.IOException; +import java.io.InputStream; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.ArrayBlockingQueue; +import java.util.concurrent.BlockingQueue; +import java.util.concurrent.CancellationException; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; +import java.util.concurrent.atomic.AtomicInteger; + +import org.jclouds.blobstore.BlobStore; +import org.jclouds.blobstore.BlobStoreContext; +import org.jclouds.blobstore.domain.Blob; +import org.jclouds.blobstore.domain.BlobMetadata; +import org.jclouds.blobstore.domain.ContainerMetadata; +import org.jclouds.blobstore.integration.internal.BaseBlobStoreIntegrationTest.TestInitializer.Result; +import org.jclouds.blobstore.util.BlobStoreUtils; +import org.jclouds.http.HttpResponseException; +import org.jclouds.http.HttpUtils; +import org.jclouds.http.config.JavaUrlHttpCommandExecutorServiceModule; +import org.jclouds.util.Utils; +import org.testng.ITestContext; +import org.testng.annotations.AfterClass; +import org.testng.annotations.BeforeClass; +import org.testng.annotations.BeforeGroups; +import org.testng.annotations.BeforeSuite; +import org.testng.collections.Lists; + +import com.google.common.base.Predicate; +import com.google.common.collect.Iterables; +import com.google.inject.Module; + +public class BaseBlobStoreIntegrationTest, C extends ContainerMetadata, M extends BlobMetadata, B extends Blob> { + protected static final String LOCAL_ENCODING = System.getProperty("file.encoding"); + protected static final String TEST_STRING = " "; + + public static interface BlobStoreObjectFactory { + B createBlob(String key); + + C createContainerMetadata(String key); + } + + public static interface TestInitializer, C extends ContainerMetadata, M extends BlobMetadata, B extends Blob> { + Result init(Module configurationModule, ITestContext context) throws Exception; + + public static interface Result, C extends ContainerMetadata, M extends BlobMetadata, B extends Blob> { + BlobStoreObjectFactory getObjectFactory(); + + S getClient(); + + BlobStoreContext getContext(); + } + } + + public static long INCONSISTENCY_WINDOW = 5000; + protected static volatile AtomicInteger containerIndex = new AtomicInteger(0); + + protected byte[] goodETag; + protected byte[] badETag; + + protected volatile BlobStoreObjectFactory objectFactory; + protected volatile S client; + protected volatile BlobStoreContext context; + protected static volatile int containerCount = 20; + public static final String CONTAINER_PREFIX = System.getProperty("user.name") + "-blobstore"; + /** + * two test groups integration and live. + */ + private volatile static BlockingQueue containerNames = new ArrayBlockingQueue( + containerCount); + + @BeforeGroups(groups = { "integration", "live" }) + public void setupTags() throws IOException { + goodETag = HttpUtils.md5(TEST_STRING); + badETag = HttpUtils.md5("alf"); + } + + /** + * There are a lot of retries here mainly from experience running inside amazon EC2. + */ + @BeforeSuite + public void setUpResourcesForAllThreads(ITestContext testContext) throws Exception { + createContainersSharedByAllThreads(getCloudResources(testContext), testContext); + } + + @SuppressWarnings("unchecked") + private Result getCloudResources(ITestContext testContext) + throws ClassNotFoundException, InstantiationException, IllegalAccessException, + Exception { + String initializerClass = checkNotNull(System.getProperty("jclouds.test.initializer"), + "jclouds.test.initializer"); + Class> clazz = (Class>) Class + .forName(initializerClass); + TestInitializer initializer = clazz.newInstance(); + return initializer.init(createHttpModule(), testContext); + } + + protected ExecutorService exec; + + /** + * we are doing this at a class level, as the client object is going to be shared for all methods + * in the class. We don't want to do this for group, as some test classes may want to have a + * different implementation of client. For example, one class may want non-blocking i/o and + * another class google appengine. + */ + @BeforeClass(groups = { "integration", "live" }) + public void setUpResourcesOnThisThread(ITestContext testContext) throws Exception { + TestInitializer.Result result = getCloudResources(testContext); + objectFactory = result.getObjectFactory(); + client = result.getClient(); + context = result.getContext(); + exec = Executors.newCachedThreadPool(); + } + + @AfterClass(groups = { "integration", "live" }) + protected void tearDownClient() throws Exception { + exec.shutdown(); + exec.awaitTermination(60, TimeUnit.SECONDS); + context.close(); + } + + private static volatile boolean initialized = false; + + protected void createContainersSharedByAllThreads(Result result, + ITestContext testContext) throws Exception { + while (!initialized) { + synchronized (BaseBlobStoreIntegrationTest.class) { + if (!initialized) { + S client = result.getClient(); + BlobStoreContext context = result.getContext(); + deleteEverything(client, context); + for (; containerIndex.get() < containerCount; containerIndex.incrementAndGet()) { + String containerName = CONTAINER_PREFIX + containerIndex; + if (blackListContainers.contains(containerName)) { + containerCount++; + } else { + try { + createContainerAndEnsureEmpty(client, context, containerName); + containerNames.put(containerName); + } catch (Throwable e) { + // throw away the container and try again with the next index + deleteContainerOrWarnIfUnable(client, context, containerName); + containerCount++; + } + } + } + testContext.setAttribute("containerNames", containerNames); + System.err.printf("*** containers to test: %s%n", containerNames); + // careful not to keep too many files open + context.close(); + initialized = true; + } + } + } + } + + private static void deleteContainerOrWarnIfUnable(BlobStore client, + BlobStoreContext context, String containerName) { + try { + deleteContainer(client, context, containerName); + } catch (Throwable ex) { + System.err.printf("unable to delete container %s, ignoring...%n", containerName); + blackListContainers.add(containerName); + } + } + + private static final List blackListContainers = Lists.newArrayList(); + + /** + * Tries to delete all containers, runs up to two times + */ + @SuppressWarnings("unchecked") + protected static void deleteEverything(final BlobStore client, + final BlobStoreContext context) throws Exception { + try { + for (int i = 0; i < 2; i++) { + Iterable testContainers = Iterables.filter( + (List) client.listContainers(), + new Predicate() { + public boolean apply(ContainerMetadata input) { + return input.getName().startsWith(CONTAINER_PREFIX.toLowerCase()); + } + }); + if (testContainers.iterator().hasNext()) { + ExecutorService executor = Executors.newCachedThreadPool(); + for (final ContainerMetadata metaDatum : testContainers) { + executor.execute(new Runnable() { + public void run() { + deleteContainerOrWarnIfUnable(client, context, metaDatum.getName()); + } + }); + } + executor.shutdown(); + executor.awaitTermination(60, TimeUnit.SECONDS); + } + } // try twice + } catch (CancellationException e) { + throw e; + } + } + + /** + * two test groups integration and live. + */ + + public static boolean SANITY_CHECK_RETURNED_BUCKET_NAME = false; + + /** + * Due to eventual consistency, container commands may not return correctly immediately. Hence, + * we will try up to the inconsistency window to see if the assertion completes. + */ + protected static void assertEventually(Runnable assertion) throws InterruptedException { + AssertionError error = null; + for (int i = 0; i < 10; i++) { + try { + assertion.run(); + return; + } catch (AssertionError e) { + error = e; + } + Thread.sleep(INCONSISTENCY_WINDOW / 10); + } + if (error != null) + throw error; + } + + protected static void createContainerAndEnsureEmpty(BlobStore client, + BlobStoreContext context, final String containerName) + throws InterruptedException, ExecutionException, TimeoutException { + attemptToCreateContainerButRetryOn409(client, containerName); + emptyContainer(client, context, containerName); + } + + /** + * 409 could be a resolvable conflict, ex. container delete in progress. FIXME Comment this + * + * @param client + * @param containerName + * @throws InterruptedException + * @throws TimeoutException + * @throws ExecutionException + */ + private static void attemptToCreateContainerButRetryOn409(BlobStore client, + final String containerName) throws InterruptedException, TimeoutException, + ExecutionException { + ExecutionException error = null; + OUTER: for (int i = 0; i < 10; i++) { + try { + client.createContainer(containerName).get(10, TimeUnit.SECONDS); + break OUTER; + } catch (ExecutionException e) { + error = e; + if (e.getCause() instanceof HttpResponseException) { + HttpResponseException ex = (HttpResponseException) e.getCause(); + if (ex.getResponse().getStatusCode() != 409) { + break OUTER; + } + } + } + Thread.sleep(INCONSISTENCY_WINDOW / 10); + } + if (error != null) + throw error; + } + + protected void createContainerAndEnsureEmpty(String containerName) throws InterruptedException, + ExecutionException, TimeoutException { + createContainerAndEnsureEmpty(client, context, containerName); + } + + protected void addBlobToContainer(String sourceContainer, String key) + throws InterruptedException, ExecutionException, TimeoutException, IOException { + B sourceObject = objectFactory.createBlob(key); + sourceObject.getMetadata().setContentType("text/xml"); + sourceObject.setData(TEST_STRING); + addBlobToContainer(sourceContainer, sourceObject); + } + + protected void addBlobToContainer(String sourceContainer, B object) throws InterruptedException, + ExecutionException, TimeoutException, IOException { + client.putBlob(sourceContainer, object).get(10, TimeUnit.SECONDS); + } + + protected B validateContent(String sourceContainer, String key) throws InterruptedException, + ExecutionException, TimeoutException, IOException { + assertEventuallyContainerSize(sourceContainer, 1); + B newObject = client.getBlob(sourceContainer, key).get(10, TimeUnit.SECONDS); + assert newObject != null; + assertEquals(BlobStoreUtils.getContentAsStringAndClose(newObject), TEST_STRING); + return newObject; + } + + protected void assertEventuallyContainerSize(final String containerName, final int count) + throws InterruptedException { + assertEventually(new Runnable() { + public void run() { + try { + assertEquals(client.listBlobs(containerName).get(10, TimeUnit.SECONDS).size(), count); + } catch (Exception e) { + Utils. rethrowIfRuntimeOrSameType(e); + } + } + }); + } + + public String getContainerName() throws InterruptedException, ExecutionException, + TimeoutException { + String containerName = containerNames.poll(30, TimeUnit.SECONDS); + assert containerName != null : "unable to get a container for the test"; + emptyContainer(containerName); + return containerName; + } + + /** + * requestor will create a container using the name returned from this. This method will take + * care not to exceed the maximum containers permitted by a service by deleting an existing + * container first. + */ + public String getScratchContainerName() throws InterruptedException, ExecutionException, + TimeoutException { + return allocateNewContainerName(getContainerName()); + } + + public void returnContainer(final String containerName) throws InterruptedException, + ExecutionException, TimeoutException { + if (containerName != null) { + containerNames.add(containerName); + /* + * Ensure that any returned container name actually exists on the server. Return of a + * non-existent container introduces subtle testing bugs, where later unrelated tests will + * fail. + * + * NOTE: This sanity check should only be run for Stub-based Integration testing -- it will + * *substantially* slow down tests on a real server over a network. + */ + if (SANITY_CHECK_RETURNED_BUCKET_NAME) { + if (!Iterables.any(client.listContainers(), new Predicate() { + public boolean apply(ContainerMetadata md) { + return containerName.equals(md.getName()); + } + })) { + throw new IllegalStateException( + "Test returned the name of a non-existent container: " + containerName); + } + } + } + } + + /** + * abandon old container name instead of waiting for the container to be created. + */ + public void destroyContainer(String scratchContainer) throws InterruptedException, + ExecutionException, TimeoutException { + if (scratchContainer != null) { + recycleContainerAndAddToPool(scratchContainer); + } + } + + protected void recycleContainerAndAddToPool(String scratchContainer) + throws InterruptedException, ExecutionException, TimeoutException { + String newScratchContainer = recycleContainer(scratchContainer); + returnContainer(newScratchContainer); + } + + protected String recycleContainer(final String container) throws InterruptedException, + ExecutionException, TimeoutException { + String newScratchContainer = allocateNewContainerName(container); + createContainerAndEnsureEmpty(newScratchContainer); + return newScratchContainer; + } + + private String allocateNewContainerName(final String container) { + exec.submit(new Runnable() { + public void run() { + deleteContainerOrWarnIfUnable(client, context, container); + } + }); + String newScratchContainer = container + containerIndex.incrementAndGet(); + System.err.printf("*** allocated new container %s...%n", container); + return newScratchContainer; + } + + protected Module createHttpModule() { + return new JavaUrlHttpCommandExecutorServiceModule(); + } + + protected void emptyContainer(String name) throws InterruptedException, ExecutionException, + TimeoutException { + emptyContainer(client, context, name); + } + + /** + * Remove any objects in a container, leaving it empty. + */ + protected static void emptyContainer(BlobStore client, + final BlobStoreContext context, final String name) + throws InterruptedException, ExecutionException, TimeoutException { + if (client.containerExists(name)) { + // This can fail to be zero length because of stale container lists. Ex. + // client.listContainer() + // could return 9 keys, when there are 10. When all the deletions finish, one entry would + // be left in this case. Instead of failing, we will attempt this entire container deletion + // operation multiple times to ensure we can acheive a zero length container. + assertEventually(new Runnable() { + public void run() { + try { + Map map = context.createInputStreamMap(name); + Set keys = map.keySet(); + if (keys.size() > 0) { + map.clear(); + assertEquals( + map.size(), + 0, + String + .format( + "deleting %s, we still have %s left in container %s, using encoding %s", + keys, map.keySet(), name, LOCAL_ENCODING)); + } + } catch (Exception e) { + Utils. rethrowIfRuntimeOrSameType(e); + } + } + }); + + } + } + + protected static void deleteContainer(final BlobStore client, + BlobStoreContext context, final String name) throws InterruptedException, + ExecutionException, TimeoutException { + if (client.containerExists(name)) { + System.err.printf("*** deleting container %s...%n", name); + emptyContainer(client, context, name); + client.deleteContainer(name).get(10, TimeUnit.SECONDS); + assertEventually(new Runnable() { + public void run() { + try { + assert !client.containerExists(name) : "container " + name + " still exists"; + } catch (Exception e) { + Utils. rethrowIfRuntimeOrSameType(e); + } + } + }); + } + } + +} \ No newline at end of file diff --git a/blobstore/core/src/test/java/org/jclouds/blobstore/integration/internal/BaseContainerIntegrationTest.java b/blobstore/core/src/test/java/org/jclouds/blobstore/integration/internal/BaseContainerIntegrationTest.java new file mode 100755 index 0000000000..8b9f48dad1 --- /dev/null +++ b/blobstore/core/src/test/java/org/jclouds/blobstore/integration/internal/BaseContainerIntegrationTest.java @@ -0,0 +1,155 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.blobstore.integration.internal; + +import static org.testng.Assert.assertEquals; + +import java.io.UnsupportedEncodingException; +import java.util.List; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; + +import org.jclouds.blobstore.BlobStore; +import org.jclouds.blobstore.domain.Blob; +import org.jclouds.blobstore.domain.BlobMetadata; +import org.jclouds.blobstore.domain.ContainerMetadata; +import org.jclouds.util.Utils; +import org.testng.annotations.Test; + +/** + * @author Adrian Cole + */ +public class BaseContainerIntegrationTest, C extends ContainerMetadata, M extends BlobMetadata, B extends Blob> + extends BaseBlobStoreIntegrationTest { + + @Test(groups = { "integration", "live" }) + public void containerDoesntExist() throws Exception { + assert !client.containerExists("forgetaboutit"); + } + + @Test(groups = { "integration", "live" }) + public void testPutTwiceIsOk() throws Exception { + String containerName = getContainerName(); + try { + client.createContainer(containerName).get(10, TimeUnit.SECONDS); + client.createContainer(containerName).get(10, TimeUnit.SECONDS); + } finally { + returnContainer(containerName); + } + } + + @Test(groups = { "integration", "live" }) + public void containerExists() throws Exception { + String containerName = getContainerName(); + try { + assert client.containerExists(containerName); + } finally { + returnContainer(containerName); + } + } + + /** + * this method overrides containerName to ensure it isn't found + */ + @Test(groups = { "integration", "live" }) + public void deleteContainerIfEmptyNotFound() throws Exception { + assert client.deleteContainer("dbienf").get(10, TimeUnit.SECONDS); + } + + @Test(groups = { "integration", "live" }) + public void deleteContainerIfEmptyButHasContents() throws Exception { + String containerName = getContainerName(); + try { + addBlobToContainer(containerName, "test"); + assert !client.deleteContainer(containerName).get(10, TimeUnit.SECONDS); + } finally { + returnContainer(containerName); + } + } + + @Test(groups = { "integration", "live" }) + public void deleteContainerIfEmpty() throws Exception { + final String containerName = getContainerName(); + try { + assert client.deleteContainer(containerName).get(10, TimeUnit.SECONDS); + + assertEventually(new Runnable() { + public void run() { + try { + assert !client.containerExists(containerName) : "container " + containerName + + " still exists"; + } catch (Exception e) { + Utils. rethrowIfRuntimeOrSameType(e); + } + } + }); + } finally { + // this container is now deleted, so we can't reuse it directly + recycleContainer(containerName); + } + } + + protected void addAlphabetUnderRoot(String containerName) throws InterruptedException, + ExecutionException, TimeoutException { + for (char letter = 'a'; letter <= 'z'; letter++) { + B blob = objectFactory.createBlob(letter + ""); + blob.setData(letter + "content"); + client.putBlob(containerName, blob).get(10, TimeUnit.SECONDS); + } + } + + @Test(groups = { "integration", "live" }) + public void testListContainer() throws InterruptedException, ExecutionException, + TimeoutException, UnsupportedEncodingException { + String containerName = getContainerName(); + try { + String prefix = "apps"; + addTenObjectsUnderPrefix(containerName, prefix); + List container = client.listBlobs(containerName).get(10, TimeUnit.SECONDS); + assertEquals(container.size(), 10); + } finally { + returnContainer(containerName); + } + + } + + protected void add15UnderRoot(String containerName) throws InterruptedException, + ExecutionException, TimeoutException { + for (int i = 0; i < 15; i++) { + B blob = objectFactory.createBlob(i + ""); + blob.setData(i + "content"); + client.putBlob(containerName, blob).get(10, TimeUnit.SECONDS); + } + } + + protected void addTenObjectsUnderPrefix(String containerName, String prefix) + throws InterruptedException, ExecutionException, TimeoutException { + for (int i = 0; i < 10; i++) { + B blob = objectFactory.createBlob(prefix + "/" + i); + blob.setData(i + "content"); + client.putBlob(containerName, blob).get(10, TimeUnit.SECONDS); + } + } +} \ No newline at end of file diff --git a/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/binders/UserMetadataBinder.java b/blobstore/core/src/test/java/org/jclouds/blobstore/integration/internal/BaseContainerLiveTest.java old mode 100644 new mode 100755 similarity index 68% rename from rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/binders/UserMetadataBinder.java rename to blobstore/core/src/test/java/org/jclouds/blobstore/integration/internal/BaseContainerLiveTest.java index 9a375b89df..b98c37dbc3 --- a/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/binders/UserMetadataBinder.java +++ b/blobstore/core/src/test/java/org/jclouds/blobstore/integration/internal/BaseContainerLiveTest.java @@ -21,19 +21,18 @@ * under the License. * ==================================================================== */ -package org.jclouds.rackspace.cloudfiles.binders; +package org.jclouds.blobstore.integration.internal; -import org.jclouds.http.HttpRequest; -import org.jclouds.rest.EntityBinder; +import org.jclouds.blobstore.BlobStore; +import org.jclouds.blobstore.domain.Blob; +import org.jclouds.blobstore.domain.BlobMetadata; +import org.jclouds.blobstore.domain.ContainerMetadata; -import com.google.common.collect.Multimap; +/** + * + * @author Adrian Cole + */ +public class BaseContainerLiveTest, C extends ContainerMetadata, M extends BlobMetadata, B extends Blob> + extends BaseBlobStoreIntegrationTest { -public class UserMetadataBinder implements EntityBinder { - - @SuppressWarnings("unchecked") - public void addEntityToRequest(Object entity, HttpRequest request) { - Multimap userMetadata = (Multimap) entity; - request.getHeaders().putAll(userMetadata); - } - -} +} \ No newline at end of file diff --git a/aws/s3/core/src/test/java/org/jclouds/aws/s3/S3InputStreamMapIntegrationTest.java b/blobstore/core/src/test/java/org/jclouds/blobstore/integration/internal/BaseInputStreamMapIntegrationTest.java old mode 100644 new mode 100755 similarity index 62% rename from aws/s3/core/src/test/java/org/jclouds/aws/s3/S3InputStreamMapIntegrationTest.java rename to blobstore/core/src/test/java/org/jclouds/blobstore/integration/internal/BaseInputStreamMapIntegrationTest.java index 7c77112526..4d6f4e1e5e --- a/aws/s3/core/src/test/java/org/jclouds/aws/s3/S3InputStreamMapIntegrationTest.java +++ b/blobstore/core/src/test/java/org/jclouds/blobstore/integration/internal/BaseInputStreamMapIntegrationTest.java @@ -21,7 +21,7 @@ * under the License. * ==================================================================== */ -package org.jclouds.aws.s3; +package org.jclouds.blobstore.integration.internal; import static org.testng.Assert.assertEquals; @@ -29,6 +29,7 @@ import java.io.IOException; import java.io.InputStream; import java.util.Collection; import java.util.HashSet; +import java.util.Map; import java.util.Set; import java.util.TreeSet; import java.util.Map.Entry; @@ -36,7 +37,12 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeoutException; import org.apache.commons.io.IOUtils; -import org.jclouds.aws.s3.internal.BaseS3Map; +import org.jclouds.blobstore.BlobStore; +import org.jclouds.blobstore.BlobStoreContext; +import org.jclouds.blobstore.InputStreamMap; +import org.jclouds.blobstore.domain.Blob; +import org.jclouds.blobstore.domain.BlobMetadata; +import org.jclouds.blobstore.domain.ContainerMetadata; import org.jclouds.util.Utils; import org.testng.annotations.Test; @@ -45,22 +51,16 @@ import org.testng.annotations.Test; * * @author Adrian Cole */ -@Test(testName = "s3.S3InputStreamMapIntegrationTest") -public class S3InputStreamMapIntegrationTest extends BaseS3MapIntegrationTest { - - @SuppressWarnings("unchecked") - protected BaseS3Map createMap(S3Context context, String bucket) { - S3InputStreamMap map = context.createInputStreamMap(bucket); - return (BaseS3Map) map; - } +public class BaseInputStreamMapIntegrationTest, C extends ContainerMetadata, M extends BlobMetadata, B extends Blob> + extends BaseMapIntegrationTest { @Override @Test(groups = { "integration", "live" }) public void testValues() throws IOException, InterruptedException, ExecutionException, TimeoutException { - String bucketName = getBucketName(); + String bucketName = getContainerName(); try { - BaseS3Map map = createMap(context, bucketName); + Map map = createMap(context, bucketName); map.putAll(this.fiveInputs); // this will cause us to block until the bucket updates. assertEventuallyKeySize(map, 5); @@ -73,16 +73,16 @@ public class S3InputStreamMapIntegrationTest extends BaseS3MapIntegrationTest map = createMap(context, bucketName); + Map map = createMap(context, bucketName); putString(map, "one", "two"); InputStream old = map.remove("one"); assertEquals(Utils.toStringAndClose(old), "two"); @@ -92,24 +92,25 @@ public class S3InputStreamMapIntegrationTest extends BaseS3MapIntegrationTest map = createMap(context, bucketName); - ((S3InputStreamMap) map).putAllStrings(this.fiveStrings); + Map map = createMap(context, bucketName); + ((InputStreamMap) map).putAllStrings(this.fiveStrings); // this will cause us to block until the bucket updates. assertEventuallyKeySize(map, 5); Set> entries = map.entrySet(); assertEquals(entries.size(), 5); for (Entry entry : entries) { - assertEquals(IOUtils.toString(entry.getValue()), fiveStrings.get(entry.getKey())); + assertEquals(fiveStrings.get(entry.getKey()), IOUtils.toString(entry.getValue())); entry.setValue(IOUtils.toInputStream("")); } assertEventuallyMapSize(map, 5); @@ -117,205 +118,221 @@ public class S3InputStreamMapIntegrationTest extends BaseS3MapIntegrationTest map = createMap(context, bucketName); - ((S3InputStreamMap) map).putString("one", "apple"); + Map map = createMap(context, bucketName); + ((InputStreamMap) map).putString("one", "apple"); assertEventuallyContainsValue(map, fiveStrings.get("one")); } finally { - returnBucket(bucketName); + returnContainer(bucketName); } } + @SuppressWarnings("unchecked") @Test(groups = { "integration", "live" }) public void testContainsFileValue() throws InterruptedException, ExecutionException, TimeoutException { - String bucketName = getBucketName(); + String bucketName = getContainerName(); try { - BaseS3Map map = createMap(context, bucketName); - ((S3InputStreamMap) map).putString("one", "apple"); + Map map = createMap(context, bucketName); + ((InputStreamMap) map).putString("one", "apple"); assertEventuallyContainsValue(map, fiveFiles.get("one")); } finally { - returnBucket(bucketName); + returnContainer(bucketName); } } + @SuppressWarnings("unchecked") @Test(groups = { "integration", "live" }) public void testContainsInputStreamValue() throws InterruptedException, ExecutionException, TimeoutException { - String bucketName = getBucketName(); + String bucketName = getContainerName(); try { - BaseS3Map map = createMap(context, bucketName); - ((S3InputStreamMap) map).putString("one", "apple"); + Map map = createMap(context, bucketName); + ((InputStreamMap) map).putString("one", "apple"); assertEventuallyContainsValue(map, this.fiveInputs.get("one")); } finally { - returnBucket(bucketName); + returnContainer(bucketName); } } + @SuppressWarnings("unchecked") @Test(groups = { "integration", "live" }) public void testContainsBytesValue() throws InterruptedException, ExecutionException, TimeoutException { - String bucketName = getBucketName(); + String bucketName = getContainerName(); try { - BaseS3Map map = createMap(context, bucketName); - ((S3InputStreamMap) map).putString("one", "apple"); + Map map = createMap(context, bucketName); + ((InputStreamMap) map).putString("one", "apple"); assertEventuallyContainsValue(map, this.fiveBytes.get("one")); } finally { - returnBucket(bucketName); + returnContainer(bucketName); } } @Override @Test(groups = { "integration", "live" }) public void testPutAll() throws InterruptedException, ExecutionException, TimeoutException { - String bucketName = getBucketName(); + String bucketName = getContainerName(); try { - BaseS3Map map = createMap(context, bucketName); + Map map = createMap(context, bucketName); map.putAll(this.fiveInputs); assertEventuallyMapSize(map, 5); assertEventuallyKeySetEquals(map, new TreeSet(fiveInputs.keySet())); fourLeftRemovingOne(map); } finally { - returnBucket(bucketName); + returnContainer(bucketName); } } + @SuppressWarnings("unchecked") @Test(groups = { "integration", "live" }) public void testPutAllBytes() throws InterruptedException, ExecutionException, TimeoutException { - String bucketName = getBucketName(); + String bucketName = getContainerName(); try { - BaseS3Map map = createMap(context, bucketName); + Map map = createMap(context, bucketName); - ((S3InputStreamMap) map).putAllBytes(this.fiveBytes); + ((InputStreamMap) map).putAllBytes(this.fiveBytes); assertEventuallyMapSize(map, 5); assertEventuallyKeySetEquals(map, new TreeSet(fiveBytes.keySet())); fourLeftRemovingOne(map); } finally { - returnBucket(bucketName); + returnContainer(bucketName); } } + @SuppressWarnings("unchecked") @Test(groups = { "integration", "live" }) public void testPutAllFiles() throws InterruptedException, ExecutionException, TimeoutException { - String bucketName = getBucketName(); + String bucketName = getContainerName(); try { - BaseS3Map map = createMap(context, bucketName); + Map map = createMap(context, bucketName); - ((S3InputStreamMap) map).putAllFiles(this.fiveFiles); + ((InputStreamMap) map).putAllFiles(this.fiveFiles); assertEventuallyMapSize(map, 5); assertEventuallyKeySetEquals(map, new TreeSet(fiveFiles.keySet())); fourLeftRemovingOne(map); } finally { - returnBucket(bucketName); + returnContainer(bucketName); } } + @SuppressWarnings("unchecked") @Test(groups = { "integration", "live" }) public void testPutAllStrings() throws InterruptedException, ExecutionException, TimeoutException { - String bucketName = getBucketName(); + String bucketName = getContainerName(); try { - BaseS3Map map = createMap(context, bucketName); + Map map = createMap(context, bucketName); - ((S3InputStreamMap) map).putAllStrings(this.fiveStrings); + ((InputStreamMap) map).putAllStrings(this.fiveStrings); assertEventuallyMapSize(map, 5); assertEventuallyKeySetEquals(map, new TreeSet(fiveStrings.keySet())); fourLeftRemovingOne(map); } finally { - returnBucket(bucketName); + returnContainer(bucketName); } } + @SuppressWarnings("unchecked") @Test(groups = { "integration", "live" }) public void testPutString() throws IOException, InterruptedException, ExecutionException, TimeoutException { - String bucketName = getBucketName(); + String bucketName = getContainerName(); try { - BaseS3Map map = createMap(context, bucketName); + Map map = createMap(context, bucketName); - InputStream old = ((S3InputStreamMap) map).putString("one", "apple"); + InputStream old = ((InputStreamMap) map).putString("one", "apple"); getOneReturnsAppleAndOldValueIsNull(map, old); - InputStream apple = ((S3InputStreamMap) map).putString("one", "bear"); + InputStream apple = ((InputStreamMap) map).putString("one", "bear"); getOneReturnsBearAndOldValueIsApple(map, apple); } finally { - returnBucket(bucketName); + returnContainer(bucketName); } } - void getOneReturnsAppleAndOldValueIsNull(BaseS3Map map, InputStream old) + void getOneReturnsAppleAndOldValueIsNull(Map map, InputStream old) throws IOException, InterruptedException, ExecutionException, TimeoutException { assert old == null; assertEquals(Utils.toStringAndClose(map.get("one")), "apple"); assertEventuallyMapSize(map, 1); } - void getOneReturnsBearAndOldValueIsApple(BaseS3Map map, InputStream oldValue) + void getOneReturnsBearAndOldValueIsApple(Map map, InputStream oldValue) throws IOException, InterruptedException, ExecutionException, TimeoutException { assertEquals(Utils.toStringAndClose(map.get("one")), "bear"); assertEquals(Utils.toStringAndClose(oldValue), "apple"); assertEventuallyMapSize(map, 1); } + @SuppressWarnings("unchecked") @Test(groups = { "integration", "live" }) public void testPutFile() throws IOException, InterruptedException, ExecutionException, TimeoutException { - String bucketName = getBucketName(); + String bucketName = getContainerName(); try { - BaseS3Map map = createMap(context, bucketName); + Map map = createMap(context, bucketName); - InputStream old = ((S3InputStreamMap) map).putFile("one", fiveFiles.get("one")); + InputStream old = ((InputStreamMap) map).putFile("one", fiveFiles.get("one")); getOneReturnsAppleAndOldValueIsNull(map, old); - InputStream apple = ((S3InputStreamMap) map).putFile("one", fiveFiles.get("two")); + InputStream apple = ((InputStreamMap) map).putFile("one", fiveFiles.get("two")); getOneReturnsBearAndOldValueIsApple(map, apple); } finally { - returnBucket(bucketName); + returnContainer(bucketName); } } + @SuppressWarnings("unchecked") @Test(groups = { "integration", "live" }) public void testPutBytes() throws IOException, InterruptedException, ExecutionException, TimeoutException { - String bucketName = getBucketName(); + String bucketName = getContainerName(); try { - BaseS3Map map = createMap(context, bucketName); + Map map = createMap(context, bucketName); - InputStream old = ((S3InputStreamMap) map).putBytes("one", "apple".getBytes()); + InputStream old = ((InputStreamMap) map).putBytes("one", "apple".getBytes()); getOneReturnsAppleAndOldValueIsNull(map, old); - InputStream apple = ((S3InputStreamMap) map).putBytes("one", "bear".getBytes()); + InputStream apple = ((InputStreamMap) map).putBytes("one", "bear".getBytes()); getOneReturnsBearAndOldValueIsApple(map, apple); } finally { - returnBucket(bucketName); + returnContainer(bucketName); } } @Test(groups = { "integration", "live" }) public void testPut() throws IOException, InterruptedException, ExecutionException, TimeoutException { - String bucketName = getBucketName(); + String bucketName = getContainerName(); try { - BaseS3Map map = createMap(context, bucketName); + Map map = createMap(context, bucketName); InputStream old = map.put("one", IOUtils.toInputStream("apple")); getOneReturnsAppleAndOldValueIsNull(map, old); InputStream apple = map.put("one", IOUtils.toInputStream("bear")); getOneReturnsBearAndOldValueIsApple(map, apple); } finally { - returnBucket(bucketName); + returnContainer(bucketName); } } + @SuppressWarnings("unchecked") @Override - protected void putString(BaseS3Map map, String key, String value) + protected void putString(Map map, String key, String value) throws InterruptedException, ExecutionException, TimeoutException { - ((S3InputStreamMap) map).putString(key, value); + ((InputStreamMap) map).putString(key, value); } + @SuppressWarnings("unchecked") + protected Map createMap(BlobStoreContext context, String bucket) { + InputStreamMap map = context.createInputStreamMap(bucket); + return (Map) map; + } } diff --git a/aws/s3/core/src/test/java/org/jclouds/aws/s3/BaseS3MapIntegrationTest.java b/blobstore/core/src/test/java/org/jclouds/blobstore/integration/internal/BaseMapIntegrationTest.java old mode 100644 new mode 100755 similarity index 73% rename from aws/s3/core/src/test/java/org/jclouds/aws/s3/BaseS3MapIntegrationTest.java rename to blobstore/core/src/test/java/org/jclouds/blobstore/integration/internal/BaseMapIntegrationTest.java index 4c07ded1c5..d95ed1d50f --- a/aws/s3/core/src/test/java/org/jclouds/aws/s3/BaseS3MapIntegrationTest.java +++ b/blobstore/core/src/test/java/org/jclouds/blobstore/integration/internal/BaseMapIntegrationTest.java @@ -21,9 +21,10 @@ * under the License. * ==================================================================== */ -package org.jclouds.aws.s3; +package org.jclouds.blobstore.integration.internal; import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertTrue; import java.io.File; import java.io.FileNotFoundException; @@ -36,7 +37,12 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeoutException; import org.apache.commons.io.IOUtils; -import org.jclouds.aws.s3.internal.BaseS3Map; +import org.jclouds.blobstore.BlobStore; +import org.jclouds.blobstore.BlobStoreContext; +import org.jclouds.blobstore.ListableMap; +import org.jclouds.blobstore.domain.Blob; +import org.jclouds.blobstore.domain.BlobMetadata; +import org.jclouds.blobstore.domain.ContainerMetadata; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Optional; import org.testng.annotations.Parameters; @@ -45,8 +51,8 @@ import org.testng.annotations.Test; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -@Test -public abstract class BaseS3MapIntegrationTest extends S3IntegrationTest { +public abstract class BaseMapIntegrationTest, C extends ContainerMetadata, M extends BlobMetadata, B extends Blob, V> + extends BaseBlobStoreIntegrationTest { public abstract void testPutAll() throws InterruptedException, ExecutionException, TimeoutException; @@ -73,8 +79,8 @@ public abstract class BaseS3MapIntegrationTest extends S3IntegrationTest { @BeforeMethod(groups = { "integration", "live" }) @Parameters( { "basedir" }) - protected void setUpTempDir(@Optional String basedir) throws InterruptedException, ExecutionException, - FileNotFoundException, IOException, TimeoutException { + protected void setUpTempDir(@Optional String basedir) throws InterruptedException, + ExecutionException, FileNotFoundException, IOException, TimeoutException { if (basedir == null) { basedir = System.getProperty("java.io.tmpdir"); } @@ -95,20 +101,20 @@ public abstract class BaseS3MapIntegrationTest extends S3IntegrationTest { .toInputStream("dogma"), "five", IOUtils.toInputStream("emma")); } - protected abstract BaseS3Map createMap(S3Context context, String bucket); + protected abstract Map createMap(BlobStoreContext context, String bucket); @Test(groups = { "integration", "live" }) public void testClear() throws InterruptedException, ExecutionException, TimeoutException { - String bucketName = getBucketName(); + String bucketName = getContainerName(); try { - BaseS3Map map = createMap(context, bucketName); + Map map = createMap(context, bucketName); assertEventuallyMapSize(map, 0); putString(map, "one", "apple"); assertEventuallyMapSize(map, 1); map.clear(); assertEventuallyMapSize(map, 0); } finally { - returnBucket(bucketName); + returnContainer(bucketName); } } @@ -118,19 +124,19 @@ public abstract class BaseS3MapIntegrationTest extends S3IntegrationTest { @Test(groups = { "integration", "live" }) public void testKeySet() throws InterruptedException, ExecutionException, TimeoutException { - String bucketName = getBucketName(); + String bucketName = getContainerName(); try { - BaseS3Map map = createMap(context, bucketName); + Map map = createMap(context, bucketName); assertEventuallyKeySize(map, 0); putString(map, "one", "two"); assertEventuallyKeySize(map, 1); assertEventuallyKeySetEquals(map, ImmutableSet.of("one")); } finally { - returnBucket(bucketName); + returnContainer(bucketName); } } - protected void assertEventuallyKeySetEquals(final BaseS3Map map, final Object toEqual) + protected void assertEventuallyKeySetEquals(final Map map, final Object toEqual) throws InterruptedException { assertEventually(new Runnable() { public void run() { @@ -139,7 +145,7 @@ public abstract class BaseS3MapIntegrationTest extends S3IntegrationTest { }); } - protected void assertEventuallyRemoveEquals(final BaseS3Map map, final String key, + protected void assertEventuallyRemoveEquals(final Map map, final String key, final Object equals) throws InterruptedException { assertEventually(new Runnable() { public void run() { @@ -148,7 +154,7 @@ public abstract class BaseS3MapIntegrationTest extends S3IntegrationTest { }); } - protected void assertEventuallyGetEquals(final BaseS3Map map, final String key, + protected void assertEventuallyGetEquals(final Map map, final String key, final Object equals) throws InterruptedException { assertEventually(new Runnable() { public void run() { @@ -157,7 +163,7 @@ public abstract class BaseS3MapIntegrationTest extends S3IntegrationTest { }); } - protected void assertEventuallyKeySize(final BaseS3Map map, final int size) + protected void assertEventuallyKeySize(final Map map, final int size) throws InterruptedException { assertEventually(new Runnable() { public void run() { @@ -168,14 +174,14 @@ public abstract class BaseS3MapIntegrationTest extends S3IntegrationTest { @Test(groups = { "integration", "live" }) public void testContainsKey() throws InterruptedException, ExecutionException, TimeoutException { - String bucketName = getBucketName(); + String bucketName = getContainerName(); try { - BaseS3Map map = createMap(context, bucketName); + Map map = createMap(context, bucketName); assertEventuallyDoesntContainKey(map); putString(map, "one", "apple"); assertEventuallyContainsKey(map); } finally { - returnBucket(bucketName); + returnContainer(bucketName); } } @@ -183,7 +189,7 @@ public abstract class BaseS3MapIntegrationTest extends S3IntegrationTest { * containsValue() uses eTag comparison to bucket contents, so this can be subject to eventual * consistency problems. */ - protected void assertEventuallyContainsValue(final BaseS3Map map, final Object value) + protected void assertEventuallyContainsValue(final Map map, final Object value) throws InterruptedException { assertEventually(new Runnable() { public void run() { @@ -192,7 +198,7 @@ public abstract class BaseS3MapIntegrationTest extends S3IntegrationTest { }); } - protected void assertEventuallyContainsKey(final BaseS3Map map) throws InterruptedException { + protected void assertEventuallyContainsKey(final Map map) throws InterruptedException { assertEventually(new Runnable() { public void run() { assert map.containsKey("one"); @@ -200,7 +206,7 @@ public abstract class BaseS3MapIntegrationTest extends S3IntegrationTest { }); } - protected void assertEventuallyDoesntContainKey(final BaseS3Map map) + protected void assertEventuallyDoesntContainKey(final Map map) throws InterruptedException { assertEventually(new Runnable() { public void run() { @@ -211,18 +217,18 @@ public abstract class BaseS3MapIntegrationTest extends S3IntegrationTest { @Test(groups = { "integration", "live" }) public void testIsEmpty() throws InterruptedException, ExecutionException, TimeoutException { - String bucketName = getBucketName(); + String bucketName = getContainerName(); try { - BaseS3Map map = createMap(context, bucketName); + Map map = createMap(context, bucketName); assertEventuallyEmpty(map); putString(map, "one", "apple"); assertEventuallyNotEmpty(map); } finally { - returnBucket(bucketName); + returnContainer(bucketName); } } - protected void assertEventuallyNotEmpty(final BaseS3Map map) throws InterruptedException { + protected void assertEventuallyNotEmpty(final Map map) throws InterruptedException { assertEventually(new Runnable() { public void run() { assert !map.isEmpty(); @@ -230,7 +236,7 @@ public abstract class BaseS3MapIntegrationTest extends S3IntegrationTest { }); } - protected void assertEventuallyEmpty(final BaseS3Map map) throws InterruptedException { + protected void assertEventuallyEmpty(final Map map) throws InterruptedException { assertEventually(new Runnable() { public void run() { assert map.isEmpty(); @@ -238,10 +244,10 @@ public abstract class BaseS3MapIntegrationTest extends S3IntegrationTest { }); } - abstract protected void putString(BaseS3Map map, String key, String value) + abstract protected void putString(Map map, String key, String value) throws InterruptedException, ExecutionException, TimeoutException; - protected void fourLeftRemovingOne(BaseS3Map map) throws InterruptedException, + protected void fourLeftRemovingOne(Map map) throws InterruptedException, ExecutionException, TimeoutException { map.remove("one"); assertEventuallyMapSize(map, 4); @@ -249,7 +255,7 @@ public abstract class BaseS3MapIntegrationTest extends S3IntegrationTest { "five"))); } - protected void assertEventuallyMapSize(final BaseS3Map map, final int size) + protected void assertEventuallyMapSize(final Map map, final int size) throws InterruptedException { assertEventually(new Runnable() { public void run() { @@ -263,21 +269,22 @@ public abstract class BaseS3MapIntegrationTest extends S3IntegrationTest { TimeoutException; @Test(groups = { "integration", "live" }) - public void testGetBucket() throws InterruptedException, ExecutionException, TimeoutException { - String bucketName = getBucketName(); + public void testListContainer() throws InterruptedException, ExecutionException, + TimeoutException { + String bucketName = getContainerName(); try { - BaseS3Map map = createMap(context, bucketName); - assertEventuallyBucketNameCorrect(map, bucketName); + ListableMap map = (ListableMap) createMap(context, bucketName); + assertEventuallyListContainer(map, bucketName); } finally { - returnBucket(bucketName); + returnContainer(bucketName); } } - protected void assertEventuallyBucketNameCorrect(final BaseS3Map map, final String bucketName) + protected void assertEventuallyListContainer(final ListableMap map, final String bucketName) throws InterruptedException { assertEventually(new Runnable() { public void run() { - assertEquals(map.getBucket().getName(), bucketName); + assertTrue(map.listContainer().size() >= 0); } }); } diff --git a/blobstore/core/src/test/java/org/jclouds/blobstore/integration/internal/BaseServiceIntegrationTest.java b/blobstore/core/src/test/java/org/jclouds/blobstore/integration/internal/BaseServiceIntegrationTest.java new file mode 100755 index 0000000000..1062bda086 --- /dev/null +++ b/blobstore/core/src/test/java/org/jclouds/blobstore/integration/internal/BaseServiceIntegrationTest.java @@ -0,0 +1,47 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.blobstore.integration.internal; + +import java.util.List; + +import org.jclouds.blobstore.BlobStore; +import org.jclouds.blobstore.domain.Blob; +import org.jclouds.blobstore.domain.BlobMetadata; +import org.jclouds.blobstore.domain.ContainerMetadata; +import org.testng.annotations.Test; + +/** + * + * @author Adrian Cole + */ +public class BaseServiceIntegrationTest, C extends ContainerMetadata, M extends BlobMetadata, B extends Blob> + extends BaseBlobStoreIntegrationTest { + + @Test(groups = { "integration", "live" }) + void containerDoesntExist() throws Exception { + List list = client.listContainers(); + assert !list.contains(objectFactory.createContainerMetadata("shouldntexist")); + } + +} \ No newline at end of file diff --git a/blobstore/core/src/test/java/org/jclouds/blobstore/integration/internal/StubBlobStore.java b/blobstore/core/src/test/java/org/jclouds/blobstore/integration/internal/StubBlobStore.java new file mode 100755 index 0000000000..0717fa2568 --- /dev/null +++ b/blobstore/core/src/test/java/org/jclouds/blobstore/integration/internal/StubBlobStore.java @@ -0,0 +1,496 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.blobstore.integration.internal; + +import static com.google.common.base.Preconditions.checkNotNull; + +import java.io.ByteArrayInputStream; +import java.io.File; +import java.io.FileInputStream; +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.net.URI; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.SortedSet; +import java.util.Map.Entry; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.Future; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; + +import javax.ws.rs.core.HttpHeaders; + +import org.apache.commons.io.IOUtils; +import org.apache.commons.io.output.ByteArrayOutputStream; +import org.jclouds.blobstore.BlobStore; +import org.jclouds.blobstore.ContainerNotFoundException; +import org.jclouds.blobstore.KeyNotFoundException; +import org.jclouds.blobstore.domain.Blob; +import org.jclouds.blobstore.domain.BlobMetadata; +import org.jclouds.blobstore.domain.ContainerMetadata; +import org.jclouds.http.HttpCommand; +import org.jclouds.http.HttpRequest; +import org.jclouds.http.HttpResponse; +import org.jclouds.http.HttpResponseException; +import org.jclouds.http.HttpUtils; +import org.jclouds.http.options.GetOptions; +import org.jclouds.http.options.HttpRequestOptions; +import org.jclouds.util.DateService; +import org.jclouds.util.Utils; +import org.joda.time.DateTime; + +import com.google.common.base.Function; +import com.google.common.base.Predicate; +import com.google.common.collect.HashMultimap; +import com.google.common.collect.Iterables; +import com.google.common.collect.Lists; +import com.google.common.collect.Multimap; +import com.google.common.collect.Sets; +import com.google.inject.internal.Nullable; + +/** + * Implementation of {@link S3BlobStore} which keeps all data in a local Map object. + * + * @author Adrian Cole + * @author James Murty + */ +public abstract class StubBlobStore> + implements BlobStore { + + protected DateService dateService = new DateService(); + + /** + * @throws java.io.IOException + */ + public static byte[] toByteArray(Object data) throws IOException { + checkNotNull(data, "data must be set before calling generateETag()"); + byte[] bytes = null; + if (data == null || data instanceof byte[]) { + bytes = (byte[]) data; + } else if (data instanceof String) { + bytes = ((String) data).getBytes(); + } else if (data instanceof File || data instanceof InputStream) { + InputStream io = (data instanceof InputStream) ? (InputStream) data : new FileInputStream( + (File) data); + bytes = IOUtils.toByteArray(io); + IOUtils.closeQuietly(io); + } else { + throw new UnsupportedOperationException("Content not supported " + data.getClass()); + } + return bytes; + + } + + public Future getBlob(final String bucketName, final String key) { + return new FutureBase() { + public B get() throws InterruptedException, ExecutionException { + if (!getContainerToBlobs().containsKey(bucketName)) + throw new ContainerNotFoundException(bucketName); + Map realContents = getContainerToBlobs().get(bucketName); + if (!realContents.containsKey(key)) + throw new KeyNotFoundException(bucketName, key); + + B object = realContents.get(key); + + B returnVal = createBlob(copy(object.getMetadata()), object.getData()); + + returnVal.setData(new ByteArrayInputStream((byte[]) returnVal.getData())); + return returnVal; + } + }; + } + + public Future> listBlobs(final String name) { + return new FutureBase>() { + public List get() throws InterruptedException, ExecutionException { + final Map realContents = getContainerToBlobs().get(name); + + if (realContents == null) + throw new ContainerNotFoundException(name); + SortedSet contents = Sets.newTreeSet(Iterables.transform(realContents.keySet(), + new Function() { + public M apply(String key) { + return realContents.get(key).getMetadata(); + } + })); + + return Lists.newArrayList(contents); + } + }; + } + + @SuppressWarnings("unchecked") + public M copy(M in) { + ByteArrayOutputStream bout = new ByteArrayOutputStream(); + ObjectOutput os; + try { + os = new ObjectOutputStream(bout); + os.writeObject(in); + ObjectInput is = new ObjectInputStream(new ByteArrayInputStream(bout.toByteArray())); + M metadata = (M) is.readObject(); + convertUserMetadataKeysToLowercase(metadata); + return metadata; + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + private void convertUserMetadataKeysToLowercase(M metadata) { + Multimap lowerCaseUserMetadata = HashMultimap.create(); + for (Entry entry : metadata.getUserMetadata().entries()) { + lowerCaseUserMetadata.put(entry.getKey().toLowerCase(), entry.getValue()); + } + metadata.setUserMetadata(lowerCaseUserMetadata); + } + + public M copy(M in, String newKey) { + M newMd = copy(in); + newMd.setKey(newKey); + return newMd; + } + + public M metadata(final String container, final String key) { + if (!getContainerToBlobs().containsKey(container)) + throw new ContainerNotFoundException(container); + Map realContents = getContainerToBlobs().get(container); + if (!realContents.containsKey(key)) + throw new KeyNotFoundException(container, key); + return realContents.get(key).getMetadata(); + } + + public Future removeBlob(final String container, final String key) { + return new FutureBase() { + public Boolean get() throws InterruptedException, ExecutionException { + if (getContainerToBlobs().containsKey(container)) { + getContainerToBlobs().get(container).remove(key); + } + return true; + } + }; + } + + public Future deleteContainer(final String container) { + new Exception().printStackTrace(); + return new FutureBase() { + public Boolean get() throws InterruptedException, ExecutionException { + if (getContainerToBlobs().containsKey(container)) { + if (getContainerToBlobs().get(container).size() == 0) + getContainerToBlobs().remove(container); + else + return false; + } + return true; + } + }; + } + + public boolean containerExists(final String container) { + return getContainerToBlobs().containsKey(container); + } + + public abstract class FutureBase implements Future { + public boolean cancel(boolean b) { + return false; + } + + public boolean isCancelled() { + return false; + } + + public boolean isDone() { + return true; + } + + public V get(long l, TimeUnit timeUnit) throws InterruptedException, ExecutionException, + TimeoutException { + return get(); + } + } + + public List listContainers() { + return Lists.newArrayList(Iterables.transform(getContainerToBlobs().keySet(), + new Function() { + public C apply(String name) { + return createContainerMetadata(name); + } + + })); + } + + protected abstract C createContainerMetadata(String name); + + protected abstract B createBlob(String name); + + protected abstract B createBlob(M metadata); + + public Future createContainer(final String name) { + return new FutureBase() { + public Boolean get() throws InterruptedException, ExecutionException { + if (!getContainerToBlobs().containsKey(name)) { + getContainerToBlobs().put(name, new ConcurrentHashMap()); + } + return getContainerToBlobs().containsKey(name); + } + }; + } + + public String getFirstQueryOrNull(String string, @Nullable HttpRequestOptions options) { + if (options == null) + return null; + Collection values = options.buildQueryParameters().get(string); + return (values != null && values.size() >= 1) ? values.iterator().next() : null; + } + + protected class DelimiterFilter implements Predicate { + private final String prefix; + private final String delimiter; + + public DelimiterFilter(String prefix, String delimiter) { + this.prefix = prefix; + this.delimiter = delimiter; + } + + public boolean apply(M metadata) { + if (prefix == null) + return metadata.getKey().indexOf(delimiter) == -1; + if (metadata.getKey().startsWith(prefix)) + return metadata.getKey().replaceFirst(prefix, "").indexOf(delimiter) == -1; + return false; + } + } + + protected class CommonPrefixes implements Function { + private final String prefix; + private final String delimiter; + public static final String NO_PREFIX = "NO_PREFIX"; + + public CommonPrefixes(String prefix, String delimiter) { + this.prefix = prefix; + this.delimiter = delimiter; + } + + public String apply(M metadata) { + String working = metadata.getKey(); + + if (prefix != null) { + if (working.startsWith(prefix)) { + working = working.replaceFirst(prefix, ""); + } + } + if (working.contains(delimiter)) { + return working.substring(0, working.indexOf(delimiter)); + } + return NO_PREFIX; + } + } + + public static > SortedSet firstSliceOfSize(Iterable elements, + int size) { + List> slices = Lists.partition(Lists.newArrayList(elements), size); + return Sets.newTreeSet(slices.get(0)); + } + + protected void throwResponseException(int code) throws ExecutionException { + HttpResponse response = null; + response = new HttpResponse(URI.create("http://localhost")); // TODO: Get real object URL? + response.setStatusCode(code); + throw new ExecutionException(new HttpResponseException(new HttpCommand() { + + public int getRedirectCount() { + return 0; + } + + public int incrementRedirectCount() { + return 0; + } + + public boolean isReplayable() { + return false; + } + + public HttpRequest setHostAndPort(String host, int port) { + return null; + } + + public HttpRequest setMethod(String method) { + return null; + } + + public Exception getException() { + return null; + } + + public int getFailureCount() { + return 0; + } + + public HttpRequest getRequest() { + return null; + } + + public int incrementFailureCount() { + return 0; + } + + public void setException(Exception exception) { + + } + }, response)); + } + + public Future putBlob(final String bucketName, final B object) { + Map container = getContainerToBlobs().get(bucketName); + if (container == null) { + new RuntimeException("bucketName not found: " + bucketName); + } + try { + M newMd = copy(object.getMetadata()); + newMd.setLastModified(new DateTime()); + byte[] data = toByteArray(object.getData()); + final byte[] eTag = HttpUtils.md5(data); + newMd.setETag(eTag); + newMd.setContentType(object.getMetadata().getContentType()); + B blob = createBlob(newMd, data); + container.put(object.getKey(), blob); + + // Set HTTP headers to match metadata + newMd.getAllHeaders().put(HttpHeaders.LAST_MODIFIED, + dateService.rfc822DateFormat(newMd.getLastModified())); + newMd.getAllHeaders().put(HttpHeaders.ETAG, HttpUtils.toHexString(eTag)); + newMd.getAllHeaders().put(HttpHeaders.CONTENT_TYPE, newMd.getContentType()); + newMd.getAllHeaders().put(HttpHeaders.CONTENT_LENGTH, newMd.getSize() + ""); + for (Entry userMD : newMd.getUserMetadata().entries()) { + newMd.getAllHeaders().put(userMD.getKey(), userMD.getValue()); + } + + return new FutureBase() { + public byte[] get() throws InterruptedException, ExecutionException { + return eTag; + } + }; + } catch (IOException e) { + throw new RuntimeException(e); + } + + } + + private B createBlob(M newMd, Object data) { + B blob = createBlob(newMd); + blob.setData(data); + return blob; + } + + public Future getBlob(final String bucketName, final String key, + @Nullable GetOptions nullableOptions) { + final GetOptions options = (nullableOptions == null) ? new GetOptions() : nullableOptions; + return new FutureBase() { + public B get() throws InterruptedException, ExecutionException { + if (!getContainerToBlobs().containsKey(bucketName)) + throw new ContainerNotFoundException(bucketName); + Map realContents = getContainerToBlobs().get(bucketName); + if (!realContents.containsKey(key)) + throw new KeyNotFoundException(bucketName, key); + + B object = realContents.get(key); + + if (options.getIfMatch() != null) { + if (!Arrays.equals(object.getMetadata().getETag(), HttpUtils.fromHexString(options + .getIfMatch().replaceAll("\"", "")))) + throwResponseException(412); + } + if (options.getIfNoneMatch() != null) { + if (Arrays.equals(object.getMetadata().getETag(), HttpUtils.fromHexString(options + .getIfNoneMatch().replaceAll("\"", "")))) + throwResponseException(304); + } + if (options.getIfModifiedSince() != null) { + DateTime modifiedSince = dateService.rfc822DateParse(options.getIfModifiedSince()); + if (object.getMetadata().getLastModified().isBefore(modifiedSince)) + throw new ExecutionException(new RuntimeException(String.format( + "%1$s is before %2$s", object.getMetadata().getLastModified(), + modifiedSince))); + + } + if (options.getIfUnmodifiedSince() != null) { + DateTime unmodifiedSince = dateService.rfc822DateParse(options + .getIfUnmodifiedSince()); + if (object.getMetadata().getLastModified().isAfter(unmodifiedSince)) + throw new ExecutionException(new RuntimeException(String.format( + "%1$s is after %2$s", object.getMetadata().getLastModified(), + unmodifiedSince))); + } + B returnVal = createBlob(copy(object.getMetadata()), object.getData()); + + if (options.getRange() != null) { + byte[] data = (byte[]) returnVal.getData(); + ByteArrayOutputStream out = new ByteArrayOutputStream(); + for (String s : options.getRange().replaceAll("bytes=", "").split(",")) { + if (s.startsWith("-")) { + int length = Integer.parseInt(s.replaceAll("\\-", "")); + out.write(data, data.length - length, length); + } else if (s.endsWith("-")) { + int offset = Integer.parseInt(s.replaceAll("\\-", "")); + out.write(data, offset, data.length - offset); + } else if (s.contains("-")) { + String[] firstLast = s.split("\\-"); + int offset = Integer.parseInt(firstLast[0]); + int last = Integer.parseInt(firstLast[1]); + int length = (last < data.length) ? last + 1 : data.length - offset; + + out.write(data, offset, length); + } else { + throw new IllegalArgumentException("first and last were null!"); + } + + } + returnVal.setData(out.toByteArray()); + returnVal.setContentLength(out.size()); + returnVal.getMetadata().setSize(data.length); + } + returnVal.setData(new ByteArrayInputStream((byte[]) returnVal.getData())); + return returnVal; + } + }; + } + + public M blobMetadata(String container, String key) { + try { + return getBlob(container, key).get().getMetadata(); + } catch (Exception e) { + Utils. rethrowIfRuntimeOrSameType(e); + throw new RuntimeException(e);// TODO + } + } + + abstract public Map> getContainerToBlobs(); + +} diff --git a/blobstore/pom.xml b/blobstore/pom.xml new file mode 100755 index 0000000000..04931bedce --- /dev/null +++ b/blobstore/pom.xml @@ -0,0 +1,124 @@ + + + + + jclouds-project + org.jclouds + 1.0-SNAPSHOT + ../project/pom.xml + + 4.0.0 + jclouds-blobstore-project + pom + jclouds blobstore project + + core + + + + ${project.groupId} + jclouds-core + ${project.version} + + + ${project.groupId} + jclouds-core + ${project.version} + test-jar + test + + + log4j + log4j + 1.2.14 + test + + + ${project.groupId} + jclouds-log4j + ${project.version} + test + + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.4.3 + + + integration + integration-test + + test + + + + + **/*LiveTest.java + **/Base*Test.java + + + **/*IntegrationTest.java + + + + jclouds.test.initializer + org.jclouds.blobstore.integration.StubTestInitializer + + + jclouds.blobstore.httpstream.url + ${jclouds.blobstore.httpstream.url} + + + jclouds.blobstore.httpstream.md5 + ${jclouds.blobstore.httpstream.md5} + + + + + + + + + **/*IntegrationTest.java + **/*LiveTest.java + + + + + + + diff --git a/keyvaluestore/core/src/main/java/org/jclouds/objectstore/ObjectStoreContext.java b/keyvaluestore/core/src/main/java/org/jclouds/objectstore/ObjectStoreContext.java deleted file mode 100644 index 809906be04..0000000000 --- a/keyvaluestore/core/src/main/java/org/jclouds/objectstore/ObjectStoreContext.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.jclouds.objectstore; - -import java.io.InputStream; -import java.util.Map; - -/** - * Represents a cloud that has key-value storage functionality. - * - * - * @author Adrian Cole - * - */ -public interface ObjectStoreContext> { - - /** - * Creates a Map view of the specified namespace. - * - * @param namespace - */ - M createInputStreamMap(String namespace); - -} \ No newline at end of file diff --git a/keyvaluestore/pom.xml b/keyvaluestore/pom.xml deleted file mode 100755 index fdab07357e..0000000000 --- a/keyvaluestore/pom.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - - jclouds-project - org.jclouds - 1.0-SNAPSHOT - ../project/pom.xml - - 4.0.0 - jclouds-keyvaluestore-project - pom - jclouds keyvaluestore project - - core - - - - ${project.groupId} - jclouds-core - ${project.version} - - - ${project.groupId} - jclouds-core - ${project.version} - test-jar - test - - - log4j - log4j - 1.2.14 - test - - - ${project.groupId} - jclouds-log4j - ${project.version} - test - - - diff --git a/pom.xml b/pom.xml index f9f714a8e3..72356fc183 100644 --- a/pom.xml +++ b/pom.xml @@ -40,7 +40,7 @@ project thirdparty core - keyvaluestore + blobstore extensions aws azure diff --git a/project/pom.xml b/project/pom.xml index 5149fe4d15..33a50752f9 100644 --- a/project/pom.xml +++ b/project/pom.xml @@ -144,6 +144,8 @@ 1.5 true true + http://apache.rediris.es/maven/binaries/apache-maven-2.1.0-bin.tar.bz2 + 9268c9de2cccfd0d8fbcdbcfaf517a87 org.jclouds.test.testng.UnitTestStatusListener @@ -210,6 +212,20 @@ ${jclouds.test.listener} + + + jclouds.test.initializer + ${jclouds.test.initializer} + + + jclouds.blobstore.httpstream.url + ${jclouds.blobstore.httpstream.url} + + + jclouds.blobstore.httpstream.md5 + ${jclouds.blobstore.httpstream.md5} + + @@ -314,7 +330,7 @@ pageTracker._trackPageview(); org.apache.maven.plugins maven-site-plugin - + org.apache.maven.plugins maven-enforcer-plugin @@ -346,7 +362,67 @@ pageTracker._trackPageview(); - + + + live + + + + org.apache.maven.plugins + maven-surefire-plugin + + + integration + integration-test + + test + + + + + none + + + **/*IntegrationTest.java + **/*LiveTest.java + + + + file.encoding + UTF-8 + + + jclouds.test.initializer + ${jclouds.test.initializer} + + + jclouds.test.user + ${jclouds.test.user} + + + jclouds.test.key + ${jclouds.test.key} + + + jclouds.blobstore.httpstream.url + ${jclouds.blobstore.httpstream.url} + + + jclouds.blobstore.httpstream.md5 + ${jclouds.blobstore.httpstream.md5} + + + + + + + + + + diff --git a/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesConnection.java b/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesBlobStore.java similarity index 55% rename from rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesConnection.java rename to rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesBlobStore.java index 617102395a..6480f54e5a 100644 --- a/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesConnection.java +++ b/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesBlobStore.java @@ -35,29 +35,31 @@ import javax.ws.rs.PUT; import javax.ws.rs.Path; import javax.ws.rs.PathParam; +import org.jclouds.blobstore.BlobStore; +import org.jclouds.blobstore.binders.BlobBinder; +import org.jclouds.blobstore.binders.UserMetadataBinder; +import org.jclouds.blobstore.domain.Blob; +import org.jclouds.blobstore.domain.BlobMetadata; +import org.jclouds.blobstore.functions.BlobKey; +import org.jclouds.blobstore.functions.ThrowKeyNotFoundOn404; import org.jclouds.http.functions.ParseETagHeader; +import org.jclouds.http.functions.ReturnFalseOn404; +import org.jclouds.http.functions.ReturnTrueOn404; import org.jclouds.http.options.GetOptions; -import org.jclouds.rackspace.cloudfiles.binders.CFObjectBinder; -import org.jclouds.rackspace.cloudfiles.binders.UserMetadataBinder; import org.jclouds.rackspace.cloudfiles.domain.AccountMetadata; -import org.jclouds.rackspace.cloudfiles.domain.CFObject; import org.jclouds.rackspace.cloudfiles.domain.ContainerMetadata; -import org.jclouds.rackspace.cloudfiles.functions.CFObjectKey; import org.jclouds.rackspace.cloudfiles.functions.ParseAccountMetadataResponseFromHeaders; -import org.jclouds.rackspace.cloudfiles.functions.ParseContainerListFromGsonResponse; +import org.jclouds.rackspace.cloudfiles.functions.ParseBlobMetadataListFromJsonResponse; +import org.jclouds.rackspace.cloudfiles.functions.ParseContainerListFromJsonResponse; import org.jclouds.rackspace.cloudfiles.functions.ParseObjectFromHeadersAndHttpContent; import org.jclouds.rackspace.cloudfiles.functions.ParseObjectMetadataFromHeaders; -import org.jclouds.rackspace.cloudfiles.functions.ReturnCFObjectMetadataNotFoundOn404; -import org.jclouds.rackspace.cloudfiles.functions.ReturnS3ObjectNotFoundOn404; -import org.jclouds.rackspace.cloudfiles.functions.ReturnTrueOn202FalseOtherwise; -import org.jclouds.rackspace.cloudfiles.functions.ReturnTrueOn204FalseOtherwise; -import org.jclouds.rackspace.cloudfiles.functions.ReturnTrueOn404FalseOtherwise; +import org.jclouds.rackspace.cloudfiles.functions.ReturnTrueOn404FalseOn409; import org.jclouds.rackspace.cloudfiles.options.ListContainerOptions; import org.jclouds.rackspace.filters.AuthenticateRequest; import org.jclouds.rest.EntityParam; import org.jclouds.rest.ExceptionParser; import org.jclouds.rest.ParamParser; -import org.jclouds.rest.Query; +import org.jclouds.rest.QueryParams; import org.jclouds.rest.RequestFilters; import org.jclouds.rest.ResponseParser; import org.jclouds.rest.SkipEncoding; @@ -75,63 +77,82 @@ import com.google.common.collect.Multimap; */ @SkipEncoding('/') @RequestFilters(AuthenticateRequest.class) -public interface CloudFilesConnection { +public interface CloudFilesBlobStore extends + BlobStore> { + @GET + @ResponseParser(ParseContainerListFromJsonResponse.class) + @QueryParams(keys = "format", values = "json") + @Path("/") + List listContainers(); + @GET + @ResponseParser(ParseContainerListFromJsonResponse.class) + @QueryParams(keys = "format", values = "json") + @Path("/") + List listContainers(ListContainerOptions options); + + @HEAD + @Path("{container}") + @ExceptionParser(ReturnFalseOn404.class) + boolean containerExists(@PathParam("container") String container); + + @PUT + @Path("{container}") + Future createContainer(@PathParam("container") String container); + + @DELETE + @ExceptionParser(ReturnTrueOn404FalseOn409.class) + @Path("{container}") + Future deleteContainer(@PathParam("container") String container); + + @GET + @QueryParams(keys = "format", values = "json") + @ResponseParser(ParseBlobMetadataListFromJsonResponse.class) + @Path("{container}") + Future> listBlobs(@PathParam("container") String container); + + @PUT + @Path("{container}/{key}") + @ResponseParser(ParseETagHeader.class) + Future putBlob( + @PathParam("container") String container, + @PathParam("key") @ParamParser(BlobKey.class) @EntityParam(BlobBinder.class) Blob object); + + @GET + @ResponseParser(ParseObjectFromHeadersAndHttpContent.class) + @ExceptionParser(ThrowKeyNotFoundOn404.class) + @Path("{container}/{key}") + Future> getBlob(@PathParam("container") String container, + @PathParam("key") String key); + + @GET + @ResponseParser(ParseObjectFromHeadersAndHttpContent.class) + @ExceptionParser(ThrowKeyNotFoundOn404.class) + @Path("{container}/{key}") + Future> getBlob(@PathParam("container") String container, + @PathParam("key") String key, GetOptions options); + + @HEAD + @ResponseParser(ParseObjectMetadataFromHeaders.class) + @ExceptionParser(ThrowKeyNotFoundOn404.class) + @Path("{container}/{key}") + BlobMetadata blobMetadata(@PathParam("container") String container, @PathParam("key") String key); + + @DELETE + @ExceptionParser(ReturnTrueOn404.class) + @Path("{container}/{key}") + Future removeBlob(@PathParam("container") String container, @PathParam("key") String key); + + // Custom rackspace stuff @HEAD @ResponseParser(ParseAccountMetadataResponseFromHeaders.class) @Path("/") AccountMetadata getAccountMetadata(); - // TODO: Should this method automatically retrieve paged results, i.e. for > 10,000 containers? - @GET - @ResponseParser(ParseContainerListFromGsonResponse.class) - @Query(key = "format", value = "json") - @Path("/") - List listOwnedContainers(ListContainerOptions ... options); - - @PUT - @Path("{container}") - boolean putContainer(@PathParam("container") String container); - - @DELETE - @ResponseParser(ReturnTrueOn204FalseOtherwise.class) - @ExceptionParser(ReturnTrueOn404FalseOtherwise.class) - @Path("{container}") - boolean deleteContainerIfEmpty(@PathParam("container") String container); - - @PUT - @Path("{container}/{key}") - @ResponseParser(ParseETagHeader.class) - Future putObject( - @PathParam("container") String container, - @PathParam("key") @ParamParser(CFObjectKey.class) @EntityParam(CFObjectBinder.class) - CFObject object); - - @HEAD - @ResponseParser(ParseObjectMetadataFromHeaders.class) - @ExceptionParser(ReturnCFObjectMetadataNotFoundOn404.class) - @Path("{container}/{key}") - CFObject.Metadata headObject(@PathParam("container") String container, - @PathParam("key") String key); - - @GET - @ResponseParser(ParseObjectFromHeadersAndHttpContent.class) - @ExceptionParser(ReturnS3ObjectNotFoundOn404.class) - @Path("{container}/{key}") - Future getObject(@PathParam("container") String container, - @PathParam("key") String key, GetOptions ... options); - @POST - @ResponseParser(ReturnTrueOn202FalseOtherwise.class) @Path("{container}/{key}") - boolean setObjectMetadata(@PathParam("container") String container, - @PathParam("key") String key, - @EntityParam(UserMetadataBinder.class) Multimap userMetadata); - - @DELETE - @ResponseParser(ReturnTrueOn204FalseOtherwise.class) - @ExceptionParser(ReturnTrueOn404FalseOtherwise.class) - @Path("{container}/{key}") - boolean deleteObject(@PathParam("container") String container, @PathParam("key") String key); + boolean setObjectMetadata(@PathParam("container") String container, + @PathParam("key") String key, + @EntityParam(UserMetadataBinder.class) Multimap userMetadata); } diff --git a/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesCDNConnection.java b/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesCDNConnection.java index 9f7c9e79fc..675fcaacf5 100644 --- a/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesCDNConnection.java +++ b/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesCDNConnection.java @@ -33,18 +33,17 @@ import javax.ws.rs.PUT; import javax.ws.rs.Path; import javax.ws.rs.PathParam; +import org.jclouds.blobstore.functions.ThrowContainerNotFoundOn404; import org.jclouds.rackspace.cloudfiles.domain.ContainerCDNMetadata; import org.jclouds.rackspace.cloudfiles.functions.ParseCdnUriFromHeaders; import org.jclouds.rackspace.cloudfiles.functions.ParseContainerCDNMetadataFromHeaders; import org.jclouds.rackspace.cloudfiles.functions.ParseContainerCDNMetadataListFromGsonResponse; -import org.jclouds.rackspace.cloudfiles.functions.ReturnContainerCDNMetadataNotFoundOn404; -import org.jclouds.rackspace.cloudfiles.functions.ReturnTrueOn202FalseOtherwise; import org.jclouds.rackspace.cloudfiles.options.ListCdnContainerOptions; import org.jclouds.rackspace.cloudfiles.reference.CloudFilesHeaders; import org.jclouds.rackspace.filters.AuthenticateRequest; import org.jclouds.rest.ExceptionParser; -import org.jclouds.rest.Header; -import org.jclouds.rest.Query; +import org.jclouds.rest.Headers; +import org.jclouds.rest.QueryParams; import org.jclouds.rest.RequestFilters; import org.jclouds.rest.ResponseParser; import org.jclouds.rest.SkipEncoding; @@ -61,22 +60,23 @@ public interface CloudFilesCDNConnection { @GET @ResponseParser(ParseContainerCDNMetadataListFromGsonResponse.class) - @Query(key = "format", value = "json") + @QueryParams(keys = "format", values = "json") @Path("/") - List listCDNContainers(ListCdnContainerOptions ... options); + List listCDNContainers(ListCdnContainerOptions... options); - // TODO: Container name is not included in CDN HEAD response headers, so we cannot populate it here. + // TODO: Container name is not included in CDN HEAD response headers, so we cannot populate it + // here. @HEAD @ResponseParser(ParseContainerCDNMetadataFromHeaders.class) - @ExceptionParser(ReturnContainerCDNMetadataNotFoundOn404.class) + @ExceptionParser(ThrowContainerNotFoundOn404.class) @Path("{container}") ContainerCDNMetadata getCDNMetadata(@PathParam("container") String container); @PUT @Path("{container}") @ResponseParser(ParseCdnUriFromHeaders.class) - String enableCDN(@PathParam("container") String container, - @HeaderParam(CloudFilesHeaders.CDN_TTL) Long ttl); + String enableCDN(@PathParam("container") String container, + @HeaderParam(CloudFilesHeaders.CDN_TTL) Long ttl); @PUT @Path("{container}") @@ -86,13 +86,12 @@ public interface CloudFilesCDNConnection { @POST @Path("{container}") @ResponseParser(ParseCdnUriFromHeaders.class) - String updateCDN(@PathParam("container") String container, - @HeaderParam(CloudFilesHeaders.CDN_TTL) Long ttl); + String updateCDN(@PathParam("container") String container, + @HeaderParam(CloudFilesHeaders.CDN_TTL) Long ttl); @POST @Path("{container}") - @Header(key = CloudFilesHeaders.CDN_ENABLED, value = "False") - @ResponseParser(ReturnTrueOn202FalseOtherwise.class) + @Headers(keys = CloudFilesHeaders.CDN_ENABLED, values = "False") boolean disableCDN(@PathParam("container") String container); } diff --git a/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesCDNContextBuilder.java b/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesCDNContextBuilder.java index 862faf9aed..615aaa7844 100644 --- a/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesCDNContextBuilder.java +++ b/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesCDNContextBuilder.java @@ -47,8 +47,7 @@ import com.google.inject.Module; * @author James Murty * @see CloudFilesCDNContext, CloudFilesCDNContextBuilder */ -public class CloudFilesCDNContextBuilder extends - RackspaceContextBuilder { +public class CloudFilesCDNContextBuilder extends RackspaceContextBuilder { public CloudFilesCDNContextBuilder(Properties props) { super(props); @@ -68,12 +67,12 @@ public class CloudFilesCDNContextBuilder extends @Override protected void addContextModule(List modules) { - //TODO + // TODO } @Override protected void addParserModule(List modules) { - //TODO + // TODO } @Override diff --git a/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesContext.java b/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesContext.java index 6ab0080c51..e9d497d08d 100644 --- a/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesContext.java +++ b/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesContext.java @@ -23,17 +23,21 @@ */ package org.jclouds.rackspace.cloudfiles; +import org.jclouds.blobstore.BlobStoreContext; +import org.jclouds.blobstore.domain.Blob; +import org.jclouds.blobstore.domain.BlobMetadata; import org.jclouds.cloud.CloudContext; /** * Represents an authenticated context to Cloud Files. * * @see - * @see CloudFilesConnection + * @see CloudFilesBlobStore * @see CloudContext * @author Adrian Cole * */ -public interface CloudFilesContext extends CloudContext { +public interface CloudFilesContext extends + BlobStoreContext> { } \ No newline at end of file diff --git a/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesContextBuilder.java b/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesContextBuilder.java index cda9120cad..829aff029b 100644 --- a/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesContextBuilder.java +++ b/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesContextBuilder.java @@ -23,13 +23,16 @@ */ package org.jclouds.rackspace.cloudfiles; +import static org.jclouds.blobstore.reference.BlobStoreConstants.PROPERTY_USER_METADATA_PREFIX; + import java.util.List; import java.util.Properties; import org.jclouds.http.config.JavaUrlHttpCommandExecutorServiceModule; import org.jclouds.logging.jdk.config.JDKLoggingModule; import org.jclouds.rackspace.RackspaceContextBuilder; -import org.jclouds.rackspace.cloudfiles.config.RestCloudFilesConnectionModule; +import org.jclouds.rackspace.cloudfiles.config.CloudFilesContextModule; +import org.jclouds.rackspace.cloudfiles.config.RestCloudFilesBlobStoreModule; import com.google.inject.Injector; import com.google.inject.Module; @@ -47,8 +50,7 @@ import com.google.inject.Module; * @author Adrian Cole * @see CloudFilesContext */ -public class CloudFilesContextBuilder extends - RackspaceContextBuilder { +public class CloudFilesContextBuilder extends RackspaceContextBuilder { public CloudFilesContextBuilder(Properties props) { super(props); @@ -56,25 +58,25 @@ public class CloudFilesContextBuilder extends public static CloudFilesContextBuilder newBuilder(String id, String secret) { Properties properties = new Properties(); + properties.setProperty(PROPERTY_USER_METADATA_PREFIX, "X-Object-Meta-"); CloudFilesContextBuilder builder = new CloudFilesContextBuilder(properties); builder.authenticate(id, secret); return builder; } - protected void addConnectionModule(List modules) { super.addConnectionModule(modules); - modules.add(new RestCloudFilesConnectionModule()); + modules.add(new RestCloudFilesBlobStoreModule()); } @Override protected void addContextModule(List modules) { -//TODO + modules.add(new CloudFilesContextModule()); } @Override protected void addParserModule(List modules) { - //TODO + // TODO } @Override diff --git a/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/binders/CFObjectBinder.java b/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/binders/CFObjectBinder.java index 91f1ce7bdf..017e59c477 100644 --- a/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/binders/CFObjectBinder.java +++ b/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/binders/CFObjectBinder.java @@ -23,60 +23,39 @@ */ package org.jclouds.rackspace.cloudfiles.binders; -import static com.google.common.base.Preconditions.checkNotNull; - -import java.io.UnsupportedEncodingException; +import static org.jclouds.blobstore.reference.BlobStoreConstants.PROPERTY_USER_METADATA_PREFIX; import javax.ws.rs.core.HttpHeaders; +import org.jclouds.blobstore.binders.BlobBinder; +import org.jclouds.blobstore.domain.Blob; import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpUtils; -import org.jclouds.rackspace.cloudfiles.domain.CFObject; -import org.jclouds.rest.EntityBinder; -public class CFObjectBinder implements EntityBinder { +import com.google.inject.Inject; +import com.google.inject.name.Named; + +public class CFObjectBinder extends BlobBinder { + @Inject + public CFObjectBinder(@Named(PROPERTY_USER_METADATA_PREFIX) String metadataPrefix) { + super(metadataPrefix); + } public void addEntityToRequest(Object entity, HttpRequest request) { - CFObject object = (CFObject) entity; - - request.setEntity(checkNotNull(object.getData(), "object.getData()")); - + Blob object = (Blob) entity; if (object.getMetadata().getSize() >= 0) { request.getHeaders().put(HttpHeaders.CONTENT_LENGTH, object.getMetadata().getSize() + ""); } else { // Enable "chunked"/"streamed" data, where the size needn't be known in advance. - request.getHeaders().put("Transfer-Encoding", "chunked"); + request.getHeaders().put("Transfer-Encoding", "chunked"); } - - request.getHeaders() - .put( - HttpHeaders.CONTENT_TYPE, - checkNotNull(object.getMetadata().getContentType(), - "object.metadata.contentType()")); - - if (object.getMetadata().getCacheControl() != null) { - request.getHeaders() - .put(HttpHeaders.CACHE_CONTROL, object.getMetadata().getCacheControl()); + /** + * rackspace uses ETag header instead of Content-MD5 + */ + if (object.getMetadata().getContentMD5() != null) { + request.getHeaders().put(HttpHeaders.ETAG, + HttpUtils.toBase64String(object.getMetadata().getContentMD5())); } - if (object.getMetadata().getContentDisposition() != null) { - request.getHeaders().put("Content-Disposition", - object.getMetadata().getContentDisposition()); - } - if (object.getMetadata().getContentEncoding() != null) { - request.getHeaders().put(HttpHeaders.CONTENT_ENCODING, - object.getMetadata().getContentEncoding()); - } - - if (object.getMetadata().getETag() != null) { - try { - String hexETag = HttpUtils.toHexString(object.getMetadata().getETag()); - request.getHeaders().put(HttpHeaders.ETAG, hexETag); - } catch (UnsupportedEncodingException e) { - throw new RuntimeException("jclouds requires UTF-8 encoding" + object, e); - } - } - - request.getHeaders().putAll(object.getMetadata().getUserMetadata()); + super.addEntityToRequest(entity, request); } - } diff --git a/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/config/CloudFilesContextModule.java b/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/config/CloudFilesContextModule.java new file mode 100644 index 0000000000..41b0492fdc --- /dev/null +++ b/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/config/CloudFilesContextModule.java @@ -0,0 +1,75 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.rackspace.cloudfiles.config; + +import org.jclouds.blobstore.domain.Blob; +import org.jclouds.blobstore.domain.BlobMetadata; +import org.jclouds.blobstore.functions.ParseBlobFromHeadersAndHttpContent.BlobFactory; +import org.jclouds.blobstore.functions.ParseBlobMetadataFromHeaders.BlobMetadataFactory; +import org.jclouds.cloud.ConfiguresCloudConnection; +import org.jclouds.http.RequiresHttp; +import org.jclouds.rackspace.cloudfiles.CloudFilesBlobStore; +import org.jclouds.rackspace.cloudfiles.CloudFilesContext; +import org.jclouds.rackspace.cloudfiles.internal.GuiceCloudFilesContext; +import org.jclouds.rackspace.cloudfiles.internal.LiveCloudFilesInputStreamMap; +import org.jclouds.rackspace.cloudfiles.internal.LiveCloudFilesObjectMap; + +import com.google.inject.AbstractModule; +import com.google.inject.TypeLiteral; +import com.google.inject.assistedinject.FactoryProvider; + +/** + * Configures the Cloud Files connection, including logging and http transport. + * + * @author Adrian Cole + */ +@ConfiguresCloudConnection +@RequiresHttp +public class CloudFilesContextModule extends AbstractModule { + protected final TypeLiteral> objectMetadataFactoryLiteral = new TypeLiteral>() { + }; + protected final TypeLiteral>> objectFactoryLiteral = new TypeLiteral>>() { + }; + + @Override + protected void configure() { + this.requireBinding(CloudFilesBlobStore.class); + bind(GuiceCloudFilesContext.CloudFilesObjectMapFactory.class).toProvider( + FactoryProvider.newFactory(GuiceCloudFilesContext.CloudFilesObjectMapFactory.class, + LiveCloudFilesObjectMap.class)); + bind(GuiceCloudFilesContext.CloudFilesInputStreamMapFactory.class).toProvider( + FactoryProvider.newFactory( + GuiceCloudFilesContext.CloudFilesInputStreamMapFactory.class, + LiveCloudFilesInputStreamMap.class)); + bind(objectMetadataFactoryLiteral).toProvider( + FactoryProvider.newFactory(objectMetadataFactoryLiteral, + new TypeLiteral() { + })); + bind(objectFactoryLiteral).toProvider( + FactoryProvider.newFactory(objectFactoryLiteral, + new TypeLiteral>() { + })); + bind(CloudFilesContext.class).to(GuiceCloudFilesContext.class); + } +} \ No newline at end of file diff --git a/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/config/RestCloudFilesConnectionModule.java b/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/config/RestCloudFilesBlobStoreModule.java old mode 100644 new mode 100755 similarity index 77% rename from rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/config/RestCloudFilesConnectionModule.java rename to rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/config/RestCloudFilesBlobStoreModule.java index b26e22b8a9..418355f0f3 --- a/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/config/RestCloudFilesConnectionModule.java +++ b/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/config/RestCloudFilesBlobStoreModule.java @@ -28,9 +28,7 @@ import java.net.URI; import org.jclouds.cloud.ConfiguresCloudConnection; import org.jclouds.http.RequiresHttp; import org.jclouds.rackspace.Storage; -import org.jclouds.rackspace.cloudfiles.CloudFilesConnection; -import org.jclouds.rackspace.cloudfiles.CloudFilesContext; -import org.jclouds.rackspace.cloudfiles.internal.GuiceCloudFilesContext; +import org.jclouds.rackspace.cloudfiles.CloudFilesBlobStore; import org.jclouds.rest.RestClientFactory; import com.google.inject.AbstractModule; @@ -44,18 +42,17 @@ import com.google.inject.Singleton; */ @ConfiguresCloudConnection @RequiresHttp -public class RestCloudFilesConnectionModule extends AbstractModule { +public class RestCloudFilesBlobStoreModule extends AbstractModule { @Override protected void configure() { - bind(CloudFilesContext.class).to(GuiceCloudFilesContext.class); } - + @Provides @Singleton - protected CloudFilesConnection provideConnection(@Storage URI authenticationUri, + protected CloudFilesBlobStore provideConnection(@Storage URI authenticationUri, RestClientFactory factory) { - return factory.create(authenticationUri, CloudFilesConnection.class); + return factory.create(authenticationUri, CloudFilesBlobStore.class); } } \ No newline at end of file diff --git a/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/domain/CFObject.java b/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/domain/CFObject.java deleted file mode 100644 index e197ce0aaa..0000000000 --- a/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/domain/CFObject.java +++ /dev/null @@ -1,418 +0,0 @@ -/** - * - * Copyright (C) 2009 Global Cloud Specialists, Inc. - * - * ==================================================================== - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * ==================================================================== - */ -package org.jclouds.rackspace.cloudfiles.domain; - -import static com.google.common.base.Preconditions.checkArgument; -import static com.google.common.base.Preconditions.checkNotNull; -import static com.google.common.base.Preconditions.checkState; - -import java.io.IOException; -import java.io.InputStream; -import java.util.Arrays; - -import javax.ws.rs.core.MediaType; - -import org.jclouds.http.HttpUtils; -import org.jclouds.http.HttpUtils.ETagInputStreamResult; -import org.joda.time.DateTime; - -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; - -/** - * Rackspace Cloud Files is designed to store objects. Objects are stored in - * {@link ContainerMetadata containers} and consist of a - * {@link CFObject#getData() value}, a {@link CFObject#getKey() key}, and - * {@link CFObject.Metadata#getUserMetadata() metadata}. - * - * @author Adrian Cole - * @author James Murty - */ -public class CFObject { - public static final CFObject NOT_FOUND = new CFObject(Metadata.NOT_FOUND); - - private Object data; - private final Metadata metadata; - private long contentLength = -1; - private String contentRange; - - public CFObject(String key) { - this(new Metadata(key)); - } - - public CFObject(Metadata metadata) { - this.metadata = metadata; - } - - public CFObject(Metadata metadata, Object data) { - this(metadata); - setData(data); - } - - public CFObject(String key, Object data) { - this(key); - setData(data); - } - - /** - * System and user Metadata for the {@link CFObject}. - * - * @author Adrian Cole - */ - public static class Metadata implements Comparable { - public static final Metadata NOT_FOUND = new Metadata("NOT_FOUND"); - - // parsed during list, head, or get - private String key; - private byte[] eTag; - private volatile long size = -1; - - // only parsed during head or get - private Multimap allHeaders = HashMultimap.create(); - private Multimap userMetadata = HashMultimap.create(); - private DateTime lastModified; - private String dataType = MediaType.APPLICATION_OCTET_STREAM; - private String cacheControl; - private String dataDisposition; - private String dataEncoding; - - public Metadata() { - super(); - } - - /** - * @param key - * @see #getKey() - */ - public Metadata(String key) { - setKey(key); - } - - public void setKey(String key) { - checkNotNull(key, "key"); - checkArgument(!key.startsWith("/"), "keys cannot start with /"); - this.key = key; - } - - @Override - public String toString() { - final StringBuilder sb = new StringBuilder(); - sb.append("Metadata"); - sb.append("{key='").append(key).append('\''); - sb.append(", lastModified=").append(lastModified); - sb.append(", eTag=").append( - getETag() == null ? "null" : Arrays.asList(getETag()).toString()); - sb.append(", size=").append(size); - sb.append(", dataType='").append(dataType).append('\''); - sb.append('}'); - return sb.toString(); - } - - @Override - public boolean equals(Object o) { - if (this == o) - return true; - if (!(o instanceof Metadata)) - return false; - - Metadata metadata = (Metadata) o; - - if (size != metadata.size) - return false; - if (dataType != null ? !dataType.equals(metadata.dataType) : metadata.dataType != null) - return false; - if (!key.equals(metadata.key)) - return false; - if (lastModified != null ? !lastModified.equals(metadata.lastModified) - : metadata.lastModified != null) - return false; - if (!Arrays.equals(getETag(), metadata.getETag())) - return false; - return true; - } - - @Override - public int hashCode() { - int result = key.hashCode(); - result = 31 * result + (lastModified != null ? lastModified.hashCode() : 0); - result = 31 * result + (getETag() != null ? Arrays.hashCode(getETag()) : 0); - result = 31 * result + (int) (size ^ (size >>> 32)); - result = 31 * result + (dataType != null ? dataType.hashCode() : 0); - return result; - } - - /** - * The key is the handle that you assign to an object that allows you retrieve it later. A key - * is a sequence of Unicode characters whose UTF-8 encoding is at most 1024 bytes long. Each - * object in a bucket must have a unique key. - */ - public String getKey() { - return key; - } - - public DateTime getLastModified() { - return lastModified; - } - - public void setLastModified(DateTime lastModified) { - this.lastModified = lastModified; - } - - /** - * The size of the object, in bytes. - * - * @see - */ - public long getSize() { - return size; - } - - public void setSize(long size) { - this.size = size; - } - - /** - * A standard MIME type describing the format of the contents. If none is provided, the - * default is binary/octet-stream. - * - * @see - */ - public String getContentType() { - return dataType; - } - - public void setContentType(String dataType) { - this.dataType = dataType; - } - - public void setETag(byte[] eTag) { - this.eTag = new byte[eTag.length]; - System.arraycopy(eTag, 0, this.eTag, 0, eTag.length); - } - - /** - * @return the eTag value stored in the Etag header returned by the service. - */ - public byte[] getETag() { - if (eTag != null) { - byte[] retval = new byte[eTag.length]; - System.arraycopy(this.eTag, 0, retval, 0, eTag.length); - return retval; - } else { - return null; - } - } - - public void setUserMetadata(Multimap userMetadata) { - this.userMetadata = userMetadata; - } - - /** - * Any header starting with X-Object-Meta- is considered user metadata. It will - * be stored with the object and returned when you retrieve the object. The total size of the - * HTTP request, not including the body, must be less than 8 KB. - */ - public Multimap getUserMetadata() { - return userMetadata; - } - - public void setCacheControl(String cacheControl) { - this.cacheControl = cacheControl; - } - - /** - * Can be used to specify caching behavior along the request/reply chain. - * - * @link http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html?sec14.9. - */ - public String getCacheControl() { - return cacheControl; - } - - public void setContentDisposition(String dataDisposition) { - this.dataDisposition = dataDisposition; - } - - /** - * Specifies presentational information for the object. - * - * @see - */ - public String getContentDisposition() { - return dataDisposition; - } - - public void setContentEncoding(String dataEncoding) { - this.dataEncoding = dataEncoding; - } - - /** - * Specifies what content encodings have been applied to the object and thus what decoding - * mechanisms must be applied in order to obtain the media-type referenced by the Content-Type - * header field. - * - * @see - */ - public String getContentEncoding() { - return dataEncoding; - } - - public void setAllHeaders(Multimap allHeaders) { - this.allHeaders = allHeaders; - } - - /** - * @return all http response headers associated with this object - */ - public Multimap getAllHeaders() { - return allHeaders; - } - - public int compareTo(Metadata o) { - return (this == o) ? 0 : getKey().compareTo(o.getKey()); - } - } - - /** - * @see Metadata#getKey() - */ - public String getKey() { - return metadata.getKey(); - } - - /** - * Sets entity for the request or the content from the response. - * - * @param data - * typically InputStream for downloads, or File, byte [], String, or InputStream for - * uploads. - */ - public void setData(Object data) { - this.data = checkNotNull(data, "data"); - } - - /** - * generate an MD5 Hash for the current data. - *

    - *

    Note

    - *

    - * If this is an InputStream, it will be converted to a byte array first. - * - * @throws IOException - * if there is a problem generating the hash. - */ - public void generateETag() throws IOException { - checkState(data != null, "data"); - if (data instanceof InputStream) { - ETagInputStreamResult result = HttpUtils.generateETagResult((InputStream) data); - getMetadata().setSize(result.length); - getMetadata().setETag(result.eTag); - setData(result.data); - } else { - getMetadata().setETag(HttpUtils.eTag(data)); - } - } - - /** - * @return InputStream, if downloading, or whatever was set during {@link #setData(Object)} - */ - public Object getData() { - return data; - } - - /** - * @return System and User metadata relevant to this object. - */ - public Metadata getMetadata() { - return metadata; - } - - @Override - public String toString() { - final StringBuilder sb = new StringBuilder(); - sb.append("CFObject"); - sb.append("{metadata=").append(metadata); - sb.append('}'); - return sb.toString(); - } - - @Override - public boolean equals(Object o) { - if (this == o) - return true; - if (!(o instanceof CFObject)) - return false; - - CFObject cfObject = (CFObject) o; - - if (data != null ? !data.equals(cfObject.data) : cfObject.data != null) - return false; - if (!metadata.equals(cfObject.metadata)) - return false; - - return true; - } - - @Override - public int hashCode() { - int result = data != null ? data.hashCode() : 0; - result = 31 * result + metadata.hashCode(); - return result; - } - - public void setContentLength(long contentLength) { - this.contentLength = contentLength; - } - - /** - * Returns the total size of the downloaded object, or the chunk that's available. - *

    - * Chunking is only used when - * TODO: Does Cloud Files support content ranges? - * is called with options like tail, range, or startAt. - * - * @return the length in bytes that can be be obtained from {@link #getData()} - * @see org.jclouds.http.HttpHeaders#CONTENT_LENGTH - * @see GetObjectOptions - */ - public long getContentLength() { - return contentLength; - } - - public void setContentRange(String contentRange) { - this.contentRange = contentRange; - } - - /** - * If this is not-null, {@link #getContentLength() } will the size of chunk of the object - * available via {@link #getData()} - * - * @see org.jclouds.http.HttpHeaders#CONTENT_RANGE - * @see GetObjectOptions - */ - public String getContentRange() { - return contentRange; - } - -} diff --git a/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/domain/ContainerCDNMetadata.java b/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/domain/ContainerCDNMetadata.java index 3d7d34eddd..86ade7b0d6 100644 --- a/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/domain/ContainerCDNMetadata.java +++ b/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/domain/ContainerCDNMetadata.java @@ -28,16 +28,14 @@ package org.jclouds.rackspace.cloudfiles.domain; * @author James Murty * */ -public class ContainerCDNMetadata { - public static final ContainerCDNMetadata NOT_FOUND = new ContainerCDNMetadata(); +public class ContainerCDNMetadata extends org.jclouds.blobstore.domain.ContainerMetadata { - private String name; private long ttl; private boolean cdn_enabled; private String cdn_uri; public ContainerCDNMetadata(String name, boolean cdnEnabled, long ttl, String cdnUri) { - this.name = name; + super(name); this.cdn_enabled = cdnEnabled; this.ttl = ttl; this.cdn_uri = cdnUri; @@ -49,10 +47,9 @@ public class ContainerCDNMetadata { @Override public String toString() { StringBuilder builder = new StringBuilder(); - builder.append("ContainerCDNMetadata [name=").append(name) - .append(", cdn_enabled=").append(cdn_enabled) - .append(", ttl=").append(ttl) - .append(", cdn_uri=").append(cdn_uri).append("]"); + builder.append("ContainerCDNMetadata [name=").append(name).append(", cdn_enabled=").append( + cdn_enabled).append(", ttl=").append(ttl).append(", cdn_uri=").append(cdn_uri) + .append("]"); return builder.toString(); } @@ -98,8 +95,7 @@ public class ContainerCDNMetadata { } /** - * Beware: The container name is not available from HEAD CDN responses and will be null. - * return + * Beware: The container name is not available from HEAD CDN responses and will be null. return * the name of the container to which these CDN settings apply. */ public String getName() { diff --git a/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/domain/ContainerMetadata.java b/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/domain/ContainerMetadata.java index cc561fe1dd..6c785a99dc 100644 --- a/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/domain/ContainerMetadata.java +++ b/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/domain/ContainerMetadata.java @@ -28,15 +28,22 @@ package org.jclouds.rackspace.cloudfiles.domain; * @author Adrian Cole * */ -public class ContainerMetadata { - - public ContainerMetadata(String name, long count, long bytes) { - this.name = name; - this.count = count; - this.bytes = bytes; - } +public class ContainerMetadata extends org.jclouds.blobstore.domain.ContainerMetadata { + private long count; + private long bytes; public ContainerMetadata() { + super(); + } + + public ContainerMetadata(String name) { + super(name); + } + + public ContainerMetadata(String name, long count, long bytes) { + super(name); + this.count = count; + this.bytes = bytes; } @Override @@ -78,30 +85,14 @@ public class ContainerMetadata { return true; } - private String name; - private long count; - private long bytes; - - public void setName(String name) { - this.name = name; - } - public String getName() { return name; } - public void setCount(long count) { - this.count = count; - } - public long getCount() { return count; } - public void setBytes(long bytes) { - this.bytes = bytes; - } - public long getBytes() { return bytes; } diff --git a/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/functions/ParseBlobMetadataListFromJsonResponse.java b/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/functions/ParseBlobMetadataListFromJsonResponse.java new file mode 100644 index 0000000000..e324506a6d --- /dev/null +++ b/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/functions/ParseBlobMetadataListFromJsonResponse.java @@ -0,0 +1,88 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.rackspace.cloudfiles.functions; + +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.UnsupportedEncodingException; +import java.lang.reflect.Type; +import java.util.List; + +import org.jclouds.blobstore.domain.BlobMetadata; +import org.jclouds.http.HttpUtils; +import org.jclouds.http.functions.ParseJson; +import org.joda.time.DateTime; + +import com.google.common.base.Function; +import com.google.common.collect.Lists; +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; +import com.google.inject.Inject; + +/** + * This parses {@link BlobMetadata} from a gson string. + * + * @author Adrian Cole + */ +public class ParseBlobMetadataListFromJsonResponse extends ParseJson> { + + @Inject + public ParseBlobMetadataListFromJsonResponse(Gson gson) { + super(gson); + } + + public static class CloudFilesMetadata { + public CloudFilesMetadata() { + } + + String name; + String hash; + long bytes; + String content_type; + DateTime last_modified; + } + + public List apply(InputStream stream) { + Type listType = new TypeToken>() { + }.getType(); + + try { + List list = gson.fromJson(new InputStreamReader(stream, "UTF-8"), + listType); + return Lists.transform(list, new Function() { + public BlobMetadata apply(CloudFilesMetadata from) { + BlobMetadata metadata = new BlobMetadata(from.name); + metadata.setSize(from.bytes); + metadata.setLastModified(from.last_modified); + metadata.setContentType(from.content_type); + metadata.setETag(HttpUtils.fromHexString(from.hash)); + return metadata; + } + }); + + } catch (UnsupportedEncodingException e) { + throw new RuntimeException("jclouds requires UTF-8 encoding", e); + } + } +} \ No newline at end of file diff --git a/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/functions/ParseContainerCDNMetadataFromHeaders.java b/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/functions/ParseContainerCDNMetadataFromHeaders.java index 1523686b7c..4c3a5705d9 100644 --- a/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/functions/ParseContainerCDNMetadataFromHeaders.java +++ b/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/functions/ParseContainerCDNMetadataFromHeaders.java @@ -46,25 +46,19 @@ public class ParseContainerCDNMetadataFromHeaders implements public ContainerCDNMetadata apply(final HttpResponse from) { // TODO: The container name is not returned as a header, hopefully one day it will be String containerName = null; - - String cdnUri = checkNotNull( - from.getFirstHeaderOrNull(CloudFilesHeaders.CDN_URI), + + String cdnUri = checkNotNull(from.getFirstHeaderOrNull(CloudFilesHeaders.CDN_URI), CloudFilesHeaders.CDN_URI); - String cdnTTL = checkNotNull( - from.getFirstHeaderOrNull(CloudFilesHeaders.CDN_TTL), + String cdnTTL = checkNotNull(from.getFirstHeaderOrNull(CloudFilesHeaders.CDN_TTL), CloudFilesHeaders.CDN_TTL); - String cdnEnabled = checkNotNull( - from.getFirstHeaderOrNull(CloudFilesHeaders.CDN_ENABLED), + String cdnEnabled = checkNotNull(from.getFirstHeaderOrNull(CloudFilesHeaders.CDN_ENABLED), CloudFilesHeaders.CDN_ENABLED); if (cdnUri == null) { // CDN is not, and has never, been enabled for this container. - return ContainerCDNMetadata.NOT_FOUND; + return null; } else { - return new ContainerCDNMetadata( - containerName, - Boolean.parseBoolean(cdnEnabled), - Long.parseLong(cdnTTL), - cdnUri); + return new ContainerCDNMetadata(containerName, Boolean.parseBoolean(cdnEnabled), Long + .parseLong(cdnTTL), cdnUri); } } } \ No newline at end of file diff --git a/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/functions/ParseContainerListFromGsonResponse.java b/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/functions/ParseContainerListFromJsonResponse.java old mode 100644 new mode 100755 similarity index 94% rename from rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/functions/ParseContainerListFromGsonResponse.java rename to rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/functions/ParseContainerListFromJsonResponse.java index 52b553947c..4f6655d5f4 --- a/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/functions/ParseContainerListFromGsonResponse.java +++ b/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/functions/ParseContainerListFromJsonResponse.java @@ -41,10 +41,10 @@ import com.google.inject.Inject; * * @author Adrian Cole */ -public class ParseContainerListFromGsonResponse extends ParseJson> { +public class ParseContainerListFromJsonResponse extends ParseJson> { @Inject - public ParseContainerListFromGsonResponse(Gson gson) { + public ParseContainerListFromJsonResponse(Gson gson) { super(gson); } diff --git a/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/functions/ParseObjectFromHeadersAndHttpContent.java b/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/functions/ParseObjectFromHeadersAndHttpContent.java index 107fa58b37..9e816563be 100644 --- a/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/functions/ParseObjectFromHeadersAndHttpContent.java +++ b/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/functions/ParseObjectFromHeadersAndHttpContent.java @@ -23,61 +23,25 @@ */ package org.jclouds.rackspace.cloudfiles.functions; -import javax.ws.rs.core.HttpHeaders; +import org.jclouds.blobstore.domain.Blob; +import org.jclouds.blobstore.domain.BlobMetadata; +import org.jclouds.blobstore.functions.ParseBlobFromHeadersAndHttpContent; +import org.jclouds.blobstore.functions.ParseBlobMetadataFromHeaders; -import org.jclouds.http.HttpException; -import org.jclouds.http.HttpResponse; -import org.jclouds.rackspace.cloudfiles.domain.CFObject; - -import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Function; import com.google.inject.Inject; /** - * Parses response headers and creates a new CFObject from them and the HTTP content. + * Parses response headers and creates a new Rackspace object from them and the HTTP content. * - * @see ParseMetadataFromHeaders + * @see ParseBlobMetadataFromHeaders * @author Adrian Cole */ -public class ParseObjectFromHeadersAndHttpContent implements Function { - private final ParseObjectMetadataFromHeaders metadataParser; - +public class ParseObjectFromHeadersAndHttpContent extends + ParseBlobFromHeadersAndHttpContent> { @Inject - public ParseObjectFromHeadersAndHttpContent(ParseObjectMetadataFromHeaders metadataParser) { - this.metadataParser = metadataParser; + public ParseObjectFromHeadersAndHttpContent( + ParseObjectMetadataFromHeaders metadataParser, + BlobFactory> blobFactory) { + super(metadataParser, blobFactory); } - - /** - * First, calls {@link ParseMetadataFromHeaders}. - * - * Then, sets the object size based on the Content-Length header and adds the content to the - * {@link S3Object} result. - * - * @throws org.jclouds.http.HttpException - */ - public CFObject apply(HttpResponse from) { - CFObject.Metadata metadata = metadataParser.apply(from); - CFObject object = new CFObject(metadata, from.getContent()); - parseContentLengthOrThrowException(from, object); - return object; - } - - @VisibleForTesting - void parseContentLengthOrThrowException(HttpResponse from, CFObject object) throws HttpException { - String contentLength = from.getFirstHeaderOrNull(HttpHeaders.CONTENT_LENGTH); - String contentRange = from.getFirstHeaderOrNull("Content-Range"); - if (contentLength == null) - throw new HttpException(HttpHeaders.CONTENT_LENGTH + " header not present in headers: " - + from.getHeaders()); - object.setContentLength(Long.parseLong(contentLength)); - - if (contentRange == null) { - object.getMetadata().setSize(object.getContentLength()); - } else { - object.setContentRange(contentRange); - object.getMetadata().setSize( - Long.parseLong(contentRange.substring(contentRange.lastIndexOf('/') + 1))); - } - } - } \ No newline at end of file diff --git a/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/functions/ParseObjectMetadataFromHeaders.java b/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/functions/ParseObjectMetadataFromHeaders.java index 24199b1dbb..7d9102dda4 100644 --- a/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/functions/ParseObjectMetadataFromHeaders.java +++ b/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/functions/ParseObjectMetadataFromHeaders.java @@ -23,107 +23,43 @@ */ package org.jclouds.rackspace.cloudfiles.functions; -import java.util.Map.Entry; +import static org.jclouds.blobstore.reference.BlobStoreConstants.PROPERTY_USER_METADATA_PREFIX; -import javax.ws.rs.core.HttpHeaders; - -import org.jclouds.http.HttpException; +import org.jclouds.blobstore.domain.BlobMetadata; +import org.jclouds.blobstore.functions.ParseBlobMetadataFromHeaders; import org.jclouds.http.HttpResponse; import org.jclouds.http.HttpUtils; -import org.jclouds.rackspace.cloudfiles.domain.CFObject; -import org.jclouds.rackspace.cloudfiles.domain.CFObject.Metadata; -import org.jclouds.rackspace.cloudfiles.reference.CloudFilesHeaders; import org.jclouds.util.DateService; -import com.google.common.base.Function; +import com.google.common.annotations.VisibleForTesting; import com.google.inject.Inject; +import com.google.inject.name.Named; /** - * This parses @{link {@link CFObject.Metadata} from HTTP headers. - * * @author Adrian Cole */ -public class ParseObjectMetadataFromHeaders implements Function { - private final DateService dateParser; +public class ParseObjectMetadataFromHeaders extends ParseBlobMetadataFromHeaders { @Inject - public ParseObjectMetadataFromHeaders(DateService dateParser) { - this.dateParser = dateParser; + public ParseObjectMetadataFromHeaders(DateService dateParser, + @Named(PROPERTY_USER_METADATA_PREFIX) String metadataPrefix, + BlobMetadataFactory metadataFactory) { + super(dateParser, metadataPrefix, metadataFactory); } + @VisibleForTesting /** - * parses the http response headers to create a new - * {@link CFObject.Metadata} object. + * ETag == Content-MD5 */ - public Metadata apply(HttpResponse from) { - // URL Path components: //// - String[] pathElements = from.getRequestURL().getPath().split("/"); - String objectKey = from.getRequestURL().getPath().substring( - (pathElements[1] + pathElements[2] + pathElements[3]).length() + 4); - - CFObject.Metadata to = new CFObject.Metadata(objectKey); - addAllHeadersTo(from, to); - - addUserMetadataTo(from, to); - addETagTo(from, to); - - parseLastModifiedOrThrowException(from, to); - setContentTypeOrThrowException(from, to); - setContentLengthOrThrowException(from, to); - - to.setCacheControl(from.getFirstHeaderOrNull(HttpHeaders.CACHE_CONTROL)); - to.setContentDisposition(from.getFirstHeaderOrNull("Content-Disposition")); - to.setContentEncoding(from.getFirstHeaderOrNull(HttpHeaders.CONTENT_ENCODING)); - return to; - } - - private void addAllHeadersTo(HttpResponse from, Metadata metadata) { - metadata.getAllHeaders().putAll(from.getHeaders()); - } - - private void setContentTypeOrThrowException(HttpResponse from, Metadata metadata) - throws HttpException { - String contentType = from.getFirstHeaderOrNull(HttpHeaders.CONTENT_TYPE); - if (contentType == null) - throw new HttpException(HttpHeaders.CONTENT_TYPE + " not found in headers"); - else - metadata.setContentType(contentType); - } - - private void setContentLengthOrThrowException(HttpResponse from, Metadata metadata) - throws HttpException { - String contentLength = from.getFirstHeaderOrNull(HttpHeaders.CONTENT_LENGTH); - if (contentLength == null) - throw new HttpException(HttpHeaders.CONTENT_LENGTH + " not found in headers"); - else - metadata.setSize(Long.parseLong(contentLength)); - } - - private void parseLastModifiedOrThrowException(HttpResponse from, Metadata metadata) - throws HttpException { - String lastModified = from.getFirstHeaderOrNull(HttpHeaders.LAST_MODIFIED); - metadata.setLastModified(dateParser.rfc822DateParse(lastModified)); - if (metadata.getLastModified() == null) - throw new HttpException("could not parse: " + HttpHeaders.LAST_MODIFIED + ": " - + lastModified); - } - - private void addETagTo(HttpResponse from, Metadata metadata) { - String eTag = from.getFirstHeaderOrNull("Etag"); // TODO: Should be HttpHeaders.ETAG - if (metadata.getETag() == null && eTag != null) { - metadata.setETag(HttpUtils.fromHexString(eTag.replaceAll("\"", ""))); - } - } - - private void addUserMetadataTo(HttpResponse from, Metadata metadata) { - for (Entry header : from.getHeaders().entries()) { - if (header.getKey() != null - && header.getKey().toLowerCase().startsWith( - CloudFilesHeaders.USER_METADATA_PREFIX.toLowerCase())) - { - metadata.getUserMetadata().put(header.getKey().toLowerCase(), header.getValue()); + protected void addETagTo(HttpResponse from, BlobMetadata metadata) { + super.addETagTo(from, metadata); + if (metadata.getETag() == null) { + // etag comes back incorrect case + String eTagHeader = from.getFirstHeaderOrNull("Etag"); + if (eTagHeader != null) { + metadata.setETag(HttpUtils.fromHexString(eTagHeader)); } } + metadata.setContentMD5(metadata.getETag()); } - } \ No newline at end of file diff --git a/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/functions/ReturnCFObjectMetadataNotFoundOn404.java b/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/functions/ReturnCFObjectMetadataNotFoundOn404.java deleted file mode 100644 index 0e1aa1e390..0000000000 --- a/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/functions/ReturnCFObjectMetadataNotFoundOn404.java +++ /dev/null @@ -1,43 +0,0 @@ -/** - * - * Copyright (C) 2009 Global Cloud Specialists, Inc. - * - * ==================================================================== - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * ==================================================================== - */ -package org.jclouds.rackspace.cloudfiles.functions; - -import org.jclouds.http.HttpResponseException; -import org.jclouds.rackspace.cloudfiles.domain.CFObject.Metadata; - -import com.google.common.base.Function; - -public class ReturnCFObjectMetadataNotFoundOn404 implements Function { - - public Metadata apply(Exception from) { - if (from instanceof HttpResponseException) { - HttpResponseException responseException = (HttpResponseException) from; - if (responseException.getResponse().getStatusCode() == 404) { - return Metadata.NOT_FOUND; - } - } - return null; - } - -} diff --git a/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/functions/ReturnContainerCDNMetadataNotFoundOn404.java b/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/functions/ReturnContainerCDNMetadataNotFoundOn404.java deleted file mode 100644 index 3d3e27875e..0000000000 --- a/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/functions/ReturnContainerCDNMetadataNotFoundOn404.java +++ /dev/null @@ -1,43 +0,0 @@ -/** - * - * Copyright (C) 2009 Global Cloud Specialists, Inc. - * - * ==================================================================== - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * ==================================================================== - */ -package org.jclouds.rackspace.cloudfiles.functions; - -import org.jclouds.http.HttpResponseException; -import org.jclouds.rackspace.cloudfiles.domain.ContainerCDNMetadata; - -import com.google.common.base.Function; - -public class ReturnContainerCDNMetadataNotFoundOn404 implements Function { - - public ContainerCDNMetadata apply(Exception from) { - if (from instanceof HttpResponseException) { - HttpResponseException responseException = (HttpResponseException) from; - if (responseException.getResponse().getStatusCode() == 404) { - return ContainerCDNMetadata.NOT_FOUND; - } - } - return null; - } - -} diff --git a/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/functions/ReturnTrueOn202FalseOtherwise.java b/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/functions/ReturnTrueOn202FalseOtherwise.java deleted file mode 100644 index 54c2f08273..0000000000 --- a/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/functions/ReturnTrueOn202FalseOtherwise.java +++ /dev/null @@ -1,36 +0,0 @@ -/** - * - * Copyright (C) 2009 Global Cloud Specialists, Inc. - * - * ==================================================================== - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * ==================================================================== - */ -package org.jclouds.rackspace.cloudfiles.functions; - -import org.jclouds.http.HttpResponse; - -import com.google.common.base.Function; - -public class ReturnTrueOn202FalseOtherwise implements Function { - - public Boolean apply(HttpResponse from) { - return (from.getStatusCode() == 202); - } - -} diff --git a/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/functions/ReturnS3ObjectNotFoundOn404.java b/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/functions/ReturnTrueOn404FalseOn409.java similarity index 85% rename from rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/functions/ReturnS3ObjectNotFoundOn404.java rename to rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/functions/ReturnTrueOn404FalseOn409.java index 4d8bb17305..dfada624a8 100644 --- a/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/functions/ReturnS3ObjectNotFoundOn404.java +++ b/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/functions/ReturnTrueOn404FalseOn409.java @@ -24,20 +24,21 @@ package org.jclouds.rackspace.cloudfiles.functions; import org.jclouds.http.HttpResponseException; -import org.jclouds.rackspace.cloudfiles.domain.CFObject; import com.google.common.base.Function; -public class ReturnS3ObjectNotFoundOn404 implements Function { +public class ReturnTrueOn404FalseOn409 implements Function { - public CFObject apply(Exception from) { + public Boolean apply(Exception from) { if (from instanceof HttpResponseException) { HttpResponseException responseException = (HttpResponseException) from; if (responseException.getResponse().getStatusCode() == 404) { - return CFObject.NOT_FOUND; + return true; + } else if (responseException.getResponse().getStatusCode() == 409) { + return false; } } return null; } -} +} \ No newline at end of file diff --git a/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/internal/GuiceCloudFilesCDNContext.java b/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/internal/GuiceCloudFilesCDNContext.java index dbdc73a15a..438c51e06a 100644 --- a/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/internal/GuiceCloudFilesCDNContext.java +++ b/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/internal/GuiceCloudFilesCDNContext.java @@ -24,16 +24,20 @@ package org.jclouds.rackspace.cloudfiles.internal; import java.io.IOException; +import java.net.URI; import javax.annotation.Resource; import org.jclouds.lifecycle.Closer; import org.jclouds.logging.Logger; +import org.jclouds.rackspace.Authentication; import org.jclouds.rackspace.cloudfiles.CloudFilesCDNConnection; import org.jclouds.rackspace.cloudfiles.CloudFilesCDNContext; +import org.jclouds.rackspace.reference.RackspaceConstants; import com.google.inject.Inject; import com.google.inject.Injector; +import com.google.inject.name.Named; /** * Uses a Guice Injector to configure the objects served by CloudFilesCDNContext methods. @@ -47,21 +51,19 @@ public class GuiceCloudFilesCDNContext implements CloudFilesCDNContext { private Logger logger = Logger.NULL; private final Injector injector; private final Closer closer; + private final URI endPoint; + private final String account; @Inject - private GuiceCloudFilesCDNContext(Injector injector, Closer closer) { + private GuiceCloudFilesCDNContext(Injector injector, Closer closer, + @Authentication URI endPoint, + @Named(RackspaceConstants.PROPERTY_RACKSPACE_USER) String account) { this.injector = injector; this.closer = closer; + this.endPoint = endPoint; + this.account = account; } - /** - * {@inheritDoc} - */ - public CloudFilesCDNConnection getConnection() { - return injector.getInstance(CloudFilesCDNConnection.class); - } - - /** * {@inheritDoc} * @@ -75,4 +77,16 @@ public class GuiceCloudFilesCDNContext implements CloudFilesCDNContext { } } + public String getAccount() { + return account; + } + + public CloudFilesCDNConnection getApi() { + return injector.getInstance(CloudFilesCDNConnection.class); + } + + public URI getEndPoint() { + return endPoint; + } + } diff --git a/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/internal/GuiceCloudFilesContext.java b/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/internal/GuiceCloudFilesContext.java index 82d06669a3..53b8bd56a2 100644 --- a/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/internal/GuiceCloudFilesContext.java +++ b/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/internal/GuiceCloudFilesContext.java @@ -24,16 +24,24 @@ package org.jclouds.rackspace.cloudfiles.internal; import java.io.IOException; +import java.net.URI; import javax.annotation.Resource; +import org.jclouds.blobstore.BlobMap; +import org.jclouds.blobstore.InputStreamMap; +import org.jclouds.blobstore.domain.Blob; +import org.jclouds.blobstore.domain.BlobMetadata; import org.jclouds.lifecycle.Closer; import org.jclouds.logging.Logger; -import org.jclouds.rackspace.cloudfiles.CloudFilesConnection; +import org.jclouds.rackspace.Authentication; +import org.jclouds.rackspace.cloudfiles.CloudFilesBlobStore; import org.jclouds.rackspace.cloudfiles.CloudFilesContext; +import org.jclouds.rackspace.reference.RackspaceConstants; import com.google.inject.Inject; import com.google.inject.Injector; +import com.google.inject.name.Named; /** * Uses a Guice Injector to configure the objects served by CloudFilesContext methods. @@ -42,26 +50,36 @@ import com.google.inject.Injector; * @see Injector */ public class GuiceCloudFilesContext implements CloudFilesContext { + public interface CloudFilesObjectMapFactory { + BlobMap> createMapView(String container); + } + + public interface CloudFilesInputStreamMapFactory { + InputStreamMap createMapView(String container); + } @Resource private Logger logger = Logger.NULL; private final Injector injector; + private final CloudFilesInputStreamMapFactory cfInputStreamMapFactory; + private final CloudFilesObjectMapFactory cfObjectMapFactory; private final Closer closer; + private final URI endPoint; + private final String account; @Inject - private GuiceCloudFilesContext(Injector injector, Closer closer) { + private GuiceCloudFilesContext(Injector injector, Closer closer, + CloudFilesObjectMapFactory cfObjectMapFactory, + CloudFilesInputStreamMapFactory cfInputStreamMapFactory, @Authentication URI endPoint, + @Named(RackspaceConstants.PROPERTY_RACKSPACE_USER) String account) { this.injector = injector; this.closer = closer; + this.cfInputStreamMapFactory = cfInputStreamMapFactory; + this.cfObjectMapFactory = cfObjectMapFactory; + this.endPoint = endPoint; + this.account = account; } - /** - * {@inheritDoc} - */ - public CloudFilesConnection getConnection() { - return injector.getInstance(CloudFilesConnection.class); - } - - /** * {@inheritDoc} * @@ -75,4 +93,26 @@ public class GuiceCloudFilesContext implements CloudFilesContext { } } + public String getAccount() { + return account; + } + + public CloudFilesBlobStore getApi() { + return injector.getInstance(CloudFilesBlobStore.class); + } + + public URI getEndPoint() { + return endPoint; + } + + public BlobMap> createBlobMap(String container) { + getApi().createContainer(container); + return cfObjectMapFactory.createMapView(container); + } + + public InputStreamMap createInputStreamMap(String container) { + getApi().createContainer(container); + return cfInputStreamMapFactory.createMapView(container); + } + } diff --git a/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/internal/LiveCloudFilesInputStreamMap.java b/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/internal/LiveCloudFilesInputStreamMap.java new file mode 100644 index 0000000000..54602a7ea0 --- /dev/null +++ b/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/internal/LiveCloudFilesInputStreamMap.java @@ -0,0 +1,55 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.rackspace.cloudfiles.internal; + +import org.jclouds.blobstore.LiveInputStreamMap; +import org.jclouds.blobstore.domain.Blob; +import org.jclouds.blobstore.domain.BlobMetadata; +import org.jclouds.rackspace.cloudfiles.CloudFilesBlobStore; +import org.jclouds.rackspace.cloudfiles.domain.ContainerMetadata; + +import com.google.inject.Inject; +import com.google.inject.assistedinject.Assisted; + +/** + * Map representation of a live connection to CloudFiles. All put operations will result in ETag + * calculation. If this is not desired, use {@link LiveCloudFilesObjectMap} instead. + * + * @author Adrian Cole + * @see CloudFilesBlobStore + * @see LiveInputStreamMap + */ +public class LiveCloudFilesInputStreamMap extends + LiveInputStreamMap> { + + @Inject + public LiveCloudFilesInputStreamMap(CloudFilesBlobStore connection, @Assisted String container) { + super(connection, container); + } + + @Override + protected Blob createBlob(String s) { + return new Blob(s); + } +} diff --git a/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/internal/LiveCloudFilesObjectMap.java b/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/internal/LiveCloudFilesObjectMap.java new file mode 100644 index 0000000000..5a3388f673 --- /dev/null +++ b/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/internal/LiveCloudFilesObjectMap.java @@ -0,0 +1,51 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.rackspace.cloudfiles.internal; + +import org.jclouds.blobstore.LiveBlobMap; +import org.jclouds.blobstore.domain.Blob; +import org.jclouds.blobstore.domain.BlobMetadata; +import org.jclouds.rackspace.cloudfiles.CloudFilesBlobStore; +import org.jclouds.rackspace.cloudfiles.domain.ContainerMetadata; + +import com.google.inject.Inject; +import com.google.inject.assistedinject.Assisted; + +/** + * Map representation of a live connection to CloudFiles. + * + * @see CloudFilesBlobStore + * @see LiveBlobMap + * + * @author Adrian Cole + */ +public class LiveCloudFilesObjectMap extends + LiveBlobMap> { + + @Inject + public LiveCloudFilesObjectMap(CloudFilesBlobStore connection, @Assisted String container) { + super(connection, container); + } + +} diff --git a/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/reference/CloudFilesConstants.java b/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/reference/CloudFilesConstants.java index 557d997450..f864ef7d06 100644 --- a/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/reference/CloudFilesConstants.java +++ b/rackspace/cloudfiles/core/src/main/java/org/jclouds/rackspace/cloudfiles/reference/CloudFilesConstants.java @@ -23,7 +23,7 @@ */ package org.jclouds.rackspace.cloudfiles.reference; -import org.jclouds.keyvaluestore.reference.ObjectStoreConstants; +import org.jclouds.blobstore.reference.BlobStoreConstants; import org.jclouds.rackspace.reference.RackspaceConstants; /** @@ -31,7 +31,7 @@ import org.jclouds.rackspace.reference.RackspaceConstants; * * @author Adrian Cole */ -public interface CloudFilesConstants extends ObjectStoreConstants, RackspaceConstants { +public interface CloudFilesConstants extends BlobStoreConstants, RackspaceConstants { diff --git a/rackspace/cloudfiles/core/src/test/java/org/jclouds/rackspace/cloudfiles/CloudFilesBlobStoreLiveTest.java b/rackspace/cloudfiles/core/src/test/java/org/jclouds/rackspace/cloudfiles/CloudFilesBlobStoreLiveTest.java new file mode 100644 index 0000000000..7bc12e1013 --- /dev/null +++ b/rackspace/cloudfiles/core/src/test/java/org/jclouds/rackspace/cloudfiles/CloudFilesBlobStoreLiveTest.java @@ -0,0 +1,282 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.rackspace.cloudfiles; + +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotNull; +import static org.testng.Assert.assertTrue; +import static org.testng.Assert.fail; + +import java.io.ByteArrayInputStream; +import java.io.InputStream; +import java.util.List; +import java.util.concurrent.TimeUnit; + +import org.apache.commons.io.IOUtils; +import org.jclouds.blobstore.domain.Blob; +import org.jclouds.blobstore.domain.BlobMetadata; +import org.jclouds.blobstore.integration.internal.BaseBlobStoreIntegrationTest; +import org.jclouds.http.HttpResponseException; +import org.jclouds.http.HttpUtils; +import org.jclouds.http.options.GetOptions; +import org.jclouds.logging.log4j.config.Log4JLoggingModule; +import org.jclouds.rackspace.cloudfiles.domain.AccountMetadata; +import org.jclouds.rackspace.cloudfiles.domain.ContainerMetadata; +import org.jclouds.rackspace.cloudfiles.options.ListContainerOptions; +import org.testng.annotations.BeforeGroups; +import org.testng.annotations.Test; + +import com.google.common.collect.HashMultimap; +import com.google.common.collect.Iterables; +import com.google.common.collect.Multimap; + +/** + * Tests behavior of {@code JaxrsAnnotationProcessor} + * + * @author Adrian Cole + */ +@Test(groups = "live", testName = "cloudfiles.CloudFilesAuthenticationLiveTest") +public class CloudFilesBlobStoreLiveTest { + + private String bucketPrefix = BaseBlobStoreIntegrationTest.CONTAINER_PREFIX; + CloudFilesBlobStore connection; + + @BeforeGroups(groups = { "live" }) + public void setupConnection() { + String account = System.getProperty("jclouds.test.user"); + String key = System.getProperty("jclouds.test.key"); + connection = CloudFilesContextBuilder.newBuilder(account, key).withModule( + new Log4JLoggingModule()).withJsonDebug().buildContext().getApi(); + } + + @Test + public void testListOwnedContainers() throws Exception { + List response = connection.listContainers(); + assertNotNull(response); + long initialContainerCount = response.size(); + assertTrue(initialContainerCount >= 0); + + // Create test containers + String[] containerNames = new String[] { bucketPrefix + ".testListOwnedContainers1", + bucketPrefix + ".testListOwnedContainers2" }; + assertTrue(connection.createContainer(containerNames[0]).get(10, TimeUnit.SECONDS)); + assertTrue(connection.createContainer(containerNames[1]).get(10, TimeUnit.SECONDS)); + + // Test default listing + response = connection.listContainers(); + // assertEquals(response.size(), initialContainerCount + 2);// if the containers already + // exist, this will fail + + // Test listing with options + response = connection.listContainers(ListContainerOptions.Builder.afterMarker( + containerNames[0].substring(0, containerNames[0].length() - 1)).maxResults(1)); + assertEquals(response.size(), 1); + assertEquals(response.get(0).getName(), containerNames[0]); + + response = connection.listContainers(ListContainerOptions.Builder.afterMarker( + containerNames[0]).maxResults(1)); + assertEquals(response.size(), 1); + assertEquals(response.get(0).getName(), containerNames[1]); + + // Cleanup and test containers have been removed + assertTrue(connection.deleteContainer(containerNames[0]).get(10, TimeUnit.SECONDS)); + assertTrue(connection.deleteContainer(containerNames[1]).get(10, TimeUnit.SECONDS)); + response = connection.listContainers(); + // assertEquals(response.size(), initialContainerCount + 2);// if the containers already + // exist, this will fail + } + + @Test + public void testHeadAccountMetadata() throws Exception { + AccountMetadata metadata = connection.getAccountMetadata(); + assertNotNull(metadata); + long initialContainerCount = metadata.getContainerCount(); + + String containerName = bucketPrefix + ".testHeadAccountMetadata"; + assertTrue(connection.createContainer(containerName).get(10, TimeUnit.SECONDS)); + + metadata = connection.getAccountMetadata(); + assertNotNull(metadata); + assertTrue(metadata.getContainerCount() >= initialContainerCount); + + assertTrue(connection.deleteContainer(containerName).get(10, TimeUnit.SECONDS)); + } + + @Test + public void testDeleteContainer() throws Exception { + assertTrue(connection.deleteContainer("does-not-exist").get(10, TimeUnit.SECONDS)); + + String containerName = bucketPrefix + ".testDeleteContainer"; + assertTrue(connection.createContainer(containerName).get(10, TimeUnit.SECONDS)); + assertTrue(connection.deleteContainer(containerName).get(10, TimeUnit.SECONDS)); + } + + @Test + public void testPutContainers() throws Exception { + String containerName1 = bucketPrefix + ".hello"; + assertTrue(connection.createContainer(containerName1).get(10, TimeUnit.SECONDS)); + // List only the container just created, using a marker with the container name less 1 char + List response = connection + .listContainers(ListContainerOptions.Builder.afterMarker( + containerName1.substring(0, containerName1.length() - 1)).maxResults(1)); + assertNotNull(response); + assertEquals(response.size(), 1); + assertEquals(response.get(0).getName(), bucketPrefix + ".hello"); + + String containerName2 = bucketPrefix + "?should-be-illegal-question-char"; + try { + connection.createContainer(containerName2).get(10, TimeUnit.MILLISECONDS); + fail("Should not be able to create container with illegal '?' character"); + } catch (Exception e) { + } + // List only the container just created, using a marker with the container name less 1 char + response = connection.listContainers(ListContainerOptions.Builder.afterMarker( + containerName2.substring(0, containerName2.length() - 1)).maxResults(1)); + assertEquals(response.size(), 1); + + // TODO: Should throw a specific exception, not UndeclaredThrowableException + try { + connection.createContainer(bucketPrefix + "/illegal-slash-char").get(10, + TimeUnit.MILLISECONDS); + fail("Should not be able to create container with illegal '/' character"); + } catch (Exception e) { + } + + assertTrue(connection.deleteContainer(containerName1).get(10, TimeUnit.SECONDS)); + assertTrue(connection.deleteContainer(containerName2).get(10, TimeUnit.SECONDS)); + } + + @Test + public void testObjectOperations() throws Exception { + String containerName = bucketPrefix + ".testObjectOperations"; + String data = "Here is my data"; + + assertTrue(connection.createContainer(containerName).get(10, TimeUnit.SECONDS)); + + // Test PUT with string data, ETag hash, and a piece of metadata + Blob object = new Blob("object"); + object.setData(data); + object.setContentLength(data.length()); + object.generateMD5(); + object.getMetadata().setContentType("text/plain"); + object.getMetadata().getUserMetadata().put("Metadata", "metadata-value"); + byte[] md5 = object.getMetadata().getContentMD5(); + byte[] newEtag = connection.putBlob(containerName, object).get(10, TimeUnit.SECONDS); + assertEquals(HttpUtils.toHexString(md5), HttpUtils.toHexString(object.getMetadata() + .getContentMD5())); + + // Test HEAD of missing object + try { + connection.blobMetadata(containerName, "non-existent-object"); + assert false; + } catch (Exception e) { + e.printStackTrace(); + } + + // Test HEAD of object + BlobMetadata metadata = connection.blobMetadata(containerName, object.getKey()); + // TODO assertEquals(metadata.getKey(), object.getKey()); + assertEquals(metadata.getSize(), data.length()); + assertEquals(metadata.getContentType(), "text/plain"); + assertEquals(HttpUtils.toHexString(md5), HttpUtils.toHexString(object.getMetadata() + .getContentMD5())); + assertEquals(metadata.getETag(), newEtag); + assertEquals(metadata.getUserMetadata().entries().size(), 1); + assertEquals(Iterables.getLast(metadata.getUserMetadata().get("metadata")), "metadata-value"); + + // // Test POST to update object's metadata + Multimap userMetadata = HashMultimap.create(); + userMetadata.put("New-Metadata-1", "value-1"); + userMetadata.put("New-Metadata-2", "value-2"); + assertTrue(connection.setObjectMetadata(containerName, object.getKey(), userMetadata)); + + // Test GET of missing object + try { + connection.getBlob(containerName, "non-existent-object").get(10, TimeUnit.SECONDS); + assert false; + } catch (Exception e) { + e.printStackTrace(); + } + // Test GET of object (including updated metadata) + Blob getBlob = connection.getBlob(containerName, object.getKey()).get(120, + TimeUnit.SECONDS); + assertEquals(IOUtils.toString((InputStream) getBlob.getData()), data); + // TODO assertEquals(getBlob.getKey(), object.getKey()); + assertEquals(getBlob.getContentLength(), data.length()); + assertEquals(getBlob.getMetadata().getContentType(), "text/plain"); + assertEquals(HttpUtils.toHexString(md5), HttpUtils.toHexString(getBlob.getMetadata() + .getContentMD5())); + assertEquals(newEtag, getBlob.getMetadata().getETag()); + assertEquals(getBlob.getMetadata().getUserMetadata().entries().size(), 2); + assertEquals( + Iterables.getLast(getBlob.getMetadata().getUserMetadata().get("new-metadata-1")), + "value-1"); + assertEquals( + Iterables.getLast(getBlob.getMetadata().getUserMetadata().get("new-metadata-2")), + "value-2"); + + // Test PUT with invalid ETag (as if object's data was corrupted in transit) + String correctEtag = HttpUtils.toHexString(newEtag); + String incorrectEtag = "0" + correctEtag.substring(1); + object.getMetadata().setETag(HttpUtils.fromHexString(incorrectEtag)); + try { + connection.putBlob(containerName, object).get(10, TimeUnit.SECONDS); + } catch (Throwable e) { + assertEquals(e.getCause().getClass(), HttpResponseException.class); + assertEquals(((HttpResponseException) e.getCause()).getResponse().getStatusCode(), 422); + } + + // Test PUT chunked/streamed upload with data of "unknown" length + ByteArrayInputStream bais = new ByteArrayInputStream(data.getBytes("UTF-8")); + object = new Blob("chunked-object"); + object.setData(bais); + newEtag = connection.putBlob(containerName, object).get(10, TimeUnit.SECONDS); + assertEquals(HttpUtils.toHexString(md5), HttpUtils.toHexString(getBlob.getMetadata() + .getContentMD5())); + + // Test GET with options + // Non-matching ETag + try { + connection.getBlob(containerName, object.getKey(), + GetOptions.Builder.ifETagDoesntMatch(newEtag)).get(120, TimeUnit.SECONDS); + } catch (Exception e) { + assertEquals(e.getCause().getClass(), HttpResponseException.class); + assertEquals(((HttpResponseException) e.getCause()).getResponse().getStatusCode(), 304); + } + + // Matching ETag + getBlob = connection.getBlob(containerName, object.getKey(), + GetOptions.Builder.ifETagMatches(newEtag)).get(120, TimeUnit.SECONDS); + assertEquals(getBlob.getMetadata().getETag(), newEtag); + getBlob = connection.getBlob(containerName, object.getKey(), GetOptions.Builder.startAt(8)) + .get(120, TimeUnit.SECONDS); + assertEquals(IOUtils.toString((InputStream) getBlob.getData()), data.substring(8)); + + assertTrue(connection.removeBlob(containerName, "object").get(10, TimeUnit.SECONDS)); + assertTrue(connection.removeBlob(containerName, "chunked-object").get(10, TimeUnit.SECONDS)); + + assertTrue(connection.deleteContainer(containerName).get(10, TimeUnit.SECONDS)); + } + +} diff --git a/rackspace/cloudfiles/core/src/test/java/org/jclouds/rackspace/cloudfiles/CloudFilesCDNConnectionLiveTest.java b/rackspace/cloudfiles/core/src/test/java/org/jclouds/rackspace/cloudfiles/CloudFilesCDNConnectionLiveTest.java index 3536faebef..a3c14b83fc 100644 --- a/rackspace/cloudfiles/core/src/test/java/org/jclouds/rackspace/cloudfiles/CloudFilesCDNConnectionLiveTest.java +++ b/rackspace/cloudfiles/core/src/test/java/org/jclouds/rackspace/cloudfiles/CloudFilesCDNConnectionLiveTest.java @@ -23,12 +23,11 @@ */ package org.jclouds.rackspace.cloudfiles; -import static org.jclouds.rackspace.reference.RackspaceConstants.PROPERTY_RACKSPACE_KEY; -import static org.jclouds.rackspace.reference.RackspaceConstants.PROPERTY_RACKSPACE_USER; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; import java.util.List; +import java.util.concurrent.TimeUnit; import org.jclouds.logging.log4j.config.Log4JLoggingModule; import org.jclouds.rackspace.cloudfiles.domain.ContainerCDNMetadata; @@ -47,108 +46,107 @@ import com.google.common.collect.Iterables; @Test(groups = "live", testName = "cloudfiles.CloudFilesAuthenticationLiveTest") public class CloudFilesCDNConnectionLiveTest { - protected static final String sysRackspaceUser = System.getProperty(PROPERTY_RACKSPACE_USER); - protected static final String sysRackspaceKey = System.getProperty(PROPERTY_RACKSPACE_KEY); - - private String bucketPrefix = System.getProperty("user.name") + ".cfcdnint"; + private String bucketPrefix = System.getProperty("user.name") + "-cfcdnint"; CloudFilesCDNConnection cdnConnection; - CloudFilesConnection filesConnection; + CloudFilesBlobStore filesConnection; @BeforeGroups(groups = { "live" }) public void setupConnection() { - cdnConnection = CloudFilesCDNContextBuilder.newBuilder(sysRackspaceUser, sysRackspaceKey) - .withModule(new Log4JLoggingModule()).withJsonDebug().buildContext().getConnection(); - filesConnection = CloudFilesContextBuilder.newBuilder(sysRackspaceUser, sysRackspaceKey) - .withModule(new Log4JLoggingModule()).withJsonDebug().buildContext().getConnection(); + String account = System.getProperty("jclouds.test.user"); + String key = System.getProperty("jclouds.test.key"); + + cdnConnection = CloudFilesCDNContextBuilder.newBuilder(account, key).withModule( + new Log4JLoggingModule()).withJsonDebug().buildContext().getApi(); + filesConnection = CloudFilesContextBuilder.newBuilder(account, key).withModule( + new Log4JLoggingModule()).withJsonDebug().buildContext().getApi(); } @Test - public void testCDNOperations() throws Exception { + public void testCDNOperations() throws Exception { final long minimumTTL = 60 * 60; // The minimum TTL is 1 hour - - // Create two new containers for testing + + // Create two new containers for testing final String containerNameWithCDN = bucketPrefix + ".testCDNOperationsContainerWithCDN"; final String containerNameWithoutCDN = bucketPrefix + ".testCDNOperationsContainerWithoutCDN"; - assertTrue(filesConnection.putContainer(containerNameWithCDN)); - assertTrue(filesConnection.putContainer(containerNameWithoutCDN)); - + assertTrue(filesConnection.createContainer(containerNameWithCDN).get(10, TimeUnit.SECONDS)); + assertTrue(filesConnection.createContainer(containerNameWithoutCDN).get(10, TimeUnit.SECONDS)); + ContainerCDNMetadata cdnMetadata = null; - + // Enable CDN with PUT for one container final String cdnUri = cdnConnection.enableCDN(containerNameWithCDN); assertTrue(cdnUri != null); assertTrue(cdnUri.startsWith("http://")); - + // Confirm CDN is enabled via HEAD request and has default TTL cdnMetadata = cdnConnection.getCDNMetadata(containerNameWithCDN); assertTrue(cdnMetadata.isCdnEnabled()); assertEquals(cdnMetadata.getCdnUri(), cdnUri); final long initialTTL = cdnMetadata.getTtl(); - + // Check HEAD responses for non-existent container, and container with no CDN metadata cdnMetadata = cdnConnection.getCDNMetadata(containerNameWithoutCDN); - assertEquals(cdnMetadata, ContainerCDNMetadata.NOT_FOUND); + assertEquals(cdnMetadata, null); cdnMetadata = cdnConnection.getCDNMetadata("DoesNotExist"); - assertEquals(cdnMetadata, ContainerCDNMetadata.NOT_FOUND); - - // List CDN metadata for containers, and ensure all CDN info is available for enabled container + assertEquals(cdnMetadata, null); + + // List CDN metadata for containers, and ensure all CDN info is available for enabled + // container List cdnMetadataList = cdnConnection.listCDNContainers(); assertTrue(cdnMetadataList.size() >= 1); assertTrue(Iterables.any(cdnMetadataList, new Predicate() { - public boolean apply(ContainerCDNMetadata cdnMetadata) { - return ( - cdnMetadata.getName().equals(containerNameWithCDN) && - cdnMetadata.isCdnEnabled() && - cdnMetadata.getTtl() == initialTTL && - cdnMetadata.getCdnUri().equals(cdnUri)); - } + public boolean apply(ContainerCDNMetadata cdnMetadata) { + return (cdnMetadata.getName().equals(containerNameWithCDN) + && cdnMetadata.isCdnEnabled() && cdnMetadata.getTtl() == initialTTL && cdnMetadata + .getCdnUri().equals(cdnUri)); + } })); - + // Test listing with options - cdnMetadataList = cdnConnection.listCDNContainers( - ListCdnContainerOptions.Builder.enabledOnly()); + cdnMetadataList = cdnConnection.listCDNContainers(ListCdnContainerOptions.Builder + .enabledOnly()); assertTrue(Iterables.all(cdnMetadataList, new Predicate() { public boolean apply(ContainerCDNMetadata cdnMetadata) { return cdnMetadata.isCdnEnabled(); - } + } })); cdnMetadataList = cdnConnection.listCDNContainers(ListCdnContainerOptions.Builder - .afterMarker(containerNameWithCDN.substring(0, containerNameWithCDN.length() - 1)) - .maxResults(1)); + .afterMarker(containerNameWithCDN.substring(0, containerNameWithCDN.length() - 1)) + .maxResults(1)); assertEquals(cdnMetadataList.size(), 1); assertEquals(cdnMetadataList.get(0).getName(), containerNameWithCDN); // Enable CDN with PUT for the same container, this time with a custom TTL long ttl = 4000; cdnConnection.enableCDN(containerNameWithCDN, ttl); - + cdnMetadata = cdnConnection.getCDNMetadata(containerNameWithCDN); assertTrue(cdnMetadata.isCdnEnabled()); - assertEquals(cdnMetadata.getTtl(), ttl); - + assertEquals(cdnMetadata.getTtl(), ttl); + // Check POST by updating TTL settings ttl = minimumTTL; cdnConnection.updateCDN(containerNameWithCDN, minimumTTL); - + cdnMetadata = cdnConnection.getCDNMetadata(containerNameWithCDN); assertTrue(cdnMetadata.isCdnEnabled()); assertEquals(cdnMetadata.getTtl(), minimumTTL); // Confirm that minimum allowed value for TTL is 3600, lower values are ignored. - cdnConnection.updateCDN(containerNameWithCDN, 3599L); + cdnConnection.updateCDN(containerNameWithCDN, 3599L); cdnMetadata = cdnConnection.getCDNMetadata(containerNameWithCDN); assertEquals(cdnMetadata.getTtl(), minimumTTL); // Note that TTL is 3600 here, not 3599 // Disable CDN with POST assertTrue(cdnConnection.disableCDN(containerNameWithCDN)); - + cdnMetadata = cdnConnection.getCDNMetadata(containerNameWithCDN); assertEquals(cdnMetadata.isCdnEnabled(), false); - + // Delete test containers - assertTrue(filesConnection.deleteContainerIfEmpty(containerNameWithCDN)); - assertTrue(filesConnection.deleteContainerIfEmpty(containerNameWithoutCDN)); + assertTrue(filesConnection.deleteContainer(containerNameWithCDN).get(10, TimeUnit.SECONDS)); + assertTrue(filesConnection.deleteContainer(containerNameWithoutCDN).get(10, TimeUnit.SECONDS)); } } diff --git a/rackspace/cloudfiles/core/src/test/java/org/jclouds/rackspace/cloudfiles/CloudFilesCDNContextBuilderTest.java b/rackspace/cloudfiles/core/src/test/java/org/jclouds/rackspace/cloudfiles/CloudFilesCDNContextBuilderTest.java new file mode 100644 index 0000000000..00dbdc46a4 --- /dev/null +++ b/rackspace/cloudfiles/core/src/test/java/org/jclouds/rackspace/cloudfiles/CloudFilesCDNContextBuilderTest.java @@ -0,0 +1,89 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.rackspace.cloudfiles; + +import static org.jclouds.http.HttpConstants.PROPERTY_HTTP_ADDRESS; +import static org.testng.Assert.assertEquals; + +import java.net.URI; +import java.util.ArrayList; +import java.util.List; + +import org.jclouds.cloud.CloudContext; +import org.jclouds.rackspace.cloudfiles.config.RestCloudFilesCDNConnectionModule; +import org.jclouds.rackspace.cloudfiles.internal.GuiceCloudFilesCDNContext; +import org.jclouds.rackspace.config.RackspaceAuthenticationModule; +import org.jclouds.rackspace.reference.RackspaceConstants; +import org.testng.annotations.Test; + +import com.google.inject.Injector; +import com.google.inject.Module; + +/** + * Tests behavior of modules configured in CloudFilesCDNContextBuilder + * + * @author Adrian Cole + */ +@Test(groups = "unit", testName = "cloudfiles.CloudFilesCDNContextBuilderTest") +public class CloudFilesCDNContextBuilderTest { + + public void testNewBuilder() { + CloudFilesCDNContextBuilder builder = CloudFilesCDNContextBuilder.newBuilder("id", "secret"); + assertEquals(builder.getProperties().getProperty(PROPERTY_HTTP_ADDRESS), "api.mosso.com"); + assertEquals(builder.getProperties().getProperty(RackspaceConstants.PROPERTY_RACKSPACE_USER), + "id"); + assertEquals(builder.getProperties().getProperty(RackspaceConstants.PROPERTY_RACKSPACE_KEY), + "secret"); + } + + public void testBuildContext() { + CloudContext context = CloudFilesCDNContextBuilder.newBuilder("id", + "secret").buildContext(); + assertEquals(context.getClass(), GuiceCloudFilesCDNContext.class); + assertEquals(context.getAccount(), "id"); + assertEquals(context.getEndPoint(), URI.create("https://api.mosso.com:443")); + } + + public void testBuildInjector() { + Injector i = CloudFilesCDNContextBuilder.newBuilder("id", "secret").buildInjector(); + assert i.getInstance(CloudFilesCDNContext.class) != null; + } + + protected void testAddContextModule() { + List modules = new ArrayList(); + CloudFilesCDNContextBuilder builder = CloudFilesCDNContextBuilder.newBuilder("id", "secret"); + builder.addContextModule(modules); + assertEquals(modules.size(), 1); + assertEquals(modules.get(0).getClass(), RackspaceAuthenticationModule.class); + } + + protected void addConnectionModule() { + List modules = new ArrayList(); + CloudFilesCDNContextBuilder builder = CloudFilesCDNContextBuilder.newBuilder("id", "secret"); + builder.addConnectionModule(modules); + assertEquals(modules.size(), 1); + assertEquals(modules.get(0).getClass(), RestCloudFilesCDNConnectionModule.class); + } + +} diff --git a/rackspace/cloudfiles/core/src/test/java/org/jclouds/rackspace/cloudfiles/CloudFilesConnectionLiveTest.java b/rackspace/cloudfiles/core/src/test/java/org/jclouds/rackspace/cloudfiles/CloudFilesConnectionLiveTest.java deleted file mode 100644 index 68bae74bb7..0000000000 --- a/rackspace/cloudfiles/core/src/test/java/org/jclouds/rackspace/cloudfiles/CloudFilesConnectionLiveTest.java +++ /dev/null @@ -1,267 +0,0 @@ -/** - * - * Copyright (C) 2009 Global Cloud Specialists, Inc. - * - * ==================================================================== - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * ==================================================================== - */ -package org.jclouds.rackspace.cloudfiles; - -import static org.jclouds.rackspace.reference.RackspaceConstants.PROPERTY_RACKSPACE_KEY; -import static org.jclouds.rackspace.reference.RackspaceConstants.PROPERTY_RACKSPACE_USER; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNotNull; -import static org.testng.Assert.assertTrue; -import static org.testng.Assert.fail; - -import java.io.ByteArrayInputStream; -import java.io.InputStream; -import java.util.List; -import java.util.concurrent.TimeUnit; - -import org.apache.commons.io.IOUtils; -import org.jclouds.http.HttpResponseException; -import org.jclouds.http.HttpUtils; -import org.jclouds.http.options.GetOptions; -import org.jclouds.logging.log4j.config.Log4JLoggingModule; -import org.jclouds.rackspace.cloudfiles.domain.AccountMetadata; -import org.jclouds.rackspace.cloudfiles.domain.CFObject; -import org.jclouds.rackspace.cloudfiles.domain.ContainerMetadata; -import org.jclouds.rackspace.cloudfiles.options.ListContainerOptions; -import org.jclouds.rackspace.cloudfiles.reference.CloudFilesHeaders; -import org.testng.annotations.BeforeGroups; -import org.testng.annotations.Test; - -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Iterables; -import com.google.common.collect.Multimap; - -/** - * Tests behavior of {@code JaxrsAnnotationProcessor} - * - * @author Adrian Cole - */ -@Test(groups = "live", testName = "cloudfiles.CloudFilesAuthenticationLiveTest") -public class CloudFilesConnectionLiveTest { - - protected static final String sysRackspaceUser = System.getProperty(PROPERTY_RACKSPACE_USER); - protected static final String sysRackspaceKey = System.getProperty(PROPERTY_RACKSPACE_KEY); - - private String bucketPrefix = System.getProperty("user.name") + ".cfint"; - CloudFilesConnection connection; - - @BeforeGroups(groups = { "live" }) - public void setupConnection() { - connection = CloudFilesContextBuilder.newBuilder(sysRackspaceUser, sysRackspaceKey) - .withModule(new Log4JLoggingModule()).withJsonDebug().buildContext().getConnection(); - } - - @Test - public void testListOwnedContainers() throws Exception { - List response = connection.listOwnedContainers(); - assertNotNull(response); - long initialContainerCount = response.size(); - assertTrue(initialContainerCount >= 0); - - // Create test containers - String[] containerNames = new String[] { - bucketPrefix + ".testListOwnedContainers1", - bucketPrefix + ".testListOwnedContainers2" }; - assertTrue(connection.putContainer(containerNames[0])); - assertTrue(connection.putContainer(containerNames[1])); - - // Test default listing - response = connection.listOwnedContainers(); - assertEquals(response.size(), initialContainerCount + 2); - - // Test listing with options - response = connection.listOwnedContainers(ListContainerOptions.Builder - .afterMarker(containerNames[0].substring(0, containerNames[0].length() - 1)) - .maxResults(1)); - assertEquals(response.size(), 1); - assertEquals(response.get(0).getName(), containerNames[0]); - - response = connection.listOwnedContainers(ListContainerOptions.Builder - .afterMarker(containerNames[0]).maxResults(1)); - assertEquals(response.size(), 1); - assertEquals(response.get(0).getName(), containerNames[1]); - - // Cleanup and test containers have been removed - assertTrue(connection.deleteContainerIfEmpty(containerNames[0])); - assertTrue(connection.deleteContainerIfEmpty(containerNames[1])); - response = connection.listOwnedContainers(); - assertEquals(response.size(), initialContainerCount); - } - - @Test - public void testHeadAccountMetadata() throws Exception { - AccountMetadata metadata = connection.getAccountMetadata(); - assertNotNull(metadata); - long initialContainerCount = metadata.getContainerCount(); - - String containerName = bucketPrefix + ".testHeadAccountMetadata"; - assertTrue(connection.putContainer(containerName)); - - metadata = connection.getAccountMetadata(); - assertNotNull(metadata); - assertEquals(metadata.getContainerCount(), initialContainerCount + 1); - - assertTrue(connection.deleteContainerIfEmpty(containerName)); - } - - @Test - public void testDeleteContainer() throws Exception { - assertTrue(connection.deleteContainerIfEmpty("does-not-exist")); - - String containerName = bucketPrefix + ".testDeleteContainer"; - assertTrue(connection.putContainer(containerName)); - assertTrue(connection.deleteContainerIfEmpty(containerName)); - } - - @Test - public void testPutContainers() throws Exception { - String containerName1 = bucketPrefix + ".hello"; - assertTrue(connection.putContainer(containerName1)); - // List only the container just created, using a marker with the container name less 1 char - List response = connection - .listOwnedContainers(ListContainerOptions.Builder.afterMarker( - containerName1.substring(0, containerName1.length() - 1)).maxResults(1)); - assertNotNull(response); - assertEquals(response.size(), 1); - assertEquals(response.get(0).getName(), bucketPrefix + ".hello"); - - // TODO: Contrary to the API documentation, a container can be created with '?' in the name. - String containerName2 = bucketPrefix + "?should-be-illegal-question-char"; - connection.putContainer(containerName2); - // List only the container just created, using a marker with the container name less 1 char - response = connection.listOwnedContainers(ListContainerOptions.Builder.afterMarker( - containerName2.substring(0, containerName2.length() - 1)).maxResults(1)); - assertEquals(response.size(), 1); - - // TODO: Should throw a specific exception, not UndeclaredThrowableException - try { - connection.putContainer(bucketPrefix + "/illegal-slash-char"); - fail("Should not be able to create container with illegal '/' character"); - } catch (Exception e) { - } - - assertTrue(connection.deleteContainerIfEmpty(containerName1)); - assertTrue(connection.deleteContainerIfEmpty(containerName2)); - } - - @Test - public void testObjectOperations() throws Exception { - String containerName = bucketPrefix + ".testObjectOperations"; - String data = "Here is my data"; - - assertTrue(connection.putContainer(containerName)); - - // Test PUT with string data, ETag hash, and a piece of metadata - CFObject object = new CFObject("object", data); - object.setContentLength(data.length()); - object.generateETag(); - object.getMetadata().setContentType("text/plain"); - object.getMetadata().getUserMetadata().put( - CloudFilesHeaders.USER_METADATA_PREFIX + "Metadata", "metadata-value"); - byte[] md5 = connection.putObject(containerName, object).get(10, TimeUnit.SECONDS); - assertEquals(HttpUtils.toHexString(md5), - HttpUtils.toHexString(object.getMetadata().getETag())); - - // Test HEAD of missing object - CFObject.Metadata metadata = connection.headObject(containerName, "non-existent-object"); - assertEquals(metadata, CFObject.Metadata.NOT_FOUND); - - // Test HEAD of object - metadata = connection.headObject(containerName, object.getKey()); - assertEquals(metadata.getKey(), object.getKey()); - assertEquals(metadata.getSize(), data.length()); - assertEquals(metadata.getContentType(), "text/plain"); - assertEquals(metadata.getETag(), object.getMetadata().getETag()); - assertEquals(metadata.getUserMetadata().entries().size(), 1); - // Notice the quirk where CF changes the case of returned metadata names - assertEquals(Iterables.getLast(metadata.getUserMetadata().get( - (CloudFilesHeaders.USER_METADATA_PREFIX + "Metadata").toLowerCase())), - "metadata-value"); - - // Test POST to update object's metadata - Multimap userMetadata = HashMultimap.create(); - userMetadata.put(CloudFilesHeaders.USER_METADATA_PREFIX + "New-Metadata-1", "value-1"); - userMetadata.put(CloudFilesHeaders.USER_METADATA_PREFIX + "New-Metadata-2", "value-2"); - assertTrue(connection.setObjectMetadata(containerName, object.getKey(), userMetadata)); - - // Test GET of missing object - CFObject getObject = connection.getObject(containerName, "non-existent-object") - .get(10, TimeUnit.SECONDS); - assertEquals(getObject, CFObject.NOT_FOUND); - - // Test GET of object (including updated metadata) - getObject = connection.getObject(containerName, object.getKey()).get(120, TimeUnit.SECONDS); - assertEquals(IOUtils.toString((InputStream)getObject.getData()), data); - assertEquals(getObject.getKey(), object.getKey()); - assertEquals(getObject.getContentLength(), data.length()); - assertEquals(getObject.getMetadata().getContentType(), "text/plain"); - assertEquals(getObject.getMetadata().getETag(), object.getMetadata().getETag()); - assertEquals(getObject.getMetadata().getUserMetadata().entries().size(), 2); - // Notice the quirk where CF changes the case of returned metadata names - assertEquals(Iterables.getLast(getObject.getMetadata().getUserMetadata().get( - (CloudFilesHeaders.USER_METADATA_PREFIX + "New-Metadata-1").toLowerCase())), "value-1"); - assertEquals(Iterables.getLast(getObject.getMetadata().getUserMetadata().get( - (CloudFilesHeaders.USER_METADATA_PREFIX + "New-Metadata-2").toLowerCase())), "value-2"); - - // Test PUT with invalid ETag (as if object's data was corrupted in transit) - String correctEtag = HttpUtils.toHexString(object.getMetadata().getETag()); - String incorrectEtag = "0" + correctEtag.substring(1); - object.getMetadata().setETag(HttpUtils.fromHexString(incorrectEtag)); - try { - connection.putObject(containerName, object).get(10, TimeUnit.SECONDS); - } catch (Throwable e) { - assertEquals(e.getCause().getClass(), HttpResponseException.class); - assertEquals(((HttpResponseException) e.getCause()).getResponse().getStatusCode(), 422); - } - - // Test PUT chunked/streamed upload with data of "unknown" length - ByteArrayInputStream bais = new ByteArrayInputStream(data.getBytes("UTF-8")); - object = new CFObject("chunked-object", bais); - md5 = connection.putObject(containerName, object).get(10, TimeUnit.SECONDS); - assertEquals(HttpUtils.toHexString(md5), correctEtag); - - // Test GET with options - // Non-matching ETag - try { - connection.getObject(containerName, object.getKey(), - GetOptions.Builder.ifETagDoesntMatch(md5)).get(120, TimeUnit.SECONDS); - } catch (Exception e) { - assertEquals(e.getCause().getClass(), HttpResponseException.class); - assertEquals(((HttpResponseException) e.getCause()).getResponse().getStatusCode(), 304); - } - // Matching ETag - getObject = connection.getObject(containerName, object.getKey(), - GetOptions.Builder.ifETagMatches(md5)).get(120, TimeUnit.SECONDS); - assertEquals(getObject.getMetadata().getETag(), md5); - // Range - getObject = connection.getObject(containerName, object.getKey(), - GetOptions.Builder.startAt(8)).get(120, TimeUnit.SECONDS); - assertEquals(IOUtils.toString((InputStream)getObject.getData()), data.substring(8)); - - assertTrue(connection.deleteObject(containerName, "object")); - assertTrue(connection.deleteObject(containerName, "chunked-object")); - assertTrue(connection.deleteContainerIfEmpty(containerName)); - } - -} diff --git a/rackspace/cloudfiles/core/src/test/java/org/jclouds/rackspace/cloudfiles/CloudFilesContextBuilderTest.java b/rackspace/cloudfiles/core/src/test/java/org/jclouds/rackspace/cloudfiles/CloudFilesContextBuilderTest.java new file mode 100755 index 0000000000..7dee172366 --- /dev/null +++ b/rackspace/cloudfiles/core/src/test/java/org/jclouds/rackspace/cloudfiles/CloudFilesContextBuilderTest.java @@ -0,0 +1,105 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.rackspace.cloudfiles; + +import static org.jclouds.blobstore.reference.BlobStoreConstants.PROPERTY_USER_METADATA_PREFIX; +import static org.jclouds.http.HttpConstants.PROPERTY_HTTP_ADDRESS; +import static org.testng.Assert.assertEquals; + +import java.net.URI; +import java.util.ArrayList; +import java.util.List; + +import org.jclouds.blobstore.domain.Blob; +import org.jclouds.blobstore.domain.BlobMetadata; +import org.jclouds.blobstore.functions.ParseBlobFromHeadersAndHttpContent.BlobFactory; +import org.jclouds.blobstore.functions.ParseBlobMetadataFromHeaders.BlobMetadataFactory; +import org.jclouds.cloud.CloudContext; +import org.jclouds.rackspace.cloudfiles.config.RestCloudFilesBlobStoreModule; +import org.jclouds.rackspace.cloudfiles.internal.GuiceCloudFilesContext; +import org.jclouds.rackspace.config.RackspaceAuthenticationModule; +import org.jclouds.rackspace.reference.RackspaceConstants; +import org.testng.annotations.Test; + +import com.google.inject.Injector; +import com.google.inject.Key; +import com.google.inject.Module; +import com.google.inject.TypeLiteral; + +/** + * Tests behavior of modules configured in CloudFilesContextBuilder + * + * @author Adrian Cole + */ +@Test(groups = "unit", testName = "cloudfiles.CloudFilesContextBuilderTest") +public class CloudFilesContextBuilderTest { + + public void testNewBuilder() { + CloudFilesContextBuilder builder = CloudFilesContextBuilder.newBuilder("id", "secret"); + assertEquals(builder.getProperties().getProperty(PROPERTY_USER_METADATA_PREFIX), + "X-Object-Meta-"); + assertEquals(builder.getProperties().getProperty(PROPERTY_HTTP_ADDRESS), "api.mosso.com"); + assertEquals(builder.getProperties().getProperty(RackspaceConstants.PROPERTY_RACKSPACE_USER), + "id"); + assertEquals(builder.getProperties().getProperty(RackspaceConstants.PROPERTY_RACKSPACE_KEY), + "secret"); + } + + public void testBuildContext() { + CloudContext context = CloudFilesContextBuilder.newBuilder("id", + "secret").buildContext(); + assertEquals(context.getClass(), GuiceCloudFilesContext.class); + assertEquals(context.getAccount(), "id"); + assertEquals(context.getEndPoint(), URI.create("https://api.mosso.com:443")); + } + + public void testBuildInjector() { + Injector i = CloudFilesContextBuilder.newBuilder("id", "secret").buildInjector(); + assert i.getInstance(CloudFilesContext.class) != null; + assert i.getInstance(GuiceCloudFilesContext.CloudFilesObjectMapFactory.class) != null; + assert i.getInstance(GuiceCloudFilesContext.CloudFilesInputStreamMapFactory.class) != null; + assert i.getInstance(Key.get(new TypeLiteral>() { + })) != null; + assert i.getInstance(Key + .get(new TypeLiteral>>() { + })) != null; + } + + protected void testAddContextModule() { + List modules = new ArrayList(); + CloudFilesContextBuilder builder = CloudFilesContextBuilder.newBuilder("id", "secret"); + builder.addContextModule(modules); + assertEquals(modules.size(), 1); + assertEquals(modules.get(0).getClass(), RackspaceAuthenticationModule.class); + } + + protected void addConnectionModule() { + List modules = new ArrayList(); + CloudFilesContextBuilder builder = CloudFilesContextBuilder.newBuilder("id", "secret"); + builder.addConnectionModule(modules); + assertEquals(modules.size(), 1); + assertEquals(modules.get(0).getClass(), RestCloudFilesBlobStoreModule.class); + } + +} diff --git a/rackspace/cloudfiles/core/src/test/java/org/jclouds/rackspace/cloudfiles/functions/ParseBlobMetadataListFromJsonResponseTest.java b/rackspace/cloudfiles/core/src/test/java/org/jclouds/rackspace/cloudfiles/functions/ParseBlobMetadataListFromJsonResponseTest.java new file mode 100644 index 0000000000..0de7ad8f48 --- /dev/null +++ b/rackspace/cloudfiles/core/src/test/java/org/jclouds/rackspace/cloudfiles/functions/ParseBlobMetadataListFromJsonResponseTest.java @@ -0,0 +1,71 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.rackspace.cloudfiles.functions; + +import static org.testng.Assert.assertEquals; + +import java.io.InputStream; +import java.util.List; + +import org.jclouds.blobstore.domain.BlobMetadata; +import org.jclouds.http.HttpUtils; +import org.jclouds.http.functions.config.ParserModule; +import org.joda.time.DateTime; +import org.testng.annotations.Test; +import org.testng.collections.Lists; + +import com.google.gson.Gson; +import com.google.inject.Guice; +import com.google.inject.Injector; + +/** + * Tests behavior of {@code ParseBlobMetadataListFromJsonResponseTest} + * + * @author Adrian Cole + */ +@Test(groups = "unit", testName = "cloudfiles.ParseBlobMetadataListFromJsonResponseTest") +public class ParseBlobMetadataListFromJsonResponseTest { + + Injector i = Guice.createInjector(new ParserModule()); + + public void testApplyInputStream() { + InputStream is = getClass().getResourceAsStream("/test_list_container.json"); + List expects = Lists.newArrayList(); + BlobMetadata one = new BlobMetadata("test_obj_1"); + one.setETag(HttpUtils.fromHexString("4281c348eaf83e70ddce0e07221c3d28")); + one.setSize(14); + one.setContentType("application/octet-stream"); + one.setLastModified(new DateTime("2009-02-03T05:26:32.612278")); + expects.add(one); + BlobMetadata two = new BlobMetadata("test_obj_2"); + two.setETag(HttpUtils.fromHexString("b039efe731ad111bc1b0ef221c3849d0")); + two.setSize(64); + two.setContentType("application/octet-stream"); + two.setLastModified(new DateTime("2009-02-03T05:26:32.612278")); + expects.add(two); + ParseBlobMetadataListFromJsonResponse parser = new ParseBlobMetadataListFromJsonResponse(i + .getInstance(Gson.class)); + assertEquals(parser.apply(is), expects); + } +} diff --git a/rackspace/cloudfiles/core/src/test/java/org/jclouds/rackspace/cloudfiles/functions/ParseContainerListFromGsonResponseTest.java b/rackspace/cloudfiles/core/src/test/java/org/jclouds/rackspace/cloudfiles/functions/ParseContainerListFromJsonResponseTest.java old mode 100644 new mode 100755 similarity index 89% rename from rackspace/cloudfiles/core/src/test/java/org/jclouds/rackspace/cloudfiles/functions/ParseContainerListFromGsonResponseTest.java rename to rackspace/cloudfiles/core/src/test/java/org/jclouds/rackspace/cloudfiles/functions/ParseContainerListFromJsonResponseTest.java index dca1c30c6d..60bc3456f0 --- a/rackspace/cloudfiles/core/src/test/java/org/jclouds/rackspace/cloudfiles/functions/ParseContainerListFromGsonResponseTest.java +++ b/rackspace/cloudfiles/core/src/test/java/org/jclouds/rackspace/cloudfiles/functions/ParseContainerListFromJsonResponseTest.java @@ -39,12 +39,12 @@ import com.google.inject.Guice; import com.google.inject.Injector; /** - * Tests behavior of {@code ParseContainerListFromGsonResponse} + * Tests behavior of {@code ParseContainerListFromJsonResponse} * * @author Adrian Cole */ -@Test(groups = "unit", testName = "cloudfiles.ParseContainerListFromGsonResponse") -public class ParseContainerListFromGsonResponseTest { +@Test(groups = "unit", testName = "cloudfiles.ParseContainerListFromJsonResponse") +public class ParseContainerListFromJsonResponseTest { Injector i = Guice.createInjector(new ParserModule()); @Test @@ -53,7 +53,7 @@ public class ParseContainerListFromGsonResponseTest { .toInputStream("[ {\"name\":\"test_container_1\",\"count\":2,\"bytes\":78}, {\"name\":\"test_container_2\",\"count\":1,\"bytes\":17} ] "); List expects = ImmutableList.of(new ContainerMetadata("test_container_1", 2, 78), new ContainerMetadata("test_container_2", 1, 17)); - ParseContainerListFromGsonResponse parser = new ParseContainerListFromGsonResponse(i.getInstance(Gson.class)); + ParseContainerListFromJsonResponse parser = new ParseContainerListFromJsonResponse(i.getInstance(Gson.class)); assertEquals(parser.apply(is), expects); } diff --git a/rackspace/cloudfiles/core/src/test/java/org/jclouds/rackspace/cloudfiles/functions/ParseObjectMetadataFromHeadersTest.java b/rackspace/cloudfiles/core/src/test/java/org/jclouds/rackspace/cloudfiles/functions/ParseObjectMetadataFromHeadersTest.java new file mode 100644 index 0000000000..04a3acce35 --- /dev/null +++ b/rackspace/cloudfiles/core/src/test/java/org/jclouds/rackspace/cloudfiles/functions/ParseObjectMetadataFromHeadersTest.java @@ -0,0 +1,58 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.rackspace.cloudfiles.functions; + +import static org.easymock.classextension.EasyMock.createNiceMock; +import static org.testng.Assert.assertNotNull; + +import java.net.URI; + +import org.jclouds.blobstore.domain.BlobMetadata; +import org.jclouds.blobstore.functions.ParseBlobMetadataFromHeaders.BlobMetadataFactory; +import org.jclouds.http.HttpResponse; +import org.jclouds.util.DateService; +import org.testng.annotations.Test; + +/** + * Tests behavior of {@code ParseContainerListFromJsonResponse} + * + * @author Adrian Cole + */ +@Test(groups = "unit", testName = "cloudfiles.ParseObjectMetadataFromHeadersTest") +public class ParseObjectMetadataFromHeadersTest { + + public void testEtagCaseIssue() { + ParseObjectMetadataFromHeaders parser = new ParseObjectMetadataFromHeaders( + createNiceMock(DateService.class), "", new BlobMetadataFactory() { + public BlobMetadata create(String key) { + return null; + } + }); + BlobMetadata md = new BlobMetadata("hello"); + HttpResponse response = new HttpResponse(URI.create("http://localhost")); + response.getHeaders().put("Etag", "feb1"); + parser.addETagTo(response, md); + assertNotNull(md.getETag()); + } +} diff --git a/rackspace/cloudfiles/core/src/test/java/org/jclouds/rackspace/cloudfiles/integration/CloudFilesBlobIntegrationTest.java b/rackspace/cloudfiles/core/src/test/java/org/jclouds/rackspace/cloudfiles/integration/CloudFilesBlobIntegrationTest.java new file mode 100755 index 0000000000..f61aa1b0e2 --- /dev/null +++ b/rackspace/cloudfiles/core/src/test/java/org/jclouds/rackspace/cloudfiles/integration/CloudFilesBlobIntegrationTest.java @@ -0,0 +1,54 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.rackspace.cloudfiles.integration; + +import java.io.IOException; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.TimeoutException; + +import org.jclouds.blobstore.domain.Blob; +import org.jclouds.blobstore.domain.BlobMetadata; +import org.jclouds.blobstore.integration.internal.BaseBlobIntegrationTest; +import org.jclouds.rackspace.cloudfiles.CloudFilesBlobStore; +import org.jclouds.rackspace.cloudfiles.domain.ContainerMetadata; +import org.testng.annotations.Test; + +/** + * + * @author James Murty + * @author Adrian Cole + */ +@Test(groups = { "integration", "live" }, testName = "cloudfiles.CloudFilesBlobIntegrationTest") +public class CloudFilesBlobIntegrationTest + extends + BaseBlobIntegrationTest> { + + @Test(enabled = false) + @Override + public void testGetTwoRanges() throws InterruptedException, ExecutionException, + TimeoutException, IOException { + // cloud files doesn't support multiple ranges; + } + +} \ No newline at end of file diff --git a/rackspace/cloudfiles/core/src/test/java/org/jclouds/rackspace/cloudfiles/integration/CloudFilesBlobLiveTest.java b/rackspace/cloudfiles/core/src/test/java/org/jclouds/rackspace/cloudfiles/integration/CloudFilesBlobLiveTest.java new file mode 100644 index 0000000000..6b58530b7c --- /dev/null +++ b/rackspace/cloudfiles/core/src/test/java/org/jclouds/rackspace/cloudfiles/integration/CloudFilesBlobLiveTest.java @@ -0,0 +1,42 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.rackspace.cloudfiles.integration; + +import org.jclouds.blobstore.domain.Blob; +import org.jclouds.blobstore.domain.BlobMetadata; +import org.jclouds.blobstore.integration.internal.BaseBlobLiveTest; +import org.jclouds.rackspace.cloudfiles.CloudFilesBlobStore; +import org.jclouds.rackspace.cloudfiles.domain.ContainerMetadata; +import org.testng.annotations.Test; + +/** + * + * @author James Murty + * @author Adrian Cole + */ +@Test(groups = { "live" }, testName = "cloudfiles.CloudFilesBlobLiveTest") +public class CloudFilesBlobLiveTest extends + BaseBlobLiveTest> { + +} \ No newline at end of file diff --git a/rackspace/cloudfiles/core/src/test/java/org/jclouds/rackspace/cloudfiles/integration/CloudFilesBlobMapIntegrationTest.java b/rackspace/cloudfiles/core/src/test/java/org/jclouds/rackspace/cloudfiles/integration/CloudFilesBlobMapIntegrationTest.java new file mode 100644 index 0000000000..0f20b81356 --- /dev/null +++ b/rackspace/cloudfiles/core/src/test/java/org/jclouds/rackspace/cloudfiles/integration/CloudFilesBlobMapIntegrationTest.java @@ -0,0 +1,41 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.rackspace.cloudfiles.integration; + +import org.jclouds.blobstore.domain.Blob; +import org.jclouds.blobstore.domain.BlobMetadata; +import org.jclouds.blobstore.integration.internal.BaseBlobMapIntegrationTest; +import org.jclouds.rackspace.cloudfiles.CloudFilesBlobStore; +import org.jclouds.rackspace.cloudfiles.domain.ContainerMetadata; +import org.testng.annotations.Test; + +/** + * @author Adrian Cole + */ +@Test(groups = { "integration", "live" }, testName = "cloudfiles.CloudFilesBlobMapIntegrationTest") +public class CloudFilesBlobMapIntegrationTest + extends + BaseBlobMapIntegrationTest> { + +} \ No newline at end of file diff --git a/rackspace/cloudfiles/core/src/test/java/org/jclouds/rackspace/cloudfiles/integration/CloudFilesContainerIntegrationTest.java b/rackspace/cloudfiles/core/src/test/java/org/jclouds/rackspace/cloudfiles/integration/CloudFilesContainerIntegrationTest.java new file mode 100755 index 0000000000..885c1390da --- /dev/null +++ b/rackspace/cloudfiles/core/src/test/java/org/jclouds/rackspace/cloudfiles/integration/CloudFilesContainerIntegrationTest.java @@ -0,0 +1,42 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.rackspace.cloudfiles.integration; + +import org.jclouds.blobstore.domain.Blob; +import org.jclouds.blobstore.domain.BlobMetadata; +import org.jclouds.blobstore.integration.internal.BaseContainerIntegrationTest; +import org.jclouds.rackspace.cloudfiles.CloudFilesBlobStore; +import org.jclouds.rackspace.cloudfiles.domain.ContainerMetadata; +import org.testng.annotations.Test; + +/** + * @author James Murty + * @author Adrian Cole + */ +@Test(groups = { "integration", "live" }, testName = "cloudfiles.CloudFilesContainerIntegrationTest") +public class CloudFilesContainerIntegrationTest + extends + BaseContainerIntegrationTest> { + +} \ No newline at end of file diff --git a/rackspace/cloudfiles/core/src/test/java/org/jclouds/rackspace/cloudfiles/integration/CloudFilesContainerLiveTest.java b/rackspace/cloudfiles/core/src/test/java/org/jclouds/rackspace/cloudfiles/integration/CloudFilesContainerLiveTest.java new file mode 100644 index 0000000000..4a7a761944 --- /dev/null +++ b/rackspace/cloudfiles/core/src/test/java/org/jclouds/rackspace/cloudfiles/integration/CloudFilesContainerLiveTest.java @@ -0,0 +1,42 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.rackspace.cloudfiles.integration; + +import org.jclouds.blobstore.domain.Blob; +import org.jclouds.blobstore.domain.BlobMetadata; +import org.jclouds.blobstore.integration.internal.BaseContainerLiveTest; +import org.jclouds.rackspace.cloudfiles.CloudFilesBlobStore; +import org.jclouds.rackspace.cloudfiles.domain.ContainerMetadata; +import org.testng.annotations.Test; + +/** + * @author James Murty + * @author Adrian Cole + */ +@Test(groups = { "live" }, testName = "cloudfiles.CloudFilesContainerLiveTest") +public class CloudFilesContainerLiveTest + extends + BaseContainerLiveTest> { + +} \ No newline at end of file diff --git a/rackspace/cloudfiles/core/src/test/java/org/jclouds/rackspace/cloudfiles/integration/CloudFilesInputStreamMapIntegrationTest.java b/rackspace/cloudfiles/core/src/test/java/org/jclouds/rackspace/cloudfiles/integration/CloudFilesInputStreamMapIntegrationTest.java new file mode 100644 index 0000000000..dd3a911530 --- /dev/null +++ b/rackspace/cloudfiles/core/src/test/java/org/jclouds/rackspace/cloudfiles/integration/CloudFilesInputStreamMapIntegrationTest.java @@ -0,0 +1,41 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.rackspace.cloudfiles.integration; + +import org.jclouds.blobstore.domain.Blob; +import org.jclouds.blobstore.domain.BlobMetadata; +import org.jclouds.blobstore.integration.internal.BaseInputStreamMapIntegrationTest; +import org.jclouds.rackspace.cloudfiles.CloudFilesBlobStore; +import org.jclouds.rackspace.cloudfiles.domain.ContainerMetadata; +import org.testng.annotations.Test; + +/** + * @author Adrian Cole + */ +@Test(groups = { "integration", "live" }, testName = "cloudfiles.CloudFilesInputStreamMapIntegrationTest") +public class CloudFilesInputStreamMapIntegrationTest + extends + BaseInputStreamMapIntegrationTest> { + +} \ No newline at end of file diff --git a/rackspace/cloudfiles/core/src/test/java/org/jclouds/rackspace/cloudfiles/integration/CloudFilesServiceIntegrationTest.java b/rackspace/cloudfiles/core/src/test/java/org/jclouds/rackspace/cloudfiles/integration/CloudFilesServiceIntegrationTest.java new file mode 100644 index 0000000000..78d3b40a75 --- /dev/null +++ b/rackspace/cloudfiles/core/src/test/java/org/jclouds/rackspace/cloudfiles/integration/CloudFilesServiceIntegrationTest.java @@ -0,0 +1,41 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.rackspace.cloudfiles.integration; + +import org.jclouds.blobstore.domain.Blob; +import org.jclouds.blobstore.domain.BlobMetadata; +import org.jclouds.blobstore.integration.internal.BaseServiceIntegrationTest; +import org.jclouds.rackspace.cloudfiles.CloudFilesBlobStore; +import org.jclouds.rackspace.cloudfiles.domain.ContainerMetadata; +import org.testng.annotations.Test; + +/** + * @author Adrian Cole + */ +@Test(groups = { "integration", "live" }, testName = "cloudfiles.CloudFilesServiceIntegrationTest") +public class CloudFilesServiceIntegrationTest extends + BaseServiceIntegrationTest> { + + +} \ No newline at end of file diff --git a/rackspace/cloudfiles/core/src/test/java/org/jclouds/rackspace/cloudfiles/integration/CloudFilesTestInitializer.java b/rackspace/cloudfiles/core/src/test/java/org/jclouds/rackspace/cloudfiles/integration/CloudFilesTestInitializer.java new file mode 100644 index 0000000000..59bdebfb32 --- /dev/null +++ b/rackspace/cloudfiles/core/src/test/java/org/jclouds/rackspace/cloudfiles/integration/CloudFilesTestInitializer.java @@ -0,0 +1,116 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.rackspace.cloudfiles.integration; + +import org.jclouds.blobstore.BlobStoreContext; +import org.jclouds.blobstore.domain.Blob; +import org.jclouds.blobstore.domain.BlobMetadata; +import org.jclouds.blobstore.integration.internal.BaseBlobStoreIntegrationTest; +import org.jclouds.blobstore.integration.internal.BaseBlobStoreIntegrationTest.BlobStoreObjectFactory; +import org.jclouds.logging.log4j.config.Log4JLoggingModule; +import org.jclouds.rackspace.cloudfiles.CloudFilesBlobStore; +import org.jclouds.rackspace.cloudfiles.CloudFilesContext; +import org.jclouds.rackspace.cloudfiles.CloudFilesContextBuilder; +import org.jclouds.rackspace.cloudfiles.domain.ContainerMetadata; +import org.jclouds.rackspace.config.StubCloudFilesBlobStoreModule; +import org.testng.ITestContext; + +import com.google.inject.Module; + +/** + * + * @author Adrian Cole + */ +public class CloudFilesTestInitializer + implements + BaseBlobStoreIntegrationTest.TestInitializer> { + + public BaseBlobStoreIntegrationTest.TestInitializer.Result> init( + Module configurationModule, ITestContext testContext) throws Exception { + String account = System.getProperty("jclouds.test.user"); + String key = System.getProperty("jclouds.test.key"); + if (account != null) + testContext.setAttribute("jclouds.test.user", account); + if (key != null) + testContext.setAttribute("jclouds.test.key", key); + + final CloudFilesContext context; + if (account != null) { + context = createLiveCloudFilesContext(configurationModule, account, key); + } else { + context = createStubCloudFilesContext(); + } + assert context != null; + + final CloudFilesBlobStore client = context.getApi(); + assert client != null; + + final BlobStoreObjectFactory> objectFactory = new BaseBlobStoreIntegrationTest.BlobStoreObjectFactory>() { + + public Blob createBlob(String key) { + return new Blob(key); + + } + + public ContainerMetadata createContainerMetadata(String key) { + return new ContainerMetadata(key); + } + + }; + assert objectFactory != null; + + return new BaseBlobStoreIntegrationTest.TestInitializer.Result>() { + + public CloudFilesBlobStore getClient() { + return client; + } + + public BlobStoreContext> getContext() { + return (BlobStoreContext>) context; + } + + public BlobStoreObjectFactory> getObjectFactory() { + return objectFactory; + } + + }; + } + + protected CloudFilesContext createStubCloudFilesContext() { + return CloudFilesContextBuilder.newBuilder("stub", "stub").withModules( + new StubCloudFilesBlobStoreModule()).buildContext(); + } + + protected CloudFilesContext createLiveCloudFilesContext(Module configurationModule, + String account, String key) { + return buildCloudFilesContextFactory(configurationModule, account, key).buildContext(); + } + + protected CloudFilesContextBuilder buildCloudFilesContextFactory(Module configurationModule, + String account, String key) { + return (CloudFilesContextBuilder) CloudFilesContextBuilder.newBuilder(account, key) + .relaxSSLHostname().withModules(configurationModule, new Log4JLoggingModule()); + } + +} \ No newline at end of file diff --git a/rackspace/cloudfiles/core/src/test/java/org/jclouds/rackspace/cloudfiles/internal/StubCloudFilesBlobStore.java b/rackspace/cloudfiles/core/src/test/java/org/jclouds/rackspace/cloudfiles/internal/StubCloudFilesBlobStore.java new file mode 100644 index 0000000000..1c7d1340db --- /dev/null +++ b/rackspace/cloudfiles/core/src/test/java/org/jclouds/rackspace/cloudfiles/internal/StubCloudFilesBlobStore.java @@ -0,0 +1,88 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.rackspace.cloudfiles.internal; + +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +import org.jclouds.blobstore.domain.Blob; +import org.jclouds.blobstore.domain.BlobMetadata; +import org.jclouds.blobstore.integration.internal.StubBlobStore; +import org.jclouds.rackspace.cloudfiles.CloudFilesBlobStore; +import org.jclouds.rackspace.cloudfiles.domain.AccountMetadata; +import org.jclouds.rackspace.cloudfiles.domain.ContainerMetadata; +import org.jclouds.rackspace.cloudfiles.options.ListContainerOptions; + +import com.google.common.collect.Multimap; + +/** + * Implementation of {@link CloudFilesBlobStore} which keeps all data in a local Map object. + * + * @author Adrian Cole + * @author James Murty + */ +public class StubCloudFilesBlobStore extends + StubBlobStore> implements + CloudFilesBlobStore { + + @Override + protected Blob createBlob(String name) { + return new Blob(name); + } + + @Override + protected Blob createBlob(BlobMetadata metadata) { + return new Blob(metadata); + } + + @Override + protected ContainerMetadata createContainerMetadata(String name) { + return new ContainerMetadata(name); + } + + /** + * note this must be final and static so that tests coming from multiple threads will pass. + */ + private static final Map>> containerToBlobs = new ConcurrentHashMap>>(); + + @Override + public Map>> getContainerToBlobs() { + return containerToBlobs; + } + + public AccountMetadata getAccountMetadata() { + return null; + } + + public List listContainers(ListContainerOptions options) { + return null; + } + + public boolean setObjectMetadata(String container, String key, + Multimap userMetadata) { + return false; + } + +} diff --git a/rackspace/cloudfiles/core/src/test/java/org/jclouds/rackspace/config/StubCloudFilesBlobStoreModule.java b/rackspace/cloudfiles/core/src/test/java/org/jclouds/rackspace/config/StubCloudFilesBlobStoreModule.java new file mode 100644 index 0000000000..afbb0cbfcc --- /dev/null +++ b/rackspace/cloudfiles/core/src/test/java/org/jclouds/rackspace/config/StubCloudFilesBlobStoreModule.java @@ -0,0 +1,47 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.rackspace.config; + +import java.net.URI; + +import org.jclouds.cloud.ConfiguresCloudConnection; +import org.jclouds.rackspace.Authentication; +import org.jclouds.rackspace.cloudfiles.CloudFilesBlobStore; +import org.jclouds.rackspace.cloudfiles.internal.StubCloudFilesBlobStore; + +import com.google.inject.AbstractModule; + +/** + * adds a stub alternative to invoking CloudFiles + * + * @author Adrian Cole + */ +@ConfiguresCloudConnection +public class StubCloudFilesBlobStoreModule extends AbstractModule { + protected void configure() { + bind(CloudFilesBlobStore.class).to(StubCloudFilesBlobStore.class); + bind(URI.class).annotatedWith(Authentication.class).toInstance( + URI.create("http://localhost:8080")); + } +} \ No newline at end of file diff --git a/rackspace/cloudfiles/core/src/test/resources/test_list_container.json b/rackspace/cloudfiles/core/src/test/resources/test_list_container.json new file mode 100644 index 0000000000..61f4eac50b --- /dev/null +++ b/rackspace/cloudfiles/core/src/test/resources/test_list_container.json @@ -0,0 +1,12 @@ +[ +{"name":"test_obj_1", +"hash":"4281c348eaf83e70ddce0e07221c3d28", +"bytes":14, +"content_type":"application\/octet-stream", +"last_modified":"2009-02-03T05:26:32.612278"}, +{"name":"test_obj_2", +"hash":"b039efe731ad111bc1b0ef221c3849d0", +"bytes":64, +"content_type":"application\/octet-stream", +"last_modified":"2009-02-03T05:26:32.612278"} +] diff --git a/rackspace/cloudfiles/pom.xml b/rackspace/cloudfiles/pom.xml index f2d79df41c..4bf21a8caf 100644 --- a/rackspace/cloudfiles/pom.xml +++ b/rackspace/cloudfiles/pom.xml @@ -39,15 +39,18 @@ core + + org.jclouds.rackspace.cloudfiles.integration.CloudFilesTestInitializer + ${project.groupId} - jclouds-keyvaluestore-core + jclouds-blobstore-core ${project.version} ${project.groupId} - jclouds-keyvaluestore-core + jclouds-blobstore-core ${project.version} test-jar test diff --git a/rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/CloudServersConnection.java b/rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/CloudServersConnection.java index 31e6a51adb..47d30572ad 100755 --- a/rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/CloudServersConnection.java +++ b/rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/CloudServersConnection.java @@ -53,17 +53,17 @@ import org.jclouds.rackspace.cloudservers.domain.RebootType; import org.jclouds.rackspace.cloudservers.domain.Server; import org.jclouds.rackspace.cloudservers.domain.SharedIpGroup; import org.jclouds.rackspace.cloudservers.functions.IpAddress; -import org.jclouds.rackspace.cloudservers.functions.ParseAddressesFromGsonResponse; -import org.jclouds.rackspace.cloudservers.functions.ParseBackupScheduleFromGsonResponse; -import org.jclouds.rackspace.cloudservers.functions.ParseFlavorFromGsonResponse; -import org.jclouds.rackspace.cloudservers.functions.ParseFlavorListFromGsonResponse; -import org.jclouds.rackspace.cloudservers.functions.ParseImageFromGsonResponse; -import org.jclouds.rackspace.cloudservers.functions.ParseImageListFromGsonResponse; -import org.jclouds.rackspace.cloudservers.functions.ParseInetAddressListFromGsonResponse; -import org.jclouds.rackspace.cloudservers.functions.ParseServerFromGsonResponse; -import org.jclouds.rackspace.cloudservers.functions.ParseServerListFromGsonResponse; -import org.jclouds.rackspace.cloudservers.functions.ParseSharedIpGroupFromGsonResponse; -import org.jclouds.rackspace.cloudservers.functions.ParseSharedIpGroupListFromGsonResponse; +import org.jclouds.rackspace.cloudservers.functions.ParseAddressesFromJsonResponse; +import org.jclouds.rackspace.cloudservers.functions.ParseBackupScheduleFromJsonResponse; +import org.jclouds.rackspace.cloudservers.functions.ParseFlavorFromJsonResponse; +import org.jclouds.rackspace.cloudservers.functions.ParseFlavorListFromJsonResponse; +import org.jclouds.rackspace.cloudservers.functions.ParseImageFromJsonResponse; +import org.jclouds.rackspace.cloudservers.functions.ParseImageListFromJsonResponse; +import org.jclouds.rackspace.cloudservers.functions.ParseInetAddressListFromJsonResponse; +import org.jclouds.rackspace.cloudservers.functions.ParseServerFromJsonResponse; +import org.jclouds.rackspace.cloudservers.functions.ParseServerListFromJsonResponse; +import org.jclouds.rackspace.cloudservers.functions.ParseSharedIpGroupFromJsonResponse; +import org.jclouds.rackspace.cloudservers.functions.ParseSharedIpGroupListFromJsonResponse; import org.jclouds.rackspace.cloudservers.functions.ReturnFlavorNotFoundOn404; import org.jclouds.rackspace.cloudservers.functions.ReturnImageNotFoundOn404; import org.jclouds.rackspace.cloudservers.functions.ReturnServerNotFoundOn404; @@ -78,7 +78,7 @@ import org.jclouds.rest.ExceptionParser; import org.jclouds.rest.MapBinder; import org.jclouds.rest.MapEntityParam; import org.jclouds.rest.ParamParser; -import org.jclouds.rest.Query; +import org.jclouds.rest.QueryParams; import org.jclouds.rest.RequestFilters; import org.jclouds.rest.ResponseParser; import org.jclouds.rest.SkipEncoding; @@ -107,8 +107,8 @@ public interface CloudServersConnection { * withDetails()} */ @GET - @ResponseParser(ParseServerListFromGsonResponse.class) - @Query(key = "format", value = "json") + @ResponseParser(ParseServerListFromJsonResponse.class) + @QueryParams(keys = "format", values = "json") @Path("/servers") // TODO: Error Response Code(s): cloudServersFault (400, 500), serviceUnavailable (503), // unauthorized (401), badRequest (400), overLimit (413) @@ -122,8 +122,8 @@ public interface CloudServersConnection { * @see Server */ @GET - @ResponseParser(ParseServerFromGsonResponse.class) - @Query(key = "format", value = "json") + @ResponseParser(ParseServerFromJsonResponse.class) + @QueryParams(keys = "format", values = "json") @ExceptionParser(ReturnServerNotFoundOn404.class) @Path("/servers/{id}") // TODO: cloudServersFault (400, 500), serviceUnavailable (503), unauthorized (401), badRequest @@ -161,7 +161,7 @@ public interface CloudServersConnection { * the server. */ @POST - @Query(key = "format", value = "json") + @QueryParams(keys = "format", values = "json") @Path("/servers/{id}/action") @ExceptionParser(ReturnFalseOn404.class) // TODO:cloudServersFault (400, 500), serviceUnavailable (503), unauthorized (401), badRequest @@ -183,7 +183,7 @@ public interface CloudServersConnection { * ACTIVE - QUEUE_RESIZE - ACTIVE (on error) */ @POST - @Query(key = "format", value = "json") + @QueryParams(keys = "format", values = "json") @Path("/servers/{id}/action") @ExceptionParser(ReturnFalseOn404.class) // TODO:cloudServersFault (400, 500), serviceUnavailable (503), unauthorized (401), badRequest @@ -203,7 +203,7 @@ public interface CloudServersConnection { * VERIFY_RESIZE - ACTIVE */ @POST - @Query(key = "format", value = "json") + @QueryParams(keys = "format", values = "json") @Path("/servers/{id}/action") @ExceptionParser(ReturnFalseOn404.class) // TODO:cloudServersFault (400, 500), serviceUnavailable (503), unauthorized (401), badRequest @@ -223,7 +223,7 @@ public interface CloudServersConnection { * VERIFY_RESIZE - ACTIVE */ @POST - @Query(key = "format", value = "json") + @QueryParams(keys = "format", values = "json") @Path("/servers/{id}/action") @ExceptionParser(ReturnFalseOn404.class) // TODO:cloudServersFault (400, 500), serviceUnavailable (503), unauthorized (401), badRequest @@ -243,8 +243,8 @@ public interface CloudServersConnection { * - used to specify extra files, metadata, or ip parameters during server creation. */ @POST - @ResponseParser(ParseServerFromGsonResponse.class) - @Query(key = "format", value = "json") + @ResponseParser(ParseServerFromJsonResponse.class) + @QueryParams(keys = "format", values = "json") @Path("/servers") @MapBinder(CreateServerOptions.class) // TODO:cloudServersFault (400, 500), serviceUnavailable (503), unauthorized (401), @@ -268,7 +268,7 @@ public interface CloudServersConnection { * with the original imageId. */ @POST - @Query(key = "format", value = "json") + @QueryParams(keys = "format", values = "json") @Path("/servers/{id}/action") @ExceptionParser(ReturnFalseOn404.class) @MapBinder(RebuildServerOptions.class) @@ -367,8 +367,8 @@ public interface CloudServersConnection { * withDetails()} */ @GET - @ResponseParser(ParseFlavorListFromGsonResponse.class) - @Query(key = "format", value = "json") + @ResponseParser(ParseFlavorListFromJsonResponse.class) + @QueryParams(keys = "format", values = "json") @Path("/flavors") // TODO: cloudServersFault (400, 500), serviceUnavailable (503), unauthorized (401), badRequest // (400) @@ -382,8 +382,8 @@ public interface CloudServersConnection { * @see Flavor */ @GET - @ResponseParser(ParseFlavorFromGsonResponse.class) - @Query(key = "format", value = "json") + @ResponseParser(ParseFlavorFromJsonResponse.class) + @QueryParams(keys = "format", values = "json") @ExceptionParser(ReturnFlavorNotFoundOn404.class) @Path("/flavors/{id}") // TODO: cloudServersFault (400, 500), serviceUnavailable (503), unauthorized (401), badRequest @@ -398,8 +398,8 @@ public interface CloudServersConnection { * withDetails()} */ @GET - @ResponseParser(ParseImageListFromGsonResponse.class) - @Query(key = "format", value = "json") + @ResponseParser(ParseImageListFromJsonResponse.class) + @QueryParams(keys = "format", values = "json") @Path("/images") // TODO: cloudServersFault (400, 500), serviceUnavailable (503), unauthorized (401), badRequest // (400) @@ -413,8 +413,8 @@ public interface CloudServersConnection { * @see Image */ @GET - @ResponseParser(ParseImageFromGsonResponse.class) - @Query(key = "format", value = "json") + @ResponseParser(ParseImageFromJsonResponse.class) + @QueryParams(keys = "format", values = "json") @ExceptionParser(ReturnImageNotFoundOn404.class) @Path("/images/{id}") // TODO: cloudServersFault (400, 500), serviceUnavailable (503), unauthorized (401), badRequest @@ -441,8 +441,8 @@ public interface CloudServersConnection { * @see Image */ @POST - @ResponseParser(ParseImageFromGsonResponse.class) - @Query(key = "format", value = "json") + @ResponseParser(ParseImageFromJsonResponse.class) + @QueryParams(keys = "format", values = "json") @ExceptionParser(ReturnImageNotFoundOn404.class) @MapBinder(CreateImageBinder.class) @Path("/images") @@ -460,8 +460,8 @@ public interface CloudServersConnection { * withDetails()} */ @GET - @ResponseParser(ParseSharedIpGroupListFromGsonResponse.class) - @Query(key = "format", value = "json") + @ResponseParser(ParseSharedIpGroupListFromJsonResponse.class) + @QueryParams(keys = "format", values = "json") @Path("/shared_ip_groups") // TODO: cloudServersFault (400, 500), serviceUnavailable (503), unauthorized (401), badRequest // (400) @@ -475,8 +475,8 @@ public interface CloudServersConnection { * @see SharedIpGroup */ @GET - @ResponseParser(ParseSharedIpGroupFromGsonResponse.class) - @Query(key = "format", value = "json") + @ResponseParser(ParseSharedIpGroupFromJsonResponse.class) + @QueryParams(keys = "format", values = "json") @ExceptionParser(ReturnSharedIpGroupNotFoundOn404.class) @Path("/shared_ip_groups/{id}") // TODO: cloudServersFault (400, 500), serviceUnavailable (503), unauthorized (401), badRequest @@ -490,8 +490,8 @@ public interface CloudServersConnection { * {@link CreateSharedIpGroupOptions} to specify an server. */ @POST - @ResponseParser(ParseSharedIpGroupFromGsonResponse.class) - @Query(key = "format", value = "json") + @ResponseParser(ParseSharedIpGroupFromJsonResponse.class) + @QueryParams(keys = "format", values = "json") @Path("/shared_ip_groups") @MapBinder(CreateSharedIpGroupOptions.class) // TODO: cloudSharedIpGroupsFault (400, 500), serviceUnavailable (503), unauthorized (401), @@ -518,8 +518,8 @@ public interface CloudServersConnection { * List the backup schedule for the specified server */ @GET - @ResponseParser(ParseBackupScheduleFromGsonResponse.class) - @Query(key = "format", value = "json") + @ResponseParser(ParseBackupScheduleFromJsonResponse.class) + @QueryParams(keys = "format", values = "json") @Path("/servers/{id}/backup_schedule") // TODO: cloudServersFault (400, 500), serviceUnavailable (503), unauthorized (401), badRequest // (400), itemNotFound (404) @@ -557,8 +557,8 @@ public interface CloudServersConnection { * List all server addresses */ @GET - @ResponseParser(ParseAddressesFromGsonResponse.class) - @Query(key = "format", value = "json") + @ResponseParser(ParseAddressesFromJsonResponse.class) + @QueryParams(keys = "format", values = "json") @Path("/servers/{id}/ips") // TODO: cloudServersFault (400, 500), serviceUnavailable (503), unauthorized (401), badRequest // (400), overLimit (413) @@ -568,8 +568,8 @@ public interface CloudServersConnection { * List all public server addresses */ @GET - @ResponseParser(ParseInetAddressListFromGsonResponse.class) - @Query(key = "format", value = "json") + @ResponseParser(ParseInetAddressListFromJsonResponse.class) + @QueryParams(keys = "format", values = "json") @Path("/servers/{id}/ips/public") // TODO: cloudServersFault (400, 500), serviceUnavailable (503), unauthorized (401), badRequest // (400), overLimit (413) @@ -579,8 +579,8 @@ public interface CloudServersConnection { * List all private server addresses */ @GET - @ResponseParser(ParseInetAddressListFromGsonResponse.class) - @Query(key = "format", value = "json") + @ResponseParser(ParseInetAddressListFromJsonResponse.class) + @QueryParams(keys = "format", values = "json") @Path("/servers/{id}/ips/private") // TODO: cloudServersFault (400, 500), serviceUnavailable (503), unauthorized (401), badRequest // (400), overLimit (413) diff --git a/rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/CloudServersContextBuilder.java b/rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/CloudServersContextBuilder.java index 9e024035b6..02394d4f6c 100755 --- a/rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/CloudServersContextBuilder.java +++ b/rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/CloudServersContextBuilder.java @@ -48,7 +48,7 @@ import com.google.inject.Module; * @see CloudServersContext */ public class CloudServersContextBuilder extends - RackspaceContextBuilder { + RackspaceContextBuilder { public CloudServersContextBuilder(Properties props) { super(props); diff --git a/rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/functions/ParseAddressesFromGsonResponse.java b/rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/functions/ParseAddressesFromJsonResponse.java similarity index 94% rename from rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/functions/ParseAddressesFromGsonResponse.java rename to rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/functions/ParseAddressesFromJsonResponse.java index 931b691170..f561dce407 100644 --- a/rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/functions/ParseAddressesFromGsonResponse.java +++ b/rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/functions/ParseAddressesFromJsonResponse.java @@ -38,10 +38,10 @@ import com.google.inject.Inject; * * @author Adrian Cole */ -public class ParseAddressesFromGsonResponse extends ParseJson { +public class ParseAddressesFromJsonResponse extends ParseJson { @Inject - public ParseAddressesFromGsonResponse(Gson gson) { + public ParseAddressesFromJsonResponse(Gson gson) { super(gson); } diff --git a/rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/functions/ParseBackupScheduleFromGsonResponse.java b/rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/functions/ParseBackupScheduleFromJsonResponse.java similarity index 94% rename from rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/functions/ParseBackupScheduleFromGsonResponse.java rename to rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/functions/ParseBackupScheduleFromJsonResponse.java index 2ec0bab893..7700c4bf13 100644 --- a/rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/functions/ParseBackupScheduleFromGsonResponse.java +++ b/rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/functions/ParseBackupScheduleFromJsonResponse.java @@ -38,10 +38,10 @@ import com.google.inject.Inject; * * @author Adrian Cole */ -public class ParseBackupScheduleFromGsonResponse extends ParseJson { +public class ParseBackupScheduleFromJsonResponse extends ParseJson { @Inject - public ParseBackupScheduleFromGsonResponse(Gson gson) { + public ParseBackupScheduleFromJsonResponse(Gson gson) { super(gson); } diff --git a/rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/functions/ParseFlavorFromGsonResponse.java b/rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/functions/ParseFlavorFromJsonResponse.java similarity index 94% rename from rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/functions/ParseFlavorFromGsonResponse.java rename to rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/functions/ParseFlavorFromJsonResponse.java index bcff42bd92..8ca9d0ef23 100644 --- a/rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/functions/ParseFlavorFromGsonResponse.java +++ b/rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/functions/ParseFlavorFromJsonResponse.java @@ -38,10 +38,10 @@ import com.google.inject.Inject; * * @author Adrian Cole */ -public class ParseFlavorFromGsonResponse extends ParseJson { +public class ParseFlavorFromJsonResponse extends ParseJson { @Inject - public ParseFlavorFromGsonResponse(Gson gson) { + public ParseFlavorFromJsonResponse(Gson gson) { super(gson); } diff --git a/rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/functions/ParseFlavorListFromGsonResponse.java b/rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/functions/ParseFlavorListFromJsonResponse.java similarity index 94% rename from rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/functions/ParseFlavorListFromGsonResponse.java rename to rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/functions/ParseFlavorListFromJsonResponse.java index df7ebb7f15..30e0a64672 100644 --- a/rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/functions/ParseFlavorListFromGsonResponse.java +++ b/rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/functions/ParseFlavorListFromJsonResponse.java @@ -40,10 +40,10 @@ import com.google.inject.internal.Lists; * * @author Adrian Cole */ -public class ParseFlavorListFromGsonResponse extends ParseJson> { +public class ParseFlavorListFromJsonResponse extends ParseJson> { @Inject - public ParseFlavorListFromGsonResponse(Gson gson) { + public ParseFlavorListFromJsonResponse(Gson gson) { super(gson); } diff --git a/rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/functions/ParseImageFromGsonResponse.java b/rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/functions/ParseImageFromJsonResponse.java similarity index 94% rename from rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/functions/ParseImageFromGsonResponse.java rename to rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/functions/ParseImageFromJsonResponse.java index 26a788e6a0..9c6a55e5cd 100644 --- a/rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/functions/ParseImageFromGsonResponse.java +++ b/rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/functions/ParseImageFromJsonResponse.java @@ -38,10 +38,10 @@ import com.google.inject.Inject; * * @author Adrian Cole */ -public class ParseImageFromGsonResponse extends ParseJson { +public class ParseImageFromJsonResponse extends ParseJson { @Inject - public ParseImageFromGsonResponse(Gson gson) { + public ParseImageFromJsonResponse(Gson gson) { super(gson); } diff --git a/rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/functions/ParseImageListFromGsonResponse.java b/rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/functions/ParseImageListFromJsonResponse.java similarity index 94% rename from rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/functions/ParseImageListFromGsonResponse.java rename to rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/functions/ParseImageListFromJsonResponse.java index 3832462033..a28f341246 100644 --- a/rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/functions/ParseImageListFromGsonResponse.java +++ b/rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/functions/ParseImageListFromJsonResponse.java @@ -40,10 +40,10 @@ import com.google.inject.internal.Lists; * * @author Adrian Cole */ -public class ParseImageListFromGsonResponse extends ParseJson> { +public class ParseImageListFromJsonResponse extends ParseJson> { @Inject - public ParseImageListFromGsonResponse(Gson gson) { + public ParseImageListFromJsonResponse(Gson gson) { super(gson); } diff --git a/rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/functions/ParseInetAddressListFromGsonResponse.java b/rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/functions/ParseInetAddressListFromJsonResponse.java similarity index 94% rename from rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/functions/ParseInetAddressListFromGsonResponse.java rename to rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/functions/ParseInetAddressListFromJsonResponse.java index d27e070912..b2d17cde78 100644 --- a/rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/functions/ParseInetAddressListFromGsonResponse.java +++ b/rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/functions/ParseInetAddressListFromJsonResponse.java @@ -42,10 +42,10 @@ import com.google.inject.Inject; * * @author Adrian Cole */ -public class ParseInetAddressListFromGsonResponse extends ParseJson> { +public class ParseInetAddressListFromJsonResponse extends ParseJson> { @Inject - public ParseInetAddressListFromGsonResponse(Gson gson) { + public ParseInetAddressListFromJsonResponse(Gson gson) { super(gson); } diff --git a/rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/functions/ParseServerFromGsonResponse.java b/rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/functions/ParseServerFromJsonResponse.java similarity index 94% rename from rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/functions/ParseServerFromGsonResponse.java rename to rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/functions/ParseServerFromJsonResponse.java index 1419eb2496..f8900fcee3 100644 --- a/rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/functions/ParseServerFromGsonResponse.java +++ b/rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/functions/ParseServerFromJsonResponse.java @@ -38,10 +38,10 @@ import com.google.inject.Inject; * * @author Adrian Cole */ -public class ParseServerFromGsonResponse extends ParseJson { +public class ParseServerFromJsonResponse extends ParseJson { @Inject - public ParseServerFromGsonResponse(Gson gson) { + public ParseServerFromJsonResponse(Gson gson) { super(gson); } diff --git a/rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/functions/ParseServerListFromGsonResponse.java b/rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/functions/ParseServerListFromJsonResponse.java similarity index 94% rename from rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/functions/ParseServerListFromGsonResponse.java rename to rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/functions/ParseServerListFromJsonResponse.java index 92481a14af..4748eac44e 100755 --- a/rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/functions/ParseServerListFromGsonResponse.java +++ b/rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/functions/ParseServerListFromJsonResponse.java @@ -40,10 +40,10 @@ import com.google.inject.internal.Lists; * * @author Adrian Cole */ -public class ParseServerListFromGsonResponse extends ParseJson> { +public class ParseServerListFromJsonResponse extends ParseJson> { @Inject - public ParseServerListFromGsonResponse(Gson gson) { + public ParseServerListFromJsonResponse(Gson gson) { super(gson); } diff --git a/rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/functions/ParseSharedIpGroupFromGsonResponse.java b/rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/functions/ParseSharedIpGroupFromJsonResponse.java similarity index 94% rename from rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/functions/ParseSharedIpGroupFromGsonResponse.java rename to rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/functions/ParseSharedIpGroupFromJsonResponse.java index 98b026656d..1f81381aa3 100644 --- a/rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/functions/ParseSharedIpGroupFromGsonResponse.java +++ b/rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/functions/ParseSharedIpGroupFromJsonResponse.java @@ -38,10 +38,10 @@ import com.google.inject.Inject; * * @author Adrian Cole */ -public class ParseSharedIpGroupFromGsonResponse extends ParseJson { +public class ParseSharedIpGroupFromJsonResponse extends ParseJson { @Inject - public ParseSharedIpGroupFromGsonResponse(Gson gson) { + public ParseSharedIpGroupFromJsonResponse(Gson gson) { super(gson); } diff --git a/rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/functions/ParseSharedIpGroupListFromGsonResponse.java b/rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/functions/ParseSharedIpGroupListFromJsonResponse.java similarity index 94% rename from rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/functions/ParseSharedIpGroupListFromGsonResponse.java rename to rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/functions/ParseSharedIpGroupListFromJsonResponse.java index 89996e0d96..fc1ef9e6f6 100644 --- a/rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/functions/ParseSharedIpGroupListFromGsonResponse.java +++ b/rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/functions/ParseSharedIpGroupListFromJsonResponse.java @@ -40,10 +40,10 @@ import com.google.inject.internal.Lists; * * @author Adrian Cole */ -public class ParseSharedIpGroupListFromGsonResponse extends ParseJson> { +public class ParseSharedIpGroupListFromJsonResponse extends ParseJson> { @Inject - public ParseSharedIpGroupListFromGsonResponse(Gson gson) { + public ParseSharedIpGroupListFromJsonResponse(Gson gson) { super(gson); } diff --git a/rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/internal/GuiceCloudServersContext.java b/rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/internal/GuiceCloudServersContext.java index b8f7c13a65..f5ab32aad3 100755 --- a/rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/internal/GuiceCloudServersContext.java +++ b/rackspace/cloudservers/core/src/main/java/org/jclouds/rackspace/cloudservers/internal/GuiceCloudServersContext.java @@ -24,16 +24,20 @@ package org.jclouds.rackspace.cloudservers.internal; import java.io.IOException; +import java.net.URI; import javax.annotation.Resource; import org.jclouds.lifecycle.Closer; import org.jclouds.logging.Logger; +import org.jclouds.rackspace.Authentication; import org.jclouds.rackspace.cloudservers.CloudServersConnection; import org.jclouds.rackspace.cloudservers.CloudServersContext; +import org.jclouds.rackspace.reference.RackspaceConstants; import com.google.inject.Inject; import com.google.inject.Injector; +import com.google.inject.name.Named; /** * Uses a Guice Injector to configure the objects served by CloudServersContext methods. @@ -47,20 +51,18 @@ public class GuiceCloudServersContext implements CloudServersContext { private Logger logger = Logger.NULL; private final Injector injector; private final Closer closer; - + private final URI endPoint; + private final String account; + @Inject - private GuiceCloudServersContext(Injector injector, Closer closer) { + private GuiceCloudServersContext(Injector injector, Closer closer,@Authentication URI endPoint, + @Named(RackspaceConstants.PROPERTY_RACKSPACE_USER) String account) { this.injector = injector; this.closer = closer; + this.endPoint = endPoint; + this.account = account; } - - /** - * {@inheritDoc} - */ - public CloudServersConnection getConnection() { - return injector.getInstance(CloudServersConnection.class); - } - + /** * {@inheritDoc} * @@ -74,4 +76,17 @@ public class GuiceCloudServersContext implements CloudServersContext { } } + + public String getAccount() { + return account; + } + + public CloudServersConnection getApi() { + return injector.getInstance(CloudServersConnection.class); + } + + public URI getEndPoint() { + return endPoint; + } + } diff --git a/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/CloudServersConnectionLiveTest.java b/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/CloudServersConnectionLiveTest.java index 5f3b90f815..48f78ee4d6 100755 --- a/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/CloudServersConnectionLiveTest.java +++ b/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/CloudServersConnectionLiveTest.java @@ -27,8 +27,6 @@ import static org.jclouds.rackspace.cloudservers.options.CreateServerOptions.Bui import static org.jclouds.rackspace.cloudservers.options.CreateSharedIpGroupOptions.Builder.withServer; import static org.jclouds.rackspace.cloudservers.options.ListOptions.Builder.withDetails; import static org.jclouds.rackspace.cloudservers.options.RebuildServerOptions.Builder.withImage; -import static org.jclouds.rackspace.reference.RackspaceConstants.PROPERTY_RACKSPACE_KEY; -import static org.jclouds.rackspace.reference.RackspaceConstants.PROPERTY_RACKSPACE_USER; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertTrue; @@ -72,16 +70,17 @@ import com.google.inject.Injector; @Test(groups = "live", sequential = true, testName = "cloudservers.CloudServersConnectionLiveTest") public class CloudServersConnectionLiveTest { - protected static final String sysRackspaceUser = System.getProperty(PROPERTY_RACKSPACE_USER); - protected static final String sysRackspaceKey = System.getProperty(PROPERTY_RACKSPACE_KEY); protected CloudServersConnection connection; protected SshConnection.Factory sshFactory; @BeforeGroups(groups = { "live" }) public void setupConnection() { - Injector injector = CloudServersContextBuilder.newBuilder(sysRackspaceUser, sysRackspaceKey) - .withModules(new Log4JLoggingModule(), new JschSshConnectionModule()) - .withJsonDebug().buildInjector(); + String account = System.getProperty("jclouds.test.user"); + String key = System.getProperty("jclouds.test.key"); + + Injector injector = CloudServersContextBuilder.newBuilder(account, key).withModules( + new Log4JLoggingModule(), new JschSshConnectionModule()).withJsonDebug() + .buildInjector(); connection = injector.getInstance(CloudServersConnection.class); sshFactory = injector.getInstance(SshConnection.Factory.class); diff --git a/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/CloudServersConnectionTest.java b/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/CloudServersConnectionTest.java index 3752ea4beb..a07ed8bfd8 100755 --- a/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/CloudServersConnectionTest.java +++ b/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/CloudServersConnectionTest.java @@ -54,17 +54,17 @@ import org.jclouds.rackspace.cloudservers.domain.BackupSchedule; import org.jclouds.rackspace.cloudservers.domain.DailyBackup; import org.jclouds.rackspace.cloudservers.domain.RebootType; import org.jclouds.rackspace.cloudservers.domain.WeeklyBackup; -import org.jclouds.rackspace.cloudservers.functions.ParseAddressesFromGsonResponse; -import org.jclouds.rackspace.cloudservers.functions.ParseBackupScheduleFromGsonResponse; -import org.jclouds.rackspace.cloudservers.functions.ParseFlavorFromGsonResponse; -import org.jclouds.rackspace.cloudservers.functions.ParseFlavorListFromGsonResponse; -import org.jclouds.rackspace.cloudservers.functions.ParseImageFromGsonResponse; -import org.jclouds.rackspace.cloudservers.functions.ParseImageListFromGsonResponse; -import org.jclouds.rackspace.cloudservers.functions.ParseInetAddressListFromGsonResponse; -import org.jclouds.rackspace.cloudservers.functions.ParseServerFromGsonResponse; -import org.jclouds.rackspace.cloudservers.functions.ParseServerListFromGsonResponse; -import org.jclouds.rackspace.cloudservers.functions.ParseSharedIpGroupFromGsonResponse; -import org.jclouds.rackspace.cloudservers.functions.ParseSharedIpGroupListFromGsonResponse; +import org.jclouds.rackspace.cloudservers.functions.ParseAddressesFromJsonResponse; +import org.jclouds.rackspace.cloudservers.functions.ParseBackupScheduleFromJsonResponse; +import org.jclouds.rackspace.cloudservers.functions.ParseFlavorFromJsonResponse; +import org.jclouds.rackspace.cloudservers.functions.ParseFlavorListFromJsonResponse; +import org.jclouds.rackspace.cloudservers.functions.ParseImageFromJsonResponse; +import org.jclouds.rackspace.cloudservers.functions.ParseImageListFromJsonResponse; +import org.jclouds.rackspace.cloudservers.functions.ParseInetAddressListFromJsonResponse; +import org.jclouds.rackspace.cloudservers.functions.ParseServerFromJsonResponse; +import org.jclouds.rackspace.cloudservers.functions.ParseServerListFromJsonResponse; +import org.jclouds.rackspace.cloudservers.functions.ParseSharedIpGroupFromJsonResponse; +import org.jclouds.rackspace.cloudservers.functions.ParseSharedIpGroupListFromJsonResponse; import org.jclouds.rackspace.cloudservers.functions.ReturnFlavorNotFoundOn404; import org.jclouds.rackspace.cloudservers.functions.ReturnImageNotFoundOn404; import org.jclouds.rackspace.cloudservers.functions.ReturnServerNotFoundOn404; @@ -175,7 +175,7 @@ public class CloudServersConnectionTest { assertEquals(httpMethod.getHeaders().get(HttpHeaders.CONTENT_TYPE), Collections .singletonList(MediaType.APPLICATION_JSON)); assertEquals(processor.createResponseParser(method).getClass(), - ParseServerFromGsonResponse.class); + ParseServerFromJsonResponse.class); assertEquals(processor.createExceptionParserOrNullIfNotFound(method), null); assertNotNull(processor.getMapEntityBinderOrNull(method, new Object[] { "", 1, 2, new CreateServerOptions[] { CreateServerOptions.Builder.withSharedIpGroup(1) } })); @@ -192,7 +192,7 @@ public class CloudServersConnectionTest { assertEquals(httpMethod.getMethod(), HttpMethod.GET); assertEquals(httpMethod.getHeaders().size(), 0); assertEquals(processor.createResponseParser(method).getClass(), - ParseServerListFromGsonResponse.class); + ParseServerListFromJsonResponse.class); assertEquals(processor.createExceptionParserOrNullIfNotFound(method), null); } @@ -211,7 +211,7 @@ public class CloudServersConnectionTest { assertEquals(httpMethod.getMethod(), HttpMethod.GET); assertEquals(httpMethod.getHeaders().size(), 0); assertEquals(processor.createResponseParser(method).getClass(), - ParseServerListFromGsonResponse.class); + ParseServerListFromJsonResponse.class); assertEquals(processor.createExceptionParserOrNullIfNotFound(method), null); } @@ -227,7 +227,7 @@ public class CloudServersConnectionTest { assertEquals(httpMethod.getMethod(), HttpMethod.GET); assertEquals(httpMethod.getHeaders().size(), 0); assertEquals(processor.createResponseParser(method).getClass(), - ParseServerListFromGsonResponse.class); + ParseServerListFromJsonResponse.class); assertEquals(processor.createExceptionParserOrNullIfNotFound(method), null); } @@ -241,7 +241,7 @@ public class CloudServersConnectionTest { assertEquals(httpMethod.getMethod(), HttpMethod.GET); assertEquals(httpMethod.getHeaders().size(), 0); assertEquals(processor.createResponseParser(method).getClass(), - ParseServerFromGsonResponse.class); + ParseServerFromJsonResponse.class); assertEquals(processor.createExceptionParserOrNullIfNotFound(method).getClass(), ReturnServerNotFoundOn404.class); } @@ -257,7 +257,7 @@ public class CloudServersConnectionTest { assertEquals(httpMethod.getMethod(), HttpMethod.GET); assertEquals(httpMethod.getHeaders().size(), 0); assertEquals(processor.createResponseParser(method).getClass(), - ParseFlavorListFromGsonResponse.class); + ParseFlavorListFromJsonResponse.class); assertEquals(processor.createExceptionParserOrNullIfNotFound(method), null); } @@ -274,7 +274,7 @@ public class CloudServersConnectionTest { assertEquals(httpMethod.getMethod(), HttpMethod.GET); assertEquals(httpMethod.getHeaders().size(), 0); assertEquals(processor.createResponseParser(method).getClass(), - ParseFlavorListFromGsonResponse.class); + ParseFlavorListFromJsonResponse.class); assertEquals(processor.createExceptionParserOrNullIfNotFound(method), null); } @@ -290,7 +290,7 @@ public class CloudServersConnectionTest { assertEquals(httpMethod.getMethod(), HttpMethod.GET); assertEquals(httpMethod.getHeaders().size(), 0); assertEquals(processor.createResponseParser(method).getClass(), - ParseFlavorListFromGsonResponse.class); + ParseFlavorListFromJsonResponse.class); assertEquals(processor.createExceptionParserOrNullIfNotFound(method), null); } @@ -307,7 +307,7 @@ public class CloudServersConnectionTest { assertEquals(httpMethod.getMethod(), HttpMethod.GET); assertEquals(httpMethod.getHeaders().size(), 0); assertEquals(processor.createResponseParser(method).getClass(), - ParseFlavorListFromGsonResponse.class); + ParseFlavorListFromJsonResponse.class); assertEquals(processor.createExceptionParserOrNullIfNotFound(method), null); } @@ -321,7 +321,7 @@ public class CloudServersConnectionTest { assertEquals(httpMethod.getMethod(), HttpMethod.GET); assertEquals(httpMethod.getHeaders().size(), 0); assertEquals(processor.createResponseParser(method).getClass(), - ParseFlavorFromGsonResponse.class); + ParseFlavorFromJsonResponse.class); assertEquals(processor.createExceptionParserOrNullIfNotFound(method).getClass(), ReturnFlavorNotFoundOn404.class); } @@ -336,7 +336,7 @@ public class CloudServersConnectionTest { assertEquals(httpMethod.getMethod(), HttpMethod.GET); assertEquals(httpMethod.getHeaders().size(), 0); assertEquals(processor.createResponseParser(method).getClass(), - ParseImageListFromGsonResponse.class); + ParseImageListFromJsonResponse.class); assertEquals(processor.createExceptionParserOrNullIfNotFound(method), null); } @@ -351,7 +351,7 @@ public class CloudServersConnectionTest { assertEquals(httpMethod.getMethod(), HttpMethod.GET); assertEquals(httpMethod.getHeaders().size(), 0); assertEquals(processor.createResponseParser(method).getClass(), - ParseImageListFromGsonResponse.class); + ParseImageListFromJsonResponse.class); assertEquals(processor.createExceptionParserOrNullIfNotFound(method), null); } @@ -367,7 +367,7 @@ public class CloudServersConnectionTest { assertEquals(httpMethod.getMethod(), HttpMethod.GET); assertEquals(httpMethod.getHeaders().size(), 0); assertEquals(processor.createResponseParser(method).getClass(), - ParseImageListFromGsonResponse.class); + ParseImageListFromJsonResponse.class); assertEquals(processor.createExceptionParserOrNullIfNotFound(method), null); } @@ -383,7 +383,7 @@ public class CloudServersConnectionTest { assertEquals(httpMethod.getMethod(), HttpMethod.GET); assertEquals(httpMethod.getHeaders().size(), 0); assertEquals(processor.createResponseParser(method).getClass(), - ParseImageListFromGsonResponse.class); + ParseImageListFromJsonResponse.class); assertEquals(processor.createExceptionParserOrNullIfNotFound(method), null); } @@ -397,7 +397,7 @@ public class CloudServersConnectionTest { assertEquals(httpMethod.getMethod(), HttpMethod.GET); assertEquals(httpMethod.getHeaders().size(), 0); assertEquals(processor.createResponseParser(method).getClass(), - ParseImageFromGsonResponse.class); + ParseImageFromJsonResponse.class); assertEquals(processor.createExceptionParserOrNullIfNotFound(method).getClass(), ReturnImageNotFoundOn404.class); } @@ -558,7 +558,7 @@ public class CloudServersConnectionTest { assertEquals(httpMethod.getMethod(), HttpMethod.GET); assertEquals(httpMethod.getHeaders().size(), 0); assertEquals(processor.createResponseParser(method).getClass(), - ParseSharedIpGroupListFromGsonResponse.class); + ParseSharedIpGroupListFromJsonResponse.class); assertEquals(processor.createExceptionParserOrNullIfNotFound(method), null); } @@ -575,7 +575,7 @@ public class CloudServersConnectionTest { assertEquals(httpMethod.getMethod(), HttpMethod.GET); assertEquals(httpMethod.getHeaders().size(), 0); assertEquals(processor.createResponseParser(method).getClass(), - ParseSharedIpGroupListFromGsonResponse.class); + ParseSharedIpGroupListFromJsonResponse.class); assertEquals(processor.createExceptionParserOrNullIfNotFound(method), null); } @@ -591,7 +591,7 @@ public class CloudServersConnectionTest { assertEquals(httpMethod.getMethod(), HttpMethod.GET); assertEquals(httpMethod.getHeaders().size(), 0); assertEquals(processor.createResponseParser(method).getClass(), - ParseSharedIpGroupListFromGsonResponse.class); + ParseSharedIpGroupListFromJsonResponse.class); assertEquals(processor.createExceptionParserOrNullIfNotFound(method), null); } @@ -609,7 +609,7 @@ public class CloudServersConnectionTest { assertEquals(httpMethod.getMethod(), HttpMethod.GET); assertEquals(httpMethod.getHeaders().size(), 0); assertEquals(processor.createResponseParser(method).getClass(), - ParseSharedIpGroupListFromGsonResponse.class); + ParseSharedIpGroupListFromJsonResponse.class); assertEquals(processor.createExceptionParserOrNullIfNotFound(method), null); } @@ -623,7 +623,7 @@ public class CloudServersConnectionTest { assertEquals(httpMethod.getMethod(), HttpMethod.GET); assertEquals(httpMethod.getHeaders().size(), 0); assertEquals(processor.createResponseParser(method).getClass(), - ParseSharedIpGroupFromGsonResponse.class); + ParseSharedIpGroupFromJsonResponse.class); assertEquals(processor.createExceptionParserOrNullIfNotFound(method).getClass(), ReturnSharedIpGroupNotFoundOn404.class); } @@ -663,7 +663,7 @@ public class CloudServersConnectionTest { assertEquals(httpMethod.getHeaders().get(HttpHeaders.CONTENT_TYPE), Collections .singletonList(MediaType.APPLICATION_JSON)); assertEquals(processor.createResponseParser(method).getClass(), - ParseSharedIpGroupFromGsonResponse.class); + ParseSharedIpGroupFromJsonResponse.class); assertEquals(processor.createExceptionParserOrNullIfNotFound(method), null); assertNotNull(processor.getMapEntityBinderOrNull(method, new Object[] { "", new CreateSharedIpGroupOptions[] { withServer(2) } })); @@ -692,7 +692,7 @@ public class CloudServersConnectionTest { assertEquals(httpMethod.getMethod(), HttpMethod.GET); assertEquals(httpMethod.getHeaders().size(), 0); assertEquals(processor.createResponseParser(method).getClass(), - ParseAddressesFromGsonResponse.class); + ParseAddressesFromJsonResponse.class); } public void testListPublicAddresses() throws SecurityException, NoSuchMethodException { @@ -705,7 +705,7 @@ public class CloudServersConnectionTest { assertEquals(httpMethod.getMethod(), HttpMethod.GET); assertEquals(httpMethod.getHeaders().size(), 0); assertEquals(processor.createResponseParser(method).getClass(), - ParseInetAddressListFromGsonResponse.class); + ParseInetAddressListFromJsonResponse.class); } public void testListPrivateAddresses() throws SecurityException, NoSuchMethodException { @@ -718,7 +718,7 @@ public class CloudServersConnectionTest { assertEquals(httpMethod.getMethod(), HttpMethod.GET); assertEquals(httpMethod.getHeaders().size(), 0); assertEquals(processor.createResponseParser(method).getClass(), - ParseInetAddressListFromGsonResponse.class); + ParseInetAddressListFromJsonResponse.class); } public void testListBackupSchedule() throws SecurityException, NoSuchMethodException { @@ -731,7 +731,7 @@ public class CloudServersConnectionTest { assertEquals(httpMethod.getMethod(), HttpMethod.GET); assertEquals(httpMethod.getHeaders().size(), 0); assertEquals(processor.createResponseParser(method).getClass(), - ParseBackupScheduleFromGsonResponse.class); + ParseBackupScheduleFromJsonResponse.class); } public void testCreateImageWithIpGroup() throws SecurityException, NoSuchMethodException { @@ -751,7 +751,7 @@ public class CloudServersConnectionTest { assertEquals(httpMethod.getHeaders().get(HttpHeaders.CONTENT_TYPE), Collections .singletonList(MediaType.APPLICATION_JSON)); assertEquals(processor.createResponseParser(method).getClass(), - ParseImageFromGsonResponse.class); + ParseImageFromJsonResponse.class); assertNotNull(processor.createExceptionParserOrNullIfNotFound(method)); assertNotNull(processor.getMapEntityBinderOrNull(method, new Object[] { "", 2 })); } diff --git a/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/binders/ChangeAdminPassBinderTest.java b/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/binders/ChangeAdminPassBinderTest.java index 78421ac49f..3011103ad5 100644 --- a/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/binders/ChangeAdminPassBinderTest.java +++ b/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/binders/ChangeAdminPassBinderTest.java @@ -52,23 +52,23 @@ public class ChangeAdminPassBinderTest { public void testPostIsIncorrect() { ChangeAdminPassBinder binder = new ChangeAdminPassBinder(); injector.injectMembers(binder); - HttpRequest request = new HttpRequest(HttpMethod.POST, URI.create("/")); + HttpRequest request = new HttpRequest(HttpMethod.POST, URI.create("http://localhost")); binder.addEntityToRequest(ImmutableMap.of("adminPass", "foo"), request); } - + @Test(expectedExceptions = IllegalArgumentException.class) public void testMustBeString() { ChangeAdminPassBinder binder = new ChangeAdminPassBinder(); injector.injectMembers(binder); - HttpRequest request = new HttpRequest(HttpMethod.POST, URI.create("/")); + HttpRequest request = new HttpRequest(HttpMethod.POST, URI.create("http://localhost")); binder.addEntityToRequest(new File("foo"), request); } - + @Test public void testCorrect() { ChangeAdminPassBinder binder = new ChangeAdminPassBinder(); injector.injectMembers(binder); - HttpRequest request = new HttpRequest(HttpMethod.PUT, URI.create("/")); + HttpRequest request = new HttpRequest(HttpMethod.PUT, URI.create("http://localhost")); binder.addEntityToRequest("foo", request); assertEquals("{\"server\":{\"adminPass\":\"foo\"}}", request.getEntity()); } @@ -77,7 +77,7 @@ public class ChangeAdminPassBinderTest { public void testNullIsBad() { ChangeAdminPassBinder binder = new ChangeAdminPassBinder(); injector.injectMembers(binder); - HttpRequest request = new HttpRequest(HttpMethod.PUT, URI.create("/")); + HttpRequest request = new HttpRequest(HttpMethod.PUT, URI.create("http://localhost")); binder.addEntityToRequest(null, request); } } diff --git a/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/binders/ChangeServerNameBinderTest.java b/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/binders/ChangeServerNameBinderTest.java index ddf8343b5d..65ca666cd6 100644 --- a/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/binders/ChangeServerNameBinderTest.java +++ b/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/binders/ChangeServerNameBinderTest.java @@ -52,7 +52,7 @@ public class ChangeServerNameBinderTest { public void testPostIsIncorrect() { ChangeServerNameBinder binder = new ChangeServerNameBinder(); injector.injectMembers(binder); - HttpRequest request = new HttpRequest(HttpMethod.POST, URI.create("/")); + HttpRequest request = new HttpRequest(HttpMethod.POST, URI.create("http://localhost")); binder.addEntityToRequest(ImmutableMap.of("name", "foo"), request); } @@ -60,7 +60,7 @@ public class ChangeServerNameBinderTest { public void testMustBeString() { ChangeServerNameBinder binder = new ChangeServerNameBinder(); injector.injectMembers(binder); - HttpRequest request = new HttpRequest(HttpMethod.POST, URI.create("/")); + HttpRequest request = new HttpRequest(HttpMethod.POST, URI.create("http://localhost")); binder.addEntityToRequest(new File("foo"), request); } @@ -68,7 +68,7 @@ public class ChangeServerNameBinderTest { public void testCorrect() { ChangeServerNameBinder binder = new ChangeServerNameBinder(); injector.injectMembers(binder); - HttpRequest request = new HttpRequest(HttpMethod.PUT, URI.create("/")); + HttpRequest request = new HttpRequest(HttpMethod.PUT, URI.create("http://localhost")); binder.addEntityToRequest("foo", request); assertEquals("{\"server\":{\"name\":\"foo\"}}", request.getEntity()); } @@ -77,7 +77,7 @@ public class ChangeServerNameBinderTest { public void testNullIsBad() { ChangeServerNameBinder binder = new ChangeServerNameBinder(); injector.injectMembers(binder); - HttpRequest request = new HttpRequest(HttpMethod.PUT, URI.create("/")); + HttpRequest request = new HttpRequest(HttpMethod.PUT, URI.create("http://localhost")); binder.addEntityToRequest(null, request); } } diff --git a/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/binders/CreateImageBinderTest.java b/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/binders/CreateImageBinderTest.java index 7d122259f1..8f391f336f 100644 --- a/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/binders/CreateImageBinderTest.java +++ b/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/binders/CreateImageBinderTest.java @@ -52,7 +52,7 @@ public class CreateImageBinderTest { public void testMustBeMap() { CreateImageBinder binder = new CreateImageBinder(); injector.injectMembers(binder); - HttpRequest request = new HttpRequest(HttpMethod.POST, URI.create("/")); + HttpRequest request = new HttpRequest(HttpMethod.POST, URI.create("http://localhost")); binder.addEntityToRequest(new File("foo"), request); } @@ -60,7 +60,7 @@ public class CreateImageBinderTest { public void testCorrect() { CreateImageBinder binder = new CreateImageBinder(); injector.injectMembers(binder); - HttpRequest request = new HttpRequest(HttpMethod.PUT, URI.create("/")); + HttpRequest request = new HttpRequest(HttpMethod.PUT, URI.create("http://localhost")); binder.addEntityToRequest(ImmutableMap.of("imageName", "foo", "serverId", "2"), request); assertEquals("{\"image\":{\"serverId\":2,\"name\":\"foo\"}}", request.getEntity()); } @@ -69,7 +69,7 @@ public class CreateImageBinderTest { public void testNullIsBad() { CreateImageBinder binder = new CreateImageBinder(); injector.injectMembers(binder); - HttpRequest request = new HttpRequest(HttpMethod.PUT, URI.create("/")); + HttpRequest request = new HttpRequest(HttpMethod.PUT, URI.create("http://localhost")); binder.addEntityToRequest(null, request); } } diff --git a/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/binders/RebootTypeBinderTest.java b/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/binders/RebootTypeBinderTest.java index 7595a1888c..aa5793a3aa 100644 --- a/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/binders/RebootTypeBinderTest.java +++ b/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/binders/RebootTypeBinderTest.java @@ -53,33 +53,32 @@ public class RebootTypeBinderTest { public void testPostIsIncorrect() { RebootTypeBinder binder = new RebootTypeBinder(); injector.injectMembers(binder); - HttpRequest request = new HttpRequest(HttpMethod.POST, URI.create("/")); + HttpRequest request = new HttpRequest(HttpMethod.POST, URI.create("http://localhost")); binder.addEntityToRequest(ImmutableMap.of("adminPass", "foo"), request); } - + @Test(expectedExceptions = IllegalArgumentException.class) public void testMustBeRebootType() { RebootTypeBinder binder = new RebootTypeBinder(); injector.injectMembers(binder); - HttpRequest request = new HttpRequest(HttpMethod.POST, URI.create("/")); + HttpRequest request = new HttpRequest(HttpMethod.POST, URI.create("http://localhost")); binder.addEntityToRequest(new File("foo"), request); } - + @Test public void testHard() { RebootTypeBinder binder = new RebootTypeBinder(); injector.injectMembers(binder); - HttpRequest request = new HttpRequest(HttpMethod.POST, URI.create("/")); + HttpRequest request = new HttpRequest(HttpMethod.POST, URI.create("http://localhost")); binder.addEntityToRequest(RebootType.HARD, request); assertEquals("{\"reboot\":{\"type\":\"HARD\"}}", request.getEntity()); } - - + @Test public void testSoft() { RebootTypeBinder binder = new RebootTypeBinder(); injector.injectMembers(binder); - HttpRequest request = new HttpRequest(HttpMethod.POST, URI.create("/")); + HttpRequest request = new HttpRequest(HttpMethod.POST, URI.create("http://localhost")); binder.addEntityToRequest(RebootType.SOFT, request); assertEquals("{\"reboot\":{\"type\":\"SOFT\"}}", request.getEntity()); } @@ -88,7 +87,7 @@ public class RebootTypeBinderTest { public void testNullIsBad() { RebootTypeBinder binder = new RebootTypeBinder(); injector.injectMembers(binder); - HttpRequest request = new HttpRequest(HttpMethod.POST, URI.create("/")); + HttpRequest request = new HttpRequest(HttpMethod.POST, URI.create("http://localhost")); binder.addEntityToRequest(null, request); } } diff --git a/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseAddressesFromGsonResponseTest.java b/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseAddressesFromJsonResponseTest.java similarity index 92% rename from rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseAddressesFromGsonResponseTest.java rename to rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseAddressesFromJsonResponseTest.java index 3341c73dd0..3e1d6ddf09 100644 --- a/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseAddressesFromGsonResponseTest.java +++ b/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseAddressesFromJsonResponseTest.java @@ -41,12 +41,12 @@ import com.google.inject.Injector; import com.google.inject.internal.ImmutableList; /** - * Tests behavior of {@code ParseAddressesFromGsonResponse} + * Tests behavior of {@code ParseAddressesFromJsonResponse} * * @author Adrian Cole */ -@Test(groups = "unit", testName = "cloudservers.ParseAddressesFromGsonResponseTest") -public class ParseAddressesFromGsonResponseTest { +@Test(groups = "unit", testName = "cloudservers.ParseAddressesFromJsonResponseTest") +public class ParseAddressesFromJsonResponseTest { Injector i = Guice.createInjector(new ParserModule()); DateService dateService = new DateService(); @@ -54,7 +54,7 @@ public class ParseAddressesFromGsonResponseTest { public void testApplyInputStreamDetails() throws UnknownHostException { InputStream is = getClass().getResourceAsStream("/test_list_addresses.json"); - ParseAddressesFromGsonResponse parser = new ParseAddressesFromGsonResponse(i + ParseAddressesFromJsonResponse parser = new ParseAddressesFromJsonResponse(i .getInstance(Gson.class)); Addresses response = parser.apply(is); List publicAddresses = ImmutableList.of(InetAddress.getByAddress(new byte[] { diff --git a/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseBackupScheduleFromGsonResponseTest.java b/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseBackupScheduleFromJsonResponseTest.java similarity index 88% rename from rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseBackupScheduleFromGsonResponseTest.java rename to rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseBackupScheduleFromJsonResponseTest.java index 7bddbd7606..843f10ec05 100644 --- a/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseBackupScheduleFromGsonResponseTest.java +++ b/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseBackupScheduleFromJsonResponseTest.java @@ -40,19 +40,19 @@ import com.google.inject.Guice; import com.google.inject.Injector; /** - * Tests behavior of {@code ParseBackupScheduleFromGsonResponse} + * Tests behavior of {@code ParseBackupScheduleFromJsonResponse} * * @author Adrian Cole */ -@Test(groups = "unit", testName = "cloudservers.ParseBackupScheduleFromGsonResponseTest") -public class ParseBackupScheduleFromGsonResponseTest { +@Test(groups = "unit", testName = "cloudservers.ParseBackupScheduleFromJsonResponseTest") +public class ParseBackupScheduleFromJsonResponseTest { Injector i = Guice.createInjector(new ParserModule()); public void testApplyInputStreamDetails() throws UnknownHostException { InputStream is = getClass().getResourceAsStream("/test_list_backupschedule.json"); - ParseBackupScheduleFromGsonResponse parser = new ParseBackupScheduleFromGsonResponse(i + ParseBackupScheduleFromJsonResponse parser = new ParseBackupScheduleFromJsonResponse(i .getInstance(Gson.class)); BackupSchedule response = parser.apply(is); assertEquals(new BackupSchedule(WeeklyBackup.THURSDAY, DailyBackup.H_0400_0600, true), @@ -61,7 +61,7 @@ public class ParseBackupScheduleFromGsonResponseTest { public void testNoSchedule() throws UnknownHostException { - ParseBackupScheduleFromGsonResponse parser = new ParseBackupScheduleFromGsonResponse(i + ParseBackupScheduleFromJsonResponse parser = new ParseBackupScheduleFromJsonResponse(i .getInstance(Gson.class)); BackupSchedule response = parser.apply(IOUtils .toInputStream("{\"backupSchedule\":{\"enabled\" : false}}")); diff --git a/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseFlavorFromGsonResponseTest.java b/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseFlavorFromJsonResponseTest.java similarity index 90% rename from rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseFlavorFromGsonResponseTest.java rename to rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseFlavorFromJsonResponseTest.java index f2c1a45652..60aab20314 100644 --- a/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseFlavorFromGsonResponseTest.java +++ b/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseFlavorFromJsonResponseTest.java @@ -38,12 +38,12 @@ import com.google.inject.Guice; import com.google.inject.Injector; /** - * Tests behavior of {@code ParseFlavorFromGsonResponse} + * Tests behavior of {@code ParseFlavorFromJsonResponse} * * @author Adrian Cole */ -@Test(groups = "unit", testName = "cloudservers.ParseFlavorFromGsonResponseTest") -public class ParseFlavorFromGsonResponseTest { +@Test(groups = "unit", testName = "cloudservers.ParseFlavorFromJsonResponseTest") +public class ParseFlavorFromJsonResponseTest { Injector i = Guice.createInjector(new ParserModule()); DateService dateService = new DateService(); @@ -51,7 +51,7 @@ public class ParseFlavorFromGsonResponseTest { public void testApplyInputStreamDetails() throws UnknownHostException { InputStream is = getClass().getResourceAsStream("/test_get_flavor_details.json"); - ParseFlavorFromGsonResponse parser = new ParseFlavorFromGsonResponse(i + ParseFlavorFromJsonResponse parser = new ParseFlavorFromJsonResponse(i .getInstance(Gson.class)); Flavor response = parser.apply(is); assertEquals(response.getId(), 1); diff --git a/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseFlavorListFromGsonResponseTest.java b/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseFlavorListFromJsonResponseTest.java similarity index 90% rename from rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseFlavorListFromGsonResponseTest.java rename to rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseFlavorListFromJsonResponseTest.java index 68a43087d1..a08bcb368b 100644 --- a/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseFlavorListFromGsonResponseTest.java +++ b/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseFlavorListFromJsonResponseTest.java @@ -39,12 +39,12 @@ import com.google.inject.Guice; import com.google.inject.Injector; /** - * Tests behavior of {@code ParseFlavorListFromGsonResponseTest} + * Tests behavior of {@code ParseFlavorListFromJsonResponseTest} * * @author Adrian Cole */ -@Test(groups = "unit", testName = "cloudFlavors.ParseFlavorListFromGsonResponseTest") -public class ParseFlavorListFromGsonResponseTest { +@Test(groups = "unit", testName = "cloudFlavors.ParseFlavorListFromJsonResponseTest") +public class ParseFlavorListFromJsonResponseTest { Injector i = Guice.createInjector(new ParserModule()); @@ -54,7 +54,7 @@ public class ParseFlavorListFromGsonResponseTest { List expects = ImmutableList.of(new Flavor(1, "256 MB Server"), new Flavor(2, "512 MB Server")); - ParseFlavorListFromGsonResponse parser = new ParseFlavorListFromGsonResponse(i + ParseFlavorListFromJsonResponse parser = new ParseFlavorListFromJsonResponse(i .getInstance(Gson.class)); assertEquals(parser.apply(is), expects); } @@ -62,7 +62,7 @@ public class ParseFlavorListFromGsonResponseTest { public void testApplyInputStreamDetails() throws UnknownHostException { InputStream is = getClass().getResourceAsStream("/test_list_flavors_detail.json"); - ParseFlavorListFromGsonResponse parser = new ParseFlavorListFromGsonResponse(i + ParseFlavorListFromJsonResponse parser = new ParseFlavorListFromJsonResponse(i .getInstance(Gson.class)); List response = parser.apply(is); assertEquals(response.get(0).getId(), 1); diff --git a/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseImageFromGsonResponseTest.java b/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseImageFromJsonResponseTest.java similarity index 91% rename from rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseImageFromGsonResponseTest.java rename to rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseImageFromJsonResponseTest.java index 2505b99015..4fb1df2071 100644 --- a/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseImageFromGsonResponseTest.java +++ b/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseImageFromJsonResponseTest.java @@ -40,12 +40,12 @@ import com.google.inject.Guice; import com.google.inject.Injector; /** - * Tests behavior of {@code ParseImageFromGsonResponse} + * Tests behavior of {@code ParseImageFromJsonResponse} * * @author Adrian Cole */ -@Test(groups = "unit", testName = "cloudservers.ParseImageFromGsonResponseTest") -public class ParseImageFromGsonResponseTest { +@Test(groups = "unit", testName = "cloudservers.ParseImageFromJsonResponseTest") +public class ParseImageFromJsonResponseTest { Injector i = Guice.createInjector(new ParserModule()); DateService dateService = new DateService(); @@ -53,7 +53,7 @@ public class ParseImageFromGsonResponseTest { public void testApplyInputStreamDetails() throws UnknownHostException { InputStream is = getClass().getResourceAsStream("/test_get_image_details.json"); - ParseImageFromGsonResponse parser = new ParseImageFromGsonResponse(i.getInstance(Gson.class)); + ParseImageFromJsonResponse parser = new ParseImageFromJsonResponse(i.getInstance(Gson.class)); Image response = parser.apply(is); assertEquals(response.getId(), 2); assertEquals(response.getName(), "CentOS 5.2"); diff --git a/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseImageListFromGsonResponseTest.java b/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseImageListFromJsonResponseTest.java similarity index 92% rename from rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseImageListFromGsonResponseTest.java rename to rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseImageListFromJsonResponseTest.java index de8fe74300..2e6567932c 100644 --- a/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseImageListFromGsonResponseTest.java +++ b/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseImageListFromJsonResponseTest.java @@ -42,12 +42,12 @@ import com.google.inject.Guice; import com.google.inject.Injector; /** - * Tests behavior of {@code ParseImageListFromGsonResponseTest} + * Tests behavior of {@code ParseImageListFromJsonResponseTest} * * @author Adrian Cole */ -@Test(groups = "unit", testName = "cloudImages.ParseImageListFromGsonResponseTest") -public class ParseImageListFromGsonResponseTest { +@Test(groups = "unit", testName = "cloudImages.ParseImageListFromJsonResponseTest") +public class ParseImageListFromJsonResponseTest { Injector i = Guice.createInjector(new ParserModule()); DateService dateService = new DateService(); @@ -57,7 +57,7 @@ public class ParseImageListFromGsonResponseTest { List expects = ImmutableList.of(new Image(2, "CentOS 5.2"), new Image(743, "My Server Backup")); - ParseImageListFromGsonResponse parser = new ParseImageListFromGsonResponse(i + ParseImageListFromJsonResponse parser = new ParseImageListFromJsonResponse(i .getInstance(Gson.class)); assertEquals(parser.apply(is), expects); } @@ -65,7 +65,7 @@ public class ParseImageListFromGsonResponseTest { public void testApplyInputStreamDetails() throws UnknownHostException { InputStream is = getClass().getResourceAsStream("/test_list_images_detail.json"); - ParseImageListFromGsonResponse parser = new ParseImageListFromGsonResponse(i + ParseImageListFromJsonResponse parser = new ParseImageListFromJsonResponse(i .getInstance(Gson.class)); List response = parser.apply(is); assertEquals(response.get(0).getId(), 2); diff --git a/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseInetAddressListFromGsonResponseTest.java b/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseInetAddressListFromJsonResponseTest.java similarity index 88% rename from rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseInetAddressListFromGsonResponseTest.java rename to rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseInetAddressListFromJsonResponseTest.java index 4dc8efd600..5755d50b11 100644 --- a/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseInetAddressListFromGsonResponseTest.java +++ b/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseInetAddressListFromJsonResponseTest.java @@ -40,12 +40,12 @@ import com.google.inject.Injector; import com.google.inject.internal.ImmutableList; /** - * Tests behavior of {@code ParseInetAddressListFromGsonResponse} + * Tests behavior of {@code ParseInetAddressListFromJsonResponse} * * @author Adrian Cole */ -@Test(groups = "unit", testName = "cloudservers.ParseInetAddressListFromGsonResponseTest") -public class ParseInetAddressListFromGsonResponseTest { +@Test(groups = "unit", testName = "cloudservers.ParseInetAddressListFromJsonResponseTest") +public class ParseInetAddressListFromJsonResponseTest { Injector i = Guice.createInjector(new ParserModule()); DateService dateService = new DateService(); @@ -53,7 +53,7 @@ public class ParseInetAddressListFromGsonResponseTest { public void testPublic() throws UnknownHostException { InputStream is = getClass().getResourceAsStream("/test_list_addresses_public.json"); - ParseInetAddressListFromGsonResponse parser = new ParseInetAddressListFromGsonResponse(i + ParseInetAddressListFromJsonResponse parser = new ParseInetAddressListFromJsonResponse(i .getInstance(Gson.class)); List response = parser.apply(is); assertEquals(response, ImmutableList.of(InetAddress.getByAddress(new byte[] { 67, 23, 10, @@ -63,7 +63,7 @@ public class ParseInetAddressListFromGsonResponseTest { public void testPrivate() throws UnknownHostException { InputStream is = getClass().getResourceAsStream("/test_list_addresses_private.json"); - ParseInetAddressListFromGsonResponse parser = new ParseInetAddressListFromGsonResponse(i + ParseInetAddressListFromJsonResponse parser = new ParseInetAddressListFromJsonResponse(i .getInstance(Gson.class)); List response = parser.apply(is); assertEquals(response, ImmutableList.of(InetAddress.getByAddress(new byte[] { 10, (byte) 176, diff --git a/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseServerFromGsonResponseTest.java b/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseServerFromJsonResponseTest.java similarity index 92% rename from rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseServerFromGsonResponseTest.java rename to rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseServerFromJsonResponseTest.java index 16ff14492d..984d049003 100644 --- a/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseServerFromGsonResponseTest.java +++ b/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseServerFromJsonResponseTest.java @@ -43,19 +43,19 @@ import com.google.inject.Guice; import com.google.inject.Injector; /** - * Tests behavior of {@code ParseServerFromGsonResponseTest} + * Tests behavior of {@code ParseServerFromJsonResponseTest} * * @author Adrian Cole */ -@Test(groups = "unit", testName = "cloudservers.ParseServerFromGsonResponseTest") -public class ParseServerFromGsonResponseTest { +@Test(groups = "unit", testName = "cloudservers.ParseServerFromJsonResponseTest") +public class ParseServerFromJsonResponseTest { Injector i = Guice.createInjector(new ParserModule()); public void testApplyInputStreamDetails() throws UnknownHostException { InputStream is = getClass().getResourceAsStream("/test_get_server_detail.json"); - ParseServerFromGsonResponse parser = new ParseServerFromGsonResponse(i + ParseServerFromJsonResponse parser = new ParseServerFromJsonResponse(i .getInstance(Gson.class)); Server response = parser.apply(is); assertEquals(response.getId(), 1234); diff --git a/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseServerListFromGsonResponseTest.java b/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseServerListFromJsonResponseTest.java similarity index 93% rename from rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseServerListFromGsonResponseTest.java rename to rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseServerListFromJsonResponseTest.java index 1fe08e8b8f..1f2927f8fc 100644 --- a/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseServerListFromGsonResponseTest.java +++ b/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseServerListFromJsonResponseTest.java @@ -44,12 +44,12 @@ import com.google.inject.Guice; import com.google.inject.Injector; /** - * Tests behavior of {@code ParseServerListFromGsonResponseTest} + * Tests behavior of {@code ParseServerListFromJsonResponseTest} * * @author Adrian Cole */ -@Test(groups = "unit", testName = "cloudservers.ParseServerListFromGsonResponseTest") -public class ParseServerListFromGsonResponseTest { +@Test(groups = "unit", testName = "cloudservers.ParseServerListFromJsonResponseTest") +public class ParseServerListFromJsonResponseTest { Injector i = Guice.createInjector(new ParserModule()); @@ -59,7 +59,7 @@ public class ParseServerListFromGsonResponseTest { List expects = ImmutableList.of(new Server(1234, "sample-server"), new Server(5678, "sample-server2")); - ParseServerListFromGsonResponse parser = new ParseServerListFromGsonResponse(i + ParseServerListFromJsonResponse parser = new ParseServerListFromJsonResponse(i .getInstance(Gson.class)); assertEquals(parser.apply(is), expects); } @@ -67,7 +67,7 @@ public class ParseServerListFromGsonResponseTest { public void testApplyInputStreamDetails() throws UnknownHostException { InputStream is = getClass().getResourceAsStream("/test_list_servers_detail.json"); - ParseServerListFromGsonResponse parser = new ParseServerListFromGsonResponse(i + ParseServerListFromJsonResponse parser = new ParseServerListFromJsonResponse(i .getInstance(Gson.class)); List response = parser.apply(is); assertEquals(response.get(0).getId(), 1234); diff --git a/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseSharedIpGroupFromGsonResponseTest.java b/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseSharedIpGroupFromJsonResponseTest.java similarity index 90% rename from rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseSharedIpGroupFromGsonResponseTest.java rename to rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseSharedIpGroupFromJsonResponseTest.java index 75af3efa13..e17ecd1b0f 100644 --- a/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseSharedIpGroupFromGsonResponseTest.java +++ b/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseSharedIpGroupFromJsonResponseTest.java @@ -39,12 +39,12 @@ import com.google.inject.Guice; import com.google.inject.Injector; /** - * Tests behavior of {@code ParseSharedIpGroupFromGsonResponse} + * Tests behavior of {@code ParseSharedIpGroupFromJsonResponse} * * @author Adrian Cole */ -@Test(groups = "unit", testName = "cloudservers.ParseSharedIpGroupFromGsonResponseTest") -public class ParseSharedIpGroupFromGsonResponseTest { +@Test(groups = "unit", testName = "cloudservers.ParseSharedIpGroupFromJsonResponseTest") +public class ParseSharedIpGroupFromJsonResponseTest { Injector i = Guice.createInjector(new ParserModule()); DateService dateService = new DateService(); @@ -52,7 +52,7 @@ public class ParseSharedIpGroupFromGsonResponseTest { public void testApplyInputStreamDetails() throws UnknownHostException { InputStream is = getClass().getResourceAsStream("/test_get_sharedipgroup_details.json"); - ParseSharedIpGroupFromGsonResponse parser = new ParseSharedIpGroupFromGsonResponse(i + ParseSharedIpGroupFromJsonResponse parser = new ParseSharedIpGroupFromJsonResponse(i .getInstance(Gson.class)); SharedIpGroup response = parser.apply(is); assertEquals(response.getId(), 1234); diff --git a/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseSharedIpGroupListFromGsonResponseTest.java b/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseSharedIpGroupListFromJsonResponseTest.java similarity index 88% rename from rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseSharedIpGroupListFromGsonResponseTest.java rename to rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseSharedIpGroupListFromJsonResponseTest.java index 04cd1bcded..6abe6c2940 100644 --- a/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseSharedIpGroupListFromGsonResponseTest.java +++ b/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseSharedIpGroupListFromJsonResponseTest.java @@ -39,12 +39,12 @@ import com.google.inject.Guice; import com.google.inject.Injector; /** - * Tests behavior of {@code ParseSharedIpGroupListFromGsonResponseTest} + * Tests behavior of {@code ParseSharedIpGroupListFromJsonResponseTest} * * @author Adrian Cole */ -@Test(groups = "unit", testName = "cloudSharedIpGroups.ParseSharedIpGroupListFromGsonResponseTest") -public class ParseSharedIpGroupListFromGsonResponseTest { +@Test(groups = "unit", testName = "cloudSharedIpGroups.ParseSharedIpGroupListFromJsonResponseTest") +public class ParseSharedIpGroupListFromJsonResponseTest { Injector i = Guice.createInjector(new ParserModule()); @@ -53,7 +53,7 @@ public class ParseSharedIpGroupListFromGsonResponseTest { List expects = ImmutableList.of(new SharedIpGroup(1234, "Shared IP Group 1"), new SharedIpGroup(5678, "Shared IP Group 2")); - ParseSharedIpGroupListFromGsonResponse parser = new ParseSharedIpGroupListFromGsonResponse(i + ParseSharedIpGroupListFromJsonResponse parser = new ParseSharedIpGroupListFromJsonResponse(i .getInstance(Gson.class)); assertEquals(parser.apply(is), expects); } @@ -61,7 +61,7 @@ public class ParseSharedIpGroupListFromGsonResponseTest { public void testApplyInputStreamDetails() throws UnknownHostException { InputStream is = getClass().getResourceAsStream("/test_list_sharedipgroups_detail.json"); - ParseSharedIpGroupListFromGsonResponse parser = new ParseSharedIpGroupListFromGsonResponse(i + ParseSharedIpGroupListFromJsonResponse parser = new ParseSharedIpGroupListFromJsonResponse(i .getInstance(Gson.class)); List response = parser.apply(is); assertEquals(response.get(0).getId(), 1234); diff --git a/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/options/CreateServerOptionsTest.java b/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/options/CreateServerOptionsTest.java index 75ea467276..02dcef1447 100644 --- a/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/options/CreateServerOptionsTest.java +++ b/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/options/CreateServerOptionsTest.java @@ -43,7 +43,7 @@ import com.google.inject.Guice; import com.google.inject.Injector; /** - * Tests behavior of {@code ParseFlavorFromGsonResponse} + * Tests behavior of {@code ParseFlavorFromJsonResponse} * * @author Adrian Cole */ @@ -62,7 +62,7 @@ public class CreateServerOptionsTest { private HttpRequest buildRequest(CreateServerOptions options) { injector.injectMembers(options); - HttpRequest request = new HttpRequest(HttpMethod.POST, URI.create("/")); + HttpRequest request = new HttpRequest(HttpMethod.POST, URI.create("http://localhost")); options.addEntityToRequest(ImmutableMap.of("name", "foo", "imageId", "1", "flavorId", "2"), request); return request; diff --git a/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/options/CreateSharedIpGroupOptionsTest.java b/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/options/CreateSharedIpGroupOptionsTest.java index a4652b8116..86d12465b5 100644 --- a/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/options/CreateSharedIpGroupOptionsTest.java +++ b/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/options/CreateSharedIpGroupOptionsTest.java @@ -39,7 +39,7 @@ import com.google.inject.Guice; import com.google.inject.Injector; /** - * Tests behavior of {@code ParseFlavorFromGsonResponse} + * Tests behavior of {@code ParseFlavorFromJsonResponse} * * @author Adrian Cole */ @@ -57,7 +57,7 @@ public class CreateSharedIpGroupOptionsTest { private HttpRequest buildRequest(CreateSharedIpGroupOptions options) { injector.injectMembers(options); - HttpRequest request = new HttpRequest(HttpMethod.POST, URI.create("/")); + HttpRequest request = new HttpRequest(HttpMethod.POST, URI.create("http://localhost")); options.addEntityToRequest(ImmutableMap.of("name", "foo"), request); return request; } diff --git a/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/options/RebuildServerOptionsTest.java b/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/options/RebuildServerOptionsTest.java index a97a5b5a4d..56e9d9ea40 100644 --- a/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/options/RebuildServerOptionsTest.java +++ b/rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/options/RebuildServerOptionsTest.java @@ -39,7 +39,7 @@ import com.google.inject.Guice; import com.google.inject.Injector; /** - * Tests behavior of {@code ParseFlavorFromGsonResponse} + * Tests behavior of {@code ParseFlavorFromJsonResponse} * * @author Adrian Cole */ @@ -57,7 +57,7 @@ public class RebuildServerOptionsTest { private HttpRequest buildRequest(RebuildServerOptions options) { injector.injectMembers(options); - HttpRequest request = new HttpRequest(HttpMethod.POST, URI.create("/")); + HttpRequest request = new HttpRequest(HttpMethod.POST, URI.create("http://localhost")); options.addEntityToRequest(new HashMap(), request); return request; } diff --git a/rackspace/core/src/main/java/org/jclouds/rackspace/RackspaceContextBuilder.java b/rackspace/core/src/main/java/org/jclouds/rackspace/RackspaceContextBuilder.java index bc52da864f..0852cea4cb 100755 --- a/rackspace/core/src/main/java/org/jclouds/rackspace/RackspaceContextBuilder.java +++ b/rackspace/core/src/main/java/org/jclouds/rackspace/RackspaceContextBuilder.java @@ -62,8 +62,8 @@ import com.google.inject.Module; * @author Adrian Cole * @see CloudFilesContext */ -public abstract class RackspaceContextBuilder> extends - CloudContextBuilder { +public abstract class RackspaceContextBuilder> extends + CloudContextBuilder { public RackspaceContextBuilder(Properties props) { super(props); @@ -84,9 +84,8 @@ public abstract class RackspaceContextBuilder> exte properties.setProperty(PROPERTY_RACKSPACE_KEY, checkNotNull(secret, "key")); } - protected void addConnectionModule(List modules) { - modules.add( new RackspaceAuthenticationModule()); + modules.add(new RackspaceAuthenticationModule()); } } diff --git a/rackspace/core/src/test/java/org/jclouds/rackspace/RackspaceAuthenticationLiveTest.java b/rackspace/core/src/test/java/org/jclouds/rackspace/RackspaceAuthenticationLiveTest.java index 31d18f4fb0..d8e91c584c 100644 --- a/rackspace/core/src/test/java/org/jclouds/rackspace/RackspaceAuthenticationLiveTest.java +++ b/rackspace/core/src/test/java/org/jclouds/rackspace/RackspaceAuthenticationLiveTest.java @@ -23,8 +23,6 @@ */ package org.jclouds.rackspace; -import static org.jclouds.rackspace.reference.RackspaceConstants.PROPERTY_RACKSPACE_KEY; -import static org.jclouds.rackspace.reference.RackspaceConstants.PROPERTY_RACKSPACE_USER; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.fail; @@ -36,7 +34,6 @@ import org.jclouds.concurrent.WithinThreadExecutorService; import org.jclouds.concurrent.config.ExecutorServiceModule; import org.jclouds.http.HttpResponseException; import org.jclouds.http.config.JavaUrlHttpCommandExecutorServiceModule; -import org.jclouds.rackspace.RackspaceAuthentication; import org.jclouds.rackspace.RackspaceAuthentication.AuthenticationResponse; import org.jclouds.rest.RestClientFactory; import org.jclouds.rest.config.JaxrsModule; @@ -57,16 +54,15 @@ import com.google.inject.Singleton; @Test(groups = "live", testName = "rackspace.RackspaceAuthenticationLiveTest") public class RackspaceAuthenticationLiveTest { - protected static final String sysRackspaceUser = System.getProperty(PROPERTY_RACKSPACE_USER); - protected static final String sysRackspaceKey = System.getProperty(PROPERTY_RACKSPACE_KEY); + String account = System.getProperty("jclouds.test.user"); + String key = System.getProperty("jclouds.test.key"); + private Injector injector; @Test public void testAuthentication() throws Exception { - RackspaceAuthentication authentication = injector - .getInstance(RackspaceAuthentication.class); - AuthenticationResponse response = authentication.authenticate(sysRackspaceUser, - sysRackspaceKey); + RackspaceAuthentication authentication = injector.getInstance(RackspaceAuthentication.class); + AuthenticationResponse response = authentication.authenticate(account, key); assertNotNull(response); assertNotNull(response.getStorageUrl()); assertNotNull(response.getCDNManagementUrl()); @@ -76,8 +72,7 @@ public class RackspaceAuthenticationLiveTest { @Test(expectedExceptions = HttpResponseException.class) public void testBadAuthentication() throws Exception { - RackspaceAuthentication authentication = injector - .getInstance(RackspaceAuthentication.class); + RackspaceAuthentication authentication = injector.getInstance(RackspaceAuthentication.class); try { authentication.authenticate("foo", "bar"); } catch (UndeclaredThrowableException e) { @@ -90,20 +85,21 @@ public class RackspaceAuthenticationLiveTest { @BeforeClass void setupFactory() { - injector = Guice.createInjector(new AbstractModule() { - @Override - protected void configure() { - } + injector = Guice.createInjector( + new AbstractModule() { + @Override + protected void configure() { + } - @SuppressWarnings("unused") - @Provides - @Singleton - protected RackspaceAuthentication provideCloudFilesAuthentication( - RestClientFactory factory) { - return factory.create(URI.create("https://api.mosso.com"), - RackspaceAuthentication.class); - } - }, new JaxrsModule(), new ExecutorServiceModule(new WithinThreadExecutorService()), + @SuppressWarnings("unused") + @Provides + @Singleton + protected RackspaceAuthentication provideCloudFilesAuthentication( + RestClientFactory factory) { + return factory.create(URI.create("https://api.mosso.com"), + RackspaceAuthentication.class); + } + }, new JaxrsModule(), new ExecutorServiceModule(new WithinThreadExecutorService()), new JavaUrlHttpCommandExecutorServiceModule()); } } diff --git a/rackspace/pom.xml b/rackspace/pom.xml index 440b56737c..13e0fabd4b 100644 --- a/rackspace/pom.xml +++ b/rackspace/pom.xml @@ -42,8 +42,8 @@ cloudservers - - + ${jclouds.rackspace.user} + ${jclouds.rackspace.key} @@ -71,54 +71,4 @@ test - - - live - - - - org.apache.maven.plugins - maven-surefire-plugin - - - integration - integration-test - - test - - - - - none - - - **/*IntegrationTest.java - **/*LiveTest.java - - - - file.encoding - UTF-8 - - - jclouds.rackspace.user - ${jclouds.rackspace.user} - - - jclouds.rackspace.key - ${jclouds.rackspace.key} - - - - - - - - - - -

    + * Chunking is only used when org.jclouds.http.GetOptions is called with options like tail, + * range, or startAt. + * + * @return the length in bytes that can be be obtained from {@link #getData()} + * @see org.jclouds.http.HttpHeaders#CONTENT_LENGTH + * @see GetObjectOptions + */ + public long getContentLength() { + return contentLength; + } + + public void setContentRange(String contentRange) { + this.contentRange = contentRange; + } + + /** + * If this is not-null, {@link #getContentLength() } will the size of chunk of the Value available + * via {@link #getData()} + * + * @see org.jclouds.http.HttpHeaders#CONTENT_RANGE + * @see GetObjectOptions + */ + public String getContentRange() { + return contentRange; + } + +} diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/domain/BlobMetadata.java b/blobstore/core/src/main/java/org/jclouds/blobstore/domain/BlobMetadata.java new file mode 100644 index 0000000000..6528d9fb61 --- /dev/null +++ b/blobstore/core/src/main/java/org/jclouds/blobstore/domain/BlobMetadata.java @@ -0,0 +1,243 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.blobstore.domain; + +import static com.google.common.base.Preconditions.checkArgument; +import static com.google.common.base.Preconditions.checkNotNull; + +import java.io.Serializable; +import java.util.Arrays; + +import javax.ws.rs.core.MediaType; + +import org.joda.time.DateTime; + +import com.google.common.collect.HashMultimap; +import com.google.common.collect.Multimap; + +/** + * System and user Metadata for the {@link Blob}. + * + * @author Adrian Cole + */ +public class BlobMetadata implements Comparable, Serializable { + /** The serialVersionUID */ + private static final long serialVersionUID = -5932618957134612231L; + + protected String key; + protected byte[] eTag; + protected volatile long size = -1; + private byte[] contentMD5; + + protected Multimap allHeaders = HashMultimap.create(); + protected Multimap userMetadata = HashMultimap.create(); + protected DateTime lastModified; + protected String dataType = MediaType.APPLICATION_OCTET_STREAM; + + @Override + public String toString() { + StringBuilder builder = new StringBuilder(); + builder.append("BlobMetadata [key=").append(key).append(", eTag=").append( + Arrays.toString(eTag)).append(", lastModified=").append(lastModified).append( + ", size=").append(size).append(", dataType=").append(dataType).append( + ", userMetadata=").append(userMetadata).append("]"); + return builder.toString(); + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((dataType == null) ? 0 : dataType.hashCode()); + result = prime * result + Arrays.hashCode(eTag); + result = prime * result + ((key == null) ? 0 : key.hashCode()); + result = prime * result + ((lastModified == null) ? 0 : lastModified.hashCode()); + result = prime * result + (int) (size ^ (size >>> 32)); + result = prime * result + ((userMetadata == null) ? 0 : userMetadata.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + BlobMetadata other = (BlobMetadata) obj; + if (dataType == null) { + if (other.dataType != null) + return false; + } else if (!dataType.equals(other.dataType)) + return false; + if (!Arrays.equals(eTag, other.eTag)) + return false; + if (key == null) { + if (other.key != null) + return false; + } else if (!key.equals(other.key)) + return false; + if (lastModified == null) { + if (other.lastModified != null) + return false; + } else if (!lastModified.equals(other.lastModified)) + return false; + if (size != other.size) + return false; + if (userMetadata == null) { + if (other.userMetadata != null) + return false; + } else if (!userMetadata.equals(other.userMetadata)) + return false; + return true; + } + + public BlobMetadata() { + super(); + } + + /** + * @param key + * @see #getKey() + */ + public BlobMetadata(String key) { + setKey(key); + } + + public void setKey(String key) { + checkNotNull(key, "key"); + checkArgument(!key.startsWith("/"), "keys cannot start with /"); + this.key = key; + } + + /** + * The key is the handle that you assign to an object that allows you retrieve it later. A key is + * a sequence of Unicode characters whose UTF-8 encoding is at most 1024 bytes long. Each object + * in a bucket must have a unique key. + * + * @see + */ + public String getKey() { + return key; + } + + public DateTime getLastModified() { + return lastModified; + } + + public void setLastModified(DateTime lastModified) { + this.lastModified = lastModified; + } + + /** + * The size of the object, in bytes. + * + * @see + */ + public long getSize() { + return size; + } + + public void setSize(long size) { + this.size = size; + } + + /** + * A standard MIME type describing the format of the contents. If none is provided, the default + * is binary/octet-stream. + * + * @see + */ + public String getContentType() { + return dataType; + } + + public void setContentType(String dataType) { + this.dataType = dataType; + } + + public void setContentMD5(byte[] contentMD5) { + if (contentMD5 != null) { + this.contentMD5 = new byte[contentMD5.length]; + System.arraycopy(contentMD5, 0, this.contentMD5, 0, contentMD5.length); + } + } + + public byte[] getContentMD5() { + if (contentMD5 != null) { + byte[] retval = new byte[contentMD5.length]; + System.arraycopy(this.contentMD5, 0, retval, 0, contentMD5.length); + return retval; + } else { + return null; + } + } + + public void setETag(byte[] eTag) { + if (eTag != null) { + this.eTag = new byte[eTag.length]; + System.arraycopy(eTag, 0, this.eTag, 0, eTag.length); + } + } + + /** + * @return the eTag value stored in the Etag header returned by HTTP. + */ + public byte[] getETag() { + if (eTag != null) { + byte[] retval = new byte[eTag.length]; + System.arraycopy(this.eTag, 0, retval, 0, eTag.length); + return retval; + } else { + return null; + } + } + + public void setUserMetadata(Multimap userMetadata) { + this.userMetadata = userMetadata; + } + + /** + * Any key-value pairs associated with the object. + */ + public Multimap getUserMetadata() { + return userMetadata; + } + + public void setAllHeaders(Multimap allHeaders) { + this.allHeaders = allHeaders; + } + + /** + * @return all http response headers associated with this Value + */ + public Multimap getAllHeaders() { + return allHeaders; + } + + public int compareTo(BlobMetadata o) { + return (this == o) ? 0 : getKey().compareTo(o.getKey()); + } +} \ No newline at end of file diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/domain/ContainerMetadata.java b/blobstore/core/src/main/java/org/jclouds/blobstore/domain/ContainerMetadata.java new file mode 100644 index 0000000000..447b499961 --- /dev/null +++ b/blobstore/core/src/main/java/org/jclouds/blobstore/domain/ContainerMetadata.java @@ -0,0 +1,80 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.blobstore.domain; + +import static com.google.common.base.Preconditions.checkNotNull; + +/** + * System metadata of the Container + * + * @author Adrian Cole + */ +public class ContainerMetadata { + + protected String name; + + /** + * @see #getName() + */ + public ContainerMetadata(String name) { + this.name = checkNotNull(name, "name"); + } + + public ContainerMetadata() { + super(); + } + + public void setName(String name) { + this.name = checkNotNull(name, "name"); + } + + public String getName() { + return name; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((name == null) ? 0 : name.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + ContainerMetadata other = (ContainerMetadata) obj; + if (name == null) { + if (other.name != null) + return false; + } else if (!name.equals(other.name)) + return false; + return true; + } +} \ No newline at end of file diff --git a/aws/s3/core/src/main/java/org/jclouds/aws/s3/functions/S3ObjectKey.java b/blobstore/core/src/main/java/org/jclouds/blobstore/functions/BlobKey.java old mode 100644 new mode 100755 similarity index 80% rename from aws/s3/core/src/main/java/org/jclouds/aws/s3/functions/S3ObjectKey.java rename to blobstore/core/src/main/java/org/jclouds/blobstore/functions/BlobKey.java index 5185c1aa3c..a8eca3ba05 --- a/aws/s3/core/src/main/java/org/jclouds/aws/s3/functions/S3ObjectKey.java +++ b/blobstore/core/src/main/java/org/jclouds/blobstore/functions/BlobKey.java @@ -21,16 +21,18 @@ * under the License. * ==================================================================== */ -package org.jclouds.aws.s3.functions; +package org.jclouds.blobstore.functions; -import org.jclouds.aws.s3.domain.S3Object; +import org.jclouds.blobstore.domain.Blob; +import org.jclouds.blobstore.domain.BlobMetadata; import com.google.common.base.Function; -public class S3ObjectKey implements Function { +public class BlobKey implements Function { + @SuppressWarnings("unchecked") public String apply(Object from) { - return ((S3Object) from).getKey(); + return ((Blob) from).getKey(); } } diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/functions/ParseBlobFromHeadersAndHttpContent.java b/blobstore/core/src/main/java/org/jclouds/blobstore/functions/ParseBlobFromHeadersAndHttpContent.java new file mode 100644 index 0000000000..3440f4aa65 --- /dev/null +++ b/blobstore/core/src/main/java/org/jclouds/blobstore/functions/ParseBlobFromHeadersAndHttpContent.java @@ -0,0 +1,94 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.blobstore.functions; + +import javax.ws.rs.core.HttpHeaders; + +import org.jclouds.blobstore.domain.Blob; +import org.jclouds.blobstore.domain.BlobMetadata; +import org.jclouds.http.HttpException; +import org.jclouds.http.HttpResponse; + +import com.google.common.annotations.VisibleForTesting; +import com.google.common.base.Function; +import com.google.inject.Inject; + +/** + * Parses response headers and creates a new Blob from them and the HTTP content. + * + * @see ParseBlobMetadataFromHeaders + * @author Adrian Cole + */ +public class ParseBlobFromHeadersAndHttpContent> + implements Function { + private final ParseBlobMetadataFromHeaders metadataParser; + private final BlobFactory blobFactory; + + public static interface BlobFactory> { + B create(M metadata); + } + + @Inject + public ParseBlobFromHeadersAndHttpContent(ParseBlobMetadataFromHeaders metadataParser, + BlobFactory blobFactory) { + this.metadataParser = metadataParser; + this.blobFactory = blobFactory; + } + + /** + * First, calls {@link ParseBlobMetadataFromHeaders}. + * + * Then, sets the object size based on the Content-Length header and adds the content to the + * {@link Blob} result. + * + * @throws org.jclouds.http.HttpException + */ + public B apply(HttpResponse from) { + M metadata = metadataParser.apply(from); + B object = blobFactory.create(metadata); + assert object.getMetadata() == metadata; + object.setData(from.getContent()); + parseContentLengthOrThrowException(from, object); + return object; + } + + @VisibleForTesting + void parseContentLengthOrThrowException(HttpResponse from, B object) throws HttpException { + String contentLength = from.getFirstHeaderOrNull(HttpHeaders.CONTENT_LENGTH); + if (contentLength == null) + throw new HttpException(HttpHeaders.CONTENT_LENGTH + " header not present in headers: " + + from.getHeaders()); + object.setContentLength(Long.parseLong(contentLength)); + + String contentRange = from.getFirstHeaderOrNull("Content-Range"); + if (contentRange == null) { + object.getMetadata().setSize(object.getContentLength()); + } else { + object.setContentRange(contentRange); + object.getMetadata().setSize( + Long.parseLong(contentRange.substring(contentRange.lastIndexOf('/') + 1))); + } + } + +} \ No newline at end of file diff --git a/aws/s3/core/src/main/java/org/jclouds/aws/s3/functions/ParseMetadataFromHeaders.java b/blobstore/core/src/main/java/org/jclouds/blobstore/functions/ParseBlobMetadataFromHeaders.java old mode 100644 new mode 100755 similarity index 61% rename from aws/s3/core/src/main/java/org/jclouds/aws/s3/functions/ParseMetadataFromHeaders.java rename to blobstore/core/src/main/java/org/jclouds/blobstore/functions/ParseBlobMetadataFromHeaders.java index 9d7dd622aa..4b0266ddd7 --- a/aws/s3/core/src/main/java/org/jclouds/aws/s3/functions/ParseMetadataFromHeaders.java +++ b/blobstore/core/src/main/java/org/jclouds/blobstore/functions/ParseBlobMetadataFromHeaders.java @@ -21,69 +21,73 @@ * under the License. * ==================================================================== */ -package org.jclouds.aws.s3.functions; +package org.jclouds.blobstore.functions; + +import static org.jclouds.blobstore.reference.BlobStoreConstants.PROPERTY_USER_METADATA_PREFIX; import java.util.Map.Entry; import javax.ws.rs.core.HttpHeaders; -import org.jclouds.aws.s3.domain.S3Object; -import org.jclouds.aws.s3.domain.S3Object.Metadata; -import org.jclouds.aws.s3.reference.S3Headers; +import org.jclouds.blobstore.domain.BlobMetadata; import org.jclouds.http.HttpException; import org.jclouds.http.HttpResponse; import org.jclouds.http.HttpUtils; import org.jclouds.util.DateService; +import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Function; import com.google.inject.Inject; +import com.google.inject.name.Named; /** - * This parses @{link {@link org.jclouds.aws.s3.domain.S3Object.Metadata} from HTTP headers. - * - * @see * @author Adrian Cole */ -public class ParseMetadataFromHeaders implements Function { +public class ParseBlobMetadataFromHeaders implements + Function { private final DateService dateParser; + private final String metadataPrefix; + private final BlobMetadataFactory metadataFactory; - @Inject - public ParseMetadataFromHeaders(DateService dateParser) { - this.dateParser = dateParser; + public static interface BlobMetadataFactory { + M create(String key); } - /** - * parses the http response headers to create a new - * {@link org.jclouds.aws.s3.domain.S3Object.Metadata} object. - */ - public Metadata apply(HttpResponse from) { + @Inject + public ParseBlobMetadataFromHeaders(DateService dateParser, + @Named(PROPERTY_USER_METADATA_PREFIX) String metadataPrefix, + BlobMetadataFactory metadataFactory) { + this.dateParser = dateParser; + this.metadataPrefix = metadataPrefix; + this.metadataFactory = metadataFactory; + } + + public M apply(HttpResponse from) { String objectKey = from.getRequestURL().getPath(); if (objectKey.startsWith("/")) { // Trim initial slash from object key name. objectKey = objectKey.substring(1); } - S3Object.Metadata to = new S3Object.Metadata(objectKey); + M to = metadataFactory.create(objectKey); addAllHeadersTo(from, to); addUserMetadataTo(from, to); addETagTo(from, to); + addContentMD5To(from, to); parseLastModifiedOrThrowException(from, to); setContentTypeOrThrowException(from, to); setContentLengthOrThrowException(from, to); - - to.setCacheControl(from.getFirstHeaderOrNull(HttpHeaders.CACHE_CONTROL)); - to.setContentDisposition(from.getFirstHeaderOrNull("Content-Disposition")); - to.setContentEncoding(from.getFirstHeaderOrNull(HttpHeaders.CONTENT_ENCODING)); return to; } - private void addAllHeadersTo(HttpResponse from, Metadata metadata) { + @VisibleForTesting + void addAllHeadersTo(HttpResponse from, M metadata) { metadata.getAllHeaders().putAll(from.getHeaders()); } - private void setContentTypeOrThrowException(HttpResponse from, Metadata metadata) - throws HttpException { + @VisibleForTesting + void setContentTypeOrThrowException(HttpResponse from, M metadata) throws HttpException { String contentType = from.getFirstHeaderOrNull(HttpHeaders.CONTENT_TYPE); if (contentType == null) throw new HttpException(HttpHeaders.CONTENT_TYPE + " not found in headers"); @@ -91,8 +95,8 @@ public class ParseMetadataFromHeaders implements Function header : from.getHeaders().entries()) { - if (header.getKey() != null && header.getKey().startsWith(S3Headers.USER_METADATA_PREFIX)) - metadata.getUserMetadata().put(header.getKey(), header.getValue()); + if (header.getKey() != null && header.getKey().startsWith(metadataPrefix)) + metadata.getUserMetadata().put( + (header.getKey().substring(metadataPrefix.length())).toLowerCase(), + header.getValue()); } } diff --git a/aws/s3/core/src/main/java/org/jclouds/aws/s3/functions/ReturnS3BucketNotFoundOn404.java b/blobstore/core/src/main/java/org/jclouds/blobstore/functions/ThrowContainerNotFoundOn404.java old mode 100644 new mode 100755 similarity index 76% rename from aws/s3/core/src/main/java/org/jclouds/aws/s3/functions/ReturnS3BucketNotFoundOn404.java rename to blobstore/core/src/main/java/org/jclouds/blobstore/functions/ThrowContainerNotFoundOn404.java index f9c894e9b8..985b09e5c8 --- a/aws/s3/core/src/main/java/org/jclouds/aws/s3/functions/ReturnS3BucketNotFoundOn404.java +++ b/blobstore/core/src/main/java/org/jclouds/blobstore/functions/ThrowContainerNotFoundOn404.java @@ -21,28 +21,28 @@ * under the License. * ==================================================================== */ -package org.jclouds.aws.s3.functions; +package org.jclouds.blobstore.functions; -import org.jclouds.aws.s3.domain.S3Bucket; +import org.jclouds.blobstore.ContainerNotFoundException; import org.jclouds.http.HttpResponseException; import com.google.common.base.Function; /** * - * {@code bucketParser} is only enacted when the http status code is 2xx. Amazon treats NoSuchBucket - * as an exception, while we regard this as a valid response. Accordingly, we check for this {@code - * NoSuchBucket} message and return {@code S3Bucket#NOT_FOUND} if present. + * {@code bucketParser} is only enacted when the http status code is 2xx. We check for Amazon's + * {@code NoSuchBucket} message and throw a ContainerNotFoundException. * * @author James Murty */ -public class ReturnS3BucketNotFoundOn404 implements Function { +public class ThrowContainerNotFoundOn404 implements Function { - public S3Bucket apply(Exception from) { + public Object apply(Exception from) { if (from instanceof HttpResponseException) { HttpResponseException responseException = (HttpResponseException) from; if (responseException.getResponse().getStatusCode() == 404) { - return S3Bucket.NOT_FOUND; + // TODO: parse to get the bucket name + throw new ContainerNotFoundException(from); } } return null; diff --git a/aws/s3/core/src/main/java/org/jclouds/aws/s3/functions/ReturnS3ObjectNotFoundOn404.java b/blobstore/core/src/main/java/org/jclouds/blobstore/functions/ThrowKeyNotFoundOn404.java similarity index 72% rename from aws/s3/core/src/main/java/org/jclouds/aws/s3/functions/ReturnS3ObjectNotFoundOn404.java rename to blobstore/core/src/main/java/org/jclouds/blobstore/functions/ThrowKeyNotFoundOn404.java index 9e45ee5a28..927ff8d7f0 100644 --- a/aws/s3/core/src/main/java/org/jclouds/aws/s3/functions/ReturnS3ObjectNotFoundOn404.java +++ b/blobstore/core/src/main/java/org/jclouds/blobstore/functions/ThrowKeyNotFoundOn404.java @@ -21,20 +21,28 @@ * under the License. * ==================================================================== */ -package org.jclouds.aws.s3.functions; +package org.jclouds.blobstore.functions; -import org.jclouds.aws.s3.domain.S3Object; +import org.jclouds.blobstore.KeyNotFoundException; import org.jclouds.http.HttpResponseException; import com.google.common.base.Function; -public class ReturnS3ObjectNotFoundOn404 implements Function { +/** + * + * {@code bucketParser} is only enacted when the http status code is 2xx. We check for Amazon's + * {@code NoSuchKey} message and throw a ContainerNotFoundException. + * + * @author James Murty + */ +public class ThrowKeyNotFoundOn404 implements Function { - public S3Object apply(Exception from) { + public Object apply(Exception from) { if (from instanceof HttpResponseException) { HttpResponseException responseException = (HttpResponseException) from; if (responseException.getResponse().getStatusCode() == 404) { - return S3Object.NOT_FOUND; + // TODO: parse to get the container and key name + throw new KeyNotFoundException(from); } } return null; diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/reference/BlobStoreConstants.java b/blobstore/core/src/main/java/org/jclouds/blobstore/reference/BlobStoreConstants.java new file mode 100755 index 0000000000..6f2654e03f --- /dev/null +++ b/blobstore/core/src/main/java/org/jclouds/blobstore/reference/BlobStoreConstants.java @@ -0,0 +1,46 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.blobstore.reference; + +/** + * Configuration properties and constants used in BlobStore connections. + * + * @author Adrian Cole + */ +public interface BlobStoreConstants { + + /** + * longest time a single synchronous operation can take before throwing an exception. + */ + public static final String PROPERTY_BLOBSTORE_TIMEOUT = "jclouds.blobstore.timeout"; + /** + * time to pause before retrying a transient failure + */ + public static final String PROPERTY_BLOBSTORE_RETRY = "jclouds.blobstore.retry"; + /** + * Any header starting with this prefix is considered user metadata. It will be stored with the + * object and returned when you retrieve the object/ + */ + public static final String PROPERTY_USER_METADATA_PREFIX = "jclouds.blobstore.metaprefix"; +} diff --git a/keyvaluestore/core/src/main/java/org/jclouds/keyvaluestore/reference/package-info.java b/blobstore/core/src/main/java/org/jclouds/blobstore/reference/package-info.java similarity index 90% rename from keyvaluestore/core/src/main/java/org/jclouds/keyvaluestore/reference/package-info.java rename to blobstore/core/src/main/java/org/jclouds/blobstore/reference/package-info.java index 9ead15c260..5f76bd1d52 100755 --- a/keyvaluestore/core/src/main/java/org/jclouds/keyvaluestore/reference/package-info.java +++ b/blobstore/core/src/main/java/org/jclouds/blobstore/reference/package-info.java @@ -22,7 +22,7 @@ * ==================================================================== */ /** - * This package contains properties and reference data used in S3. + * This package contains properties and reference data used in blob service. * @author Adrian Cole */ -package org.jclouds.keyvaluestore.reference; \ No newline at end of file +package org.jclouds.blobstore.reference; \ No newline at end of file diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/util/BlobStoreUtils.java b/blobstore/core/src/main/java/org/jclouds/blobstore/util/BlobStoreUtils.java new file mode 100644 index 0000000000..2219ce10fb --- /dev/null +++ b/blobstore/core/src/main/java/org/jclouds/blobstore/util/BlobStoreUtils.java @@ -0,0 +1,58 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.blobstore.util; + +import static com.google.common.base.Preconditions.checkNotNull; + +import java.io.IOException; +import java.io.InputStream; + +import org.jclouds.blobstore.domain.Blob; +import org.jclouds.blobstore.domain.BlobMetadata; +import org.jclouds.util.Utils; + +/** + * Encryption, Hashing, and IO Utilities needed to sign and verify S3 requests and responses. + * + * @author Adrian Cole + */ +public class BlobStoreUtils { + + public static String getContentAsStringAndClose(Blob object) + throws IOException { + checkNotNull(object, "s3Object"); + checkNotNull(object.getData(), "s3Object.content"); + Object o = object.getData(); + + if (o instanceof InputStream) { + String returnVal = Utils.toStringAndClose((InputStream) o); + if (object.getMetadata().getContentType().indexOf("xml") >= 0) { + + } + return returnVal; + } else { + throw new IllegalArgumentException("Object type not supported: " + o.getClass().getName()); + } + } +} \ No newline at end of file diff --git a/aws/s3/core/src/test/java/org/jclouds/aws/s3/internal/BaseS3MapTest.java b/blobstore/core/src/test/java/org/jclouds/blobstore/BaseBlobMapTest.java old mode 100644 new mode 100755 similarity index 67% rename from aws/s3/core/src/test/java/org/jclouds/aws/s3/internal/BaseS3MapTest.java rename to blobstore/core/src/test/java/org/jclouds/blobstore/BaseBlobMapTest.java index 47a29c3ef9..74d69df567 --- a/aws/s3/core/src/test/java/org/jclouds/aws/s3/internal/BaseS3MapTest.java +++ b/blobstore/core/src/test/java/org/jclouds/blobstore/BaseBlobMapTest.java @@ -21,7 +21,7 @@ * under the License. * ==================================================================== */ -package org.jclouds.aws.s3.internal; +package org.jclouds.blobstore; import static org.easymock.EasyMock.expect; import static org.easymock.classextension.EasyMock.createMock; @@ -37,8 +37,9 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import org.jclouds.aws.s3.S3Connection; -import org.jclouds.aws.s3.domain.S3Object; +import org.jclouds.blobstore.domain.Blob; +import org.jclouds.blobstore.domain.BlobMetadata; +import org.jclouds.blobstore.domain.ContainerMetadata; import org.testng.annotations.Test; /** @@ -47,13 +48,14 @@ import org.testng.annotations.Test; * * @author Adrian Cole */ -@Test(groups = { "unit" }, testName = "s3.BaseS3MapTest") -public class BaseS3MapTest { +@Test(groups = { "unit" }, testName = "blobstore.BaseBlobMapTest") +public abstract class BaseBlobMapTest, V> { - class MockBaseS3Map extends BaseS3Map { + class MockBaseBlobMap extends BaseBlobMap { - public MockBaseS3Map() { - super(createNiceMock(S3Connection.class), "bucket"); + @SuppressWarnings("unchecked") + public MockBaseBlobMap(String container) { + super(createNiceMock(BlobStore.class), container); } public Set> entrySet() { @@ -85,39 +87,46 @@ public class BaseS3MapTest { @SuppressWarnings("unchecked") public void testIfNotFoundRetryOtherwiseAddToSet() throws InterruptedException, ExecutionException, TimeoutException { - BaseS3Map map = new MockBaseS3Map(); - Future futureObject = createMock(Future.class); - S3Object object = createNiceMock(S3Object.class); - expect(futureObject.get(map.requestTimeoutMilliseconds, TimeUnit.MILLISECONDS)).andReturn( - S3Object.NOT_FOUND); + BaseBlobMap map = new MockBaseBlobMap("test"); + Future futureObject = createMock(Future.class); + B object = createBlob(); + expect(futureObject.get(map.requestTimeoutMilliseconds, TimeUnit.MILLISECONDS)).andThrow( + new KeyNotFoundException()); expect(futureObject.get(map.requestTimeoutMilliseconds, TimeUnit.MILLISECONDS)).andReturn( object); replay(futureObject); - Set objects = new HashSet(); + Set objects = new HashSet(); long time = System.currentTimeMillis(); - map.ifNotFoundRetryOtherwiseAddToSet(futureObject, objects); + map.ifNotFoundRetryOtherwiseAddToSet("key", futureObject, objects); // should have retried once assert System.currentTimeMillis() >= time + map.requestRetryMilliseconds; assert objects.contains(object); - assert !objects.contains(S3Object.NOT_FOUND); + assert !objects.contains(null); } + protected abstract B createBlob(); + @SuppressWarnings("unchecked") public void testIfNotFoundRetryOtherwiseAddToSetButNeverGetsIt() throws InterruptedException, ExecutionException, TimeoutException { - BaseS3Map map = new MockBaseS3Map(); - Future futureObject = createMock(Future.class); - S3Object object = createNiceMock(S3Object.class); - expect(futureObject.get(map.requestTimeoutMilliseconds, TimeUnit.MILLISECONDS)).andReturn( - S3Object.NOT_FOUND).atLeastOnce(); + BaseBlobMap map = new MockBaseBlobMap("test"); + Future futureObject = createMock(Future.class); + Blob object = createNiceMock(Blob.class); + expect(futureObject.get(map.requestTimeoutMilliseconds, TimeUnit.MILLISECONDS)).andThrow( + new KeyNotFoundException()).atLeastOnce(); replay(futureObject); - Set objects = new HashSet(); + Set objects = new HashSet(); long time = System.currentTimeMillis(); - map.ifNotFoundRetryOtherwiseAddToSet(futureObject, objects); + map.ifNotFoundRetryOtherwiseAddToSet("key", futureObject, objects); // should have retried thrice assert System.currentTimeMillis() >= time + map.requestRetryMilliseconds * 3; assert !objects.contains(object); - assert !objects.contains(S3Object.NOT_FOUND); + assert !objects.contains(null); + } + + @Test(expectedExceptions = IllegalArgumentException.class) + public void testBlankContainerName() { + new MockBaseBlobMap("test"); } } \ No newline at end of file diff --git a/aws/s3/core/src/test/java/org/jclouds/aws/s3/domain/S3ObjectTest.java b/blobstore/core/src/test/java/org/jclouds/blobstore/domain/BlobTest.java similarity index 64% rename from aws/s3/core/src/test/java/org/jclouds/aws/s3/domain/S3ObjectTest.java rename to blobstore/core/src/test/java/org/jclouds/blobstore/domain/BlobTest.java index 9cb38804c5..ad8503c240 100644 --- a/aws/s3/core/src/test/java/org/jclouds/aws/s3/domain/S3ObjectTest.java +++ b/blobstore/core/src/test/java/org/jclouds/blobstore/domain/BlobTest.java @@ -21,7 +21,7 @@ * under the License. * ==================================================================== */ -package org.jclouds.aws.s3.domain; +package org.jclouds.blobstore.domain; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotSame; @@ -32,25 +32,24 @@ import javax.ws.rs.core.MediaType; import org.testng.annotations.Test; -@Test(groups = "unit", testName = "s3.S3ObjectTest") -public class S3ObjectTest { +@Test(groups = "unit", testName = "blobstore.BlobTest") +public class BlobTest { + + @Test + void testSetNoContentType() { + Blob object = new Blob("test"); + File file = new File("hello.txt"); + object.setData(file); + assertEquals(object.getMetadata().getContentType(), MediaType.APPLICATION_OCTET_STREAM); + } + + @Test + void testETagCopyingNotReference() { + byte[] eTag = new byte[12]; + Blob object = new Blob("test"); + object.getMetadata().setETag(eTag); + byte[] returnedETag = object.getMetadata().getETag(); + assertNotSame(eTag, returnedETag); + } - @Test - void testSetNoContentType() { - S3Object object = new S3Object("test"); - File file = new File("hello.txt"); - object.setData(file); - assertEquals(object.getMetadata().getContentType(), - MediaType.APPLICATION_OCTET_STREAM); - } - - @Test - void testETagCopyingNotReference() { - byte[] eTag = new byte[12]; - S3Object object = new S3Object("test"); - object.getMetadata().setETag(eTag); - byte[] returnedETag = object.getMetadata().getETag(); - assertNotSame(eTag, returnedETag); - } - } diff --git a/aws/s3/core/src/test/java/org/jclouds/aws/s3/functions/ParseObjectFromHeadersAndHttpContentTest.java b/blobstore/core/src/test/java/org/jclouds/blobstore/functions/ParseBlobFromHeadersAndHttpContentTest.java old mode 100644 new mode 100755 similarity index 57% rename from aws/s3/core/src/test/java/org/jclouds/aws/s3/functions/ParseObjectFromHeadersAndHttpContentTest.java rename to blobstore/core/src/test/java/org/jclouds/blobstore/functions/ParseBlobFromHeadersAndHttpContentTest.java index 0282598b43..bc612db087 --- a/aws/s3/core/src/test/java/org/jclouds/aws/s3/functions/ParseObjectFromHeadersAndHttpContentTest.java +++ b/blobstore/core/src/test/java/org/jclouds/blobstore/functions/ParseBlobFromHeadersAndHttpContentTest.java @@ -21,7 +21,7 @@ * under the License. * ==================================================================== */ -package org.jclouds.aws.s3.functions; +package org.jclouds.blobstore.functions; import static org.easymock.EasyMock.expect; import static org.easymock.classextension.EasyMock.createMock; @@ -31,46 +31,60 @@ import static org.testng.Assert.assertEquals; import javax.ws.rs.core.HttpHeaders; import org.apache.commons.io.IOUtils; -import org.jclouds.aws.s3.domain.S3Object; -import org.jclouds.aws.s3.domain.S3Object.Metadata; -import org.jclouds.aws.s3.functions.ParseMetadataFromHeaders; -import org.jclouds.aws.s3.functions.ParseObjectFromHeadersAndHttpContent; +import org.jclouds.blobstore.domain.Blob; +import org.jclouds.blobstore.domain.BlobMetadata; import org.jclouds.http.HttpException; import org.jclouds.http.HttpResponse; import org.testng.annotations.Test; +import com.google.common.collect.ImmutableMultimap; + /** * @author Adrian Cole */ -@Test(groups = "unit", testName = "s3.ParseObjectFromHeadersAndHttpContentTest") -public class ParseObjectFromHeadersAndHttpContentTest { +public class ParseBlobFromHeadersAndHttpContentTest { + @SuppressWarnings("unchecked") @Test(expectedExceptions = NullPointerException.class) public void testCall() throws HttpException { - ParseMetadataFromHeaders metadataParser = createMock(ParseMetadataFromHeaders.class); - ParseObjectFromHeadersAndHttpContent callable = new ParseObjectFromHeadersAndHttpContent( - metadataParser); + ParseBlobMetadataFromHeaders metadataParser = createMock(ParseBlobMetadataFromHeaders.class); + ParseBlobFromHeadersAndHttpContent.BlobFactory> objectFactory = createMock(ParseBlobFromHeadersAndHttpContent.BlobFactory.class); + ParseBlobFromHeadersAndHttpContent> callable = new ParseBlobFromHeadersAndHttpContent( + metadataParser, objectFactory); HttpResponse response = createMock(HttpResponse.class); - expect(response.getStatusCode()).andReturn(409).atLeastOnce(); + expect(response.getFirstHeaderOrNull("Content-Length")).andReturn("100"); + expect(response.getFirstHeaderOrNull("Content-Range")).andReturn(null); + expect(response.getHeaders()).andReturn(ImmutableMultimap.of("Content-Length", "100")); expect(response.getContent()).andReturn(null); replay(response); callable.apply(response); } + @SuppressWarnings("unchecked") @Test public void testParseContentLengthWhenContentRangeSet() throws HttpException { - ParseMetadataFromHeaders metadataParser = createMock(ParseMetadataFromHeaders.class); - ParseObjectFromHeadersAndHttpContent callable = new ParseObjectFromHeadersAndHttpContent( - metadataParser); + ParseBlobMetadataFromHeaders metadataParser = createMock(ParseBlobMetadataFromHeaders.class); + ParseBlobFromHeadersAndHttpContent.BlobFactory> objectFactory = new ParseBlobFromHeadersAndHttpContent.BlobFactory>() { + + public Blob create(BlobMetadata metadata) { + return new Blob(metadata); + } + + }; + ParseBlobFromHeadersAndHttpContent> callable = new ParseBlobFromHeadersAndHttpContent( + metadataParser, objectFactory); HttpResponse response = createMock(HttpResponse.class); - Metadata meta = createMock(Metadata.class); + BlobMetadata meta = createMock(BlobMetadata.class); expect(metadataParser.apply(response)).andReturn(meta); expect(meta.getSize()).andReturn(-1l); meta.setSize(-1l); expect(response.getFirstHeaderOrNull(HttpHeaders.CONTENT_LENGTH)).andReturn("10485760") .atLeastOnce(); - expect(response.getFirstHeaderOrNull("Content-Range")).andReturn( - "0-10485759/20232760").atLeastOnce(); + expect(response.getFirstHeaderOrNull("Content-Range")).andReturn("0-10485759/20232760") + .atLeastOnce(); + expect(response.getHeaders()).andReturn( + ImmutableMultimap.of("Content-Length", "10485760", "Content-Range", + "0-10485759/20232760")); meta.setSize(20232760l); expect(meta.getSize()).andReturn(20232760l); @@ -80,7 +94,7 @@ public class ParseObjectFromHeadersAndHttpContentTest { replay(metadataParser); replay(meta); - S3Object object = callable.apply(response); + Blob object = callable.apply(response); assertEquals(object.getContentLength(), 10485760); assertEquals(object.getMetadata().getSize(), 20232760); assertEquals(object.getContentRange(), "0-10485759/20232760"); diff --git a/blobstore/core/src/test/java/org/jclouds/blobstore/functions/ParseBlobMetadataFromHeadersTest.java b/blobstore/core/src/test/java/org/jclouds/blobstore/functions/ParseBlobMetadataFromHeadersTest.java new file mode 100644 index 0000000000..0091721732 --- /dev/null +++ b/blobstore/core/src/test/java/org/jclouds/blobstore/functions/ParseBlobMetadataFromHeadersTest.java @@ -0,0 +1,137 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.blobstore.functions; + +import static org.testng.Assert.assertEquals; + +import java.net.URI; +import java.util.Collections; + +import javax.ws.rs.core.HttpHeaders; +import javax.ws.rs.core.MediaType; + +import org.jclouds.blobstore.domain.BlobMetadata; +import org.jclouds.blobstore.functions.ParseBlobMetadataFromHeaders.BlobMetadataFactory; +import org.jclouds.http.HttpException; +import org.jclouds.http.HttpResponse; +import org.jclouds.http.HttpUtils; +import org.jclouds.util.DateService; +import org.testng.annotations.BeforeTest; +import org.testng.annotations.Test; + +import com.google.common.collect.ImmutableMultimap; +import com.google.common.collect.Multimap; + +public class ParseBlobMetadataFromHeadersTest { + + private ParseBlobMetadataFromHeaders parser; + + @BeforeTest + void setUp() { + parser = new ParseBlobMetadataFromHeaders(new DateService(), "prefix", + new BlobMetadataFactory() { + public BlobMetadata create(String key) { + return new BlobMetadata(key); + } + }); + } + + @Test + public void testAddAllHeadersTo() { + Multimap allHeaders = ImmutableMultimap.of("key", "value"); + HttpResponse from = new HttpResponse(URI.create("http://localhost")); + from.setHeaders(allHeaders); + BlobMetadata metadata = new BlobMetadata("test"); + parser.addAllHeadersTo(from, metadata); + assertEquals(metadata.getAllHeaders().get("key"), Collections.singletonList("value")); + } + + @Test + public void testSetContentLength() { + HttpResponse from = new HttpResponse(URI.create("http://localhost")); + from.getHeaders().put(HttpHeaders.CONTENT_LENGTH, "100"); + BlobMetadata metadata = new BlobMetadata("test"); + parser.setContentLengthOrThrowException(from, metadata); + assertEquals(metadata.getSize(), 100); + } + + @Test(expectedExceptions = HttpException.class) + public void testSetContentLengthException() { + HttpResponse from = new HttpResponse(URI.create("http://localhost")); + BlobMetadata metadata = new BlobMetadata("test"); + parser.setContentLengthOrThrowException(from, metadata); + } + + @Test + public void testSetContentType() { + HttpResponse from = new HttpResponse(URI.create("http://localhost")); + from.getHeaders().put(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON); + BlobMetadata metadata = new BlobMetadata("test"); + parser.setContentTypeOrThrowException(from, metadata); + assertEquals(metadata.getContentType(), MediaType.APPLICATION_JSON); + } + + @Test(expectedExceptions = HttpException.class) + public void testSetContentTypeException() { + HttpResponse from = new HttpResponse(URI.create("http://localhost")); + BlobMetadata metadata = new BlobMetadata("test"); + parser.setContentTypeOrThrowException(from, metadata); + } + + @Test + public void testSetLastModified() { + HttpResponse from = new HttpResponse(URI.create("http://localhost")); + from.getHeaders().put(HttpHeaders.LAST_MODIFIED, "Wed, 09 Sep 2009 19:50:23 GMT"); + BlobMetadata metadata = new BlobMetadata("test"); + parser.parseLastModifiedOrThrowException(from, metadata); + assertEquals(metadata.getLastModified(), new DateService() + .rfc822DateParse("Wed, 09 Sep 2009 19:50:23 GMT")); + } + + @Test(expectedExceptions = NullPointerException.class) + public void testSetLastModifiedException() { + HttpResponse from = new HttpResponse(URI.create("http://localhost")); + BlobMetadata metadata = new BlobMetadata("test"); + parser.parseLastModifiedOrThrowException(from, metadata); + } + + @Test + public void testAddETagTo() { + HttpResponse from = new HttpResponse(URI.create("http://localhost")); + from.getHeaders().put(HttpHeaders.ETAG, "0xfeb"); + BlobMetadata metadata = new BlobMetadata("test"); + parser.addETagTo(from, metadata); + assertEquals(metadata.getETag(), HttpUtils.fromHexString("0xfeb")); + } + + @Test + public void testAddUserMetadataTo() { + Multimap allHeaders = ImmutableMultimap.of("prefix" + "key", "value"); + HttpResponse from = new HttpResponse(URI.create("http://localhost")); + from.setHeaders(allHeaders); + BlobMetadata metadata = new BlobMetadata("test"); + parser.addUserMetadataTo(from, metadata); + assertEquals(metadata.getUserMetadata().get("key"), Collections.singletonList("value")); + } +} diff --git a/blobstore/core/src/test/java/org/jclouds/blobstore/integration/StubBlobIntegrationTest.java b/blobstore/core/src/test/java/org/jclouds/blobstore/integration/StubBlobIntegrationTest.java new file mode 100755 index 0000000000..9b5bbbaba6 --- /dev/null +++ b/blobstore/core/src/test/java/org/jclouds/blobstore/integration/StubBlobIntegrationTest.java @@ -0,0 +1,42 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.blobstore.integration; + +import org.jclouds.blobstore.BlobStore; +import org.jclouds.blobstore.domain.Blob; +import org.jclouds.blobstore.domain.BlobMetadata; +import org.jclouds.blobstore.domain.ContainerMetadata; +import org.jclouds.blobstore.integration.internal.BaseBlobIntegrationTest; +import org.testng.annotations.Test; + +/** + * + * @author James Murty + * @author Adrian Cole + */ +@Test(groups = { "integration"}, testName = "blobstore.StubBlobIntegrationTest") +public class StubBlobIntegrationTest extends + BaseBlobIntegrationTest>, ContainerMetadata, BlobMetadata, Blob> { + +} \ No newline at end of file diff --git a/blobstore/core/src/test/java/org/jclouds/blobstore/integration/StubBlobMapIntegrationTest.java b/blobstore/core/src/test/java/org/jclouds/blobstore/integration/StubBlobMapIntegrationTest.java new file mode 100644 index 0000000000..ecb98dc0bb --- /dev/null +++ b/blobstore/core/src/test/java/org/jclouds/blobstore/integration/StubBlobMapIntegrationTest.java @@ -0,0 +1,41 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.blobstore.integration; + +import org.jclouds.blobstore.BlobStore; +import org.jclouds.blobstore.domain.Blob; +import org.jclouds.blobstore.domain.BlobMetadata; +import org.jclouds.blobstore.domain.ContainerMetadata; +import org.jclouds.blobstore.integration.internal.BaseBlobMapIntegrationTest; +import org.testng.annotations.Test; + +/** + * @author Adrian Cole + */ + +@Test(groups = { "integration", "live" }, testName = "blobstore.StubBlobMapIntegrationTest") +public class StubBlobMapIntegrationTest extends + BaseBlobMapIntegrationTest>, ContainerMetadata, BlobMetadata, Blob> { + +} \ No newline at end of file diff --git a/blobstore/core/src/test/java/org/jclouds/blobstore/integration/StubContainerIntegrationTest.java b/blobstore/core/src/test/java/org/jclouds/blobstore/integration/StubContainerIntegrationTest.java new file mode 100755 index 0000000000..35fa2f6a3b --- /dev/null +++ b/blobstore/core/src/test/java/org/jclouds/blobstore/integration/StubContainerIntegrationTest.java @@ -0,0 +1,42 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.blobstore.integration; + +import org.jclouds.blobstore.BlobStore; +import org.jclouds.blobstore.domain.Blob; +import org.jclouds.blobstore.domain.BlobMetadata; +import org.jclouds.blobstore.domain.ContainerMetadata; +import org.jclouds.blobstore.integration.internal.BaseContainerIntegrationTest; +import org.testng.annotations.Test; + +/** + * @author James Murty + * @author Adrian Cole + */ +@Test(groups = { "integration", "live" }, testName = "blobstore.StubContainerIntegrationTest") +public class StubContainerIntegrationTest + extends + BaseContainerIntegrationTest>, ContainerMetadata, BlobMetadata, Blob> { + +} \ No newline at end of file diff --git a/blobstore/core/src/test/java/org/jclouds/blobstore/integration/StubInputStreamMapIntegrationTest.java b/blobstore/core/src/test/java/org/jclouds/blobstore/integration/StubInputStreamMapIntegrationTest.java new file mode 100644 index 0000000000..bdbc9c7424 --- /dev/null +++ b/blobstore/core/src/test/java/org/jclouds/blobstore/integration/StubInputStreamMapIntegrationTest.java @@ -0,0 +1,40 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.blobstore.integration; + +import org.jclouds.blobstore.BlobStore; +import org.jclouds.blobstore.domain.Blob; +import org.jclouds.blobstore.domain.BlobMetadata; +import org.jclouds.blobstore.domain.ContainerMetadata; +import org.jclouds.blobstore.integration.internal.BaseInputStreamMapIntegrationTest; +import org.testng.annotations.Test; + +/** + * @author Adrian Cole + */ +@Test(groups = { "integration", "live" }, testName = "blobstore.StubInputStreamMapIntegrationTest") +public class StubInputStreamMapIntegrationTest extends + BaseInputStreamMapIntegrationTest>, ContainerMetadata, BlobMetadata, Blob> { + +} \ No newline at end of file diff --git a/blobstore/core/src/test/java/org/jclouds/blobstore/integration/StubServiceIntegrationTest.java b/blobstore/core/src/test/java/org/jclouds/blobstore/integration/StubServiceIntegrationTest.java new file mode 100644 index 0000000000..ac5b96059e --- /dev/null +++ b/blobstore/core/src/test/java/org/jclouds/blobstore/integration/StubServiceIntegrationTest.java @@ -0,0 +1,41 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.blobstore.integration; + +import org.jclouds.blobstore.BlobStore; +import org.jclouds.blobstore.domain.Blob; +import org.jclouds.blobstore.domain.BlobMetadata; +import org.jclouds.blobstore.domain.ContainerMetadata; +import org.jclouds.blobstore.integration.internal.BaseServiceIntegrationTest; +import org.testng.annotations.Test; + +/** + * @author Adrian Cole + */ +@Test(groups = { "integration", "live" }, testName = "blobstore.StubServiceIntegrationTest") +public class StubServiceIntegrationTest + extends + BaseServiceIntegrationTest>, ContainerMetadata, BlobMetadata, Blob> { + +} \ No newline at end of file diff --git a/blobstore/core/src/test/java/org/jclouds/blobstore/integration/StubTestInitializer.java b/blobstore/core/src/test/java/org/jclouds/blobstore/integration/StubTestInitializer.java new file mode 100644 index 0000000000..6d9567c731 --- /dev/null +++ b/blobstore/core/src/test/java/org/jclouds/blobstore/integration/StubTestInitializer.java @@ -0,0 +1,296 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.blobstore.integration; + +import java.io.IOException; +import java.net.URI; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.concurrent.ConcurrentHashMap; + +import javax.annotation.Resource; + +import org.jclouds.blobstore.BlobMap; +import org.jclouds.blobstore.BlobStore; +import org.jclouds.blobstore.BlobStoreContext; +import org.jclouds.blobstore.InputStreamMap; +import org.jclouds.blobstore.LiveBlobMap; +import org.jclouds.blobstore.LiveInputStreamMap; +import org.jclouds.blobstore.domain.Blob; +import org.jclouds.blobstore.domain.BlobMetadata; +import org.jclouds.blobstore.domain.ContainerMetadata; +import org.jclouds.blobstore.integration.internal.BaseBlobStoreIntegrationTest; +import org.jclouds.blobstore.integration.internal.StubBlobStore; +import org.jclouds.blobstore.integration.internal.BaseBlobStoreIntegrationTest.BlobStoreObjectFactory; +import org.jclouds.cloud.CloudContextBuilder; +import org.jclouds.lifecycle.Closer; +import org.jclouds.logging.Logger; +import org.testng.ITestContext; + +import com.google.inject.AbstractModule; +import com.google.inject.Inject; +import com.google.inject.Injector; +import com.google.inject.Key; +import com.google.inject.Module; +import com.google.inject.Scopes; +import com.google.inject.TypeLiteral; +import com.google.inject.assistedinject.Assisted; +import com.google.inject.assistedinject.FactoryProvider; + +/** + * + * @author Adrian Cole + */ +public class StubTestInitializer + implements + BaseBlobStoreIntegrationTest.TestInitializer>, ContainerMetadata, BlobMetadata, Blob> { + + public BaseBlobStoreIntegrationTest.TestInitializer.Result>, ContainerMetadata, BlobMetadata, Blob> init( + Module configurationModule, ITestContext testContext) throws Exception { + + final StubBlobStoreContext context = createStubContext(); + assert context != null; + + final BlobStore> client = context + .getApi(); + assert client != null; + + final BlobStoreObjectFactory> objectFactory = new BaseBlobStoreIntegrationTest.BlobStoreObjectFactory>() { + + public Blob createBlob(String key) { + return new Blob(key); + + } + + public ContainerMetadata createContainerMetadata(String key) { + return new ContainerMetadata(key); + } + + }; + assert objectFactory != null; + + return new BaseBlobStoreIntegrationTest.TestInitializer.Result>, ContainerMetadata, BlobMetadata, Blob>() { + + public BlobStore> getClient() { + return client; + } + + public BlobStoreContext>, BlobMetadata, Blob> getContext() { + return context; + } + + public BlobStoreObjectFactory> getObjectFactory() { + return objectFactory; + } + + }; + } + + protected StubBlobStoreContext createStubContext() { + return new StubContextBuilder().buildContext(); + } + + public static interface BlobMapFactory { + BlobMap> createMapView(String bucket); + } + + public static interface InputStreamMapFactory { + InputStreamMap createMapView(String bucket); + } + + public static class GuiceStubBlobStoreContext implements StubBlobStoreContext { + + @Resource + private Logger logger = Logger.NULL; + private final Injector injector; + private final InputStreamMapFactory s3InputStreamMapFactory; + private final BlobMapFactory s3ObjectMapFactory; + private final Closer closer; + + @Inject + private GuiceStubBlobStoreContext(Injector injector, Closer closer, + BlobMapFactory s3ObjectMapFactory, InputStreamMapFactory s3InputStreamMapFactory) { + this.injector = injector; + this.s3InputStreamMapFactory = s3InputStreamMapFactory; + this.s3ObjectMapFactory = s3ObjectMapFactory; + this.closer = closer; + } + + /** + * {@inheritDoc} + */ + public InputStreamMap createInputStreamMap(String bucket) { + getApi().createContainer(bucket); + return s3InputStreamMapFactory.createMapView(bucket); + } + + /** + * {@inheritDoc} + */ + public BlobMap> createBlobMap(String bucket) { + getApi().createContainer(bucket); + return s3ObjectMapFactory.createMapView(bucket); + } + + /** + * {@inheritDoc} + * + * @see Closer + */ + public void close() { + try { + closer.close(); + } catch (IOException e) { + logger.error(e, "error closing content"); + } + } + + public String getAccount() { + // throw org.jboss.util.NotImplementedException("FIXME NYI getAccount"); + return null; + } + + public URI getEndPoint() { + // throw org.jboss.util.NotImplementedException("FIXME NYI getEndPoint"); + return null; + } + + public BlobStore> getApi() { + return injector + .getInstance(Key + .get(new TypeLiteral>>() { + })); + } + + } + + public interface StubBlobStoreContext + extends + BlobStoreContext>, BlobMetadata, Blob> { + + } + + public static class StubContextBuilder extends CloudContextBuilder { + + public StubContextBuilder() { + super(new Properties()); + } + + public void authenticate(String id, String secret) { + } + + public StubBlobStoreContext buildContext() { + return buildInjector().getInstance(StubBlobStoreContext.class); + } + + protected void addParserModule(List modules) { + } + + protected void addContextModule(List modules) { + modules.add(new AbstractModule() { + + @Override + protected void configure() { + + requireBinding(TestStubBlobStore.class); + bind(URI.class).toInstance(URI.create("http://localhost:8080")); + bind(new TypeLiteral() { + }) + .toProvider( + FactoryProvider + .newFactory( + new TypeLiteral() { + }, + new TypeLiteral>>() { + })); + bind(new TypeLiteral() { + }).toProvider(FactoryProvider.newFactory(new TypeLiteral() { + }, new TypeLiteral() { + })); + bind(StubBlobStoreContext.class).to(GuiceStubBlobStoreContext.class); + } + }); + } + + protected void addConnectionModule(List modules) { + modules.add(new AbstractModule() { + + @Override + protected void configure() { + bind( + new TypeLiteral>>() { + }).to(TestStubBlobStore.class).in(Scopes.SINGLETON); + } + + }); + } + } + + public static class StubInputStreamMap extends + LiveInputStreamMap> { + + @Inject + public StubInputStreamMap( + BlobStore> connection, + @Assisted String container) { + super(connection, container); + } + + @Override + protected Blob createBlob(String s) { + return new Blob(s); + } + + } + + public static class TestStubBlobStore extends + StubBlobStore> { + /** + * note this must be final and static so that tests coming from multiple threads will pass. + */ + private static final Map>> containerToBlobs = new ConcurrentHashMap>>(); + + @Override + public Map>> getContainerToBlobs() { + return containerToBlobs; + } + + @Override + protected Blob createBlob(String name) { + return new Blob(name); + } + + @Override + protected Blob createBlob(BlobMetadata metadata) { + return new Blob(metadata); + } + + @Override + protected ContainerMetadata createContainerMetadata(String name) { + return new ContainerMetadata(name); + } + + } +} \ No newline at end of file diff --git a/blobstore/core/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobIntegrationTest.java b/blobstore/core/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobIntegrationTest.java new file mode 100755 index 0000000000..a5ae023f99 --- /dev/null +++ b/blobstore/core/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobIntegrationTest.java @@ -0,0 +1,385 @@ +/** + * + * Copyright (C) 2009 Global Cloud Specialists, Inc. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +package org.jclouds.blobstore.integration.internal; + +import static org.jclouds.http.options.GetOptions.Builder.ifETagDoesntMatch; +import static org.jclouds.http.options.GetOptions.Builder.ifETagMatches; +import static org.jclouds.http.options.GetOptions.Builder.ifModifiedSince; +import static org.jclouds.http.options.GetOptions.Builder.ifUnmodifiedSince; +import static org.jclouds.http.options.GetOptions.Builder.range; +import static org.jclouds.http.options.GetOptions.Builder.startAt; +import static org.jclouds.http.options.GetOptions.Builder.tail; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotNull; + +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.Collections; +import java.util.List; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; + +import org.apache.commons.io.IOUtils; +import org.jclouds.blobstore.BlobStore; +import org.jclouds.blobstore.domain.Blob; +import org.jclouds.blobstore.domain.BlobMetadata; +import org.jclouds.blobstore.domain.ContainerMetadata; +import org.jclouds.blobstore.util.BlobStoreUtils; +import org.jclouds.http.HttpResponseException; +import org.jclouds.http.HttpUtils; +import org.joda.time.DateTime; +import org.testng.annotations.DataProvider; +import org.testng.annotations.Test; + +/** + * @author Adrian Cole + */ +public class BaseBlobIntegrationTest, C extends ContainerMetadata, M extends BlobMetadata, B extends Blob> + extends BaseBlobStoreIntegrationTest { + + @Test(groups = { "integration", "live" }) + public void testGetIfModifiedSince() throws InterruptedException, ExecutionException, + TimeoutException, IOException { + String containerName = getContainerName(); + try { + String key = "apples"; + + DateTime before = new DateTime().minusSeconds(1); + addObjectAndValidateContent(containerName, key); + DateTime after = new DateTime().plusSeconds(1); + + client.getBlob(containerName, key, ifModifiedSince(before)).get(10, TimeUnit.SECONDS); + validateContent(containerName, key); + + try { + client.getBlob(containerName, key, ifModifiedSince(after)).get(10, TimeUnit.SECONDS); + validateContent(containerName, key); + } catch (ExecutionException e) { + if (e.getCause() instanceof HttpResponseException) { + HttpResponseException ex = (HttpResponseException) e.getCause(); + assertEquals(ex.getResponse().getStatusCode(), 304); + } else if (e.getCause() instanceof RuntimeException) { + // TODO enhance stub connection so that it throws the correct error + } else { + throw e; + } + } + } finally { + returnContainer(containerName); + } + + } + + @Test(groups = { "integration", "live" }) + public void testGetIfUnmodifiedSince() throws InterruptedException, ExecutionException, + TimeoutException, IOException { + String containerName = getContainerName(); + try { + + String key = "apples"; + + DateTime before = new DateTime().minusSeconds(1); + addObjectAndValidateContent(containerName, key); + DateTime after = new DateTime().plusSeconds(1); + + client.getBlob(containerName, key, ifUnmodifiedSince(after)).get(10, TimeUnit.SECONDS); + validateContent(containerName, key); + + try { + client.getBlob(containerName, key, ifUnmodifiedSince(before)).get(10, TimeUnit.SECONDS); + validateContent(containerName, key); + } catch (ExecutionException e) { + if (e.getCause() instanceof HttpResponseException) { + HttpResponseException ex = (HttpResponseException) e.getCause(); + assertEquals(ex.getResponse().getStatusCode(), 412); + } else if (e.getCause() instanceof RuntimeException) { + // TODO enhance stub connection so that it throws the correct error + } else { + throw e; + } + } + } finally { + returnContainer(containerName); + } + } + + @Test(groups = { "integration", "live" }) + public void testGetIfMatch() throws InterruptedException, ExecutionException, TimeoutException, + IOException { + String containerName = getContainerName(); + try { + + String key = "apples"; + + addObjectAndValidateContent(containerName, key); + + client.getBlob(containerName, key, ifETagMatches(goodETag)).get(10, TimeUnit.SECONDS); + validateContent(containerName, key); + + try { + client.getBlob(containerName, key, ifETagMatches(badETag)).get(10, TimeUnit.SECONDS); + validateContent(containerName, key); + } catch (ExecutionException e) { + if (e.getCause() instanceof HttpResponseException) { + HttpResponseException ex = (HttpResponseException) e.getCause(); + assertEquals(ex.getResponse().getStatusCode(), 412); + } else if (e.getCause() instanceof RuntimeException) { + // TODO enhance stub connection so that it throws the correct error + } else { + throw e; + } + } + } finally { + returnContainer(containerName); + } + } + + @Test(groups = { "integration", "live" }) + public void testGetIfNoneMatch() throws InterruptedException, ExecutionException, + TimeoutException, IOException { + String containerName = getContainerName(); + try { + + String key = "apples"; + + addObjectAndValidateContent(containerName, key); + + client.getBlob(containerName, key, ifETagDoesntMatch(badETag)).get(10, TimeUnit.SECONDS); + validateContent(containerName, key); + + try { + client.getBlob(containerName, key, ifETagDoesntMatch(goodETag)).get(10, + TimeUnit.SECONDS); + validateContent(containerName, key); + } catch (ExecutionException e) { + if (e.getCause() instanceof HttpResponseException) { + HttpResponseException ex = (HttpResponseException) e.getCause(); + assertEquals(ex.getResponse().getStatusCode(), 304); + } else { + throw e; + } + } + } finally { + returnContainer(containerName); + } + } + + @Test(groups = { "integration", "live" }) + public void testGetRange() throws InterruptedException, ExecutionException, TimeoutException, + IOException { + String containerName = getContainerName(); + try { + + String key = "apples"; + + addObjectAndValidateContent(containerName, key); + B object1 = client.getBlob(containerName, key, range(0, 5)).get(10, TimeUnit.SECONDS); + assertEquals(BlobStoreUtils.getContentAsStringAndClose(object1), TEST_STRING.substring(0, + 6)); + + B object2 = client.getBlob(containerName, key, range(6, TEST_STRING.length())).get(10, + TimeUnit.SECONDS); + assertEquals(BlobStoreUtils.getContentAsStringAndClose(object2), TEST_STRING.substring(6, + TEST_STRING.length())); + } finally { + returnContainer(containerName); + } + } + + @Test(groups = { "integration", "live" }) + public void testGetTwoRanges() throws InterruptedException, ExecutionException, + TimeoutException, IOException { + String containerName = getContainerName(); + try { + + String key = "apples"; + + addObjectAndValidateContent(containerName, key); + B object = client.getBlob(containerName, key, range(0, 5).range(6, TEST_STRING.length())) + .get(10, TimeUnit.SECONDS); + + assertEquals(BlobStoreUtils.getContentAsStringAndClose(object), TEST_STRING); + } finally { + returnContainer(containerName); + } + } + + @Test(groups = { "integration", "live" }) + public void testGetTail() throws InterruptedException, ExecutionException, TimeoutException, + IOException { + String containerName = getContainerName(); + try { + + String key = "apples"; + + addObjectAndValidateContent(containerName, key); + B object = client.getBlob(containerName, key, tail(5)).get(10, TimeUnit.SECONDS); + assertEquals(BlobStoreUtils.getContentAsStringAndClose(object), TEST_STRING + .substring(TEST_STRING.length() - 5)); + assertEquals(object.getContentLength(), 5); + assertEquals(object.getMetadata().getSize(), TEST_STRING.length()); + } finally { + returnContainer(containerName); + } + } + + @Test(groups = { "integration", "live" }) + public void testGetStartAt() throws InterruptedException, ExecutionException, TimeoutException, + IOException { + String containerName = getContainerName(); + try { + String key = "apples"; + + addObjectAndValidateContent(containerName, key); + B object = client.getBlob(containerName, key, startAt(5)).get(10, TimeUnit.SECONDS); + assertEquals(BlobStoreUtils.getContentAsStringAndClose(object), TEST_STRING.substring(5, + TEST_STRING.length())); + assertEquals(object.getContentLength(), TEST_STRING.length() - 5); + assertEquals(object.getMetadata().getSize(), TEST_STRING.length()); + } finally { + returnContainer(containerName); + } + } + + private void addObjectAndValidateContent(String sourcecontainerName, String sourceKey) + throws InterruptedException, ExecutionException, TimeoutException, IOException { + addBlobToContainer(sourcecontainerName, sourceKey); + validateContent(sourcecontainerName, sourceKey); + } + + @Test(groups = { "integration", "live" }) + public void deleteObjectNotFound() throws Exception { + String containerName = getContainerName(); + String key = "test"; + try { + assert client.removeBlob(containerName, key).get(10, TimeUnit.SECONDS); + } finally { + returnContainer(containerName); + } + } + + @DataProvider(name = "delete") + public Object[][] createData() { + return new Object[][] { { "sp ace" }, { "unicde" }, { "qu?stion" } }; + } + + @Test(groups = { "integration", "live" }, dataProvider = "delete") + public void deleteObject(String key) throws Exception { + String containerName = getContainerName(); + try { + addBlobToContainer(containerName, key); + assert client.removeBlob(containerName, key).get(10, TimeUnit.SECONDS); + assertContainerEmptyDeleting(containerName, key); + } finally { + returnContainer(containerName); + } + } + + private void assertContainerEmptyDeleting(String containerName, String key) + throws InterruptedException, ExecutionException, TimeoutException { + List listing = client.listBlobs(containerName).get(10, TimeUnit.SECONDS); + assertEquals(listing.size(), 0, String.format( + "deleting %s, we still have %s left in container %s, using encoding %s", key, + listing.size(), containerName, LOCAL_ENCODING)); + } + + @Test(groups = { "integration", "live" }) + public void deleteObjectNoContainer() throws Exception { + try { + client.removeBlob("donb", "test").get(10, TimeUnit.SECONDS); + } catch (ExecutionException e) { + assert e.getCause() instanceof HttpResponseException; + assertEquals(((HttpResponseException) e.getCause()).getResponse().getStatusCode(), 404); + } + } + + @DataProvider(name = "putTests") + public Object[][] createData1() throws IOException { + + String realObject = IOUtils.toString(new FileInputStream("pom.xml")); + + return new Object[][] { { "file", "text/xml", new File("pom.xml"), realObject }, + { "string", "text/xml", realObject, realObject }, + { "bytes", "application/octet-stream", realObject.getBytes(), realObject } }; + } + + @Test(groups = { "integration", "live" }, dataProvider = "putTests") + public void testPutObject(String key, String type, Object content, Object realObject) + throws Exception { + B object = objectFactory.createBlob(key); + object.getMetadata().setContentType(type); + object.setData(content); + if (content instanceof InputStream) { + object.generateMD5(); + } + String containerName = getContainerName(); + try { + assertNotNull(client.putBlob(containerName, object).get(10, TimeUnit.SECONDS)); + object = client.getBlob(containerName, object.getKey()).get(10, TimeUnit.SECONDS); + String returnedString = BlobStoreUtils.getContentAsStringAndClose(object); + assertEquals(returnedString, realObject); + assertEquals(client.listBlobs(containerName).get(10, TimeUnit.SECONDS).size(), 1); + } finally { + returnContainer(containerName); + } + } + + @Test(groups = { "integration", "live" }) + public void testMetadata() throws Exception { + String key = "hello"; + + B object = objectFactory.createBlob(key); + object.setData(TEST_STRING); + object.getMetadata().setContentType("text/plain"); + object.getMetadata().setSize(TEST_STRING.length()); + // NOTE all metadata in jclouds comes out as lowercase, in an effort to normalize the + // providers. + object.getMetadata().getUserMetadata().put("Adrian", "powderpuff"); + object.getMetadata().setContentMD5(HttpUtils.md5(TEST_STRING.getBytes())); + String containerName = getContainerName(); + try { + addBlobToContainer(containerName, object); + B newObject = validateContent(containerName, key); + + M metadata = newObject.getMetadata(); + + validateMetadata(metadata); + validateMetadata(client.blobMetadata(containerName, key)); + } finally { + returnContainer(containerName); + } + } + + protected void validateMetadata(M metadata) { + assertEquals(metadata.getContentType(), "text/plain"); + assertEquals(metadata.getSize(), TEST_STRING.length()); + assertEquals(metadata.getUserMetadata().get("adrian"), Collections + .singletonList("powderpuff")); + assertEquals(metadata.getContentMD5(), HttpUtils.md5(TEST_STRING.getBytes())); + } + +} \ No newline at end of file diff --git a/aws/s3/core/src/test/java/org/jclouds/aws/s3/S3ConnectionLiveTest.java b/blobstore/core/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobLiveTest.java old mode 100644 new mode 100755 similarity index 61% rename from aws/s3/core/src/test/java/org/jclouds/aws/s3/S3ConnectionLiveTest.java rename to blobstore/core/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobLiveTest.java index 35976dbe08..4bb5a658ba --- a/aws/s3/core/src/test/java/org/jclouds/aws/s3/S3ConnectionLiveTest.java +++ b/blobstore/core/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobLiveTest.java @@ -21,7 +21,7 @@ * under the License. * ==================================================================== */ -package org.jclouds.aws.s3; +package org.jclouds.blobstore.integration.internal; import static com.google.common.base.Preconditions.checkNotNull; import static org.testng.Assert.assertEquals; @@ -31,25 +31,33 @@ import java.net.URL; import java.net.URLConnection; import java.util.concurrent.TimeUnit; -import org.jclouds.aws.s3.domain.S3Object; +import org.jclouds.blobstore.BlobStore; +import org.jclouds.blobstore.domain.Blob; +import org.jclouds.blobstore.domain.BlobMetadata; +import org.jclouds.blobstore.domain.ContainerMetadata; import org.jclouds.http.HttpUtils; import org.testng.annotations.Optional; import org.testng.annotations.Parameters; import org.testng.annotations.Test; /** - * Tests connection by copying the contents of a url into the bucket. + * Tests integrated functionality of all PutObject commands. + *

    * The HEAD operation is used to retrieve information about a specific object or object size, @@ -155,17 +151,17 @@ public interface S3Connection { * @param key * unique key in the s3Bucket identifying the object * @return metadata associated with the key or - * {@link org.jclouds.aws.s3.domain.S3Object.Metadata#NOT_FOUND} if not present; - * @see #getObject(String, String) + * {@link org.jclouds.aws.s3.domain.ObjectMetadata#NOT_FOUND} if not present; + * @see #getBlob(String, String) * @see */ @HEAD @Path("{key}") - @ExceptionParser(ReturnS3ObjectMetadataNotFoundOn404.class) - @ResponseParser(ParseMetadataFromHeaders.class) - S3Object.Metadata headObject(@HostPrefixParam String bucketName, @PathParam("key") String key); + @ExceptionParser(ThrowKeyNotFoundOn404.class) + @ResponseParser(ParseObjectMetadataFromHeaders.class) + ObjectMetadata blobMetadata(@HostPrefixParam String bucketName, @PathParam("key") String key); /** * Removes the object and metadata associated with the key. @@ -186,7 +182,7 @@ public interface S3Connection { */ @DELETE @Path("{key}") - Future deleteObject(@HostPrefixParam String bucketName, @PathParam("key") String key); + Future removeBlob(@HostPrefixParam String bucketName, @PathParam("key") String key); /** * Store data by creating or overwriting an object. @@ -201,7 +197,11 @@ public interface S3Connection { * namespace of the object you are storing * @param object * contains the data and metadata to create or overwrite + * @param options + * options for creating the object * @return MD5 hash of the content uploaded + * @throws org.jclouds.http.HttpResponseException + * if the conditions requested set are not satisfied by the object on the server. * @see org.jclouds.aws.s3.domain.CannedAccessPolicy#PRIVATE * @see putObject( + Future putBlob( @HostPrefixParam String bucketName, - @PathParam("key") @ParamParser(S3ObjectKey.class) @EntityParam(S3ObjectBinder.class) S3Object object); + @PathParam("key") @ParamParser(BlobKey.class) @EntityParam(S3ObjectBinder.class) S3Object object, + PutObjectOptions options); - /** - * Like {@link #putObject(String, S3Object)} except you can use {@link PutObjectOptions} to - * control delivery of content. - * - * - * @param options - * options for creating the object - * @throws org.jclouds.http.HttpResponseException - * if the conditions requested set are not satisfied by the object on the server. - * @see S3Connection#putObject(String, S3Object) - * @see PutObjectOptions - * @see - */ @PUT @Path("{key}") @ResponseParser(ParseETagHeader.class) - Future putObject( + Future putBlob( @HostPrefixParam String bucketName, - @PathParam("key") @ParamParser(S3ObjectKey.class) @EntityParam(S3ObjectBinder.class) S3Object object, - PutObjectOptions options); + @PathParam("key") @ParamParser(BlobKey.class) @EntityParam(S3ObjectBinder.class) S3Object object); /** * Create and name your own bucket in which to store your objects. * - * @see - * @return true, if the bucket was created or already exists - * @see org.jclouds.aws.s3.commands.PutBucket - */ - @PUT - @Path("/") - @ExceptionParser(ReturnTrueIfBucketAlreadyOwnedByYou.class) - Future putBucketIfNotExists(@HostPrefixParam String bucketName); - - /** - * Like {@link #putBucketIfNotExists(String)} except that you can use {@link PutBucketOptions} to - * create the bucket in EU. + *