Many small improvements

Author: t3hnar

pom.xml

@@ -54,14 +54,8 @@
         <dependency>
             <groupId>com.typesafe.akka</groupId>
             <artifactId>akka-testkit</artifactId>
-            <scope>test</scope>
             <version>${akka.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <version>1.0.3</version>
+            <scope>test</scope>
         </dependency>
 
         <dependency>

src/main/scala/com/thenewmotion/akka/http/AsyncActor.scala

@@ -1,11 +1,15 @@
 package com.thenewmotion.akka.http
 
-import javax.servlet.http.{HttpServletResponse, HttpServletRequest}
+
 import akka.actor._
 import akka.util.duration._
-import javax.servlet.{ServletRequest, ServletResponse, AsyncContext}
 import Endpoints._
 import Async._
+import ext.Response
+import javax.servlet.{ServletRequest, ServletResponse, AsyncContext}
+import javax.servlet.http.{HttpServletResponse, HttpServletRequest}
+import HttpServletResponse.SC_INTERNAL_SERVER_ERROR
+
 
 /**
  * @author Yaroslav Klymko
@@ -55,8 +59,8 @@ class AsyncActor extends Actor with LoggingFSM[State, Data] {
       val res = async.getResponse
       try doComplete(completing(res)) catch {
         case e: Exception =>
-          log.error("Exception while responding for '{}'", url)
-          res.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR)
+          log.error(e, "Exception while responding for '{}'", url)
+          res.sendError(SC_INTERNAL_SERVER_ERROR, e.getMessage)
           doComplete(DummyCallback)
       }
       stop()
@@ -79,11 +83,7 @@ class AsyncActor extends Actor with LoggingFSM[State, Data] {
   def InternalErrorOnException(url: String): PartialFunction[Throwable, Unit] = {
     case e: Exception =>
       log.error(e, "Exception while serving request for '{}'", url)
-      val internalError = (res: HttpServletResponse) => {
-        res.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR)
-        DummyCallback
-      }
-      self ! Complete(internalError)
+      self ! Complete(Response(SC_INTERNAL_SERVER_ERROR, e.getMessage))
   }
 
   def safeProcess(endpoint: Processing, async: Context): State = {

src/main/scala/com/thenewmotion/akka/http/Endpoints.scala

@@ -2,6 +2,7 @@ package com.thenewmotion.akka.http
 
 import javax.servlet.http.{HttpServletResponse, HttpServletRequest}
 import akka.actor.{ActorRef, ActorLogging, Actor}
+import ext.Response
 
 /**
  * @author Yaroslav Klymko
@@ -17,14 +18,9 @@ object Endpoints {
   type Processing = (HttpServletRequest => Completing)
   val DummyProcessing: Processing = (_ => DummyCompleting)
 
-  val NotFound: Processing = (req: HttpServletRequest) => (res: HttpServletResponse) => {
-    res.setStatus(HttpServletResponse.SC_NOT_FOUND)
-    val writer = res.getWriter
-    writer.write("No endpoint available for [" + req.getPathInfo + "]")
-    writer.close()
-    res.flushBuffer()
-    DummyCallback
-  }
+  val NotFound: Processing = (req: HttpServletRequest) => Response.apply(
+    HttpServletResponse.SC_NOT_FOUND,
+    "No endpoint available for [" + req.getPathInfo + "]")
 
   type Provider = PartialFunction[String, Endpoint]
 

src/main/scala/com/thenewmotion/akka/http/ext/Response.scala

@@ -0,0 +1,34 @@
+package com.thenewmotion.akka.http
+package ext
+
+import javax.servlet.http.HttpServletResponse
+import Endpoints.{Completing, DummyCallback}
+
+/**
+ * @author Yaroslav Klymko
+ */
+object Response {
+
+  def apply(statusCode: Int, msg: String, headers: (String, String)*): Completing =
+    (res: HttpServletResponse) => {
+      headers.foreach {
+        case (name, value) => res.setHeader(name, value)
+      }
+      res.setStatus(statusCode)
+      val writer = res.getWriter
+      writer.write(msg)
+      writer.close()
+      res.flushBuffer()
+      DummyCallback
+    }
+
+  def apply(statusCode: Int, headers: (String, String)*): Completing = {
+    (res: HttpServletResponse) => {
+      headers.foreach {
+        case (name, value) => res.setHeader(name, value)
+      }
+      res.sendError(statusCode)
+      DummyCallback
+    }
+  }
+}

src/test/scala/com/thenewmotion/akka/http/AsyncActorSpec.scala

@@ -151,7 +151,7 @@ class AsyncActorSpec extends SpecificationWithJUnit with Mockito {
       expectMsgType[Find]
       actorRef ! Found(Endpoint(_ => responseException))
 
-      there was one(res).setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR)
+      there was one(res).sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, null)
       there was one(asyncContext).complete()
     }
     "pass to enpoint true if completed successfully" >> new HttpContext {