Improved error messages as requested by Walmart

Author: machavan

src/main/java/com/microsoft/sqlserver/jdbc/SQLServerMSAL4JUtils.java

@@ -145,7 +145,7 @@ static SqlAuthenticationToken getSqlFedAuthToken(SqlFedAuthInfo fedAuthInfo, Str
         } catch (MalformedURLException | ExecutionException e) {
             throw getCorrectedException(e, user, authenticationString);
         } catch (TimeoutException e) {
-            throw new SQLServerException(SQLServerException.getErrString("R_connectionTimedOut"), e);
+            throw getCorrectedException(new SQLServerException(SQLServerException.getErrString("R_connectionTimedOut"), e), user, authenticationString);
         } finally {
             if (isSemAcquired) {
                 sem.release();
@@ -223,7 +223,7 @@ static SqlAuthenticationToken getSqlFedAuthTokenPrincipal(SqlFedAuthInfo fedAuth
         } catch (MalformedURLException | ExecutionException e) {
             throw getCorrectedException(e, aadPrincipalID, authenticationString);
         } catch (TimeoutException e) {
-            throw new SQLServerException(SQLServerException.getErrString("R_connectionTimedOut"), e);
+            throw getCorrectedException(new SQLServerException(SQLServerException.getErrString("R_connectionTimedOut"), e), aadPrincipalID, authenticationString);
         } finally {
             if (isSemAcquired) {
                 sem.release();
@@ -354,7 +354,7 @@ static SqlAuthenticationToken getSqlFedAuthTokenPrincipalCertificate(SqlFedAuthI
             throw new SQLServerException(SQLServerException.getErrString("R_readCertError") + e.getMessage(), null, 0,
                     null);
         } catch (TimeoutException e) {
-            throw new SQLServerException(SQLServerException.getErrString("R_connectionTimedOut"), e);
+            throw getCorrectedException(new SQLServerException(SQLServerException.getErrString("R_connectionTimedOut"), e), aadPrincipalID, authenticationString);
         } catch (Exception e) {
             throw getCorrectedException(e, aadPrincipalID, authenticationString);
 
@@ -420,7 +420,7 @@ static SqlAuthenticationToken getSqlFedAuthTokenIntegrated(SqlFedAuthInfo fedAut
         } catch (IOException | ExecutionException e) {
             throw getCorrectedException(e, user, authenticationString);
         } catch (TimeoutException e) {
-            throw new SQLServerException(SQLServerException.getErrString("R_connectionTimedOut"), e);
+            throw getCorrectedException(new SQLServerException(SQLServerException.getErrString("R_connectionTimedOut"), e), user, authenticationString);
         } finally {
             if (isSemAcquired) {
                 sem.release();
@@ -526,7 +526,7 @@ static SqlAuthenticationToken getSqlFedAuthTokenInteractive(SqlFedAuthInfo fedAu
         } catch (MalformedURLException | URISyntaxException | ExecutionException e) {
             throw getCorrectedException(e, user, authenticationString);
         } catch (TimeoutException e) {
-            throw new SQLServerException(SQLServerException.getErrString("R_connectionTimedOut"), e);
+            throw getCorrectedException(new SQLServerException(SQLServerException.getErrString("R_connectionTimedOut"), e), user, authenticationString);
         } finally {
             if (isSemAcquired) {
                 sem.release();

src/test/java/com/microsoft/sqlserver/jdbc/SQLServerConnectionTest.java

@@ -1336,7 +1336,7 @@ public void testGetSqlFedAuthTokenFailure() throws SQLException {
         	fail(TestResource.getResource("R_expectedExceptionNotThrown"));
         } catch (SQLServerException e) {
         	//test pass
-        	assertEquals(e.getMessage(), SQLServerException.getErrString("R_connectionTimedOut"), "Expected Timeout Exception was not thrown");
+            assertTrue(e.getMessage().contains(SQLServerException.getErrString("R_connectionTimedOut")), "Expected Timeout Exception was not thrown");
         }        
     }
 
@@ -1351,7 +1351,7 @@ public void testGetSqlFedAuthTokenFailureNoWaiting() throws SQLException {
         	fail(TestResource.getResource("R_expectedExceptionNotThrown"));
         } catch (SQLServerException e) {
         	//test pass
-        	assertEquals(e.getMessage(), SQLServerException.getErrString("R_connectionTimedOut"), "Expected Timeout Exception was not thrown");
+            assertTrue(e.getMessage().contains(SQLServerException.getErrString("R_connectionTimedOut")), "Expected Timeout Exception was not thrown");
         }        
     }
 
@@ -1366,7 +1366,7 @@ public void testGetSqlFedAuthTokenFailureNagativeWaiting() throws SQLException {
         	fail(TestResource.getResource("R_expectedExceptionNotThrown"));
         } catch (SQLServerException e) {
         	//test pass
-        	assertEquals(e.getMessage(), SQLServerException.getErrString("R_connectionTimedOut"), "Expected Timeout Exception was not thrown");
+            assertTrue(e.getMessage().contains(SQLServerException.getErrString("R_connectionTimedOut")), "Expected Timeout Exception was not thrown");
         }        
     }