SQL: Refactor package names of sql-proto and sql-shared-proto projects (#31622)

- renames project `sql-proto` to `sql-action`,
- renames package `sql.plugin` to `sql.action`
- renames project `sql-shared-client` to `sql-client`
- renames package `sql.shard.client` to `sql.client`
- renames project `sql-shared-proto` to `sql-proto`

Closes #31593

Author: imotov

x-pack/plugin/security/build.gradle

@@ -16,7 +16,7 @@ dependencies {
     compileOnly project(path: ':modules:transport-netty4', configuration: 'runtime')
 
     testCompile project(path: xpackModule('monitoring'))
-    testCompile project(path: xpackModule('sql:sql-proto'))
+    testCompile project(path: xpackModule('sql:sql-action'))
 
     testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
 

x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authz/AuthorizationServiceTests.java

@@ -122,8 +122,8 @@
 import org.elasticsearch.xpack.security.audit.AuditTrailService;
 import org.elasticsearch.xpack.security.authc.esnative.ReservedRealm;
 import org.elasticsearch.xpack.security.authz.store.CompositeRolesStore;
-import org.elasticsearch.xpack.sql.plugin.SqlQueryAction;
-import org.elasticsearch.xpack.sql.plugin.SqlQueryRequest;
+import org.elasticsearch.xpack.sql.action.SqlQueryAction;
+import org.elasticsearch.xpack.sql.action.SqlQueryRequest;
 import org.junit.Before;
 import org.mockito.Mockito;
 

x-pack/plugin/sql/build.gradle

@@ -24,7 +24,7 @@ dependencies {
         // exclude ASM to not affect featureAware task on Java 10+
         exclude group: "org.ow2.asm"
     }
-    compile project('sql-proto')
+    compile project('sql-action')
     compile "org.elasticsearch.plugin:aggs-matrix-stats-client:${version}"
     compile "org.antlr:antlr4-runtime:4.5.3"
     testCompile "org.elasticsearch.test:framework:${version}"

x-pack/plugin/sql/jdbc/build.gradle

@@ -24,10 +24,10 @@ forbiddenApisMain {
 }
 
 dependencies {
-    compile (xpackProject('plugin:sql:sql-shared-client')) {
+    compile (xpackProject('plugin:sql:sql-client')) {
         transitive = false
     }
-    compile (xpackProject('plugin:sql:sql-shared-proto')) {
+    compile (xpackProject('plugin:sql:sql-proto')) {
         transitive = false
     }
     compile (project(':libs:x-content')) {
@@ -39,12 +39,12 @@ dependencies {
 }
 
 dependencyLicenses {
-    mapping from: /sql-shared-proto.*/, to: 'elasticsearch'
-    mapping from: /sql-shared-client.*/, to: 'elasticsearch'
+    mapping from: /sql-proto.*/, to: 'elasticsearch'
+    mapping from: /sql-client.*/, to: 'elasticsearch'
     mapping from: /jackson-.*/, to: 'jackson'
     mapping from: /elasticsearch-core.*/, to: 'elasticsearch'
-    ignoreSha 'sql-shared-proto'
-    ignoreSha 'sql-shared-client'
+    ignoreSha 'sql-proto'
+    ignoreSha 'sql-client'
     ignoreSha 'elasticsearch'
 }
 

x-pack/plugin/sql/jdbc/src/main/java/org/elasticsearch/xpack/sql/jdbc/debug/Debug.java

@@ -5,7 +5,7 @@
  */
 package org.elasticsearch.xpack.sql.jdbc.debug;
 
-import org.elasticsearch.xpack.sql.client.shared.SuppressForbidden;
+import org.elasticsearch.xpack.sql.client.SuppressForbidden;
 import org.elasticsearch.xpack.sql.jdbc.JdbcException;
 import org.elasticsearch.xpack.sql.jdbc.jdbc.JdbcConfiguration;
 
@@ -39,10 +39,10 @@
  * being global and not working well with encoding (hence why {@link DriverManager#getLogWriter()} was introduced)
  * and was changed again through {@link DataSource#getLogWriter()}.
  * However by then the damage was done and most drivers don't use either and have their own logging implementation.
- * 
+ *
  * This class tries to cater to both audiences - use the legacy, Writer way if needed though strive to use the
  * proper typical approach, that of specifying intention and output (file) in the URL.
- * 
+ *
  * For this reason the {@link System#out} and {@link System#err} are being refered in this class though are used only
  * when needed.
  */
@@ -65,7 +65,7 @@ public final class Debug {
      * {@link DriverManager#setLogWriter(PrintWriter)} and {@link DataSource#setLogWriter(PrintWriter)}.
      * The former is the 'legacy' way, having a global impact on all drivers while the latter allows per
      * instance configuration.
-     * 
+     *
      * As both approaches are not widely used, Debug will take the principle of least surprise and pick its
      * own configuration first; if that does not exist it will fallback to the managed approaches (assuming they
      * are specified, otherwise logging is simply disabled).
@@ -235,4 +235,4 @@ private static PrintStream stdout() {
     private static PrintStream stderr() {
         return System.err;
     }
-}
+}

x-pack/plugin/sql/jdbc/src/main/java/org/elasticsearch/xpack/sql/jdbc/debug/DebugLog.java

@@ -5,7 +5,7 @@
  */
 package org.elasticsearch.xpack.sql.jdbc.debug;
 
-import org.elasticsearch.xpack.sql.client.shared.StringUtils;
+import org.elasticsearch.xpack.sql.client.StringUtils;
 
 import java.io.PrintWriter;
 import java.lang.reflect.Array;
@@ -56,16 +56,16 @@ void logException(Method m, Object[] args, Throwable t) {
         t.printStackTrace(print);
         print.flush();
     }
-    
+
 
     private static String array(Object[] a) {
         if (a == null || a.length == 0) {
-            return StringUtils.EMPTY; 
+            return StringUtils.EMPTY;
         }
         if (a.length == 1) {
             return handleArray(a[0]);
         }
-        
+
         StringBuilder b = new StringBuilder();
         int iMax = a.length - 1;
         for (int i = 0; ; i++) {
@@ -97,4 +97,4 @@ private static String handleArray(Object o) {
         }
         return String.valueOf(o);
     }
-}
+}

x-pack/plugin/sql/jdbc/src/main/java/org/elasticsearch/xpack/sql/jdbc/jdbc/JdbcConfiguration.java

@@ -5,9 +5,9 @@
  */
 package org.elasticsearch.xpack.sql.jdbc.jdbc;
 
-import org.elasticsearch.xpack.sql.client.shared.ConnectionConfiguration;
-import org.elasticsearch.xpack.sql.client.shared.StringUtils;
-import org.elasticsearch.xpack.sql.client.shared.Version;
+import org.elasticsearch.xpack.sql.client.ConnectionConfiguration;
+import org.elasticsearch.xpack.sql.client.StringUtils;
+import org.elasticsearch.xpack.sql.client.Version;
 import org.elasticsearch.xpack.sql.jdbc.JdbcSQLException;
 
 import java.net.URI;
@@ -22,8 +22,8 @@
 import java.util.TimeZone;
 import java.util.concurrent.TimeUnit;
 
-import static org.elasticsearch.xpack.sql.client.shared.UriUtils.parseURI;
-import static org.elasticsearch.xpack.sql.client.shared.UriUtils.removeQuery;
+import static org.elasticsearch.xpack.sql.client.UriUtils.parseURI;
+import static org.elasticsearch.xpack.sql.client.UriUtils.removeQuery;
 
 /**
  / Supports the following syntax

x-pack/plugin/sql/jdbc/src/main/java/org/elasticsearch/xpack/sql/jdbc/jdbc/JdbcDatabaseMetaData.java

@@ -5,8 +5,8 @@
  */
 package org.elasticsearch.xpack.sql.jdbc.jdbc;
 
-import org.elasticsearch.xpack.sql.client.shared.ObjectUtils;
-import org.elasticsearch.xpack.sql.client.shared.Version;
+import org.elasticsearch.xpack.sql.client.ObjectUtils;
+import org.elasticsearch.xpack.sql.client.Version;
 import org.elasticsearch.xpack.sql.jdbc.JdbcSQLException;
 import org.elasticsearch.xpack.sql.jdbc.net.client.Cursor;
 import org.elasticsearch.xpack.sql.jdbc.net.protocol.ColumnInfo;

x-pack/plugin/sql/jdbc/src/main/java/org/elasticsearch/xpack/sql/jdbc/jdbc/JdbcDriver.java

@@ -5,7 +5,7 @@
  */
 package org.elasticsearch.xpack.sql.jdbc.jdbc;
 
-import org.elasticsearch.xpack.sql.client.shared.Version;
+import org.elasticsearch.xpack.sql.client.Version;
 import org.elasticsearch.xpack.sql.jdbc.JdbcSQLException;
 import org.elasticsearch.xpack.sql.jdbc.debug.Debug;
 
@@ -127,4 +127,4 @@ public Logger getParentLogger() throws SQLFeatureNotSupportedException {
     private void close() {
         Debug.close();
     }
-}
+}

x-pack/plugin/sql/jdbc/src/main/java/org/elasticsearch/xpack/sql/jdbc/jdbcx/JdbcDataSource.java

@@ -5,11 +5,11 @@
  */
 package org.elasticsearch.xpack.sql.jdbc.jdbcx;
 
-import org.elasticsearch.xpack.sql.client.shared.ConnectionConfiguration;
+import org.elasticsearch.xpack.sql.client.ConnectionConfiguration;
 import org.elasticsearch.xpack.sql.jdbc.debug.Debug;
 import org.elasticsearch.xpack.sql.jdbc.jdbc.JdbcConfiguration;
 import org.elasticsearch.xpack.sql.jdbc.jdbc.JdbcConnection;
-import org.elasticsearch.xpack.sql.client.shared.Version;
+import org.elasticsearch.xpack.sql.client.Version;
 
 import java.io.PrintWriter;
 import java.sql.Connection;
@@ -117,4 +117,4 @@ public <T> T unwrap(Class<T> iface) throws SQLException {
         }
         throw new SQLException();
     }
-}
+}