Forráskód Böngészése

[livy] Clean up session code

Erick Tryzelaar 10 éve
szülő
commit
71eeefb

+ 2 - 1
apps/spark/java/livy-server/src/main/scala/com/cloudera/hue/livy/server/WebApp.scala

@@ -2,7 +2,8 @@ package com.cloudera.hue.livy.server
 
 import com.cloudera.hue.livy.Logging
 import com.cloudera.hue.livy.msgs.ExecuteRequest
-import com.cloudera.hue.livy.server.sessions.{SessionFailedToStart, Session}
+import com.cloudera.hue.livy.server.sessions.Session
+import com.cloudera.hue.livy.server.sessions.Session.SessionFailedToStart
 import com.fasterxml.jackson.core.JsonParseException
 import org.json4s.{DefaultFormats, Formats, MappingException}
 import org.scalatra._

+ 1 - 0
apps/spark/java/livy-server/src/main/scala/com/cloudera/hue/livy/server/sessions/ProcessSession.scala

@@ -3,6 +3,7 @@ package com.cloudera.hue.livy.server.sessions
 import java.lang.ProcessBuilder.Redirect
 
 import com.cloudera.hue.livy.Logging
+import com.cloudera.hue.livy.server.sessions.Session.SessionFailedToStart
 
 import scala.annotation.tailrec
 import scala.concurrent.Future

+ 14 - 9
apps/spark/java/livy-server/src/main/scala/com/cloudera/hue/livy/server/sessions/session.scala → apps/spark/java/livy-server/src/main/scala/com/cloudera/hue/livy/server/sessions/Session.scala

@@ -5,7 +5,21 @@ import com.cloudera.hue.livy.server.Statement
 
 import scala.concurrent.Future
 
+object Session {
+  sealed trait State
+  case class Starting() extends State
+  case class Idle() extends State
+  case class Busy() extends State
+  case class Dead() extends State
+
+  class SessionFailedToStart(msg: String) extends Exception(msg)
+
+  class StatementNotFound extends Exception
+}
+
 trait Session {
+  import Session._
+
   def id: String
 
   def lastActivity: Long
@@ -25,12 +39,3 @@ trait Session {
   def stop(): Future[Unit]
 }
 
-sealed trait State
-case class Starting() extends State
-case class Idle() extends State
-case class Busy() extends State
-case class Dead() extends State
-
-class SessionFailedToStart(msg: String) extends Exception(msg)
-
-class StatementNotFound extends Exception

+ 2 - 1
apps/spark/java/livy-server/src/main/scala/com/cloudera/hue/livy/server/sessions/WebSession.scala

@@ -3,9 +3,10 @@ package com.cloudera.hue.livy.server.sessions
 import com.cloudera.hue.livy._
 import com.cloudera.hue.livy.msgs.ExecuteRequest
 import com.cloudera.hue.livy.server.Statement
+import com.cloudera.hue.livy.server.sessions.Session._
 import dispatch._
 import org.json4s.jackson.Serialization.write
-import org.json4s.{JValue, DefaultFormats, Formats}
+import org.json4s.{DefaultFormats, Formats}
 
 import scala.annotation.tailrec
 import scala.collection.mutable.ArrayBuffer