From e8fc8af8731b4ab56f60a903c4a52aeae708f23e Mon Sep 17 00:00:00 2001 From: Roland Oldenburg Date: Sat, 18 Apr 2020 14:50:09 +0200 Subject: [PATCH] [GITLAB] Support proxy by using HttpClients.createSystem() --- .../gitlab/GitlabServerPullRequestDecorator.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/github/mc1arke/sonarqube/plugin/ce/pullrequest/gitlab/GitlabServerPullRequestDecorator.java b/src/main/java/com/github/mc1arke/sonarqube/plugin/ce/pullrequest/gitlab/GitlabServerPullRequestDecorator.java index d19c3401f..f4f7069f7 100644 --- a/src/main/java/com/github/mc1arke/sonarqube/plugin/ce/pullrequest/gitlab/GitlabServerPullRequestDecorator.java +++ b/src/main/java/com/github/mc1arke/sonarqube/plugin/ce/pullrequest/gitlab/GitlabServerPullRequestDecorator.java @@ -201,7 +201,7 @@ private X getSingle(String userURL, Map headers, Class ty for (Map.Entry entry : headers.entrySet()) { httpGet.addHeader(entry.getKey(), entry.getValue()); } - HttpResponse httpResponse = HttpClients.createDefault().execute(httpGet); + HttpResponse httpResponse = HttpClients.createSystem().execute(httpGet); if (null != httpResponse && httpResponse.getStatusLine().getStatusCode() != 200) { LOGGER.error(httpResponse.toString()); LOGGER.error(EntityUtils.toString(httpResponse.getEntity(), StandardCharsets.UTF_8)); @@ -232,7 +232,7 @@ private List getPagedList(String commitDiscussionURL, Map List discussions = new ArrayList<>(); if (sendRequest) { - HttpResponse httpResponse = HttpClients.createDefault().execute(httpGet); + HttpResponse httpResponse = HttpClients.createSystem().execute(httpGet); if (null != httpResponse && httpResponse.getStatusLine().getStatusCode() != 200) { LOGGER.error(httpResponse.toString()); LOGGER.error(EntityUtils.toString(httpResponse.getEntity(), StandardCharsets.UTF_8)); @@ -267,7 +267,7 @@ private void deleteCommitDiscussionNote(String commitDiscussionNoteURL, Map head if (sendRequest) { LOGGER.info("Posting {} with headers {} to {}", params, headers, commitCommentUrl); - HttpResponse httpResponse = HttpClients.createDefault().execute(httpPost); + HttpResponse httpResponse = HttpClients.createSystem().execute(httpPost); validateGitlabResponse(httpResponse, 201, "Comment posted"); } } @@ -307,7 +307,7 @@ private void postStatus(String statusPostUrl, Map headers, Analy httpPost.addHeader(entry.getKey(), entry.getValue()); } if (sendRequest) { - HttpResponse httpResponse = HttpClients.createDefault().execute(httpPost); + HttpResponse httpResponse = HttpClients.createSystem().execute(httpPost); if (null != httpResponse && httpResponse.toString().contains("Cannot transition status")) { // Workaround for https://gitlab.com/gitlab-org/gitlab-ce/issues/25807 LOGGER.debug("Transition status is already {}", status);