Change UI createHandler routines to createServlet since they now return servlets

tgravescs · tgravescs · commit 4a57acc4f4b9 · 2014-03-03T12:44:09.000-06:00
diff --git a/core/src/main/scala/org/apache/spark/metrics/sink/MetricsServlet.scala b/core/src/main/scala/org/apache/spark/metrics/sink/MetricsServlet.scala
@@ -47,7 +47,7 @@ class MetricsServlet(val property: Properties, val registry: MetricRegistry) ext
 
   def getHandlers = Array[ServletContextHandler](
     JettyUtils.createServletHandler(servletPath, 
-      JettyUtils.createHandler(request => getMetricsSnapshot(request), "text/json"))
+      JettyUtils.createServlet(request => getMetricsSnapshot(request), "text/json"))
   )
 
   def getMetricsSnapshot(request: HttpServletRequest): String = {
diff --git a/core/src/main/scala/org/apache/spark/ui/JettyUtils.scala b/core/src/main/scala/org/apache/spark/ui/JettyUtils.scala
@@ -46,16 +46,16 @@ private[spark] object JettyUtils extends Logging {
   type Responder[T] = HttpServletRequest => T
 
   // Conversions from various types of Responder's to jetty Handlers
-  implicit def jsonResponderToHandler(responder: Responder[JValue]): HttpServlet =
-    createHandler(responder, "text/json", (in: JValue) => pretty(render(in)))
+  implicit def jsonResponderToServlet(responder: Responder[JValue]): HttpServlet =
+    createServlet(responder, "text/json", (in: JValue) => pretty(render(in)))
 
-  implicit def htmlResponderToHandler(responder: Responder[Seq[Node]]): HttpServlet =
-    createHandler(responder, "text/html", (in: Seq[Node]) => "<!DOCTYPE html>" + in.toString)
+  implicit def htmlResponderToServlet(responder: Responder[Seq[Node]]): HttpServlet =
+    createServlet(responder, "text/html", (in: Seq[Node]) => "<!DOCTYPE html>" + in.toString)
 
-  implicit def textResponderToHandler(responder: Responder[String]): HttpServlet =
-    createHandler(responder, "text/plain")
+  implicit def textResponderToServlet(responder: Responder[String]): HttpServlet =
+    createServlet(responder, "text/plain")
 
-  def createHandler[T <% AnyRef](responder: Responder[T], contentType: String, 
+  def createServlet[T <% AnyRef](responder: Responder[T], contentType: String, 
                                  extractFn: T => String = (in: Any) => in.toString): HttpServlet = {
     new HttpServlet {
       override def doGet(request: HttpServletRequest,

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ class MetricsServlet(val property: Properties, val registry: MetricRegistry) ext`
`47`	`47`
`48`	`48`	`def getHandlers = Array[ServletContextHandler](`
`49`	`49`	`JettyUtils.createServletHandler(servletPath,`
`50`		`- JettyUtils.createHandler(request => getMetricsSnapshot(request), "text/json"))`
	`50`	`+ JettyUtils.createServlet(request => getMetricsSnapshot(request), "text/json"))`
`51`	`51`	`)`
`52`	`52`
`53`	`53`	`def getMetricsSnapshot(request: HttpServletRequest): String = {`