Merge branch 'master' into SNOW-1881874-telemetry-service-availability

Author: semyonmelman

.github/workflows/build-test.yml

@@ -27,7 +27,7 @@ concurrency:
 jobs:
     build:
         name: Build
-        runs-on: ubuntu-20.04
+        runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@v4
             - name: Build

.github/workflows/check-style.yml

@@ -7,7 +7,7 @@ on:
 jobs:
     check-style:
         name: Check Style
-        runs-on: ubuntu-20.04
+        runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@v4
             - name: Check Style

.github/workflows/parameters_aws_auth_tests.json.gpg

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

CHANGELOG.rst

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

FIPS/pom.xml

@@ -1,6 +1,3 @@
-/*
- * Copyright (c) 2012-2019 Snowflake Computing Inc. All right reserved.
- */
 package net.snowflake.client;
 
 import static org.hamcrest.MatcherAssert.assertThat;

FIPS/src/test/java/net/snowflake/client/AbstractDriverIT.java

@@ -1,6 +1,3 @@
-/*
- * Copyright (c) 2024 Snowflake Computing Inc. All rights reserved.
- */
 package net.snowflake.client;
 
 import java.lang.annotation.ElementType;

FIPS/src/test/java/net/snowflake/client/DontRunOnGCP.java

@@ -1,6 +1,3 @@
-/*
- * Copyright (c) 2024 Snowflake Computing Inc. All rights reserved.
- */
 package net.snowflake.client;
 
 import java.lang.annotation.ElementType;

FIPS/src/test/java/net/snowflake/client/DontRunOnGithubActions.java

@@ -1,6 +1,3 @@
-/*
- * Copyright (c) 2012-2019 Snowflake Computing Inc. All right reserved.
- */
 package net.snowflake.client;
 
 import static org.hamcrest.CoreMatchers.is;

FIPS/src/test/java/net/snowflake/client/TestUtil.java

@@ -1,6 +1,3 @@
-/*
- * Copyright (c) 2024 Snowflake Computing Inc. All rights reserved.
- */
 package net.snowflake.client.category;
 
 import org.junit.platform.suite.api.IncludeTags;

FIPS/src/test/java/net/snowflake/client/category/FipsTestSuite.java

@@ -1,6 +1,3 @@
-/*
- * Copyright (c) 2012-2020 Snowflake Computing Inc. All right reserved.
- */
 package net.snowflake.client.jdbc;
 
 import static org.junit.jupiter.api.Assertions.*;

FIPS/src/test/java/net/snowflake/client/jdbc/ConnectionFipsIT.java

@@ -22,6 +22,7 @@
     <surefire.version>3.5.1</surefire.version>
     <mockito.version>3.5.6</mockito.version>
     <netty.version>4.1.118.Final</netty.version>
+    <apache.httpclient.version>4.5.14</apache.httpclient.version>
     <shadeBase>net.snowflake.client.jdbc.internal</shadeBase>
   </properties>
 
@@ -31,6 +32,11 @@
       <artifactId>netty-common</artifactId>
       <version>${netty.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpclient</artifactId>
+      <version>${apache.httpclient.version}</version>
+    </dependency>
     <dependency>
       <groupId>io.netty</groupId>
       <artifactId>netty-buffer</artifactId>

TestOnly/pom.xml

@@ -5,7 +5,7 @@
 
   <groupId>net.snowflake</groupId>
   <artifactId>snowflake-jdbc-parent</artifactId>
-  <version>3.23.1-SNAPSHOT</version>
+  <version>3.23.1</version>
   <packaging>pom</packaging>
 
   <modules>

parent-pom.xml

@@ -6,13 +6,13 @@
   <parent>
     <groupId>net.snowflake</groupId>
     <artifactId>snowflake-jdbc-parent</artifactId>
-    <version>3.23.1-SNAPSHOT</version>
+    <version>3.23.1</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.1-SNAPSHOT</version>
+  <version>3.23.1</version>
   <packaging>jar</packaging>
 
   <name>${artifactId}</name>

pom.xml

@@ -1,7 +1,3 @@
-/*
- * Copyright (c) 2012-2019 Snowflake Computing Inc. All rights reserved.
- */
-
 package com.snowflake.client.jdbc;
 
 import java.sql.Driver;

src/main/java/com/snowflake/client/jdbc/SnowflakeDriver.java

@@ -1,6 +1,3 @@
-/*
- * Copyright (c) 2012-2024 Snowflake Computing Inc. All rights reserved.
- */
 package net.snowflake.client.config;
 
 import java.util.Properties;

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

@@ -1,7 +1,3 @@
-/*
- * Copyright (c) 2012-2024 Snowflake Computing Inc. All rights reserved.
- */
-
 package net.snowflake.client.core;
 
 import static net.snowflake.client.jdbc.SnowflakeUtil.mapSFExceptionToSQLException;

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

@@ -1,12 +1,7 @@
-/*
- * Copyright (c) 2012-2019 Snowflake Computing Inc. All rights reserved.
- */
-
 package net.snowflake.client.core;
 
 import net.snowflake.client.jdbc.ErrorCode;
 
-/** Created by jhuang on 1/27/16. */
 public class AssertUtil {
   /**
    * Assert the condition is true, otherwise throw an internal error exception with the given

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

@@ -1,7 +1,3 @@
-/*
- * Copyright (c) 2012-2024 Snowflake Computing Inc. All rights reserved.
- */
-
 package net.snowflake.client.core;
 
 import static net.snowflake.client.jdbc.SnowflakeUtil.mapSFExceptionToSQLException;

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

@@ -1,16 +1,8 @@
-/*
- * Copyright (c) 2012-2019 Snowflake Computing Inc. All rights reserved.
- */
-
 package net.snowflake.client.core;
 
 import static net.snowflake.client.jdbc.SnowflakeUtil.systemGetProperty;
 
-/**
- * Base Event class for events that don't need to deviate from the default flush behavior.
- *
- * @author jrosen
- */
+/** Base Event class for events that don't need to deviate from the default flush behavior. */
 public class BasicEvent extends Event {
   // Format strings for query state transitions
   private static final String requestId = "requestId: %s";

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

@@ -1,7 +1,3 @@
-/*
- * Copyright (c) 2024-2025 Snowflake Computing Inc. All rights reserved.
- */
-
 package net.snowflake.client.core;
 
 enum CachedCredentialType {

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

@@ -1,6 +1,3 @@
-/*
- * Copyright (c) 2024 Snowflake Computing Inc. All rights reserved.
- */
 package net.snowflake.client.core;
 
 @SnowflakeJdbcInternalApi

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

@@ -1,7 +1,3 @@
-/*
- * Copyright (c) 2012-2019 Snowflake Computing Inc. All rights reserved.
- */
-
 package net.snowflake.client.core;
 
 import net.snowflake.client.jdbc.SnowflakeResultChunk;

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

@@ -1,6 +1,3 @@
-/*
- * Copyright (c) 2012-2024 Snowflake Computing Inc. All right reserved.
- */
 package net.snowflake.client.core;
 
 import java.sql.Types;

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

@@ -1,7 +1,3 @@
-/*
- * Copyright (c) 2012-2019 Snowflake Computing Inc. All rights reserved.
- */
-
 package net.snowflake.client.core;
 
 import static net.snowflake.client.jdbc.SnowflakeUtil.systemGetProperty;

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

@@ -1,7 +1,3 @@
-/*
- * Copyright (c) 2012-2019 Snowflake Computing Inc. All rights reserved.
- */
-
 package net.snowflake.client.core;
 
 import com.amazonaws.util.StringUtils;

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

@@ -1,6 +1,3 @@
-/*
- * Copyright (c) 2012-2019 Snowflake Computing Inc. All rights reserved.
- */
 package net.snowflake.client.core;
 
 import java.util.TimeZone;

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

@@ -1,6 +1,3 @@
-/*
- * Copyright (c) 2012-2019 Snowflake Computing Inc. All rights reserved.
- */
 package net.snowflake.client.core;
 
 /** Metrics related to chunk downloader performance */

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

@@ -1,7 +1,3 @@
-/*
- * Copyright (c) 2012-2019 Snowflake Computing Inc. All rights reserved.
- */
-
 package net.snowflake.client.core;
 
 import com.google.common.base.Preconditions;
@@ -14,11 +10,7 @@
 import net.snowflake.client.log.SFLogger;
 import net.snowflake.client.log.SFLoggerFactory;
 
-/**
- * Abstract class to encapsulate a Client-side Event and any methods associated with it.
- *
- * @author jrosen
- */
+/** Abstract class to encapsulate a Client-side Event and any methods associated with it. */
 public abstract class Event {
   private static final SFLogger logger = SFLoggerFactory.getLogger(Event.class);
 

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

@@ -1,7 +1,3 @@
-/*
- * Copyright (c) 2012-2019 Snowflake Computing Inc. All rights reserved.
- */
-
 package net.snowflake.client.core;
 
 import static net.snowflake.client.jdbc.SnowflakeUtil.systemGetProperty;
@@ -33,9 +29,6 @@
 import net.snowflake.client.log.SFLoggerFactory;
 import org.joda.time.DateTime;
 
-/**
- * @author jrosen
- */
 public class EventHandler extends Handler {
   private static final SFLogger logger = SFLoggerFactory.getLogger(EventHandler.class);
 

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

@@ -1,19 +1,11 @@
-/*
- * Copyright (c) 2012-2019 Snowflake Computing Inc. All rights reserved.
- */
-
 package net.snowflake.client.core;
 
 import static net.snowflake.client.jdbc.SnowflakeUtil.systemGetProperty;
 
 import java.io.File;
 import java.util.concurrent.atomic.AtomicReference;
 
-/**
- * Utility class to encapsulate support information pertaining to the EventHandler and events.
- *
- * @author jrosen
- */
+/** Utility class to encapsulate support information pertaining to the EventHandler and events. */
 public class EventUtil {
   public static final String DUMP_PATH_PROP = "snowflake.dump_path";
   public static final String DUMP_SIZE_PROP = "snowflake.max_dump_size";

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

@@ -1,6 +1,3 @@
-/*
- * Copyright (c) 2018-2019 Snowflake Computing Inc. All rights reserved.
- */
 package net.snowflake.client.core;
 
 import com.google.common.base.Strings;

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

@@ -1,7 +1,3 @@
-/*
- * Copyright (c) 2012-2019 Snowflake Computing Inc. All rights reserved.
- */
-
 package net.snowflake.client.core;
 
 import static net.snowflake.client.core.FileUtil.isWritable;
@@ -141,14 +137,18 @@ synchronized FileCacheManager build() {
     }
     if (!cacheDir.exists()) {
       try {
-        Files.createDirectories(
-            cacheDir.toPath(),
-            PosixFilePermissions.asFileAttribute(
-                Stream.of(
-                        PosixFilePermission.OWNER_READ,
-                        PosixFilePermission.OWNER_WRITE,
-                        PosixFilePermission.OWNER_EXECUTE)
-                    .collect(Collectors.toSet())));
+        if (!isWindows() && onlyOwnerPermissions) {
+          Files.createDirectories(
+              cacheDir.toPath(),
+              PosixFilePermissions.asFileAttribute(
+                  Stream.of(
+                          PosixFilePermission.OWNER_READ,
+                          PosixFilePermission.OWNER_WRITE,
+                          PosixFilePermission.OWNER_EXECUTE)
+                      .collect(Collectors.toSet())));
+        } else {
+          Files.createDirectories(cacheDir.toPath());
+        }
       } catch (IOException e) {
         logger.info(
             "Failed to create the cache directory: {}. Ignored. {}",

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

@@ -1,18 +1,10 @@
-/*
- * Copyright (c) 2012-2019 Snowflake Computing Inc. All rights reserved.
- */
-
 package net.snowflake.client.core;
 
 import java.io.IOException;
 import java.nio.file.Path;
 import org.apache.tika.Tika;
 
-/**
- * Use Tika to detect the mime type of files
- *
- * @author jhuang
- */
+/** Use Tika to detect the mime type of files */
 public class FileTypeDetector extends java.nio.file.spi.FileTypeDetector {
   private final Tika tika = new Tika();
 

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

@@ -1,7 +1,3 @@
-/*
- * Copyright (c) 2012-2019 Snowflake Computing Inc. All rights reserved.
- */
-
 package net.snowflake.client.core;
 
 import java.util.HashSet;

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

@@ -1,7 +1,3 @@
-/*
- * Copyright (c) 2025 Snowflake Computing Inc. All rights reserved.
- */
-
 package net.snowflake.client.core;
 
 class HexUtil {

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

@@ -1,7 +1,3 @@
-/*
- * Copyright (c) 2012-2021 Snowflake Computing Inc. All rights reserved.
- */
-
 package net.snowflake.client.core;
 
 import com.google.common.base.Strings;