Factored mapping by type name

Author: Dragos Manolescu

build.sbt

@@ -46,7 +46,7 @@ libraryDependencies ++= Seq (
     "com.persist" %% "persist-json" % "0.13",
     "com.fasterxml.jackson.core" % "jackson-core" % "2.2.1",
     "com.fasterxml.jackson.core" % "jackson-databind" % "2.2.1",
-    "com.fasterxml.jackson.module" % "jackson-module-scala_2.9.2" % "2.2.0",
+    "com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.2.0",
     "net.liftweb" %% "lift-json" % "2.5-M4",
     "net.minidev" % "json-smart" % "1.1.1",
     "com.rojoma" %% "rojoma-json" % "2.2.0",
@@ -81,7 +81,7 @@ publishTo <<= version { (v: String) =>
     "snapshots" at nexus + "content/repositories/snapshots"
   )
   else Some("releases" at nexus + "service/local/staging/deploy/maven2")
-                      }
+  }
 
 publishArtifact in Test := false
 

src/main/scala/com/microWorkflow/jsonScalaPerftest/LibraryAdaptor.scala

@@ -22,14 +22,21 @@ abstract class LibraryAdaptor(name: String) extends TimeMeasurements {
 
   def parseOnce(json: String): Any
 
-  def mapOnce(json: String): Any
+  def mapTweet(json: String): Any
+
+  def mapPlace(json: String) = { /* nop */ }
 
   def measure(dataset: Dataset, doMap:Boolean, iterations: Int) {
     initialize()
 
     val context2 = mainTimer.time()
 
-    val f: String => Any = if (doMap) mapOnce else parseOnce
+    val mapper: String => Any = dataset.name match {
+      case "100tweets" => mapTweet
+      case _ => mapPlace
+    }
+
+    val f: String => Any = if (doMap) mapper else parseOnce
 
     try {
       for (count <- 1 to iterations) {

src/main/scala/com/microWorkflow/jsonScalaPerftest/jackson/JacksonAdaptor.scala

@@ -1,36 +1,32 @@
 package com.microWorkflow.jsonScalaPerftest.jackson
 
 import com.microWorkflow.jsonScalaPerftest.LibraryAdaptor
-import com.fasterxml.jackson.databind.ObjectMapper
-//import com.fasterxml.jackson.module.scala.DefaultScalaModule
+import com.fasterxml.jackson.databind.{DeserializationFeature, ObjectMapper}
+import com.microWorkflow.jsonScalaPerftest.domain.{Place, Tweet}
 
-case class Url(indices: Array[Int], url: String)
-
-case class HashTag(indices: Array[Int], text:String)
-
-case class UserMention(indices: Array[Int], name: String)
-
-case class Entities(hashtags: Array[HashTag], urls:Array[Url], user_mentions:Array[UserMention])
-
-case class Tweet(id_str: String, text: String, entities: Entities)
+import com.fasterxml.jackson.module.scala.DefaultScalaModule
 
 class JacksonAdaptor(name: String) extends LibraryAdaptor(name) {
 
   var m: ObjectMapper = _
 
   override def initialize() { 
     m = new ObjectMapper
-//    m.registerModule(new DefaultScalaModule)
-//    m.configure(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES, false)
+    m.registerModule(new DefaultScalaModule)
+    m.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
   }
 
   override def parseOnce(json: String) = {
       m.readTree(json)
   }
 
-  override def mapOnce(json: String) = {
+  override def mapTweet(json: String) = {
       m.readValue(json, classOf[Tweet])
   }
 
+  override def mapPlace(json: String) = {
+    m.readValue(json, classOf[Place])
+  }
+
   override def hasMap = true
 }

src/main/scala/com/microWorkflow/jsonScalaPerftest/jsonsmart/JsonSmartAdaptor.scala

@@ -3,22 +3,6 @@ package com.microWorkflow.jsonScalaPerftest.jsonsmart
 import com.microWorkflow.jsonScalaPerftest.LibraryAdaptor
 import net.minidev.json.JSONValue.parse
 
-case class User ( utc_offset: Int
-                , time_zone: String
-                )
-
-case class Url(indices: Array[Int], url: String)
-
-case class Hashtag(indices: Array[Int], text: String)
-
-case class UserMention(indices: Array[Int], name: String)
-
-case class Entities(hashtags: Array[Hashtag], urls: Array[Url], userMentions: Array[UserMention])
-
-case class Tweet(idStr: String, text: String, entities: Entities)
-
-
-
 class JsonSmartAdaptor(name: String) extends LibraryAdaptor(name) {
 
   override def initialize() { /* nop */ }
@@ -27,7 +11,7 @@ class JsonSmartAdaptor(name: String) extends LibraryAdaptor(name) {
       parse(json /* , classOf[Tweet] */)  // TODO: add map (JsonSmart v.2)
   }
 
-  def mapOnce(json: String) = null
+  def mapTweet(json: String) = null
 
   override def hasMap = false
 

src/main/scala/com/microWorkflow/jsonScalaPerftest/liftjson/LiftJsonAdaptor.scala

@@ -2,12 +2,7 @@ package com.microWorkflow.jsonScalaPerftest.liftjson
 
 import net.liftweb.json._
 import com.microWorkflow.jsonScalaPerftest.LibraryAdaptor
-
-case class Url(indices: Array[Int], url: String)
-case class Hashtag(indices: Array[Int], text: String)
-case class UserMention(indices: Array[Int], name: String)
-case class Entities(hashtags: Array[Hashtag], urls: Array[Url], userMentions: Array[UserMention])
-case class Tweet(id_str: String, text: String, entities: Entities)
+import com.microWorkflow.jsonScalaPerftest.domain.{Tweet}
 
 class LiftJsonAdaptor(name: String) extends LibraryAdaptor(name) {
 
@@ -22,11 +17,13 @@ class LiftJsonAdaptor(name: String) extends LibraryAdaptor(name) {
     }
   }
 
-  override def mapOnce(json: String) = {
+  override def mapTweet(json: String) = {
     implicit val formats = DefaultFormats
     parse(json) match {
-      case obj: JObject => List(obj.extract[Tweet])
-      case array: JArray => array.extract[List[Tweet]]
+      case obj: JObject =>
+        List(obj.extract[Tweet])
+      case array: JArray =>
+        array.extract[List[Tweet]]
       case _ => List[Tweet]()
     }
   }

src/main/scala/com/microWorkflow/jsonScalaPerftest/persist/PersistAdaptor.scala

@@ -4,12 +4,7 @@ import com.persist.JsonOps._
 import com.persist.JsonMapper._
 
 import com.microWorkflow.jsonScalaPerftest.LibraryAdaptor
-
-case class Url(indices: Seq[Int], url: String)
-case class Hashtag(indices: Seq[Int], text: String)
-case class UserMention(indices: Seq[Int], name: String)
-case class Entities(hashtags: Seq[Hashtag], urls: Seq[Url], user_mentions: Seq[UserMention])
-case class Tweet(id_str: String, text: String, entities: Entities)
+import com.microWorkflow.jsonScalaPerftest.domain.{Place, Tweet}
 
 class PersistAdaptor(name: String) extends LibraryAdaptor(name) {
 
@@ -19,10 +14,14 @@ class PersistAdaptor(name: String) extends LibraryAdaptor(name) {
     Json(json)
   }
 
-  override def mapOnce(json: String) = {
+  override def mapTweet(json: String) = {
     ToObject[Tweet](Json(json))
   }
 
+  override def mapPlace(json: String) = {
+    ToObject[Place](Json(json))
+  }
+
   override def hasMap = true
 
 }

src/main/scala/com/microWorkflow/jsonScalaPerftest/play/PlayAdaptor.scala

@@ -2,17 +2,7 @@ package com.microWorkflow.jsonScalaPerftest.play
 
 import com.microWorkflow.jsonScalaPerftest.LibraryAdaptor
 import play.api.libs.json._
-
-case class Url(indices: Array[Int], url: String)
-
-case class HashTag(indices: Array[Int], text:String)
-
-case class UserMention(indices: Array[Int], name: String)
-
-case class Entities(hashtags: Array[HashTag], urls:Array[Url], user_mentions:Array[UserMention])
-
-case class Tweet(id_str: String, text: String, entities: Entities)
-
+import com.microWorkflow.jsonScalaPerftest.domain._
 
 class PlayAdaptor(name: String) extends LibraryAdaptor(name) {
   implicit val urlReads = Json.reads[Url]
@@ -29,7 +19,7 @@ class PlayAdaptor(name: String) extends LibraryAdaptor(name) {
     Json.parse(json)
   }
 
-  def mapOnce(json: String) = {
+  def mapTweet(json: String) = {
 
     val parsed = Json.parse(json)
     parsed.as[Tweet]

src/main/scala/com/microWorkflow/jsonScalaPerftest/rojoma/RojomaAdaptor.scala

@@ -58,7 +58,7 @@ class RojomaAdaptor(name:String) extends LibraryAdaptor(name) {
 
   def initialize() {}
 
-  def mapOnce(json: String) = {
+  def mapTweet(json: String) = {
       JsonUtil.parseJson[Tweet](json).get
   }
 

src/main/scala/com/microWorkflow/jsonScalaPerftest/scalalib/ScalaLibAdaptor.scala

@@ -3,14 +3,6 @@ package com.microWorkflow.jsonScalaPerftest.scalalib
 import com.microWorkflow.jsonScalaPerftest.LibraryAdaptor
 import scala.util.parsing.json.JSON
 
-/*
-case class Url(indices: Seq[Int], url: String)
-case class Hashtag(indices: Seq[Int], text: String)
-case class UserMention(indices: Seq[Int], name: String)
-case class Entities(hashtags: Seq[Hashtag], urls: Seq[Url], user_mentions: Seq[UserMention])
-case class Tweet(id_str: String, text: String, entities: Entities)
-*/
-
 class ScalaLibAdaptor(name: String) extends LibraryAdaptor(name) {
 
   override def initialize() { /* nop */ }
@@ -19,7 +11,7 @@ class ScalaLibAdaptor(name: String) extends LibraryAdaptor(name) {
       JSON.parseFull(json)
   }
 
-  override def mapOnce(json: String) = null
+  override def mapTweet(json: String) = null
 
   override def hasMap = false
 

src/main/scala/com/microWorkflow/jsonScalaPerftest/spray/SprayAdaptor.scala

@@ -2,16 +2,11 @@ package com.microWorkflow.jsonScalaPerftest.spray
 
 import com.microWorkflow.jsonScalaPerftest.LibraryAdaptor
 import spray.json._
-
-case class Url(indices: Array[Int], url: String)
-case class Hashtag(indices: Array[Int], text: String)
-case class UserMention(indices: Array[Int], name: String)
-case class Entities(hashtags: Array[Hashtag], urls: Array[Url], user_mentions: Array[UserMention])
-case class Tweet(id_str: String, text: String, entities: Entities)
+import com.microWorkflow.jsonScalaPerftest.domain._
 
 object myJsonProtocol extends DefaultJsonProtocol {
     implicit val urlFormat = jsonFormat2(Url)
-    implicit val hashtagFormat = jsonFormat2(Hashtag)
+    implicit val hashtagFormat = jsonFormat2(HashTag)
     implicit val userMentionFormat = jsonFormat2(UserMention)
     implicit val entitiesFormat = jsonFormat3(Entities)
     implicit val tweetFormat = jsonFormat3(Tweet)
@@ -25,7 +20,7 @@ class SprayAdaptor(name: String) extends LibraryAdaptor(name) {
       json.asJson
   }
 
-  override def mapOnce(json: String) = {
+  override def mapTweet(json: String) = {
       import myJsonProtocol._
       json.asJson.convertTo[Tweet]
   }

src/main/scala/com/microWorkflow/jsonScalaPerftest/twitter/TwitterAdaptor.scala

@@ -11,7 +11,7 @@ class TwitterAdaptor(name:String) extends LibraryAdaptor(name) {
       parse(json)
   }
 
-  override def mapOnce(json: String) = null
+  override def mapTweet(json: String) = null
 
   override def hasMap = false