Move Thrift metastore authentication classes

trinodb · Aug 15, 2022 · ae638af · ae638af
1 parent 8408f03
commit ae638af
Show file tree

Hide file tree

Showing 9 changed files with 3 additions and 11 deletions.
diff --git a/.../main/java/io/trino/plugin/hive/metastore/thrift/DefaultThriftMetastoreClientFactory.java b/.../main/java/io/trino/plugin/hive/metastore/thrift/DefaultThriftMetastoreClientFactory.java
@@ -16,7 +16,6 @@
 import com.google.common.net.HostAndPort;
 import io.airlift.security.pem.PemReader;
 import io.airlift.units.Duration;
-import io.trino.plugin.hive.authentication.HiveMetastoreAuthentication;
 import io.trino.spi.NodeManager;
 import org.apache.thrift.transport.TTransport;
 import org.apache.thrift.transport.TTransportException;

diff --git a/...tication/HiveMetastoreAuthentication.java → ...e/thrift/HiveMetastoreAuthentication.java b/...tication/HiveMetastoreAuthentication.java → ...e/thrift/HiveMetastoreAuthentication.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.hive.authentication;
+package io.trino.plugin.hive.metastore.thrift;
 
 import org.apache.thrift.transport.TTransport;
 

diff --git a/.../main/java/io/trino/plugin/hive/metastore/thrift/KerberosHiveMetastoreAuthentication.java b/.../main/java/io/trino/plugin/hive/metastore/thrift/KerberosHiveMetastoreAuthentication.java
@@ -16,8 +16,6 @@
 import com.google.common.collect.ImmutableMap;
 import io.trino.plugin.hive.ForHiveMetastore;
 import io.trino.plugin.hive.authentication.HadoopAuthentication;
-import io.trino.plugin.hive.authentication.HiveMetastoreAuthentication;
-import io.trino.plugin.hive.authentication.MetastoreKerberosConfig;
 import org.apache.hadoop.hive.metastore.security.DelegationTokenIdentifier;
 import org.apache.hadoop.hive.thrift.client.TUGIAssumingTransport;
 import org.apache.hadoop.security.SaslRpcServer;

diff --git a/...thentication/MetastoreKerberosConfig.java → ...store/thrift/MetastoreKerberosConfig.java b/...thentication/MetastoreKerberosConfig.java → ...store/thrift/MetastoreKerberosConfig.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.hive.authentication;
+package io.trino.plugin.hive.metastore.thrift;
 
 import io.airlift.configuration.Config;
 import io.airlift.configuration.ConfigDescription;

diff --git a/...ve/src/main/java/io/trino/plugin/hive/metastore/thrift/NoHiveMetastoreAuthentication.java b/...ve/src/main/java/io/trino/plugin/hive/metastore/thrift/NoHiveMetastoreAuthentication.java
@@ -13,7 +13,6 @@
  */
 package io.trino.plugin.hive.metastore.thrift;
 
-import io.trino.plugin.hive.authentication.HiveMetastoreAuthentication;
 import org.apache.thrift.transport.TTransport;
 
 import java.util.Optional;

diff --git a/.../main/java/io/trino/plugin/hive/metastore/thrift/ThriftMetastoreAuthenticationModule.java b/.../main/java/io/trino/plugin/hive/metastore/thrift/ThriftMetastoreAuthenticationModule.java
@@ -21,8 +21,6 @@
 import io.trino.plugin.hive.ForHiveMetastore;
 import io.trino.plugin.hive.HdfsConfigurationInitializer;
 import io.trino.plugin.hive.authentication.HadoopAuthentication;
-import io.trino.plugin.hive.authentication.HiveMetastoreAuthentication;
-import io.trino.plugin.hive.authentication.MetastoreKerberosConfig;
 
 import static com.google.inject.Scopes.SINGLETON;
 import static io.airlift.configuration.ConfigBinder.configBinder;

diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/Transport.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/Transport.java
@@ -14,7 +14,6 @@
 package io.trino.plugin.hive.metastore.thrift;
 
 import com.google.common.net.HostAndPort;
-import io.trino.plugin.hive.authentication.HiveMetastoreAuthentication;
 import org.apache.thrift.transport.TSocket;
 import org.apache.thrift.transport.TTransport;
 import org.apache.thrift.transport.TTransportException;

diff --git a/...tication/TestMetastoreKerberosConfig.java → ...e/thrift/TestMetastoreKerberosConfig.java b/...tication/TestMetastoreKerberosConfig.java → ...e/thrift/TestMetastoreKerberosConfig.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.hive.authentication;
+package io.trino.plugin.hive.metastore.thrift;
 
 import com.google.common.collect.ImmutableMap;
 import org.testng.annotations.Test;

diff --git a/...ino-hive/src/test/java/io/trino/plugin/hive/metastore/thrift/TestingMetastoreLocator.java b/...ino-hive/src/test/java/io/trino/plugin/hive/metastore/thrift/TestingMetastoreLocator.java
@@ -15,7 +15,6 @@
 
 import com.google.common.net.HostAndPort;
 import io.airlift.units.Duration;
-import io.trino.plugin.hive.authentication.HiveMetastoreAuthentication;
 import org.apache.thrift.TException;
 
 import java.util.Optional;