Apply Scalariform rule to test code and other projects (#6191)

Follow up to #6189
mesosphere · May 7, 2018 · 235c4fa · 235c4fa
1 parent 1d566ef
commit 235c4fa
Show file tree

Hide file tree

Showing 253 changed files with 684 additions and 684 deletions.
diff --git a/benchmark/src/main/scala/mesosphere/marathon/core/health/impl/AppHealthCheckBenchmark.scala b/benchmark/src/main/scala/mesosphere/marathon/core/health/impl/AppHealthCheckBenchmark.scala
@@ -3,11 +3,11 @@ package core.health.impl
 
 import java.util.concurrent.TimeUnit
 
-import mesosphere.marathon.core.health.{ Health, MarathonHttpHealthCheck, PortReference, impl }
-import mesosphere.marathon.core.health.impl.AppHealthCheckActor.{ ApplicationKey, InstanceKey }
+import mesosphere.marathon.core.health.{Health, MarathonHttpHealthCheck, PortReference, impl}
+import mesosphere.marathon.core.health.impl.AppHealthCheckActor.{ApplicationKey, InstanceKey}
 import mesosphere.marathon.core.instance.Instance
 import mesosphere.marathon.state.PathId
-import org.openjdk.jmh.annotations.{ Mode, OutputTimeUnit, Scope, State, BenchmarkMode, Fork, Benchmark }
+import org.openjdk.jmh.annotations.{Mode, OutputTimeUnit, Scope, State, BenchmarkMode, Fork, Benchmark}
 import org.openjdk.jmh.infra.Blackhole
 import mesosphere.marathon.state.Timestamp
 

diff --git a/...in/scala/mesosphere/marathon/core/storage/store/impl/zk/ZkPresistenceStoreBenchmark.scala b/...in/scala/mesosphere/marathon/core/storage/store/impl/zk/ZkPresistenceStoreBenchmark.scala
@@ -4,19 +4,19 @@ package core.storage.store.impl.zk
 import java.util.concurrent.TimeUnit
 
 import akka.Done
-import akka.actor.{ ActorSystem, Scheduler }
-import akka.stream.{ ActorMaterializer, Materializer }
+import akka.actor.{ActorSystem, Scheduler}
+import akka.stream.{ActorMaterializer, Materializer}
 import scala.concurrent.ExecutionContext.Implicits.global
 import mesosphere.marathon.core.base.LifecycleState
-import mesosphere.marathon.storage.{ CuratorZk, StorageConf }
+import mesosphere.marathon.storage.{CuratorZk, StorageConf}
 import mesosphere.marathon.storage.repository.StoredGroup
 import mesosphere.marathon.storage.store.ZkStoreSerialization
 import mesosphere.marathon.upgrade.DependencyGraphBenchmark
 import org.openjdk.jmh.annotations._
 import org.openjdk.jmh.infra.Blackhole
 
 import scala.async.Async._
-import scala.concurrent.{ Await, Future, Promise }
+import scala.concurrent.{Await, Future, Promise}
 import scala.concurrent.duration._
 
 object ZkPresistenceStoreBenchmark {

diff --git a/benchmark/src/main/scala/mesosphere/marathon/json/JsonFormatBenchmark.scala b/benchmark/src/main/scala/mesosphere/marathon/json/JsonFormatBenchmark.scala
@@ -4,13 +4,13 @@ package json
 import java.util.concurrent.TimeUnit
 
 import mesosphere.marathon.api.v2.json.AppAndGroupFormats
-import mesosphere.marathon.core.appinfo.{ AppInfo, EnrichedTask }
+import mesosphere.marathon.core.appinfo.{AppInfo, EnrichedTask}
 import mesosphere.marathon.core.condition.Condition
 import mesosphere.marathon.core.instance.Instance.AgentInfo
 import mesosphere.marathon.core.task.Task
 import mesosphere.marathon.core.task.Task.Status
 import mesosphere.marathon.core.task.state.NetworkInfo
-import mesosphere.marathon.state.{ AppDefinition, EnvVarString, PathId, Timestamp }
+import mesosphere.marathon.state.{AppDefinition, EnvVarString, PathId, Timestamp}
 import org.openjdk.jmh.annotations._
 import org.openjdk.jmh.infra.Blackhole
 import play.api.libs.json.Json

diff --git a/benchmark/src/main/scala/mesosphere/marathon/json/JsonSerializeDeserializeBenchmark.scala b/benchmark/src/main/scala/mesosphere/marathon/json/JsonSerializeDeserializeBenchmark.scala
@@ -3,11 +3,11 @@ package json
 
 import java.util.concurrent.TimeUnit
 
-import mesosphere.marathon.raml.{ GroupConversion, Raml }
-import mesosphere.marathon.state.{ AppDefinition, Group, RootGroup, Timestamp }
+import mesosphere.marathon.raml.{GroupConversion, Raml}
+import mesosphere.marathon.state.{AppDefinition, Group, RootGroup, Timestamp}
 import org.openjdk.jmh.annotations._
 import org.openjdk.jmh.infra.Blackhole
-import play.api.libs.json.{ JsValue, Json }
+import play.api.libs.json.{JsValue, Json}
 
 @State(Scope.Benchmark)
 class JsonSerializeDeserializeState {

diff --git a/benchmark/src/main/scala/mesosphere/marathon/tasks/PortsMatcherBenchmark.scala b/benchmark/src/main/scala/mesosphere/marathon/tasks/PortsMatcherBenchmark.scala
@@ -3,7 +3,7 @@ package tasks
 
 import java.util.concurrent.TimeUnit
 
-import mesosphere.marathon.tasks.PortsMatcher.{ PortRange, PortWithRole }
+import mesosphere.marathon.tasks.PortsMatcher.{PortRange, PortWithRole}
 import org.openjdk.jmh.annotations._
 import org.openjdk.jmh.infra.Blackhole
 

diff --git a/benchmark/src/main/scala/mesosphere/marathon/upgrade/DependencyGraphBenchmark.scala b/benchmark/src/main/scala/mesosphere/marathon/upgrade/DependencyGraphBenchmark.scala
@@ -8,7 +8,7 @@ import mesosphere.marathon.state.AppDefinition.AppKey
 import mesosphere.marathon.state.Group.GroupKey
 import mesosphere.marathon.state.PathId._
 import mesosphere.marathon.state._
-import org.openjdk.jmh.annotations.{ Group => _, _ }
+import org.openjdk.jmh.annotations.{Group => _, _}
 import org.openjdk.jmh.infra.Blackhole
 
 import scala.collection.breakOut

diff --git a/benchmark/src/main/scala/mesosphere/marathon/upgrade/FlatDependencyBenchmark.scala b/benchmark/src/main/scala/mesosphere/marathon/upgrade/FlatDependencyBenchmark.scala
@@ -2,15 +2,15 @@ package mesosphere.marathon
 package upgrade
 
 import java.util.concurrent.TimeUnit
-import mesosphere.marathon.core.pod.{ MesosContainer, BridgeNetwork }
-import mesosphere.marathon.raml.{ Endpoint, Image, ImageType, Resources }
+import mesosphere.marathon.core.pod.{MesosContainer, BridgeNetwork}
+import mesosphere.marathon.raml.{Endpoint, Image, ImageType, Resources}
 import mesosphere.marathon.state.Container
 
 import mesosphere.marathon.state.PathId._
 import mesosphere.marathon.state._
 import mesosphere.marathon.core.deployment.DeploymentPlan
 import mesosphere.marathon.core.pod.PodDefinition
-import org.openjdk.jmh.annotations.{ Group => _, _ }
+import org.openjdk.jmh.annotations.{Group => _, _}
 import org.openjdk.jmh.infra.Blackhole
 
 import scala.collection.breakOut

diff --git a/benchmark/src/main/scala/mesosphere/marathon/upgrade/GroupManagerBenchmark.scala b/benchmark/src/main/scala/mesosphere/marathon/upgrade/GroupManagerBenchmark.scala
@@ -4,13 +4,13 @@ package upgrade
 import java.util.concurrent.TimeUnit
 
 import mesosphere.marathon.core.group.impl.AssignDynamicServiceLogic
-import mesosphere.marathon.core.pod.{ BridgeNetwork, MesosContainer }
-import mesosphere.marathon.raml.{ Endpoint, Image, ImageType, Resources }
+import mesosphere.marathon.core.pod.{BridgeNetwork, MesosContainer}
+import mesosphere.marathon.raml.{Endpoint, Image, ImageType, Resources}
 import mesosphere.marathon.state.Container
 import mesosphere.marathon.state.PathId._
 import mesosphere.marathon.state._
 import mesosphere.marathon.core.pod.PodDefinition
-import org.openjdk.jmh.annotations.{ Group => _, _ }
+import org.openjdk.jmh.annotations.{Group => _, _}
 import org.openjdk.jmh.infra.Blackhole
 
 import scala.collection.breakOut

diff --git a/benchmark/src/main/scala/mesosphere/marathon/upgrade/PathIdBenchmark.scala b/benchmark/src/main/scala/mesosphere/marathon/upgrade/PathIdBenchmark.scala
@@ -4,7 +4,7 @@ package upgrade
 import java.util.concurrent.TimeUnit
 
 import mesosphere.marathon.state.PathId
-import org.openjdk.jmh.annotations.{ Group => _, _ }
+import org.openjdk.jmh.annotations.{Group => _, _}
 import org.openjdk.jmh.infra.Blackhole
 
 import scala.util.Random

diff --git a/mesos-client/src/main/scala/mesosphere/mesos/client/MesosCalls.scala b/mesos-client/src/main/scala/mesosphere/mesos/client/MesosCalls.scala
@@ -2,9 +2,9 @@ package mesosphere.mesos.client
 
 import akka.util.ByteString
 import com.google.protobuf
-import org.apache.mesos.v1.mesos.{ AgentID, ExecutorID, FrameworkID, Filters, KillPolicy, OfferID, Request, TaskID }
-import org.apache.mesos.v1.scheduler.scheduler.Call.{ Accept, Acknowledge, Decline, Kill, Message, Reconcile, Revive }
-import org.apache.mesos.v1.scheduler.scheduler.{ Call, Event }
+import org.apache.mesos.v1.mesos.{AgentID, ExecutorID, FrameworkID, Filters, KillPolicy, OfferID, Request, TaskID}
+import org.apache.mesos.v1.scheduler.scheduler.Call.{Accept, Acknowledge, Decline, Kill, Message, Reconcile, Revive}
+import org.apache.mesos.v1.scheduler.scheduler.{Call, Event}
 
 class MesosCalls(frameworkId: FrameworkID) {
   private val someFrameworkId = Some(frameworkId)

diff --git a/mesos-client/src/main/scala/mesosphere/mesos/client/MesosClient.scala b/mesos-client/src/main/scala/mesosphere/mesos/client/MesosClient.scala
@@ -1,6 +1,6 @@
 package mesosphere.mesos.client
 
-import akka.stream.{ Materializer, OverflowStrategy }
+import akka.stream.{Materializer, OverflowStrategy}
 import java.net.URI
 
 import akka.actor.ActorSystem
@@ -11,12 +11,12 @@ import akka.stream._
 import akka.stream.alpakka.recordio.scaladsl.RecordIOFraming
 import akka.stream.scaladsl._
 import akka.util.ByteString
-import akka.{ Done, NotUsed }
+import akka.{Done, NotUsed}
 import com.typesafe.scalalogging.StrictLogging
 import mesosphere.mesos.conf.MesosClientConf
 import org.apache.mesos.v1.mesos._
-import org.apache.mesos.v1.scheduler.scheduler.{ Call, Event }
-import scala.concurrent.{ ExecutionContext, Future }
+import org.apache.mesos.v1.scheduler.scheduler.{Call, Event}
+import scala.concurrent.{ExecutionContext, Future}
 
 trait MesosClient {
   /**

diff --git a/mesos-client/src/main/scala/mesosphere/mesos/examples/UselessFramework.scala b/mesos-client/src/main/scala/mesosphere/mesos/examples/UselessFramework.scala
@@ -2,16 +2,16 @@ package mesosphere.mesos.examples
 
 import akka.actor.ActorSystem
 import akka.stream.ActorMaterializer
-import akka.stream.scaladsl.{ Sink, Source }
+import akka.stream.scaladsl.{Sink, Source}
 import com.typesafe.scalalogging.StrictLogging
-import mesosphere.mesos.client.{ MesosClient, StrictLoggingFlow }
+import mesosphere.mesos.client.{MesosClient, StrictLoggingFlow}
 import mesosphere.mesos.conf.MesosClientConf
-import org.apache.mesos.v1.mesos.{ Filters, FrameworkInfo }
+import org.apache.mesos.v1.mesos.{Filters, FrameworkInfo}
 import org.apache.mesos.v1.scheduler.scheduler.Event
 import scala.concurrent.Await
 import scala.concurrent.duration._
 
-import scala.util.{ Failure, Success }
+import scala.util.{Failure, Success}
 
 /**
   * Run Foo framework that:

diff --git a/mesos-client/src/test/scala/mesosphere/mesos/client/MesosClientIntegrationTest.scala b/mesos-client/src/test/scala/mesosphere/mesos/client/MesosClientIntegrationTest.scala
@@ -4,14 +4,14 @@ import akka.Done
 import java.util.UUID
 
 import akka.actor.ActorSystem
-import akka.stream.{ ActorMaterializer }
-import akka.stream.scaladsl.{ Sink, Source }
+import akka.stream.{ActorMaterializer}
+import akka.stream.scaladsl.{Sink, Source}
 import com.typesafe.scalalogging.StrictLogging
 import mesosphere.AkkaUnitTest
 import mesosphere.marathon.IntegrationTest
 import mesosphere.marathon.integration.setup.MesosClusterTest
 import mesosphere.mesos.conf.MesosClientConf
-import org.apache.mesos.v1.mesos.{ Filters, FrameworkID, FrameworkInfo }
+import org.apache.mesos.v1.mesos.{Filters, FrameworkID, FrameworkInfo}
 import org.apache.mesos.v1.scheduler.scheduler.Event
 import org.scalatest.Inside
 import org.scalatest.concurrent.Eventually

diff --git a/mesos-simulation/src/main/scala/mesosphere/mesos/simulation/SimulatedDriverWiring.scala b/mesos-simulation/src/main/scala/mesosphere/mesos/simulation/SimulatedDriverWiring.scala
@@ -1,7 +1,7 @@
 package mesosphere.mesos.simulation
 
 import akka.actor.Props
-import org.apache.mesos.{ Scheduler, SchedulerDriver }
+import org.apache.mesos.{Scheduler, SchedulerDriver}
 
 private class SimulatedDriverWiring(scheduler: Scheduler) {
   private lazy val schedulerActorProps = Props(new SchedulerActor(scheduler))

diff --git a/...mulation/src/main/scala/mesosphere/mesos/simulation/SimulatedSchedulerDriverFactory.scala b/...mulation/src/main/scala/mesosphere/mesos/simulation/SimulatedSchedulerDriverFactory.scala
@@ -2,7 +2,7 @@ package mesosphere.mesos.simulation
 
 import javax.inject.Inject
 
-import mesosphere.marathon.{ MarathonScheduler, MarathonSchedulerDriverHolder, SchedulerDriverFactory }
+import mesosphere.marathon.{MarathonScheduler, MarathonSchedulerDriverHolder, SchedulerDriverFactory}
 import org.apache.mesos.SchedulerDriver
 
 class SimulatedSchedulerDriverFactory @Inject() (

diff --git a/mesos-simulation/src/test/scala/mesosphere/mesos/scale/CSVExporter.scala b/mesos-simulation/src/test/scala/mesosphere/mesos/scale/CSVExporter.scala
@@ -1,6 +1,6 @@
 package mesosphere.mesos.scale
 
-import java.io.{ FileWriter, File }
+import java.io.{FileWriter, File}
 
 import mesosphere.marathon.io.IO
 

diff --git a/mesos-simulation/src/test/scala/mesosphere/mesos/scale/DisplayAppScalingResults.scala b/mesos-simulation/src/test/scala/mesosphere/mesos/scale/DisplayAppScalingResults.scala
@@ -65,7 +65,7 @@ object DisplayAppScalingResults {
 
     val sortedRows = rows.sortBy(-_(1).asInstanceOf[Long])
 
-    import DisplayHelpers.{ left, right }
+    import DisplayHelpers.{left, right}
     DisplayHelpers.printTable(
       Seq(left, right, right, right, right, right, right, right, right, right, right),
       DisplayHelpers.withUnderline(header) ++ sortedRows)

diff --git a/mesos-simulation/src/test/scala/mesosphere/mesos/scale/Metric.scala b/mesos-simulation/src/test/scala/mesosphere/mesos/scale/Metric.scala
@@ -23,18 +23,18 @@ case class Counter(name: String, count: Int) extends Metric {
 }
 
 case class Histogram(
-  name: String,
-  count: Int,
-  max: Double,
-  mean: Double,
-  min: Double,
-  p50: Double,
-  p75: Double,
-  p95: Double,
-  p98: Double,
-  p99: Double,
-  p999: Double,
-  stddev: Double) extends Metric
+    name: String,
+    count: Int,
+    max: Double,
+    mean: Double,
+    min: Double,
+    p50: Double,
+    p75: Double,
+    p95: Double,
+    p98: Double,
+    p99: Double,
+    p999: Double,
+    stddev: Double) extends Metric
 
 case class Meter(
     name: String,
@@ -48,24 +48,24 @@ case class Meter(
 }
 
 case class Timer(
-  name: String,
-  count: Int,
-  max: Double,
-  mean: Double,
-  min: Double,
-  p50: Double,
-  p75: Double,
-  p95: Double,
-  p98: Double,
-  p99: Double,
-  p999: Double,
-  stddev: Double,
-  m15_rate: Double,
-  m1_rate: Double,
-  m5_rate: Double,
-  mean_rate: Double,
-  duration_units: String,
-  rate_units: String) extends Metric
+    name: String,
+    count: Int,
+    max: Double,
+    mean: Double,
+    min: Double,
+    p50: Double,
+    p75: Double,
+    p95: Double,
+    p98: Double,
+    p99: Double,
+    p999: Double,
+    stddev: Double,
+    m15_rate: Double,
+    m1_rate: Double,
+    m5_rate: Double,
+    mean_rate: Double,
+    duration_units: String,
+    rate_units: String) extends Metric
 
 case class MetricsSample(
     version: String,

diff --git a/src/test/scala/mesosphere/UnitTest.scala b/src/test/scala/mesosphere/UnitTest.scala
@@ -1,21 +1,21 @@
 package mesosphere
 
-import java.util.concurrent.{ LinkedBlockingDeque, TimeUnit }
+import java.util.concurrent.{LinkedBlockingDeque, TimeUnit}
 
-import akka.actor.{ ActorSystem, Scheduler }
-import akka.stream.{ ActorMaterializer, Materializer }
-import akka.testkit.{ TestActor, TestActorRef, TestKitBase }
+import akka.actor.{ActorSystem, Scheduler}
+import akka.stream.{ActorMaterializer, Materializer}
+import akka.testkit.{TestActor, TestActorRef, TestKitBase}
 import akka.util.Timeout
-import com.typesafe.config.{ Config, ConfigFactory }
+import com.typesafe.config.{Config, ConfigFactory}
 import com.typesafe.scalalogging.StrictLogging
 import mesosphere.marathon.test.Mockito
 import org.scalactic.source.Position
-import org.scalatest.matchers.{ BeMatcher, MatchResult }
+import org.scalatest.matchers.{BeMatcher, MatchResult}
 import org.scalatest._
-import org.scalatest.concurrent.{ JavaFutures, ScalaFutures, TimeLimitedTests }
-import org.scalatest.time.{ Minute, Minutes, Seconds, Span }
+import org.scalatest.concurrent.{JavaFutures, ScalaFutures, TimeLimitedTests}
+import org.scalatest.time.{Minute, Minutes, Seconds, Span}
 import mesosphere.marathon.integration.setup.RestResult
-import mesosphere.marathon.raml.{ PodState, PodStatus }
+import mesosphere.marathon.raml.{PodState, PodStatus}
 
 import scala.concurrent.ExecutionContextExecutor
 

diff --git a/src/test/scala/mesosphere/ValidationTestLike.scala b/src/test/scala/mesosphere/ValidationTestLike.scala
@@ -1,14 +1,14 @@
 package mesosphere
 
-import com.wix.accord.Descriptions.{ Generic, Path }
+import com.wix.accord.Descriptions.{Generic, Path}
 import com.wix.accord._
 import mesosphere.marathon.Normalization
 import mesosphere.marathon.ValidationFailedException
 import mesosphere.marathon.api.v2.Validation
 import mesosphere.marathon.api.v2.Validation.ConstraintViolation
 import org.scalatest._
-import org.scalatest.matchers.{ BePropertyMatchResult, BePropertyMatcher, MatchResult, Matcher }
-import play.api.libs.json.{ Format, JsError, Json }
+import org.scalatest.matchers.{BePropertyMatchResult, BePropertyMatcher, MatchResult, Matcher}
+import play.api.libs.json.{Format, JsError, Json}
 
 import scala.collection.breakOut
 

diff --git a/src/test/scala/mesosphere/marathon/ForwardingActor.scala b/src/test/scala/mesosphere/marathon/ForwardingActor.scala
@@ -1,6 +1,6 @@
 package mesosphere.marathon
 
-import akka.actor.{ Actor, ActorRef, Props }
+import akka.actor.{Actor, ActorRef, Props}
 
 /**
   * An actor which forwards all its messages

diff --git a/src/test/scala/mesosphere/marathon/LaunchQueueModuleTest.scala b/src/test/scala/mesosphere/marathon/LaunchQueueModuleTest.scala
@@ -5,9 +5,9 @@ import java.time.Clock
 import mesosphere.AkkaUnitTest
 import mesosphere.marathon.core.instance.TestInstanceBuilder
 import mesosphere.marathon.core.instance.TestInstanceBuilder._
-import mesosphere.marathon.core.instance.update.{ InstanceUpdateEffect, InstanceUpdateOperation }
+import mesosphere.marathon.core.instance.update.{InstanceUpdateEffect, InstanceUpdateOperation}
 import mesosphere.marathon.core.launcher.impl.InstanceOpFactoryHelper
-import mesosphere.marathon.core.launcher.{ InstanceOpFactory, OfferMatchResult }
+import mesosphere.marathon.core.launcher.{InstanceOpFactory, OfferMatchResult}
 import mesosphere.marathon.core.launchqueue.LaunchQueueModule
 import mesosphere.marathon.core.leadership.AlwaysElectedLeadershipModule
 import mesosphere.marathon.core.matcher.DummyOfferMatcherManager

diff --git a/src/test/scala/mesosphere/marathon/MarathonConfTest.scala b/src/test/scala/mesosphere/marathon/MarathonConfTest.scala
@@ -4,7 +4,7 @@ import mesosphere.UnitTest
 import mesosphere.marathon.state.ResourceRole
 import mesosphere.marathon.test.MarathonTestHelper
 
-import scala.util.{ Failure, Try }
+import scala.util.{Failure, Try}
 
 class MarathonConfTest extends UnitTest {
   private[this] val principal = "foo"