Merge pull request #41 from darxriggs/code-cleanup

Code Improvements

Author: Antonio Mansilla

pom.xml

@@ -10,7 +10,6 @@
     <relativePath />
   </parent>
 
-  <groupId>org.jenkins-ci.plugins</groupId>
   <artifactId>bitbucket-build-status-notifier</artifactId>
   <version>1.4.2-SNAPSHOT</version>
   <packaging>hpi</packaging>

src/main/java/org/jenkinsci/plugins/bitbucket/BitbucketBuildStatusHelper.java

@@ -187,8 +187,8 @@ public static String buildUrlFromBuild(Run<?, ?> build) {
     }
 
     private static BitbucketBuildStatus createBitbucketBuildStatusFromBuild(Run<?, ?> build, boolean overrideLatestBuild) throws Exception {
-        String buildKey = "";
-        String buildName = "";
+        String buildKey;
+        String buildName;
         String buildState = guessBitbucketBuildState(build.getResult());
         // bitbucket requires the key to be shorter than 40 chars
         if (overrideLatestBuild) {
@@ -253,7 +253,7 @@ public static void notifyBuildStatus(UsernamePasswordCredentials credentials, bo
                 }
             }
 
-            if(repoSlug != null && commitId != null) {
+            if (repoSlug != null && commitId != null) {
                 buildStatusResource = new BitbucketBuildStatusResource(buildStatusResource.getOwner(), repoSlug, commitId);
             }
 

src/main/java/org/jenkinsci/plugins/bitbucket/BitbucketBuildStatusNotifier.java

@@ -56,10 +56,10 @@ public class BitbucketBuildStatusNotifier extends Notifier {
 
     private static final Logger logger = Logger.getLogger(BitbucketBuildStatusNotifier.class.getName());
 
-    private boolean notifyStart;
-    private boolean notifyFinish;
-    private boolean overrideLatestBuild;
-    private String credentialsId;
+    private final boolean notifyStart;
+    private final boolean notifyFinish;
+    private final boolean overrideLatestBuild;
+    private final String credentialsId;
 
     @DataBoundConstructor
     public BitbucketBuildStatusNotifier(final boolean notifyStart, final boolean notifyFinish,
@@ -99,7 +99,6 @@ private StandardUsernamePasswordCredentials getCredentials(AbstractBuild<?,?> bu
 
     @Override
     public boolean prebuild(AbstractBuild<?, ?> build, BuildListener listener) {
-
         if (!this.notifyStart) {
             return true;
         }
@@ -120,7 +119,6 @@ public boolean prebuild(AbstractBuild<?, ?> build, BuildListener listener) {
 
     @Override
     public boolean perform(AbstractBuild<?, ?> build, Launcher launcher, BuildListener listener) {
-
         if (!this.notifyFinish) {
             return true;
         }
@@ -160,7 +158,7 @@ public boolean needsToRunAfterFinalized() {
     public static class DescriptorImpl extends BuildStepDescriptor<Publisher> {
 
         private String globalCredentialsId;
-        
+
         public DescriptorImpl() {
             load();
         }
@@ -240,7 +238,6 @@ public FormValidation doCheckGlobalCredentialsId(@QueryParameter final String gl
         }
 
         private FormValidation checkCredentials(UsernamePasswordCredentials credentials) {
-
             try {
                 OAuthConfig config = new OAuthConfig(credentials.getUsername(), credentials.getPassword().getPlainText());
                 BitbucketApiService apiService = (BitbucketApiService) new BitbucketApi().createService(config);

src/main/java/org/jenkinsci/plugins/bitbucket/BitbucketBuildStatusNotifierStep.java

@@ -54,10 +54,7 @@ public class BitbucketBuildStatusNotifierStep extends AbstractStepImpl {
     private static final BitbucketHostValidator hostValidator = new BitbucketHostValidator();
 
     private String credentialsId;
-    public String getCredentialsId() {
-        return this.credentialsId;
-    }
-
+    public String getCredentialsId() { return this.credentialsId; }
     @DataBoundSetter public void setCredentialsId(String credentialsId) {
         this.credentialsId = credentialsId;
     }
@@ -97,7 +94,6 @@ public String getCredentialsId() {
 
     @DataBoundConstructor
     public BitbucketBuildStatusNotifierStep(final String buildState) {
-        this.credentialsId = credentialsId;
         this.buildState = buildState;
     }
 
@@ -167,7 +163,7 @@ private void readGlobalConfiguration() {
             try {
                 config.unmarshal(cfg);
                 step.getDescriptor().setGlobalCredentialsId(cfg.getGlobalCredentialsId());
-            } catch(IOException e) {
+            } catch (IOException e) {
                 logger.warning("Unable to read BitbucketBuildStatusNotifier configuration");
             }
         }
@@ -179,17 +175,17 @@ public Void run() throws Exception {
             String buildState = step.getBuildState();
 
             String buildKey = step.getBuildKey();
-            if(buildKey == null) {
+            if (buildKey == null) {
                 buildKey = BitbucketBuildStatusHelper.defaultBitbucketBuildKeyFromBuild(build);
             }
 
             String buildName = step.getBuildName();
-            if(buildName == null) {
+            if (buildName == null) {
                 buildName = BitbucketBuildStatusHelper.defaultBitbucketBuildNameFromBuild(build);
             }
 
             String buildDescription = step.getBuildDescription();
-            if(buildDescription == null) {
+            if (buildDescription == null) {
                 buildDescription = BitbucketBuildStatusHelper.defaultBitbucketBuildDescriptionFromBuild(build);
             }
 

src/main/java/org/jenkinsci/plugins/bitbucket/api/BitbucketApiService.java

@@ -34,8 +34,8 @@ public class BitbucketApiService extends OAuth20ServiceImpl {
     private static final String GRANT_TYPE_KEY = "grant_type";
     private static final String GRANT_TYPE_CLIENT_CREDENTIALS = "client_credentials";
 
-    private DefaultApi20 api;
-    private OAuthConfig config;
+    private final DefaultApi20 api;
+    private final OAuthConfig config;
 
     public BitbucketApiService(DefaultApi20 api, OAuthConfig config) {
         super(api, config);

src/main/java/org/jenkinsci/plugins/bitbucket/model/BitbucketBuildStatusResource.java

@@ -30,9 +30,9 @@ public class BitbucketBuildStatusResource {
 
     private static final String API_ENDPOINT = "https://api.bitbucket.org/2.0/";
 
-    private String owner;
-    private String repoSlug;
-    private String commitId;
+    private final String owner;
+    private final String repoSlug;
+    private final String commitId;
 
     public BitbucketBuildStatusResource(String owner, String repoSlug, String commitId) {
         this.owner = owner;

src/main/java/org/jenkinsci/plugins/bitbucket/scm/MultiScmAdapter.java

@@ -34,8 +34,6 @@
 import org.jenkinsci.plugins.multiplescms.MultiSCM;
 
 import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
 import java.util.Map;
 
 public class MultiScmAdapter implements ScmAdapter {
@@ -48,12 +46,10 @@ public MultiScmAdapter(MultiSCM multiScm, Run<?, ?> build) {
         this.build = build;
     }
 
-    public Map getCommitRepoMap() throws Exception {
+    public Map<String, URIish> getCommitRepoMap() throws Exception {
         HashMap<String, URIish> commitRepoMap = new HashMap<String, URIish>();
-        List<SCM> scms = multiScm.getConfiguredSCMs();
 
-        for (Iterator<SCM> i = scms.iterator(); i.hasNext(); ) {
-            SCM scm = i.next();
+        for (SCM scm : multiScm.getConfiguredSCMs()) {
             if (scm instanceof GitSCM) {
                 commitRepoMap.putAll(new GitScmAdapter((GitSCM) scm, this.build).getCommitRepoMap());
             } else if (scm instanceof MercurialSCM) {

src/main/java/org/jenkinsci/plugins/bitbucket/validator/BitbucketHostValidator.java

@@ -27,17 +27,14 @@
 import com.google.common.collect.ImmutableSet;
 import java.util.Set;
 
-public class BitbucketHostValidator
-{
+public class BitbucketHostValidator {
     final Set<String> supportedDomains = ImmutableSet.of("bitbucket.org", "altssh.bitbucket.org");
 
-    public boolean isValid(final String $value)
-    {
+    public boolean isValid(final String $value) {
         return this.supportedDomains.contains($value);
     }
 
-    public String renderError()
-    {
+    public String renderError() {
         return "Bitbucket build notifier support only repositories hosted in bitbucket.org";
     }
 }