diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2023-01-04 07:59:31 +0100 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2023-01-25 10:48:38 +0100 |
commit | dd05e4b94d67b481c241cfa20ccf0e481dcb0bd7 (patch) | |
tree | d48af28cb2c6651f6a7424d599dfeb1610b8c931 /vespaclient-java/src | |
parent | db01dd9ebc4f63acc71d4ef9b015db4133a5de6d (diff) |
Bump apache httpclient from 5.1 to 5.2.
Diffstat (limited to 'vespaclient-java/src')
-rw-r--r-- | vespaclient-java/src/main/java/com/yahoo/vespa/filedistribution/status/FileDistributionStatusClient.java | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/vespaclient-java/src/main/java/com/yahoo/vespa/filedistribution/status/FileDistributionStatusClient.java b/vespaclient-java/src/main/java/com/yahoo/vespa/filedistribution/status/FileDistributionStatusClient.java index a9bbfafeaf0..eb26fdaaccc 100644 --- a/vespaclient-java/src/main/java/com/yahoo/vespa/filedistribution/status/FileDistributionStatusClient.java +++ b/vespaclient-java/src/main/java/com/yahoo/vespa/filedistribution/status/FileDistributionStatusClient.java @@ -71,6 +71,7 @@ public class FileDistributionStatusClient { System.out.println(parseAndGenerateOutput(json)); } + @SuppressWarnings("deprecation") private String doHttpRequest() { Timeout timeoutInMillis = Timeout.ofMilliseconds((long) (timeout * 1000)); RequestConfig config = custom() @@ -78,11 +79,10 @@ public class FileDistributionStatusClient { .setConnectionRequestTimeout(timeoutInMillis) .setResponseTimeout(timeoutInMillis) .build(); - CloseableHttpClient httpClient = VespaHttpClientBuilder.create().build(); - URI statusUri = createStatusApiUri(); - if (debug) - System.out.println("URI:" + statusUri); - try { + try (CloseableHttpClient httpClient = VespaHttpClientBuilder.create().build()) { + URI statusUri = createStatusApiUri(); + if (debug) + System.out.println("URI:" + statusUri); HttpGet request = new HttpGet(statusUri); request.addHeader("Connection", "Close"); request.setConfig(config); @@ -95,7 +95,7 @@ public class FileDistributionStatusClient { return content; } else { throw new RuntimeException("Failed to get status for request " + statusUri + ": " + - response.getCode() + ": " + content); + response.getCode() + ": " + content); } } catch (IOException | ParseException e) { throw new RuntimeException(e); @@ -111,16 +111,12 @@ public class FileDistributionStatusClient { throw new RuntimeException(e); } String status = jsonNode.get("status").asText(); - switch (status) { - case statusUnknown: - return "File distribution status unknown: " + jsonNode.get("message").asText(); - case statusInProgress: - return "File distribution in progress:\n" + inProgressOutput(jsonNode.get("hosts")); - case statusFinished: - return "File distribution finished"; - default: - throw new RuntimeException("Unknown status " + status); - } + return switch (status) { + case statusUnknown -> "File distribution status unknown: " + jsonNode.get("message").asText(); + case statusInProgress -> "File distribution in progress:\n" + inProgressOutput(jsonNode.get("hosts")); + case statusFinished -> "File distribution finished"; + default -> throw new RuntimeException("Unknown status " + status); + }; } private URI createStatusApiUri() { @@ -158,7 +154,7 @@ public class FileDistributionStatusClient { finished++; } } - sb.append(" (" + finished + " of " + fileReferencesArray.size() + " finished)"); + sb.append(" (").append(finished).append(" of ").append(fileReferencesArray.size()).append(" finished)"); break; case statusFinished: break; // Nothing to add |