Merge pull request #309 from Azure/master

Bring master into dev

Author: rickle-msft

README.md

@@ -1,6 +1,8 @@
 # Microsoft Azure Storage SDK for Java
 
-This project provides a client library in Java that makes it easy to consume Microsoft Azure Storage services. For documentation please see the Microsoft Azure [Java Developer Center](http://azure.microsoft.com/en-us/develop/java/) and the [JavaDocs](http://azure.github.io/azure-storage-java/).
+This project provides a client library in Java that makes it easy to consume Microsoft Azure Storage services. For documentation please see the [Storage API doc page](https://docs.microsoft.com/en-us/java/api/overview/azure/storage) and the generated [javadoc](http://azure.github.io/azure-storage-java/).
+
+NOTE: There is a new version of this library in development, which supports asynchronous APIs in a reactive model. This entails a significant architectural overhaul and a redesign of the current interface.  If this interests you, please feel free to check it out in the New-Storage-SDK-V10-Preview branch. Feedback is always appreciated. The rest of the document below applies to the existing generally available library.
 
 > If you are looking for the Azure Storage Android SDK, please visit [https://github.com/Azure/azure-storage-android](https://github.com/Azure/azure-storage-android).
 
@@ -30,7 +32,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>6.1.0</version>
+	<version>7.0.0</version>
 </dependency>
 ```
 
@@ -60,7 +62,7 @@ SLF4J is only needed if you enable logging through the OperationContext class. I
 
 ## Usage
 
-To use this SDK to call Microsoft Azure storage services, you need to first [create an account](https://account.windowsazure.com/signup).
+To use this SDK to call Microsoft Azure storage services, you need to first [create an account](https://azure.microsoft.com/free).
 
 Samples are provided in the microsoft-azure-storage-samples folder. The unit tests in microsoft-azure-storage-test can also be helpful.
 
@@ -131,7 +133,7 @@ When sending pull requests, please send non-breaking PRs to the dev branch and b
 
 # Learn More
 
-* [Azure Developer Center](http://azure.microsoft.com/en-us/develop/java/)
+* [Java on Azure Developer Center](http://azure.microsoft.com/en-us/java/azure)
 * [Azure Storage Service](http://azure.microsoft.com/en-us/documentation/services/storage/)
 * [Azure Storage Team Blog](http://blogs.msdn.com/b/windowsazurestorage/)
-* [JavaDocs](http://azure.github.io/azure-storage-java/)
+* [Javadoc](http://azure.github.io/azure-storage-java/)

microsoft-azure-storage-samples/pom.xml

@@ -26,12 +26,22 @@
 		<dependency>
 			<groupId>com.microsoft.azure</groupId>
 			<artifactId>azure-storage</artifactId>
-			<version>6.1.0</version>
+			<version>7.0.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.microsoft.azure</groupId>
 			<artifactId>azure-keyvault-extensions</artifactId>
-			<version>0.8.0</version>
+			<version>1.0.0</version>
+		</dependency>
+		<dependency>
+			<groupId>com.microsoft.rest</groupId>
+			<artifactId>client-runtime</artifactId>
+			<version>1.2.1</version>
+		</dependency>
+		<dependency>
+			<groupId>com.microsoft.aad</groupId>
+			<artifactId>adal4j</artifactId>
+			<version>0.0.2</version>
 		</dependency>
 	</dependencies>
 </project>

microsoft-azure-storage-samples/src/com/microsoft/azure/storage/encryption/blob/gettingstarted/BlobGettingStarted.java

@@ -25,7 +25,7 @@
 import java.util.Random;
 import java.util.UUID;
 
-import com.microsoft.azure.keyvault.extensions.RsaKey;
+import com.microsoft.azure.keyvault.cryptography.RsaKey;
 import com.microsoft.azure.storage.CloudStorageAccount;
 import com.microsoft.azure.storage.StorageException;
 import com.microsoft.azure.storage.blob.BlobEncryptionPolicy;

microsoft-azure-storage-samples/src/com/microsoft/azure/storage/encryption/keyvault/gettingstarted/KeyVaultGettingStarted.java

@@ -30,7 +30,7 @@
 import com.microsoft.azure.keyvault.extensions.AggregateKeyResolver;
 import com.microsoft.azure.keyvault.extensions.CachingKeyResolver;
 import com.microsoft.azure.keyvault.extensions.KeyVaultKeyResolver;
-import com.microsoft.azure.keyvault.extensions.RsaKey;
+import com.microsoft.azure.keyvault.cryptography.RsaKey;
 import com.microsoft.azure.storage.CloudStorageAccount;
 import com.microsoft.azure.storage.StorageException;
 import com.microsoft.azure.storage.blob.BlobEncryptionPolicy;
@@ -44,9 +44,7 @@
 
 public class KeyVaultGettingStarted {
 
-    public static void main(String[] args) throws StorageException,
-            NoSuchAlgorithmException, InterruptedException, ExecutionException,
-            URISyntaxException, InvalidKeyException, IOException {
+    public static void main(String[] args) throws Exception {
         Utility.printSampleStartInfo("KeyVaultGettingStarted");
 
         // Get the key ID from App.config if it exists.
@@ -86,7 +84,7 @@ public static void main(String[] args) throws StorageException,
         keyGen.initialize(1024);
         final KeyPair wrapKey = keyGen.generateKeyPair();
 
-        RsaKey rsaKey = new RsaKey("rsaKey1", wrapKey);
+        RsaKey rsaKey = new RsaKey(keyID, wrapKey);
         LocalResolver resolver = new LocalResolver();
         resolver.add(rsaKey);
 
@@ -95,8 +93,8 @@ public static void main(String[] args) throws StorageException,
         // This helps users to define a plug-in model for all the different key
         // providers they support.
         AggregateKeyResolver aggregateResolver = new AggregateKeyResolver();
-        aggregateResolver.Add(resolver);
-        aggregateResolver.Add(cloudResolver);
+        aggregateResolver.add(resolver);
+        aggregateResolver.add(cloudResolver);
 
         // Set up a caching resolver so the secrets can be cached on the client.
         // This is the recommended usage

microsoft-azure-storage-samples/src/com/microsoft/azure/storage/encryption/keyvault/keyrotation/gettingstarted/KeyRotationGettingStarted.java

@@ -39,9 +39,7 @@
 
 public class KeyRotationGettingStarted {
 
-    public static void main(String[] args) throws StorageException,
-            InterruptedException, ExecutionException, URISyntaxException,
-            NoSuchAlgorithmException, InvalidKeyException, IOException {
+    public static void main(String[] args) throws Exception {
         Utility.printSampleStartInfo("KeyRotationGettingStarted");
 
         // Create two secrets and obtain their IDs. This is normally a one-time

microsoft-azure-storage-samples/src/com/microsoft/azure/storage/encryption/queue/gettingstarted/QueueGettingStarted.java

@@ -21,7 +21,7 @@
 import java.util.EnumSet;
 import java.util.UUID;
 
-import com.microsoft.azure.keyvault.extensions.RsaKey;
+import com.microsoft.azure.keyvault.cryptography.RsaKey;
 import com.microsoft.azure.storage.CloudStorageAccount;
 import com.microsoft.azure.storage.StorageException;
 import com.microsoft.azure.storage.queue.CloudQueue;

microsoft-azure-storage-samples/src/com/microsoft/azure/storage/encryption/table/gettingstarted/attributes/TableGettingStartedAttributes.java

@@ -16,11 +16,13 @@
 
 import java.net.URISyntaxException;
 import java.security.InvalidKeyException;
+import java.security.KeyPair;
+import java.security.KeyPairGenerator;
 import java.security.NoSuchAlgorithmException;
 import java.util.Date;
 import java.util.UUID;
 
-import com.microsoft.azure.keyvault.extensions.RsaKey;
+import com.microsoft.azure.keyvault.cryptography.RsaKey;
 import com.microsoft.azure.storage.CloudStorageAccount;
 import com.microsoft.azure.storage.StorageException;
 import com.microsoft.azure.storage.table.CloudTable;
@@ -51,7 +53,10 @@ public static void main(String[] args) throws URISyntaxException,
             table.createIfNotExists();
 
             // Create the IKey used for encryption.
-            RsaKey key = new RsaKey("private:key1");
+            final KeyPairGenerator keyGen = KeyPairGenerator.getInstance("RSA");
+            keyGen.initialize(1024);
+            final KeyPair wrapKey = keyGen.generateKeyPair();
+            RsaKey key = new RsaKey("private:key1", wrapKey);
 
             EncryptedEntity ent = new EncryptedEntity(UUID.randomUUID()
                     .toString(), String.valueOf(new Date().getTime()));

microsoft-azure-storage-samples/src/com/microsoft/azure/storage/encryption/table/gettingstarted/resolver/TableGettingStartedResolver.java

@@ -16,6 +16,8 @@
 
 import java.net.URISyntaxException;
 import java.security.InvalidKeyException;
+import java.security.KeyPair;
+import java.security.KeyPairGenerator;
 import java.security.NoSuchAlgorithmException;
 import java.util.Date;
 import java.util.UUID;
@@ -31,7 +33,7 @@
 import com.microsoft.azure.storage.table.TableResult;
 import com.microsoft.azure.storage.util.LocalResolver;
 import com.microsoft.azure.storage.util.Utility;
-import com.microsoft.azure.keyvault.extensions.RsaKey;
+import com.microsoft.azure.keyvault.cryptography.RsaKey;
 import com.microsoft.azure.storage.CloudStorageAccount;
 import com.microsoft.azure.storage.StorageException;
 
@@ -54,7 +56,10 @@ public static void main(String[] args) throws StorageException,
             table.createIfNotExists();
 
             // Create the IKey used for encryption.
-            RsaKey key = new RsaKey("private:key1");
+            final KeyPairGenerator keyGen = KeyPairGenerator.getInstance("RSA");
+            keyGen.initialize(1024);
+            final KeyPair wrapKey = keyGen.generateKeyPair();
+            RsaKey key = new RsaKey("rsaKey1", wrapKey);
 
             DynamicTableEntity ent = new DynamicTableEntity();
             ent.setPartitionKey(UUID.randomUUID().toString());

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

@@ -26,12 +26,12 @@
         <dependency>
             <groupId>com.microsoft.azure</groupId>
             <artifactId>azure-storage</artifactId>
-            <version>6.1.0</version>
+            <version>7.0.0</version>
         </dependency>
         <dependency>
             <groupId>com.microsoft.azure</groupId>
             <artifactId>azure-keyvault-extensions</artifactId>
-            <version>0.8.0</version>
+            <version>1.0.0</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>

microsoft-azure-storage-samples/src/com/microsoft/azure/storage/table/payloadformat/PayloadFormat.java

@@ -84,7 +84,7 @@ public static void main(String[] args) throws InvalidKeyException, URISyntaxExce
 				// Submit the operation to the table service.
 				table.execute(insertCustomer1);	
 
-				// When using JsonNoMetadata the client library will “infer” the property types(int, double,
+				// When using JsonNoMetadata the client library will infer the property types(int, double,
 				// String and some booleans) by inspecting the type information on the POJO entity type 
 				// provided by the client. Additionally, in some scenarios clients may wish to provide 
 				// the property type information at runtime such as when querying with the DynamicTableEntity 
@@ -97,15 +97,15 @@ class PropertyResolverClass implements PropertyResolver {
 					public EdmType propertyResolver(String pk, String rk, String key,
 							String value) {
 						if (key.equals("Email")) {
-				            return EdmType.STRING;
-				        }
-				        else if (key.equals("PhoneNumber")) {
-				            return EdmType.STRING;
-				        }
-				        else if (key.equals("Id")) {
-				            return EdmType.GUID;
-				        }
-				        return null;
+							return EdmType.STRING;
+						}
+						else if (key.equals("PhoneNumber")) {
+							return EdmType.STRING;
+						}
+						else if (key.equals("Id")) {
+							return EdmType.GUID;
+						}
+						return null;
 					}
 				}