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

remove deprecated constructor in serializers, #21423

Browse source
This commit is contained in:
Patrik Nordwall 2017-01-19 15:12:01 +01:00
parent cc8c543b90
commit db74c33130
5 changed files with 8 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -281,14 +281,6 @@ object JavaSerializer {
*/ */
class JavaSerializer(val system: ExtendedActorSystem) extends BaseSerializer { class JavaSerializer(val system: ExtendedActorSystem) extends BaseSerializer {
@deprecated("Use constructor with ExtendedActorSystem", "2.4")
def this() = this(null)
// TODO remove this when deprecated this() is removed
override val identifier: Int =
if (system eq null) 1
else identifierFromConfig
def includeManifest: Boolean = false def includeManifest: Boolean = false
def toBinary(o: AnyRef): Array[Byte] = { def toBinary(o: AnyRef): Array[Byte] = {
@ -324,14 +316,6 @@ class NullSerializer extends Serializer {
*/ */
class ByteArraySerializer(val system: ExtendedActorSystem) extends BaseSerializer with ByteBufferSerializer { class ByteArraySerializer(val system: ExtendedActorSystem) extends BaseSerializer with ByteBufferSerializer {
@deprecated("Use constructor with ExtendedActorSystem", "2.4")
def this() = this(null)
// TODO remove this when deprecated this() is removed
override val identifier: Int =
if (system eq null) 4
else identifierFromConfig
def includeManifest: Boolean = false def includeManifest: Boolean = false
def toBinary(o: AnyRef): Array[Byte] = o match { def toBinary(o: AnyRef): Array[Byte] = o match {
case null ⇒ null case null ⇒ null

8
akka-cluster/src/main/scala/akka/cluster/protobuf/ClusterMessageSerializer.scala
View file

@ -26,14 +26,6 @@ import akka.cluster.InternalClusterAction.ExitingConfirmed
*/ */
class ClusterMessageSerializer(val system: ExtendedActorSystem) extends BaseSerializer { class ClusterMessageSerializer(val system: ExtendedActorSystem) extends BaseSerializer {
@deprecated("Use constructor with ExtendedActorSystem", "2.4")
def this() = this(null)
// TODO remove this when deprecated this() is removed
override val identifier: Int =
if (system eq null) 5
else identifierFromConfig
private final val BufferSize = 1024 * 4 private final val BufferSize = 1024 * 4
// must be lazy because serializer is initialized from Cluster extension constructor // must be lazy because serializer is initialized from Cluster extension constructor
private lazy val GossipTimeToLive = Cluster(system).settings.GossipTimeToLive private lazy val GossipTimeToLive = Cluster(system).settings.GossipTimeToLive

8
akka-remote/src/main/scala/akka/remote/serialization/MessageContainerSerializer.scala
View file

@ -18,16 +18,8 @@ import akka.serialization.SerializerWithStringManifest
class MessageContainerSerializer(val system: ExtendedActorSystem) extends BaseSerializer { class MessageContainerSerializer(val system: ExtendedActorSystem) extends BaseSerializer {
@deprecated("Use constructor with ExtendedActorSystem", "2.4")
def this() = this(null)
private lazy val serialization = SerializationExtension(system) private lazy val serialization = SerializationExtension(system)
// TODO remove this when deprecated this() is removed
override val identifier: Int =
if (system eq null) 6
else identifierFromConfig
def includeManifest: Boolean = false def includeManifest: Boolean = false
def toBinary(obj: AnyRef): Array[Byte] = obj match { def toBinary(obj: AnyRef): Array[Byte] = obj match {

8
akka-remote/src/main/scala/akka/remote/serialization/ProtobufSerializer.scala
View file

@ -40,14 +40,6 @@ object ProtobufSerializer {
*/ */
class ProtobufSerializer(val system: ExtendedActorSystem) extends BaseSerializer { class ProtobufSerializer(val system: ExtendedActorSystem) extends BaseSerializer {
@deprecated("Use constructor with ExtendedActorSystem", "2.4")
def this() = this(null)
// TODO remove this when deprecated this() is removed
override val identifier: Int =
if (system eq null) 2
else identifierFromConfig
@deprecated("Will be removed without replacement", "2.4") @deprecated("Will be removed without replacement", "2.4")
val ARRAY_OF_BYTE_ARRAY = Array[Class[_]](classOf[Array[Byte]]) val ARRAY_OF_BYTE_ARRAY = Array[Class[_]](classOf[Array[Byte]])

8
project/MiMa.scala
View file

@ -261,6 +261,14 @@ object MiMa extends AutoPlugin {
ProblemFilters.exclude[MissingClassProblem]("akka.util.Crypt"), ProblemFilters.exclude[MissingClassProblem]("akka.util.Crypt"),
ProblemFilters.exclude[MissingClassProblem]("akka.util.Crypt$"), ProblemFilters.exclude[MissingClassProblem]("akka.util.Crypt$"),
// #21423 removal of deprecated serializer constructors (in 2.5.x)
ProblemFilters.exclude[DirectMissingMethodProblem]("akka.remote.serialization.ProtobufSerializer.this"),
ProblemFilters.exclude[DirectMissingMethodProblem]("akka.remote.serialization.MessageContainerSerializer.this"),
ProblemFilters.exclude[DirectMissingMethodProblem]("akka.remote.serialization.DaemonMsgCreateSerializer.this"),
ProblemFilters.exclude[DirectMissingMethodProblem]("akka.serialization.JavaSerializer.this"),
ProblemFilters.exclude[DirectMissingMethodProblem]("akka.serialization.ByteArraySerializer.this"),
ProblemFilters.exclude[DirectMissingMethodProblem]("akka.cluster.protobuf.ClusterMessageSerializer.this"),
// #21423 removal of deprecated `PersistentView` (in 2.5.x) // #21423 removal of deprecated `PersistentView` (in 2.5.x)
ProblemFilters.exclude[MissingClassProblem]("akka.persistence.Update"), ProblemFilters.exclude[MissingClassProblem]("akka.persistence.Update"),
ProblemFilters.exclude[MissingClassProblem]("akka.persistence.Update$"), ProblemFilters.exclude[MissingClassProblem]("akka.persistence.Update$"),