Bläddra i källkod

[livy] Convert construtors into "apply" methods

Erick Tryzelaar 10 år sedan
förälder
incheckning
606aef9

+ 3 - 3
apps/spark/java/livy-spark/src/main/scala/com/cloudera/hue/livy/spark/interactive/InteractiveSessionProcess.scala

@@ -36,9 +36,9 @@ object InteractiveSessionProcess extends Logging {
   val CONF_LIVY_REPL_CALLBACK_URL = "livy.repl.callback-url"
   val CONF_LIVY_REPL_DRIVER_CLASS_PATH = "livy.repl.driverClassPath"
 
-  def create(livyConf: LivyConf,
-             id: Int,
-             createInteractiveRequest: CreateInteractiveRequest): InteractiveSession = {
+  def apply(livyConf: LivyConf,
+            id: Int,
+            createInteractiveRequest: CreateInteractiveRequest): InteractiveSession = {
     val process = startProcess(livyConf, id, createInteractiveRequest)
     new InteractiveSessionProcess(id, createInteractiveRequest, process)
   }

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

@@ -29,6 +29,6 @@ class InteractiveSessionProcessFactory(livyConf: LivyConf) extends InteractiveSe
 
    override def create(id: Int,
                        createInteractiveRequest: CreateInteractiveRequest): InteractiveSession = {
-     InteractiveSessionProcess.create(livyConf, id, createInteractiveRequest)
+     InteractiveSessionProcess(livyConf, id, createInteractiveRequest)
    }
  }

+ 4 - 4
apps/spark/java/livy-spark/src/main/scala/com/cloudera/hue/livy/spark/interactive/InteractiveSessionYarn.scala

@@ -36,10 +36,10 @@ object InteractiveSessionYarn {
 
   private val CONF_LIVY_JAR = "livy.yarn.jar"
 
-  def create(livyConf: LivyConf,
-             client: Client,
-             id: Int,
-             createInteractiveRequest: CreateInteractiveRequest): InteractiveSession = {
+  def apply(livyConf: LivyConf,
+            client: Client,
+            id: Int,
+            createInteractiveRequest: CreateInteractiveRequest): InteractiveSession = {
     val callbackUrl = System.getProperty("livy.server.callback-url")
     val url = f"$callbackUrl/sessions/$id/callback"
 

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

@@ -31,7 +31,7 @@ class InteractiveSessionYarnFactory(livyConf: LivyConf) extends InteractiveSessi
    val client = new Client(livyConf)
 
    override def create(id: Int, createInteractiveRequest: CreateInteractiveRequest): InteractiveSession = {
-     InteractiveSessionYarn.create(livyConf, client, id, createInteractiveRequest)
+     InteractiveSessionYarn(livyConf, client, id, createInteractiveRequest)
    }
 
    override def close(): Unit = {

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

@@ -31,5 +31,5 @@ class InteractiveSessionProcessSpec
   val livyConf = new LivyConf()
   livyConf.set("livy.repl.driverClassPath", sys.props("java.class.path"))
 
-  def createSession() = InteractiveSessionProcess.create(livyConf, 0, CreateInteractiveRequest(kind = PySpark()))
+  def createSession() = InteractiveSessionProcess(livyConf, 0, CreateInteractiveRequest(kind = PySpark()))
 }