Refactor for clarity and better code practices

Author: Avery-Dunn

src/integrationtest/java/com.microsoft.aad.msal4j/DeviceCodeIT.java

@@ -61,7 +61,6 @@ public void DeviceCodeFlowADTest(String environment) throws Exception {
 
     @Test(dataProvider = "environments", dataProviderClass = EnvironmentsProvider.class)
     public void DeviceCodeFlowADFSv2019Test(String environment) throws Exception {
-        cfg = new Config(environment);
 
         User user = labUserProvider.getOnPremAdfsUser(FederationProvider.ADFS_2019);
 

src/main/java/com/microsoft/aad/msal4j/AADAuthority.java

@@ -23,8 +23,6 @@ class AADAuthority extends Authority {
     private final static String AAD_TOKEN_ENDPOINT_FORMAT = AAD_AUTHORITY_FORMAT + TOKEN_ENDPOINT;
     private final static String DEVICE_CODE_ENDPOINT_FORMAT = AAD_AUTHORITY_FORMAT + DEVICE_CODE_ENDPOINT;
 
-    String deviceCodeEndpoint;
-
     AADAuthority(final URL authorityUrl) {
         super(authorityUrl, AuthorityType.AAD);
         setAuthorityProperties();

src/main/java/com/microsoft/aad/msal4j/ADFSAuthority.java

@@ -14,8 +14,6 @@ class ADFSAuthority extends Authority{
     private final static String ADFS_AUTHORITY_FORMAT = "https://%s/%s/";
     private final static String DEVICE_CODE_ENDPOINT_FORMAT = ADFS_AUTHORITY_FORMAT + DEVICE_CODE_ENDPOINT;
 
-    String deviceCodeEndpoint;
-
     ADFSAuthority(final URL authorityUrl) {
         super(authorityUrl, AuthorityType.ADFS);
         this.authority = String.format(ADFS_AUTHORITY_FORMAT, host, tenant);
@@ -25,7 +23,5 @@ class ADFSAuthority extends Authority{
         this.deviceCodeEndpoint = String.format(DEVICE_CODE_ENDPOINT_FORMAT, host, tenant);
     }
 
-    String deviceCodeEndpoint() {
-        return deviceCodeEndpoint;
-    }
+
 }

src/main/java/com/microsoft/aad/msal4j/Authority.java

@@ -147,4 +147,8 @@ private static boolean isAdfsAuthority(final String firstPath) {
     private static boolean isB2CAuthority(final String firstPath) {
         return firstPath.compareToIgnoreCase(B2C_PATH_SEGMENT) == 0;
     }
+
+    String deviceCodeEndpoint() {
+        return deviceCodeEndpoint;
+    }
 }

src/main/java/com/microsoft/aad/msal4j/PublicClientApplication.java

@@ -58,7 +58,7 @@ public CompletableFuture<IAuthenticationResult> acquireToken(DeviceCodeFlowParam
         if (!(AuthorityType.AAD.equals(authenticationAuthority.authorityType()) ||
                 AuthorityType.ADFS.equals(authenticationAuthority.authorityType()))) {
             throw new IllegalArgumentException(
-                    "Invalid authority type. Device Flow is only supported by AAD and ADFS authority");
+                    "Invalid authority type. Device Flow is only supported by AAD and ADFS authorities");
         }
 
         validateNotNull("parameters", parameters);

src/test/java/com/microsoft/aad/msal4j/DeviceCodeFlowTest.java

@@ -150,7 +150,7 @@ public void deviceCodeFlowTest() throws Exception {
     }
 
     @Test(expectedExceptions = IllegalArgumentException.class,
-            expectedExceptionsMessageRegExp = "Invalid authority type. Device Flow is only supported by AAD and ADFS authority")
+            expectedExceptionsMessageRegExp = "Invalid authority type. Device Flow is only supported by AAD and ADFS authorities")
     public void executeAcquireDeviceCode_B2CAuthorityUsed_IllegalArgumentExceptionThrown()
             throws Exception {