From 45d53bd520403df8667ff33a6e64526b9e53250c Mon Sep 17 00:00:00 2001 From: Konrad Malawski Date: Fri, 28 Oct 2016 17:22:36 +0200 Subject: [PATCH] fix mima warnings (#21756) --- .../main/scala/akka/serialization/Serialization.scala | 9 +++++---- project/MiMa.scala | 8 +++++++- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/akka-actor/src/main/scala/akka/serialization/Serialization.scala b/akka-actor/src/main/scala/akka/serialization/Serialization.scala index 9ad0134e6c..c7814ab093 100644 --- a/akka-actor/src/main/scala/akka/serialization/Serialization.scala +++ b/akka-actor/src/main/scala/akka/serialization/Serialization.scala @@ -6,7 +6,7 @@ package akka.serialization import com.typesafe.config.Config import akka.actor._ -import akka.event.{ LogMarker, Logging } +import akka.event.{ LogMarker, Logging, LoggingAdapter } import java.util.concurrent.ConcurrentHashMap import scala.collection.mutable.ArrayBuffer @@ -97,7 +97,8 @@ class Serialization(val system: ExtendedActorSystem) extends Extension { import Serialization._ val settings = new Settings(system.settings.config) - val log = Logging.withMarker(system, getClass.getName) + private[this] val _log = Logging.withMarker(system, getClass.getName) + val log: LoggingAdapter = _log private val manifestCache = new AtomicReference[Map[String, Option[Class[_]]]](Map.empty[String, Option[Class[_]]]) /** @@ -226,13 +227,13 @@ class Serialization(val system: ExtendedActorSystem) extends Extension { throw new NotSerializableException("No configured serialization-bindings for class [%s]" format clazz.getName) case possibilities ⇒ if (!unique(possibilities)) - log.warning(LogMarker.Security, "Multiple serializers found for " + clazz + ", choosing first: " + possibilities) + _log.warning(LogMarker.Security, "Multiple serializers found for " + clazz + ", choosing first: " + possibilities) possibilities(0)._2 } serializerMap.putIfAbsent(clazz, ser) match { case null ⇒ if (shouldWarnAboutJavaSerializer(clazz, ser)) { - log.warning(LogMarker.Security, "Using the default Java serializer for class [{}] which is not recommended because of " + + _log.warning(LogMarker.Security, "Using the default Java serializer for class [{}] which is not recommended because of " + "performance implications. Use another serializer or disable this warning using the setting " + "'akka.actor.warn-about-java-serializer-usage'", clazz.getName) } diff --git a/project/MiMa.scala b/project/MiMa.scala index caf028d2af..82e6f32c5e 100644 --- a/project/MiMa.scala +++ b/project/MiMa.scala @@ -1008,7 +1008,13 @@ object MiMa extends AutoPlugin { ProblemFilters.exclude[MissingClassProblem]("akka.stream.scaladsl.Unfold"), // #21194 renamed internal actor method - ProblemFilters.exclude[DirectMissingMethodProblem]("akka.cluster.sharding.ShardCoordinator.allocateShardHomes") + ProblemFilters.exclude[DirectMissingMethodProblem]("akka.cluster.sharding.ShardCoordinator.allocateShardHomes"), + + // MarkerLoggingAdapter introduced (all internal classes) + ProblemFilters.exclude[IncompatibleResultTypeProblem]("akka.actor.LocalActorRefProvider.log"), + ProblemFilters.exclude[IncompatibleResultTypeProblem]("akka.actor.VirtualPathContainer.log"), + ProblemFilters.exclude[IncompatibleMethTypeProblem]("akka.actor.VirtualPathContainer.this"), + ProblemFilters.exclude[IncompatibleMethTypeProblem]("akka.remote.RemoteSystemDaemon.this") ) )