Merge branch 'CredentialsSupport' into master

Also bump pom version

Conflicts:
	.gitignore

4 files changed, 120 insertions, 29 deletions

diff --git a/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger.java b/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger.java
index cd9345c..2375ec7 100644
--- a/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger.java
+++ b/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger.java
@@ -1,12 +1,17 @@
 package bitbucketpullrequestbuilder.bitbucketpullrequestbuilder;
 
 import antlr.ANTLRException;
+import com.cloudbees.plugins.credentials.CredentialsProvider;
+import com.cloudbees.plugins.credentials.common.StandardListBoxModel;
+import com.cloudbees.plugins.credentials.common.StandardUsernamePasswordCredentials;
+import com.cloudbees.plugins.credentials.common.UsernamePasswordCredentials;
 import hudson.Extension;
 import hudson.model.*;
 import hudson.model.queue.QueueTaskFuture;
 import hudson.plugins.git.RevisionParameterAction;
 import hudson.triggers.Trigger;
 import hudson.triggers.TriggerDescriptor;
+import hudson.util.ListBoxModel;
 import net.sf.json.JSONObject;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.StaplerRequest;
@@ -17,6 +22,8 @@ import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import static com.cloudbees.plugins.credentials.CredentialsMatchers.instanceOf;
+
 /**
  * Created by nishio
  */
@@ -24,6 +31,7 @@ public class BitbucketBuildTrigger extends Trigger<AbstractProject<?, ?>> {
     private static final Logger logger = Logger.getLogger(BitbucketBuildTrigger.class.getName());
     private final String projectPath;
     private final String cron;
+    private final String credentialsId;
     private final String username;
     private final String password;
     private final String repositoryOwner;
@@ -45,6 +53,7 @@ public class BitbucketBuildTrigger extends Trigger<AbstractProject<?, ?>> {
     public BitbucketBuildTrigger(
             String projectPath,
             String cron,
+            String credentialsId,
             String username,
             String password,
             String repositoryOwner,
@@ -60,6 +69,7 @@ public class BitbucketBuildTrigger extends Trigger<AbstractProject<?, ?>> {
         super(cron);
         this.projectPath = projectPath;
         this.cron = cron;
+        this.credentialsId = credentialsId;
         this.username = username;
         this.password = password;
         this.repositoryOwner = repositoryOwner;
@@ -81,6 +91,10 @@ public class BitbucketBuildTrigger extends Trigger<AbstractProject<?, ?>> {
         return this.cron;
     }
 
+    public String getCredentialsId() {
+        return credentialsId;
+    }
+
     public String getUsername() {
         return username;
     }
@@ -208,5 +222,12 @@ public class BitbucketBuildTrigger extends Trigger<AbstractProject<?, ?>> {
             save();
             return super.configure(req, json);
         }
+
+        public ListBoxModel doFillCredentialsIdItems() {
+            return new StandardListBoxModel()
+                    .withEmptySelection()
+                    .withMatching(instanceOf(UsernamePasswordCredentials.class),
+                            CredentialsProvider.lookupCredentials(StandardUsernamePasswordCredentials.class));
+        }
     }
 }
diff --git a/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketRepository.java b/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketRepository.java
index 6736ee9..23b0607 100644
--- a/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketRepository.java
+++ b/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketRepository.java
@@ -13,12 +13,18 @@ import java.util.LinkedList;
 import java.util.logging.Level;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import com.cloudbees.plugins.credentials.CredentialsMatchers;
+import com.cloudbees.plugins.credentials.CredentialsProvider;
+import com.cloudbees.plugins.credentials.common.StandardUsernamePasswordCredentials;
+import com.cloudbees.plugins.credentials.common.UsernamePasswordCredentials;
 import jenkins.model.Jenkins;
 import jenkins.scm.api.SCMSource;
 import jenkins.scm.api.SCMSourceOwner;
 import jenkins.scm.api.SCMSourceOwners;
 import org.apache.commons.lang.StringUtils;
 
+import static com.cloudbees.plugins.credentials.CredentialsMatchers.instanceOf;
+
 /**
  * Created by nishio
  */
@@ -34,26 +40,46 @@ public class BitbucketRepository {
     private BitbucketPullRequestsBuilder builder;
     private BitbucketBuildTrigger trigger;
     private ApiClient client;
-
+    
     public BitbucketRepository(String projectPath, BitbucketPullRequestsBuilder builder) {
         this.projectPath = projectPath;
         this.builder = builder;
     }
 
     public void init() {
-        this.init(null);
+        this.init(null, null);
+    }
+    
+    public <T extends ApiClient.HttpClientFactory> void init(Class<T> httpFactory) {
+        this.init(null, httpFactory);
     }
     
     public void init(ApiClient client) {
+        this.init(client, null);
+    }
+    
+    public <T extends ApiClient.HttpClientFactory> void init(ApiClient client, Class<T> httpFactory) {
         this.trigger = this.builder.getTrigger();
-        this.client = (client == null) ? new ApiClient(
-                trigger.getUsername(),
-                trigger.getPassword(),
+        
+        if (client == null) {                      
+            String username = trigger.getUsername();
+            String password = trigger.getPassword();            
+            StandardUsernamePasswordCredentials credentials = getCredentials(trigger.getCredentialsId());
+            if (credentials != null) {
+                username = credentials.getUsername();
+                password = credentials.getPassword().getPlainText();
+            }            
+            this.client = new ApiClient(
+                username,
+                password,
                 trigger.getRepositoryOwner(),
                 trigger.getRepositoryName(),
                 trigger.getCiKey(),
-                trigger.getCiName()
-        ) : client;
+                trigger.getCiName(),
+                httpFactory
+            );
+            
+        } else this.client = client;
     }
 
     public Collection<Pullrequest> getTargetPullRequests() {
@@ -67,6 +93,10 @@ public class BitbucketRepository {
         }
         return targetPullRequests;
     }
+    
+    public ApiClient getClient() {
+      return this.client;
+    }
 
     public void addFutureBuildTasks(Collection<Pullrequest> pullRequests) {
         for(Pullrequest pullRequest : pullRequests) {
@@ -267,4 +297,12 @@ public class BitbucketRepository {
         
         return filter.approved(cause);
     }
+
+    private StandardUsernamePasswordCredentials getCredentials(String credentialsId) {
+        return CredentialsMatchers
+                .firstOrNull(
+                        CredentialsProvider.lookupCredentials(StandardUsernamePasswordCredentials.class),
+                        CredentialsMatchers.allOf(CredentialsMatchers.withId(credentialsId),
+                                instanceOf(UsernamePasswordCredentials.class)));
+    }
 }
diff --git a/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/bitbucket/ApiClient.java b/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/bitbucket/ApiClient.java
index e635f65..509dfaf 100644
--- a/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/bitbucket/ApiClient.java
+++ b/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/bitbucket/ApiClient.java
@@ -17,7 +17,6 @@ import java.util.logging.Logger;
 import jenkins.model.Jenkins;
 import hudson.ProxyConfiguration;
 import org.apache.commons.httpclient.methods.PutMethod;
-import org.apache.commons.httpclient.params.HttpMethodParams;
 import org.apache.commons.httpclient.util.EncodingUtil;
 
 /**
@@ -33,13 +32,55 @@ public class ApiClient {
     private Credentials credentials;
     private String key;
     private String name;
-
-    public ApiClient(String username, String password, String owner, String repositoryName, String key, String name) {
+    private HttpClientFactory factory;
+
+    public static class HttpClientFactory {    
+        public static final HttpClientFactory INSTANCE = new HttpClientFactory(); 
+        
+        public HttpClient getInstanceHttpClient() {
+            HttpClient client = new HttpClient();
+            if (Jenkins.getInstance() == null) return client;
+
+            ProxyConfiguration proxy = Jenkins.getInstance().proxy;
+            if (proxy == null) return client;
+
+            logger.log(Level.INFO, "Jenkins proxy: {0}:{1}", new Object[]{ proxy.name, proxy.port });
+            client.getHostConfiguration().setProxy(proxy.name, proxy.port);
+            String username = proxy.getUserName();
+            String password = proxy.getPassword();
+
+            // Consider it to be passed if username specified. Sufficient?
+            if (username != null && !"".equals(username.trim())) {
+                logger.log(Level.INFO, "Using proxy authentication (user={0})", username);
+                client.getState().setProxyCredentials(AuthScope.ANY,
+                    new UsernamePasswordCredentials(username, password));
+            }
+            
+            return client;
+        }
+    }
+    
+    public <T extends HttpClientFactory> ApiClient(
+        String username, String password, 
+        String owner, String repositoryName, 
+        String key, String name, 
+        Class<T> httpFactory
+    ) {
         this.credentials = new UsernamePasswordCredentials(username, password);
         this.owner = owner;
         this.repositoryName = repositoryName;
         this.key = key;
         this.name = name;
+        
+        try {
+            this.factory = (httpFactory != null) ? httpFactory.newInstance() : HttpClientFactory.INSTANCE;
+        } catch(InstantiationException e) {
+            logger.log(Level.WARNING, "failed new instance of {0}: {1} ", new Object[] { httpFactory.getName(), e });
+            e.printStackTrace();
+        } catch (IllegalAccessException e) {
+            logger.log(Level.WARNING, "failed new instance of {0}: {1} ", new Object[] { httpFactory.getName(), e });
+            e.printStackTrace();
+      }
     }
 
     public List<Pullrequest> getPullRequests() {
@@ -47,6 +88,7 @@ public class ApiClient {
             return parse(get(v2("/pullrequests/")), Pullrequest.Response.class).getPullrequests();
         } catch(Exception e) {
             logger.log(Level.WARNING, "invalid pull request response.", e);
+            e.printStackTrace();
         }
         return Collections.EMPTY_LIST;
     }
@@ -56,6 +98,7 @@ public class ApiClient {
             return parse(get(v1("/pullrequests/" + pullRequestId + "/comments")), new TypeReference<List<Pullrequest.Comment>>() {});
         } catch(Exception e) {
             logger.log(Level.WARNING, "invalid pull request response.", e);
+            e.printStackTrace();
         }
         return Collections.EMPTY_LIST;
     }
@@ -112,6 +155,7 @@ public class ApiClient {
             return parse(post(v2("/pullrequests/" + pullRequestId + "/approve"),
                 new NameValuePair[]{}), Pullrequest.Participant.class);
         } catch (IOException e) {
+            logger.log(Level.WARNING, "Invalid pull request approval response.", e);
             e.printStackTrace();
         }
         return null;
@@ -131,24 +175,7 @@ public class ApiClient {
     }
 
     private HttpClient getHttpClient() {
-        HttpClient client = new HttpClient();
-        if (Jenkins.getInstance() == null) return client;
-
-        ProxyConfiguration proxy = Jenkins.getInstance().proxy;
-        if (proxy == null) return client;
-
-        logger.info("Jenkins proxy: " + proxy.name + ":" + proxy.port);
-        client.getHostConfiguration().setProxy(proxy.name, proxy.port);
-        String username = proxy.getUserName();
-        String password = proxy.getPassword();
-
-        // Consider it to be passed if username specified. Sufficient?
-        if (username != null && !"".equals(username.trim())) {
-            logger.info("Using proxy authentication (user=" + username + ")");
-            client.getState().setProxyCredentials(AuthScope.ANY,
-                new UsernamePasswordCredentials(username, password));
-        }
-        return client;
+        return this.factory.getInstanceHttpClient();
     }
 
     private String v1(String url) {
@@ -193,8 +220,10 @@ public class ApiClient {
             client.executeMethod(req);
             return req.getResponseBodyAsString();
         } catch (HttpException e) {
+            logger.log(Level.WARNING, "Failed to send request.", e);
             e.printStackTrace();
         } catch (IOException e) {
+            logger.log(Level.WARNING, "Failed to send request.", e);
             e.printStackTrace();
         }
         return null;
diff --git a/src/main/resources/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger/config.jelly b/src/main/resources/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger/config.jelly
index 25acac0..d4b23da 100644
--- a/src/main/resources/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger/config.jelly
+++ b/src/main/resources/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger/config.jelly
@@ -1,7 +1,10 @@
-<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:c="/lib/credentials">
   <f:entry title="Cron" field="cron">
     <f:textbox />
   </f:entry>
+  <f:entry title="${%Credentials}" field="credentialsId">
+      <c:select/>
+  </f:entry>
   <f:entry title="Bitbucket BasicAuth Username" field="username">
     <f:textbox />
   </f:entry>