This is an automated email from the ASF dual-hosted git repository.
liuxun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/submarine.git
The following commit(s) were added to refs/heads/master by this push:
new 71ef07d SUBMARINE-435. Improve scala style check for import grouping
71ef07d is described below
commit 71ef07de51b01a4b6896b2aa0db05fb071eaf145
Author: Kent Yao <[email protected]>
AuthorDate: Tue Mar 17 22:31:51 2020 +0800
SUBMARINE-435. Improve scala style check for import grouping
### What is this PR for?
grouping imports in four group java, scala, others, submarine for easier
code maintenance
### What type of PR is it?
Improvement
### Todos
* [ ] - Task
### What is the Jira issue?
* Open an issue on Jira https://issues.apache.org/jira/browse/SUBMARINE-435
### How should this be tested?
pass style check
### Screenshots (if appropriate)
### Questions:
* Does the licenses files need update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? No
Author: Kent Yao <[email protected]>
Closes #234 from yaooqinn/UBMARINE-435 and squashes the following commits:
01c1208 [Kent Yao] SUBMARINE-435. Improve scala style check for import
grouping
---
dev-support/maven-config/scalastyle-config.xml | 3 ++-
.../optimizer/SubmarineConfigurationCheckExtension.scala | 1 +
.../catalyst/optimizer/SubmarineDataMaskingExtension.scala | 1 +
.../sql/catalyst/optimizer/SubmarineRowFilterExtension.scala | 4 ++--
.../sql/catalyst/optimizer/SubmarineSparkOptimizer.scala | 2 +-
.../SubmarineSparkRangerAuthorizationExtension.scala | 9 +++++----
.../spark/sql/execution/SubmarineShowDatabasesCommand.scala | 1 +
.../spark/sql/execution/SubmarineShowTablesCommand.scala | 1 +
.../submarine/spark/security/RangerSparkAccessRequest.scala | 1 +
.../submarine/spark/security/RangerSparkAuthorizer.scala | 11 ++++++-----
.../spark/security/api/RangerSparkAuthzExtension.scala | 1 +
.../spark/security/api/RangerSparkSQLExtension.scala | 1 +
.../optimizer/SubmarineConfigurationCheckExtensionTest.scala | 3 ++-
.../optimizer/SubmarineDataMaskingExtensionTest.scala | 2 +-
.../catalyst/optimizer/SubmarineRowFilterExtensionTest.scala | 2 +-
.../sql/catalyst/optimizer/SubmarineSparkOptimizerTest.scala | 2 +-
.../SubmarineSparkRangerAuthorizationExtensionTest.scala | 5 +++--
.../apache/submarine/spark/security/RowFilterSQLTest.scala | 4 ++--
.../scala/org/apache/submarine/spark/security/TPCDSTest.scala | 2 +-
19 files changed, 34 insertions(+), 22 deletions(-)
diff --git a/dev-support/maven-config/scalastyle-config.xml
b/dev-support/maven-config/scalastyle-config.xml
index 3eda046..0deecf9 100644
--- a/dev-support/maven-config/scalastyle-config.xml
+++ b/dev-support/maven-config/scalastyle-config.xml
@@ -188,7 +188,8 @@
<parameter name="group.java">javax?\..*</parameter>
<parameter name="group.scala">scala\..*</parameter>
<parameter
name="group.3rdParty">(?!org\.apache\.submarine\.).*</parameter>
- <parameter
name="group.spark">org\.apache\.submarine\..*</parameter>
+ <parameter
name="group.submarine">org\.apache\.submarine\..*</parameter>
+ <parameter name="lexicographic">false</parameter>
</parameters>
</check>
diff --git
a/submarine-security/spark-security/src/main/scala/org/apache/spark/sql/catalyst/optimizer/SubmarineConfigurationCheckExtension.scala
b/submarine-security/spark-security/src/main/scala/org/apache/spark/sql/catalyst/optimizer/SubmarineConfigurationCheckExtension.scala
index 7bd6d89..44e94ec 100644
---
a/submarine-security/spark-security/src/main/scala/org/apache/spark/sql/catalyst/optimizer/SubmarineConfigurationCheckExtension.scala
+++
b/submarine-security/spark-security/src/main/scala/org/apache/spark/sql/catalyst/optimizer/SubmarineConfigurationCheckExtension.scala
@@ -22,6 +22,7 @@ package org.apache.spark.sql.catalyst.optimizer
import org.apache.spark.sql.SparkSession
import org.apache.spark.sql.catalyst.plans.logical.LogicalPlan
import org.apache.spark.sql.execution.command.SetCommand
+
import org.apache.submarine.spark.security.SparkAccessControlException
/**
diff --git
a/submarine-security/spark-security/src/main/scala/org/apache/spark/sql/catalyst/optimizer/SubmarineDataMaskingExtension.scala
b/submarine-security/spark-security/src/main/scala/org/apache/spark/sql/catalyst/optimizer/SubmarineDataMaskingExtension.scala
index a829eae..2713f8d 100644
---
a/submarine-security/spark-security/src/main/scala/org/apache/spark/sql/catalyst/optimizer/SubmarineDataMaskingExtension.scala
+++
b/submarine-security/spark-security/src/main/scala/org/apache/spark/sql/catalyst/optimizer/SubmarineDataMaskingExtension.scala
@@ -34,6 +34,7 @@ import org.apache.spark.sql.catalyst.rules.Rule
import
org.apache.spark.sql.execution.command.{CreateDataSourceTableAsSelectCommand,
CreateViewCommand, InsertIntoDataSourceDirCommand}
import
org.apache.spark.sql.execution.datasources.{InsertIntoDataSourceCommand,
InsertIntoHadoopFsRelationCommand, LogicalRelation, SaveIntoDataSourceCommand}
import org.apache.spark.sql.hive.execution.{CreateHiveTableAsSelectCommand,
InsertIntoHiveDirCommand, InsertIntoHiveTable}
+
import org.apache.submarine.spark.security._
import org.apache.submarine.spark.security.SparkObjectType.COLUMN
diff --git
a/submarine-security/spark-security/src/main/scala/org/apache/spark/sql/catalyst/optimizer/SubmarineRowFilterExtension.scala
b/submarine-security/spark-security/src/main/scala/org/apache/spark/sql/catalyst/optimizer/SubmarineRowFilterExtension.scala
index e5d3167..18f9520 100644
---
a/submarine-security/spark-security/src/main/scala/org/apache/spark/sql/catalyst/optimizer/SubmarineRowFilterExtension.scala
+++
b/submarine-security/spark-security/src/main/scala/org/apache/spark/sql/catalyst/optimizer/SubmarineRowFilterExtension.scala
@@ -22,12 +22,12 @@ package org.apache.spark.sql.catalyst.optimizer
import org.apache.commons.lang3.StringUtils
import org.apache.hadoop.security.UserGroupInformation
import org.apache.ranger.plugin.policyengine.RangerAccessResult
-import org.apache.spark.sql.catalyst.expressions.SubqueryExpression
+import org.apache.spark.sql.AuthzUtils.getFieldVal
import org.apache.spark.sql.SparkSession
import org.apache.spark.sql.catalyst.catalog.CatalogTable
+import org.apache.spark.sql.catalyst.expressions.SubqueryExpression
import org.apache.spark.sql.catalyst.plans.logical._
import org.apache.spark.sql.catalyst.rules.Rule
-import org.apache.spark.sql.AuthzUtils.getFieldVal
import
org.apache.spark.sql.execution.command.{CreateDataSourceTableAsSelectCommand,
CreateViewCommand, InsertIntoDataSourceDirCommand}
import
org.apache.spark.sql.execution.datasources.{InsertIntoDataSourceCommand,
InsertIntoHadoopFsRelationCommand, LogicalRelation, SaveIntoDataSourceCommand}
import org.apache.spark.sql.hive.execution.{CreateHiveTableAsSelectCommand,
InsertIntoHiveDirCommand, InsertIntoHiveTable}
diff --git
a/submarine-security/spark-security/src/main/scala/org/apache/spark/sql/catalyst/optimizer/SubmarineSparkOptimizer.scala
b/submarine-security/spark-security/src/main/scala/org/apache/spark/sql/catalyst/optimizer/SubmarineSparkOptimizer.scala
index 1f675fc..36811ce 100644
---
a/submarine-security/spark-security/src/main/scala/org/apache/spark/sql/catalyst/optimizer/SubmarineSparkOptimizer.scala
+++
b/submarine-security/spark-security/src/main/scala/org/apache/spark/sql/catalyst/optimizer/SubmarineSparkOptimizer.scala
@@ -19,9 +19,9 @@
package org.apache.spark.sql.catalyst.optimizer
+import org.apache.spark.sql.SparkSession
import org.apache.spark.sql.catalyst.plans.logical.LogicalPlan
import org.apache.spark.sql.catalyst.rules.RuleExecutor
-import org.apache.spark.sql.SparkSession
/**
* An Optimizer without all `spark.sql.extensions`
diff --git
a/submarine-security/spark-security/src/main/scala/org/apache/spark/sql/catalyst/optimizer/SubmarineSparkRangerAuthorizationExtension.scala
b/submarine-security/spark-security/src/main/scala/org/apache/spark/sql/catalyst/optimizer/SubmarineSparkRangerAuthorizationExtension.scala
index b28b7f1..22fe1e6 100644
---
a/submarine-security/spark-security/src/main/scala/org/apache/spark/sql/catalyst/optimizer/SubmarineSparkRangerAuthorizationExtension.scala
+++
b/submarine-security/spark-security/src/main/scala/org/apache/spark/sql/catalyst/optimizer/SubmarineSparkRangerAuthorizationExtension.scala
@@ -20,14 +20,15 @@
package org.apache.spark.sql.catalyst.optimizer
import org.apache.commons.logging.LogFactory
-import org.apache.spark.sql.hive.execution.CreateHiveTableAsSelectCommand
-import org.apache.spark.sql.hive.PrivilegesBuilder
import org.apache.spark.sql.SparkSession
import org.apache.spark.sql.catalyst.plans.logical.{Command, LogicalPlan}
import org.apache.spark.sql.catalyst.rules.Rule
-import org.apache.spark.sql.execution.command.{AlterDatabasePropertiesCommand,
AlterTableAddPartitionCommand, AlterTableDropPartitionCommand,
AlterTableRecoverPartitionsCommand, AlterTableRenameCommand,
AlterTableRenamePartitionCommand, AlterTableSerDePropertiesCommand,
AlterTableSetLocationCommand, AlterTableSetPropertiesCommand,
AlterTableUnsetPropertiesCommand, AlterViewAsCommand, AnalyzeColumnCommand,
AnalyzeTableCommand, CacheTableCommand, CreateDatabaseCommand,
CreateDataSourceTabl [...]
-import org.apache.spark.sql.execution.datasources.{CreateTempViewUsing,
InsertIntoDataSourceCommand, InsertIntoHadoopFsRelationCommand}
import org.apache.spark.sql.execution.{SubmarineShowDatabasesCommand,
SubmarineShowTablesCommand}
+import org.apache.spark.sql.execution.command._
+import org.apache.spark.sql.execution.datasources.{CreateTempViewUsing,
InsertIntoDataSourceCommand, InsertIntoHadoopFsRelationCommand}
+import org.apache.spark.sql.hive.PrivilegesBuilder
+import org.apache.spark.sql.hive.execution.CreateHiveTableAsSelectCommand
+
import org.apache.submarine.spark.security.{RangerSparkAuthorizer,
SparkAccessControlException}
/**
diff --git
a/submarine-security/spark-security/src/main/scala/org/apache/spark/sql/execution/SubmarineShowDatabasesCommand.scala
b/submarine-security/spark-security/src/main/scala/org/apache/spark/sql/execution/SubmarineShowDatabasesCommand.scala
index aaad6b4..d74c180 100644
---
a/submarine-security/spark-security/src/main/scala/org/apache/spark/sql/execution/SubmarineShowDatabasesCommand.scala
+++
b/submarine-security/spark-security/src/main/scala/org/apache/spark/sql/execution/SubmarineShowDatabasesCommand.scala
@@ -21,6 +21,7 @@ package org.apache.spark.sql.execution
import org.apache.spark.sql.{Row, SparkSession}
import org.apache.spark.sql.execution.command.{RunnableCommand,
ShowDatabasesCommand}
+
import org.apache.submarine.spark.security.{RangerSparkAuthorizer,
SparkPrivilegeObject, SparkPrivilegeObjectType}
case class SubmarineShowDatabasesCommand(child: ShowDatabasesCommand) extends
RunnableCommand {
diff --git
a/submarine-security/spark-security/src/main/scala/org/apache/spark/sql/execution/SubmarineShowTablesCommand.scala
b/submarine-security/spark-security/src/main/scala/org/apache/spark/sql/execution/SubmarineShowTablesCommand.scala
index c2da431..b32e132 100644
---
a/submarine-security/spark-security/src/main/scala/org/apache/spark/sql/execution/SubmarineShowTablesCommand.scala
+++
b/submarine-security/spark-security/src/main/scala/org/apache/spark/sql/execution/SubmarineShowTablesCommand.scala
@@ -22,6 +22,7 @@ package org.apache.spark.sql.execution
import org.apache.spark.sql.{Row, SparkSession}
import org.apache.spark.sql.catalyst.expressions.Attribute
import org.apache.spark.sql.execution.command.{RunnableCommand,
ShowTablesCommand}
+
import org.apache.submarine.spark.security.{RangerSparkAuthorizer,
SparkPrivilegeObject, SparkPrivilegeObjectType}
case class SubmarineShowTablesCommand(child: ShowTablesCommand) extends
RunnableCommand {
diff --git
a/submarine-security/spark-security/src/main/scala/org/apache/submarine/spark/security/RangerSparkAccessRequest.scala
b/submarine-security/spark-security/src/main/scala/org/apache/submarine/spark/security/RangerSparkAccessRequest.scala
index 3b6bc04..c9383b1 100644
---
a/submarine-security/spark-security/src/main/scala/org/apache/submarine/spark/security/RangerSparkAccessRequest.scala
+++
b/submarine-security/spark-security/src/main/scala/org/apache/submarine/spark/security/RangerSparkAccessRequest.scala
@@ -25,6 +25,7 @@ import scala.collection.JavaConverters._
import org.apache.ranger.plugin.policyengine.{RangerAccessRequestImpl,
RangerPolicyEngine}
import org.apache.ranger.plugin.util.RangerAccessRequestUtil
+
import org.apache.submarine.spark.security.SparkAccessType.SparkAccessType
class RangerSparkAccessRequest private extends RangerAccessRequestImpl {
diff --git
a/submarine-security/spark-security/src/main/scala/org/apache/submarine/spark/security/RangerSparkAuthorizer.scala
b/submarine-security/spark-security/src/main/scala/org/apache/submarine/spark/security/RangerSparkAuthorizer.scala
index eba8077..45c1633 100644
---
a/submarine-security/spark-security/src/main/scala/org/apache/submarine/spark/security/RangerSparkAuthorizer.scala
+++
b/submarine-security/spark-security/src/main/scala/org/apache/submarine/spark/security/RangerSparkAuthorizer.scala
@@ -19,7 +19,7 @@
package org.apache.submarine.spark.security
-import java.util.{Locale, List => JList}
+import java.util.{List => JList, Locale}
import scala.collection.JavaConverters._
import scala.collection.mutable.ArrayBuffer
@@ -27,8 +27,8 @@ import scala.collection.mutable.ArrayBuffer
import org.apache.commons.lang3.StringUtils
import org.apache.commons.logging.LogFactory
import org.apache.hadoop.conf.Configuration
-import org.apache.hadoop.fs.permission.FsAction
import org.apache.hadoop.fs.{FileSystem, Path}
+import org.apache.hadoop.fs.permission.FsAction
import org.apache.hadoop.hive.common.FileUtils
import
org.apache.hadoop.hive.ql.security.authorization.plugin.HiveAccessControlException
import org.apache.hadoop.security.UserGroupInformation
@@ -36,6 +36,7 @@ import org.apache.ranger.authorization.utils.StringUtil
import org.apache.ranger.plugin.policyengine.RangerAccessRequest
import org.apache.ranger.plugin.util.RangerPerfTracer
import org.apache.spark.sql.SparkSession
+
import org.apache.submarine.spark.security.SparkAccessType.SparkAccessType
import org.apache.submarine.spark.security.SparkObjectType.SparkObjectType
import
org.apache.submarine.spark.security.SparkOperationType.SparkOperationType
@@ -192,7 +193,7 @@ object RangerSparkAuthorizer {
case SparkPrivObjectActionType.INSERT |
SparkPrivObjectActionType.INSERT_OVERWRITE =>
SparkAccessType.UPDATE
case SparkPrivObjectActionType.OTHER =>
- import SparkOperationType._
+ import org.apache.submarine.spark.security.SparkOperationType._
opType match {
case CREATEDATABASE if obj.getType ==
SparkPrivilegeObjectType.DATABASE =>
SparkAccessType.CREATE
@@ -243,7 +244,7 @@ object RangerSparkAuthorizer {
private def getSparkResource(
obj: SparkPrivilegeObject,
opType: SparkOperationType): RangerSparkResource = {
- import SparkObjectType._
+ import org.apache.submarine.spark.security.SparkObjectType._
val objectType = getObjectType(obj, opType)
val resource = objectType match {
case DATABASE => RangerSparkResource(objectType, Option(obj.getDbname))
@@ -285,7 +286,7 @@ object RangerSparkAuthorizer {
}
private def getURIAccessType(operationType: SparkOperationType): FsAction = {
- import SparkOperationType._
+ import org.apache.submarine.spark.security.SparkOperationType._
operationType match {
case LOAD => FsAction.READ
diff --git
a/submarine-security/spark-security/src/main/scala/org/apache/submarine/spark/security/api/RangerSparkAuthzExtension.scala
b/submarine-security/spark-security/src/main/scala/org/apache/submarine/spark/security/api/RangerSparkAuthzExtension.scala
index 42b4b7e..5d0b34c 100644
---
a/submarine-security/spark-security/src/main/scala/org/apache/submarine/spark/security/api/RangerSparkAuthzExtension.scala
+++
b/submarine-security/spark-security/src/main/scala/org/apache/submarine/spark/security/api/RangerSparkAuthzExtension.scala
@@ -21,6 +21,7 @@ package org.apache.submarine.spark.security.api
import org.apache.spark.sql.SparkSessionExtensions
import
org.apache.spark.sql.catalyst.optimizer.{SubmarineConfigurationCheckExtension,
SubmarineSparkRangerAuthorizationExtension}
+
import org.apache.submarine.spark.security.Extensions
/**
diff --git
a/submarine-security/spark-security/src/main/scala/org/apache/submarine/spark/security/api/RangerSparkSQLExtension.scala
b/submarine-security/spark-security/src/main/scala/org/apache/submarine/spark/security/api/RangerSparkSQLExtension.scala
index 25cd7d9..681a169 100644
---
a/submarine-security/spark-security/src/main/scala/org/apache/submarine/spark/security/api/RangerSparkSQLExtension.scala
+++
b/submarine-security/spark-security/src/main/scala/org/apache/submarine/spark/security/api/RangerSparkSQLExtension.scala
@@ -22,6 +22,7 @@ package org.apache.submarine.spark.security.api
import org.apache.spark.sql.SparkSessionExtensions
import
org.apache.spark.sql.catalyst.optimizer.{SubmarineConfigurationCheckExtension,
SubmarineDataMaskingExtension, SubmarineRowFilterExtension,
SubmarineSparkRangerAuthorizationExtension}
import org.apache.spark.sql.execution.SubmarineSparkPlanOmitStrategy
+
import org.apache.submarine.spark.security.Extensions
/**
diff --git
a/submarine-security/spark-security/src/test/scala/org/apache/spark/sql/catalyst/optimizer/SubmarineConfigurationCheckExtensionTest.scala
b/submarine-security/spark-security/src/test/scala/org/apache/spark/sql/catalyst/optimizer/SubmarineConfigurationCheckExtensionTest.scala
index 877c223..5fd651d 100644
---
a/submarine-security/spark-security/src/test/scala/org/apache/spark/sql/catalyst/optimizer/SubmarineConfigurationCheckExtensionTest.scala
+++
b/submarine-security/spark-security/src/test/scala/org/apache/spark/sql/catalyst/optimizer/SubmarineConfigurationCheckExtensionTest.scala
@@ -20,9 +20,10 @@
package org.apache.spark.sql.catalyst.optimizer
import org.apache.spark.sql.hive.test.TestHive
-import org.apache.submarine.spark.security.SparkAccessControlException
import org.scalatest.{BeforeAndAfterAll, FunSuite}
+import org.apache.submarine.spark.security.SparkAccessControlException
+
class SubmarineConfigurationCheckExtensionTest extends FunSuite with
BeforeAndAfterAll{
private val spark = TestHive.sparkSession.newSession()
diff --git
a/submarine-security/spark-security/src/test/scala/org/apache/spark/sql/catalyst/optimizer/SubmarineDataMaskingExtensionTest.scala
b/submarine-security/spark-security/src/test/scala/org/apache/spark/sql/catalyst/optimizer/SubmarineDataMaskingExtensionTest.scala
index 1887934..13e2699 100644
---
a/submarine-security/spark-security/src/test/scala/org/apache/spark/sql/catalyst/optimizer/SubmarineDataMaskingExtensionTest.scala
+++
b/submarine-security/spark-security/src/test/scala/org/apache/spark/sql/catalyst/optimizer/SubmarineDataMaskingExtensionTest.scala
@@ -19,8 +19,8 @@
package org.apache.spark.sql.catalyst.optimizer
-import org.apache.spark.sql.catalyst.plans.logical.{Project,
SubmarineDataMasking}
import org.apache.spark.sql.SubmarineSparkUtils
+import org.apache.spark.sql.catalyst.plans.logical.{Project,
SubmarineDataMasking}
import org.apache.spark.sql.hive.test.TestHive
import org.scalatest.{BeforeAndAfterAll, FunSuite}
diff --git
a/submarine-security/spark-security/src/test/scala/org/apache/spark/sql/catalyst/optimizer/SubmarineRowFilterExtensionTest.scala
b/submarine-security/spark-security/src/test/scala/org/apache/spark/sql/catalyst/optimizer/SubmarineRowFilterExtensionTest.scala
index 907d9ee..f8fb113 100644
---
a/submarine-security/spark-security/src/test/scala/org/apache/spark/sql/catalyst/optimizer/SubmarineRowFilterExtensionTest.scala
+++
b/submarine-security/spark-security/src/test/scala/org/apache/spark/sql/catalyst/optimizer/SubmarineRowFilterExtensionTest.scala
@@ -19,9 +19,9 @@
package org.apache.spark.sql.catalyst.optimizer
+import org.apache.spark.sql.SubmarineSparkUtils
import org.apache.spark.sql.catalyst.plans.logical.{Filter, SubmarineRowFilter}
import org.apache.spark.sql.hive.test.TestHive
-import org.apache.spark.sql.SubmarineSparkUtils
import org.scalatest.{BeforeAndAfterAll, FunSuite}
class SubmarineRowFilterExtensionTest extends FunSuite with BeforeAndAfterAll {
diff --git
a/submarine-security/spark-security/src/test/scala/org/apache/spark/sql/catalyst/optimizer/SubmarineSparkOptimizerTest.scala
b/submarine-security/spark-security/src/test/scala/org/apache/spark/sql/catalyst/optimizer/SubmarineSparkOptimizerTest.scala
index 91b7c61..6014a34 100644
---
a/submarine-security/spark-security/src/test/scala/org/apache/spark/sql/catalyst/optimizer/SubmarineSparkOptimizerTest.scala
+++
b/submarine-security/spark-security/src/test/scala/org/apache/spark/sql/catalyst/optimizer/SubmarineSparkOptimizerTest.scala
@@ -19,10 +19,10 @@
package org.apache.spark.sql.catalyst.optimizer
-import org.apache.spark.sql.hive.test.TestHive
import org.apache.spark.sql.SubmarineSparkUtils
import org.apache.spark.sql.execution.SubmarineShowTablesCommand
import org.apache.spark.sql.execution.command.ShowTablesCommand
+import org.apache.spark.sql.hive.test.TestHive
import org.scalatest.{BeforeAndAfterAll, FunSuite}
class SubmarineSparkOptimizerTest extends FunSuite with BeforeAndAfterAll {
diff --git
a/submarine-security/spark-security/src/test/scala/org/apache/spark/sql/catalyst/optimizer/SubmarineSparkRangerAuthorizationExtensionTest.scala
b/submarine-security/spark-security/src/test/scala/org/apache/spark/sql/catalyst/optimizer/SubmarineSparkRangerAuthorizationExtensionTest.scala
index a3a0785..92b9ca4 100644
---
a/submarine-security/spark-security/src/test/scala/org/apache/spark/sql/catalyst/optimizer/SubmarineSparkRangerAuthorizationExtensionTest.scala
+++
b/submarine-security/spark-security/src/test/scala/org/apache/spark/sql/catalyst/optimizer/SubmarineSparkRangerAuthorizationExtensionTest.scala
@@ -19,10 +19,11 @@
package org.apache.spark.sql.catalyst.optimizer
-import org.scalatest.{BeforeAndAfterAll, FunSuite}
-import org.apache.spark.sql.execution.command.{CreateDatabaseCommand,
ShowDatabasesCommand, ShowTablesCommand}
import org.apache.spark.sql.execution.{SubmarineShowDatabasesCommand,
SubmarineShowTablesCommand}
+import org.apache.spark.sql.execution.command.{CreateDatabaseCommand,
ShowDatabasesCommand, ShowTablesCommand}
import org.apache.spark.sql.hive.test.TestHive
+import org.scalatest.{BeforeAndAfterAll, FunSuite}
+
import org.apache.submarine.spark.security.SparkAccessControlException
class SubmarineSparkRangerAuthorizationExtensionTest extends FunSuite with
BeforeAndAfterAll {
diff --git
a/submarine-security/spark-security/src/test/scala/org/apache/submarine/spark/security/RowFilterSQLTest.scala
b/submarine-security/spark-security/src/test/scala/org/apache/submarine/spark/security/RowFilterSQLTest.scala
index ace0f4e..bd3a2ad 100644
---
a/submarine-security/spark-security/src/test/scala/org/apache/submarine/spark/security/RowFilterSQLTest.scala
+++
b/submarine-security/spark-security/src/test/scala/org/apache/submarine/spark/security/RowFilterSQLTest.scala
@@ -19,9 +19,9 @@
package org.apache.submarine.spark.security
-import org.apache.spark.sql.hive.test.TestHive
import org.apache.spark.sql.SubmarineSparkUtils._
-import org.apache.spark.sql.catalyst.plans.logical.{Project,
SubmarineRowFilter}
+import org.apache.spark.sql.catalyst.plans.logical.SubmarineRowFilter
+import org.apache.spark.sql.hive.test.TestHive
import org.scalatest.{BeforeAndAfterAll, FunSuite}
class RowFilterSQLTest extends FunSuite with BeforeAndAfterAll {
diff --git
a/submarine-security/spark-security/src/test/scala/org/apache/submarine/spark/security/TPCDSTest.scala
b/submarine-security/spark-security/src/test/scala/org/apache/submarine/spark/security/TPCDSTest.scala
index 28db217..13a7d64 100644
---
a/submarine-security/spark-security/src/test/scala/org/apache/submarine/spark/security/TPCDSTest.scala
+++
b/submarine-security/spark-security/src/test/scala/org/apache/submarine/spark/security/TPCDSTest.scala
@@ -19,13 +19,13 @@
package org.apache.submarine.spark.security
+import org.apache.spark.sql.SubmarineSparkUtils
import org.apache.spark.sql.catalyst.expressions.codegen.{CodeFormatter,
CodeGenerator}
import org.apache.spark.sql.catalyst.plans.logical.{SubmarineDataMasking,
SubmarineRowFilter}
import org.apache.spark.sql.catalyst.util.resourceToString
import org.apache.spark.sql.execution.{SparkPlan, WholeStageCodegenExec}
import org.apache.spark.sql.hive.test.TestHive
import org.apache.spark.sql.internal.SQLConf
-import org.apache.spark.sql.SubmarineSparkUtils
import org.scalatest.{BeforeAndAfterAll, FunSuite}
class TPCDSTest extends FunSuite with BeforeAndAfterAll {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
