From f7b7c3642dbd943efd55bb3e2b63a8a1549e0c91 Mon Sep 17 00:00:00 2001 From: Konrad `ktoso` Malawski Date: Fri, 10 Mar 2017 14:21:37 +0100 Subject: [PATCH] =pro silence MiMa warning in testkit --- .../src/main/scala/akka/cluster/sharding/Shard.scala | 4 ++-- project/MiMa.scala | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/Shard.scala b/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/Shard.scala index 14db4c577b..ce14ca82d3 100644 --- a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/Shard.scala +++ b/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/Shard.scala @@ -228,7 +228,7 @@ private[akka] class Shard( def passivate(entity: ActorRef, stopMessage: Any): Unit = { idByRef.get(entity) match { - case Some(id) => if (!messageBuffers.contains(id)) { + case Some(id) ⇒ if (!messageBuffers.contains(id)) { log.debug("Passivating started on entity {}", id) passivating = passivating + entity @@ -237,7 +237,7 @@ private[akka] class Shard( } else { log.debug("Passivation already in progress for {}. Not sending stopMessage back to entity.", entity) } - case None => log.debug("Unknown entity {}. Not sending stopMessage back to entity.", entity) + case None ⇒ log.debug("Unknown entity {}. Not sending stopMessage back to entity.", entity) } } diff --git a/project/MiMa.scala b/project/MiMa.scala index 3ef35a24de..e93a160578 100644 --- a/project/MiMa.scala +++ b/project/MiMa.scala @@ -540,7 +540,11 @@ object MiMa extends AutoPlugin { ProblemFilters.exclude[DirectMissingMethodProblem]("akka.stream.stage.GraphStageWithMaterializedValue.module"), ProblemFilters.exclude[MissingClassProblem]("akka.stream.scaladsl.ModuleExtractor"), ProblemFilters.exclude[MissingClassProblem]("akka.stream.scaladsl.ModuleExtractor$"), - ProblemFilters.excludePackage("akka.stream.impl") + ProblemFilters.excludePackage("akka.stream.impl"), + + // small changes in attributes + ProblemFilters.exclude[IncompatibleResultTypeProblem]("akka.stream.testkit.StreamTestKit#ProbeSource.withAttributes"), + ProblemFilters.exclude[IncompatibleResultTypeProblem]("akka.stream.testkit.StreamTestKit#ProbeSink.withAttributes") // NOTE: filters that will be backported to 2.4 should go to the latest 2.4 version below )