Convert JDBC driver from TimeZoneKey to ZoneId

presto-benchmark-driver/src/main/java/io/prestosql/benchmark/driver/BenchmarkDriverOptions.java

@@ -24,13 +24,13 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.nio.charset.CharsetEncoder;
+import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
-import java.util.TimeZone;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static java.nio.charset.StandardCharsets.US_ASCII;
@@ -97,7 +97,7 @@ public ClientSession getClientSession()
                 catalog,
                 schema,
                 null,
-                TimeZone.getDefault().getID(),
+                ZoneId.systemDefault(),
                 Locale.getDefault(),
                 ImmutableMap.of(),
                 toProperties(this.sessionProperties),

presto-cli/src/main/java/io/prestosql/cli/ClientOptions.java

@@ -25,14 +25,14 @@
 
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
-import java.util.TimeZone;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Strings.nullToEmpty;
@@ -160,7 +160,7 @@ public ClientSession toClientSession()
                 catalog,
                 schema,
                 null,
-                TimeZone.getDefault().getID(),
+                ZoneId.systemDefault(),
                 Locale.getDefault(),
                 toResourceEstimates(resourceEstimates),
                 toProperties(sessionProperties),

presto-cli/src/test/java/io/prestosql/cli/TestQueryRunner.java

@@ -32,6 +32,7 @@
 import java.io.IOException;
 import java.io.PrintStream;
 import java.sql.SQLException;
+import java.time.ZoneId;
 import java.util.Locale;
 import java.util.Optional;
 
@@ -92,7 +93,7 @@ public void testCookie()
                         "catalog",
                         "schema",
                         "path",
-                        "America/Los_Angeles",
+                        ZoneId.of("America/Los_Angeles"),
                         Locale.ENGLISH,
                         ImmutableMap.of(),
                         ImmutableMap.of(),

presto-client/src/main/java/io/prestosql/client/ClientSession.java

@@ -16,10 +16,10 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import io.airlift.units.Duration;
-import io.prestosql.spi.type.TimeZoneKey;
 
 import java.net.URI;
 import java.nio.charset.CharsetEncoder;
+import java.time.ZoneId;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -42,7 +42,7 @@ public class ClientSession
     private final String catalog;
     private final String schema;
     private final String path;
-    private final TimeZoneKey timeZone;
+    private final ZoneId timeZone;
     private final Locale locale;
     private final Map<String, String> resourceEstimates;
     private final Map<String, String> properties;
@@ -72,7 +72,7 @@ public ClientSession(
             String catalog,
             String schema,
             String path,
-            String timeZoneId,
+            ZoneId timeZone,
             Locale locale,
             Map<String, String> resourceEstimates,
             Map<String, String> properties,
@@ -90,7 +90,7 @@ public ClientSession(
         this.schema = schema;
         this.path = path;
         this.locale = locale;
-        this.timeZone = TimeZoneKey.getTimeZoneKey(timeZoneId);
+        this.timeZone = requireNonNull(timeZone, "timeZone is null");
         this.transactionId = transactionId;
         this.resourceEstimates = ImmutableMap.copyOf(requireNonNull(resourceEstimates, "resourceEstimates is null"));
         this.properties = ImmutableMap.copyOf(requireNonNull(properties, "properties is null"));
@@ -163,7 +163,7 @@ public String getPath()
         return path;
     }
 
-    public TimeZoneKey getTimeZone()
+    public ZoneId getTimeZone()
     {
         return timeZone;
     }
@@ -234,7 +234,7 @@ public static final class Builder
         private String catalog;
         private String schema;
         private String path;
-        private TimeZoneKey timeZone;
+        private ZoneId timeZone;
         private Locale locale;
         private Map<String, String> resourceEstimates;
         private Map<String, String> properties;
@@ -317,7 +317,7 @@ public ClientSession build()
                     catalog,
                     schema,
                     path,
-                    timeZone.getId(),
+                    timeZone,
                     locale,
                     resourceEstimates,
                     properties,

presto-client/src/main/java/io/prestosql/client/StatementClient.java

@@ -13,11 +13,10 @@
  */
 package io.prestosql.client;
 
-import io.prestosql.spi.type.TimeZoneKey;
-
 import javax.annotation.Nullable;
 
 import java.io.Closeable;
+import java.time.ZoneId;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
@@ -27,7 +26,7 @@ public interface StatementClient
 {
     String getQuery();
 
-    TimeZoneKey getTimeZone();
+    ZoneId getTimeZone();
 
     boolean isRunning();
 

presto-client/src/main/java/io/prestosql/client/StatementClientV1.java

@@ -21,7 +21,6 @@
 import io.airlift.json.JsonCodec;
 import io.airlift.units.Duration;
 import io.prestosql.client.OkHttpUtil.NullCallback;
-import io.prestosql.spi.type.TimeZoneKey;
 import okhttp3.Headers;
 import okhttp3.HttpUrl;
 import okhttp3.MediaType;
@@ -36,6 +35,7 @@
 import java.net.URI;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
+import java.time.ZoneId;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -104,7 +104,7 @@ class StatementClientV1
     private final Set<String> deallocatedPreparedStatements = Sets.newConcurrentHashSet();
     private final AtomicReference<String> startedTransactionId = new AtomicReference<>();
     private final AtomicBoolean clearTransactionId = new AtomicBoolean();
-    private final TimeZoneKey timeZone;
+    private final ZoneId timeZone;
     private final Duration requestTimeoutNanos;
     private final String user;
     private final String clientCapabilities;
@@ -201,7 +201,7 @@ public String getQuery()
     }
 
     @Override
-    public TimeZoneKey getTimeZone()
+    public ZoneId getTimeZone()
     {
         return timeZone;
     }

presto-jdbc/src/main/java/io/prestosql/jdbc/PrestoConnection.java

@@ -41,12 +41,12 @@
 import java.sql.Savepoint;
 import java.sql.Statement;
 import java.sql.Struct;
+import java.time.ZoneId;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Properties;
-import java.util.TimeZone;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Executor;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -74,7 +74,7 @@ public class PrestoConnection
     private final AtomicReference<String> catalog = new AtomicReference<>();
     private final AtomicReference<String> schema = new AtomicReference<>();
     private final AtomicReference<String> path = new AtomicReference<>();
-    private final AtomicReference<String> timeZoneId = new AtomicReference<>();
+    private final AtomicReference<ZoneId> timeZoneId = new AtomicReference<>();
     private final AtomicReference<Locale> locale = new AtomicReference<>();
     private final AtomicReference<Integer> networkTimeoutMillis = new AtomicReference<>(Ints.saturatedCast(MINUTES.toMillis(2)));
     private final AtomicReference<ServerInfo> serverInfo = new AtomicReference<>();
@@ -104,7 +104,7 @@ public class PrestoConnection
 
         this.queryExecutor = requireNonNull(queryExecutor, "queryExecutor is null");
 
-        timeZoneId.set(TimeZone.getDefault().getID());
+        timeZoneId.set(ZoneId.systemDefault());
         locale.set(Locale.getDefault());
     }
 
@@ -519,13 +519,12 @@ public String getSchema()
 
     public String getTimeZoneId()
     {
-        return timeZoneId.get();
+        return timeZoneId.get().getId();
     }
 
     public void setTimeZoneId(String timeZoneId)
     {
-        requireNonNull(timeZoneId, "timeZoneId is null");
-        this.timeZoneId.set(timeZoneId);
+        this.timeZoneId.set(ZoneId.of(timeZoneId));
     }
 
     public Locale getLocale()

presto-tests/src/main/java/io/prestosql/tests/AbstractTestingPrestoClient.java

@@ -35,6 +35,7 @@
 
 import java.io.Closeable;
 import java.net.URI;
+import java.time.ZoneId;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -146,7 +147,7 @@ private static ClientSession toClientSession(Session session, URI server, Durati
                 session.getCatalog().orElse(null),
                 session.getSchema().orElse(null),
                 session.getPath().toString(),
-                session.getTimeZoneKey().getId(),
+                ZoneId.of(session.getTimeZoneKey().getId()),
                 session.getLocale(),
                 resourceEstimates.build(),
                 properties.build(),

presto-tests/src/test/java/io/prestosql/execution/TestFinalQueryInfo.java

@@ -26,6 +26,7 @@
 import okhttp3.OkHttpClient;
 import org.testng.annotations.Test;
 
+import java.time.ZoneId;
 import java.util.Locale;
 import java.util.Optional;
 
@@ -72,7 +73,7 @@ private static QueryId startQuery(String sql, DistributedQueryRunner queryRunner
                     null,
                     null,
                     null,
-                    "America/Los_Angeles",
+                    ZoneId.of("America/Los_Angeles"),
                     Locale.ENGLISH,
                     ImmutableMap.of(),
                     ImmutableMap.of(),