Skip to content

Commit

Permalink
Merge pull request #143 from gcheng/dev
Browse files Browse the repository at this point in the history 
Integrate week 2 & 3's work into Windows Azure dev branch
  • Loading branch information
Albert Cheng committed Aug 6, 2012
2 parents eac6dc2 + 17cf30a commit 351ce2c
Show file tree
Hide file tree
Showing 14 changed files with 517 additions and 98 deletions.
19 changes: 11 additions & 8 deletions microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/BlobContract.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,12 @@
import com.microsoft.windowsazure.services.blob.models.CommitBlobBlocksOptions;
import com.microsoft.windowsazure.services.blob.models.ContainerACL;
import com.microsoft.windowsazure.services.blob.models.CopyBlobOptions;
import com.microsoft.windowsazure.services.blob.models.CopyBlobResult;
import com.microsoft.windowsazure.services.blob.models.CreateBlobBlockOptions;
import com.microsoft.windowsazure.services.blob.models.CreateBlobOptions;
import com.microsoft.windowsazure.services.blob.models.CreateBlobPagesOptions;
import com.microsoft.windowsazure.services.blob.models.CreateBlobPagesResult;
import com.microsoft.windowsazure.services.blob.models.CreateBlobResult;
import com.microsoft.windowsazure.services.blob.models.CreateBlobSnapshotOptions;
import com.microsoft.windowsazure.services.blob.models.CreateBlobSnapshotResult;
import com.microsoft.windowsazure.services.blob.models.CreateContainerOptions;
Expand Down Expand Up @@ -429,7 +431,7 @@ void setContainerMetadata(String container, HashMap<String, String> metadata, Se
* @throws ServiceException
* if an error occurs accessing the storage service.
*/
void createPageBlob(String container, String blob, long length) throws ServiceException;
CreateBlobResult createPageBlob(String container, String blob, long length) throws ServiceException;

/**
* Creates a page blob of the specified maximum length, using the specified options.
Expand Down Expand Up @@ -457,7 +459,8 @@ void setContainerMetadata(String container, HashMap<String, String> metadata, Se
* @throws ServiceException
* if an error occurs accessing the storage service.
*/
void createPageBlob(String container, String blob, long length, CreateBlobOptions options) throws ServiceException;
CreateBlobResult createPageBlob(String container, String blob, long length, CreateBlobOptions options)
throws ServiceException;

/**
* Creates a block blob from a content stream.
Expand All @@ -473,7 +476,7 @@ void setContainerMetadata(String container, HashMap<String, String> metadata, Se
* @throws ServiceException
* if an error occurs accessing the storage service.
*/
void createBlockBlob(String container, String blob, InputStream contentStream) throws ServiceException;
CreateBlobResult createBlockBlob(String container, String blob, InputStream contentStream) throws ServiceException;

/**
* Creates a block blob from a content stream, using the specified options.
Expand All @@ -495,7 +498,7 @@ void setContainerMetadata(String container, HashMap<String, String> metadata, Se
* @throws ServiceException
* if an error occurs accessing the storage service.
*/
void createBlockBlob(String container, String blob, InputStream contentStream, CreateBlobOptions options)
CreateBlobResult createBlockBlob(String container, String blob, InputStream contentStream, CreateBlobOptions options)
throws ServiceException;

/**
Expand Down Expand Up @@ -1214,8 +1217,8 @@ CreateBlobSnapshotResult createBlobSnapshot(String container, String blob, Creat
* @throws ServiceException
* if an error occurs accessing the storage service.
*/
void copyBlob(String destinationContainer, String destinationBlob, String sourceContainer, String sourceBlob)
throws ServiceException;
CopyBlobResult copyBlob(String destinationContainer, String destinationBlob, String sourceContainer,
String sourceBlob) throws ServiceException;

/**
* Copies a source blob to a destination within the storage account, using the specified options.
Expand Down Expand Up @@ -1293,8 +1296,8 @@ void copyBlob(String destinationContainer, String destinationBlob, String source
* @throws ServiceException
* if an error occurs accessing the storage service.
*/
void copyBlob(String destinationContainer, String destinationBlob, String sourceContainer, String sourceBlob,
CopyBlobOptions options) throws ServiceException;
CopyBlobResult copyBlob(String destinationContainer, String destinationBlob, String sourceContainer,
String sourceBlob, CopyBlobOptions options) throws ServiceException;

/**
* Gets a new lease on a blob.
Expand Down
31 changes: 17 additions & 14 deletions .../java/com/microsoft/windowsazure/services/blob/implementation/BlobExceptionProcessor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,12 @@
import com.microsoft.windowsazure.services.blob.models.CommitBlobBlocksOptions;
import com.microsoft.windowsazure.services.blob.models.ContainerACL;
import com.microsoft.windowsazure.services.blob.models.CopyBlobOptions;
import com.microsoft.windowsazure.services.blob.models.CopyBlobResult;
import com.microsoft.windowsazure.services.blob.models.CreateBlobBlockOptions;
import com.microsoft.windowsazure.services.blob.models.CreateBlobOptions;
import com.microsoft.windowsazure.services.blob.models.CreateBlobPagesOptions;
import com.microsoft.windowsazure.services.blob.models.CreateBlobPagesResult;
import com.microsoft.windowsazure.services.blob.models.CreateBlobResult;
import com.microsoft.windowsazure.services.blob.models.CreateBlobSnapshotOptions;
import com.microsoft.windowsazure.services.blob.models.CreateBlobSnapshotResult;
import com.microsoft.windowsazure.services.blob.models.CreateContainerOptions;
Expand Down Expand Up @@ -383,9 +385,9 @@ public ListBlobsResult listBlobs(String container, ListBlobsOptions options) thr
}

@Override
public void createPageBlob(String container, String blob, long length) throws ServiceException {
public CreateBlobResult createPageBlob(String container, String blob, long length) throws ServiceException {
try {
service.createPageBlob(container, blob, length);
return service.createPageBlob(container, blob, length);
}
catch (UniformInterfaceException e) {
throw processCatch(new ServiceException(e));
Expand All @@ -396,10 +398,10 @@ public void createPageBlob(String container, String blob, long length) throws Se
}

@Override
public void createPageBlob(String container, String blob, long length, CreateBlobOptions options)
public CreateBlobResult createPageBlob(String container, String blob, long length, CreateBlobOptions options)
throws ServiceException {
try {
service.createPageBlob(container, blob, length, options);
return service.createPageBlob(container, blob, length, options);
}
catch (UniformInterfaceException e) {
throw processCatch(new ServiceException(e));
Expand All @@ -410,9 +412,10 @@ public void createPageBlob(String container, String blob, long length, CreateBlo
}

@Override
public void createBlockBlob(String container, String blob, InputStream contentStream) throws ServiceException {
public CreateBlobResult createBlockBlob(String container, String blob, InputStream contentStream)
throws ServiceException {
try {
service.createBlockBlob(container, blob, contentStream);
return service.createBlockBlob(container, blob, contentStream);
}
catch (UniformInterfaceException e) {
throw processCatch(new ServiceException(e));
Expand All @@ -423,10 +426,10 @@ public void createBlockBlob(String container, String blob, InputStream contentSt
}

@Override
public void createBlockBlob(String container, String blob, InputStream contentStream, CreateBlobOptions options)
throws ServiceException {
public CreateBlobResult createBlockBlob(String container, String blob, InputStream contentStream,
CreateBlobOptions options) throws ServiceException {
try {
service.createBlockBlob(container, blob, contentStream, options);
return service.createBlockBlob(container, blob, contentStream, options);
}
catch (UniformInterfaceException e) {
throw processCatch(new ServiceException(e));
Expand Down Expand Up @@ -776,10 +779,10 @@ public CreateBlobSnapshotResult createBlobSnapshot(String container, String blob
}

@Override
public void copyBlob(String destinationContainer, String destinationBlob, String sourceContainer, String sourceBlob)
throws ServiceException {
public CopyBlobResult copyBlob(String destinationContainer, String destinationBlob, String sourceContainer,
String sourceBlob) throws ServiceException {
try {
service.copyBlob(destinationContainer, destinationBlob, sourceContainer, sourceBlob);
return service.copyBlob(destinationContainer, destinationBlob, sourceContainer, sourceBlob);
}
catch (UniformInterfaceException e) {
throw processCatch(new ServiceException(e));
Expand All @@ -790,10 +793,10 @@ public void copyBlob(String destinationContainer, String destinationBlob, String
}

@Override
public void copyBlob(String destinationContainer, String destinationBlob, String sourceContainer,
public CopyBlobResult copyBlob(String destinationContainer, String destinationBlob, String sourceContainer,
String sourceBlob, CopyBlobOptions options) throws ServiceException {
try {
service.copyBlob(destinationContainer, destinationBlob, sourceContainer, sourceBlob, options);
return service.copyBlob(destinationContainer, destinationBlob, sourceContainer, sourceBlob, options);
}
catch (UniformInterfaceException e) {
throw processCatch(new ServiceException(e));
Expand Down
Loading

0 comments on commit 351ce2c

Please sign in to comment.