Java API - cleanup

README.md

@@ -6,7 +6,7 @@ Add `play-airbrake` to your `project/Build.scala` file
 
 ``` scala
 val appDependencies = Seq(
-  "eu.teamon" %% "play-airbrake" % "0.2.0"
+  "eu.teamon" %% "play-airbrake" % "0.2.1"
 )
 
 val main = PlayProject(appName, appVersion, appDependencies, mainLang = SCALA).settings(
@@ -45,14 +45,12 @@ For javascript notifications
 For java integration your app/Global.java should look like this
 
 ```java
-@Override
-public Result onError(RequestHeader request, Throwable t) {
-	Map<String, String> data = new HashMap<String, String>();
-	for (Entry<String, String[]> value : request.headers().entrySet()) {
-		data.put(value.getKey(), Arrays.deepToString(value.getValue()));
-	}
-	Airbrake.notify(request.method(), request.uri(), data, t);
-	return super.onError(request, t);
+class Global extends GlobalSettings {
+  @Override
+  public Result onError(RequestHeader request, Throwable t) {
+    Airbrake.notify(request, t);
+    return super.onError(request, t);
+  }
 }
 ```
 

build.sbt

@@ -2,7 +2,7 @@ organization := "eu.teamon"
 
 name := "play-airbrake"
 
-version := "0.2.0"
+version := "0.2.1"
 
 scalaVersion := "2.9.1"
 
@@ -15,7 +15,7 @@ resolvers ++= Seq(
 )
 
 libraryDependencies ++= Seq(
-  "play" %% "play" % Option(System.getenv("PLAY_VERSION")).getOrElse("2.0") % "compile"
+  "play" %% "play" % Option(System.getenv("PLAY_VERSION")).getOrElse("2.0.4") % "compile"
 )
 
 seq(scalajarsSettings:_*)

src/main/scala/play/airbrake/Airbrake.scala

@@ -14,26 +14,44 @@ object Airbrake {
   private lazy val apiKey = app.configuration.getString("airbrake.apiKey") getOrElse { throw PlayException("Configuration error", "Could not find airbrake.apiKey in settings") }
   private lazy val ssl = app.configuration.getBoolean("airbrake.ssl").getOrElse(false)
 
-
-  def notify(request: RequestHeader, th: Throwable) = if(enabled){
-    Akka.future {
-      val scheme = if(ssl) "https" else "http"
-      WS.url(scheme + "://api.airbrake.io/notifier_api/v2/notices").post(formatNotice(app, apiKey, request.method, request.uri, request.session.data, liftThrowable(th))).onRedeem { response =>
-        Logger.info("Exception notice sent to Airbrake")
-      }
-    }
+  /**
+    * Scala API
+    *
+    * {{{
+    * // app/Global.scala
+    * override def onError(request: RequestHeader, ex: Throwable) = {
+    *   Airbrake.notify(request, ex)
+    *   super.onError(request, ex)
+    * }
+    * }}}
+    */
+  def notify(request: RequestHeader, th: Throwable): Unit = if(enabled) _notify(request.method, request.uri, request.session.data, th)
+
+  /**
+    * Java API
+    *
+    * {{{
+    * // app/Global.java
+    * @Override
+    * public Result onError(RequestHeader request, Throwable t) {
+    *   Airbrake.notify(request, t);
+    *   return super.onError(request, t);
+    * }
+    * }}}
+    */
+  def notify(request: play.mvc.Http.RequestHeader, th: Throwable): Unit = if(enabled){
+    val data = request.headers.toMap.mapValues(_.toString)
+    _notify(request.method, request.uri, data, th)
   }
-
-  def notify(method:String, uri:String, data:java.util.Map[String,String], th: Throwable) = if(enabled){
-
-    val myMap = scala.collection.JavaConversions.mapAsScalaMap(data).toMap
+
+  protected def _notify(method: String, uri: String, data: Map[String, String], th: Throwable): Unit =
     Akka.future {
       val scheme = if(ssl) "https" else "http"
-      WS.url(scheme + "://api.airbrake.io/notifier_api/v2/notices").post(formatNotice(app, apiKey, method, uri, myMap, liftThrowable(th))).onRedeem { response =>
+      WS.url(scheme + "://api.airbrake.io/notifier_api/v2/notices").post(formatNotice(app, apiKey, method, uri, data, liftThrowable(th))).onRedeem { response =>
         Logger.info("Exception notice sent to Airbrake")
       }
     }
-  }
+
 
   def js = if(enabled) { """
     <script src="http://cdn.airbrake.io/notifier.min.js"></script>
@@ -50,7 +68,7 @@ object Airbrake {
     case e: PlayException.UsefulException => e
     case e => UnexpectedException(unexpected = Some(e))
   }
-  
+
   protected def formatNotice(app: Application, apiKey: String, method: String, uri: String, data: Map[String,String], ex: UsefulException) = {
     <notice version="2.2">
       <api-key>{ apiKey }</api-key>
@@ -96,5 +114,5 @@ object Airbrake {
     val line = "%s.%s(%s)" format (e.getClassName, e.getMethodName, e.getFileName)
     <line file={line} number={e.getLineNumber.toString}/>
   }
-  
+
 }