Skip to content

Commit 4878161

Browse files
committed
final static instance variables should be in CAPS
1 parent 2c33841 commit 4878161

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ static SqlFedAuthToken getSqlFedAuthToken(SqlFedAuthInfo fedAuthInfo,
2222
ExecutorService executorService = Executors.newFixedThreadPool(1);
2323
try {
2424
AuthenticationContext context = new AuthenticationContext(fedAuthInfo.stsurl, false, executorService);
25-
Future<AuthenticationResult> future = context.acquireToken(fedAuthInfo.spn, ActiveDirectoryAuthentication.jdbcFedauthClientId, user,
25+
Future<AuthenticationResult> future = context.acquireToken(fedAuthInfo.spn, ActiveDirectoryAuthentication.JDBC_FEDAUTH_CLIENT_ID, user,
2626
password, null);
2727

2828
AuthenticationResult authenticationResult = future.get();

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

+8-8
Original file line numberDiff line numberDiff line change
@@ -148,12 +148,12 @@ public String toString() {
148148

149149

150150
class ActiveDirectoryAuthentication {
151-
static final String jdbcFedauthClientId = "7f98cb04-cd1e-40df-9140-3bf7e2cea4db";
152-
static final String AdalGetAccessTokenFunctionName = "ADALGetAccessToken";
153-
static final int GetAccessTokenSuccess = 0;
154-
static final int GetAccessTokenInvalidGrant = 1;
155-
static final int GetAccessTokenTansisentError = 2;
156-
static final int GetAccessTokenOtherError = 3;
151+
static final String JDBC_FEDAUTH_CLIENT_ID = "7f98cb04-cd1e-40df-9140-3bf7e2cea4db";
152+
static final String ADAL_GET_ACCESS_TOKEN_FUNCTION_NAME = "ADALGetAccessToken";
153+
static final int GET_ACCESS_TOKEN_SUCCESS = 0;
154+
static final int GET_ACCESS_TOKEN_INVALID_GRANT = 1;
155+
static final int GET_ACCESS_TOKEN_TANSISENT_ERROR = 2;
156+
static final int GET_ACCESS_TOKEN_OTHER_ERROR = 3;
157157
}
158158

159159
/**
@@ -3451,7 +3451,7 @@ else if (authenticationString.trim().equalsIgnoreCase(SqlAuthentication.ActiveDi
34513451
try {
34523452
long expirationFileTime = 0;
34533453
FedAuthDllInfo dllInfo = AuthenticationJNI.getAccessTokenForWindowsIntegrated(fedAuthInfo.stsurl, fedAuthInfo.spn,
3454-
clientConnectionId.toString(), ActiveDirectoryAuthentication.jdbcFedauthClientId, expirationFileTime);
3454+
clientConnectionId.toString(), ActiveDirectoryAuthentication.JDBC_FEDAUTH_CLIENT_ID, expirationFileTime);
34553455

34563456
// AccessToken should not be null.
34573457
assert null != dllInfo.accessTokenBytes;
@@ -3476,7 +3476,7 @@ else if (authenticationString.trim().equalsIgnoreCase(SqlAuthentication.ActiveDi
34763476
}
34773477

34783478
int millisecondsRemaining = TimerRemaining(timerExpire);
3479-
if (ActiveDirectoryAuthentication.GetAccessTokenTansisentError != errorCategory || timerHasExpired(timerExpire)
3479+
if (ActiveDirectoryAuthentication.GET_ACCESS_TOKEN_TANSISENT_ERROR != errorCategory || timerHasExpired(timerExpire)
34803480
|| (sleepInterval >= millisecondsRemaining)) {
34813481

34823482
String errorStatus = Integer.toHexString(adalException.GetStatus());

0 commit comments

Comments
 (0)