diff --git a/akka-core/src/main/scala/serialization/Binary.scala b/akka-core/src/main/scala/serialization/Binary.scala index 818131cbf8..229c5ad616 100644 --- a/akka-core/src/main/scala/serialization/Binary.scala +++ b/akka-core/src/main/scala/serialization/Binary.scala @@ -1,66 +1,60 @@ /** * Copyright (C) 2009-2010 Scalable Solutions AB */ -/* + package se.scalablesolutions.akka.serialization +import sbinary._ +import sbinary.Operations._ +import sbinary.DefaultProtocol._ + // --- PRIMITIVES --- case class BinaryString(val value: String) extends Serializable.SBinary[BinaryString] { - import sbinary.DefaultProtocol._ def this() = this(null) def fromBytes(bytes: Array[Byte]): BinaryString = BinaryString(fromByteArray[String](bytes)) def toBytes: Array[Byte] = toByteArray(value) } case class BinaryBigInt(val value: BigInt) extends Serializable.SBinary[BinaryBigInt] { - import sbinary.DefaultProtocol._ def this() = this(null) def fromBytes(bytes: Array[Byte]) = BinaryBigInt(fromByteArray[BigInt](bytes)) def toBytes: Array[Byte] = toByteArray(value) } case class BinaryBigDecimal(val value: BigDecimal) extends Serializable.SBinary[BinaryBigDecimal] { - import sbinary.DefaultProtocol._ def this() = this(null) def fromBytes(bytes: Array[Byte]) = BinaryBigDecimal(fromByteArray[BigDecimal](bytes)) def toBytes: Array[Byte] = toByteArray(value) } case class BinaryLong(val value: Long) extends Serializable.SBinary[BinaryLong] { - import sbinary.DefaultProtocol._ def this() = this(0L) def fromBytes(bytes: Array[Byte]) = BinaryLong(fromByteArray[Long](bytes)) def toBytes: Array[Byte] = toByteArray(value) } case class BinaryInt(val value: Int) extends Serializable.SBinary[BinaryInt] { - import sbinary.DefaultProtocol._ def this() = this(0) def fromBytes(bytes: Array[Byte]) = BinaryInt(fromByteArray[Int](bytes)) def toBytes: Array[Byte] = toByteArray(value) } case class BinaryDouble(val value: Double) extends Serializable.SBinary[BinaryDouble] { - import sbinary.DefaultProtocol._ def this() = this(0.0D) def fromBytes(bytes: Array[Byte]) = BinaryDouble(fromByteArray[Double](bytes)) def toBytes: Array[Byte] = toByteArray(value) } case class BinaryFloat(val value: Float) extends Serializable.SBinary[BinaryFloat] { - import sbinary.DefaultProtocol._ def this() = this(0.0F) def fromBytes(bytes: Array[Byte]) = BinaryFloat(fromByteArray[Float](bytes)) def toBytes: Array[Byte] = toByteArray(value) } case class BinaryBoolean(val value: Boolean) extends Serializable.SBinary[BinaryBoolean] { - import sbinary.DefaultProtocol._ - def this() = this(true) + def this() = this(true) def fromBytes(bytes: Array[Byte]) = BinaryBoolean(fromByteArray[Boolean](bytes)) def toBytes: Array[Byte] = toByteArray(value) } case class BinaryByte(val value: Byte) extends Serializable.SBinary[BinaryByte] { - import sbinary.DefaultProtocol._ def this() = this(0x00) def fromBytes(bytes: Array[Byte]) = BinaryByte(fromByteArray[Byte](bytes)) def toBytes: Array[Byte] = toByteArray(value) } case class BinaryChar(val value: Char) extends Serializable.SBinary[BinaryChar] { - import sbinary.DefaultProtocol._ def this() = this(' ') def fromBytes(bytes: Array[Byte]) = BinaryChar(fromByteArray[Char](bytes)) def toBytes: Array[Byte] = toByteArray(value) @@ -68,117 +62,98 @@ case class BinaryChar(val value: Char) extends Serializable.SBinary[BinaryChar] // --- ARRAYS --- case class BinaryStringArray(val value: Array[String]) extends Serializable.SBinary[BinaryStringArray] { - import sbinary.DefaultProtocol._ def this() = this(null) def fromBytes(bytes: Array[Byte]) = BinaryStringArray(fromByteArray[Array[String]](bytes)) def toBytes: Array[Byte] = toByteArray(value) } case class BinaryBigIntArray(val value: Array[BigInt]) extends Serializable.SBinary[BinaryBigIntArray] { - import sbinary.DefaultProtocol._ def this() = this(null) def fromBytes(bytes: Array[Byte]) = BinaryBigIntArray(fromByteArray[Array[BigInt]](bytes)) def toBytes: Array[Byte] = toByteArray(value) } case class BinaryBigDecimalArray(val value: Array[BigDecimal]) extends Serializable.SBinary[BinaryBigDecimalArray] { - import sbinary.DefaultProtocol._ def this() = this(null) def fromBytes(bytes: Array[Byte]) = BinaryBigDecimalArray(fromByteArray[Array[BigDecimal]](bytes)) def toBytes: Array[Byte] = toByteArray(value) } case class BinaryIntArray(val value: Array[Int]) extends Serializable.SBinary[BinaryIntArray] { - import sbinary.DefaultProtocol._ def this() = this(null) def fromBytes(bytes: Array[Byte]) = BinaryIntArray(fromByteArray[Array[Int]](bytes)) def toBytes: Array[Byte] = toByteArray(value) } case class BinaryLongArray(val value: Array[Long]) extends Serializable.SBinary[BinaryLongArray] { - import sbinary.DefaultProtocol._ def this() = this(null) def fromBytes(bytes: Array[Byte]) = BinaryLongArray(fromByteArray[Array[Long]](bytes)) def toBytes: Array[Byte] = toByteArray(value) } case class BinaryDoubleArray(val value: Array[Double]) extends Serializable.SBinary[BinaryDoubleArray] { - import sbinary.DefaultProtocol._ def this() = this(null) def fromBytes(bytes: Array[Byte]) = BinaryDoubleArray(fromByteArray[Array[Double]](bytes)) def toBytes: Array[Byte] = toByteArray(value) } case class BinaryFloatArray(val value: Array[Float]) extends Serializable.SBinary[BinaryFloatArray] { - import sbinary.DefaultProtocol._ def this() = this(null) def fromBytes(bytes: Array[Byte]) = BinaryFloatArray(fromByteArray[Array[Float]](bytes)) def toBytes: Array[Byte] = toByteArray(value) } case class BinaryBooleanArray(val value: Array[Boolean]) extends Serializable.SBinary[BinaryBooleanArray] { - import sbinary.DefaultProtocol._ def this() = this(null) def fromBytes(bytes: Array[Byte]) = BinaryBooleanArray(fromByteArray[Array[Boolean]](bytes)) def toBytes: Array[Byte] = toByteArray(value) } case class BinaryByteArray(val value: Array[Byte]) extends Serializable.SBinary[BinaryByteArray] { - import sbinary.DefaultProtocol._ def this() = this(null) def fromBytes(bytes: Array[Byte]) = BinaryByteArray(fromByteArray[Array[Byte]](bytes)) def toBytes: Array[Byte] = toByteArray(value) } -case class BinaryClassArray(val value: Array[Class[_]]) extends Serializable.SBinary[BinaryClassArray] { - import sbinary.DefaultProtocol._ +/*case class BinaryClassArray(val value: Array[Class[_]]) extends Serializable.SBinary[BinaryClassArray] { def this() = this(null) def fromBytes(bytes: Array[Byte]) = BinaryClassArray(fromByteArray[Array[Class[_]]](bytes)) def toBytes: Array[Byte] = toByteArray(value) -} +}*/ // --- LISTS --- case class BinaryStringList(val value: List[String]) extends Serializable.SBinary[BinaryStringList] { - import sbinary.DefaultProtocol._ def this() = this(null) def fromBytes(bytes: Array[Byte]) = BinaryStringList(fromByteArray[List[String]](bytes)) def toBytes: Array[Byte] = toByteArray(value) } case class BinaryBigIntList(val value: List[BigInt]) extends Serializable.SBinary[BinaryBigIntList] { - import sbinary.DefaultProtocol._ def this() = this(null) def fromBytes(bytes: Array[Byte]) = BinaryBigIntList(fromByteArray[List[BigInt]](bytes)) def toBytes: Array[Byte] = toByteArray(value) } case class BinaryBigDecimalList(val value: List[BigDecimal]) extends Serializable.SBinary[BinaryBigDecimalList] { - import sbinary.DefaultProtocol._ def this() = this(null) def fromBytes(bytes: Array[Byte]) = BinaryBigDecimalList(fromByteArray[List[BigDecimal]](bytes)) def toBytes: Array[Byte] = toByteArray(value) } case class BinaryLongList(val value: List[Long]) extends Serializable.SBinary[BinaryLongList] { - import sbinary.DefaultProtocol._ def this() = this(null) def fromBytes(bytes: Array[Byte]) = BinaryLongList(fromByteArray[List[Long]](bytes)) def toBytes: Array[Byte] = toByteArray(value) } case class BinaryIntList(val value: List[Int]) extends Serializable.SBinary[BinaryIntList] { - import sbinary.DefaultProtocol._ def this() = this(null) def fromBytes(bytes: Array[Byte]) = BinaryIntList(fromByteArray[List[Int]](bytes)) def toBytes: Array[Byte] = toByteArray(value) } case class BinaryDoubleList(val value: List[Double]) extends Serializable.SBinary[BinaryDoubleList] { - import sbinary.DefaultProtocol._ def this() = this(null) def fromBytes(bytes: Array[Byte]) = BinaryDoubleList(fromByteArray[List[Double]](bytes)) def toBytes: Array[Byte] = toByteArray(value) } case class BinaryFloatList(val value: List[Float]) extends Serializable.SBinary[BinaryFloatList] { - import sbinary.DefaultProtocol._ def this() = this(null) def fromBytes(bytes: Array[Byte]) = BinaryFloatList(fromByteArray[List[Float]](bytes)) def toBytes: Array[Byte] = toByteArray(value) } case class BinaryBooleanList(val value: List[Boolean]) extends Serializable.SBinary[BinaryBooleanList] { - import sbinary.DefaultProtocol._ def this() = this(null) def fromBytes(bytes: Array[Byte]) = BinaryBooleanList(fromByteArray[List[Boolean]](bytes)) def toBytes: Array[Byte] = toByteArray(value) } case class BinaryClassList(val value: List[Class[_]]) extends Serializable.SBinary[BinaryClassList] { - import sbinary.DefaultProtocol._ def this() = this(null) def fromBytes(bytes: Array[Byte]) = BinaryClassList(fromByteArray[List[Class[_]]](bytes)) def toBytes: Array[Byte] = toByteArray(value) @@ -186,103 +161,86 @@ case class BinaryClassList(val value: List[Class[_]]) extends Serializable.SBina // --- TUPLES --- case class BinaryStringStringTuple(val value: Tuple2[String, String]) extends Serializable.SBinary[BinaryStringStringTuple] { - import sbinary.DefaultProtocol._ - def this() = this(null) + def this() = this(null) def fromBytes(bytes: Array[Byte]) = BinaryStringStringTuple(fromByteArray[Tuple2[String, String]](bytes)) def toBytes: Array[Byte] = toByteArray(value) } case class BinaryBigIntBigIntTuple(val value: Tuple2[BigInt, BigInt]) extends Serializable.SBinary[BinaryBigIntBigIntTuple] { - import sbinary.DefaultProtocol._ - def this() = this(null) + def this() = this(null) def fromBytes(bytes: Array[Byte]) = BinaryBigIntBigIntTuple(fromByteArray[Tuple2[BigInt, BigInt]](bytes)) def toBytes: Array[Byte] = toByteArray(value) } case class BinaryBigDecimalBigDecimalTuple(val value: Tuple2[BigDecimal, BigDecimal]) extends Serializable.SBinary[BinaryBigDecimalBigDecimalTuple] { - import sbinary.DefaultProtocol._ def this() = this(null) def fromBytes(bytes: Array[Byte]) = BinaryBigDecimalBigDecimalTuple(fromByteArray[Tuple2[BigDecimal, BigDecimal]](bytes)) def toBytes: Array[Byte] = toByteArray(value) } case class BinaryLongLongTuple(val value: Tuple2[Long, Long]) extends Serializable.SBinary[BinaryLongLongTuple] { - import sbinary.DefaultProtocol._ def this() = this(null) def fromBytes(bytes: Array[Byte]) = BinaryLongLongTuple(fromByteArray[Tuple2[Long, Long]](bytes)) def toBytes: Array[Byte] = toByteArray(value) } case class BinaryIntIntTuple(val value: Tuple2[Int, Int]) extends Serializable.SBinary[BinaryIntIntTuple] { - import sbinary.DefaultProtocol._ def this() = this(null) def fromBytes(bytes: Array[Byte]) = BinaryIntIntTuple(fromByteArray[Tuple2[Int, Int]](bytes)) def toBytes: Array[Byte] = toByteArray(value) } case class BinaryDoubleDoubleTuple(val value: Tuple2[Double, Double]) extends Serializable.SBinary[BinaryDoubleDoubleTuple] { - import sbinary.DefaultProtocol._ def this() = this(null) def fromBytes(bytes: Array[Byte]) = BinaryDoubleDoubleTuple(fromByteArray[Tuple2[Double, Double]](bytes)) def toBytes: Array[Byte] = toByteArray(value) } case class BinaryFloatFloatTuple(val value: Tuple2[Float, Float]) extends Serializable.SBinary[BinaryFloatFloatTuple] { - import sbinary.DefaultProtocol._ def this() = this(null) def fromBytes(bytes: Array[Byte]) = BinaryFloatFloatTuple(fromByteArray[Tuple2[Float, Float]](bytes)) def toBytes: Array[Byte] = toByteArray(value) } case class BinaryBooleanBooleanTuple(val value: Tuple2[Boolean, Boolean]) extends Serializable.SBinary[BinaryBooleanBooleanTuple] { - import sbinary.DefaultProtocol._ def this() = this(null) def fromBytes(bytes: Array[Byte]) = BinaryBooleanBooleanTuple(fromByteArray[Tuple2[Boolean, Boolean]](bytes)) def toBytes: Array[Byte] = toByteArray(value) } case class BinaryClassClassTuple(val value: Tuple2[Class[_], Class[_]]) extends Serializable.SBinary[BinaryClassClassTuple] { - import sbinary.DefaultProtocol._ def this() = this(null) def fromBytes(bytes: Array[Byte]) = BinaryClassClassTuple(fromByteArray[Tuple2[Class[_], Class[_]]](bytes)) def toBytes: Array[Byte] = toByteArray(value) } case class BinaryByteArrayByteArrayTuple(val value: Tuple2[Array[Byte], Array[Byte]]) extends Serializable.SBinary[BinaryByteArrayByteArrayTuple] { - import sbinary.DefaultProtocol._ def this() = this(null) def fromBytes(bytes: Array[Byte]) = BinaryByteArrayByteArrayTuple(fromByteArray[Tuple2[Array[Byte], Array[Byte]]](bytes)) def toBytes: Array[Byte] = toByteArray(value) } case class BinaryBigIntStringTuple(val value: Tuple2[BigInt, String]) extends Serializable.SBinary[BinaryBigIntStringTuple] { - import sbinary.DefaultProtocol._ def this() = this(null) def fromBytes(bytes: Array[Byte]) = BinaryBigIntStringTuple(fromByteArray[Tuple2[BigInt, String]](bytes)) def toBytes: Array[Byte] = toByteArray(value) } case class BinaryBigDecimalStringTuple(val value: Tuple2[BigDecimal, String]) extends Serializable.SBinary[BinaryBigDecimalStringTuple] { - import sbinary.DefaultProtocol._ def this() = this(null) def fromBytes(bytes: Array[Byte]) = BinaryBigDecimalStringTuple(fromByteArray[Tuple2[BigDecimal, String]](bytes)) def toBytes: Array[Byte] = toByteArray(value) } case class BinaryLongStringTuple(val value: Tuple2[Long, String]) extends Serializable.SBinary[BinaryLongStringTuple] { - import sbinary.DefaultProtocol._ def this() = this(null) def fromBytes(bytes: Array[Byte]) = BinaryLongStringTuple(fromByteArray[Tuple2[Long, String]](bytes)) def toBytes: Array[Byte] = toByteArray(value) } case class BinaryIntStringTuple(val value: Tuple2[Int, String]) extends Serializable.SBinary[BinaryIntStringTuple] { - import sbinary.DefaultProtocol._ def this() = this(null) def fromBytes(bytes: Array[Byte]) = BinaryIntStringTuple(fromByteArray[Tuple2[Int, String]](bytes)) def toBytes: Array[Byte] = toByteArray(value) } case class BinaryDoubleStringTuple(val value: Tuple2[Double, String]) extends Serializable.SBinary[BinaryDoubleStringTuple] { - import sbinary.DefaultProtocol._ def this() = this(null) def fromBytes(bytes: Array[Byte]) = BinaryDoubleStringTuple(fromByteArray[Tuple2[Double, String]](bytes)) def toBytes: Array[Byte] = toByteArray(value) } case class BinaryFloatStringTuple(val value: Tuple2[Float, String]) extends Serializable.SBinary[BinaryFloatStringTuple] { - import sbinary.DefaultProtocol._ def this() = this(null) def fromBytes(bytes: Array[Byte]) = BinaryFloatStringTuple(fromByteArray[Tuple2[Float, String]](bytes)) def toBytes: Array[Byte] = toByteArray(value) } case class BinaryBooleanStringTuple(val value: Tuple2[Boolean, String]) extends Serializable.SBinary[BinaryBooleanStringTuple] { - import sbinary.DefaultProtocol._ def this() = this(null) def fromBytes(bytes: Array[Byte]) = BinaryBooleanStringTuple(fromByteArray[Tuple2[Boolean, String]](bytes)) def toBytes: Array[Byte] = toByteArray(value) @@ -294,7 +252,6 @@ case class BinaryClassStringTuple(val value: Tuple2[Class[_], String]) extends S def toBytes: Array[Byte] = toByteArray(value) } case class BinaryStringByteArrayTuple(val value: Tuple2[String, Array[Byte]]) extends Serializable.SBinary[BinaryStringByteArrayTuple] { - import sbinary.DefaultProtocol._ def this() = this(null) def fromBytes(bytes: Array[Byte]) = BinaryStringByteArrayTuple(fromByteArray[Tuple2[String, Array[Byte]]](bytes)) def toBytes: Array[Byte] = toByteArray(value) @@ -302,75 +259,62 @@ case class BinaryStringByteArrayTuple(val value: Tuple2[String, Array[Byte]]) ex // --- MAPS --- case class BinaryStringStringMap(val value: Map[String, String]) extends Serializable.SBinary[BinaryStringStringMap] { - import sbinary.DefaultProtocol._ def this() = this(null) def fromBytes(bytes: Array[Byte]) = BinaryStringStringMap(fromByteArray[Map[String, String]](bytes)) def toBytes: Array[Byte] = toByteArray(value) } case class BinaryBigIntStringMap(val value: Map[BigInt, String]) extends Serializable.SBinary[BinaryBigIntStringMap] { - import sbinary.DefaultProtocol._ def this() = this(null) def fromBytes(bytes: Array[Byte]) = BinaryBigIntStringMap(fromByteArray[Map[BigInt, String]](bytes)) def toBytes: Array[Byte] = toByteArray(value) } case class BinaryBigDecimalStringMap(val value: Map[BigDecimal, String]) extends Serializable.SBinary[BinaryBigDecimalStringMap] { - import sbinary.DefaultProtocol._ def this() = this(null) def fromBytes(bytes: Array[Byte]) = BinaryBigDecimalStringMap(fromByteArray[Map[BigDecimal, String]](bytes)) def toBytes: Array[Byte] = toByteArray(value) } case class BinaryLongStringMap(val value: Map[Long, String]) extends Serializable.SBinary[BinaryLongStringMap] { - import sbinary.DefaultProtocol._ def this() = this(null) def fromBytes(bytes: Array[Byte]) = BinaryLongStringMap(fromByteArray[Map[Long, String]](bytes)) def toBytes: Array[Byte] = toByteArray(value) } case class BinaryIntStringMap(val value: Map[Int, String]) extends Serializable.SBinary[BinaryIntStringMap] { - import sbinary.DefaultProtocol._ def this() = this(null) def fromBytes(bytes: Array[Byte]) = BinaryIntStringMap(fromByteArray[Map[Int, String]](bytes)) def toBytes: Array[Byte] = toByteArray(value) } case class BinaryClassStringMap(val value: Map[Class[_], String]) extends Serializable.SBinary[BinaryClassStringMap] { - import sbinary.DefaultProtocol._ def this() = this(null) def fromBytes(bytes: Array[Byte]) = BinaryClassStringMap(fromByteArray[Map[Class[_], String]](bytes)) def toBytes: Array[Byte] = toByteArray(value) } case class BinaryStringBigIntMap(val value: Map[String, BigInt]) extends Serializable.SBinary[BinaryStringBigIntMap] { - import sbinary.DefaultProtocol._ def this() = this(null) def fromBytes(bytes: Array[Byte]) = BinaryStringBigIntMap(fromByteArray[Map[String, BigInt]](bytes)) def toBytes: Array[Byte] = toByteArray(value) } case class BinaryStringBigDecimalMap(val value: Map[String, BigDecimal]) extends Serializable.SBinary[BinaryStringBigDecimalMap] { - import sbinary.DefaultProtocol._ def this() = this(null) def fromBytes(bytes: Array[Byte]) = BinaryStringBigDecimalMap(fromByteArray[Map[String, BigDecimal]](bytes)) def toBytes: Array[Byte] = toByteArray(value) } case class BinaryStringLongMap(val value: Map[String, Long]) extends Serializable.SBinary[BinaryStringLongMap] { - import sbinary.DefaultProtocol._ def this() = this(null) def fromBytes(bytes: Array[Byte]) = BinaryStringLongMap(fromByteArray[Map[String, Long]](bytes)) def toBytes: Array[Byte] = toByteArray(value) } case class BinaryStringIntMap(val value: Map[String, Int]) extends Serializable.SBinary[BinaryStringIntMap] { - import sbinary.DefaultProtocol._ def this() = this(null) def fromBytes(bytes: Array[Byte]) = BinaryStringIntMap(fromByteArray[Map[String, Int]](bytes)) def toBytes: Array[Byte] = toByteArray(value) } case class BinaryStringClassMap(val value: Map[String, Class[_]]) extends Serializable.SBinary[BinaryStringClassMap] { - import sbinary.DefaultProtocol._ def this() = this(null) def fromBytes(bytes: Array[Byte]) = BinaryStringClassMap(fromByteArray[Map[String, Class[_]]](bytes)) def toBytes: Array[Byte] = toByteArray(value) } case class BinaryStringByteArrayMap(val value: Map[String, Array[Byte]]) extends Serializable.SBinary[BinaryStringByteArrayMap] { - import sbinary.DefaultProtocol._ def this() = this(null) def fromBytes(bytes: Array[Byte]) = BinaryStringByteArrayMap(fromByteArray[Map[String, Array[Byte]]](bytes)) def toBytes: Array[Byte] = toByteArray(value) -} -*/ \ No newline at end of file +} \ No newline at end of file diff --git a/akka-core/src/main/scala/serialization/Serializable.scala b/akka-core/src/main/scala/serialization/Serializable.scala index 813f4fd12f..d0a199f67b 100644 --- a/akka-core/src/main/scala/serialization/Serializable.scala +++ b/akka-core/src/main/scala/serialization/Serializable.scala @@ -9,14 +9,14 @@ import org.codehaus.jackson.map.ObjectMapper import com.google.protobuf.Message import reflect.Manifest -//import sbinary.DefaultProtocol +import sbinary.DefaultProtocol import java.io.{StringWriter, ByteArrayOutputStream, ObjectOutputStream} import sjson.json.{Serializer=>SJSONSerializer} object SerializationProtocol { - //val SBINARY = 1 + val SBINARY = 1 val SCALA_JSON = 2 val JAVA_JSON = 3 val PROTOBUF = 4 @@ -64,10 +64,10 @@ object Serializable { * * @author Jonas Bonér */ - /*trait SBinary[T <: AnyRef] extends Serializable { + trait SBinary[T <: AnyRef] extends Serializable { def fromBytes(bytes: Array[Byte]): T def toBytes: Array[Byte] - } */ + } /** * @author Jonas Bonér diff --git a/akka-core/src/main/scala/serialization/Serializer.scala b/akka-core/src/main/scala/serialization/Serializer.scala index 5363664ad4..8881bf2747 100644 --- a/akka-core/src/main/scala/serialization/Serializer.scala +++ b/akka-core/src/main/scala/serialization/Serializer.scala @@ -33,7 +33,7 @@ class SerializerFactory { def getJava: Java.type = Java def getJavaJSON: JavaJSON.type = JavaJSON def getScalaJSON: ScalaJSON.type = ScalaJSON - //def getSBinary: SBinary.type = SBinary + def getSBinary: SBinary.type = SBinary def getProtobuf: Protobuf.type = Protobuf } @@ -163,8 +163,10 @@ object Serializer { /** * @author Jonas Bonér */ - /*object SBinary extends SBinary + object SBinary extends SBinary class SBinary { + import sbinary._ + import sbinary.Operations._ import sbinary.DefaultProtocol._ def deepClone[T <: AnyRef](obj: T)(implicit w : Writes[T], r : Reads[T]): T = in[T](out[T](obj), None) @@ -174,6 +176,6 @@ object Serializer { def in[T](array : Array[Byte], clazz: Option[Class[T]])(implicit bin : Reads[T]): T = fromByteArray[T](array) def in[T](array : Array[Byte])(implicit bin : Reads[T]): T = fromByteArray[T](array) - } */ + } } diff --git a/akka-core/src/test/scala/Messages.scala b/akka-core/src/test/scala/Messages.scala index a5dcaf38c9..a189110c42 100644 --- a/akka-core/src/test/scala/Messages.scala +++ b/akka-core/src/test/scala/Messages.scala @@ -5,6 +5,9 @@ package se.scalablesolutions.akka import se.scalablesolutions.akka.serialization.Serializable +import sbinary._ +import sbinary.Operations._ +import sbinary.DefaultProtocol._ sealed abstract class TestMessage case object Ping extends TestMessage @@ -16,9 +19,9 @@ case object NotifySupervisorExit extends TestMessage case class User(val usernamePassword: Tuple2[String, String], val email: String, val age: Int) - /*extends Serializable.SBinary[User]*/ { + extends Serializable.SBinary[User] { def this() = this(null, null, 0) -/* import sbinary.DefaultProtocol._ + import sbinary.DefaultProtocol._ implicit object UserFormat extends Format[User] { def reads(in : Input) = User( read[Tuple2[String, String]](in), @@ -31,7 +34,7 @@ case class User(val usernamePassword: Tuple2[String, String], } } def fromBytes(bytes: Array[Byte]) = fromByteArray[User](bytes) - def toBytes: Array[Byte] = toByteArray(this)*/ + def toBytes: Array[Byte] = toByteArray(this) } case object RemotePing extends TestMessage diff --git a/akka-core/src/test/scala/RemoteSupervisorTest.scala b/akka-core/src/test/scala/RemoteSupervisorTest.scala index 47e12647b3..409e5ddfa7 100644 --- a/akka-core/src/test/scala/RemoteSupervisorTest.scala +++ b/akka-core/src/test/scala/RemoteSupervisorTest.scala @@ -4,7 +4,7 @@ package se.scalablesolutions.akka.actor -//import se.scalablesolutions.akka.serialization.BinaryString +import se.scalablesolutions.akka.serialization.BinaryString import se.scalablesolutions.akka.config.ScalaConfig._ import se.scalablesolutions.akka.remote.{RemoteNode, RemoteServer} import se.scalablesolutions.akka.OneWay @@ -18,12 +18,6 @@ object Log { var oneWayLog: String = "" } -//Dummy until SBinary is fixed for Scala 2.8 -object BinaryString{ - def apply(string : String) = string - def unapply(string : String) = Some(string) -} - @serializable class RemotePingPong1Actor extends Actor { dispatcher = Dispatchers.newThreadBasedDispatcher(this) def receive = { diff --git a/akka-persistence/akka-persistence-redis/src/test/scala/RedisPersistentSortedSetSpec.scala b/akka-persistence/akka-persistence-redis/src/test/scala/RedisPersistentSortedSetSpec.scala index a2abb2cd40..a871b616ef 100644 --- a/akka-persistence/akka-persistence-redis/src/test/scala/RedisPersistentSortedSetSpec.scala +++ b/akka-persistence/akka-persistence-redis/src/test/scala/RedisPersistentSortedSetSpec.scala @@ -144,7 +144,7 @@ class RedisPersistentSortedSetSpec extends qa !! REMOVE(h7) } catch { - case e: Predef.NoSuchElementException => + case e: NoSuchElementException => e.getMessage should endWith("not present") } } diff --git a/akka-persistence/akka-persistence-redis/src/test/scala/RedisStorageBackendSpec.scala b/akka-persistence/akka-persistence-redis/src/test/scala/RedisStorageBackendSpec.scala index 7cb659fbf5..8433c866cf 100644 --- a/akka-persistence/akka-persistence-redis/src/test/scala/RedisStorageBackendSpec.scala +++ b/akka-persistence/akka-persistence-redis/src/test/scala/RedisStorageBackendSpec.scala @@ -221,11 +221,10 @@ class RedisStorageBackendSpec extends } } -case class Name(id: Int, name: String, address: String) - -/** case class Name(id: Int, name: String, address: String) extends Serializable.SBinary[Name] { + import sbinary._ + import sbinary.Operations._ import sbinary.DefaultProtocol._ def this() = this(0, null, null) @@ -246,4 +245,3 @@ case class Name(id: Int, name: String, address: String) def toBytes: Array[Byte] = toByteArray(this) } -**/ diff --git a/akka-samples/akka-sample-chat/src/main/scala/ChatServer.scala b/akka-samples/akka-sample-chat/src/main/scala/ChatServer.scala index 4ff7e1e0c6..6afd7baaf2 100644 --- a/akka-samples/akka-sample-chat/src/main/scala/ChatServer.scala +++ b/akka-samples/akka-sample-chat/src/main/scala/ChatServer.scala @@ -166,7 +166,7 @@ trait ChatManagement { this: Actor => * Creates and links a RedisChatStorage. */ trait RedisChatStorageFactory { this: Actor => - val storage: ChatStorage = spawnLink(classOf[RedisChatStorage]) // starts and links ChatStorage + val storage: ChatStorage = spawnLink[RedisChatStorage] // starts and links ChatStorage } /** diff --git a/akka-samples/akka-sample-security/src/main/scala/SimpleService.scala b/akka-samples/akka-sample-security/src/main/scala/SimpleService.scala index b6183cfda9..92b742ab8b 100644 --- a/akka-samples/akka-sample-security/src/main/scala/SimpleService.scala +++ b/akka-samples/akka-sample-security/src/main/scala/SimpleService.scala @@ -7,7 +7,7 @@ package se.scalablesolutions.akka.security.samples import se.scalablesolutions.akka.actor.{SupervisorFactory, Actor} import se.scalablesolutions.akka.config.ScalaConfig._ import se.scalablesolutions.akka.util.Logging -import se.scalablesolutions.akka.security.{DigestAuthenticationActor, UserInfo} +import se.scalablesolutions.akka.security.{BasicAuthenticationActor,BasicCredentials,SpnegoAuthenticationActor,DigestAuthenticationActor, UserInfo} import se.scalablesolutions.akka.stm.TransactionalState class Boot { diff --git a/embedded-repo/com/redis/redisclient/1.2-SNAPSHOT/redisclient-1.2-SNAPSHOT.jar b/embedded-repo/com/redis/redisclient/1.2-SNAPSHOT/redisclient-1.2-SNAPSHOT.jar deleted file mode 100644 index 88815a75d9..0000000000 Binary files a/embedded-repo/com/redis/redisclient/1.2-SNAPSHOT/redisclient-1.2-SNAPSHOT.jar and /dev/null differ diff --git a/embedded-repo/com/redis/redisclient/2.8.0.Beta1-1.2-SNAPSHOT/redisclient-2.8.0.Beta1-1.2-SNAPSHOT.jar b/embedded-repo/com/redis/redisclient/2.8.0.Beta1-1.2-SNAPSHOT/redisclient-2.8.0.Beta1-1.2-SNAPSHOT.jar new file mode 100644 index 0000000000..8f84253cf3 Binary files /dev/null and b/embedded-repo/com/redis/redisclient/2.8.0.Beta1-1.2-SNAPSHOT/redisclient-2.8.0.Beta1-1.2-SNAPSHOT.jar differ diff --git a/embedded-repo/com/redis/redisclient/1.2-SNAPSHOT/redisclient-1.2-SNAPSHOT.pom b/embedded-repo/com/redis/redisclient/2.8.0.Beta1-1.2-SNAPSHOT/redisclient-2.8.0.Beta1-1.2-SNAPSHOT.pom similarity index 89% rename from embedded-repo/com/redis/redisclient/1.2-SNAPSHOT/redisclient-1.2-SNAPSHOT.pom rename to embedded-repo/com/redis/redisclient/2.8.0.Beta1-1.2-SNAPSHOT/redisclient-2.8.0.Beta1-1.2-SNAPSHOT.pom index 0d27588814..21f8040bdf 100755 --- a/embedded-repo/com/redis/redisclient/1.2-SNAPSHOT/redisclient-1.2-SNAPSHOT.pom +++ b/embedded-repo/com/redis/redisclient/2.8.0.Beta1-1.2-SNAPSHOT/redisclient-2.8.0.Beta1-1.2-SNAPSHOT.pom @@ -3,6 +3,6 @@ 4.0.0 com.redis redisclient - 1.2-SNAPSHOT + 2.8.0.Beta1-1.2-SNAPSHOT jar diff --git a/embedded-repo/sbinary/sbinary/0.3/sbinary-0.3.jar b/embedded-repo/sbinary/sbinary/0.3/sbinary-0.3.jar deleted file mode 100644 index e7839cfb24..0000000000 Binary files a/embedded-repo/sbinary/sbinary/0.3/sbinary-0.3.jar and /dev/null differ diff --git a/embedded-repo/sbinary/sbinary/0.3/sbinary-0.3.pom b/embedded-repo/sbinary/sbinary/2.8.0.Beta1-2.8.0.Beta1-0.3.1-SNAPSHOT/2.8.0.Beta1-2.8.0.Beta1-0.3.1-SNAPSHOT.pom similarity index 86% rename from embedded-repo/sbinary/sbinary/0.3/sbinary-0.3.pom rename to embedded-repo/sbinary/sbinary/2.8.0.Beta1-2.8.0.Beta1-0.3.1-SNAPSHOT/2.8.0.Beta1-2.8.0.Beta1-0.3.1-SNAPSHOT.pom index 5110b4fdbe..b0581caf71 100644 --- a/embedded-repo/sbinary/sbinary/0.3/sbinary-0.3.pom +++ b/embedded-repo/sbinary/sbinary/2.8.0.Beta1-2.8.0.Beta1-0.3.1-SNAPSHOT/2.8.0.Beta1-2.8.0.Beta1-0.3.1-SNAPSHOT.pom @@ -3,6 +3,6 @@ 4.0.0 sbinary sbinary - 0.3 + 2.8.0.Beta1-2.8.0.Beta1-0.3.1-SNAPSHOT jar \ No newline at end of file diff --git a/embedded-repo/sbinary/sbinary/2.8.0.Beta1-2.8.0.Beta1-0.3.1-SNAPSHOT/sbinary-2.8.0.Beta1-2.8.0.Beta1-0.3.1-SNAPSHOT.jar b/embedded-repo/sbinary/sbinary/2.8.0.Beta1-2.8.0.Beta1-0.3.1-SNAPSHOT/sbinary-2.8.0.Beta1-2.8.0.Beta1-0.3.1-SNAPSHOT.jar new file mode 100644 index 0000000000..1da2c02302 Binary files /dev/null and b/embedded-repo/sbinary/sbinary/2.8.0.Beta1-2.8.0.Beta1-0.3.1-SNAPSHOT/sbinary-2.8.0.Beta1-2.8.0.Beta1-0.3.1-SNAPSHOT.jar differ diff --git a/project/build/AkkaProject.scala b/project/build/AkkaProject.scala index 7db64b0348..d601453ae2 100644 --- a/project/build/AkkaProject.scala +++ b/project/build/AkkaProject.scala @@ -170,7 +170,7 @@ class AkkaParent(info: ProjectInfo) extends DefaultProject(info) { val dispatch_json = "net.databinder" % "dispatch-json_2.8.0.Beta1" % "0.6.6" % "compile" val dispatch_htdisttp = "net.databinder" % "dispatch-http_2.8.0.Beta1" % "0.6.6" % "compile" val sjson = "sjson.json" % "sjson" % "0.5-SNAPSHOT-2.8.Beta1" % "compile" -// val sbinary = "sbinary" % "sbinary" % "0.3" % "compile" + val sbinary = "sbinary" % "sbinary" % "2.8.0.Beta1-2.8.0.Beta1-0.3.1-SNAPSHOT" % "compile" val jackson = "org.codehaus.jackson" % "jackson-mapper-asl" % "1.2.1" % "compile" val jackson_core = "org.codehaus.jackson" % "jackson-core-asl" % "1.2.1" % "compile" val voldemort = "voldemort.store.compress" % "h2-lzf" % "1.0" % "compile" @@ -254,7 +254,7 @@ class AkkaParent(info: ProjectInfo) extends DefaultProject(info) { } class AkkaRedisProject(info: ProjectInfo) extends DefaultProject(info) { - val redis = "com.redis" % "redisclient" % "1.2-SNAPSHOT" % "compile" + val redis = "com.redis" % "redisclient" % "2.8.0.Beta1-1.2-SNAPSHOT" % "compile" override def testOptions = TestFilter((name: String) => name.endsWith("Test")) :: Nil lazy val dist = deployTask(info, distPath) dependsOn(`package`) describedAs("Deploying") } @@ -281,8 +281,8 @@ class AkkaParent(info: ProjectInfo) extends DefaultProject(info) { class AkkaPersistenceParentProject(info: ProjectInfo) extends ParentProject(info) { lazy val akka_persistence_common = project("akka-persistence-common", "akka-persistence-common", new AkkaPersistenceCommonProject(_), akka_core) - /*lazy val akka_persistence_redis = project("akka-persistence-redis", "akka-persistence-redis", - new AkkaRedisProject(_), akka_persistence_common)*/ + lazy val akka_persistence_redis = project("akka-persistence-redis", "akka-persistence-redis", + new AkkaRedisProject(_), akka_persistence_common) lazy val akka_persistence_mongo = project("akka-persistence-mongo", "akka-persistence-mongo", new AkkaMongoProject(_), akka_persistence_common) lazy val akka_persistence_cassandra = project("akka-persistence-cassandra", "akka-persistence-cassandra", @@ -374,7 +374,7 @@ class AkkaParent(info: ProjectInfo) extends DefaultProject(info) { } class AkkaSamplesParentProject(info: ProjectInfo) extends ParentProject(info) { - /* lazy val akka_sample_chat = project("akka-sample-chat", "akka-sample-chat", + lazy val akka_sample_chat = project("akka-sample-chat", "akka-sample-chat", new AkkaSampleChatProject(_), akka_kernel) lazy val akka_sample_lift = project("akka-sample-lift", "akka-sample-lift", new AkkaSampleLiftProject(_), akka_kernel) @@ -385,7 +385,7 @@ class AkkaParent(info: ProjectInfo) extends DefaultProject(info) { lazy val akka_sample_camel = project("akka-sample-camel", "akka-sample-camel", new AkkaSampleCamelProject(_), akka_kernel) lazy val akka_sample_security = project("akka-sample-security", "akka-sample-security", - new AkkaSampleSecurityProject(_), akka_kernel) */ + new AkkaSampleSecurityProject(_), akka_kernel) } // ------------------------------------------------------------