Selaa lähdekoodia

[livy] Move SessionManager into livy-core

Erick Tryzelaar 10 vuotta sitten
vanhempi
commit
04b9051319

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

@@ -16,11 +16,10 @@
  * limitations under the License.
  */
 
-package com.cloudera.hue.livy.server
+package com.cloudera.hue.livy.sessions
 
 import java.util.concurrent.atomic.AtomicInteger
 
-import com.cloudera.hue.livy.sessions.{SessionFactory, Session}
 import com.cloudera.hue.livy.{LivyConf, Logging}
 import org.json4s.JValue
 

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

@@ -16,10 +16,9 @@
  * limitations under the License.
  */
 
-package com.cloudera.hue.livy.server
+package com.cloudera.hue.livy.sessions
 
 import com.cloudera.hue.livy.LivyConf
-import com.cloudera.hue.livy.sessions._
 import org.json4s.JsonAST.{JNothing, JValue}
 import org.scalatest.{FlatSpec, Matchers}
 

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

@@ -24,6 +24,7 @@ import javax.servlet.ServletContext
 import com.cloudera.hue.livy._
 import com.cloudera.hue.livy.server.batch.BatchSessionServlet
 import com.cloudera.hue.livy.server.interactive.InteractiveSessionServlet
+import com.cloudera.hue.livy.sessions.SessionManager
 import com.cloudera.hue.livy.sessions.batch.BatchSession
 import com.cloudera.hue.livy.sessions.interactive.InteractiveSession
 import com.cloudera.hue.livy.spark.SparkProcessBuilderFactory

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

@@ -19,7 +19,7 @@
 package com.cloudera.hue.livy.server
 
 import com.cloudera.hue.livy.Logging
-import com.cloudera.hue.livy.sessions.Session
+import com.cloudera.hue.livy.sessions.{SessionManager, Session}
 import com.cloudera.hue.livy.sessions.interactive.InteractiveSession.SessionFailedToStart
 import com.fasterxml.jackson.core.JsonParseException
 import org.json4s.JsonDSL._

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

@@ -19,7 +19,8 @@
 package com.cloudera.hue.livy.server.batch
 
 import com.cloudera.hue.livy.Logging
-import com.cloudera.hue.livy.server.{SessionManager, SessionServlet}
+import com.cloudera.hue.livy.server.SessionServlet
+import com.cloudera.hue.livy.sessions.SessionManager
 import com.cloudera.hue.livy.sessions.batch.BatchSession
 import org.json4s.JsonDSL._
 import org.json4s._

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

@@ -23,7 +23,7 @@ import java.util.concurrent.TimeUnit
 
 import com.cloudera.hue.livy.Logging
 import com.cloudera.hue.livy.msgs.ExecuteRequest
-import com.cloudera.hue.livy.server.{SessionManager, SessionServlet}
+import com.cloudera.hue.livy.server.SessionServlet
 import com.cloudera.hue.livy.sessions._
 import com.cloudera.hue.livy.sessions.interactive.{InteractiveSession, Statement, StatementState}
 import org.json4s.JsonAST.JString

+ 1 - 3
apps/spark/java/livy-server/src/test/scala/com/cloudera/hue/livy/server/batch/BatchServletSpec.scala

@@ -21,9 +21,7 @@ package com.cloudera.hue.livy.server.batch
 import java.io.FileWriter
 import java.nio.file.{Files, Path}
 import java.util.concurrent.TimeUnit
-
-import com.cloudera.hue.livy.server.SessionManager
-import com.cloudera.hue.livy.sessions.SessionState
+import com.cloudera.hue.livy.sessions.{SessionManager, SessionState}
 import com.cloudera.hue.livy.spark.SparkProcessBuilderFactory
 import com.cloudera.hue.livy.spark.batch.{BatchSessionProcessFactory, CreateBatchRequest}
 import com.cloudera.hue.livy.{LivyConf, Utils}

+ 0 - 1
apps/spark/java/livy-server/src/test/scala/com/cloudera/hue/livy/server/interactive/InteractiveSessionServletSpec.scala

@@ -23,7 +23,6 @@ import java.util.concurrent.atomic.AtomicInteger
 
 import com.cloudera.hue.livy.LivyConf
 import com.cloudera.hue.livy.msgs.ExecuteRequest
-import com.cloudera.hue.livy.server.SessionManager
 import com.cloudera.hue.livy.sessions._
 import com.cloudera.hue.livy.sessions.interactive.{InteractiveSession, Statement}
 import com.cloudera.hue.livy.spark.{SparkProcess, SparkProcessBuilderFactory}