Replace apache http client with airlift

trinodb · Jan 11, 2024 · 455a957 · 455a957
1 parent 89c5c5e
commit 455a957
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 13 deletions.
diff --git a/gateway-ha/pom.xml b/gateway-ha/pom.xml
@@ -72,6 +72,11 @@
             <version>${dep.jakarta.mail.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>http-client</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>io.dropwizard</groupId>
             <artifactId>dropwizard-assets</artifactId>
@@ -115,6 +120,11 @@
             <version>${dep.jakarta.annotations.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>joda-time</groupId>
+            <artifactId>joda-time</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
@@ -127,12 +137,6 @@
             <version>2.1.2</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-            <version>${dep.apache.httpcomponents}</version>
-        </dependency>
-
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcpkix-jdk15on</artifactId>

diff --git a/gateway-ha/src/main/java/io/trino/gateway/ha/clustermonitor/ClusterStatsHttpMonitor.java b/gateway-ha/src/main/java/io/trino/gateway/ha/clustermonitor/ClusterStatsHttpMonitor.java
@@ -25,7 +25,7 @@
 import okhttp3.Request;
 import okhttp3.RequestBody;
 import okhttp3.Response;
-import org.apache.http.HttpStatus;
+import org.eclipse.jetty.http.HttpStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -151,9 +151,9 @@ private String queryCluster(ProxyBackendConfiguration backend, String path)
 
         try (Response res = call.execute()) {
             switch (res.code()) {
-                case HttpStatus.SC_OK:
+                case HttpStatus.OK_200:
                     return res.body().string();
-                case HttpStatus.SC_UNAUTHORIZED:
+                case HttpStatus.UNAUTHORIZED_401:
                     log.info("Unauthorized to fetch cluster stats");
                     log.debug("username: {}, targetUrl: {}, cookieStore: {}",
                             backendStateConfiguration.getUsername(),

diff --git a/gateway-ha/src/main/java/io/trino/gateway/proxyserver/ProxyHandler.java b/gateway-ha/src/main/java/io/trino/gateway/proxyserver/ProxyHandler.java
@@ -15,9 +15,9 @@
 
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-import org.apache.http.HttpHeaders;
 import org.eclipse.jetty.client.api.Request;
 import org.eclipse.jetty.http.HttpFields;
+import org.eclipse.jetty.http.HttpHeader;
 import org.eclipse.jetty.util.Callback;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -105,7 +105,7 @@ protected void debugLogHeaders(Request proxyRequest)
 
     protected boolean isGZipEncoding(HttpServletResponse response)
     {
-        String contentEncoding = response.getHeader(HttpHeaders.CONTENT_ENCODING);
+        String contentEncoding = response.getHeader(HttpHeader.CONTENT_ENCODING.toString());
         return contentEncoding != null && contentEncoding.toLowerCase().contains("gzip");
     }
 

diff --git a/gateway-ha/src/main/java/io/trino/gateway/proxyserver/ProxyServer.java b/gateway-ha/src/main/java/io/trino/gateway/proxyserver/ProxyServer.java
@@ -15,7 +15,6 @@
 
 import jakarta.servlet.DispatcherType;
 import jakarta.servlet.Filter;
-import org.apache.http.util.TextUtils;
 import org.eclipse.jetty.http.HttpScheme;
 import org.eclipse.jetty.proxy.ConnectHandler;
 import org.eclipse.jetty.server.HttpConfiguration;
@@ -35,6 +34,8 @@
 import java.util.EnumSet;
 import java.util.concurrent.TimeUnit;
 
+import static com.google.common.base.Strings.isNullOrEmpty;
+
 public class ProxyServer
         implements Closeable
 {
@@ -78,7 +79,7 @@ private void setupContext(ProxyServerConfiguration config)
             sslContextFactory.setTrustAll(true);
             sslContextFactory.setSslSessionTimeout((int) TimeUnit.SECONDS.toMillis(15));
 
-            if (!TextUtils.isBlank(keystorePath)) {
+            if (!isNullOrEmpty(keystorePath)) {
                 sslContextFactory.setKeyStorePath(keystoreFile.getAbsolutePath());
                 sslContextFactory.setKeyStorePassword(keystorePass);
                 sslContextFactory.setKeyManagerPassword(keystorePass);

diff --git a/pom.xml b/pom.xml
@@ -73,6 +73,14 @@
 
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>io.airlift</groupId>
+                <artifactId>bom</artifactId>
+                <version>239</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
             <dependency>
                 <groupId>io.dropwizard</groupId>
                 <artifactId>dropwizard-dependencies</artifactId>