use json4s instead of lift-json

project/build.scala

@@ -14,7 +14,7 @@ object HookupBuild extends Build {
     libraryDependencies ++= Seq(
       "io.netty" % "netty" % "3.6.6.Final",
       "com.github.nscala-time" %% "nscala-time" % "0.4.2",
-      "net.liftweb" %% "lift-json" % "2.5" % "compile",
+      "org.json4s" %% "json4s-jackson" % "3.2.4" % "compile",
       "commons-io" % "commons-io" % "2.4",
       "com.typesafe.akka" %% "akka-actor" % "2.1.4" % "compile",
       "com.typesafe.akka" %% "akka-testkit" % "2.1.4" % "test",

src/main/scala/io/backchat/hookup/buffer.scala

@@ -4,7 +4,7 @@ import java.io._
 import java.util.concurrent.ConcurrentLinkedQueue
 import collection.mutable
 import scala.concurrent.{ Promise, ExecutionContext, Future }
-import net.liftweb.json.Formats
+import org.json4s._
 import collection.JavaConverters._
 import java.util.Queue
 import collection.mutable.{ Queue ⇒ ScalaQueue }
@@ -143,10 +143,10 @@ class FileBuffer private[hookup] (file: File, writeToFile: Boolean, memoryBuffer
 
   /**
    * Drain the buffer using the `readLine` function to process each message in the buffer.
-   * This method works with [[scala.concurrent.Future]] objects and needs an [[akka.dispatch.ExecutionContext]] in scope
+   * This method works with [[scala.concurrent.Future]] objects and needs an [[scala.concurrent.ExecutionContext]] in scope
    *
    * @param readLine A function that takes a [[io.backchat.hookup.OutboundMessage]] and produces a [[scala.concurrent.Future]] of [[io.backchat.hookup.OperationResult]]
-   * @param executionContext An [[akka.dispatch.ExecutionContext]]
+   * @param executionContext An [[scala.concurrent.ExecutionContext]]
    * @return A [[scala.concurrent.Future]] of [[io.backchat.hookup.OperationResult]]
    */
   def drain(readLine: (OutboundMessage ⇒ Future[OperationResult]))(implicit executionContext: ExecutionContext, wireFormat: WireFormat): Future[OperationResult] = synchronized {

src/main/scala/io/backchat/hookup/client.scala

@@ -19,8 +19,8 @@ import org.jboss.netty.util.{ Timeout ⇒ NettyTimeout, TimerTask, HashedWheelTi
 import scala.concurrent.duration.Duration
 import java.net.{ ConnectException, InetSocketAddress, URI }
 import java.nio.channels.ClosedChannelException
-import net.liftweb.json.JsonAST.JValue
-import net.liftweb.json.{JsonParser, DefaultFormats, Formats, parse, render, compact}
+import org.json4s._
+import org.json4s.jackson.JsonMethods._
 import java.io.{Closeable, File}
 import java.util.concurrent.{ConcurrentSkipListSet, TimeUnit, Executors}
 import beans.BeanProperty
@@ -601,13 +601,13 @@ trait HookupClient extends HookupClientLike with Connectable with Reconnectable
 
   /**
    * The execution context for futures within this client.
-   * @return The [[akka.dispatch.ExecutionContext]]
+   * @return The [[scala.concurrent.ExecutionContext]]
    */
   implicit protected lazy val executionContext: ExecutionContext = settings.executionContext
 
 //  /**
-//   * The lift-json formats to use when serializing json values.
-//   * @return The [[net.liftweb.json.Formats]]
+//   * The json4s formats to use when serializing json values.
+//   * @return The [[org.json4s.Formats]]
 //   */
 //  implicit protected def jsonFormats: Formats = DefaultFormats
 //
@@ -736,7 +736,7 @@ trait WebSocketListener {
    * The callback method for when an error has occured
    *
    * @param client The client that received the message
-   * @param error The message it received the throwable if any, otherwise null
+   * @param reason The message it received the throwable if any, otherwise null
    */
   def onError(client: HookupClient, reason: Throwable): Unit = ()
 
@@ -752,7 +752,7 @@ trait WebSocketListener {
    * The callback method for when a json message has failed to be acknowledged.
    *
    * @param client The client that received the message
-   * @param text The message it received
+   * @param json The message it received
    */
   def onJsonAckFailed(client: HookupClient, json: String): Unit = ()
 }
@@ -774,19 +774,19 @@ trait JavaHelpers extends WebSocketListener { self: HookupClient =>
 
   /**
    * Send a json message.
-   *
-   * @param message The message to send.
+  json
+   * @param json The message to send.
    * @return A [[scala.concurrent.Future]] with the [[io.backchat.hookup.OperationResult]]
    */
   def send(json: JValue): Future[OperationResult] = channel.send(json)
 
   /**
-   * Send a json message. If the message isn't a json string it will throw a [[net.liftweb.json.JsonParser.ParseException]]
+   * Send a json message. If the message isn't a json string it will throw a [[org.json4s.ParserUtil.ParseException]]
    *
-   * @param message The message to send.
+   * @param json The message to send.
    * @return A [[scala.concurrent.Future]] with the [[io.backchat.hookup.OperationResult]]
    */
-  def sendJson(json: String): Future[OperationResult] = channel.send(JsonParser.parse(json))
+  def sendJson(json: String): Future[OperationResult] = channel.send(parse(json))
 
   /**
    * Send a text message which expects an Ack. If the message is a json string it will still be turned into a json message
@@ -801,7 +801,7 @@ trait JavaHelpers extends WebSocketListener { self: HookupClient =>
   }
     // channel.send(message.needsAck(timeout))
   /**
-   * Send a json message which expects an Ack. If the message isn't a json string it will throw a [[net.liftweb.json.JsonParser.ParseException]]
+   * Send a json message which expects an Ack. If the message isn't a json string it will throw a [[org.json4s.ParserUtil.ParseException]]
    *
    * @param message The message to send.
    * @param timeout the [[scala.concurrent.duration.Duration]] as timeout for the ack operation
@@ -812,7 +812,7 @@ trait JavaHelpers extends WebSocketListener { self: HookupClient =>
   /**
    * Send a text message which expects an Ack. If the message is a json string it will still be turned into a json message
    *
-   * @param message The message to send.
+   * @param json The message to send.
    * @param timeout the [[scala.concurrent.duration.Duration]] as timeout for the ack operation
    * @return A [[scala.concurrent.Future]] with the [[io.backchat.hookup.OperationResult]]
    */

src/main/scala/io/backchat/hookup/examples/ChatClient.scala

@@ -2,7 +2,7 @@ package io.backchat.hookup
 package examples
 
 import java.net.URI
-import net.liftweb.json.{ DefaultFormats, Formats }
+import org.json4s.{ DefaultFormats, Formats }
 import akka.actor.ActorSystem
 import scala.concurrent.duration._
 import java.util.concurrent.atomic.AtomicInteger

src/main/scala/io/backchat/hookup/examples/ChatServer.scala

@@ -1,7 +1,8 @@
 package io.backchat.hookup
 package examples
 
-import net.liftweb.json._
+import org.json4s._
+import org.json4s.jackson.JsonMethods._
 
 object ChatServer {
 

src/main/scala/io/backchat/hookup/examples/PrintAllEventsClient.scala

@@ -1,13 +1,14 @@
 package io.backchat.hookup
 package examples
 
-import net.liftweb.json._
+import org.json4s._
 import java.util.concurrent.atomic.AtomicInteger
 import java.net.URI
 import scala.concurrent.duration._
 import akka.actor.{ Cancellable, ActorSystem }
 import JsonDSL._
 import java.io.File
+import org.json4s.jackson.JsonMethods._
 
 object PrintAllEventsClient {
   import DefaultConversions._

src/main/scala/io/backchat/hookup/examples/PrintAllEventsServer.scala

@@ -1,7 +1,8 @@
 package io.backchat.hookup
 package examples
 
-import net.liftweb.json._
+import org.json4s._
+import org.json4s.jackson.JsonMethods._
 
 object PrintAllEventsServer {
   import DefaultConversions._

src/main/scala/io/backchat/hookup/examples/PrintingEchoClient.scala

@@ -2,7 +2,7 @@ package io.backchat.hookup
 package examples
 
 import java.net.URI
-import net.liftweb.json.{ DefaultFormats, Formats }
+import org.json4s.{ DefaultFormats, Formats }
 import akka.actor.ActorSystem
 import scala.concurrent.duration._
 import java.util.concurrent.atomic.AtomicInteger

src/main/scala/io/backchat/hookup/examples/PrintingEchoServer.scala

@@ -1,7 +1,7 @@
 package io.backchat.hookup
 package examples
 
-import net.liftweb.json._
+import org.json4s._
 
 object PrintingEchoServer {
   import DefaultConversions._

src/main/scala/io/backchat/hookup/examples/PubSubClient.scala

@@ -3,8 +3,9 @@ package examples
 
 import java.net.URI
 import scala.concurrent.duration._
-import net.liftweb.json._
+import org.json4s._
 import JsonDSL._
+import org.json4s.jackson.JsonMethods._
 import java.util.concurrent.atomic.AtomicInteger
 import akka.actor.ActorSystem
 

src/main/scala/io/backchat/hookup/examples/PubSubServer.scala

@@ -2,7 +2,7 @@ package io.backchat.hookup
 package examples
 
 
-import net.liftweb.json._
+import org.json4s._
 import java.util.concurrent.{ConcurrentSkipListSet, ConcurrentHashMap}
 import collection.JavaConverters._
 

src/main/scala/io/backchat/hookup/messages.scala

@@ -1,7 +1,7 @@
 package io.backchat.hookup
 
 import scala.concurrent.duration._
-import net.liftweb.json.JsonAST.JValue
+import org.json4s._
 import scala.concurrent.duration.Duration
 
 /**
@@ -58,7 +58,7 @@ case object Reconnecting extends InboundMessage
 /**
  * A message representing a json object sent to/received from a remote party.
  *
- * @param content A [[net.liftweb.json.JValue]] object
+ * @param content A [[org.json4s.JValue]] object
  */
 case class JsonMessage(content: JValue) extends ProtocolMessage[JValue]
 

src/main/scala/io/backchat/hookup/package.scala

@@ -2,11 +2,10 @@ package io.backchat
 
 import scala.concurrent.{ ExecutionContext, Promise, Future }
 import org.jboss.netty.channel.{ Channel, ChannelFutureListener, ChannelFuture }
-import net.liftweb.json.JsonAST.JValue
+import org.json4s._
 import scala.concurrent.duration.Duration
 import java.util.concurrent.TimeUnit
 import org.jboss.netty.logging.{Slf4JLoggerFactory, InternalLoggerFactory}
-import net.liftweb.json.DefaultFormats
 import beans.BeanProperty
 import org.joda.time.DateTimeZone
 import org.joda.time.format.DateTimeFormat
@@ -99,7 +98,7 @@ package object hookup {
   }
 
   /**
-   * Implicit conversion from a lift-json jvalue to a [[io.backchat.hookup.JsonMessage]]
+   * Implicit conversion from a json4s jvalue to a [[io.backchat.hookup.JsonMessage]]
    *
    * @param content The string content of the message
    * @return A [[io.backchat.hookup.JsonMessage]]

src/main/scala/io/backchat/hookup/server.scala

@@ -16,8 +16,9 @@ import java.net.{ SocketAddress, InetSocketAddress }
 import scala.collection.JavaConverters._
 import collection.mutable.ListBuffer
 import org.jboss.netty.handler.timeout.IdleStateHandler
-import net.liftweb.json._
+import org.json4s._
 import JsonDSL._
+import org.json4s.jackson.JsonMethods._
 import java.util.concurrent.{ ConcurrentHashMap, ConcurrentLinkedQueue, TimeUnit, Executors }
 import akka.util.Timeout
 import org.jboss.netty.buffer.ChannelBuffers
@@ -703,7 +704,7 @@ object HookupServer {
       while (expectedAcks.put(id, exp) != null) { // spin until we've updated
 
       }
-      ctx.getChannel.write(new TextWebSocketFrame(compact(render(msg))))
+      ctx.getChannel.write(new TextWebSocketFrame(compact(msg)))
       id
     }
 

src/main/scala/io/backchat/hookup/wire_formats.scala

@@ -1,6 +1,7 @@
 package io.backchat.hookup
 
-import net.liftweb.json._
+import org.json4s._
+import jackson.JsonMethods._
 import scala.concurrent.duration._
 
 /**
@@ -52,7 +53,7 @@ trait WireFormat {
  * It looks at the first character in the message and if it thinks it's JSON it will try to parse it as JSON
  * otherwise it creates a text message
  *
- * @param formats the [[net.liftweb.json.Formats]] for lift-json
+ * @param formats the [[org.json4s.Formats]] for json4s
  */
 class SimpleJsonWireFormat(implicit formats: Formats) extends WireFormat {
 
@@ -71,7 +72,7 @@ class SimpleJsonWireFormat(implicit formats: Formats) extends WireFormat {
 
   def render(message: OutboundMessage) = message match {
     case TextMessage(text) => text
-    case JsonMessage(json) => compact(JsonAST.render(json))
+    case JsonMessage(json) => compact(json)
     case _ => ""
   }
 }
@@ -188,7 +189,7 @@ object JsonProtocolWireFormat {
  * This wireformat knows about acking and the related protocol messages.
  * it uses a json object to transfer meaning everything has a property name.
  *
- * @param formats  the [[net.liftweb.json.Formats]] for lift-json
+ * @param formats  the [[org.json4s.Formats]] for json4s
  */
 class JsonProtocolWireFormat(implicit formats: Formats) extends WireFormat {
   val name = "jsonProtocol"

src/test/scala/io/backchat/hookup/examples/ServerConfigurationsExample.scala

@@ -5,7 +5,7 @@ import org.specs2.Specification
 import org.specs2.time.NoTimeConversions
 import scala.concurrent.duration._
 import akka.testkit._
-import net.liftweb.json.{Formats, DefaultFormats}
+import org.json4s.{Formats, DefaultFormats}
 import akka.util.Timeout
 import java.net.{InetSocketAddress, SocketAddress, ServerSocket, Socket}
 import java.io.{BufferedReader, PrintWriter, InputStreamReader}

src/test/scala/io/backchat/hookup/tests/FileBufferSpec.scala

@@ -5,7 +5,7 @@ import org.specs2.time.NoTimeConversions
 import org.specs2.Specification
 import java.io.File
 import org.apache.commons.io.{FilenameUtils, FileUtils}
-import net.liftweb.json.DefaultFormats
+import org.json4s._
 import scala.io.Source
 import collection.JavaConverters._
 import org.specs2.specification.{Fragments, Step}

src/test/scala/io/backchat/hookup/tests/HookupClientSpec.scala

@@ -3,13 +3,12 @@ package tests
 
 import org.specs2.Specification
 import org.specs2.time.NoTimeConversions
-import net.liftweb.json.DefaultFormats
+import org.json4s._
 import org.specs2.execute.Result
 import org.specs2.execute.AsResult
 import java.net.{ServerSocket, URI}
 import akka.testkit._
 import akka.actor.ActorSystem
-import net.liftweb.json.JsonAST.{JField, JString, JObject}
 import scala.concurrent.duration._
 import org.specs2.specification.{Around, Step, Fragments}
 import scala.concurrent.{ExecutionContext, Await}

src/test/scala/io/backchat/hookup/tests/HookupServerSpec.scala

@@ -9,7 +9,7 @@ import org.specs2.time.NoTimeConversions
 import org.specs2.execute.Result
 import java.net.{URI, ServerSocket}
 import akka.util.Timeout
-import net.liftweb.json._
+import org.json4s._
 import JsonDSL._
 import java.io.File
 import akka.testkit._

src/test/scala/io/backchat/hookup/tests/JsonProtocolWireFormatSpec.scala

@@ -2,7 +2,7 @@ package io.backchat.hookup
 package tests
 
 import org.specs2.Specification
-import net.liftweb.json._
+import org.json4s._
 import JsonDSL._
 import scala.concurrent.duration._
 import org.specs2.time.NoTimeConversions