Scalastyle fixes

Author: ash211

resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/kubernetes/submit/Client.scala

@@ -23,10 +23,10 @@ import io.fabric8.kubernetes.client.KubernetesClient
 import scala.collection.mutable
 
 import org.apache.spark.SparkConf
+import org.apache.spark.deploy.kubernetes.SparkKubernetesClientFactory
 import org.apache.spark.deploy.kubernetes.config._
 import org.apache.spark.deploy.kubernetes.constants._
 import org.apache.spark.deploy.kubernetes.submit.submitsteps.{DriverConfigurationStep, KubernetesDriverSpec}
-import org.apache.spark.deploy.kubernetes.SparkKubernetesClientFactory
 import org.apache.spark.internal.Logging
 import org.apache.spark.util.Utils
 

resource-managers/kubernetes/core/src/test/scala/org/apache/spark/deploy/kubernetes/InitContainerResourceStagingServerSecretPluginSuite.scala

@@ -20,8 +20,8 @@ import io.fabric8.kubernetes.api.model._
 import org.scalatest.BeforeAndAfter
 import scala.collection.JavaConverters._
 
-import org.apache.spark.deploy.kubernetes.constants._
 import org.apache.spark.SparkFunSuite
+import org.apache.spark.deploy.kubernetes.constants._
 
 class InitContainerResourceStagingServerSecretPluginSuite extends SparkFunSuite with BeforeAndAfter{
   private val INIT_CONTAINER_SECRET_NAME = "init-secret"

resource-managers/kubernetes/core/src/test/scala/org/apache/spark/deploy/kubernetes/SparkPodInitContainerBootstrapSuite.scala

@@ -20,8 +20,8 @@ import io.fabric8.kubernetes.api.model._
 import org.scalatest.BeforeAndAfter
 import scala.collection.JavaConverters._
 
-import org.apache.spark.deploy.kubernetes.constants._
 import org.apache.spark.SparkFunSuite
+import org.apache.spark.deploy.kubernetes.constants._
 
 class SparkPodInitContainerBootstrapSuite extends SparkFunSuite with BeforeAndAfter {
   private val INIT_CONTAINER_IMAGE = "spark-init:latest"

resource-managers/kubernetes/core/src/test/scala/org/apache/spark/deploy/kubernetes/submit/KubernetesExternalShuffleServiceSuite.scala

@@ -17,8 +17,8 @@
 package org.apache.spark.deploy.kubernetes.submit
 
 import org.apache.spark.{SecurityManager, SparkConf, SparkFunSuite}
-import org.apache.spark.deploy.kubernetes.config._
 import org.apache.spark.deploy.kubernetes.KubernetesExternalShuffleService
+import org.apache.spark.deploy.kubernetes.config._
 import org.apache.spark.internal.config
 import org.apache.spark.network.netty.SparkTransportConf
 import org.apache.spark.network.shuffle.kubernetes.KubernetesExternalShuffleClient

resource-managers/yarn/src/test/scala/org/apache/spark/network/yarn/YarnShuffleServiceMetricsSuite.scala

@@ -26,9 +26,9 @@ import org.mockito.Mockito.{mock, times, verify, when}
 import org.scalatest.Matchers
 import scala.collection.JavaConverters._
 
+import org.apache.spark.SparkFunSuite
 import org.apache.spark.network.server.OneForOneStreamManager
 import org.apache.spark.network.shuffle.{ExternalShuffleBlockHandler, ExternalShuffleBlockResolver}
-import org.apache.spark.SparkFunSuite
 
 class YarnShuffleServiceMetricsSuite extends SparkFunSuite with Matchers {