Merge pull request #89 from jofriedm-msft/dev

Dev

Author: jofriedm-msft

README.md

@@ -30,7 +30,7 @@ To get the binaries of this library as distributed by Microsoft, ready for use w
 <dependency>
 	<groupId>com.microsoft.azure</groupId>
 	<artifactId>azure-storage</artifactId>
-	<version>5.5.0</version>
+	<version>6.0.0</version>
 </dependency>
 ```
 

microsoft-azure-storage-samples/pom.xml

@@ -26,7 +26,7 @@
 		<dependency>
 			<groupId>com.microsoft.azure</groupId>
 			<artifactId>azure-storage</artifactId>
-			<version>5.5.0</version>
+			<version>6.0.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.microsoft.azure</groupId>

microsoft-azure-storage-samples/src/com/microsoft/azure/storage/logging/pom.xml

@@ -26,7 +26,7 @@
         <dependency>
             <groupId>com.microsoft.azure</groupId>
             <artifactId>azure-storage</artifactId>
-            <version>5.5.0</version>
+            <version>6.0.0</version>
         </dependency>
         <dependency>
             <groupId>com.microsoft.azure</groupId>

microsoft-azure-storage-test/src/com/microsoft/azure/storage/file/CloudFileDirectoryTests.java

@@ -60,7 +60,7 @@ public void cloudFileDirectorySetUp() throws URISyntaxException, StorageExceptio
 
     @After
     public void cloudFileDirectoryTearDown() throws StorageException {
-        this.share.deleteIfExists();
+        this.share.deleteIfExists(DeleteShareSnapshotsOption.INCLUDE_SNAPSHOTS, null, null, null);
     }
 
     /**

microsoft-azure-storage-test/src/com/microsoft/azure/storage/file/CloudFileShareTests.java

@@ -62,7 +62,7 @@ public void fileShareTestMethodSetUp() throws StorageException, URISyntaxExcepti
 
     @After
     public void fileShareTestMethodTearDown() throws StorageException {
-        this.share.deleteIfExists();
+        this.share.deleteIfExists(DeleteShareSnapshotsOption.INCLUDE_SNAPSHOTS, null, null, null);
     }
 
     /**

microsoft-azure-storage-test/src/com/microsoft/azure/storage/file/CloudFileTests.java

@@ -86,7 +86,7 @@ public void fileTestMethodSetUp() throws URISyntaxException, StorageException {
 
     @After
     public void fileTestMethodTearDown() throws StorageException {
-        this.share.deleteIfExists();
+        this.share.deleteIfExists(DeleteShareSnapshotsOption.INCLUDE_SNAPSHOTS, null, null, null);
     }
 
     /**

microsoft-azure-storage/src/com/microsoft/azure/storage/Constants.java

@@ -661,7 +661,7 @@ public static class HeaderConstants {
         /**
          * Specifies the value to use for UserAgent header.
          */
-        public static final String USER_AGENT_VERSION = "5.5.0";
+        public static final String USER_AGENT_VERSION = "6.0.0";
 
         /**
          * The default type for content-type and accept

microsoft-azure-storage/src/com/microsoft/azure/storage/file/CloudFileDirectory.java

@@ -532,11 +532,11 @@ public Boolean preProcessResponse(CloudFileDirectory directory, CloudFileClient
                     OperationContext context) throws Exception {
                 if (this.getResult().getStatusCode() == HttpURLConnection.HTTP_OK) {
                     directory.updatePropertiesFromResponse(this.getConnection());
-//                    // Set properties
-//                    final FileDirectoryAttributes attributes =
-//                            FileResponse.getFileDirectoryAttributes(this.getConnection(), client.isUsePathStyleUris());
-//                    directory.setMetadata(attributes.getMetadata());
-//                    directory.setProperties(attributes.getProperties());
+                    // Set properties
+                    final FileDirectoryAttributes attributes =
+                            FileResponse.getFileDirectoryAttributes(this.getConnection(), client.isUsePathStyleUris());
+                    directory.setMetadata(attributes.getMetadata());
+                    directory.setProperties(attributes.getProperties());
 
                     return Boolean.valueOf(true);
                 }

microsoft-azure-storage/src/com/microsoft/azure/storage/file/CloudFileShare.java

@@ -1020,10 +1020,10 @@ public Boolean preProcessResponse(CloudFileShare share, CloudFileClient client,
                     throws Exception {
                 if (this.getResult().getStatusCode() == HttpURLConnection.HTTP_OK) {
                     share.updatePropertiesFromResponse(this.getConnection());
-//                    final FileShareAttributes attributes = FileResponse.getFileShareAttributes(this.getConnection(),
-//                            client.isUsePathStyleUris());
-//                    share.metadata = attributes.getMetadata();
-//                    share.properties = attributes.getProperties();
+                    final FileShareAttributes attributes = FileResponse.getFileShareAttributes(this.getConnection(),
+                            client.isUsePathStyleUris());
+                    share.metadata = attributes.getMetadata();
+                    share.properties = attributes.getProperties();
 
                     return Boolean.valueOf(true);
                 }