Merge pull request Azure#533 from Azure/dev

[Release 0.8.3] Merge dev into master

Author: jianghaolu

ChangeLog.txt

@@ -1,3 +1,10 @@
+2015.9.22 Version 0.8.3
+* Fix unexpected exceptions thrown in some long running operations
+
+2015.9.22 Version 0.8.2
+* Revert a previous breaking change on enum casing
+* Fix string comparison on long running operation status
+
 2015.9.15 Version 0.8.1
 * Use commons library for Base64 encoding
 

azure-mgmt-samples/pom.xml

@@ -17,7 +17,7 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure</artifactId>
-        <version>0.8.2-SNAPSHOT</version>
+        <version>0.8.4-SNAPSHOT</version>
         <relativePath>../azure/pom.xml</relativePath>
     </parent>
 

azure-mgmt-samples/src/main/java/com/microsoft/azure/samples/storage/StorageAccountExample.java

@@ -16,22 +16,24 @@
 
 package com.microsoft.azure.samples.storage;
 
-import com.microsoft.azure.management.storage.models.*;
+import com.microsoft.azure.management.storage.StorageManagementClient;
+import com.microsoft.azure.management.storage.StorageManagementService;
+import com.microsoft.azure.management.storage.models.AccountType;
+import com.microsoft.azure.management.storage.models.KeyName;
+import com.microsoft.azure.management.storage.models.StorageAccount;
+import com.microsoft.azure.management.storage.models.StorageAccountCreateParameters;
+import com.microsoft.azure.management.storage.models.StorageAccountKeys;
+import com.microsoft.azure.management.storage.models.StorageAccountRegenerateKeyResponse;
+import com.microsoft.azure.management.storage.models.StorageAccountUpdateResponse;
 import com.microsoft.azure.utility.AuthHelper;
-import com.microsoft.azure.utility.StorageHelper;
 import com.microsoft.azure.utility.ResourceContext;
-
+import com.microsoft.azure.utility.StorageHelper;
 import com.microsoft.windowsazure.Configuration;
 import com.microsoft.windowsazure.management.configuration.ManagementConfiguration;
 
-import com.microsoft.azure.management.storage.StorageManagementClient;
-import com.microsoft.azure.management.storage.StorageManagementService;
-
-import java.net.SocketTimeoutException;
+import java.net.URI;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
-import java.net.URI;
 
 public class StorageAccountExample {
     /**
@@ -130,9 +132,9 @@ public static void main(String[] args) throws Exception {
             } else {
                 KeyName keyName = null;
                 if (args[3].toLowerCase().equals("primary")) {
-                    keyName = KeyName.KEY1;
+                    keyName = KeyName.Key1;
                 } else if (args[3].toLowerCase().equals("secondary")) {
-                    keyName = KeyName.KEY2;
+                    keyName = KeyName.Key2;
                 }
                 if (keyName == null) {
                     result = -1;
@@ -210,15 +212,15 @@ private static void displayUsageAndExit(String command) {
 
     private static AccountType accountTypeStrToVal(String accountType) {
         if(accountType.toLowerCase().equals("standard_grs")) {
-            return AccountType.STANDARDGRS;
+            return AccountType.StandardGRS;
         } else if(accountType.toLowerCase().equals("standard_ragrs")) {
-            return AccountType.STANDARDRAGRS;
+            return AccountType.StandardRAGRS;
         } else if(accountType.toLowerCase().equals("standard_lrs")) {
-            return AccountType.STANDARDLRS;
+            return AccountType.StandardLRS;
         } else if(accountType.toLowerCase().equals("standard_zrs")) {
-            return AccountType.STANDARDZRS;
+            return AccountType.StandardZRS;
         } else if(accountType.toLowerCase().equals("premium_lrs")) {
-            return AccountType.PREMIUMLRS;
+            return AccountType.PremiumLRS;
         }
 
         return null;
@@ -337,9 +339,9 @@ private static int regenerateStorageAccountKey(StorageManagementClient client,
         StorageAccountRegenerateKeyResponse response = StorageHelper.regenerateStorageAccountKey(client, context,
                 keyName);
         if(response != null) {
-            System.out.println("Key " + (keyName == KeyName.KEY1 ? "Primary" : "Secondary") + " regenerated.");
+            System.out.println("Key " + (keyName == KeyName.Key1 ? "Primary" : "Secondary") + " regenerated.");
             StorageAccountKeys keys = response.getStorageAccountKeys();
-            System.out.println("Key Value: " + (keyName == KeyName.KEY1 ? keys.getKey1() : keys.getKey2()));
+            System.out.println("Key Value: " + (keyName == KeyName.Key1 ? keys.getKey1() : keys.getKey2()));
         }
 
         return (response == null ? 1 : 0);

azure-mgmt-samples/src/main/java/com/microsoft/azure/samples/templatedeployments/CreateTemplateDeploymentExample.java

@@ -80,7 +80,7 @@ public static void main(String[] args) {
             DeploymentExtended deployment = ResourceHelper.createTemplateDeploymentFromURI(
                     resourceManagementClient,
                     resourceGroupName,
-                    DeploymentMode.INCREMENTAL,
+                    DeploymentMode.Incremental,
                     deploymentName,
                     TEMPLATE_URI,
                     "1.0.0.0",

azure-mgmt-samples/src/main/java/com/microsoft/azure/samples/templatedeployments/ListTemplateDeploymentExample.java

@@ -4,7 +4,6 @@
 import com.microsoft.azure.management.resources.ResourceManagementClient;
 import com.microsoft.azure.management.resources.ResourceManagementService;
 import com.microsoft.azure.management.resources.models.DeploymentExtended;
-import com.microsoft.azure.management.resources.models.DeploymentListResult;
 import com.microsoft.azure.management.resources.models.ResourceGroupExtended;
 import com.microsoft.azure.utility.AuthHelper;
 import com.microsoft.windowsazure.Configuration;

azure/pom.xml

@@ -16,7 +16,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>com.microsoft.azure</groupId>
-    <version>0.8.2-SNAPSHOT</version>
+    <version>0.8.4-SNAPSHOT</version>
     <artifactId>azure-bom</artifactId>
   </parent>
 

core/azure-core-test/pom.xml

@@ -17,7 +17,7 @@
   <parent>
     <groupId>com.microsoft.azure</groupId>
     <artifactId>azure</artifactId>
-    <version>0.8.2-SNAPSHOT</version>
+    <version>0.8.4-SNAPSHOT</version>
     <relativePath>../../azure/pom.xml</relativePath>
   </parent>
 

core/azure-core-test/src/main/java/com/microsoft/windowsazure/MockIntegrationTestBase.java

@@ -14,7 +14,12 @@
 import com.microsoft.windowsazure.core.pipeline.filter.ServiceResponseFilter;
 import com.microsoft.windowsazure.management.configuration.ManagementConfiguration;
 import org.apache.commons.io.IOUtils;
-import org.apache.http.*;
+import org.apache.http.Header;
+import org.apache.http.HttpRequest;
+import org.apache.http.HttpRequestInterceptor;
+import org.apache.http.HttpResponse;
+import org.apache.http.HttpResponseInterceptor;
+import org.apache.http.HttpStatus;
 import org.apache.http.entity.BufferedHttpEntity;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.protocol.HttpContext;
@@ -29,14 +34,25 @@
 import java.lang.reflect.Field;
 import java.net.URI;
 import java.net.URL;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
 import java.util.Map.Entry;
 import java.util.concurrent.Callable;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.zip.GZIPInputStream;
 
-import static com.github.tomakehurst.wiremock.client.WireMock.*;
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.delete;
+import static com.github.tomakehurst.wiremock.client.WireMock.get;
+import static com.github.tomakehurst.wiremock.client.WireMock.patch;
+import static com.github.tomakehurst.wiremock.client.WireMock.post;
+import static com.github.tomakehurst.wiremock.client.WireMock.put;
+import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
 
 public class MockIntegrationTestBase {
     protected final static Boolean  IS_MOCKED = System.getenv(ManagementConfiguration.AZURE_TEST_MODE) == null ||

core/azure-core/pom.xml

@@ -17,7 +17,7 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure</artifactId>
-        <version>0.8.2-SNAPSHOT</version>
+        <version>0.8.4-SNAPSHOT</version>
         <relativePath>../../azure/pom.xml</relativePath>
     </parent>
 

core/azure-core/src/main/java/com/microsoft/windowsazure/Configuration.java

@@ -17,15 +17,15 @@
 
 import com.microsoft.windowsazure.core.Builder;
 import com.microsoft.windowsazure.core.DefaultBuilder;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
 public class Configuration {
     /**
      * Property name for socket connection timeout used by services created with