This is an automated email from the ASF dual-hosted git repository. aljoscha pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/flink.git
commit c41b578924d477c6286b09da6615429b3fe9757b Author: Aljoscha Krettek <[email protected]> AuthorDate: Tue Oct 2 10:19:15 2018 +0200 [FLINK-7811] Add implicit types to make Scala 2.12 happy This wasn't a problem for Scala 2.11 but Scala 2.12 seems to be more strict. --- .../org/apache/flink/mesos/scheduler/LaunchCoordinatorTest.scala | 9 +++++---- .../flink/mesos/scheduler/ReconciliationCoordinatorTest.scala | 8 ++++---- .../scala/org/apache/flink/mesos/scheduler/TaskMonitorTest.scala | 9 +++++---- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/flink-mesos/src/test/scala/org/apache/flink/mesos/scheduler/LaunchCoordinatorTest.scala b/flink-mesos/src/test/scala/org/apache/flink/mesos/scheduler/LaunchCoordinatorTest.scala index a4ae2bb..3b175d3 100644 --- a/flink-mesos/src/test/scala/org/apache/flink/mesos/scheduler/LaunchCoordinatorTest.scala +++ b/flink-mesos/src/test/scala/org/apache/flink/mesos/scheduler/LaunchCoordinatorTest.scala @@ -21,18 +21,19 @@ package org.apache.flink.mesos.scheduler import java.util.{Collections, UUID} import java.util.concurrent.atomic.AtomicReference +import akka.actor.ActorSystem import akka.actor.FSM.StateTimeout import akka.testkit._ import com.netflix.fenzo.TaskRequest.{AssignedResources, NamedResourceSetRequest} import com.netflix.fenzo._ import com.netflix.fenzo.functions.{Action1, Action2} -import org.apache.flink.api.java.tuple.{Tuple2=>FlinkTuple2} +import org.apache.flink.api.java.tuple.{Tuple2 => FlinkTuple2} import org.apache.flink.configuration.Configuration import org.apache.flink.mesos.scheduler.LaunchCoordinator._ import org.apache.flink.mesos.scheduler.messages._ import org.apache.flink.runtime.akka.AkkaUtils import org.apache.mesos.Protos.{SlaveID, TaskInfo} -import org.apache.mesos.{SchedulerDriver, Protos} +import org.apache.mesos.{Protos, SchedulerDriver} import org.junit.runner.RunWith import org.mockito.Mockito.{verify, _} import org.mockito.invocation.InvocationOnMock @@ -56,8 +57,8 @@ class LaunchCoordinatorTest with Matchers with BeforeAndAfterAll { - lazy val config = new Configuration() - implicit lazy val system = AkkaUtils.createLocalActorSystem(config) + lazy val config: Configuration = new Configuration() + implicit lazy val system: ActorSystem = AkkaUtils.createLocalActorSystem(config) override def afterAll(): Unit = { TestKit.shutdownActorSystem(system) diff --git a/flink-mesos/src/test/scala/org/apache/flink/mesos/scheduler/ReconciliationCoordinatorTest.scala b/flink-mesos/src/test/scala/org/apache/flink/mesos/scheduler/ReconciliationCoordinatorTest.scala index c223852..8e97613 100644 --- a/flink-mesos/src/test/scala/org/apache/flink/mesos/scheduler/ReconciliationCoordinatorTest.scala +++ b/flink-mesos/src/test/scala/org/apache/flink/mesos/scheduler/ReconciliationCoordinatorTest.scala @@ -20,14 +20,14 @@ package org.apache.flink.mesos.scheduler import java.util.UUID -import akka.actor.FSM +import akka.actor.{ActorSystem, FSM} import akka.testkit._ import org.apache.flink.configuration.Configuration import org.apache.flink.mesos.Matchers._ import org.apache.flink.mesos.scheduler.messages.{Connected, Disconnected, StatusUpdate} import org.apache.flink.runtime.akka.AkkaUtils import org.apache.mesos.Protos.TaskState._ -import org.apache.mesos.{SchedulerDriver, Protos} +import org.apache.mesos.{Protos, SchedulerDriver} import org.junit.runner.RunWith import org.mockito.Mockito import org.mockito.Mockito._ @@ -44,8 +44,8 @@ class ReconciliationCoordinatorTest import ReconciliationCoordinator._ - lazy val config = new Configuration() - implicit lazy val system = AkkaUtils.createLocalActorSystem(config) + lazy val config: Configuration = new Configuration() + implicit lazy val system: ActorSystem = AkkaUtils.createLocalActorSystem(config) override def afterAll(): Unit = { TestKit.shutdownActorSystem(system) diff --git a/flink-mesos/src/test/scala/org/apache/flink/mesos/scheduler/TaskMonitorTest.scala b/flink-mesos/src/test/scala/org/apache/flink/mesos/scheduler/TaskMonitorTest.scala index b4ef938..564a3e3 100644 --- a/flink-mesos/src/test/scala/org/apache/flink/mesos/scheduler/TaskMonitorTest.scala +++ b/flink-mesos/src/test/scala/org/apache/flink/mesos/scheduler/TaskMonitorTest.scala @@ -20,14 +20,15 @@ package org.apache.flink.mesos.scheduler import java.util.UUID +import akka.actor.ActorSystem import akka.actor.FSM.StateTimeout import akka.testkit._ import org.apache.flink.configuration.Configuration import org.apache.flink.mesos.TestFSMUtils import org.apache.flink.mesos.scheduler.ReconciliationCoordinator.Reconcile -import org.apache.flink.mesos.scheduler.messages.{Disconnected, Connected, StatusUpdate} +import org.apache.flink.mesos.scheduler.messages.{Connected, Disconnected, StatusUpdate} import org.apache.flink.runtime.akka.AkkaUtils -import org.apache.mesos.{SchedulerDriver, Protos} +import org.apache.mesos.{Protos, SchedulerDriver} import org.apache.mesos.Protos.TaskState._ import org.junit.runner.RunWith import org.mockito.Mockito @@ -45,8 +46,8 @@ class TaskMonitorTest import TaskMonitor._ - lazy val config = new Configuration() - implicit lazy val system = AkkaUtils.createLocalActorSystem(config) + lazy val config: Configuration = new Configuration() + implicit lazy val system: ActorSystem = AkkaUtils.createLocalActorSystem(config) override def afterAll(): Unit = { TestKit.shutdownActorSystem(system)
