From 0ca83cf9f34ba00c86006d48c3e5c91652b9864f Mon Sep 17 00:00:00 2001
From: Jay Patel <jay.patel@snowflake.com>
Date: Wed, 15 Nov 2023 12:28:37 -0800
Subject: [PATCH] SNOW-913746 upgrade jdbc 3.14.3  (#745)

---
 pom.xml                                                        | 2 +-
 pom_confluent.xml                                              | 2 +-
 .../com/snowflake/kafka/connector/internal/InternalUtils.java  | 3 +++
 .../snowflake/kafka/connector/internal/InternalStageIT.java    | 2 ++
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index a92c0e59d..29cca8bf2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -329,7 +329,7 @@
         <dependency>
             <groupId>net.snowflake</groupId>
             <artifactId>snowflake-jdbc</artifactId>
-            <version>3.13.30</version>
+            <version>3.14.3</version>
         </dependency>
 
         <!-- Ingest SDK for copy staged file into snowflake table -->
diff --git a/pom_confluent.xml b/pom_confluent.xml
index 6c8d8a6de..526f025a1 100644
--- a/pom_confluent.xml
+++ b/pom_confluent.xml
@@ -380,7 +380,7 @@
         <dependency>
             <groupId>net.snowflake</groupId>
             <artifactId>snowflake-jdbc</artifactId>
-            <version>3.13.30</version>
+            <version>3.14.3</version>
         </dependency>
 
         <!-- Ingest SDK for copy staged file into snowflake table -->
diff --git a/src/main/java/com/snowflake/kafka/connector/internal/InternalUtils.java b/src/main/java/com/snowflake/kafka/connector/internal/InternalUtils.java
index d8318460b..b8e29c909 100644
--- a/src/main/java/com/snowflake/kafka/connector/internal/InternalUtils.java
+++ b/src/main/java/com/snowflake/kafka/connector/internal/InternalUtils.java
@@ -299,6 +299,9 @@ protected static Properties generateProxyParametersIfRequired(Map<String, String
         proxyProperties.put(SFSessionProperty.PROXY_USER.getPropertyKey(), username);
         proxyProperties.put(SFSessionProperty.PROXY_PASSWORD.getPropertyKey(), password);
       }
+      // There is a change in JDBC version 3.13.31 which causes NPE if this is not added.
+      // https://github.com/snowflakedb/snowflake-jdbc/blob/master/src/main/java/net/snowflake/client/jdbc/SnowflakeUtil.java#L614
+      proxyProperties.put(SFSessionProperty.GZIP_DISABLED.getPropertyKey(), "false");
     }
     return proxyProperties;
   }
diff --git a/src/test/java/com/snowflake/kafka/connector/internal/InternalStageIT.java b/src/test/java/com/snowflake/kafka/connector/internal/InternalStageIT.java
index e03fee897..037c63033 100644
--- a/src/test/java/com/snowflake/kafka/connector/internal/InternalStageIT.java
+++ b/src/test/java/com/snowflake/kafka/connector/internal/InternalStageIT.java
@@ -140,6 +140,8 @@ public void testInternalStageWithProxy() throws SnowflakeSQLException {
     proxyProperties.put(SFSessionProperty.PROXY_PORT.getPropertyKey(), "3128");
     proxyProperties.put(SFSessionProperty.PROXY_USER.getPropertyKey(), "admin");
     proxyProperties.put(SFSessionProperty.PROXY_PASSWORD.getPropertyKey(), "test");
+    // required otherwise JDBC version 3.13.31 throws NPE
+    proxyProperties.put(SFSessionProperty.GZIP_DISABLED.getPropertyKey(), "false");
 
     // Create new snowflake connection service
     Map<String, String> config = TestUtils.getConf();