Merge branch 'master' into SNOW-1902245-wif-gcp

Author: sfc-gh-dheyman

.github/workflows/jira_issue.yml

@@ -37,7 +37,7 @@ jobs:
           summary: '${{ github.event.issue.title }}'
           description: |
             ${{ github.event.issue.body }} \\ \\ _Created from GitHub Action_ for ${{ github.event.issue.html_url }}
-          fields: '{ "customfield_11401": {"id": "14723"}, "assignee": {"id": "712020:e1f41916-da57-4fe8-b317-116d5229aa51"}, "components":[{"id":"19281"}], "labels": ["oss"], "priority": {"id": "10001"} }'
+          fields: '{ "customfield_11401": {"id": "14723"}, "assignee": {"id": "712020:e527ae71-55cc-4e02-9217-1ca4ca8028a2"}, "components":[{"id":"19281"}], "labels": ["oss"], "priority": {"id": "10001"} }'
 
       - name: Update GitHub Issue
         uses: ./jira/gajira-issue-update

CHANGELOG.rst

@@ -1,3 +1,7 @@
+**JDBC Driver 3.23.2**
+
+- \||Please Refer to Release Notes at https://docs.snowflake.com/en/release-notes/clients-drivers/jdbc
+
 **JDBC Driver 3.23.1**
 
 - \||Please Refer to Release Notes at https://docs.snowflake.com/en/release-notes/clients-drivers/jdbc

FIPS/pom.xml

@@ -5,12 +5,12 @@
   <parent>
     <groupId>net.snowflake</groupId>
     <artifactId>snowflake-jdbc-parent</artifactId>
-    <version>3.23.2-SNAPSHOT</version>
+    <version>3.23.2</version>
     <relativePath>../parent-pom.xml</relativePath>
   </parent>
 
   <artifactId>snowflake-jdbc-fips</artifactId>
-  <version>3.23.2-SNAPSHOT</version>
+  <version>3.23.2</version>
   <packaging>jar</packaging>
 
   <name>snowflake-jdbc-fips</name>

parent-pom.xml

@@ -5,7 +5,7 @@
 
   <groupId>net.snowflake</groupId>
   <artifactId>snowflake-jdbc-parent</artifactId>
-  <version>3.23.2-SNAPSHOT</version>
+  <version>3.23.2</version>
   <packaging>pom</packaging>
 
   <modules>
@@ -48,7 +48,6 @@
     <google.flatbuffers.version>24.3.25</google.flatbuffers.version>
     <google.gax.version>2.57.0</google.gax.version>
     <google.guava.version>33.3.1-jre</google.guava.version>
-    <google.http.client.version>1.45.0</google.http.client.version>
     <google.j2objc-annotations.version>3.0.0</google.j2objc-annotations.version>
     <google.jsr305.version>3.0.2</google.jsr305.version>
     <google.protobuf.java.version>4.28.2</google.protobuf.java.version>
@@ -59,7 +58,6 @@
     <jacoco.skip.instrument>true</jacoco.skip.instrument>
     <javax.servlet.version>3.1.0</javax.servlet.version>
     <jna.version>5.13.0</jna.version>
-    <joda.time.version>2.8.1</joda.time.version>
     <json.smart.version>2.5.2</json.smart.version>
     <junit4.version>4.13.2</junit4.version>
     <junit.version>5.11.1</junit.version>
@@ -127,13 +125,6 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
-      <dependency>
-        <groupId>com.google.http-client</groupId>
-        <artifactId>google-http-client-bom</artifactId>
-        <version>${google.http.client.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
       <dependency>
         <groupId>com.google.protobuf</groupId>
         <artifactId>protobuf-bom</artifactId>
@@ -368,11 +359,6 @@
         <artifactId>javax.servlet-api</artifactId>
         <version>${javax.servlet.version}</version>
       </dependency>
-      <dependency>
-        <groupId>joda-time</groupId>
-        <artifactId>joda-time</artifactId>
-        <version>${joda.time.version}</version>
-      </dependency>
       <dependency>
         <groupId>net.minidev</groupId>
         <artifactId>json-smart</artifactId>
@@ -655,10 +641,6 @@
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.google.http-client</groupId>
-      <artifactId>google-http-client</artifactId>
-    </dependency>
     <dependency>
       <groupId>com.microsoft.azure</groupId>
       <artifactId>azure-storage</artifactId>
@@ -695,10 +677,6 @@
       <groupId>javax.servlet</groupId>
       <artifactId>javax.servlet-api</artifactId>
     </dependency>
-    <dependency>
-      <groupId>joda-time</groupId>
-      <artifactId>joda-time</artifactId>
-    </dependency>
     <dependency>
       <groupId>net.minidev</groupId>
       <artifactId>json-smart</artifactId>

pom.xml

@@ -6,13 +6,13 @@
   <parent>
     <groupId>net.snowflake</groupId>
     <artifactId>snowflake-jdbc-parent</artifactId>
-    <version>3.23.2-SNAPSHOT</version>
+    <version>3.23.2</version>
     <relativePath>./parent-pom.xml</relativePath>
   </parent>
 
   <!-- Maven complains about using property here, but it makes install and deploy process easier to override final package names and localization -->
   <artifactId>${artifactId}</artifactId>
-  <version>3.23.2-SNAPSHOT</version>
+  <version>3.23.2</version>
   <packaging>jar</packaging>
 
   <name>${artifactId}</name>

src/main/java/net/snowflake/client/config/SFConnectionConfigParser.java

@@ -1,11 +1,11 @@
 package net.snowflake.client.config;
 
 import static net.snowflake.client.jdbc.SnowflakeUtil.convertSystemGetEnvToBooleanValue;
+import static net.snowflake.client.jdbc.SnowflakeUtil.isNullOrEmpty;
 import static net.snowflake.client.jdbc.SnowflakeUtil.isWindows;
 import static net.snowflake.client.jdbc.SnowflakeUtil.systemGetEnv;
 
 import com.fasterxml.jackson.dataformat.toml.TomlMapper;
-import com.google.common.base.Strings;
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.Charset;
@@ -162,7 +162,7 @@ private static String createUrl(Map<String, String> fileConnectionConfiguration)
     logger.debug("Host created using parameters from connection configuration file: {}", host);
     String port = fileConnectionConfiguration.get("port");
     String protocol = fileConnectionConfiguration.get("protocol");
-    if (Strings.isNullOrEmpty(port)) {
+    if (isNullOrEmpty(port)) {
       if ("https".equals(protocol)) {
         port = "443";
       } else {

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

@@ -1,7 +1,7 @@
 package net.snowflake.client.core;
 
-import com.amazonaws.util.StringUtils;
-import com.google.common.base.Strings;
+import static net.snowflake.client.jdbc.SnowflakeUtil.isNullOrEmpty;
+
 import java.net.URI;
 import java.nio.charset.StandardCharsets;
 import java.util.Base64;
@@ -149,7 +149,7 @@ static void fillCachedDPoPBundledAccessToken(SFLoginInput loginInput) throws SFE
   synchronized void fillCachedCredential(
       SFLoginInput loginInput, String host, String username, CachedCredentialType credType)
       throws SFException {
-    if (StringUtils.isNullOrEmpty(username)) {
+    if (isNullOrEmpty(username)) {
       logger.debug("Missing username; Cannot read from credential cache");
       return;
     }
@@ -210,7 +210,7 @@ synchronized void fillCachedCredential(
 
   private void updateInputWithTokenAndPublicKey(String cred, SFLoginInput loginInput)
       throws SFException {
-    if (Strings.isNullOrEmpty(cred)) {
+    if (isNullOrEmpty(cred)) {
       String[] values = cred.split("\\.");
       if (values.length != 2) {
         throw new SFException(
@@ -313,11 +313,11 @@ static void writeDPoPBundledAccessToken(SFLoginInput loginInput) throws SFExcept
   /** Store the temporary credential */
   synchronized void writeTemporaryCredential(
       String host, String user, String cred, CachedCredentialType credType) {
-    if (StringUtils.isNullOrEmpty(user)) {
+    if (isNullOrEmpty(user)) {
       logger.debug("Missing username; Cannot write to credential cache");
       return;
     }
-    if (Strings.isNullOrEmpty(cred)) {
+    if (isNullOrEmpty(cred)) {
       logger.debug("No {} is given.", credType);
       return; // no credential
     }
@@ -426,7 +426,7 @@ synchronized void deleteTemporaryCredential(
       logMissingJnaJarForSecureLocalStorage();
       return;
     }
-    if (StringUtils.isNullOrEmpty(user)) {
+    if (isNullOrEmpty(user)) {
       logger.debug("Missing username; Cannot delete from credential cache");
       return;
     }

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

@@ -12,22 +12,18 @@
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
 import java.util.TimeZone;
 import java.util.TreeSet;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
 import java.util.logging.Formatter;
 import java.util.logging.Handler;
 import java.util.logging.LogRecord;
 import java.util.zip.GZIPOutputStream;
 import net.snowflake.client.log.SFLogger;
 import net.snowflake.client.log.SFLoggerFactory;
-import org.joda.time.DateTime;
 
 public class EventHandler extends Handler {
   private static final SFLogger logger = SFLoggerFactory.getLogger(EventHandler.class);
@@ -94,12 +90,6 @@ public void run() {
   // Period of time (in ms) to wait before waking the QueueFlusher
   private final int flushPeriodMs;
 
-  // Map to keep track of incident signatures for throttling incidents
-  private final Map<String, AtomicInteger> incidentCounter;
-
-  // Map
-  private final Map<String, DateTime> throttledIncidents;
-
   // Queue to buffer events while they are waiting to be flushed
   private final ArrayList<Event> eventBuffer;
 
@@ -117,9 +107,6 @@ public EventHandler(int maxEntries, int flushPeriodMs) {
     logBuffer = new ArrayList<>();
 
     logDumpPathPrefix = EventUtil.getDumpPathPrefix();
-
-    incidentCounter = new HashMap<>();
-    throttledIncidents = new HashMap<>();
   }
 
   /**

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

@@ -1,6 +1,7 @@
 package net.snowflake.client.core;
 
-import com.google.common.base.Strings;
+import static net.snowflake.client.jdbc.SnowflakeUtil.isNullOrEmpty;
+
 import net.minidev.json.JSONObject;
 import net.snowflake.client.jdbc.telemetryOOB.TelemetryService;
 import net.snowflake.client.util.TimeMeasurement;
@@ -106,7 +107,7 @@ public void setRequestId(String requestId) {
   }
 
   public void addRetryLocation(String location) {
-    if (Strings.isNullOrEmpty(this.retryLocations)) {
+    if (isNullOrEmpty(this.retryLocations)) {
       this.retryLocations = location;
     } else {
       this.retryLocations = this.retryLocations.concat(", ").concat(location);

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

@@ -1,8 +1,8 @@
 package net.snowflake.client.core;
 
+import static net.snowflake.client.jdbc.SnowflakeUtil.isNullOrEmpty;
 import static net.snowflake.client.jdbc.SnowflakeUtil.isWindows;
 
-import com.google.common.base.Strings;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
@@ -190,7 +190,7 @@ static String getFileOwnerName(Path filePath) throws IOException {
   }
 
   private static String getContextStr(String context) {
-    return Strings.isNullOrEmpty(context) ? "" : context + ": ";
+    return isNullOrEmpty(context) ? "" : context + ": ";
   }
 
   public static boolean exists(File file) {