Merge branch 'master' of https://github.com/Azure/azure-sdk-for-java

# Conflicts:

#	azure-mgmt-datalake-store-uploader/src/test/java/com/microsoft/azure/management/datalake/store/uploader/DataLakeUploaderTestBase.java

azure-mgmt-batch/pom.xml

@@ -49,7 +49,6 @@
     <dependency>
       <groupId>com.microsoft.azure</groupId>
       <artifactId>azure-client-runtime</artifactId>
-      <version>1.0.0-beta4-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.microsoft.azure</groupId>
@@ -64,7 +63,6 @@
     <dependency>
       <groupId>com.microsoft.azure</groupId>
       <artifactId>azure-client-authentication</artifactId>
-      <version>1.0.0-beta4-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>

azure-mgmt-batch/src/test/java/com/microsoft/azure/management/batch/BatchManagementTestBase.java

@@ -7,9 +7,6 @@
 import com.microsoft.azure.management.resources.implementation.ResourceManager;
 import okhttp3.logging.HttpLoggingInterceptor;
 
-import java.io.File;
-import java.io.IOException;
-
 public abstract class BatchManagementTestBase {
     protected static ResourceManager resourceManager;
     protected static BatchManager batchManager;
@@ -21,7 +18,8 @@ public static void createClients() {
                 System.getenv("secret"),
                 AzureEnvironment.AZURE);
 
-        RestClient restClient = AzureEnvironment.AZURE.newRestClientBuilder()
+        RestClient restClient = new RestClient.Builder()
+                .withBaseUrl(AzureEnvironment.AZURE, AzureEnvironment.Endpoint.RESOURCE_MANAGER)
                 .withCredentials(credentials)
                 .withLogLevel(HttpLoggingInterceptor.Level.BODY)
                 .build();

azure-mgmt-compute/pom.xml

@@ -49,7 +49,6 @@
     <dependency>
       <groupId>com.microsoft.azure</groupId>
       <artifactId>azure-client-runtime</artifactId>
-      <version>1.0.0-beta4-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.microsoft.azure</groupId>
@@ -74,7 +73,6 @@
     <dependency>
       <groupId>com.microsoft.azure</groupId>
       <artifactId>azure-client-authentication</artifactId>
-      <version>1.0.0-beta4-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>

azure-mgmt-compute/src/test/java/com/microsoft/azure/management/compute/ComputeManagementTestBase.java

@@ -22,7 +22,8 @@ public static void createClients() {
                 System.getenv("secret"),
                 AzureEnvironment.AZURE);
 
-        RestClient restClient = AzureEnvironment.AZURE.newRestClientBuilder()
+        RestClient restClient = new RestClient.Builder()
+                .withBaseUrl(AzureEnvironment.AZURE, AzureEnvironment.Endpoint.RESOURCE_MANAGER)
                 .withCredentials(credentials)
                 .withLogLevel(HttpLoggingInterceptor.Level.BODY)
                 .build();

azure-mgmt-datalake-store/src/test/java/com/microsoft/azure/management/datalake/store/DataLakeStoreManagementTestBase.java

@@ -20,7 +20,7 @@ public static void createClients() {
                 AzureEnvironment.AZURE);
 
         RestClient restClient = new RestClient.Builder()
-                .withDefaultBaseUrl(com.microsoft.azure.AzureEnvironment.AZURE)
+                .withBaseUrl(AzureEnvironment.AZURE, AzureEnvironment.Endpoint.RESOURCE_MANAGER)
                 .withCredentials(credentials)
                 .withLogLevel(HttpLoggingInterceptor.Level.BODY)
                 .build();

azure-mgmt-graph-rbac/pom.xml

@@ -49,7 +49,6 @@
     <dependency>
       <groupId>com.microsoft.azure</groupId>
       <artifactId>azure-client-runtime</artifactId>
-      <version>1.0.0-beta4-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.microsoft.azure</groupId>
@@ -64,7 +63,6 @@
     <dependency>
       <groupId>com.microsoft.azure</groupId>
       <artifactId>azure-client-authentication</artifactId>
-      <version>1.0.0-beta4-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>

azure-mgmt-graph-rbac/src/main/java/com/microsoft/azure/management/graphrbac/implementation/GraphRbacManager.java

@@ -77,14 +77,10 @@ public interface Configurable extends AzureConfigurable<Configurable> {
      * The implementation for Configurable interface.
      */
     private static class ConfigurableImpl extends AzureConfigurableImpl<Configurable> implements Configurable {
-        protected ConfigurableImpl() {
-            super.restClientBuilder = new RestClient.Builder()
-                    .withBaseUrl(AzureEnvironment.AZURE.getGraphEndpoint()) // default to public cloud
-                    .withInterceptor(new RequestIdHeaderInterceptor());
-        }
-
         public GraphRbacManager authenticate(AzureTokenCredentials credentials) {
-            return GraphRbacManager.authenticate(buildRestClientForGraph(credentials), credentials.getDomain());
+            return GraphRbacManager.authenticate(
+                    buildRestClient(credentials, AzureEnvironment.Endpoint.GRAPH),
+                    credentials.getDomain());
         }
     }
 

azure-mgmt-keyvault/pom.xml

@@ -49,7 +49,6 @@
     <dependency>
       <groupId>com.microsoft.azure</groupId>
       <artifactId>azure-client-runtime</artifactId>
-      <version>1.0.0-beta4-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.microsoft.azure</groupId>
@@ -69,7 +68,6 @@
     <dependency>
       <groupId>com.microsoft.azure</groupId>
       <artifactId>azure-client-authentication</artifactId>
-      <version>1.0.0-beta4-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>

azure-mgmt-keyvault/src/main/java/com/microsoft/azure/management/keyvault/implementation/KeyVaultManager.java

@@ -7,7 +7,6 @@
 package com.microsoft.azure.management.keyvault.implementation;
 
 import com.microsoft.azure.AzureEnvironment;
-import com.microsoft.azure.RequestIdHeaderInterceptor;
 import com.microsoft.azure.RestClient;
 import com.microsoft.azure.credentials.AzureTokenCredentials;
 import com.microsoft.azure.management.graphrbac.implementation.GraphRbacManager;
@@ -44,7 +43,8 @@ public static Configurable configure() {
      * @return the StorageManager
      */
     public static KeyVaultManager authenticate(AzureTokenCredentials credentials, String subscriptionId) {
-        return new KeyVaultManager(credentials.getEnvironment().newRestClientBuilder()
+        return new KeyVaultManager(credentials.getEnvironment()
+                .newRestClientBuilder()
                 .withCredentials(credentials)
                 .build(), credentials.getDomain(), subscriptionId);
     }
@@ -81,7 +81,9 @@ public interface Configurable extends AzureConfigurable<Configurable> {
      */
     private static final class ConfigurableImpl extends AzureConfigurableImpl<Configurable> implements Configurable {
         public KeyVaultManager authenticate(AzureTokenCredentials credentials, String tenantId, String subscriptionId) {
-            return KeyVaultManager.authenticate(buildRestClient(credentials), tenantId, subscriptionId);
+            return KeyVaultManager.authenticate(
+                    buildRestClient(credentials, AzureEnvironment.Endpoint.RESOURCE_MANAGER),
+                    tenantId, subscriptionId);
         }
     }
 
@@ -94,10 +96,8 @@ private KeyVaultManager(final RestClient restClient, String tenantId, String sub
         if (restClient.credentials() instanceof AzureTokenCredentials) {
             graphEndpoint = ((AzureTokenCredentials) restClient.credentials()).getEnvironment().getGraphEndpoint();
         }
-        graphRbacManager = GraphRbacManager.authenticate(new RestClient.Builder()
+        graphRbacManager = GraphRbacManager.authenticate(restClient.newBuilder()
                 .withBaseUrl(graphEndpoint)
-                .withInterceptor(new RequestIdHeaderInterceptor())
-                .withCredentials(restClient.credentials())
                 .build(), tenantId);
         this.tenantId = tenantId;
     }

azure-mgmt-keyvault/src/test/java/com/microsoft/azure/management/keyvault/KeyVaultManagementTestBase.java

@@ -27,7 +27,8 @@ protected static void createClients() {
                 System.getenv("secret"),
                 AzureEnvironment.AZURE);
 
-        RestClient restClient = AzureEnvironment.AZURE.newRestClientBuilder()
+        RestClient restClient = new RestClient.Builder()
+                .withBaseUrl(AzureEnvironment.AZURE, AzureEnvironment.Endpoint.RESOURCE_MANAGER)
                 .withCredentials(credentials)
                 .withLogLevel(HttpLoggingInterceptor.Level.BODY)
                 .build();

azure-mgmt-network/pom.xml

@@ -49,7 +49,6 @@
     <dependency>
       <groupId>com.microsoft.azure</groupId>
       <artifactId>azure-client-runtime</artifactId>
-      <version>1.0.0-beta4-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.microsoft.azure</groupId>
@@ -64,7 +63,6 @@
     <dependency>
       <groupId>com.microsoft.azure</groupId>
       <artifactId>azure-client-authentication</artifactId>
-      <version>1.0.0-beta4-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>

azure-mgmt-network/src/test/java/com/microsoft/azure/management/network/NetworkManagementTestBase.java

@@ -1,10 +1,10 @@
 package com.microsoft.azure.management.network;
 
 import com.microsoft.azure.AzureEnvironment;
+import com.microsoft.azure.RestClient;
 import com.microsoft.azure.credentials.ApplicationTokenCredentials;
 import com.microsoft.azure.management.network.implementation.NetworkManager;
 import com.microsoft.azure.management.resources.implementation.ResourceManager;
-import com.microsoft.azure.RestClient;
 
 public abstract class NetworkManagementTestBase {
     protected static ResourceManager resourceManager;
@@ -17,7 +17,8 @@ public static void createClients() {
                 System.getenv("secret"),
                 null);
 
-        RestClient restClient = AzureEnvironment.AZURE.newRestClientBuilder()
+        RestClient restClient = new RestClient.Builder()
+                .withBaseUrl(AzureEnvironment.AZURE, AzureEnvironment.Endpoint.RESOURCE_MANAGER)
                 .withCredentials(credentials)
                 //.withLogLevel(HttpLoggingInterceptor.Level.BASIC)
                 .build();

azure-mgmt-redis/pom.xml

@@ -48,7 +48,6 @@
         <dependency>
             <groupId>com.microsoft.azure</groupId>
             <artifactId>azure-client-runtime</artifactId>
-            <version>1.0.0-beta4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.microsoft.azure</groupId>
@@ -63,7 +62,6 @@
         <dependency>
             <groupId>com.microsoft.azure</groupId>
             <artifactId>azure-client-authentication</artifactId>
-            <version>1.0.0-beta4-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>

azure-mgmt-redis/src/test/java/com/microsoft/azure/management/redis/RedisManagementTestBase.java

@@ -30,7 +30,8 @@ protected static void createClients() {
                 System.getenv("secret"),
                 AzureEnvironment.AZURE);
 
-        RestClient restClient = AzureEnvironment.AZURE.newRestClientBuilder()
+        RestClient restClient = new RestClient.Builder()
+                .withBaseUrl(AzureEnvironment.AZURE, AzureEnvironment.Endpoint.RESOURCE_MANAGER)
                 .withCredentials(credentials)
                 .withLogLevel(HttpLoggingInterceptor.Level.BODY)
                 // uncomment for Fiddler tracing

azure-mgmt-resources/pom.xml

@@ -49,7 +49,6 @@
     <dependency>
       <groupId>com.microsoft.azure</groupId>
       <artifactId>azure-client-runtime</artifactId>
-      <version>1.0.0-beta4-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
@@ -63,7 +62,6 @@
     <dependency>
       <groupId>com.microsoft.azure</groupId>
       <artifactId>azure-client-authentication</artifactId>
-      <version>1.0.0-beta4-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>

azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/implementation/AzureConfigurableImpl.java

@@ -13,7 +13,6 @@
 import okhttp3.Interceptor;
 import okhttp3.logging.HttpLoggingInterceptor;
 
-import java.lang.reflect.Field;
 import java.net.Proxy;
 import java.util.concurrent.Executor;
 import java.util.concurrent.TimeUnit;
@@ -26,10 +25,10 @@
  */
 public class AzureConfigurableImpl<T extends AzureConfigurable<T>>
         implements AzureConfigurable<T> {
-    protected RestClient.Builder.Buildable restClientBuilder;
+    protected RestClient.Builder restClientBuilder;
 
     protected AzureConfigurableImpl() {
-        this.restClientBuilder = AzureEnvironment.AZURE.newRestClientBuilder(); // default to public cloud
+        this.restClientBuilder = new RestClient.Builder(); // default to public cloud
     }
 
     @SuppressWarnings("unchecked")
@@ -88,28 +87,12 @@ public T withProxy(Proxy proxy) {
         return (T) this;
     }
 
-    protected RestClient buildRestClient(AzureTokenCredentials credentials) {
-        restClientBuilder = modifyBaseUrl(restClientBuilder, credentials.getEnvironment().getBaseUrl());
+    protected RestClient buildRestClient(AzureTokenCredentials credentials, AzureEnvironment.Endpoint endpoint) {
+        restClientBuilder = restClientBuilder.withBaseUrl(credentials.getEnvironment(), endpoint);
         return restClientBuilder.withCredentials(credentials).build();
     }
 
-    protected RestClient buildRestClientForGraph(AzureTokenCredentials credentials) {
-        restClientBuilder = modifyBaseUrl(restClientBuilder, credentials.getEnvironment().getGraphEndpoint());
-        return restClientBuilder.withCredentials(credentials).build();
-    }
-
-    private RestClient.Builder.Buildable modifyBaseUrl(RestClient.Builder.Buildable builder, String baseUrl) {
-        try {
-            // This reflection will be removed in next version of client runtime
-            Field enclosed = builder.getClass().getDeclaredField("this$0");
-            enclosed.setAccessible(true);
-            Object enclosedObj = enclosed.get(builder);
-            Field url = enclosedObj.getClass().getDeclaredField("baseUrl");
-            url.setAccessible(true);
-            url.set(enclosedObj, baseUrl);
-        } catch (IllegalAccessException | NoSuchFieldException ex) {
-            // swallow it to use default base url
-        }
-        return builder;
+    protected RestClient buildRestClient(AzureTokenCredentials credentials) {
+        return buildRestClient(credentials, AzureEnvironment.Endpoint.RESOURCE_MANAGER);
     }
 }

azure-mgmt-search/pom.xml

@@ -50,7 +50,6 @@
     <dependency>
       <groupId>com.microsoft.azure</groupId>
       <artifactId>azure-client-runtime</artifactId>
-      <version>1.0.0-beta4-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.microsoft.azure</groupId>
@@ -65,7 +64,6 @@
     <dependency>
       <groupId>com.microsoft.azure</groupId>
       <artifactId>azure-client-authentication</artifactId>
-      <version>1.0.0-beta4-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>

azure-mgmt-storage/pom.xml

@@ -49,7 +49,6 @@
     <dependency>
       <groupId>com.microsoft.azure</groupId>
       <artifactId>azure-client-runtime</artifactId>
-      <version>1.0.0-beta4-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.microsoft.azure</groupId>
@@ -64,7 +63,6 @@
     <dependency>
       <groupId>com.microsoft.azure</groupId>
       <artifactId>azure-client-authentication</artifactId>
-      <version>1.0.0-beta4-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>

azure-mgmt-storage/src/test/java/com/microsoft/azure/management/storage/StorageManagementTestBase.java

@@ -27,9 +27,10 @@ protected static void createClients() {
                 System.getenv("secret"),
                 AzureEnvironment.AZURE);
 
-        RestClient restClient = AzureEnvironment.AZURE.newRestClientBuilder()
+        RestClient restClient = new RestClient.Builder()
+                .withBaseUrl(AzureEnvironment.AZURE, AzureEnvironment.Endpoint.RESOURCE_MANAGER)
                 .withCredentials(credentials)
-                .withLogLevel(HttpLoggingInterceptor.Level.BODY)
+                .withLogLevel(HttpLoggingInterceptor.Level.BASIC)
                 .build();
 
         resourceManager = ResourceManager

azure-mgmt-website/pom.xml

@@ -50,7 +50,6 @@
     <dependency>
       <groupId>com.microsoft.azure</groupId>
       <artifactId>azure-client-runtime</artifactId>
-      <version>1.0.0-beta4-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.microsoft.azure</groupId>

azure/pom.xml

@@ -49,12 +49,10 @@
     <dependency>
       <groupId>com.microsoft.azure</groupId>
       <artifactId>azure-client-runtime</artifactId>
-      <version>1.0.0-beta4-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.microsoft.azure</groupId>
       <artifactId>azure-client-authentication</artifactId>
-      <version>1.0.0-beta4-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.microsoft.azure</groupId>

pom.xml

@@ -92,12 +92,12 @@
       <dependency>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-client-runtime</artifactId>
-        <version>1.0.0-beta4-SNAPSHOT</version>
+        <version>1.0.0-beta4-20161011.232453-5</version>
       </dependency>
       <dependency>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-client-authentication</artifactId>
-        <version>1.0.0-beta4-SNAPSHOT</version>
+        <version>1.0.0-beta4-20161011.232500-5</version>
       </dependency>
       <!-- Test dependencies -->
       <dependency>