address comments

Author: Luegg

x-pack/plugin/sql/qa/jdbc/security/src/test/java/org/elasticsearch/xpack/sql/qa/jdbc/security/JdbcWarningsIT.java

@@ -0,0 +1,34 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+package org.elasticsearch.xpack.sql.qa.jdbc.security;
+
+import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.xpack.sql.qa.jdbc.JdbcWarningsTestCase;
+
+import java.util.Properties;
+
+public class JdbcWarningsIT extends JdbcWarningsTestCase {
+
+    @Override
+    protected Settings restClientSettings() {
+        return JdbcConnectionIT.securitySettings();
+    }
+
+    @Override
+    protected String getProtocol() {
+        return JdbcConnectionIT.SSL_ENABLED ? "https" : "http";
+    }
+
+    @Override
+    protected Properties connectionProperties() {
+        Properties properties = super.connectionProperties();
+        properties.putAll(JdbcSecurityUtils.adminProperties());
+        return properties;
+    }
+
+}

x-pack/plugin/sql/qa/jdbc/single-node/src/test/java/org/elasticsearch/xpack/sql/qa/jdbc/single_node/JdbcWarningsIT.java

@@ -0,0 +1,12 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+package org.elasticsearch.xpack.sql.qa.jdbc.single_node;
+
+import org.elasticsearch.xpack.sql.qa.jdbc.JdbcWarningsTestCase;
+
+public class JdbcWarningsIT extends JdbcWarningsTestCase {}

x-pack/plugin/sql/qa/server/single-node/src/test/java/org/elasticsearch/xpack/sql/qa/single_node/JdbcWarningsIT.java renamed to x-pack/plugin/sql/qa/jdbc/src/main/java/org/elasticsearch/xpack/sql/qa/jdbc/JdbcWarningsTestCase.java

@@ -5,15 +5,13 @@
  * 2.0.
  */
 
-package org.elasticsearch.xpack.sql.qa.single_node;
-
-import org.elasticsearch.xpack.sql.qa.jdbc.JdbcIntegrationTestCase;
+package org.elasticsearch.xpack.sql.qa.jdbc;
 
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.Statement;
 
-public class JdbcWarningsIT extends JdbcIntegrationTestCase {
+public abstract class JdbcWarningsTestCase extends JdbcIntegrationTestCase {
 
     public void testDeprecationWarningsDoNotReachJdbcDriver() throws Exception {
         index("test_data", b -> b.field("foo", 1));

x-pack/plugin/sql/qa/server/single-node/src/test/java/org/elasticsearch/xpack/sql/qa/single_node/RestSqlDeprecationIT.java

@@ -42,7 +42,7 @@ public void testFrozenSyntaxIsDeprecatedInFromClause() throws IOException {
         testFrozenSyntaxIsDeprecated("SELECT * FROM FROZEN test", "FROZEN");
     }
 
-    public void testFrozenSyntaxIsDeprecated(String query, String syntax) throws IOException {
+    private void testFrozenSyntaxIsDeprecated(String query, String syntax) throws IOException {
         testDeprecationWarning(
             query(query).mode(randomMode()),
             "["
@@ -52,7 +52,7 @@ public void testFrozenSyntaxIsDeprecated(String query, String syntax) throws IOE
         );
     }
 
-    public void testDeprecationWarning(RequestObjectBuilder query, String warning) throws IOException {
+    private void testDeprecationWarning(RequestObjectBuilder query, String warning) throws IOException {
         index("{\"foo\": 1}");
 
         Request request = new Request("POST", SQL_QUERY_REST_ENDPOINT);

x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/parser/CommandBuilder.java

@@ -122,7 +122,7 @@ public Object visitShowTables(ShowTablesContext ctx) {
         String index = ti != null ? ti.qualifiedIndex() : null;
 
         boolean includeFrozen = ctx.FROZEN() != null;
-        warnDeprecatedFrozenSyntax(includeFrozen, "INCLUDE FROZEN");
+        maybeWarnDeprecatedFrozenSyntax(includeFrozen, "INCLUDE FROZEN");
 
         return new ShowTables(
             source(ctx),
@@ -145,7 +145,7 @@ public Object visitShowColumns(ShowColumnsContext ctx) {
         String index = ti != null ? ti.qualifiedIndex() : null;
 
         boolean includeFrozen = ctx.FROZEN() != null;
-        warnDeprecatedFrozenSyntax(includeFrozen, "INCLUDE FROZEN");
+        maybeWarnDeprecatedFrozenSyntax(includeFrozen, "INCLUDE FROZEN");
 
         return new ShowColumns(source(ctx), string(ctx.cluster), index, visitLikePattern(ctx.tableLike), includeFrozen);
     }

x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/parser/LogicalPlanBuilder.java

@@ -76,7 +76,7 @@ abstract class LogicalPlanBuilder extends ExpressionBuilder {
     private static final String FROZEN_DEPRECATION_WARNING = "[{}] syntax is deprecated because frozen indices have been deprecated. "
         + "Consider cold or frozen tiers in place of frozen indices.";
 
-    protected void warnDeprecatedFrozenSyntax(boolean includeFrozen, String syntax) {
+    protected void maybeWarnDeprecatedFrozenSyntax(boolean includeFrozen, String syntax) {
         if (includeFrozen) {
             DEPRECATION_LOGGER.warn(DeprecationCategory.PARSING, "include_frozen_syntax", format(null, FROZEN_DEPRECATION_WARNING, syntax));
         }
@@ -282,7 +282,7 @@ public LogicalPlan visitTableName(TableNameContext ctx) {
         String alias = visitQualifiedName(ctx.qualifiedName());
         TableIdentifier tableIdentifier = visitTableIdentifier(ctx.tableIdentifier());
         boolean includeFrozen = ctx.FROZEN() != null;
-        warnDeprecatedFrozenSyntax(includeFrozen, "FROZEN");
+        maybeWarnDeprecatedFrozenSyntax(includeFrozen, "FROZEN");
         return new UnresolvedRelation(source(ctx), tableIdentifier, alias, includeFrozen);
     }