diff options
5 files changed, 17 insertions, 27 deletions
diff --git a/http-client/src/main/java/ai/vespa/hosted/client/AbstractHttpClient.java b/http-client/src/main/java/ai/vespa/hosted/client/AbstractHttpClient.java index 48bbffc7e37..f0aaccb82fa 100644 --- a/http-client/src/main/java/ai/vespa/hosted/client/AbstractHttpClient.java +++ b/http-client/src/main/java/ai/vespa/hosted/client/AbstractHttpClient.java @@ -36,7 +36,6 @@ import java.util.logging.Logger; import static java.util.Objects.requireNonNull; import static java.util.logging.Level.FINE; -import static java.util.logging.Level.WARNING; /** * @author jonmv diff --git a/http-utils/src/main/java/ai/vespa/util/http/hc5/HttpToHttpsRoutePlanner.java b/http-utils/src/main/java/ai/vespa/util/http/hc5/HttpToHttpsRoutePlanner.java index 962e6b32947..0a22437f5fc 100644 --- a/http-utils/src/main/java/ai/vespa/util/http/hc5/HttpToHttpsRoutePlanner.java +++ b/http-utils/src/main/java/ai/vespa/util/http/hc5/HttpToHttpsRoutePlanner.java @@ -4,7 +4,6 @@ package ai.vespa.util.http.hc5; import org.apache.hc.client5.http.HttpRoute; import org.apache.hc.client5.http.protocol.HttpClientContext; import org.apache.hc.client5.http.routing.HttpRoutePlanner; -import org.apache.hc.core5.http.HttpException; import org.apache.hc.core5.http.HttpHost; import org.apache.hc.core5.http.protocol.HttpContext; @@ -17,7 +16,7 @@ import org.apache.hc.core5.http.protocol.HttpContext; class HttpToHttpsRoutePlanner implements HttpRoutePlanner { @Override - public HttpRoute determineRoute(HttpHost target, HttpContext context) throws HttpException { + public HttpRoute determineRoute(HttpHost target, HttpContext context) { if ( ! target.getSchemeName().equals("http") && ! target.getSchemeName().equals("https")) throw new IllegalArgumentException("Scheme must be 'http' or 'https' when using HttpToHttpsRoutePlanner, was '" + target.getSchemeName() + "'"); diff --git a/http-utils/src/test/java/ai/vespa/util/http/hc5/HttpToHttpsRoutePlannerTest.java b/http-utils/src/test/java/ai/vespa/util/http/hc5/HttpToHttpsRoutePlannerTest.java index b20d801e39c..6dbfb0a2312 100644 --- a/http-utils/src/test/java/ai/vespa/util/http/hc5/HttpToHttpsRoutePlannerTest.java +++ b/http-utils/src/test/java/ai/vespa/util/http/hc5/HttpToHttpsRoutePlannerTest.java @@ -4,7 +4,6 @@ package ai.vespa.util.http.hc5; import org.apache.hc.client5.http.HttpRoute; import org.apache.hc.client5.http.config.RequestConfig; import org.apache.hc.client5.http.protocol.HttpClientContext; -import org.apache.hc.core5.http.HttpException; import org.apache.hc.core5.http.HttpHost; import org.junit.jupiter.api.Test; @@ -18,7 +17,7 @@ public class HttpToHttpsRoutePlannerTest { final HttpToHttpsRoutePlanner planner = new HttpToHttpsRoutePlanner(); @Test - void verifySchemeMustBeHttp() throws HttpException { + void verifySchemeMustBeHttp() { try { planner.determineRoute(new HttpHost("https", "host", 1), new HttpClientContext()); } @@ -28,7 +27,7 @@ public class HttpToHttpsRoutePlannerTest { } @Test - void verifyPortMustBeSet() throws HttpException { + void verifyPortMustBeSet() { try { planner.determineRoute(new HttpHost("http", "host", -1), new HttpClientContext()); } @@ -39,7 +38,7 @@ public class HttpToHttpsRoutePlannerTest { @Test - void verifyProxyIsDisallowed() throws HttpException { + void verifyProxyIsDisallowed() { HttpClientContext context = new HttpClientContext(); context.setRequestConfig(RequestConfig.custom().setProxy(new HttpHost("proxy")).build()); try { @@ -51,7 +50,7 @@ public class HttpToHttpsRoutePlannerTest { } @Test - void verifySchemeIsRewritten() throws HttpException { + void verifySchemeIsRewritten() { assertEquals(new HttpRoute(new HttpHost("https", "host", 1)), planner.determineRoute(new HttpHost("http", "host", 1), new HttpClientContext())); } diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsRetriever.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsRetriever.java index d4f04cdb3fc..7f4499797e8 100644 --- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsRetriever.java +++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsRetriever.java @@ -28,7 +28,6 @@ import java.util.concurrent.TimeoutException; import java.util.concurrent.CancellationException; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.stream.Collectors; import static ai.vespa.metricsproxy.http.ValuesFetcher.defaultMetricsConsumerId; 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..249432804ad 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 @@ -74,15 +74,13 @@ public class FileDistributionStatusClient { private String doHttpRequest() { Timeout timeoutInMillis = Timeout.ofMilliseconds((long) (timeout * 1000)); RequestConfig config = custom() - .setConnectTimeout(timeoutInMillis) .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 +93,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 +109,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 +152,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 |