You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@toree.apache.org by ch...@apache.org on 2016/03/31 16:13:15 UTC
[5/6] incubator-toree git commit: Changes based on comments in PR
Changes based on comments in PR
Project: http://git-wip-us.apache.org/repos/asf/incubator-toree/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-toree/commit/8dd92a1d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-toree/tree/8dd92a1d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-toree/diff/8dd92a1d
Branch: refs/heads/master
Commit: 8dd92a1df8cf441e30d863be095d3cb0ddbab01d
Parents: dc493eb
Author: Gino Bustelo <lb...@apache.org>
Authored: Wed Mar 30 11:23:20 2016 -0500
Committer: Gino Bustelo <lb...@apache.org>
Committed: Wed Mar 30 14:02:17 2016 -0500
----------------------------------------------------------------------
.../org/apache/toree/boot/CommandLineOptions.scala | 12 +++++-------
.../toree/boot/layer/ComponentInitialization.scala | 4 ++--
.../kernel/interpreter/scala/ScalaInterpreter.scala | 9 +++------
3 files changed, 10 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/8dd92a1d/kernel/src/main/scala/org/apache/toree/boot/CommandLineOptions.scala
----------------------------------------------------------------------
diff --git a/kernel/src/main/scala/org/apache/toree/boot/CommandLineOptions.scala b/kernel/src/main/scala/org/apache/toree/boot/CommandLineOptions.scala
index da3ef49..43cfc8e 100644
--- a/kernel/src/main/scala/org/apache/toree/boot/CommandLineOptions.scala
+++ b/kernel/src/main/scala/org/apache/toree/boot/CommandLineOptions.scala
@@ -154,15 +154,13 @@ class CommandLineOptions(args: Seq[String]) {
pair => if (pair._2.isDefined) Some((pair._1, pair._2.get)) else None
}
- /**
- *
- * @return
- */
private def interpreterArgs: Option[java.util.List[String]] = {
- args.dropWhile(_ != "--").drop(1).toList match {
- case Nil => None
- case list: List[String] => Some(list.asJava)
+ val interpreterArgsList = args.dropWhile(_ != "--").drop(1).toList match {
+ case Nil => List.empty[String]
+ case list: List[String] => list
}
+
+ Some(interpreterArgsList.asJava)
}
private def interpreterPlugins: Option[java.util.List[String]] = {
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/8dd92a1d/kernel/src/main/scala/org/apache/toree/boot/layer/ComponentInitialization.scala
----------------------------------------------------------------------
diff --git a/kernel/src/main/scala/org/apache/toree/boot/layer/ComponentInitialization.scala b/kernel/src/main/scala/org/apache/toree/boot/layer/ComponentInitialization.scala
index 69f71ae..a7194eb 100644
--- a/kernel/src/main/scala/org/apache/toree/boot/layer/ComponentInitialization.scala
+++ b/kernel/src/main/scala/org/apache/toree/boot/layer/ComponentInitialization.scala
@@ -89,7 +89,7 @@ trait StandardComponentInitialization extends ComponentInitialization {
val responseMap = initializeResponseMap()
(commStorage, commRegistrar, commManager,
- interpreterManager.defaultInterpreter.orNull, kernel,
+ interpreterManager.defaultInterpreter.get, kernel,
dependencyDownloader, kernel.magics, pluginManager, responseMap)
}
@@ -177,7 +177,7 @@ trait StandardComponentInitialization extends ComponentInitialization {
val pluginManager = new PluginManager()
logger.debug("Building dependency map")
- pluginManager.dependencyManager.add(interpreterManager.interpreters.get("Scala").orNull)
+ pluginManager.dependencyManager.add(interpreterManager.interpreters.get("Scala").get)
pluginManager.dependencyManager.add(dependencyDownloader)
pluginManager.dependencyManager.add(config)
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/8dd92a1d/scala-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/scala/ScalaInterpreter.scala
----------------------------------------------------------------------
diff --git a/scala-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/scala/ScalaInterpreter.scala b/scala-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/scala/ScalaInterpreter.scala
index ce0b8ec..d037884 100644
--- a/scala-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/scala/ScalaInterpreter.scala
+++ b/scala-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/scala/ScalaInterpreter.scala
@@ -43,7 +43,7 @@ import scala.tools.nsc.util.{ClassPath, MergedClassPath}
import scala.tools.nsc.{Global, Settings, io}
import scala.util.{Try => UtilTry}
-class ScalaInterpreter(config:Config = ConfigFactory.empty) extends Interpreter {
+class ScalaInterpreter(private val config:Config = ConfigFactory.load) extends Interpreter {
protected val logger = LoggerFactory.getLogger(this.getClass.getName)
@@ -230,10 +230,7 @@ class ScalaInterpreter(config:Config = ConfigFactory.empty) extends Interpreter
protected def interpreterArgs(): List[String] = {
import scala.collection.JavaConverters._
- if(config.hasPath("interpreter_args"))
- config.getStringList("interpreter_args").asScala.toList
- else
- Nil
+ config.getStringList("interpreter_args").asScala.toList
}
protected def bindKernelVariable(kernel: KernelLike): Unit = {
@@ -519,7 +516,7 @@ class ScalaInterpreter(config:Config = ConfigFactory.empty) extends Interpreter
doQuietly {
logger.debug(s"Binding SparkContext into interpreter as $bindName")
- interpret(s"""def ${bindName}: org.apache.spark.SparkContext = kernel.sparkContext""")
+ interpret(s"""def ${bindName}: ${classOf[SparkContext].getName} = kernel.sparkContext""")
// NOTE: This is needed because interpreter blows up after adding
// dependencies to SparkContext and Interpreter before the