Erick Tryzelaar 10 жил өмнө
parent
commit
d174121

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

@@ -16,10 +16,10 @@
  * limitations under the License.
  */
 
-package com.cloudera.hue.livy.msgs
+package com.cloudera.hue.livy
+
+sealed trait MsgType
 
-sealed trait MsgType {
-}
 object MsgType {
   case object execute_request extends MsgType
   case object execute_reply extends MsgType

+ 2 - 3
apps/spark/java/livy-core/src/main/scala/com/cloudera/hue/livy/sessions/interactive/InteractiveSession.scala

@@ -21,9 +21,8 @@ package com.cloudera.hue.livy.sessions.interactive
 import java.net.URL
 import java.util.concurrent.TimeoutException
 
-import com.cloudera.hue.livy.Utils
-import com.cloudera.hue.livy.msgs.ExecuteRequest
-import com.cloudera.hue.livy.sessions.{Session, Kind, SessionState}
+import com.cloudera.hue.livy.{ExecuteRequest, Utils}
+import com.cloudera.hue.livy.sessions.{Kind, Session, SessionState}
 
 import scala.concurrent._
 import scala.concurrent.duration.Duration

+ 1 - 1
apps/spark/java/livy-core/src/main/scala/com/cloudera/hue/livy/sessions/interactive/Statement.scala

@@ -18,7 +18,7 @@
 
 package com.cloudera.hue.livy.sessions.interactive
 
-import com.cloudera.hue.livy.msgs.ExecuteRequest
+import com.cloudera.hue.livy.ExecuteRequest
 import org.json4s.JValue
 import org.json4s.JsonAST.{JArray, JField, JObject, JString}
 

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

@@ -20,7 +20,7 @@ package com.cloudera.hue.livy.sessions
 
 import java.util.concurrent.TimeUnit
 
-import com.cloudera.hue.livy.msgs.ExecuteRequest
+import com.cloudera.hue.livy.ExecuteRequest
 import com.cloudera.hue.livy.sessions.interactive.InteractiveSession
 import org.json4s.{DefaultFormats, Extraction}
 import org.scalatest.{BeforeAndAfter, FunSpec, Matchers}

+ 2 - 3
apps/spark/java/livy-core/src/test/scala/com/cloudera/hue/livy/sessions/interactive/StatementSpec.scala

@@ -18,10 +18,9 @@
  * limitations under the License.
  */
 
-package scala.com.cloudera.hue.livy.sessions.interactive
+package com.cloudera.hue.livy.sessions.interactive
 
-import com.cloudera.hue.livy.msgs.ExecuteRequest
-import com.cloudera.hue.livy.sessions.interactive.Statement
+import com.cloudera.hue.livy.ExecuteRequest
 import org.json4s.JsonAST.JString
 import org.json4s.{DefaultFormats, Extraction}
 import org.scalatest.{FunSpec, Matchers}

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

@@ -20,8 +20,7 @@ package com.cloudera.hue.livy.repl
 
 import java.util.concurrent.TimeUnit
 
-import com.cloudera.hue.livy.Logging
-import com.cloudera.hue.livy.msgs.ExecuteRequest
+import com.cloudera.hue.livy.{ExecuteRequest, Logging}
 import com.cloudera.hue.livy.sessions._
 import com.fasterxml.jackson.core.JsonParseException
 import org.json4s.{DefaultFormats, JsonDSL, MappingException, _}

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

@@ -21,8 +21,7 @@ package com.cloudera.hue.livy.server.interactive
 import java.net.URL
 import java.util.concurrent.TimeUnit
 
-import com.cloudera.hue.livy.Logging
-import com.cloudera.hue.livy.msgs.ExecuteRequest
+import com.cloudera.hue.livy.{ExecuteRequest, Logging}
 import com.cloudera.hue.livy.server.SessionServlet
 import com.cloudera.hue.livy.sessions._
 import com.cloudera.hue.livy.sessions.interactive.{InteractiveSession, Statement, StatementState}

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

@@ -21,12 +21,11 @@ package com.cloudera.hue.livy.server.interactive
 import java.net.URL
 import java.util.concurrent.atomic.AtomicInteger
 
-import com.cloudera.hue.livy.LivyConf
-import com.cloudera.hue.livy.msgs.ExecuteRequest
+import com.cloudera.hue.livy.{ExecuteRequest, LivyConf}
 import com.cloudera.hue.livy.sessions._
 import com.cloudera.hue.livy.sessions.interactive.{InteractiveSession, Statement}
-import com.cloudera.hue.livy.spark.{SparkProcess, SparkProcessBuilderFactory}
 import com.cloudera.hue.livy.spark.interactive.{CreateInteractiveRequest, InteractiveSessionFactory}
+import com.cloudera.hue.livy.spark.{SparkProcess, SparkProcessBuilderFactory}
 import org.json4s.JsonAST.{JArray, JInt, JObject, JString}
 import org.json4s.jackson.JsonMethods._
 import org.json4s.jackson.Serialization.write

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

@@ -22,7 +22,7 @@ import java.net.{ConnectException, URL}
 import java.util.concurrent.TimeUnit
 
 import com.cloudera.hue.livy._
-import com.cloudera.hue.livy.msgs.ExecuteRequest
+import com.cloudera.hue.livy.ExecuteRequest
 import com.cloudera.hue.livy.sessions._
 import com.cloudera.hue.livy.sessions.interactive.{Statement, InteractiveSession}
 import com.cloudera.hue.livy.spark.SparkProcess