aboutsummaryrefslogtreecommitdiffstats
path: root/http-utils
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2023-01-26 15:26:12 +0100
committerHenning Baldersheim <balder@yahoo-inc.com>2023-01-26 15:53:53 +0100
commit9ec1c0b9585e2c845d47c396f72229aad23abac7 (patch)
treeb45cf2fc11cdc7bfc34c77d96f9e73b187679015 /http-utils
parent48b902d4852bc63db8ec835a9dfccc2b1f8f89ec (diff)
Upgrade apache 5.1 => 5.2 and add deprecation suppressions.
Diffstat (limited to 'http-utils')
-rw-r--r--http-utils/src/main/java/ai/vespa/util/http/hc5/HttpToHttpsRoutePlanner.java1
-rw-r--r--http-utils/src/test/java/ai/vespa/util/http/hc5/HttpToHttpsRoutePlannerTest.java1
2 files changed, 2 insertions, 0 deletions
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());