Merge pull request #940 from ayyoob/master

Removed slf4j - unnecessary import package
wso2-attic · Sep 13, 2015 · 7e64e5f · 7e64e5f
2 parents 91e753e + 3ded9b5
commit 7e64e5f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/components/sso-saml/org.wso2.carbon.identity.sso.saml/pom.xml b/components/sso-saml/org.wso2.carbon.identity.sso.saml/pom.xml
@@ -113,7 +113,6 @@
                             org.eclipse.equinox.http.helper,
                             org.joda.time; version="${opensaml2.wso2.osgi.version.range}",
                             org.opensaml.*; version="${opensaml2.wso2.osgi.version.range}",
-                            org.slf4j; version="${org.slf4j.imp.pkg.version.range}",
 
                             org.apache.xerces.util; resolution:=optional,
                             org.apache.xml.security.*; version="${wss4j.xml.security.imp.pkg.version.range}",

diff --git a/.../wso2/carbon/identity/sso/saml/validators/SAML2HTTPRedirectDeflateSignatureValidator.java b/.../wso2/carbon/identity/sso/saml/validators/SAML2HTTPRedirectDeflateSignatureValidator.java
@@ -32,8 +32,8 @@
 import org.opensaml.xml.signature.impl.ExplicitKeySignatureTrustEngine;
 import org.opensaml.xml.util.Base64;
 import org.opensaml.xml.util.DatatypeHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.identity.base.IdentityException;
 import org.wso2.carbon.identity.sso.saml.builders.X509CredentialImpl;
 import org.wso2.carbon.identity.sso.saml.exception.IdentitySAML2SSOException;
@@ -46,7 +46,7 @@
 
 public class SAML2HTTPRedirectDeflateSignatureValidator implements SAML2HTTPRedirectSignatureValidator {
 
-    private final static Logger log = LoggerFactory.getLogger(SAML2HTTPRedirectDeflateSignatureValidator.class);
+    private final static Log log = LogFactory.getLog(SAML2HTTPRedirectDeflateSignatureValidator.class);
 
     /**
      * Build a criteria set suitable for input to the trust engine.
@@ -139,15 +139,17 @@ protected static byte[] getSignedContent(String queryString) throws SecurityPoli
         // request directly. We can't use the decoded parameters because we need
         // the raw
         // data and URL-encoding isn't canonical.
-        log.debug("Constructing signed content string from URL query string {}", queryString);
-
+        if (log.isDebugEnabled()) {
+            log.debug("Constructing signed content string from URL query string " + queryString);
+        }
         String constructed = buildSignedContentString(queryString);
         if (DatatypeHelper.isEmpty(constructed)) {
             throw new SecurityPolicyException(
                     "Could not extract signed content string from query string");
         }
-        log.debug("Constructed signed content string for HTTP-Redirect DEFLATE {}", constructed);
-
+        if (log.isDebugEnabled()) {
+            log.debug("Constructed signed content string for HTTP-Redirect DEFLATE " + constructed);
+        }
         try {
             return constructed.getBytes("UTF-8");
         } catch (UnsupportedEncodingException e) {