Check PluginManager is not null to make tests pass. Refactors event names into their own class
Project: http://git-wip-us.apache.org/repos/asf/incubator-toree/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-toree/commit/63ba1c3c Tree: http://git-wip-us.apache.org/repos/asf/incubator-toree/tree/63ba1c3c Diff: http://git-wip-us.apache.org/repos/asf/incubator-toree/diff/63ba1c3c Branch: refs/heads/sandbox Commit: 63ba1c3cd5559e35e7ebef7a1cb7d2d75094377f Parents: 5feb3bd Author: David Taieb <david_ta...@us.ibm.com> Authored: Wed Jan 18 16:18:54 2017 -0500 Committer: David Taieb <david_ta...@us.ibm.com> Committed: Wed Jan 18 16:18:54 2017 -0500 ---------------------------------------------------------------------- .../org/apache/toree/boot/layer/ComponentInitialization.scala | 5 ++--- kernel/src/main/scala/org/apache/toree/kernel/api/Kernel.scala | 5 ++--- .../kernel/protocol/v5/handler/ExecuteRequestHandler.scala | 6 +++--- .../toree/kernel/protocol/v5/relay/ExecuteRequestRelay.scala | 5 ++--- 4 files changed, 9 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/63ba1c3c/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 fafbae7..a69d276 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 @@ -21,7 +21,6 @@ import java.io.File import java.net.URL import java.nio.file.{Files, Paths} import java.util.concurrent.ConcurrentHashMap - import akka.actor.ActorRef import com.typesafe.config.Config import org.apache.spark.SparkConf @@ -34,8 +33,8 @@ import org.apache.toree.kernel.protocol.v5.kernel.ActorLoader import org.apache.toree.magic.MagicManager import org.apache.toree.plugins.PluginManager import org.apache.toree.utils.LogLike - import scala.collection.JavaConverters._ +import org.apache.toree.plugins.AllInterpretersReady /** * Represents the component initialization. All component-related pieces of the @@ -89,7 +88,7 @@ trait StandardComponentInitialization extends ComponentInitialization { interpreterManager.initializeInterpreters(kernel) - pluginManager.fireEvent("allInterpretersReady") + pluginManager.fireEvent(AllInterpretersReady) val responseMap = initializeResponseMap() http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/63ba1c3c/kernel/src/main/scala/org/apache/toree/kernel/api/Kernel.scala ---------------------------------------------------------------------- diff --git a/kernel/src/main/scala/org/apache/toree/kernel/api/Kernel.scala b/kernel/src/main/scala/org/apache/toree/kernel/api/Kernel.scala index 6b369b3..087a0fe 100644 --- a/kernel/src/main/scala/org/apache/toree/kernel/api/Kernel.scala +++ b/kernel/src/main/scala/org/apache/toree/kernel/api/Kernel.scala @@ -19,7 +19,6 @@ package org.apache.toree.kernel.api import java.io.{InputStream, PrintStream} import java.util.concurrent.ConcurrentHashMap - import com.typesafe.config.Config import org.apache.spark.api.java.JavaSparkContext import org.apache.spark.sql.{SQLContext, SparkSession} @@ -39,10 +38,10 @@ import org.apache.toree.kernel.protocol.v5.{KMBuilder, KernelMessage} import org.apache.toree.magic.MagicManager import org.apache.toree.plugins.PluginManager import org.apache.toree.utils.{KeyValuePairUtils, LogLike} - import scala.language.dynamics import scala.reflect.runtime.universe._ import scala.util.{DynamicVariable, Try} +import org.apache.toree.plugins.SparkReady /** * Represents the main kernel API to be used for interaction. @@ -357,7 +356,7 @@ class Kernel ( pluginManager.dependencyManager.add(_sparkContext) pluginManager.dependencyManager.add(_javaSparkContext) - pluginManager.fireEvent("sparkReady") + pluginManager.fireEvent(SparkReady) _sparkContext } http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/63ba1c3c/kernel/src/main/scala/org/apache/toree/kernel/protocol/v5/handler/ExecuteRequestHandler.scala ---------------------------------------------------------------------- diff --git a/kernel/src/main/scala/org/apache/toree/kernel/protocol/v5/handler/ExecuteRequestHandler.scala b/kernel/src/main/scala/org/apache/toree/kernel/protocol/v5/handler/ExecuteRequestHandler.scala index 3764b8c..a59608d 100644 --- a/kernel/src/main/scala/org/apache/toree/kernel/protocol/v5/handler/ExecuteRequestHandler.scala +++ b/kernel/src/main/scala/org/apache/toree/kernel/protocol/v5/handler/ExecuteRequestHandler.scala @@ -30,10 +30,10 @@ import Utilities._ import org.apache.toree.utils._ import play.api.data.validation.ValidationError import play.api.libs.json.JsPath - import scala.concurrent.ExecutionContext.Implicits.global import scala.concurrent._ import scala.util.{Failure, Success} +import org.apache.toree.plugins.PreRunCell /** * Receives an ExecuteRequest KernelMessage and forwards the ExecuteRequest @@ -75,9 +75,9 @@ class ExecuteRequestHandler( (executeRequest, km, outputStream) ).mapTo[(ExecuteReply, ExecuteResult)] - if (!executeRequest.silent){ + if (!executeRequest.silent && kernel.pluginManager != null){ import org.apache.toree.plugins.Implicits._ - kernel.pluginManager.fireEvent("preRunCell", "outputStream" -> outputStream) + kernel.pluginManager.fireEvent(PreRunCell, "outputStream" -> outputStream) } // Flush the output stream after code execution completes to ensure http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/63ba1c3c/kernel/src/main/scala/org/apache/toree/kernel/protocol/v5/relay/ExecuteRequestRelay.scala ---------------------------------------------------------------------- diff --git a/kernel/src/main/scala/org/apache/toree/kernel/protocol/v5/relay/ExecuteRequestRelay.scala b/kernel/src/main/scala/org/apache/toree/kernel/protocol/v5/relay/ExecuteRequestRelay.scala index 5ac3af9..9105841 100644 --- a/kernel/src/main/scala/org/apache/toree/kernel/protocol/v5/relay/ExecuteRequestRelay.scala +++ b/kernel/src/main/scala/org/apache/toree/kernel/protocol/v5/relay/ExecuteRequestRelay.scala @@ -18,7 +18,6 @@ package org.apache.toree.kernel.protocol.v5.relay import java.io.OutputStream - import akka.actor.Actor import akka.pattern._ import akka.util.Timeout @@ -29,9 +28,9 @@ import org.apache.toree.kernel.protocol.v5.kernel.ActorLoader import org.apache.toree.kernel.protocol.v5.magic.{PostProcessor, MagicParser} import org.apache.toree.plugins.PluginManager import org.apache.toree.utils.LogLike - import scala.concurrent.Future import scala.concurrent.duration._ +import org.apache.toree.plugins.NewOutputStream case class ExecuteRequestRelay( actorLoader: ActorLoader, @@ -100,7 +99,7 @@ case class ExecuteRequestRelay( // Sets the outputStream for this particular ExecuteRequest import org.apache.toree.plugins.Implicits._ pluginManager.fireEventFirstResult( - "newOutputStream", + NewOutputStream, "outputStream" -> outputStream )
