Change package of converters class

snowflakedb · Apr 2, 2024 · 3ec0b41 · 3ec0b41
1 parent 2604eb3
commit 3ec0b41
Show file tree

Hide file tree

Showing 14 changed files with 14 additions and 11 deletions.
diff --git a/src/main/java/net/snowflake/client/core/ArrowSqlInput.java b/src/main/java/net/snowflake/client/core/ArrowSqlInput.java
@@ -16,6 +16,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.TimeZone;
+import net.snowflake.client.core.json.Converters;
 import net.snowflake.client.core.structs.SQLDataCreationHelper;
 import net.snowflake.client.jdbc.FieldMetadata;
 import net.snowflake.client.util.ThrowingBiFunction;

diff --git a/src/main/java/net/snowflake/client/core/BaseSqlInput.java b/src/main/java/net/snowflake/client/core/BaseSqlInput.java
@@ -17,6 +17,7 @@
 import java.sql.SQLXML;
 import java.sql.Timestamp;
 import java.util.List;
+import net.snowflake.client.core.json.Converters;
 import net.snowflake.client.jdbc.FieldMetadata;
 import net.snowflake.client.jdbc.SnowflakeLoggedFeatureNotSupportedException;
 

diff --git a/src/main/java/net/snowflake/client/core/JsonSqlInput.java b/src/main/java/net/snowflake/client/core/JsonSqlInput.java
@@ -17,6 +17,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.TimeZone;
+import net.snowflake.client.core.json.Converters;
 import net.snowflake.client.core.structs.SQLDataCreationHelper;
 import net.snowflake.client.jdbc.FieldMetadata;
 import net.snowflake.client.jdbc.SnowflakeLoggedFeatureNotSupportedException;

diff --git a/src/main/java/net/snowflake/client/core/SFArrowResultSet.java b/src/main/java/net/snowflake/client/core/SFArrowResultSet.java
@@ -27,6 +27,7 @@
 import net.snowflake.client.core.arrow.ArrowVectorConverter;
 import net.snowflake.client.core.arrow.StructConverter;
 import net.snowflake.client.core.arrow.VarCharConverter;
+import net.snowflake.client.core.json.Converters;
 import net.snowflake.client.core.structs.StructureTypeHelper;
 import net.snowflake.client.jdbc.ArrowResultChunk;
 import net.snowflake.client.jdbc.ArrowResultChunk.ArrowChunkIterator;

diff --git a/src/main/java/net/snowflake/client/core/SFBaseResultSet.java b/src/main/java/net/snowflake/client/core/SFBaseResultSet.java
@@ -16,6 +16,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.TimeZone;
+import net.snowflake.client.core.json.Converters;
 import net.snowflake.client.jdbc.ErrorCode;
 import net.snowflake.client.jdbc.SnowflakeResultSetSerializable;
 import net.snowflake.client.jdbc.SnowflakeResultSetSerializableV1;

diff --git a/src/main/java/net/snowflake/client/core/SFFixedViewResultSet.java b/src/main/java/net/snowflake/client/core/SFFixedViewResultSet.java
@@ -6,6 +6,7 @@
 
 import java.sql.SQLException;
 import java.util.List;
+import net.snowflake.client.core.json.Converters;
 import net.snowflake.client.jdbc.ErrorCode;
 import net.snowflake.client.jdbc.SFBaseFileTransferAgent;
 import net.snowflake.client.jdbc.SFBaseFileTransferAgent.CommandType;

diff --git a/src/main/java/net/snowflake/client/core/SFJsonResultSet.java b/src/main/java/net/snowflake/client/core/SFJsonResultSet.java
@@ -25,6 +25,7 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
+import net.snowflake.client.core.json.Converters;
 import net.snowflake.client.core.structs.StructureTypeHelper;
 import net.snowflake.client.jdbc.ErrorCode;
 import net.snowflake.client.jdbc.FieldMetadata;

diff --git a/src/main/java/net/snowflake/client/core/SFResultSet.java b/src/main/java/net/snowflake/client/core/SFResultSet.java
@@ -12,6 +12,7 @@
 import java.util.Arrays;
 import java.util.Comparator;
 import net.snowflake.client.core.BasicEvent.QueryState;
+import net.snowflake.client.core.json.Converters;
 import net.snowflake.client.jdbc.ErrorCode;
 import net.snowflake.client.jdbc.JsonResultChunk;
 import net.snowflake.client.jdbc.SnowflakeResultChunk;

diff --git a/src/main/java/net/snowflake/client/core/json/BytesConverter.java b/src/main/java/net/snowflake/client/core/json/BytesConverter.java
@@ -2,7 +2,6 @@
 
 import java.nio.ByteBuffer;
 import java.sql.Types;
-import net.snowflake.client.core.Converters;
 import net.snowflake.client.core.SFException;
 import net.snowflake.client.jdbc.ErrorCode;
 import net.snowflake.client.jdbc.SnowflakeUtil;

diff --git a/...net/snowflake/client/core/Converters.java → ...nowflake/client/core/json/Converters.java b/...net/snowflake/client/core/Converters.java → ...nowflake/client/core/json/Converters.java
@@ -1,4 +1,4 @@
-package net.snowflake.client.core;
+package net.snowflake.client.core.json;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -11,12 +11,11 @@
 import java.util.Arrays;
 import java.util.Map;
 import java.util.TimeZone;
+import net.snowflake.client.core.SFBaseSession;
+import net.snowflake.client.core.SFException;
+import net.snowflake.client.core.SnowflakeJdbcInternalApi;
+import net.snowflake.client.core.SqlInputTimestampUtil;
 import net.snowflake.client.core.arrow.StructuredTypeDateTimeConverter;
-import net.snowflake.client.core.json.BooleanConverter;
-import net.snowflake.client.core.json.BytesConverter;
-import net.snowflake.client.core.json.DateTimeConverter;
-import net.snowflake.client.core.json.NumberConverter;
-import net.snowflake.client.core.json.StringConverter;
 import net.snowflake.client.jdbc.ErrorCode;
 import net.snowflake.client.jdbc.SnowflakeResultSetSerializableV1;
 import net.snowflake.client.util.Converter;

diff --git a/src/main/java/net/snowflake/client/core/json/StringConverter.java b/src/main/java/net/snowflake/client/core/json/StringConverter.java
@@ -3,7 +3,6 @@
 import java.sql.Date;
 import java.sql.Types;
 import java.util.TimeZone;
-import net.snowflake.client.core.Converters;
 import net.snowflake.client.core.ResultUtil;
 import net.snowflake.client.core.SFBaseSession;
 import net.snowflake.client.core.SFException;

diff --git a/src/test/java/net/snowflake/client/core/json/BytesConverterTest.java b/src/test/java/net/snowflake/client/core/json/BytesConverterTest.java
@@ -5,7 +5,6 @@
 import java.math.BigInteger;
 import java.nio.ByteBuffer;
 import java.sql.Types;
-import net.snowflake.client.core.Converters;
 import net.snowflake.client.core.SFException;
 import net.snowflake.client.core.SFSession;
 import org.apache.arrow.vector.Float8Vector;

diff --git a/src/test/java/net/snowflake/client/core/json/StringConverterTest.java b/src/test/java/net/snowflake/client/core/json/StringConverterTest.java
@@ -6,7 +6,6 @@
 import java.sql.Types;
 import java.time.ZoneId;
 import java.util.TimeZone;
-import net.snowflake.client.core.Converters;
 import net.snowflake.client.core.SFException;
 import net.snowflake.client.core.SFSession;
 import net.snowflake.client.jdbc.SnowflakeResultSetSerializableV1;

diff --git a/src/test/java/net/snowflake/client/jdbc/MockConnectionTest.java b/src/test/java/net/snowflake/client/jdbc/MockConnectionTest.java
@@ -32,7 +32,6 @@
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 import net.snowflake.client.category.TestCategoryConnection;
-import net.snowflake.client.core.Converters;
 import net.snowflake.client.core.ExecTimeTelemetryData;
 import net.snowflake.client.core.ParameterBindingDTO;
 import net.snowflake.client.core.QueryContextDTO;
@@ -48,6 +47,7 @@
 import net.snowflake.client.core.SFSession;
 import net.snowflake.client.core.SFStatementType;
 import net.snowflake.client.core.SessionUtil;
+import net.snowflake.client.core.json.Converters;
 import net.snowflake.client.jdbc.telemetry.Telemetry;
 import net.snowflake.client.jdbc.telemetry.TelemetryData;
 import net.snowflake.common.core.SFBinaryFormat;