Rename legacyPreparedStatements to explicitPrepare

client/trino-client/src/main/java/io/trino/client/uri/ConnectionProperties.java

@@ -99,7 +99,7 @@ enum SslVerificationMode
     public static final ConnectionProperty<String, String> DNS_RESOLVER_CONTEXT = new ResolverContext();
     public static final ConnectionProperty<String, String> HOSTNAME_IN_CERTIFICATE = new HostnameInCertificate();
     public static final ConnectionProperty<String, ZoneId> TIMEZONE = new TimeZone();
-    public static final ConnectionProperty<String, Boolean> LEGACY_PREPARED_STATEMENTS = new LegacyPreparedStatements();
+    public static final ConnectionProperty<String, Boolean> EXPLICIT_PREPARE = new ExplicitPrepare();
 
     private static final Set<ConnectionProperty<?, ?>> ALL_PROPERTIES = ImmutableSet.<ConnectionProperty<?, ?>>builder()
             .add(USER)
@@ -145,7 +145,7 @@ enum SslVerificationMode
             .add(DNS_RESOLVER_CONTEXT)
             .add(HOSTNAME_IN_CERTIFICATE)
             .add(TIMEZONE)
-            .add(LEGACY_PREPARED_STATEMENTS)
+            .add(EXPLICIT_PREPARE)
             .build();
 
     private static final Map<String, ConnectionProperty<?, ?>> KEY_LOOKUP = unmodifiableMap(ALL_PROPERTIES.stream()
@@ -718,12 +718,12 @@ public TimeZone()
         }
     }
 
-    private static class LegacyPreparedStatements
+    private static class ExplicitPrepare
             extends AbstractConnectionProperty<String, Boolean>
     {
-        public LegacyPreparedStatements()
+        public ExplicitPrepare()
         {
-            super(PropertyName.LEGACY_PREPARED_STATEMENTS, NOT_REQUIRED, ALLOWED, BOOLEAN_CONVERTER);
+            super(PropertyName.EXPLICIT_PREPARE, NOT_REQUIRED, ALLOWED, BOOLEAN_CONVERTER);
         }
     }
 

client/trino-client/src/main/java/io/trino/client/uri/PropertyName.java

@@ -61,7 +61,7 @@ public enum PropertyName
     TRACE_TOKEN("traceToken"),
     SESSION_PROPERTIES("sessionProperties"),
     SOURCE("source"),
-    LEGACY_PREPARED_STATEMENTS("legacyPreparedStatements"),
+    EXPLICIT_PREPARE("explicitPrepare"),
     DNS_RESOLVER("dnsResolver"),
     DNS_RESOLVER_CONTEXT("dnsResolverContext"),
     HOSTNAME_IN_CERTIFICATE("hostnameInCertificate"),

client/trino-client/src/main/java/io/trino/client/uri/TrinoUri.java

@@ -70,6 +70,7 @@
 import static io.trino.client.uri.ConnectionProperties.DISABLE_COMPRESSION;
 import static io.trino.client.uri.ConnectionProperties.DNS_RESOLVER;
 import static io.trino.client.uri.ConnectionProperties.DNS_RESOLVER_CONTEXT;
+import static io.trino.client.uri.ConnectionProperties.EXPLICIT_PREPARE;
 import static io.trino.client.uri.ConnectionProperties.EXTERNAL_AUTHENTICATION;
 import static io.trino.client.uri.ConnectionProperties.EXTERNAL_AUTHENTICATION_REDIRECT_HANDLERS;
 import static io.trino.client.uri.ConnectionProperties.EXTERNAL_AUTHENTICATION_TIMEOUT;
@@ -86,7 +87,6 @@
 import static io.trino.client.uri.ConnectionProperties.KERBEROS_REMOTE_SERVICE_NAME;
 import static io.trino.client.uri.ConnectionProperties.KERBEROS_SERVICE_PRINCIPAL_PATTERN;
 import static io.trino.client.uri.ConnectionProperties.KERBEROS_USE_CANONICAL_HOSTNAME;
-import static io.trino.client.uri.ConnectionProperties.LEGACY_PREPARED_STATEMENTS;
 import static io.trino.client.uri.ConnectionProperties.PASSWORD;
 import static io.trino.client.uri.ConnectionProperties.ROLES;
 import static io.trino.client.uri.ConnectionProperties.SESSION_PROPERTIES;
@@ -168,7 +168,7 @@ public class TrinoUri
     private Optional<String> traceToken;
     private Optional<Map<String, String>> sessionProperties;
     private Optional<String> source;
-    private Optional<Boolean> legacyPreparedStatements;
+    private Optional<Boolean> explicitPrepare;
 
     private Optional<String> catalog = Optional.empty();
     private Optional<String> schema = Optional.empty();
@@ -222,7 +222,7 @@ private TrinoUri(
             Optional<String> traceToken,
             Optional<Map<String, String>> sessionProperties,
             Optional<String> source,
-            Optional<Boolean> legacyPreparedStatements)
+            Optional<Boolean> explicitPrepare)
             throws SQLException
     {
         this.uri = requireNonNull(uri, "uri is null");
@@ -275,7 +275,7 @@ private TrinoUri(
         this.traceToken = TRACE_TOKEN.getValueOrDefault(urlProperties, traceToken);
         this.sessionProperties = SESSION_PROPERTIES.getValueOrDefault(urlProperties, sessionProperties);
         this.source = SOURCE.getValueOrDefault(urlProperties, source);
-        this.legacyPreparedStatements = LEGACY_PREPARED_STATEMENTS.getValueOrDefault(urlProperties, legacyPreparedStatements);
+        this.explicitPrepare = EXPLICIT_PREPARE.getValueOrDefault(urlProperties, explicitPrepare);
 
         properties = buildProperties();
 
@@ -361,7 +361,7 @@ private Properties buildProperties()
         clientTags.ifPresent(value -> properties.setProperty(PropertyName.CLIENT_TAGS.toString(), value));
         traceToken.ifPresent(value -> properties.setProperty(PropertyName.TRACE_TOKEN.toString(), value));
         source.ifPresent(value -> properties.setProperty(PropertyName.SOURCE.toString(), value));
-        legacyPreparedStatements.ifPresent(value -> properties.setProperty(PropertyName.LEGACY_PREPARED_STATEMENTS.toString(), value.toString()));
+        explicitPrepare.ifPresent(value -> properties.setProperty(PropertyName.EXPLICIT_PREPARE.toString(), value.toString()));
         return properties;
     }
 
@@ -421,7 +421,7 @@ protected TrinoUri(URI uri, Properties driverProperties)
         this.traceToken = TRACE_TOKEN.getValue(properties);
         this.sessionProperties = SESSION_PROPERTIES.getValue(properties);
         this.source = SOURCE.getValue(properties);
-        this.legacyPreparedStatements = LEGACY_PREPARED_STATEMENTS.getValue(properties);
+        this.explicitPrepare = EXPLICIT_PREPARE.getValue(properties);
 
         // enable SSL by default for the trino schema and the standard port
         useSecureConnection = ssl.orElse(uri.getScheme().equals("https") || (uri.getScheme().equals("trino") && uri.getPort() == 443));
@@ -529,9 +529,9 @@ public Optional<String> getSource()
         return source;
     }
 
-    public Optional<Boolean> getLegacyPreparedStatements()
+    public Optional<Boolean> getExplicitPrepare()
     {
-        return legacyPreparedStatements;
+        return explicitPrepare;
     }
 
     public boolean isCompressionDisabled()
@@ -938,7 +938,7 @@ public static final class Builder
         private String traceToken;
         private Map<String, String> sessionProperties;
         private String source;
-        private Boolean legacyPreparedStatements;
+        private Boolean explicitPrepare;
 
         private Builder() {}
 
@@ -1227,9 +1227,9 @@ public Builder setSource(String source)
             return this;
         }
 
-        public Builder setLegacyPreparedStatements(Boolean legacyPreparedStatements)
+        public Builder setExplicitPrepare(Boolean explicitPrepare)
         {
-            this.legacyPreparedStatements = requireNonNull(legacyPreparedStatements, "legacyPreparedStatements is null");
+            this.explicitPrepare = requireNonNull(explicitPrepare, "explicitPrepare is null");
             return this;
         }
 
@@ -1282,7 +1282,7 @@ public TrinoUri build()
                     Optional.ofNullable(traceToken),
                     Optional.ofNullable(sessionProperties),
                     Optional.ofNullable(source),
-                    Optional.ofNullable(legacyPreparedStatements));
+                    Optional.ofNullable(explicitPrepare));
         }
     }
 }

client/trino-jdbc/pom.xml

@@ -132,6 +132,12 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>junit-extensions</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.airlift</groupId>
             <artifactId>log</artifactId>
@@ -258,6 +264,12 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>

client/trino-jdbc/src/main/java/io/trino/jdbc/TrinoConnection.java

@@ -112,7 +112,7 @@ public class TrinoConnection
     private final AtomicReference<String> transactionId = new AtomicReference<>();
     private final Call.Factory httpCallFactory;
     private final Set<TrinoStatement> statements = newSetFromMap(new ConcurrentHashMap<>());
-    private boolean useLegacyPreparedStatements = true;
+    private boolean useExplicitPrepare = true;
 
     TrinoConnection(TrinoDriverUri uri, Call.Factory httpCallFactory)
     {
@@ -146,7 +146,7 @@ public class TrinoConnection
         locale.set(Locale.getDefault());
         sessionProperties.putAll(uri.getSessionProperties());
 
-        uri.getLegacyPreparedStatements().ifPresent(value -> this.useLegacyPreparedStatements = value);
+        uri.getExplicitPrepare().ifPresent(value -> this.useExplicitPrepare = value);
     }
 
     @Override
@@ -915,8 +915,8 @@ public void throwIfHeld()
         }
     }
 
-    public Boolean isUseLegacyPreparedStatements()
+    public boolean useExplicitPrepare()
     {
-        return this.useLegacyPreparedStatements;
+        return this.useExplicitPrepare;
     }
 }

client/trino-jdbc/src/main/java/io/trino/jdbc/TrinoPreparedStatement.java

@@ -117,7 +117,7 @@ public class TrinoPreparedStatement
         super(connection, onClose);
         this.statementName = requireNonNull(statementName, "statementName is null");
         this.originalSql = requireNonNull(sql, "sql is null");
-        if (connection().isUseLegacyPreparedStatements()) {
+        if (connection().useExplicitPrepare()) {
             super.execute(format("PREPARE %s FROM %s", statementName, sql));
             prepareStatementExecuted = true;
         }
@@ -1020,7 +1020,7 @@ private String getLegacySql(String statementName, List<String> values)
     private String getExecuteSql(String statementName, List<String> values)
             throws SQLException
     {
-        return connection().isUseLegacyPreparedStatements()
+        return connection().useExplicitPrepare()
                 ? getLegacySql(statementName, values)
                 : getExecuteImmediateSql(values);
     }
@@ -1147,7 +1147,7 @@ private static List<ColumnInfo> getDescribeOutputColumnInfoList(ResultSet result
     }
 
     /*
-    When isUseLegacyPreparedStatements is disabled, the PREPARE statement won't be executed unless needed
+    When explicitPrepare is disabled, the PREPARE statement won't be executed unless needed
     e.g. when getMetadata() or getParameterMetadata() are called.
     When needed, just make sure it is executed only once, even if the metadata methods are called many times
      */