Merge pull request #80 from AzureAD/sagonzal/warnings

Remove use of deprecated API. Suppress test warning

Author: sangonzal

pom.xml

@@ -55,8 +55,8 @@
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>3.9</version>
+            <artifactId>commons-text</artifactId>
+            <version>1.7</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
@@ -98,7 +98,7 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
-            <version>4.5</version>
+            <version>4.5.9</version>
         </dependency>
         <dependency>
             <groupId>com.microsoft.azure</groupId>

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

@@ -3,8 +3,7 @@
 
 package com.microsoft.aad.msal4j;
 
-import org.apache.commons.lang3.StringEscapeUtils;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.text.StringEscapeUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -189,7 +188,7 @@ static StringBuilder buildMessage(String address, String username,
                                 guid, address,
                                 integrated ? "" : securityHeaderBuilder.toString(),
                                 rstTrustNamespace,
-                                StringUtils.isNotEmpty(cloudAudienceUrn) ? cloudAudienceUrn : DEFAULT_APPLIES_TO,
+                                StringHelper.isBlank(cloudAudienceUrn) ? DEFAULT_APPLIES_TO : cloudAudienceUrn,
                                 keyType,
                                 requestType));
 

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

@@ -58,6 +58,7 @@ public static Map<String, String> getQueryMap(String query)
             "  \"message\": \"To sign in, use a web browser to open the page https://aka.ms/devicelogin and enter the code DW83JNP2P to authenticate.\"\n" +
             "}";
 
+    @SuppressWarnings("unchecked")
     @Test
     public void deviceCodeFlowTest() throws Exception {
         app = PowerMock.createPartialMock(PublicClientApplication.class,
@@ -137,7 +138,7 @@ public void deviceCodeFlowTest() throws Exception {
         Map<String, String> expectedQueryParams = new HashMap<>();
         expectedQueryParams.put("client_id", AAD_CLIENT_ID);
         expectedQueryParams.put("scope", URLEncoder.encode(AbstractMsalAuthorizationGrant.COMMON_SCOPES_PARAM +
-                AbstractMsalAuthorizationGrant.SCOPES_DELIMITER + AAD_RESOURCE_ID));
+                AbstractMsalAuthorizationGrant.SCOPES_DELIMITER + AAD_RESOURCE_ID, "UTF-8" ));
 
         Assert.assertEquals(getQueryMap(url.getQuery()), expectedQueryParams);
 

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

@@ -176,6 +176,7 @@ public void oAuthRequest_for_acquireTokenByUserAssertion() throws Exception {
         Assert.assertEquals(CLIENT_INFO_VALUE, queryParams.get("client_info"));
     }
 
+    @SuppressWarnings("unchecked")
     @Test
     public void oAuthRequest_for_acquireTokenByAsymmetricKeyCredential() throws Exception {
         PowerMock.mockStatic(HttpHelper.class);

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

@@ -24,6 +24,8 @@ public class PublicClientApplicationTest extends PowerMockTestCase {
 
     private PublicClientApplication app = null;
 
+    @SuppressWarnings("unchecked")
+    @Test
     public void testAcquireToken_Username_Password() throws Exception {
         app = PowerMock.createPartialMock(PublicClientApplication.class,
                 new String[] { "acquireTokenCommon" },