resolve more

Author: gengliangwang

core/src/test/scala/org/apache/spark/AccumulatorSuite.scala

@@ -47,15 +47,15 @@ class AccumulatorSuite extends SparkFunSuite with Matchers with LocalSparkContex
 
   implicit def setAccum[A]: AccumulableParam[mutable.Set[A], A] =
     new AccumulableParam[mutable.Set[A], A] {
-      def addInPlace(t1: mutable.Set[A], t2: mutable.Set[A]) : mutable.Set[A] = {
+      def addInPlace(t1: mutable.Set[A], t2: mutable.Set[A]): mutable.Set[A] = {
         t1 ++= t2
         t1
       }
-      def addAccumulator(t1: mutable.Set[A], t2: A) : mutable.Set[A] = {
+      def addAccumulator(t1: mutable.Set[A], t2: A): mutable.Set[A] = {
         t1 += t2
         t1
       }
-      def zero(t: mutable.Set[A]) : mutable.Set[A] = {
+      def zero(t: mutable.Set[A]): mutable.Set[A] = {
         new mutable.HashSet[A]()
       }
     }

core/src/test/scala/org/apache/spark/ContextCleanerSuite.scala

@@ -523,22 +523,22 @@ class CleanerTester(
     toBeCheckpointIds.synchronized { toBeCheckpointIds.isEmpty }
 
   private def getRDDBlocks(rddId: Int): Seq[BlockId] = {
-    blockManager.master.getMatchingBlockIds( _ match {
+    blockManager.master.getMatchingBlockIds(_ match {
       case RDDBlockId(`rddId`, _) => true
       case _ => false
     }, askSlaves = true)
   }
 
   private def getShuffleBlocks(shuffleId: Int): Seq[BlockId] = {
-    blockManager.master.getMatchingBlockIds( _ match {
+    blockManager.master.getMatchingBlockIds(_ match {
       case ShuffleBlockId(`shuffleId`, _, _) => true
       case ShuffleIndexBlockId(`shuffleId`, _, _) => true
       case _ => false
     }, askSlaves = true)
   }
 
   private def getBroadcastBlocks(broadcastId: Long): Seq[BlockId] = {
-    blockManager.master.getMatchingBlockIds( _ match {
+    blockManager.master.getMatchingBlockIds(_ match {
       case BroadcastBlockId(`broadcastId`, _) => true
       case _ => false
     }, askSlaves = true)

core/src/test/scala/org/apache/spark/Smuggle.scala

@@ -62,7 +62,7 @@ object Smuggle {
   private val lock = new ReentrantReadWriteLock
   private val smuggledObjects = mutable.WeakHashMap.empty[Symbol, Any]
 
-  private def get[T](key: Symbol) : T = {
+  private def get[T](key: Symbol): T = {
     lock.readLock().lock()
     try {
       smuggledObjects(key).asInstanceOf[T]
@@ -78,6 +78,6 @@ object Smuggle {
    * @tparam T
    * @return the smuggled object represented by the wrapper.
    */
-  implicit def unpackSmuggledObject[T](smuggle : Smuggle[T]): T = smuggle.smuggledObject
+  implicit def unpackSmuggledObject[T](smuggle: Smuggle[T]): T = smuggle.smuggledObject
 
 }

core/src/test/scala/org/apache/spark/deploy/DeployTestUtils.scala

@@ -30,7 +30,7 @@ private[deploy] object DeployTestUtils {
     new ApplicationDescription("name", Some(4), 1234, cmd, "appUiUrl")
   }
 
-  def createAppInfo() : ApplicationInfo = {
+  def createAppInfo(): ApplicationInfo = {
     val appDesc = createAppDesc()
     val appInfo = new ApplicationInfo(JsonConstants.appInfoStartTime,
       "id", appDesc, JsonConstants.submitDate, null, Int.MaxValue)

core/src/test/scala/org/apache/spark/deploy/SparkSubmitSuite.scala

@@ -64,7 +64,7 @@ trait TestPrematureExit {
   private[spark] def testPrematureExit(
       input: Array[String],
       searchString: String,
-      mainObject: CommandLineUtils = SparkSubmit) : Unit = {
+      mainObject: CommandLineUtils = SparkSubmit): Unit = {
     val printStream = new BufferPrintStream()
     mainObject.printStream = printStream
 

core/src/test/scala/org/apache/spark/deploy/history/ApplicationCacheSuite.scala

@@ -77,7 +77,7 @@ class ApplicationCacheSuite extends SparkFunSuite with Logging with MockitoSugar
     override def getAppUI(appId: String, attemptId: Option[String]): Option[LoadedAppUI] = {
       logDebug(s"getAppUI($appId, $attemptId)")
       getAppUICount += 1
-      instances.get(CacheKey(appId, attemptId)).map( e =>
+      instances.get(CacheKey(appId, attemptId)).map(e =>
         LoadedAppUI(e.ui, updateProbe(appId, attemptId, e.probeTime)))
     }
 
@@ -393,7 +393,7 @@ class ApplicationCacheSuite extends SparkFunSuite with Logging with MockitoSugar
     val ids = new ListBuffer[String]()
     // build a list of applications
     val count = 100
-    for (i <- 1 to count ) {
+    for (i <- 1 to count) {
       val appId = f"app-$i%04d"
       ids += appId
       clock.advance(10)

core/src/test/scala/org/apache/spark/deploy/worker/WorkerSuite.scala

@@ -30,7 +30,7 @@ class WorkerSuite extends SparkFunSuite with Matchers with BeforeAndAfter {
   import org.apache.spark.deploy.DeployTestUtils._
 
   def cmd(javaOpts: String*): Command = {
-    Command("", Seq.empty, Map.empty, Seq.empty, Seq.empty, Seq(javaOpts : _*))
+    Command("", Seq.empty, Map.empty, Seq.empty, Seq.empty, Seq(javaOpts: _*))
   }
   def conf(opts: (String, String)*): SparkConf = new SparkConf(loadDefaults = false).setAll(opts)
 

core/src/test/scala/org/apache/spark/rdd/JdbcRDDSuite.scala

@@ -78,7 +78,7 @@ class JdbcRDDSuite extends SparkFunSuite with BeforeAndAfter with LocalSparkCont
       () => { DriverManager.getConnection("jdbc:derby:target/JdbcRDDSuiteDb") },
       "SELECT DATA FROM FOO WHERE ? <= ID AND ID <= ?",
       1, 100, 3,
-      (r: ResultSet) => { r.getInt(1) } ).cache()
+      (r: ResultSet) => { r.getInt(1) }).cache()
 
     assert(rdd.count === 100)
     assert(rdd.reduce(_ + _) === 10100)
@@ -91,7 +91,7 @@ class JdbcRDDSuite extends SparkFunSuite with BeforeAndAfter with LocalSparkCont
       () => { DriverManager.getConnection("jdbc:derby:target/JdbcRDDSuiteDb") },
       "SELECT DATA FROM BIGINT_TEST WHERE ? <= ID AND ID <= ?",
       1131544775L, 567279358897692673L, 20,
-      (r: ResultSet) => { r.getInt(1) } ).cache()
+      (r: ResultSet) => { r.getInt(1) }).cache()
     assert(rdd.count === 100)
     assert(rdd.reduce(_ + _) === 5050)
   }

core/src/test/scala/org/apache/spark/rdd/ZippedPartitionsSuite.scala

@@ -20,7 +20,7 @@ package org.apache.spark.rdd
 import org.apache.spark.{SharedSparkContext, SparkFunSuite}
 
 object ZippedPartitionsSuite {
-  def procZippedData(i: Iterator[Int], s: Iterator[String], d: Iterator[Double]) : Iterator[Int] = {
+  def procZippedData(i: Iterator[Int], s: Iterator[String], d: Iterator[Double]): Iterator[Int] = {
     Iterator(i.toArray.size, s.toArray.size, d.toArray.size)
   }
 }

core/src/test/scala/org/apache/spark/rpc/RpcEnvSuite.scala

@@ -745,18 +745,18 @@ abstract class RpcEnvSuite extends SparkFunSuite with BeforeAndAfterAll {
 
     // Construct RpcTimeout with a single property
     val rt1 = RpcTimeout(conf, testProp)
-    assert( testDurationSeconds === rt1.duration.toSeconds )
+    assert(testDurationSeconds === rt1.duration.toSeconds )
 
     // Construct RpcTimeout with prioritized list of properties
     val rt2 = RpcTimeout(conf, Seq("spark.ask.invalid.timeout", testProp, secondaryProp), "1s")
-    assert( testDurationSeconds === rt2.duration.toSeconds )
+    assert(testDurationSeconds === rt2.duration.toSeconds )
 
     // Construct RpcTimeout with default value,
     val defaultProp = "spark.ask.default.timeout"
     val defaultDurationSeconds = 1
     val rt3 = RpcTimeout(conf, Seq(defaultProp), defaultDurationSeconds.toString + "s")
-    assert( defaultDurationSeconds === rt3.duration.toSeconds )
-    assert( rt3.timeoutProp.contains(defaultProp) )
+    assert(defaultDurationSeconds === rt3.duration.toSeconds )
+    assert(rt3.timeoutProp.contains(defaultProp) )
 
     // Try to construct RpcTimeout with an unconfigured property
     intercept[NoSuchElementException] {