Move PrincipalType to presto-spi

Extracted-From: prestodb/presto#10904
trinodb · Jan 29, 2019 · 776b453 · 776b453
1 parent 42ba503
commit 776b453
Show file tree

Hide file tree

Showing 14 changed files with 16 additions and 14 deletions.
diff --git a/presto-geospatial/src/test/java/io/prestosql/plugin/geospatial/TestSpatialJoins.java b/presto-geospatial/src/test/java/io/prestosql/plugin/geospatial/TestSpatialJoins.java
@@ -22,8 +22,8 @@
 import io.prestosql.plugin.hive.HivePlugin;
 import io.prestosql.plugin.hive.authentication.NoHdfsAuthentication;
 import io.prestosql.plugin.hive.metastore.Database;
-import io.prestosql.plugin.hive.metastore.PrincipalType;
 import io.prestosql.plugin.hive.metastore.file.FileHiveMetastore;
+import io.prestosql.spi.security.PrincipalType;
 import io.prestosql.tests.AbstractTestQueryFramework;
 import io.prestosql.tests.DistributedQueryRunner;
 import org.testng.annotations.Test;

diff --git a/presto-hive/src/main/java/io/prestosql/plugin/hive/HiveMetadata.java b/presto-hive/src/main/java/io/prestosql/plugin/hive/HiveMetadata.java
@@ -178,7 +178,6 @@
 import static io.prestosql.plugin.hive.metastore.MetastoreUtil.getHiveSchema;
 import static io.prestosql.plugin.hive.metastore.MetastoreUtil.getProtectMode;
 import static io.prestosql.plugin.hive.metastore.MetastoreUtil.verifyOnline;
-import static io.prestosql.plugin.hive.metastore.PrincipalType.USER;
 import static io.prestosql.plugin.hive.metastore.StorageFormat.VIEW_STORAGE_FORMAT;
 import static io.prestosql.plugin.hive.metastore.StorageFormat.fromHiveStorageFormat;
 import static io.prestosql.plugin.hive.util.ConfigurationUtils.toJobConf;
@@ -191,6 +190,7 @@
 import static io.prestosql.spi.StandardErrorCode.NOT_SUPPORTED;
 import static io.prestosql.spi.StandardErrorCode.SCHEMA_NOT_EMPTY;
 import static io.prestosql.spi.predicate.TupleDomain.withColumnDomains;
+import static io.prestosql.spi.security.PrincipalType.USER;
 import static java.lang.String.format;
 import static java.util.Collections.emptyList;
 import static java.util.Objects.requireNonNull;

diff --git a/presto-hive/src/main/java/io/prestosql/plugin/hive/metastore/Database.java b/presto-hive/src/main/java/io/prestosql/plugin/hive/metastore/Database.java
@@ -16,6 +16,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableMap;
+import io.prestosql.spi.security.PrincipalType;
 
 import javax.annotation.concurrent.Immutable;
 

diff --git a/presto-hive/src/main/java/io/prestosql/plugin/hive/metastore/file/DatabaseMetadata.java b/presto-hive/src/main/java/io/prestosql/plugin/hive/metastore/file/DatabaseMetadata.java
@@ -17,7 +17,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableMap;
 import io.prestosql.plugin.hive.metastore.Database;
-import io.prestosql.plugin.hive.metastore.PrincipalType;
+import io.prestosql.spi.security.PrincipalType;
 
 import java.util.Map;
 import java.util.Optional;

diff --git a/presto-hive/src/main/java/io/prestosql/plugin/hive/metastore/file/FileHiveMetastore.java b/presto-hive/src/main/java/io/prestosql/plugin/hive/metastore/file/FileHiveMetastore.java
@@ -39,7 +39,6 @@
 import io.prestosql.plugin.hive.metastore.Partition;
 import io.prestosql.plugin.hive.metastore.PartitionWithStatistics;
 import io.prestosql.plugin.hive.metastore.PrincipalPrivileges;
-import io.prestosql.plugin.hive.metastore.PrincipalType;
 import io.prestosql.plugin.hive.metastore.Table;
 import io.prestosql.plugin.hive.metastore.thrift.ThriftMetastoreUtil;
 import io.prestosql.spi.PrestoException;
@@ -48,6 +47,7 @@
 import io.prestosql.spi.connector.SchemaTableName;
 import io.prestosql.spi.connector.TableNotFoundException;
 import io.prestosql.spi.security.Identity;
+import io.prestosql.spi.security.PrincipalType;
 import io.prestosql.spi.statistics.ColumnStatisticType;
 import io.prestosql.spi.type.Type;
 import org.apache.hadoop.fs.FSDataInputStream;
@@ -86,12 +86,12 @@
 import static io.prestosql.plugin.hive.metastore.HivePrivilegeInfo.HivePrivilege.OWNERSHIP;
 import static io.prestosql.plugin.hive.metastore.MetastoreUtil.makePartName;
 import static io.prestosql.plugin.hive.metastore.MetastoreUtil.verifyCanDropColumn;
-import static io.prestosql.plugin.hive.metastore.PrincipalType.ROLE;
-import static io.prestosql.plugin.hive.metastore.PrincipalType.USER;
 import static io.prestosql.plugin.hive.metastore.thrift.ThriftMetastoreUtil.getHiveBasicStatistics;
 import static io.prestosql.plugin.hive.metastore.thrift.ThriftMetastoreUtil.updateStatisticsParameters;
 import static io.prestosql.spi.StandardErrorCode.ALREADY_EXISTS;
 import static io.prestosql.spi.StandardErrorCode.NOT_SUPPORTED;
+import static io.prestosql.spi.security.PrincipalType.ROLE;
+import static io.prestosql.spi.security.PrincipalType.USER;
 import static java.util.Objects.requireNonNull;
 import static java.util.stream.Collectors.toList;
 import static org.apache.hadoop.hive.common.FileUtils.unescapePathName;

diff --git a/...rc/main/java/io/prestosql/plugin/hive/metastore/glue/converter/GlueToPrestoConverter.java b/...rc/main/java/io/prestosql/plugin/hive/metastore/glue/converter/GlueToPrestoConverter.java
@@ -22,13 +22,13 @@
 import io.prestosql.plugin.hive.metastore.Column;
 import io.prestosql.plugin.hive.metastore.Database;
 import io.prestosql.plugin.hive.metastore.Partition;
-import io.prestosql.plugin.hive.metastore.PrincipalType;
 import io.prestosql.plugin.hive.metastore.SortingColumn;
 import io.prestosql.plugin.hive.metastore.SortingColumn.Order;
 import io.prestosql.plugin.hive.metastore.Storage;
 import io.prestosql.plugin.hive.metastore.StorageFormat;
 import io.prestosql.plugin.hive.metastore.Table;
 import io.prestosql.spi.PrestoException;
+import io.prestosql.spi.security.PrincipalType;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/presto-hive/src/main/java/io/prestosql/plugin/hive/metastore/thrift/ThriftMetastoreUtil.java b/presto-hive/src/main/java/io/prestosql/plugin/hive/metastore/thrift/ThriftMetastoreUtil.java
@@ -26,11 +26,11 @@
 import io.prestosql.plugin.hive.metastore.Partition;
 import io.prestosql.plugin.hive.metastore.PartitionWithStatistics;
 import io.prestosql.plugin.hive.metastore.PrincipalPrivileges;
-import io.prestosql.plugin.hive.metastore.PrincipalType;
 import io.prestosql.plugin.hive.metastore.Storage;
 import io.prestosql.plugin.hive.metastore.StorageFormat;
 import io.prestosql.plugin.hive.metastore.Table;
 import io.prestosql.spi.PrestoException;
+import io.prestosql.spi.security.PrincipalType;
 import io.prestosql.spi.statistics.ColumnStatisticType;
 import io.prestosql.spi.type.ArrayType;
 import io.prestosql.spi.type.DecimalType;

diff --git a/presto-hive/src/test/java/io/prestosql/plugin/hive/AbstractTestHiveClientLocal.java b/presto-hive/src/test/java/io/prestosql/plugin/hive/AbstractTestHiveClientLocal.java
@@ -16,10 +16,10 @@
 import com.google.common.io.Files;
 import io.prestosql.plugin.hive.metastore.Database;
 import io.prestosql.plugin.hive.metastore.ExtendedHiveMetastore;
-import io.prestosql.plugin.hive.metastore.PrincipalType;
 import io.prestosql.spi.connector.ConnectorMetadata;
 import io.prestosql.spi.connector.ConnectorTableHandle;
 import io.prestosql.spi.connector.SchemaTableName;
+import io.prestosql.spi.security.PrincipalType;
 import org.testng.SkipException;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;

diff --git a/presto-hive/src/test/java/io/prestosql/plugin/hive/HiveBenchmarkQueryRunner.java b/presto-hive/src/test/java/io/prestosql/plugin/hive/HiveBenchmarkQueryRunner.java
@@ -19,8 +19,8 @@
 import io.prestosql.benchmark.BenchmarkSuite;
 import io.prestosql.plugin.hive.metastore.Database;
 import io.prestosql.plugin.hive.metastore.ExtendedHiveMetastore;
-import io.prestosql.plugin.hive.metastore.PrincipalType;
 import io.prestosql.plugin.tpch.TpchConnectorFactory;
+import io.prestosql.spi.security.PrincipalType;
 import io.prestosql.testing.LocalQueryRunner;
 
 import java.io.File;

diff --git a/presto-hive/src/test/java/io/prestosql/plugin/hive/HiveQueryRunner.java b/presto-hive/src/test/java/io/prestosql/plugin/hive/HiveQueryRunner.java
@@ -22,9 +22,9 @@
 import io.prestosql.metadata.QualifiedObjectName;
 import io.prestosql.plugin.hive.authentication.NoHdfsAuthentication;
 import io.prestosql.plugin.hive.metastore.Database;
-import io.prestosql.plugin.hive.metastore.PrincipalType;
 import io.prestosql.plugin.hive.metastore.file.FileHiveMetastore;
 import io.prestosql.plugin.tpch.TpchPlugin;
+import io.prestosql.spi.security.PrincipalType;
 import io.prestosql.testing.QueryRunner;
 import io.prestosql.tests.DistributedQueryRunner;
 import org.intellij.lang.annotations.Language;

diff --git a/presto-hive/src/test/java/io/prestosql/plugin/hive/metastore/TestRecordingHiveMetastore.java b/presto-hive/src/test/java/io/prestosql/plugin/hive/metastore/TestRecordingHiveMetastore.java
@@ -24,6 +24,7 @@
 import io.prestosql.plugin.hive.PartitionStatistics;
 import io.prestosql.plugin.hive.metastore.HivePrivilegeInfo.HivePrivilege;
 import io.prestosql.plugin.hive.metastore.SortingColumn.Order;
+import io.prestosql.spi.security.PrincipalType;
 import io.prestosql.spi.statistics.ColumnStatisticType;
 import io.prestosql.spi.type.Type;
 import org.testng.annotations.Test;

diff --git a/...hive/src/test/java/io/prestosql/plugin/hive/metastore/glue/TestGlueToPrestoConverter.java b/...hive/src/test/java/io/prestosql/plugin/hive/metastore/glue/TestGlueToPrestoConverter.java
@@ -20,9 +20,9 @@
 import com.google.common.collect.ImmutableList;
 import io.prestosql.plugin.hive.HiveBucketProperty;
 import io.prestosql.plugin.hive.metastore.Column;
-import io.prestosql.plugin.hive.metastore.PrincipalType;
 import io.prestosql.plugin.hive.metastore.Storage;
 import io.prestosql.plugin.hive.metastore.glue.converter.GlueToPrestoConverter;
+import io.prestosql.spi.security.PrincipalType;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 

diff --git a/...o-hive/src/test/java/io/prestosql/plugin/hive/metastore/glue/TestingMetastoreObjects.java b/...o-hive/src/test/java/io/prestosql/plugin/hive/metastore/glue/TestingMetastoreObjects.java
@@ -22,9 +22,9 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import io.prestosql.plugin.hive.HiveType;
-import io.prestosql.plugin.hive.metastore.PrincipalType;
 import io.prestosql.plugin.hive.metastore.Storage;
 import io.prestosql.plugin.hive.metastore.StorageFormat;
+import io.prestosql.spi.security.PrincipalType;
 import org.apache.hadoop.hive.metastore.TableType;
 
 import java.util.List;

diff --git a/.../plugin/hive/metastore/PrincipalType.java → ...prestosql/spi/security/PrincipalType.java b/.../plugin/hive/metastore/PrincipalType.java → ...prestosql/spi/security/PrincipalType.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.prestosql.plugin.hive.metastore;
+package io.prestosql.spi.security;
 
 public enum PrincipalType
 {