From 9ec1c0b9585e2c845d47c396f72229aad23abac7 Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Thu, 26 Jan 2023 15:26:12 +0100 Subject: Upgrade apache 5.1 => 5.2 and add deprecation suppressions. --- .../src/main/java/ai/vespa/util/http/hc5/HttpToHttpsRoutePlanner.java | 1 + .../test/java/ai/vespa/util/http/hc5/HttpToHttpsRoutePlannerTest.java | 1 + 2 files changed, 2 insertions(+) (limited to 'http-utils') 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 cce73cf3b05..0c140ce236e 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 @@ -17,6 +17,7 @@ import org.apache.hc.core5.http.protocol.HttpContext; class HttpToHttpsRoutePlanner implements HttpRoutePlanner { @Override + @SuppressWarnings("deprecation") 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 6dbfb0a2312..9f56f7ebc09 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 @@ -38,6 +38,7 @@ public class HttpToHttpsRoutePlannerTest { @Test + @SuppressWarnings("deprecation") void verifyProxyIsDisallowed() { HttpClientContext context = new HttpClientContext(); context.setRequestConfig(RequestConfig.custom().setProxy(new HttpHost("proxy")).build()); -- cgit v1.2.3