raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Closing #1584 and #1585

Browse source
This commit is contained in:
Viktor Klang 2011-12-29 16:11:56 +01:00
parent 840cacfd2a
commit cffe60bf43
8 changed files with 192 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

21
akka-actor/src/main/scala/akka/serialization/Serializer.scala
View file

@ -8,8 +8,7 @@ import java.io.{ ObjectOutputStream, ByteArrayOutputStream, ObjectInputStream, B
import akka.util.ClassLoaderObjectInputStream
object Serializer {
val defaultSerializerName = classOf[JavaSerializer].getName
type Identifier = Byte
type Identifier = Int
}
/**
@ -17,7 +16,7 @@ object Serializer {
*/
trait Serializer extends scala.Serializable {
/**
* Completely unique Byte value to identify this implementation of Serializer, used to optimize network traffic
* Completely unique value to identify this implementation of Serializer, used to optimize network traffic
* Values from 0 to 16 is reserved for Akka internal usage
*/
def identifier: Serializer.Identifier
@ -27,10 +26,15 @@ trait Serializer extends scala.Serializable {
*/
def toBinary(o: AnyRef): Array[Byte]
/**
* Returns whether this serializer needs a manifest in the fromBinary method
*/
def includeManifest: Boolean
/**
* Produces an object from an array of bytes, with an optional type-hint and a classloader to load the class into
*/
def fromBinary(bytes: Array[Byte], clazz: Option[Class[_]] = None, classLoader: Option[ClassLoader] = None): AnyRef
def fromBinary(bytes: Array[Byte], manifest: Option[Class[_]] = None, classLoader: Option[ClassLoader] = None): AnyRef
}
object JavaSerializer extends JavaSerializer
@ -38,7 +42,9 @@ object NullSerializer extends NullSerializer
class JavaSerializer extends Serializer {
def identifier = 1: Byte
def includeManifest: Boolean = false
def identifier = 1: Serializer.Identifier
def toBinary(o: AnyRef): Array[Byte] = {
val bos = new ByteArrayOutputStream
@ -60,10 +66,9 @@ class JavaSerializer extends Serializer {
}
class NullSerializer extends Serializer {
val nullAsBytes = Array[Byte]()
def identifier = 0: Byte
def includeManifest: Boolean = false
def identifier = 0: Serializer.Identifier
def toBinary(o: AnyRef) = nullAsBytes
def fromBinary(bytes: Array[Byte], clazz: Option[Class[_]] = None, classLoader: Option[ClassLoader] = None): AnyRef = null
}