SNOW-1042432: Remove dependency on com.amazonaws.Protocol from HttpClientSettingsKey

src/main/java/net/snowflake/client/core/HttpClientSettingsKey.java

@@ -4,7 +4,6 @@
 
 package net.snowflake.client.core;
 
-import com.amazonaws.Protocol;
 import com.google.common.base.Strings;
 import java.io.Serializable;
 
@@ -132,8 +131,16 @@ public String getNonProxyHosts() {
     return this.nonProxyHosts;
   }
 
-  public Protocol getProxyProtocol() {
-    return this.proxyProtocol.equalsIgnoreCase("https") ? Protocol.HTTPS : Protocol.HTTP;
+  /**
+   * @deprecated Use {@link #getProxyHttpProtocol()}
+   * @return ProxyProtocol
+   */
+  @Deprecated
+  public com.amazonaws.Protocol getProxyProtocol() {
+    return this.proxyProtocol.equalsIgnoreCase("https") ? com.amazonaws.Protocol.HTTPS : com.amazonaws.Protocol.HTTP;
+  }
+  public HttpProtocol getProxyHttpProtocol() {
+    return this.proxyProtocol.equalsIgnoreCase("https") ? HttpProtocol.HTTPS : HttpProtocol.HTTP;
   }
 
   public Boolean getGzipDisabled() {

src/main/java/net/snowflake/client/core/HttpProtocol.java

@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2012-2024 Snowflake Computing Inc. All rights reserved.
+ */
+
+package net.snowflake.client.core;
+
+public enum HttpProtocol {
+
+    HTTP("http"),
+
+    HTTPS("https");
+
+    private final String protocol;
+
+    HttpProtocol(String protocol) {
+        this.protocol = protocol;
+    }
+
+    @Override
+    public String toString() {
+        return protocol;
+    }
+}

src/main/java/net/snowflake/client/core/HttpUtil.java

@@ -296,7 +296,7 @@ public static CloseableHttpClient buildHttpClient(
     HttpHost proxy =
         (key != null && key.usesProxy())
             ? new HttpHost(
-                key.getProxyHost(), key.getProxyPort(), key.getProxyProtocol().toString())
+                key.getProxyHost(), key.getProxyPort(), key.getProxyHttpProtocol().toString())
             : null;
     // If defaultrequestconfig is not initialized or its proxy settings do not match current proxy
     // settings, re-build it (current or old proxy settings could be null, so null check is

src/main/java/net/snowflake/client/core/SFSession.java

@@ -524,7 +524,7 @@ public synchronized void open() throws SFException, SnowflakeSQLException {
         httpClientSettingsKey.getProxyUser(),
         !Strings.isNullOrEmpty(httpClientSettingsKey.getProxyPassword()) ? "***" : "(empty)",
         httpClientSettingsKey.getNonProxyHosts(),
-        httpClientSettingsKey.getProxyProtocol());
+        httpClientSettingsKey.getProxyHttpProtocol());
 
     // TODO: temporarily hardcode sessionParameter debug info. will be changed in the future
     SFLoginInput loginInput = new SFLoginInput();

src/test/java/net/snowflake/client/jdbc/CustomProxyLatestIT.java

@@ -9,14 +9,14 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertTrue;
 
-import com.amazonaws.Protocol;
 import java.io.File;
 import java.net.Authenticator;
 import java.net.PasswordAuthentication;
 import java.sql.*;
 import java.util.Properties;
 import net.snowflake.client.category.TestCategoryOthers;
 import net.snowflake.client.core.HttpClientSettingsKey;
+import net.snowflake.client.core.HttpProtocol;
 import net.snowflake.client.core.HttpUtil;
 import net.snowflake.client.core.SFSession;
 import net.snowflake.common.core.SqlState;
@@ -596,7 +596,7 @@ public void testSetJVMProxyHttp() throws SQLException {
             "jdbc:snowflake://s3testaccount.us-east-1.snowflakecomputing.com", props);
     SFSession sfSession = con.unwrap(SnowflakeConnectionV1.class).getSfSession();
     HttpClientSettingsKey clientSettingsKey = sfSession.getHttpClientKey();
-    assertEquals(Protocol.HTTP, clientSettingsKey.getProxyProtocol());
+    assertEquals(HttpProtocol.HTTP, clientSettingsKey.getProxyHttpProtocol());
     con.close();
   }
 
@@ -622,7 +622,7 @@ public void testSetJVMProxyHttps() throws SQLException {
             "jdbc:snowflake://s3testaccount.us-east-1.snowflakecomputing.com", props);
     SFSession sfSession = con.unwrap(SnowflakeConnectionV1.class).getSfSession();
     HttpClientSettingsKey clientSettingsKey = sfSession.getHttpClientKey();
-    assertEquals(Protocol.HTTPS, clientSettingsKey.getProxyProtocol());
+    assertEquals(HttpProtocol.HTTPS, clientSettingsKey.getProxyHttpProtocol());
     con.close();
   }
 
@@ -647,7 +647,7 @@ public void testSetJVMProxyDefaultHttps() throws SQLException {
             "jdbc:snowflake://s3testaccount.us-east-1.snowflakecomputing.com", props);
     SFSession sfSession = con.unwrap(SnowflakeConnectionV1.class).getSfSession();
     HttpClientSettingsKey clientSettingsKey = sfSession.getHttpClientKey();
-    assertEquals(Protocol.HTTPS, clientSettingsKey.getProxyProtocol());
+    assertEquals(HttpProtocol.HTTPS, clientSettingsKey.getProxyHttpProtocol());
     con.close();
   }