diff options
author | Nicholas Blair <nicholas.blair@gmail.com> | 2017-02-23 09:40:25 -0600 |
---|---|---|
committer | Nicholas Blair <nicholas.blair@gmail.com> | 2017-02-23 09:40:25 -0600 |
commit | 4c5edc0144af81056f96eceadb864ac93809b22f (patch) | |
tree | b8b33f76cf674bd0875fd32745934d2054c42ee0 /src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/bitbucket/ApiClient.java | |
parent | 65d4d19adf3ab11b7327aa2f0a54199ddc32a7cf (diff) | |
parent | 67e38c42109c9ed95462d1dd47404c6c102d3854 (diff) | |
download | bbprb-4c5edc0144af81056f96eceadb864ac93809b22f.tar.gz |
Merge branch 'master' into parameterize-comment-build-trigger
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, |