CQI Remove unused import. Define lengths as constants in OAuth2 credential matcher.

Author: nfalco79

src/main/java/com/cloudbees/jenkins/plugins/bitbucket/hooks/PullRequestHookProcessor.java

@@ -51,7 +51,6 @@
 import java.util.logging.Logger;
 import jenkins.plugins.git.AbstractGitSCMSource;
 import jenkins.scm.api.SCMEvent;
-import jenkins.scm.api.SCMEvent.Type;
 import jenkins.scm.api.SCMHead;
 import jenkins.scm.api.SCMHeadEvent;
 import jenkins.scm.api.SCMHeadObserver;

src/main/java/com/cloudbees/jenkins/plugins/bitbucket/impl/credentials/BitbucketOAuthCredentialMatcher.java

@@ -30,20 +30,22 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-// Although the CredentialsMatcher documentation says that the best practice
-// is to implement CredentialsMatcher.CQL too, this class does not implement
-// CredentialsMatcher.CQL, for the following reasons:
-//
-// * CQL supports neither method calls like username.contains(".")
-//   nor any regular-expression matching that could be used instead.
-// * There don't seem to be any public credential-provider plugins that
-//   would benefit from CQL.
+/*
+ * Although the CredentialsMatcher documentation says that the best practice
+ * is to implement CredentialsMatcher.CQL too, this class does not implement
+ * CredentialsMatcher.CQL, for the following reasons:
+ *
+ * - CQL supports neither method calls like username.contains(".")
+ *   nor any regular-expression matching that could be used instead;
+ * - there don't seem to be any public credential-provider plugins that
+ *    would benefit from CQL.
+ */
 public class BitbucketOAuthCredentialMatcher implements CredentialsMatcher {
-    private static int keyLength = 18;
-    private static int secretLength = 32;
-
     private static final long serialVersionUID = 6458784517693211197L;
-    private static final Logger LOGGER = Logger.getLogger(BitbucketOAuthCredentialMatcher.class.getName());
+    private static final Logger logger = Logger.getLogger(BitbucketOAuthCredentialMatcher.class.getName());
+
+    private static final int CLIENT_KEY_LENGTH = 18;
+    private static final int CLIENT_SECRET_LENGTH = 32;
 
     /**
      * {@inheritDoc}
@@ -54,20 +56,20 @@ public boolean matches(Credentials item) {
             return false;
         }
 
-        if(item.getClass().getName().equals("com.cloudbees.jenkins.plugins.amazonecr.AmazonECSRegistryCredential")) {
+        if (item.getClass().getName().equals("com.cloudbees.jenkins.plugins.amazonecr.AmazonECSRegistryCredential")) {
             return false;
         }
 
         try {
             UsernamePasswordCredentials usernamePasswordCredential = ((UsernamePasswordCredentials) item);
             String username = usernamePasswordCredential.getUsername();
             boolean isEMail = username.contains(".") && username.contains("@");
-            boolean validSecretLength = usernamePasswordCredential.getPassword().getPlainText().length() == secretLength;
-            boolean validKeyLength = username.length() == keyLength;
+            boolean validSecretLength = usernamePasswordCredential.getPassword().getPlainText().length() == CLIENT_SECRET_LENGTH;
+            boolean validKeyLength = username.length() == CLIENT_KEY_LENGTH;
 
             return !isEMail && validKeyLength && validSecretLength;
         } catch (RuntimeException e) {
-            LOGGER.log(Level.FINE, "Caught exception validating credential", e);
+            logger.log(Level.FINE, "Caught exception validating credential", e);
             return false;
         }
     }