Add isDebugEnabled

Fixes spring-atticgh-1040

Author: kazuki43zoo

spring-security-oauth2/src/main/java/org/springframework/security/oauth2/client/token/OAuth2AccessTokenSupport.java

@@ -1,11 +1,5 @@
 package org.springframework.security.oauth2.client.token;
 
-import java.io.IOException;
-import java.net.HttpURLConnection;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.http.HttpHeaders;
@@ -37,6 +31,12 @@
 import org.springframework.web.client.RestOperations;
 import org.springframework.web.client.RestTemplate;
 
+import java.io.IOException;
+import java.net.HttpURLConnection;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
 /**
  * Base support logic for obtaining access tokens.
  * 
@@ -218,6 +218,9 @@ public void doWithRequest(ClientHttpRequest request) throws IOException {
 			request.getHeaders().putAll(this.headers);
 			request.getHeaders().setAccept(
 					Arrays.asList(MediaType.APPLICATION_JSON, MediaType.APPLICATION_FORM_URLENCODED));
+			if (logger.isDebugEnabled()) {
+				logger.debug("Encoding and sending form: " + form);
+			}
 			FORM_MESSAGE_CONVERTER.write(this.form, MediaType.APPLICATION_FORM_URLENCODED, request);
 		}
 	}

spring-security-oauth2/src/main/java/org/springframework/security/oauth2/provider/approval/JdbcApprovalStore.java

@@ -113,7 +113,9 @@ public void setRefreshApprovalStatement(String refreshApprovalStatement) {
 
 	@Override
 	public boolean addApprovals(final Collection<Approval> approvals) {
-		logger.debug(String.format("adding approvals: [%s]", approvals));
+		if (logger.isDebugEnabled()) {
+			logger.debug(String.format("adding approvals: [%s]", approvals));
+		}
 		boolean success = true;
 		for (Approval approval : approvals) {
 			if (!updateApproval(refreshApprovalStatement, approval)) {
@@ -127,7 +129,9 @@ public boolean addApprovals(final Collection<Approval> approvals) {
 
 	@Override
 	public boolean revokeApprovals(Collection<Approval> approvals) {
-		logger.debug(String.format("Revoking approvals: [%s]", approvals));
+		if (logger.isDebugEnabled()) {
+			logger.debug(String.format("Revoking approvals: [%s]", approvals));
+		}
 		boolean success = true;
 		for (final Approval approval : approvals) {
 			if (handleRevocationsAsExpiry) {
@@ -171,7 +175,9 @@ public void setValues(PreparedStatement ps) throws SQLException {
 							ps.setTimestamp(1, new Timestamp(new Date().getTime()));
 						}
 					});
-			logger.debug(deleted + " expired approvals deleted");
+			if (logger.isDebugEnabled()) {
+				logger.debug(deleted + " expired approvals deleted");
+			}
 		}
 		catch (DataAccessException ex) {
 			logger.error("Error purging expired approvals", ex);
@@ -186,7 +192,9 @@ public List<Approval> getApprovals(String userName, String clientId) {
 	}
 
 	private boolean updateApproval(final String sql, final Approval approval) {
-		logger.debug(String.format("refreshing approval: [%s]", approval));
+		if (logger.isDebugEnabled()) {
+			logger.debug(String.format("refreshing approval: [%s]", approval));
+		}
 		int refreshed = jdbcTemplate.update(sql, new PreparedStatementSetter() {
 			@Override
 			public void setValues(PreparedStatement ps) throws SQLException {

spring-security-oauth2/src/main/java/org/springframework/security/oauth2/provider/approval/TokenStoreUserApprovalHandler.java

@@ -139,9 +139,13 @@ public AuthorizationRequest checkForPreApproval(AuthorizationRequest authorizati
 		}
 
 		OAuth2AccessToken accessToken = tokenStore.getAccessToken(authentication);
-		logger.debug("Existing access token=" + accessToken);
+		if (logger.isDebugEnabled()) {
+			logger.debug("Existing access token=" + accessToken);
+		}
 		if (accessToken != null && !accessToken.isExpired()) {
-			logger.debug("User already approved with token=" + accessToken);
+			if (logger.isDebugEnabled()) {
+				logger.debug("User already approved with token=" + accessToken);
+			}
 			// A token was already granted and is still valid, so this is already approved
 			approved = true;
 		}

spring-security-oauth2/src/main/java/org/springframework/security/oauth2/provider/endpoint/AuthorizationEndpoint.java

@@ -241,7 +241,9 @@ public View approveOrDeny(@RequestParam Map<String, String> approvalParameters,
 	// We need explicit approval from the user.
 	private ModelAndView getUserApprovalPageResponse(Map<String, Object> model,
 			AuthorizationRequest authorizationRequest, Authentication principal) {
-		logger.debug("Loading user approval page: " + userApprovalPage);
+		if (logger.isDebugEnabled()) {
+			logger.debug("Loading user approval page: " + userApprovalPage);
+		}
 		model.putAll(userApprovalHandler.getUserApprovalRequest(authorizationRequest, principal));
 		return new ModelAndView(userApprovalPage, model);
 	}

spring-security-oauth2/src/main/java/org/springframework/security/oauth2/provider/token/AbstractTokenGranter.java

@@ -59,8 +59,10 @@ public OAuth2AccessToken grant(String grantType, TokenRequest tokenRequest) {
 		String clientId = tokenRequest.getClientId();
 		ClientDetails client = clientDetailsService.loadClientByClientId(clientId);
 		validateGrantType(grantType, client);
-		
-		logger.debug("Getting access token for: " + clientId);
+
+		if (logger.isDebugEnabled()) {
+			logger.debug("Getting access token for: " + clientId);
+		}
 
 		return getAccessToken(client, tokenRequest);
 

spring-security-oauth2/src/main/java/org/springframework/security/oauth2/provider/token/RemoteTokenServices.java

@@ -106,7 +106,9 @@ public OAuth2Authentication loadAuthentication(String accessToken) throws Authen
 		Map<String, Object> map = postForMap(checkTokenEndpointUrl, formData, headers);
 
 		if (map.containsKey("error")) {
-			logger.debug("check_token returned error: " + map.get("error"));
+			if (logger.isDebugEnabled()) {
+				logger.debug("check_token returned error: " + map.get("error"));
+			}
 			throw new InvalidTokenException(accessToken);
 		}