Browse Source

[livy] Minor cleanup

Erick Tryzelaar 10 years ago
parent
commit
875c604492

+ 3 - 4
apps/spark/java/livy-core/src/main/scala/com/cloudera/hue/livy/sessions/SessionManager.scala

@@ -27,21 +27,20 @@ import scala.collection.mutable
 import scala.concurrent.{ExecutionContext, Future}
 
 object SessionManager {
-  val LIVY_SERVER_SESSION_TIMEOUT = "livy.server.session.timeout"
+  val SESSION_TIMEOUT = "livy.server.session.timeout"
 }
 
 class SessionManager[S <: Session](livyConf: LivyConf, factory: SessionFactory[S])
   extends Logging {
 
-  import SessionManager._
-
   private implicit def executor: ExecutionContext = ExecutionContext.global
 
   private[this] final val _idCounter = new AtomicInteger()
   private[this] final val _sessions = mutable.Map[Int, S]()
 
-  private[this] final val sessionTimeout = livyConf.getInt(LIVY_SERVER_SESSION_TIMEOUT, 1000 * 60 * 60)
+  private[this] final val sessionTimeout = livyConf.getInt(SessionManager.SESSION_TIMEOUT, 1000 * 60 * 60)
   private[this] final val garbageCollector = new GarbageCollector
+
   garbageCollector.setDaemon(true)
   garbageCollector.start()
 

+ 1 - 1
apps/spark/java/livy-core/src/test/scala/com/cloudera/hue/livy/sessions/SessionManagerSpec.scala

@@ -41,7 +41,7 @@ class SessionManagerSpec extends FlatSpec with Matchers {
 
   it should "garbage collect old sessions" in {
     val livyConf = new LivyConf()
-    livyConf.set(SessionManager.LIVY_SERVER_SESSION_TIMEOUT, "100")
+    livyConf.set(SessionManager.SESSION_TIMEOUT, "100")
     val manager = new SessionManager(livyConf, new MockSessionFactory)
     val session = manager.create(JNothing)
     manager.get(session.id).isDefined should be(true)

+ 0 - 1
apps/spark/java/livy-spark/src/main/scala/com/cloudera/hue/livy/spark/batch/CreateBatchRequest.scala

@@ -34,4 +34,3 @@ case class CreateBatchRequest(
     archives: List[String] = List(),
     queue: Option[String] = None,
     name: Option[String] = None)
-

+ 0 - 1
apps/spark/java/pom.xml

@@ -50,7 +50,6 @@
     <properties>
         <commons-codec.version>1.9</commons-codec.version>
         <dispatch.version>0.11.2</dispatch.version>
-        <guava.version>11.0.2</guava.version>
         <httpclient.version>4.5</httpclient.version>
         <httpcore.version>4.4.1</httpcore.version>
         <jackson.version>2.2.3</jackson.version>