summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2021-04-08 20:22:38 +0200
committerGitHub <noreply@github.com>2021-04-08 20:22:38 +0200
commit9552068fbb4848b220ea86fe35abbaff32dec55b (patch)
tree8f4fefb43f1a33cbeb120320d9dd0935af9b96cb /config
parent9e74aa13acef30d8c008f91d7231c515820a2622 (diff)
Revert "Unify on hc5"
Diffstat (limited to 'config')
-rw-r--r--config/src/main/java/com/yahoo/vespa/config/ConfigVerification.java13
1 files changed, 6 insertions, 7 deletions
diff --git a/config/src/main/java/com/yahoo/vespa/config/ConfigVerification.java b/config/src/main/java/com/yahoo/vespa/config/ConfigVerification.java
index 68a1d9b7333..d3f80d8c3f5 100644
--- a/config/src/main/java/com/yahoo/vespa/config/ConfigVerification.java
+++ b/config/src/main/java/com/yahoo/vespa/config/ConfigVerification.java
@@ -1,14 +1,13 @@
// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
package com.yahoo.vespa.config;
-import ai.vespa.util.http.hc5.VespaHttpClientBuilder;
+import ai.vespa.util.http.hc4.VespaHttpClientBuilder;
import com.yahoo.slime.ArrayTraverser;
import com.yahoo.slime.Slime;
import com.yahoo.slime.SlimeUtils;
-import org.apache.hc.client5.http.classic.methods.HttpGet;
-import org.apache.hc.client5.http.impl.classic.BasicHttpClientResponseHandler;
-import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
-import org.apache.hc.client5.http.impl.io.BasicHttpClientConnectionManager;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.BasicResponseHandler;
+import org.apache.http.impl.client.CloseableHttpClient;
import java.io.IOException;
import java.util.ArrayList;
@@ -38,7 +37,7 @@ public class ConfigVerification {
for (String arg : args) {
configservers.add(prefix + arg + ":" + port + "/config/v2/tenant/" + tenant + "/application/" + appName + "/environment/" + environment + "/region/" + region + "/instance/" + instance + "/?recursive=true");
}
- try (CloseableHttpClient httpClient = VespaHttpClientBuilder.create(BasicHttpClientConnectionManager::new).build()) {
+ try (CloseableHttpClient httpClient = VespaHttpClientBuilder.createWithBasicConnectionManager().build()) {
System.exit(compareConfigs(listConfigs(configservers, httpClient), httpClient));
}
}
@@ -92,6 +91,6 @@ public class ConfigVerification {
}
private static String performRequest(String url, CloseableHttpClient httpClient) throws IOException {
- return httpClient.execute(new HttpGet(url), new BasicHttpClientResponseHandler());
+ return httpClient.execute(new HttpGet(url), new BasicResponseHandler());
}
}