swap to apache http client for jar size reasons

Trianz-Akshay · May 31, 2024 · 04bd9f6 · 04bd9f6
1 parent 79d63b9
commit 04bd9f6
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/athena-federation-sdk/pom.xml b/athena-federation-sdk/pom.xml
@@ -117,6 +117,10 @@
                     <groupId>commons-logging</groupId>
                     <artifactId>commons-logging</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>software.amazon.awssdk</groupId>
+                    <artifactId>netty-nio-client</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -155,15 +159,11 @@
                     <groupId>software.amazon.awssdk</groupId>
                     <artifactId>netty-nio-client</artifactId>
                 </exclusion>
-                <exclusion>
-                    <groupId>software.amazon.awssdk</groupId>
-                    <artifactId>apache-client</artifactId>
-                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
-            <artifactId>aws-crt-client</artifactId>
+            <artifactId>apache-client</artifactId>
             <version>${aws-sdk-v2.version}</version>
         </dependency>
         <dependency>

diff --git a/...sdk/src/main/java/com/amazonaws/athena/connector/lambda/handlers/GlueMetadataHandler.java b/...sdk/src/main/java/com/amazonaws/athena/connector/lambda/handlers/GlueMetadataHandler.java
@@ -42,7 +42,7 @@
 import org.apache.arrow.vector.types.pojo.Schema;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import software.amazon.awssdk.http.crt.AwsCrtHttpClient;
+import software.amazon.awssdk.http.apache.ApacheHttpClient;
 import software.amazon.awssdk.services.glue.GlueClient;
 import software.amazon.awssdk.services.glue.model.Column;
 import software.amazon.awssdk.services.glue.model.Database;
@@ -156,7 +156,7 @@ public GlueMetadataHandler(String sourceType, java.util.Map<String, String> conf
 
         // null if the current instance does not want to leverage Glue for metadata
         awsGlue = disabled ? null : (GlueClient.builder()
-                .httpClientBuilder(AwsCrtHttpClient
+                .httpClientBuilder(ApacheHttpClient
                         .builder()
                         .connectionTimeout(Duration.ofMillis(CONNECT_TIMEOUT)))
                 .build());

diff --git a/...src/test/java/com/amazonaws/athena/connector/lambda/handlers/GlueMetadataHandlerTest.java b/...src/test/java/com/amazonaws/athena/connector/lambda/handlers/GlueMetadataHandlerTest.java
@@ -231,6 +231,7 @@ public void tearDown()
             throws Exception
     {
         allocator.close();
+        mockGlue.close();
         logger.info("{}: exit ", testName.getMethodName());
     }
 

diff --git a/athena-redis/src/test/java/com/amazonaws/athena/connectors/redis/integ/RedisIntegTest.java b/athena-redis/src/test/java/com/amazonaws/athena/connectors/redis/integ/RedisIntegTest.java
@@ -59,7 +59,7 @@
 import software.amazon.awscdk.services.iam.PolicyDocument;
 import software.amazon.awscdk.services.s3.Bucket;
 import software.amazon.awscdk.services.s3.IBucket;
-import software.amazon.awssdk.http.crt.AwsCrtHttpClient;
+import software.amazon.awssdk.http.apache.ApacheHttpClient;
 import software.amazon.awssdk.services.glue.GlueClient;
 import software.amazon.awssdk.services.glue.model.EntityNotFoundException;
 import software.amazon.awssdk.services.glue.model.TableInput;
@@ -120,7 +120,7 @@ public RedisIntegTest()
         redisTableNamePrefix = (String) userSettings.get("redis_table_name_prefix");
         lambdaFunctionName = getLambdaFunctionName();
         glue = GlueClient.builder()
-                .httpClientBuilder(AwsCrtHttpClient.builder()
+                .httpClientBuilder(ApacheHttpClient.builder()
                         .connectionTimeout(Duration.ofMillis(GLUE_TIMEOUT)))
                 .build();
         redisStackName = "integ-redis-instance-" + UUID.randomUUID();