Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Integrate week 2 & 3's work into Windows Azure dev branch #143

Merged
merged 20 commits into from
Aug 6, 2012
Merged

Integrate week 2 & 3's work into Windows Azure dev branch #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
4ad59a4
issure #77, let get blob properties throws an exception when the if
Jul 25, 2012
8f8c6e3
Support range MD5 for get Blob request.
Jul 26, 2012
0040bcf
Merge pull request #3 from gcheng/Jerusalem
Jul 27, 2012
a97379d
Merge pull request #4 from gcheng/London
Jul 27, 2012
1b76225
Return Etag for create*Blob and copyBlob
Jul 27, 2012
a542866
Merge branch 'Jerusalem' of https://github.com/gcheng/azure-sdk-for-j…
Jul 27, 2012
26ee763
add breaks in PipelineHelper/addOptionalSourceAccessContitionHeader
Jul 29, 2012
3c9be11
add PipelineHelpersTest unit test.
Jul 29, 2012
a118bfb
encode special characters when serializing entity to XML
Jul 30, 2012
796a21a
Merge pull request #8 from gcheng/Jerusalem
Jul 30, 2012
b18bd32
address code review feedback for returning ETag for create*Blob and
Jul 30, 2012
101b1e0
Merge pull request #6 from gcheng/Paris
Jul 30, 2012
5966f3b
Address code review feedback to add breaks in
Jul 30, 2012
36b1c3e
Merge branch 'dev' of https://github.com/gcheng/azure-sdk-for-java in…
Jul 30, 2012
e9830c4
Merge pull request #7 from gcheng/Beirut
Jul 30, 2012
54ff076
Internationalize the service bus for the dev-private branch.
Aug 1, 2012
333e2f3
address code review feedback for service bus internationalization.
Aug 1, 2012
3a646ab
Merge pull request #10 from gcheng/dev-private
Aug 1, 2012
4a759eb
address code review feedback regarding table encoding.
Aug 2, 2012
17cf30a
Merge pull request #9 from gcheng/Jerusalem
Aug 2, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/BlobContract.java
View file
Open in desktop
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
Open in desktop
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