Skip to content

[SNOW-3249917] JDBC removal Step 11b: Clean up remaining FQN JDBC references#1145

Merged
sfc-gh-ggeng merged 2 commits intomasterfrom
jdbc-removal-step11b-cleanup-fqn-v2
Apr 8, 2026
Merged

[SNOW-3249917] JDBC removal Step 11b: Clean up remaining FQN JDBC references#1145
sfc-gh-ggeng merged 2 commits intomasterfrom
jdbc-removal-step11b-cleanup-fqn-v2

Conversation

@sfc-gh-ggeng
Copy link
Copy Markdown
Contributor

@sfc-gh-ggeng sfc-gh-ggeng commented Apr 6, 2026

Summary

Remove all remaining FQN net.snowflake.client.* references from production code. After this PR, zero JDBC references remain in production code.

11 files changed, +115/-73

FQN SnowflakeSQLException removal (~44 occurrences)

Remove , net.snowflake.client.jdbc.SnowflakeSQLException from throws clauses across 8 files:
SnowflakeStorageClient (10), SnowflakeS3Client (7), SnowflakeAzureClient (8),
SnowflakeGCSClient (11), GCSAccessStrategy (1), GCSAccessStrategyAwsSdk (2),
GCSDefaultAccessStrategy (1), StorageClientFactory (4)

FQN type reference swaps

  • net.snowflake.client.core.HttpClientSettingsKeyHttpClientSettingsKey (same package, in SnowflakeGCSClient, SnowflakeStorageClient, SnowflakeFileTransferAgent)
  • net.snowflake.client.core.OCSPModenet.snowflake.ingest.utils.OCSPMode (in SnowflakeFileTransferAgent)
  • net.snowflake.client.jdbc.SnowflakeUtil.convertProxyPropertiesToHttpClientKeyStorageClientUtil (in SnowflakeFileTransferAgent)
  • net.snowflake.client.jdbc.cloud.storage.AwsSdkGCPSignernet.snowflake.ingest...AwsSdkGCPSigner (in GCSAccessStrategyAwsSdk)

New replication

  • AwsSdkGCPSigner (56 lines) — GCS virtual-style access signer

Stacked on #1144.

Replication Verification Diff Report

AwsSdkGCPSigner

JDBC source : net/snowflake/client/jdbc/cloud/storage/AwsSdkGCPSigner.java @ v3.25.1
Ingest copy : src/main/java/net/snowflake/ingest/streaming/internal/fileTransferAgent/AwsSdkGCPSigner.java

Permitted differences (mechanical):

  • Package declaration changed
  • @SnowflakeJdbcInternalApi annotation removed

Unexpected differences: NONE

Modified files (all mechanical)

All changes are mechanical FQN removal/swap with no logic changes:

File Change
SnowflakeStorageClient Remove FQN SnowflakeSQLException from 10 throws clauses
SnowflakeS3Client Remove FQN SnowflakeSQLException from 7 throws clauses
SnowflakeAzureClient Remove FQN SnowflakeSQLException from 8 throws clauses
SnowflakeGCSClient Remove FQN SnowflakeSQLException from 11 throws clauses, swap 3 FQN HttpClientSettingsKey
GCSAccessStrategy Remove FQN SnowflakeSQLException from 1 throws clause
GCSAccessStrategyAwsSdk Remove FQN SnowflakeSQLException from 2 throws clauses, swap AwsSdkGCPSigner FQN
GCSDefaultAccessStrategy Remove FQN SnowflakeSQLException from 1 throws clause
StorageClientFactory Remove FQN SnowflakeSQLException from 4 throws clauses
SnowflakeFileTransferAgent Swap FQN HttpClientSettingsKey, OCSPMode, SnowflakeUtil refs
HttpClientSettingsKey Comment-only: remove FQN from header

Test plan

  • mvn compiler:compile passes
  • CI passes

🤖 Generated with Claude Code

@sfc-gh-ggeng sfc-gh-ggeng force-pushed the jdbc-removal-step11b-cleanup-fqn-v2 branch from 4e558ae to 6bc9ff7 Compare April 6, 2026 23:55
@sfc-gh-ggeng sfc-gh-ggeng force-pushed the jdbc-removal-step11a-httputil branch from 372f22d to 486d52f Compare April 6, 2026 23:55
@sfc-gh-ggeng sfc-gh-ggeng force-pushed the jdbc-removal-step11b-cleanup-fqn-v2 branch from 6bc9ff7 to 153dca4 Compare April 7, 2026 07:03
@sfc-gh-ggeng sfc-gh-ggeng force-pushed the jdbc-removal-step11a-httputil branch from 486d52f to 13967ca Compare April 7, 2026 07:03
@sfc-gh-ggeng sfc-gh-ggeng force-pushed the jdbc-removal-step11a-httputil branch from 13967ca to f5c0fa5 Compare April 7, 2026 18:27
@sfc-gh-ggeng sfc-gh-ggeng force-pushed the jdbc-removal-step11b-cleanup-fqn-v2 branch 3 times, most recently from 06a9c71 to 3ddb06f Compare April 7, 2026 18:51
Base automatically changed from jdbc-removal-step11a-httputil to master April 7, 2026 21:16
…ap callers, clean up FQN refs

Replicate JDBC's HttpUtil as JdbcHttpUtil (renamed to avoid collision with
ingest's utils.HttpUtil). Swap all callers to use replicated REST
infrastructure. Clean up all FQN JDBC references.

New files:
- JdbcHttpUtil.java — verbatim replication of JDBC's HttpUtil
- SnowflakeMutableProxyRoutePlanner.java — proxy routing for HttpUtil
- AttributeEnhancingHttpRequestRetryHandler.java — headers customizer
- AwsSdkGCPSigner.java — GCS virtual-style access signer

Changes:
- RestRequest: swap HttpUtil FQN → JdbcHttpUtil
- TelemetryClient: swap HttpUtil → JdbcHttpUtil
- SnowflakeGCSClient: swap HttpUtil/RestRequest → JdbcHttpUtil/RestRequest
- SnowflakeAzureClient: swap setSessionlessProxyForAzure → JdbcHttpUtil
- StorageClientUtil: fix convertProxy exception type, fix throwNoSpaceLeft
- Remove all FQN SnowflakeSQLException from throws (~47 occurrences)
- Remove all FQN HttpClientSettingsKey/HttpProtocol/OCSPMode
- Swap AwsSdkGCPSigner to ingest version

Result: ZERO net.snowflake.client references in production code
(only comments documenting source URLs remain).

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@sfc-gh-ggeng sfc-gh-ggeng force-pushed the jdbc-removal-step11b-cleanup-fqn-v2 branch from 3ddb06f to b52cb1d Compare April 7, 2026 21:29
JDBC is unused in production code after FQN cleanup but remains in
compile scope until Step 11d demotes it to test scope.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@sfc-gh-ggeng sfc-gh-ggeng merged commit 1378627 into master Apr 8, 2026
89 of 99 checks passed
@sfc-gh-ggeng sfc-gh-ggeng deleted the jdbc-removal-step11b-cleanup-fqn-v2 branch April 8, 2026 02:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants