From c9ab35d5f0998001c71f2fec3ea43d602f86459e Mon Sep 17 00:00:00 2001
From: Viktor Klang <viktor.klang@gmail.com>
Date: Thu, 24 May 2012 12:34:18 +0200
Subject: [PATCH] Binary compat work for the 0mq module

---
 .../akka/zeromq/ConcurrentSocketActor.scala   |  9 ++------
 .../main/scala/akka/zeromq/SocketOption.scala |  4 +++-
 .../akka/zeromq/ZMQMessageDeserializer.scala  |  2 +-
 .../scala/akka/zeromq/ZeroMQExtension.scala   | 21 +++++++------------
 .../src/main/scala/akka/zeromq/package.scala  |  4 ++--
 5 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/akka-zeromq/src/main/scala/akka/zeromq/ConcurrentSocketActor.scala b/akka-zeromq/src/main/scala/akka/zeromq/ConcurrentSocketActor.scala
index c4e6d08f59..e848809644 100644
--- a/akka-zeromq/src/main/scala/akka/zeromq/ConcurrentSocketActor.scala
+++ b/akka-zeromq/src/main/scala/akka/zeromq/ConcurrentSocketActor.scala
@@ -205,11 +205,6 @@ private[zeromq] class ConcurrentSocketActor(params: Seq[SocketOption]) extends A
   }
 
   private val listenerOpt = params collectFirst { case Listener(l) ⇒ l }
-  private def watchListener() {
-    listenerOpt foreach context.watch
-  }
-
-  private def notifyListener(message: Any) {
-    listenerOpt foreach { _ ! message }
-  }
+  private def watchListener(): Unit = listenerOpt foreach context.watch
+  private def notifyListener(message: Any): Unit = listenerOpt foreach { _ ! message }
 }
diff --git a/akka-zeromq/src/main/scala/akka/zeromq/SocketOption.scala b/akka-zeromq/src/main/scala/akka/zeromq/SocketOption.scala
index 1e4c83bcef..c5d5919fb7 100644
--- a/akka-zeromq/src/main/scala/akka/zeromq/SocketOption.scala
+++ b/akka-zeromq/src/main/scala/akka/zeromq/SocketOption.scala
@@ -255,7 +255,9 @@ case class Linger(value: Long) extends SocketOption
 /**
  * Gets the linger option @see [[akka.zeromq.Linger]]
  */
-object Linger extends SocketOptionQuery
+object Linger extends SocketOptionQuery {
+  val no: Linger = Linger(0)
+}
 
 /**
  * Sets the recovery interval for multicast transports using the specified socket.
diff --git a/akka-zeromq/src/main/scala/akka/zeromq/ZMQMessageDeserializer.scala b/akka-zeromq/src/main/scala/akka/zeromq/ZMQMessageDeserializer.scala
index 1776f21211..2d41424e88 100644
--- a/akka-zeromq/src/main/scala/akka/zeromq/ZMQMessageDeserializer.scala
+++ b/akka-zeromq/src/main/scala/akka/zeromq/ZMQMessageDeserializer.scala
@@ -20,5 +20,5 @@ case class Frame(payload: Seq[Byte]) {
  * Deserializes ZeroMQ messages into an immutable sequence of frames
  */
 class ZMQMessageDeserializer extends Deserializer {
-  def apply(frames: Seq[Frame]) = ZMQMessage(frames)
+  def apply(frames: Seq[Frame]): ZMQMessage = ZMQMessage(frames)
 }
diff --git a/akka-zeromq/src/main/scala/akka/zeromq/ZeroMQExtension.scala b/akka-zeromq/src/main/scala/akka/zeromq/ZeroMQExtension.scala
index 1ddd213325..85a9ea6642 100644
--- a/akka-zeromq/src/main/scala/akka/zeromq/ZeroMQExtension.scala
+++ b/akka-zeromq/src/main/scala/akka/zeromq/ZeroMQExtension.scala
@@ -19,7 +19,7 @@ import org.zeromq.ZMQException
  * @param patch
  */
 case class ZeroMQVersion(major: Int, minor: Int, patch: Int) {
-  override def toString = "%d.%d.%d".format(major, minor, patch)
+  override def toString: String = "%d.%d.%d".format(major, minor, patch)
 }
 
 /**
@@ -27,17 +27,14 @@ case class ZeroMQVersion(major: Int, minor: Int, patch: Int) {
  */
 object ZeroMQExtension extends ExtensionId[ZeroMQExtension] with ExtensionIdProvider {
   override def get(system: ActorSystem): ZeroMQExtension = super.get(system)
-  def lookup() = this
-  def createExtension(system: ExtendedActorSystem) = new ZeroMQExtension(system)
+  def lookup(): this.type = this
+  override def createExtension(system: ExtendedActorSystem): ZeroMQExtension = new ZeroMQExtension(system)
 
   private val minVersionString = "2.1.0"
   private val minVersion = JZMQ.makeVersion(2, 1, 0)
 
-  private[zeromq] def check[TOption <: SocketOption: Manifest](parameters: Seq[SocketOption]) = {
-    parameters exists { p ⇒
-      ClassManifest.singleType(p) <:< manifest[TOption]
-    }
-  }
+  private[zeromq] def check[TOption <: SocketOption: Manifest](parameters: Seq[SocketOption]) =
+    parameters exists { p ⇒ ClassManifest.singleType(p) <:< manifest[TOption] }
 }
 
 /**
@@ -47,16 +44,14 @@ object ZeroMQExtension extends ExtensionId[ZeroMQExtension] with ExtensionIdProv
  */
 class ZeroMQExtension(system: ActorSystem) extends Extension {
 
-  val DefaultPollTimeout = Duration(system.settings.config.getMilliseconds("akka.zeromq.poll-timeout"), TimeUnit.MILLISECONDS)
-  val NewSocketTimeout = Timeout(Duration(system.settings.config.getMilliseconds("akka.zeromq.new-socket-timeout"), TimeUnit.MILLISECONDS))
+  val DefaultPollTimeout: Duration = Duration(system.settings.config.getMilliseconds("akka.zeromq.poll-timeout"), TimeUnit.MILLISECONDS)
+  val NewSocketTimeout: Timeout = Timeout(Duration(system.settings.config.getMilliseconds("akka.zeromq.new-socket-timeout"), TimeUnit.MILLISECONDS))
 
   /**
    * The version of the ZeroMQ library
    * @return a [[akka.zeromq.ZeroMQVersion]]
    */
-  def version = {
-    ZeroMQVersion(JZMQ.getMajorVersion, JZMQ.getMinorVersion, JZMQ.getPatchVersion)
-  }
+  def version: ZeroMQVersion = ZeroMQVersion(JZMQ.getMajorVersion, JZMQ.getMinorVersion, JZMQ.getPatchVersion)
 
   /**
    * Factory method to create the [[akka.actor.Props]] to build the ZeroMQ socket actor.
diff --git a/akka-zeromq/src/main/scala/akka/zeromq/package.scala b/akka-zeromq/src/main/scala/akka/zeromq/package.scala
index 6eeba5b92a..1241700fcb 100644
--- a/akka-zeromq/src/main/scala/akka/zeromq/package.scala
+++ b/akka-zeromq/src/main/scala/akka/zeromq/package.scala
@@ -20,10 +20,10 @@ package object zeromq {
   /**
    * Convenience accessor to subscribe to all events
    */
-  val SubscribeAll = Subscribe(Seq.empty)
+  val SubscribeAll: Subscribe = Subscribe.all
 
   /**
    * Set the linger to 0, doesn't block and discards messages that haven't been sent yet.
    */
-  val NoLinger = Linger(0)
+  val NoLinger: Linger = Linger.no
 }
\ No newline at end of file