diff options
author | Martin Damovsky <martin.damovsky@gmail.com> | 2017-02-20 13:14:26 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-02-20 13:14:26 +0100 |
commit | 6f4801d6123397c060a05e980f9421ed8b983aa3 (patch) | |
tree | 4eca6474a26791e58d5b01c37993b6126cc7744b /src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/bitbucket/ApiClient.java | |
parent | d6add0ce1f04133e65c0ec10b03268bded3818f0 (diff) | |
parent | 9417295b77c5b1da8dd5454862e2998f0f03ebb1 (diff) | |
download | bbprb-6f4801d6123397c060a05e980f9421ed8b983aa3.tar.gz |
Merge pull request #16 from jenkinsci/upgrading-parent-pom
Upgrading parent pom org.jenkins-ci.plugins to version 2.11.
Diffstat (limited to 'src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/bitbucket/ApiClient.java')
-rw-r--r-- | src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/bitbucket/ApiClient.java | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/bitbucket/ApiClient.java b/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/bitbucket/ApiClient.java index 0c87478..7ab69c4 100644 --- a/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/bitbucket/ApiClient.java +++ b/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/bitbucket/ApiClient.java @@ -58,7 +58,7 @@ public class ApiClient { if (Jenkins.getInstance() == null) return client; - ProxyConfiguration proxy = Jenkins.getInstance().proxy; + ProxyConfiguration proxy = getInstance().proxy; if (proxy == null) return client; logger.log(Level.INFO, "Jenkins proxy: {0}:{1}", new Object[]{ proxy.name, proxy.port }); @@ -75,7 +75,17 @@ public class ApiClient { return client; } + + private Jenkins getInstance() { + final Jenkins instance = Jenkins.getInstance(); + if (instance == null){ + throw new IllegalStateException("Jenkins instance is NULL!"); + } + return instance; + } } + + public <T extends HttpClientFactory> ApiClient( String username, String password, |