format code

sql/thriftserver/src/main/scala/org/apache/spark/sql/thriftserver/AbstractService.scala

@@ -32,7 +32,8 @@ import org.apache.spark.sql.thriftserver.Service._
  * @param name
  * service name
  */
-abstract class AbstractService(val name: String) extends Service with Logging {
+private[thriftserver] abstract class AbstractService(val name: String)
+  extends Service with Logging {
 
   /**
    * Service state: initially {@link STATE#NOTINITED}.

sql/thriftserver/src/main/scala/org/apache/spark/sql/thriftserver/CompositeService.scala

@@ -27,7 +27,9 @@ import org.apache.hadoop.hive.conf.HiveConf
 import org.apache.spark.internal.Logging
 import org.apache.spark.sql.thriftserver.Service.STOPPED
 
-class CompositeService(name: String) extends AbstractService(name) with Logging {
+private[thriftserver] class CompositeService(name: String)
+  extends AbstractService(name)
+  with Logging {
 
 
   private val serviceList: util.ArrayList[Service] = new util.ArrayList[Service]

sql/thriftserver/src/main/scala/org/apache/spark/sql/thriftserver/CookieSigner.scala

@@ -28,12 +28,12 @@ import org.apache.spark.internal.Logging
  * and appends it to the cookie value generated at the
  * server side. It uses SHA digest algorithm to sign and verify signatures.
  */
-object CookieSigner {
+private[thriftserver] object CookieSigner {
   private val SIGNATURE = "&s="
   private val SHA_STRING = "SHA"
 }
 
-class CookieSigner extends Logging {
+private[thriftserver] class CookieSigner extends Logging {
   private var secretBytes: Array[Byte] = null
 
   def this(secret: Array[Byte]) {

sql/thriftserver/src/main/scala/org/apache/spark/sql/thriftserver/Service.scala

@@ -20,7 +20,7 @@ package org.apache.spark.sql.thriftserver
 
 import org.apache.hadoop.hive.conf.HiveConf
 
-trait Service {
+private[thriftserver] trait Service {
   /**
    * Initialize the service.
    *
@@ -98,7 +98,7 @@ trait Service {
   def getStartTime: Long
 }
 
-object Service {
+private[thriftserver] object Service {
 
   trait STATE
 

sql/thriftserver/src/main/scala/org/apache/spark/sql/thriftserver/ServiceException.scala

@@ -18,7 +18,7 @@
 
 package org.apache.spark.sql.thriftserver
 
-class ServiceException(msg: String, cause: Throwable)
+private[thriftserver] class ServiceException(msg: String, cause: Throwable)
   extends RuntimeException(msg, cause) {
 
   def this(cause: Throwable) = this(null, cause)

sql/thriftserver/src/main/scala/org/apache/spark/sql/thriftserver/ServiceOperations.scala

@@ -22,7 +22,7 @@ import org.apache.hadoop.hive.conf.HiveConf
 import org.apache.spark.internal.Logging
 import org.apache.spark.sql.thriftserver.Service._
 
-object ServiceOperations extends Logging {
+private[thriftserver] object ServiceOperations extends Logging {
 
   /**
    * Verify that a service is in a given state.

sql/thriftserver/src/main/scala/org/apache/spark/sql/thriftserver/ServiceStateChangeListener.scala

@@ -22,7 +22,7 @@ package org.apache.spark.sql.thriftserver
  * ServiceStateChangeListener.
  *
  */
-trait ServiceStateChangeListener {
+private[thriftserver] trait ServiceStateChangeListener {
 
   /**
    * Callback to notify of a state change. The service will already

sql/thriftserver/src/main/scala/org/apache/spark/sql/thriftserver/ServiceUtils.scala

@@ -21,7 +21,7 @@ import java.io.{Closeable, IOException}
 
 import org.slf4j.Logger
 
-object ServiceUtils {
+private[thriftserver] object ServiceUtils {
 
   /*
    * Get the index separating the user name from domain name (the user's name up

sql/thriftserver/src/main/scala/org/apache/spark/sql/thriftserver/SparkThriftServer2.scala

@@ -39,7 +39,7 @@ import org.apache.spark.util.{ShutdownHookManager, Utils}
  * The main entry point for the Spark SQL port of HiveServer2.  Starts up a `SparkSQLContext` and a
  * `HiveThriftServer2` thrift server.
  */
-object SparkThriftServer2 extends Logging {
+private[thriftserver] object SparkThriftServer2 extends Logging {
   var uiTab: Option[ThriftServerTab] = None
   var listener: SparkThriftServerListener = _
 

sql/thriftserver/src/main/scala/org/apache/spark/sql/thriftserver/cli/CLIService.scala

@@ -37,11 +37,9 @@ import org.apache.spark.sql.thriftserver.cli.thrift._
 import org.apache.spark.sql.thriftserver.server.SparkThriftServer
 import org.apache.spark.sql.types.StructType
 
-class CLIService(hiveServer2: SparkThriftServer, sqlContext: SQLContext)
+private[thriftserver] class CLIService(hiveServer2: SparkThriftServer, sqlContext: SQLContext)
   extends CompositeService(classOf[CLIService].getSimpleName)
-    with ICLIService with Logging {
-
-  import CLIService._
+  with ICLIService with Logging {
 
   private var hiveConf: HiveConf = null
   private var sessionManager: SessionManager = null
@@ -100,23 +98,7 @@ class CLIService(hiveServer2: SparkThriftServer, sqlContext: SQLContext)
 
   def getHttpUGI: UserGroupInformation = this.httpUGI
 
-  def openSession(protocol: TProtocolVersion,
-                  username: String,
-                  password: String,
-                  configuration: Predef.Map[String, String]): SessionHandle = {
-    val sessionHandle: SessionHandle =
-      sessionManager.openSession(protocol,
-        username,
-        password,
-        null,
-        configuration,
-        false,
-        null)
-    logDebug(sessionHandle + ": openSession()")
-    sessionHandle
-  }
-
-  def openSession(protocol: TProtocolVersion,
+  override def openSession(protocol: TProtocolVersion,
                   username: String,
                   password: String,
                   ipAddress: String,
@@ -133,24 +115,7 @@ class CLIService(hiveServer2: SparkThriftServer, sqlContext: SQLContext)
     sessionHandle
   }
 
-  def openSessionWithImpersonation(protocol: TProtocolVersion,
-                                   username: String,
-                                   password: String,
-                                   configuration: Predef.Map[String, String],
-                                   delegationToken: String): SessionHandle = {
-    val sessionHandle =
-      sessionManager.openSession(protocol,
-        username,
-        password,
-        null,
-        configuration,
-        true,
-        delegationToken)
-    logDebug(sessionHandle + ": openSessionWithImpersonation()")
-    sessionHandle
-  }
-
-  def openSessionWithImpersonation(protocol: TProtocolVersion,
+  override def openSessionWithImpersonation(protocol: TProtocolVersion,
                                    username: String,
                                    password: String,
                                    ipAddress: String,
@@ -168,38 +133,6 @@ class CLIService(hiveServer2: SparkThriftServer, sqlContext: SQLContext)
     sessionHandle
   }
 
-  override def openSession(username: String,
-                           password: String,
-                           configuration: Predef.Map[String, String]): SessionHandle = {
-    val sessionHandle =
-      sessionManager.openSession(
-        SERVER_VERSION,
-        username,
-        password,
-        null,
-        configuration,
-        false,
-        null)
-    logDebug(sessionHandle + ": openSession()")
-    sessionHandle
-  }
-
-  override def openSessionWithImpersonation(username: String,
-                                            password: String,
-                                            configuration: Predef.Map[String, String],
-                                            delegationToken: String): SessionHandle = {
-    val sessionHandle =
-      sessionManager.openSession(SERVER_VERSION,
-        username,
-        password,
-        null,
-        configuration,
-        true,
-        delegationToken)
-    logDebug(sessionHandle + ": openSessionWithImpersonation()")
-    sessionHandle
-  }
-
   override def closeSession(sessionHandle: SessionHandle): Unit = {
     sessionManager.closeSession(sessionHandle)
     logDebug(sessionHandle + ": closeSession()")

sql/thriftserver/src/main/scala/org/apache/spark/sql/thriftserver/cli/ColumnBasedSet.scala

@@ -28,9 +28,10 @@ import org.apache.spark.sql.execution.HiveResult
 import org.apache.spark.sql.thriftserver.cli.thrift._
 import org.apache.spark.sql.types.{BinaryType, _}
 
-case class ColumnBasedSet(types: StructType,
-                          rows: ArrayBuffer[Row],
-                          initStartOffset: Long)
+private[thriftserver] case class ColumnBasedSet(
+    types: StructType,
+    rows: ArrayBuffer[Row],
+    initStartOffset: Long)
   extends RowSet {
 
   var startOffset: Long = initStartOffset

sql/thriftserver/src/main/scala/org/apache/spark/sql/thriftserver/cli/ColumnDescriptor.scala

@@ -24,7 +24,7 @@ import org.apache.spark.sql.types.StructField
  * A wrapper class for Spark's [[StructField]] with a column position,
  * and can be transform to [[TColumnDesc]]
  */
-case class ColumnDescriptor(field: StructField, pos: Int) {
+private[thriftserver] case class ColumnDescriptor(field: StructField, pos: Int) {
   /**
    * Transform a [[ColumnDescriptor]] to a [[TColumnDesc]] instance.
    */

sql/thriftserver/src/main/scala/org/apache/spark/sql/thriftserver/cli/FetchOrientation.scala

@@ -19,11 +19,11 @@ package org.apache.spark.sql.thriftserver.cli
 
 import org.apache.spark.sql.thriftserver.cli.thrift.TFetchOrientation
 
-trait FetchOrientation {
+private[thriftserver] trait FetchOrientation {
   def toTFetchOrientation: TFetchOrientation
 }
 
-object FetchOrientation {
+private[thriftserver] object FetchOrientation {
 
   case object FETCH_NEXT extends FetchOrientation {
     override val toTFetchOrientation: TFetchOrientation = TFetchOrientation.FETCH_NEXT

sql/thriftserver/src/main/scala/org/apache/spark/sql/thriftserver/cli/FetchType.scala

@@ -17,11 +17,11 @@
 
 package org.apache.spark.sql.thriftserver.cli
 
-trait FetchType {
+private[thriftserver] trait FetchType {
   def toTFetchType: Short
 }
 
-object FetchType {
+private[thriftserver] object FetchType {
 
   case object QUERY_OUTPUT extends FetchType {
     override val toTFetchType: Short = 0

sql/thriftserver/src/main/scala/org/apache/spark/sql/thriftserver/cli/Handle.scala

@@ -20,7 +20,7 @@ package org.apache.spark.sql.thriftserver.cli
 import org.apache.spark.sql.thriftserver.cli.thrift.THandleIdentifier
 
 
-abstract class Handle(val handleId: HandleIdentifier) {
+private[thriftserver] abstract class Handle(val handleId: HandleIdentifier) {
   def this() = this(new HandleIdentifier())
 
   def this(tHandleIdentifier: THandleIdentifier) = this(new HandleIdentifier(tHandleIdentifier))

sql/thriftserver/src/main/scala/org/apache/spark/sql/thriftserver/cli/HandleIdentifier.scala

@@ -22,7 +22,7 @@ import java.util.UUID
 
 import org.apache.spark.sql.thriftserver.cli.thrift.THandleIdentifier
 
-class HandleIdentifier(val publicId: UUID, val secretId: UUID) {
+private[thriftserver] class HandleIdentifier(val publicId: UUID, val secretId: UUID) {
 
   def this() = this(UUID.randomUUID(), UUID.randomUUID())
 

sql/thriftserver/src/main/scala/org/apache/spark/sql/thriftserver/cli/ICLIService.scala

@@ -18,20 +18,24 @@
 package org.apache.spark.sql.thriftserver.cli
 
 import org.apache.spark.sql.thriftserver.auth.HiveAuthFactory
-import org.apache.spark.sql.thriftserver.cli.thrift.{TGetQueryIdReq, TGetQueryIdResp, TSetClientInfoReq, TSetClientInfoResp}
+import org.apache.spark.sql.thriftserver.cli.thrift._
 import org.apache.spark.sql.types.StructType
 
 
-trait ICLIService {
+private[thriftserver] trait ICLIService {
 
   @throws[SparkThriftServerSQLException]
-  def openSession(username: String,
+  def openSession(protocol: TProtocolVersion,
+                  username: String,
                   password: String,
+                  ipAddress: String,
                   configuration: Map[String, String]): SessionHandle
 
   @throws[SparkThriftServerSQLException]
-  def openSessionWithImpersonation(username: String,
+  def openSessionWithImpersonation(protocol: TProtocolVersion,
+                                   username: String,
                                    password: String,
+                                   ipAddress: String,
                                    configuration: Map[String, String],
                                    delegationToken: String): SessionHandle
 

sql/thriftserver/src/main/scala/org/apache/spark/sql/thriftserver/cli/OperationHandle.scala

@@ -19,9 +19,10 @@ package org.apache.spark.sql.thriftserver.cli
 
 import org.apache.spark.sql.thriftserver.cli.thrift.{TOperationHandle, TProtocolVersion}
 
-class OperationHandle private(val opType: OperationType,
-                              protocol: TProtocolVersion,
-                              handleId: HandleIdentifier) extends Handle(handleId) {
+private[thriftserver] class OperationHandle private(
+    val opType: OperationType,
+    protocol: TProtocolVersion,
+    handleId: HandleIdentifier) extends Handle(handleId) {
 
   private[this] var hasResultSet: Boolean = false