Skip to content

Commit f8f025b

Browse files
author
Dragos Manolescu
committed
Updated jackson and scala
1 parent ac23220 commit f8f025b

File tree

2 files changed

+21
-56
lines changed

2 files changed

+21
-56
lines changed

build.sbt

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ scmInfo := Some(
2626
// organizationName := "My Company"
2727

2828
/* scala versions and options */
29-
scalaVersion := "2.10.0"
29+
scalaVersion := "2.10.1"
3030

3131
// crossScalaVersions := Seq("2.9.1")
3232

@@ -43,13 +43,15 @@ mainClass in (Compile, run) := Some("com.microWorkflow.jsonScalaPerftest.Main")
4343

4444
/* dependencies */
4545
libraryDependencies ++= Seq (
46-
"com.persist" % "persist-json_2.10" % "0.9",
47-
"com.codahale" % "jerkson_2.9.1" % "0.5.0",
48-
"net.liftweb" % "lift-json_2.10" % "2.5-M4",
46+
"com.persist" %% "persist-json" % "0.13",
47+
"com.fasterxml.jackson.core" % "jackson-core" % "2.2.1",
48+
"com.fasterxml.jackson.core" % "jackson-databind" % "2.2.1",
49+
"com.fasterxml.jackson.module" % "jackson-module-scala_2.9.2" % "2.2.0",
50+
"net.liftweb" %% "lift-json" % "2.5-M4",
4951
"net.minidev" % "json-smart" % "1.1.1",
5052
"com.rojoma" %% "rojoma-json" % "2.2.0",
51-
"io.spray" %% "spray-json" % "1.2.3",
52-
"com.yammer.metrics" % "metrics-core" % "2.1.3",
53+
"io.spray" %% "spray-json" % "1.2.3",
54+
"nl.grons" %% "metrics-scala" % "2.2.0",
5355
"fr.janalyse" %% "janalyse-jmx" % "0.6.1" % "compile",
5456
"net.sf.jopt-simple" % "jopt-simple" % "4.4",
5557
"play" % "play-json_2.10" % "2.2-SNAPSHOT"

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

Lines changed: 13 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,27 @@
11
package com.microWorkflow.jsonScalaPerftest.jackson
22

33
import com.microWorkflow.jsonScalaPerftest.LibraryAdaptor
4-
import org.codehaus.jackson.map.ObjectMapper
5-
import org.codehaus.jackson.map.DeserializationConfig
4+
import com.fasterxml.jackson.databind.ObjectMapper
5+
//import com.fasterxml.jackson.module.scala.DefaultScalaModule
66

7-
class Url {
8-
private var indices:Array[Int] = _
9-
private var url:String = _
10-
def getIndices = indices
11-
def setIndices(v:Array[Int]) { indices = v}
12-
def getUrl = url
13-
def setUrl(s:String) { url = s}
14-
}
15-
class HashTag {
16-
private var indices:Array[Int] = _
17-
private var text:String = _
18-
def getIndices = indices
19-
def setIndices(v:Array[Int]) { indices = v}
20-
def getText = text
21-
def setText(s:String) { text = s}
22-
}
23-
class UserMention {
24-
private var indices:Array[Int] = _
25-
private var name:String = _
26-
def getIndices = indices
27-
def setIndices(v:Array[Int]) { indices = v}
28-
def getName = name
29-
def setName(s:String) { name = s}
30-
}
31-
class Entities {
32-
private var hashtags:Array[HashTag] = _
33-
private var urls:Array[Url] = _
34-
private var user_mentions:Array[UserMention] = _
35-
def getHashtags = hashtags
36-
def setHashtags(v:Array[HashTag]) { hashtags = v }
37-
def getUrls = urls
38-
def setUrls(v:Array[Url]) { urls = v }
39-
def getUser_mentions = user_mentions
40-
def setUser_mentions(v:Array[UserMention]) { user_mentions = v }
41-
}
7+
case class Url(indices: Array[Int], url: String)
428

43-
class Tweet {
44-
private var id_str:String = _
45-
private var text:String = _
46-
private var entities:Entities = _
47-
def getId_str = id_str
48-
def setId_str(s:String) { id_str = s}
49-
def getText = text
50-
def setText(s:String) { text = s}
51-
def getEntities = entities
52-
def setEntities(e:Entities) { entities = e}
53-
}
9+
case class HashTag(indices: Array[Int], text:String)
10+
11+
case class UserMention(indices: Array[Int], name: String)
12+
13+
case class Entities(hashtags: Array[HashTag], urls:Array[Url], user_mentions:Array[UserMention])
14+
15+
case class Tweet(id_str: String, text: String, entities: Entities)
5416

5517
class JacksonAdaptor(name: String) extends LibraryAdaptor(name) {
5618

5719
var m: ObjectMapper = _
5820

5921
override def initialize() {
60-
m = new ObjectMapper()
61-
m.configure(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES, false)
22+
m = new ObjectMapper
23+
// m.registerModule(new DefaultScalaModule)
24+
// m.configure(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES, false)
6225
}
6326

6427
override def parseOnce(json: String) = {

0 commit comments

Comments
 (0)