SPARK-11323 style: methods whose arg list is multiline have newline before first arg

Author: steveloughran

yarn/src/history/main/scala/org/apache/spark/deploy/history/yarn/rest/JerseyBinding.scala

@@ -77,7 +77,8 @@ private[spark] object JerseyBinding extends Logging {
    * @param thrown exception caught
    * @return an exception to log, ingore, throw...
    */
-  def translateException(verb: String,
+  def translateException(
+    verb: String,
     targetURL: URI,
     thrown: Throwable): Throwable = {
     thrown match {
@@ -110,7 +111,8 @@ private[spark] object JerseyBinding extends Logging {
    * @param exception original exception
    * @return an exception to throw
    */
-  def translateException(verb: String,
+  def translateException(
+    verb: String,
     targetURL: URI,
     exception: ClientHandlerException): IOException = {
     val uri = if (targetURL !=null) targetURL.toString else "unknown URL"
@@ -162,7 +164,8 @@ private[spark] object JerseyBinding extends Logging {
    * @param exception original exception
    * @return a new exception, the original one nested as a cause
    */
-  def translateException(verb: String,
+  def translateException(
+    verb: String,
     targetURL: URI,
     exception: UniformInterfaceException): IOException = {
     var ioe: IOException = null
@@ -215,10 +218,11 @@ private[spark] object JerseyBinding extends Logging {
    * @param token optional delegation token
    * @return a new client instance
    */
-  def createJerseyClient(conf: Configuration,
-      clientConfig: ClientConfig,
-      token: DelegationTokenAuthenticatedURL.Token = new DelegationTokenAuthenticatedURL.Token):
-  Client = {
+  def createJerseyClient(
+    conf: Configuration,
+    clientConfig: ClientConfig,
+    token: DelegationTokenAuthenticatedURL.Token = new DelegationTokenAuthenticatedURL.Token)
+    : Client = {
     new JerseyBinding(conf, token).createClient(conf, clientConfig)
   }
 

yarn/src/history/main/scala/org/apache/spark/deploy/history/yarn/rest/LoggingKerberosDelegationTokenAuthenticator.scala

@@ -56,8 +56,12 @@ private[spark] class LoggingKerberosDelegationTokenAuthenticator
   /**
    * Low level token renewal operation
    */
-  override def renewDelegationToken(url: URL, token: AuthToken,
-      dToken: Token[AbstractDelegationTokenIdentifier], doAsUser: String): Long = {
+  override def renewDelegationToken(
+    url: URL,
+    token: AuthToken,
+    dToken: Token[AbstractDelegationTokenIdentifier],
+    doAsUser: String): Long = {
+
     val orig = dToken.toString
     val user = if (doAsUser != null) s"user=$doAsUser" else ""
     logInfo(s"Renewing token against $url $user")

yarn/src/history/main/scala/org/apache/spark/deploy/history/yarn/rest/SpnegoUrlConnector.scala

@@ -178,7 +178,8 @@ private[spark] class SpnegoUrlConnector(connConfigurator: ConnectionConfigurator
    * @param payloadContentType content type. Required if payload != null
    * @return the response
    */
-  def execHttpOperation(verb: String,
+  def execHttpOperation(
+    verb: String,
     url: URL,
     payload: Array[Byte] = null,
     payloadContentType: String = ""): HttpOperationResponse = {

yarn/src/history/main/scala/org/apache/spark/deploy/history/yarn/server/ApplicationListingResults.scala

@@ -86,8 +86,8 @@ private[spark] class ApplicationListingResults(
    * @param attemptId attempt ID
    * @return (app, attempt, attempt) options.
    */
-  def lookupAttempt(appId: String, attemptId: Option[String]):
-  (Option[TimelineApplicationHistoryInfo], Option[TimelineApplicationAttemptInfo],
+  def lookupAttempt(appId: String, attemptId: Option[String])
+  : (Option[TimelineApplicationHistoryInfo], Option[TimelineApplicationAttemptInfo],
       List[TimelineApplicationAttemptInfo] ) = {
     val foundApp = lookup(appId)
     if (foundApp.isEmpty) {

yarn/src/history/main/scala/org/apache/spark/deploy/history/yarn/server/TimelineQueryClient.scala

@@ -46,7 +46,8 @@ import org.apache.spark.deploy.history.yarn.rest.{HttpRequestException, JerseyBi
  * @param conf Hadoop configuration
  * @param jerseyClientConfig Jersey client configuration
  */
-private[spark] class TimelineQueryClient(timelineURI: URI,
+private[spark] class TimelineQueryClient(
+    timelineURI: URI,
     conf: Configuration,
     jerseyClientConfig: ClientConfig)
     extends Logging with Closeable {
@@ -64,8 +65,7 @@ private[spark] class TimelineQueryClient(timelineURI: URI,
   /**
    * the delegation token (unused until delegation support implemented)
    */
-  private var token: DelegationTokenAuthenticatedURL.Token =
-    new DelegationTokenAuthenticatedURL.Token
+  private var token = new DelegationTokenAuthenticatedURL.Token
 
   /**
    * The last time there was a token renewal operation.
@@ -311,7 +311,8 @@ private[spark] class TimelineQueryClient(timelineURI: URI,
    * @param fromTs optional timestamp to start from
    * @return a possibly empty list of entities
    */
-    def listEntities(entityType: String,
+    def listEntities(
+      entityType: String,
         primaryFilter: Option[(String, String)] = None,
         secondaryFilters: Map[String, String] = Map(),
         fields: Seq[String] = Nil,

yarn/src/history/main/scala/org/apache/spark/deploy/history/yarn/server/YarnHistoryProvider.scala

@@ -529,7 +529,8 @@ private[spark] class YarnHistoryProvider(sparkConf: SparkConf)
    * @return  the result of the last successful listing operation,
    *          or a listing with no history events if there has been a failure
    */
-   def listApplications(limit: Option[Long] = None,
+   def listApplications(
+      limit: Option[Long] = None,
       windowStart: Option[Long] = None,
       windowEnd: Option[Long] = None): ApplicationListingResults = {
     if (!enabled) {

yarn/src/history/main/scala/org/apache/spark/deploy/history/yarn/server/YarnProviderUtils.scala

@@ -127,7 +127,8 @@ private[spark] object YarnProviderUtils extends Logging {
    * @param latest later list of entries
    * @return a combined list.
    */
-  def combineResults(original: Seq[TimelineApplicationHistoryInfo],
+  def combineResults(
+      original: Seq[TimelineApplicationHistoryInfo],
       latest: Seq[TimelineApplicationHistoryInfo]): Seq[TimelineApplicationHistoryInfo] = {
     // build map of original
     val results = new scala.collection.mutable.HashMap[String, TimelineApplicationHistoryInfo]
@@ -157,8 +158,8 @@ private[spark] object YarnProviderUtils extends Logging {
    * @param latest the latest attempt
    * @return the merged set
    */
-  def mergeAttempts(old: TimelineApplicationHistoryInfo, latest: TimelineApplicationHistoryInfo):
-  TimelineApplicationHistoryInfo = {
+  def mergeAttempts(old: TimelineApplicationHistoryInfo, latest: TimelineApplicationHistoryInfo)
+    : TimelineApplicationHistoryInfo = {
     val oldAttempts = old.attempts
     val latestAttempts = latest.attempts
     new TimelineApplicationHistoryInfo(old.id, old.name,
@@ -173,7 +174,8 @@ private[spark] object YarnProviderUtils extends Logging {
    * @return an ordered list of attempts with original attempt entries removed if a later
    *         version updated the event information.
    */
-  def mergeAttemptInfoLists(oldAttempts: List[TimelineApplicationAttemptInfo],
+  def mergeAttemptInfoLists(
+      oldAttempts: List[TimelineApplicationAttemptInfo],
       latestAttempts: List[TimelineApplicationAttemptInfo])
     : List[TimelineApplicationAttemptInfo] = {
 
@@ -210,7 +212,8 @@ private[spark] object YarnProviderUtils extends Logging {
    * @param attempt2 attempt 2
    * @return the preferred outcome
    */
-  def mostRecentAttempt(attempt1: TimelineApplicationAttemptInfo,
+  def mostRecentAttempt
+  (attempt1: TimelineApplicationAttemptInfo,
       attempt2: TimelineApplicationAttemptInfo): TimelineApplicationAttemptInfo = {
     (attempt1, attempt2) match {
       case (a1, a2) if a1.version > 0 && a2.version > 0 =>
@@ -230,7 +233,8 @@ private[spark] object YarnProviderUtils extends Logging {
    * @param attempt2 attempt 2
    * @return true if attempt1 is considered newer than attempt2
    */
-  def attemptNewerThan(attempt1: TimelineApplicationAttemptInfo,
+  def attemptNewerThan(
+      attempt1: TimelineApplicationAttemptInfo,
       attempt2: TimelineApplicationAttemptInfo): Boolean = {
     if (attempt1.version > 0 && attempt2.version > 0) {
       attempt1.version > attempt2.version
@@ -318,8 +322,8 @@ private[spark] object YarnProviderUtils extends Logging {
    * @param history history to scan (which can be an empty list)
    * @return the latest element in the list, or `None` for no match
    */
-  def findStartOfWindow(history: Seq[TimelineApplicationHistoryInfo]):
-    Option[TimelineApplicationHistoryInfo] = {
+  def findStartOfWindow(history: Seq[TimelineApplicationHistoryInfo])
+    : Option[TimelineApplicationHistoryInfo] = {
     findIncompleteApplications(history) match {
       // no incomplete apps; use latest
       case Nil => findLatestApplication(history)
@@ -439,7 +443,8 @@ private[spark] object YarnProviderUtils extends Logging {
    * @param livenessWindow the window in millis within which apps are considered automatically live
    * @return list of apps which are marked as incomplete but no longer running
    */
-  private[yarn] def completeAppsFromYARN(apps: Seq[TimelineApplicationHistoryInfo],
+  private[yarn] def completeAppsFromYARN(
+      apps: Seq[TimelineApplicationHistoryInfo],
       recordMap: Map[String, ApplicationReport],
       currentTime: Long,
       livenessWindow: Long): Seq[TimelineApplicationHistoryInfo] = {

yarn/src/history/test/scala/org/apache/spark/deploy/history/yarn/integration/AbstractHistoryIntegrationTests.scala

@@ -288,7 +288,8 @@ abstract class AbstractHistoryIntegrationTests
    * @param history service to flush
    * @param delay time to wait for an empty queue
    */
-  def flushHistoryServiceToSuccess(history: YarnHistoryService,
+  def flushHistoryServiceToSuccess(
+      history: YarnHistoryService,
       delay: Int = TEST_STARTUP_DELAY): Unit = {
     assertNotNull(history, "null history queue")
     historyService.asyncFlush()

yarn/src/history/test/scala/org/apache/spark/deploy/history/yarn/integration/AsyncRefreshSuite.scala

@@ -141,8 +141,11 @@ class AsyncRefreshSuite extends AbstractHistoryIntegrationTests {
    * @param timeout timeout
    * @return the successful listing
    */
-  def awaitRefreshMessageProcessed (provider: TimeManagedHistoryProvider,
-      initialCount: Long, timeout: Long, text: String): Unit = {
+  def awaitRefreshMessageProcessed (
+      provider: TimeManagedHistoryProvider,
+      initialCount: Long,
+      timeout: Long,
+      text: String): Unit = {
     val refresher = provider.refresher
 
     def listingProbe(): Outcome = {

yarn/src/history/test/scala/org/apache/spark/deploy/history/yarn/integration/IntegrationTestUtils.scala

@@ -35,17 +35,20 @@ import org.apache.spark.scheduler.cluster.{StubApplicationAttemptId, StubApplica
  */
 private[yarn] trait IntegrationTestUtils {
 
-  def appHistoryInfo(id: String,
+  def appHistoryInfo(
+      id: String,
       attempts: List[TimelineApplicationAttemptInfo]): TimelineApplicationHistoryInfo = {
     new TimelineApplicationHistoryInfo(id, id, attempts)
   }
 
-  def appHistoryInfo(id: String,
+  def appHistoryInfo(
+      id: String,
       attempt: TimelineApplicationAttemptInfo): TimelineApplicationHistoryInfo = {
     new TimelineApplicationHistoryInfo(id, id, attempt :: Nil)
   }
 
-  def attempt(id: String,
+  def attempt(
+      id: String,
       startTime: Long,
       endTime: Long,
       lastUpdated: Long,
@@ -64,9 +67,13 @@ private[yarn] trait IntegrationTestUtils {
    * @param finishTime finish time or 0
    * @return the report
    */
-  def stubApplicationReport(id: Int, clusterTimestamp: Long, attempt: Int,
+  def stubApplicationReport(
+      id: Int,
+      clusterTimestamp: Long,
+      attempt: Int,
       state: YarnApplicationState,
-      startTime: Long, finishTime: Long = 0): ApplicationReport = {
+      startTime: Long,
+      finishTime: Long = 0): ApplicationReport = {
     val yarnId = new StubApplicationId(id, clusterTimestamp)
     // this is tagged as hadoop private. The alternate tactic: create your own implementation,
     // is brittle against Hadoop versions, as new fields are added. Using this
@@ -88,7 +95,10 @@ private[yarn] trait IntegrationTestUtils {
    * @param updateTime update time, will be taken from report start time otherwise
    * @return
    */
-  def attemptFromAppReport(report: ApplicationReport, endTime: Long, completed: Boolean,
+  def attemptFromAppReport(
+      report: ApplicationReport,
+      endTime: Long,
+      completed: Boolean,
       updateTime: Long = 0): TimelineApplicationAttemptInfo = {
 
     val entityId = report.getCurrentApplicationAttemptId.toString
@@ -144,7 +154,8 @@ private[yarn] trait IntegrationTestUtils {
    * @param timeout timeout
    * @return the application details.
    */
-  def awaitListingEntry(provider: YarnHistoryProvider,
+  def awaitListingEntry(
+      provider: YarnHistoryProvider,
       appId: String,
       attempts: Int,
       timeout: Long): TimelineApplicationHistoryInfo = {
@@ -175,7 +186,8 @@ private[yarn] trait IntegrationTestUtils {
    * @param timeout timeout
    * @return the successful listing
    */
-  def awaitRefreshExecuted(provider: YarnHistoryProvider,
+  def awaitRefreshExecuted(
+      provider: YarnHistoryProvider,
       triggerRefresh: Boolean,
       timeout: Long): Unit = {
     val initialCount = provider.refreshCount
@@ -200,8 +212,12 @@ private[yarn] trait IntegrationTestUtils {
    * @param text text which must not be present
    * @param timeout timeout in mils
    */
-  def awaitURLDoesNotContainText(connector: SpnegoUrlConnector,
-      url: URL, text: String, timeout: Long, message: String = ""): String = {
+  def awaitURLDoesNotContainText(
+      connector: SpnegoUrlConnector,
+      url: URL,
+      text: String,
+      timeout: Long,
+      message: String = ""): String = {
     def get: String = {
       connector.execHttpOperation("GET", url, null, "").responseBody
     }
@@ -236,8 +252,11 @@ private[yarn] trait IntegrationTestUtils {
    * @param text text which must be present
    * @param timeout timeout in mils
    */
-  def awaitURLContainsText(connector: SpnegoUrlConnector,
-      url: URL, text: String, timeout: Long): String = {
+  def awaitURLContainsText(
+      connector: SpnegoUrlConnector,
+      url: URL,
+      text: String,
+      timeout: Long): String = {
     def get: String = {
       connector.execHttpOperation("GET", url, null, "").responseBody
     }
@@ -266,13 +285,13 @@ private[yarn] trait IntegrationTestUtils {
     get
   }
 
-  def lookupApplication(listing: Seq[TimelineApplicationHistoryInfo], id: ApplicationId):
-  TimelineApplicationHistoryInfo = {
+  def lookupApplication(listing: Seq[TimelineApplicationHistoryInfo], id: ApplicationId)
+      : TimelineApplicationHistoryInfo = {
     lookupApplication(listing, id.toString)
   }
 
-  def lookupApplication(listing: Seq[TimelineApplicationHistoryInfo], id: String):
-  TimelineApplicationHistoryInfo = {
+  def lookupApplication(listing: Seq[TimelineApplicationHistoryInfo], id: String)
+    : TimelineApplicationHistoryInfo = {
     findAppById(listing, id) match {
       case Some(applicationInfo2) =>
         applicationInfo2