Skip to content

[JENKINS-44618] Fix Warning spam, Use getResponseBodyAsStream instead #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jetersen wants to merge 1 commit into from
Closed

[JENKINS-44618] Fix Warning spam, Use getResponseBodyAsStream instead #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 16 additions & 5 deletions src/main/java/com/cloudbees/jenkins/plugins/bitbucket/client/BitbucketCloudApiClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,8 @@
import edu.umd.cs.findbugs.annotations.NonNull;
import hudson.ProxyConfiguration;
import hudson.util.Secret;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.UnsupportedEncodingException;

import java.io.*;
import java.net.InetSocketAddress;
import java.net.Proxy;
import java.net.URLEncoder;
Expand Down Expand Up @@ -481,6 +480,18 @@ public List<BitbucketCloudRepository> getRepositories() throws IOException, Inte
return getRepositories(null);
}

private String getResponseBody(HttpMethod httpMethod) throws IOException {
StringBuilder response = new StringBuilder();
BufferedReader reader = new BufferedReader(new InputStreamReader(httpMethod.getResponseBodyAsStream(), "UTF-8"));
String line = null;
while ((line = reader.readLine()) != null)
{
response.append(line).append(System.getProperty("line.separator"));
}
reader.close();
return response.toString();
}

private synchronized HttpClient getHttpClient() {
if (this.client == null) {
HttpClient client = new HttpClient(connectionManager);
Expand Down Expand Up @@ -563,7 +574,7 @@ private String getRequest(String path) throws IOException, InterruptedException
GetMethod httpget = new GetMethod(path);
try {
executeMethod(client, httpget);
String response = new String(httpget.getResponseBody(), "UTF-8");
String response = getResponseBody(httpget);
if (httpget.getStatusCode() == HttpStatus.SC_NOT_FOUND) {
throw new FileNotFoundException("URL: " + path);
}
Expand Down Expand Up @@ -631,7 +642,7 @@ private String postRequest(PostMethod httppost) throws IOException {
// 204, no content
return "";
}
String response = new String(httppost.getResponseBody(), "UTF-8");
String response = getResponseBody(httppost);
if (httppost.getStatusCode() != HttpStatus.SC_OK && httppost.getStatusCode() != HttpStatus.SC_CREATED) {
throw new BitbucketRequestException(httppost.getStatusCode(), "HTTP request error. Status: " + httppost.getStatusCode() + ": " + httppost.getStatusText() + ".\n" + response);
}
Expand Down
38 changes: 16 additions & 22 deletions .../java/com/cloudbees/jenkins/plugins/bitbucket/server/client/BitbucketServerAPIClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,13 @@
import com.cloudbees.jenkins.plugins.bitbucket.api.BitbucketRepositoryType;
import edu.umd.cs.findbugs.annotations.CheckForNull;
import edu.umd.cs.findbugs.annotations.NonNull;
import java.io.FileNotFoundException;
import java.io.IOException;

import java.io.*;
import java.net.InetSocketAddress;
import java.net.MalformedURLException;
import java.net.Proxy;
import java.net.URL;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
Expand All @@ -60,7 +59,6 @@
import com.cloudbees.jenkins.plugins.bitbucket.api.BitbucketTeam;
import com.cloudbees.jenkins.plugins.bitbucket.api.BitbucketWebHook;
import com.cloudbees.jenkins.plugins.bitbucket.client.repository.UserRoleInRepository;
import com.cloudbees.jenkins.plugins.bitbucket.hooks.BitbucketSCMSourcePushHookReceiver;
import com.cloudbees.jenkins.plugins.bitbucket.server.client.branch.BitbucketServerBranch;
import com.cloudbees.jenkins.plugins.bitbucket.server.client.branch.BitbucketServerBranches;
import com.cloudbees.jenkins.plugins.bitbucket.server.client.branch.BitbucketServerCommit;
Expand All @@ -72,23 +70,7 @@
import hudson.util.Secret;
import jenkins.model.Jenkins;
import net.sf.json.JSONObject;
import org.apache.commons.httpclient.*;
import org.apache.commons.httpclient.auth.AuthScope;
import org.apache.commons.httpclient.methods.*;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
import org.codehaus.jackson.map.ObjectMapper;

import java.io.IOException;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
import java.net.InetSocketAddress;
import java.net.Proxy;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;

/**
* Bitbucket API client.
Expand Down Expand Up @@ -481,7 +463,7 @@ private String getRequest(String path) throws IOException {
HttpClient client = getHttpClient(getMethodHost(httpget));
try {
client.executeMethod(httpget);
String response = new String(httpget.getResponseBody(), "UTF-8");
String response = getResponseBody(httpget);
if (httpget.getStatusCode() == HttpStatus.SC_NOT_FOUND) {
throw new FileNotFoundException("URL: " + path);
}
Expand All @@ -498,6 +480,18 @@ private String getRequest(String path) throws IOException {
}
}

private String getResponseBody(HttpMethod httpMethod) throws IOException {
StringBuilder response = new StringBuilder();
BufferedReader reader = new BufferedReader(new InputStreamReader(httpMethod.getResponseBodyAsStream(), "UTF-8"));
String line = null;
while ((line = reader.readLine()) != null)
{
response.append(line).append(System.getProperty("line.separator"));
}
reader.close();
return response.toString();
}

private HttpClient getHttpClient(String host) {
HttpClient client = new HttpClient();

Expand Down Expand Up @@ -595,7 +589,7 @@ private String doRequest(HttpMethod httppost) throws IOException {
// 204, no content
return "";
}
String response = new String(httppost.getResponseBody(), "UTF-8");
String response = getResponseBody(httppost);
if (httppost.getStatusCode() != HttpStatus.SC_OK && httppost.getStatusCode() != HttpStatus.SC_CREATED) {
throw new BitbucketRequestException(httppost.getStatusCode(), "HTTP request error. Status: " + httppost.getStatusCode() + ": " + httppost.getStatusText() + ".\n" + response);
}
Expand Down