Refactor code to use try-with-resource
Change-Id: I7eaeb7ce620984ca094c48376531306eb0c6fe11
(cherry picked from commit a420c6eabacb0d320bacb92372e0220b2570ebd6)
diff --git a/src/main/java/com/googlesource/gerrit/plugins/its/storyboard/StoryboardClient.java b/src/main/java/com/googlesource/gerrit/plugins/its/storyboard/StoryboardClient.java
index 69edb1c..f5f52d7 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/its/storyboard/StoryboardClient.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/storyboard/StoryboardClient.java
@@ -48,64 +48,49 @@
// generic method to get data from a REST endpoint
public String getData(final String url) throws IOException {
- CloseableHttpClient client = HttpClients.createDefault();
- String responseJson = null;
- try {
- HttpGet httpget = new HttpGet(url);
+ HttpGet httpget = new HttpGet(url);
+ try (CloseableHttpClient client = HttpClients.createDefault();
+ CloseableHttpResponse response = client.execute(httpget)) {
log.debug("Making request for " + httpget.getRequestLine());
- CloseableHttpResponse response = client.execute(httpget);
- try {
- StatusLine sl = response.getStatusLine();
- int responseCode = sl.getStatusCode();
- if (responseCode == HttpURLConnection.HTTP_OK) {
- log.debug("Retreiving data from response " + httpget.getRequestLine());
- InputStream inputStream = response.getEntity().getContent();
- Reader reader = new InputStreamReader(inputStream);
- int contentLength = (int) response.getEntity().getContentLength();
- char[] charArray = new char[contentLength];
- reader.read(charArray);
- responseJson = new String(charArray);
- log.debug("Data retreived: " + responseJson);
- } else {
- log.error("Failed request: " + httpget.getRequestLine() +
- " with response: " + responseCode);
- }
- } finally {
- response.close();
+ StatusLine sl = response.getStatusLine();
+ int responseCode = sl.getStatusCode();
+ if (responseCode == HttpURLConnection.HTTP_OK) {
+ log.debug("Retreiving data from response " + httpget.getRequestLine());
+ InputStream inputStream = response.getEntity().getContent();
+ Reader reader = new InputStreamReader(inputStream);
+ int contentLength = (int) response.getEntity().getContentLength();
+ char[] charArray = new char[contentLength];
+ reader.read(charArray);
+ String responseJson = new String(charArray);
+ log.debug("Data retreived: " + responseJson);
+ return responseJson;
+ } else {
+ log.error("Failed request: " + httpget.getRequestLine() +
+ " with response: " + responseCode);
}
- } finally {
- client.close();
}
- return responseJson;
+ return null;
}
// generic method to POST data with a REST endpoint
public void postData(final String url, final String data)
throws IOException {
- CloseableHttpClient httpclient = HttpClients.createDefault();
- try {
- HttpPost httpPost = new HttpPost(url);
- httpPost.addHeader("Authorization", "Bearer " + password);
- httpPost.addHeader("Content-Type", "application/json; charset=utf-8");
- httpPost.setEntity(new StringEntity(data, "utf-8"));
-
+ HttpPost httpPost = new HttpPost(url);
+ httpPost.addHeader("Authorization", "Bearer " + password);
+ httpPost.addHeader("Content-Type", "application/json; charset=utf-8");
+ httpPost.setEntity(new StringEntity(data, "utf-8"));
+ try (CloseableHttpClient httpclient = HttpClients.createDefault();
+ CloseableHttpResponse response = httpclient.execute(httpPost)) {
log.debug("Executing request " + httpPost.getRequestLine());
- CloseableHttpResponse response = httpclient.execute(httpPost);
- try {
- int responseCode = response.getStatusLine().getStatusCode();
- if (responseCode == HttpURLConnection.HTTP_OK) {
- log.info("Updated " + url + " with " + data);
- } else {
- log.error("Failed to add comment, response: " + responseCode +
- " (" + response.getStatusLine().getReasonPhrase() + ")");
- }
- } finally {
- response.close();
+ int responseCode = response.getStatusLine().getStatusCode();
+ if (responseCode == HttpURLConnection.HTTP_OK) {
+ log.info("Updated " + url + " with " + data);
+ } else {
+ log.error("Failed to post, response: " + responseCode +
+ " (" + response.getStatusLine().getReasonPhrase() + ")");
}
- } finally {
- httpclient.close();
}
}
