Unify default subscription field (#177)

* Use 0.13 of Okio

* Unify default subscription field

Author: jianghaolu

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

@@ -40,8 +40,6 @@ public class ApplicationTokenCredentials extends AzureTokenCredentials {
     private byte[] certificate;
     /** The certificate password. */
     private String certPassword;
-    /** The default subscription to use, if any. */
-    private String defaultSubscription;
 
     /**
      * Initializes a new instance of the ApplicationTokenCredentials.
@@ -117,24 +115,6 @@ public String toString() {
         }
     }
 
-    /**
-     * @return The default subscription ID, if any
-     */
-    public String defaultSubscriptionId() {
-        return defaultSubscription;
-    }
-
-    /**
-     * Set default subscription ID.
-     *
-     * @param subscriptionId the default subscription ID.
-     * @return the credentials object itself.
-     */
-    public ApplicationTokenCredentials withDefaultSubscriptionId(String subscriptionId) {
-        this.defaultSubscription = subscriptionId;
-        return this;
-    }
-
     /**
      * Initializes the credentials based on the provided credentials file.
      *
@@ -178,7 +158,7 @@ public static ApplicationTokenCredentials fromFile(File credentialsFile) throws
         final String defaultSubscriptionId = authSettings.getProperty(CredentialSettings.SUBSCRIPTION_ID.toString());
 
         if (clientKey != null) {
-            return new ApplicationTokenCredentials(
+            return (ApplicationTokenCredentials) new ApplicationTokenCredentials(
                     clientId,
                     tenantId,
                     clientKey,
@@ -197,7 +177,7 @@ public static ApplicationTokenCredentials fromFile(File credentialsFile) throws
             } else {
                 certs = Files.readAllBytes(Paths.get(credentialsFile.getParent(), certificate));
             }
-            return new ApplicationTokenCredentials(
+            return (ApplicationTokenCredentials) new ApplicationTokenCredentials(
                     clientId,
                     tenantId,
                     certs,

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

@@ -30,7 +30,6 @@ public final class AzureCliCredentials extends AzureTokenCredentials {
     private static final ObjectMapper MAPPER = new JacksonAdapter().serializer().setDateFormat(new SimpleDateFormat("yyyy-MM-dd hh:mm:ssssss"));
     /** A mapping from resource endpoint to its cached access token. */
     private Map<String, AzureCliSubscription> subscriptions;
-    private String defaultSubscriptionId;
     private File azureProfile;
     private File accessTokens;
     private Lock lock = new ReentrantLock();
@@ -58,7 +57,7 @@ private synchronized void loadAccessTokens() throws IOException {
                             && subscription.tenant().equalsIgnoreCase(token.tenant())) {
                         subscriptions.put(subscription.id(), subscription.withToken(token));
                         if (subscription.isDefault()) {
-                            defaultSubscriptionId = subscription.id();
+                            withDefaultSubscriptionId(subscription.id());
                         }
                     }
                 }
@@ -101,50 +100,32 @@ public static AzureCliCredentials create(File azureProfile, File accessTokens) t
      * @return the active directory application client id
      */
     public String clientId() {
-        return subscriptions.get(defaultSubscriptionId).clientId();
+        return subscriptions.get(defaultSubscriptionId()).clientId();
     }
 
     /**
      * @return the tenant or domain the containing the application
      */
     @Override
     public String domain() {
-        return subscriptions.get(defaultSubscriptionId).tenant();
+        return subscriptions.get(defaultSubscriptionId()).tenant();
     }
 
     /**
      * @return the Azure environment to authenticate with
      */
     public AzureEnvironment environment() {
-        return subscriptions.get(defaultSubscriptionId).environment();
-    }
-
-    /**
-     * @return the default subscription ID logged in in Azure CLI
-     */
-    public String defaultSubscriptionId() {
-        return defaultSubscriptionId;
-    }
-
-    /**
-     * Set default subscription ID.
-     *
-     * @param subscriptionId the default subscription ID.
-     * @return the credentials object itself.
-     */
-    public AzureCliCredentials withDefaultSubscriptionId(String subscriptionId) {
-        this.defaultSubscriptionId = subscriptionId;
-        return this;
+        return subscriptions.get(defaultSubscriptionId()).environment();
     }
 
     @Override
     public synchronized String getToken(String resource) throws IOException {
-        String token = subscriptions.get(defaultSubscriptionId).credentialInstance().getToken(resource);
+        String token = subscriptions.get(defaultSubscriptionId()).credentialInstance().getToken(resource);
         if (token == null) {
             System.err.println("Please login in Azure CLI and press any key to continue after you've successfully logged in.");
             System.in.read();
             loadAccessTokens();
-            token = subscriptions.get(defaultSubscriptionId).credentialInstance().getToken(resource);
+            token = subscriptions.get(defaultSubscriptionId()).credentialInstance().getToken(resource);
         }
         return token;
     }

azure-client-runtime/src/main/java/com/microsoft/azure/credentials/AzureTokenCredentials.java

@@ -21,6 +21,7 @@
 public abstract class AzureTokenCredentials extends TokenCredentials {
     private final AzureEnvironment environment;
     private final String domain;
+    private String defaultSubscription;
 
     private Proxy proxy;
 
@@ -75,6 +76,24 @@ public AzureEnvironment environment() {
         return environment;
     }
 
+    /**
+     * @return The default subscription ID, if any
+     */
+    public String defaultSubscriptionId() {
+        return defaultSubscription;
+    }
+
+    /**
+     * Set default subscription ID.
+     *
+     * @param subscriptionId the default subscription ID.
+     * @return the credentials object itself.
+     */
+    public AzureTokenCredentials withDefaultSubscriptionId(String subscriptionId) {
+        this.defaultSubscription = subscriptionId;
+        return this;
+    }
+
     /**
      * @return the proxy being used for accessing Active Directory.
      */