Reduce complexity in RestClient

azure-client-authentication/src/main/java/com/microsoft/azure/credentials/ApplicationTokenCredentials.java

@@ -131,8 +131,9 @@ public static ApplicationTokenCredentials fromFile(File credentialsFile) throws
         // Set defaults
         Properties authSettings = new Properties();
         authSettings.put(CredentialSettings.AUTH_URL.toString(), AzureEnvironment.AZURE.getAuthenticationEndpoint());
-        authSettings.put(CredentialSettings.BASE_URL.toString(), AzureEnvironment.AZURE.getBaseUrl());
+        authSettings.put(CredentialSettings.BASE_URL.toString(), AzureEnvironment.AZURE.getResourceManagerEndpoint());
         authSettings.put(CredentialSettings.MANAGEMENT_URI.toString(), AzureEnvironment.AZURE.getManagementEndpoint());
+        authSettings.put(CredentialSettings.GRAPH_URL.toString(), AzureEnvironment.AZURE.getGraphEndpoint());
 
         // Load the credentials from the file
         FileInputStream credentialsFileStream = new FileInputStream(credentialsFile);

azure-client-runtime/src/main/java/com/microsoft/azure/AzureEnvironment.java

@@ -7,14 +7,16 @@
 
 package com.microsoft.azure;
 
+import java.lang.reflect.Field;
+
 /**
  * An instance of this class describes an environment in Azure.
  */
 public final class AzureEnvironment {
     /**
      * Base URL for calls to Azure management API.
      */
-    private final String resourceManagerEndpoint;
+    private String resourceManagerEndpoint;
 
     /**
      * ActiveDirectory Endpoint for the authentications.
@@ -98,19 +100,10 @@ public AzureEnvironment(
      *
      * @return the Base URL for the management service.
      */
-    public String getBaseUrl() {
+    public String getResourceManagerEndpoint() {
         return this.resourceManagerEndpoint;
     }
 
-    /**
-     * @return a builder for the rest client.
-     */
-    public RestClient.Builder.Buildable newRestClientBuilder() {
-        return new RestClient.Builder()
-                .withDefaultBaseUrl(this)
-                .withInterceptor(new RequestIdHeaderInterceptor());
-    }
-
     /**
      * @return the ActiveDirectory Endpoint for the Azure Environment.
      */
@@ -153,4 +146,59 @@ public boolean isValidateAuthority() {
     public void setValidateAuthority(boolean validateAuthority) {
         this.validateAuthority = validateAuthority;
     }
+
+    /**
+     * The enum representing available endpoints in an environment.
+     */
+    public enum Endpoint {
+        /** Azure Resource Manager endpoint. */
+        RESOURCE_MANAGER("resourceManagerEndpoint"),
+        /** Azure Active Directory Graph APIs endpoint. */
+        GRAPH("graphEndpoint");
+
+        private String field;
+
+        Endpoint(String value) {
+            this.field = value;
+        }
+
+        @Override
+        public String toString() {
+            return field;
+        }
+    }
+
+    /**
+     * Get the endpoint URL for the current environment.
+     *
+     * @param endpoint the endpoint
+     * @return the URL
+     */
+    public String getEndpoint(Endpoint endpoint) {
+        try {
+            Field f = AzureEnvironment.class.getDeclaredField(endpoint.toString());
+            f.setAccessible(true);
+            return (String) f.get(this);
+        } catch (NoSuchFieldException | IllegalAccessException e) {
+            throw new RuntimeException("Unable to reflect on field " + endpoint.toString(), e);
+        }
+    }
+
+    /**
+     * Create a builder for rest client from an endpoint.
+     *
+     * @param endpoint the endpoint
+     * @return a RestClient builder
+     */
+    public RestClient.Builder newRestClientBuilder(Endpoint endpoint) {
+        return new RestClient.Builder().withBaseUrl(this, endpoint);
+    }
+
+    /**
+     * Create a builder for rest client to Azure Resource Manager.
+     * @return a RestClient builder
+     */
+    public RestClient.Builder newRestClientBuilder() {
+        return new RestClient.Builder().withBaseUrl(this, Endpoint.RESOURCE_MANAGER);
+    }
 }

azure-client-runtime/src/main/java/com/microsoft/azure/AzureServiceClient.java

@@ -22,8 +22,7 @@ public abstract class AzureServiceClient {
     private RestClient restClient;
 
     protected AzureServiceClient(String baseUrl) {
-        this(new RestClient.Builder().withBaseUrl(baseUrl)
-                .withInterceptor(new RequestIdHeaderInterceptor()).build());
+        this(new RestClient.Builder().withBaseUrl(baseUrl).build());
     }
 
     /**