Pull master to dev

ChangeLog.txt

@@ -1,4 +1,12 @@
-2013.02.22 Version 0.4.1
+2013.03.12 Version 0.4.1
+ * Added "Azure-SDK-For-Java/<version>" To User-Agent HTTP header
+ * Added connection string support for Service Bus
+ * Added new methods to break lease for Storage Blob which doesn't require a lease id and returns the result as an object. Deprecated the old breakLease() methods.
+ * Added a new method to get the historical events for Media Services
+ * Fixed Storage Table encoding issue for special characters
+ * BlobOutputStream now commits block list using LATEST instead of UNCOMMITTED
+ * Added RequestResult to StorageEvents
+ * Fixed issue when accessing OperationContext RequestResults
  * Fixed the return value of BlobInputStream.read
  * Fixed CloudPageBlob.downloadPageRanges to retrieve the blob length
  * Fixed MD5 validation in BlobInputStream
@@ -7,8 +15,8 @@
 2013.01.18 Version 0.4.0
  * Added support for Windows Azure Media Services
  * Updated dependencies to non-beta stable versions
- * Add a Sending Request Event to OperationContext in Storage Client code
- * Fix a bug in the STorage client in blob download resume for blobs greater than 2GB
+ * Added a Sending Request Event to OperationContext in Storage Client code
+ * Fixed a bug in the Storage client in blob download resume for blobs greater than 2GB
 
 2012.10.29 Version 0.3.3
  * In the blob client, fixed a bug which allows users to call write APIs on a blob snapshot reference

README.md

@@ -45,7 +45,7 @@ within your project you can also have them installed by the Java package manager
     <dependency>
       <groupId>com.microsoft.windowsazure</groupId>
       <artifactId>microsoft-windowsazure-api</artifactId>
-      <version>0.4.0</version>
+      <version>0.4.1</version>
     </dependency>
 
 ##Minimum Requirements

microsoft-azure-api/pom.xml

@@ -17,7 +17,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.microsoft.windowsazure</groupId>
   <artifactId>microsoft-windowsazure-api</artifactId>
-  <version>0.4.0</version>
+  <version>0.4.1</version>
   <packaging>jar</packaging>
 
   <name>Microsoft Windows Azure Client API</name>

microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/client/BlobOutputStream.java

@@ -356,7 +356,7 @@ private synchronized void dispatchWrite(final int writeLength) throws IOExceptio
         if (this.streamType == BlobType.BLOCK_BLOB) {
             final CloudBlockBlob blobRef = (CloudBlockBlob) this.parentBlobRef;
             final String blockID = Base64.encode(Utility.getBytesFromLong(this.blockIdSequenceNumber++));
-            this.blockList.add(new BlockEntry(blockID, BlockSearchMode.UNCOMMITTED));
+            this.blockList.add(new BlockEntry(blockID, BlockSearchMode.LATEST));
 
             worker = new Callable<Void>() {
                 @Override

microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/client/CloudBlob.java

@@ -298,7 +298,7 @@ public String execute(final CloudBlobClient client, final CloudBlob blob, final
 
                 client.getCredentials().signRequest(request, 0L);
 
-                this.setResult(ExecutionEngine.processRequest(request, opContext));
+                ExecutionEngine.processRequest(request, opContext, this.getResult());
 
                 if (this.getResult().getStatusCode() != HttpURLConnection.HTTP_CREATED) {
                     this.setNonExceptionedRetryableFailure(true);
@@ -410,7 +410,7 @@ public Long execute(final CloudBlobClient client, final CloudBlob blob, final Op
 
                 client.getCredentials().signRequest(request, 0L);
 
-                this.setResult(ExecutionEngine.processRequest(request, opContext));
+                ExecutionEngine.processRequest(request, opContext, this.getResult());
 
                 if (this.getResult().getStatusCode() != HttpURLConnection.HTTP_ACCEPTED) {
                     this.setNonExceptionedRetryableFailure(true);
@@ -544,7 +544,7 @@ public Void execute(final CloudBlobClient client, final CloudBlob blob, final Op
                 BlobRequest.addMetadata(request, blob.metadata, opContext);
                 client.getCredentials().signRequest(request, 0);
 
-                this.setResult(ExecutionEngine.processRequest(request, opContext));
+                ExecutionEngine.processRequest(request, opContext, this.getResult());
 
                 if (this.getResult().getStatusCode() != HttpURLConnection.HTTP_ACCEPTED) {
                     this.setNonExceptionedRetryableFailure(true);
@@ -623,7 +623,7 @@ public Void execute(final CloudBlobClient client, final CloudBlob blob, final Op
 
                 client.getCredentials().signRequest(request, 0);
 
-                this.setResult(ExecutionEngine.processRequest(request, opContext));
+                ExecutionEngine.processRequest(request, opContext, this.getResult());
 
                 if (this.getResult().getStatusCode() != HttpURLConnection.HTTP_ACCEPTED) {
                     this.setNonExceptionedRetryableFailure(true);
@@ -698,7 +698,7 @@ public CloudBlob execute(final CloudBlobClient client, final CloudBlob blob,
 
                 client.getCredentials().signRequest(request, 0L);
 
-                this.setResult(ExecutionEngine.processRequest(request, opContext));
+                ExecutionEngine.processRequest(request, opContext, this.getResult());
 
                 if (this.getResult().getStatusCode() != HttpURLConnection.HTTP_CREATED) {
                     this.setNonExceptionedRetryableFailure(true);
@@ -787,7 +787,7 @@ public Void execute(final CloudBlobClient client, final CloudBlob blob, final Op
 
                 client.getCredentials().signRequest(request, -1L);
 
-                this.setResult(ExecutionEngine.processRequest(request, opContext));
+                ExecutionEngine.processRequest(request, opContext, this.getResult());
 
                 if (this.getResult().getStatusCode() != HttpURLConnection.HTTP_ACCEPTED) {
                     this.setNonExceptionedRetryableFailure(true);
@@ -878,7 +878,7 @@ public Boolean execute(final CloudBlobClient client, final CloudBlob blob, final
 
                 client.getCredentials().signRequest(request, -1L);
 
-                this.setResult(ExecutionEngine.processRequest(request, opContext));
+                ExecutionEngine.processRequest(request, opContext, this.getResult());
 
                 if (this.getResult().getStatusCode() == HttpURLConnection.HTTP_ACCEPTED) {
                     return true;
@@ -961,8 +961,7 @@ public Void execute(final CloudBlobClient client, final CloudBlob blob, final Op
                         blobOptions.getTimeoutIntervalInMs(), blob.snapshotID, accessCondition, blobOptions, opContext);
 
                 client.getCredentials().signRequest(request, -1L);
-                final InputStream streamRef = ExecutionEngine.getInputStream(request, opContext);
-                this.setResult(opContext.getLastResult());
+                final InputStream streamRef = ExecutionEngine.getInputStream(request, opContext, this.getResult());
 
                 final String contentMD5 = request.getHeaderField(Constants.HeaderConstants.CONTENT_MD5);
                 final Boolean validateMD5 = !blobOptions.getDisableContentMD5Validation()
@@ -1015,8 +1014,8 @@ public Void execute(final CloudBlobClient client, final CloudBlob blob, final Op
             if ((ex.getHttpStatusCode() == Constants.HeaderConstants.HTTP_UNUSED_306 && !ex.getErrorCode().equals(
                     StorageErrorCodeStrings.OUT_OF_RANGE_INPUT))
                     || ex.getHttpStatusCode() == HttpURLConnection.HTTP_PRECON_FAILED
-                    || !dummyPolicy.shouldRetry(0, opContext.getLastResult().getStatusCode(),
-                            (Exception) ex.getCause(), opContext).isShouldRetry()) {
+                    || !dummyPolicy.shouldRetry(0, impl.getResult().getStatusCode(), (Exception) ex.getCause(),
+                            opContext).isShouldRetry()) {
                 opContext.setIntermediateMD5(null);
                 throw ex;
             }
@@ -1141,7 +1140,7 @@ public Void execute(final CloudBlobClient client, final CloudBlob blob, final Op
 
                 client.getCredentials().signRequest(request, -1L);
 
-                this.setResult(ExecutionEngine.processRequest(request, opContext));
+                ExecutionEngine.processRequest(request, opContext, this.getResult());
 
                 if (this.getResult().getStatusCode() != HttpURLConnection.HTTP_OK) {
                     this.setNonExceptionedRetryableFailure(true);
@@ -1298,8 +1297,7 @@ public Void execute(final CloudBlobClient client, final CloudBlob blob, final Op
 
                 client.getCredentials().signRequest(request, -1L);
 
-                final InputStream sourceStream = ExecutionEngine.getInputStream(request, opContext);
-                this.setResult(opContext.getLastResult());
+                final InputStream sourceStream = ExecutionEngine.getInputStream(request, opContext, this.getResult());
 
                 int totalRead = 0;
                 int nextRead = buffer.length - bufferOffset;
@@ -1435,7 +1433,7 @@ public Boolean execute(final CloudBlobClient client, final CloudBlob blob, final
 
                 client.getCredentials().signRequest(request, -1L);
 
-                this.setResult(ExecutionEngine.processRequest(request, opContext));
+                ExecutionEngine.processRequest(request, opContext, this.getResult());
 
                 if (this.getResult().getStatusCode() == HttpURLConnection.HTTP_OK) {
                     final BlobAttributes retrievedAttributes = BlobResponse.getAttributes(request, blob.getUri(),
@@ -1922,7 +1920,7 @@ public Void execute(final CloudBlobClient client, final CloudBlob blob, final Op
 
                 client.getCredentials().signRequest(request, 0L);
 
-                this.setResult(ExecutionEngine.processRequest(request, opContext));
+                ExecutionEngine.processRequest(request, opContext, this.getResult());
 
                 if (this.getResult().getStatusCode() != HttpURLConnection.HTTP_OK) {
                     this.setNonExceptionedRetryableFailure(true);
@@ -2002,7 +2000,7 @@ public Void execute(final CloudBlobClient client, final CloudBlob blob, final Op
 
                 client.getCredentials().signRequest(request, 0L);
 
-                this.setResult(ExecutionEngine.processRequest(request, opContext));
+                ExecutionEngine.processRequest(request, opContext, this.getResult());
 
                 if (this.getResult().getStatusCode() != HttpURLConnection.HTTP_OK) {
                     this.setNonExceptionedRetryableFailure(true);
@@ -2091,7 +2089,7 @@ public Void execute(final CloudBlobClient client, final CloudBlob blob, final Op
 
                 client.getCredentials().signRequest(request, 0L);
 
-                this.setResult(ExecutionEngine.processRequest(request, opContext));
+                ExecutionEngine.processRequest(request, opContext, this.getResult());
 
                 if (this.getResult().getStatusCode() != HttpURLConnection.HTTP_OK) {
                     this.setNonExceptionedRetryableFailure(true);
@@ -2218,7 +2216,7 @@ public Long execute(final CloudBlobClient client, final CloudBlob blob, final Op
 
                 client.getCredentials().signRequest(request, 0L);
 
-                this.setResult(ExecutionEngine.processRequest(request, opContext));
+                ExecutionEngine.processRequest(request, opContext, this.getResult());
 
                 if (this.getResult().getStatusCode() == HttpURLConnection.HTTP_CONFLICT) {
                     final StorageException potentialConflictException = StorageException.translateException(request,
@@ -2368,7 +2366,7 @@ public Void execute(final CloudBlobClient client, final CloudBlob blob, final Op
                             HttpURLConnection.HTTP_FORBIDDEN, null, null);
                 }
 
-                this.setResult(ExecutionEngine.processRequest(request, opContext));
+                ExecutionEngine.processRequest(request, opContext, this.getResult());
 
                 if (this.getResult().getStatusCode() != HttpURLConnection.HTTP_CREATED) {
                     this.setNonExceptionedRetryableFailure(true);
@@ -2442,7 +2440,7 @@ public Void execute(final CloudBlobClient client, final CloudBlob blob, final Op
                 BlobRequest.addMetadata(request, blob.metadata, opContext);
                 client.getCredentials().signRequest(request, 0L);
 
-                this.setResult(ExecutionEngine.processRequest(request, opContext));
+                ExecutionEngine.processRequest(request, opContext, this.getResult());
 
                 if (this.getResult().getStatusCode() != HttpURLConnection.HTTP_OK) {
                     this.setNonExceptionedRetryableFailure(true);
@@ -2516,7 +2514,7 @@ public Void execute(final CloudBlobClient client, final CloudBlob blob, final Op
                 BlobRequest.addMetadata(request, blob.metadata, opContext);
                 client.getCredentials().signRequest(request, 0L);
 
-                this.setResult(ExecutionEngine.processRequest(request, opContext));
+                ExecutionEngine.processRequest(request, opContext, this.getResult());
 
                 if (this.getResult().getStatusCode() != HttpURLConnection.HTTP_OK) {
                     this.setNonExceptionedRetryableFailure(true);

microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/client/CloudBlobClient.java

@@ -388,7 +388,7 @@ ResultSegment<CloudBlobContainer> listContainersCore(final String prefix,
 
         this.getCredentials().signRequest(listContainerRequest, -1L);
 
-        taskReference.setResult(ExecutionEngine.processRequest(listContainerRequest, opContext));
+        ExecutionEngine.processRequest(listContainerRequest, opContext, taskReference.getResult());
 
         if (taskReference.getResult().getStatusCode() != HttpURLConnection.HTTP_OK) {
             taskReference.setNonExceptionedRetryableFailure(true);