More scala-ish implementation of Tweet

raphaelcm · Aug 22, 2011 · 4adeada · 4adeada
1 parent b1d15f0
commit 4adeada
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/main/scala/com/retwis/api/Retwis.scala b/src/main/scala/com/retwis/api/Retwis.scala
@@ -221,7 +221,7 @@ object Retwis {
 		try {
 			val jsonTwt = jedis.get("pid:" + id + ":tweet")
 			if (jsonTwt != null) {
-				return Tweet.getTweetFromJson(jsonTwt)
+				return Tweet(jsonTwt)
 			}
 		} catch {
 			case e => e.printStackTrace()
@@ -241,7 +241,7 @@ object Retwis {
 			var tweets = new Array[Tweet](tweetIds.length)
 			var i = 0
 			for(id<-tweetIds) {
-				tweets(i) = Tweet.getTweetFromJson(jedis.get("pid:" + id + ":tweet"))
+				tweets(i) = Tweet(jedis.get("pid:" + id + ":tweet"))
 				i += 1
 			}
 			return tweets
@@ -266,7 +266,7 @@ object Retwis {
 			var tweets = new Array[Tweet](tweetIds.length)
 			var i = 0
 			for(id<-tweetIds) {
-				tweets(i) = Tweet.getTweetFromJson(jedis.get("pid:" + id + ":tweet"))
+				tweets(i) = Tweet(jedis.get("pid:" + id + ":tweet"))
 				i += 1
 			}
 			return tweets

diff --git a/src/main/scala/com/retwis/model/Tweet.scala b/src/main/scala/com/retwis/model/Tweet.scala
@@ -5,7 +5,7 @@ import net.liftweb.json.JsonAST._
 import net.liftweb.json.JsonDSL._
 
 object Tweet {
-	def getTweetFromJson(jsonStr: String):Tweet = {
+	def apply(jsonStr: String):Tweet = {
 		implicit val formats = net.liftweb.json.DefaultFormats
 		val json = parse(jsonStr)
 		val id = (json \ "tweet" \ "id").extract[String]
@@ -16,7 +16,7 @@ object Tweet {
 	}
 }
 
-class Tweet(val id: String, val time: Long, val message: String, val authorId: String) {	
+class Tweet(val id: String, val time: Long, val message: String, val authorId: String) {
 	/* Serialize tweet to JSON string */
 	def toJson(): String = {
 		val json = ("tweet" ->