twitter-server: Reformat with scalafmt 2.4.2

Differential Revision: https://phabricator.twitter.biz/D455456
twitter · Mar 26, 2020 · b888ebf · b888ebf
1 parent 6d9c877
commit b888ebf
Show file tree

Hide file tree

Showing 23 changed files with 85 additions and 153 deletions.
diff --git a/build.sbt b/build.sbt
@@ -8,13 +8,13 @@ val jacksonDatabindVersion = "2.9.10.1"
 val jacksonLibs = Seq(
   "com.fasterxml.jackson.core" % "jackson-core" % jacksonVersion,
   "com.fasterxml.jackson.core" % "jackson-databind" % jacksonDatabindVersion,
-  "com.fasterxml.jackson.module" %% "jackson-module-scala" % jacksonVersion exclude("com.google.guava", "guava")
+  "com.fasterxml.jackson.module" %% "jackson-module-scala" % jacksonVersion exclude ("com.google.guava", "guava")
 )
 val opencensusVersion = "0.19.1"
 val slf4jVersion = "1.7.30"
 
-def util(which: String) = "com.twitter" %% ("util-"+which) % releaseVersion
-def finagle(which: String) = "com.twitter" %% ("finagle-"+which) % releaseVersion
+def util(which: String) = "com.twitter" %% ("util-" + which) % releaseVersion
+def finagle(which: String) = "com.twitter" %% ("finagle-" + which) % releaseVersion
 
 lazy val noPublishSettings = Seq(
   publish := {},
@@ -91,42 +91,35 @@ lazy val sharedSettings = Seq(
     "com.novocode" % "junit-interface" % "0.11" % "test",
     "org.mockito" % "mockito-all" % "1.9.5" % "test"
   ),
-
   ScoverageKeys.coverageHighlighting := true,
-
   ivyXML :=
     <dependencies>
       <exclude org="com.sun.jmx" module="jmxri" />
       <exclude org="com.sun.jdmk" module="jmxtools" />
       <exclude org="javax.jms" module="jms" />
     </dependencies>,
-
   scalacOptions ++= Seq(
     "-target:jvm-1.8",
     "-deprecation",
     "-unchecked",
-    "-feature", "-Xlint",
-    "-encoding", "utf8"
+    "-feature",
+    "-Xlint",
+    "-encoding",
+    "utf8"
   ),
   javacOptions ++= Seq("-Xlint:unchecked", "-source", "1.8", "-target", "1.8"),
   javacOptions in doc := Seq("-source", "1.8"),
-
   javaOptions ++= Seq(
     "-Djava.net.preferIPv4Stack=true",
     "-XX:+AggressiveOpts",
     "-server"
   ),
-
   javaOptions ++= gcJavaOptions,
-
   javaOptions in Test ++= travisTestJavaOptions,
-
   // This is bad news for things like com.twitter.util.Time
   parallelExecution in Test := false,
-
   // -a: print stack traces for failing asserts
   testOptions += Tests.Argument(TestFrameworks.JUnit, "-a"),
-
   // Sonatype publishing
   publishArtifact in Test := false,
   pomIncludeRepository := { _ => false },
@@ -158,7 +151,7 @@ lazy val sharedSettings = Seq(
     if (version.value.trim.endsWith("SNAPSHOT"))
       Some("snapshots" at nexus + "content/repositories/snapshots")
     else
-      Some("releases"  at nexus + "service/local/staging/deploy/maven2")
+      Some("releases" at nexus + "service/local/staging/deploy/maven2")
   }
 )
 
@@ -179,10 +172,7 @@ lazy val twitterServer = (project in file("server"))
   .enablePlugins(
     ScalaUnidocPlugin
   )
-  .settings(
-    name :=  "twitter-server",
-    moduleName :=  "twitter-server",
-    sharedSettings)
+  .settings(name := "twitter-server", moduleName := "twitter-server", sharedSettings)
   .settings(
     libraryDependencies ++= Seq(
       "org.slf4j" % "slf4j-api" % slf4jVersion,
@@ -199,15 +189,16 @@ lazy val twitterServer = (project in file("server"))
       util("slf4j-jul-bridge"),
       util("tunable")
     ),
-    libraryDependencies ++= jacksonLibs)
+    libraryDependencies ++= jacksonLibs
+  )
 
 lazy val twitterServerOpenCensus = (project in file("opencensus"))
   .enablePlugins(
     ScalaUnidocPlugin
   )
   .settings(
-    name :=  "twitter-server-opencensus",
-    moduleName :=  "twitter-server-opencensus",
+    name := "twitter-server-opencensus",
+    moduleName := "twitter-server-opencensus",
     sharedSettings)
   .settings(
     libraryDependencies ++= Seq(
@@ -216,54 +207,49 @@ lazy val twitterServerOpenCensus = (project in file("opencensus"))
       "io.opencensus" % "opencensus-api" % opencensusVersion,
       "io.opencensus" % "opencensus-contrib-zpages" % opencensusVersion
     ))
-  .dependsOn(
-    twitterServer)
-
+  .dependsOn(twitterServer)
 
 lazy val twitterServerSlf4jJdk14 = (project in file("slf4j-jdk14"))
   .settings(
-    name :=  "twitter-server-slf4j-jdk14",
-    moduleName :=  "twitter-server-slf4j-jdk14",
+    name := "twitter-server-slf4j-jdk14",
+    moduleName := "twitter-server-slf4j-jdk14",
     sharedSettings)
-  .settings(
-    libraryDependencies ++= Seq(
-      "org.slf4j" % "slf4j-api" % slf4jVersion,
-      "org.slf4j" % "slf4j-jdk14" % slf4jVersion,
-      "org.slf4j" % "jcl-over-slf4j" % slf4jVersion,
-      "org.slf4j" % "log4j-over-slf4j" % slf4jVersion))
-  .dependsOn(
-    twitterServer)
+  .settings(libraryDependencies ++= Seq(
+    "org.slf4j" % "slf4j-api" % slf4jVersion,
+    "org.slf4j" % "slf4j-jdk14" % slf4jVersion,
+    "org.slf4j" % "jcl-over-slf4j" % slf4jVersion,
+    "org.slf4j" % "log4j-over-slf4j" % slf4jVersion
+  ))
+  .dependsOn(twitterServer)
 
 lazy val twitterServerSlf4jLog4j12 = (project in file("slf4j-log4j12"))
   .settings(
-    name :=  "twitter-server-slf4j-log4j12",
-    moduleName :=  "twitter-server-slf4j-log4j12",
+    name := "twitter-server-slf4j-log4j12",
+    moduleName := "twitter-server-slf4j-log4j12",
     sharedSettings)
-  .settings(
-    libraryDependencies ++= Seq(
-      "log4j" % "log4j" % "1.2.17" % "provided",
-      "org.slf4j" % "slf4j-api" % slf4jVersion,
-      "org.slf4j" % "slf4j-log4j12" % slf4jVersion,
-      "org.slf4j" % "jcl-over-slf4j" % slf4jVersion,
-      "org.slf4j" % "jul-to-slf4j" % slf4jVersion))
-  .dependsOn(
-    twitterServer)
+  .settings(libraryDependencies ++= Seq(
+    "log4j" % "log4j" % "1.2.17" % "provided",
+    "org.slf4j" % "slf4j-api" % slf4jVersion,
+    "org.slf4j" % "slf4j-log4j12" % slf4jVersion,
+    "org.slf4j" % "jcl-over-slf4j" % slf4jVersion,
+    "org.slf4j" % "jul-to-slf4j" % slf4jVersion
+  ))
+  .dependsOn(twitterServer)
 
 lazy val twitterServerSlf4jLogbackClassic = (project in file("logback-classic"))
   .settings(
-    name :=  "twitter-server-logback-classic",
-    moduleName :=  "twitter-server-logback-classic",
+    name := "twitter-server-logback-classic",
+    moduleName := "twitter-server-logback-classic",
     sharedSettings)
-  .settings(
-    libraryDependencies ++= Seq(
-      "ch.qos.logback" % "logback-classic" % "1.2.3" % "provided",
-      "ch.qos.logback" % "logback-core" % "1.2.3" % "provided",
-      "org.slf4j" % "slf4j-api" % slf4jVersion,
-      "org.slf4j" % "jcl-over-slf4j" % slf4jVersion,
-      "org.slf4j" % "jul-to-slf4j" % slf4jVersion,
-      "org.slf4j" % "log4j-over-slf4j" % slf4jVersion))
-  .dependsOn(
-    twitterServer)
+  .settings(libraryDependencies ++= Seq(
+    "ch.qos.logback" % "logback-classic" % "1.2.3" % "provided",
+    "ch.qos.logback" % "logback-core" % "1.2.3" % "provided",
+    "org.slf4j" % "slf4j-api" % slf4jVersion,
+    "org.slf4j" % "jcl-over-slf4j" % slf4jVersion,
+    "org.slf4j" % "jul-to-slf4j" % slf4jVersion,
+    "org.slf4j" % "log4j-over-slf4j" % slf4jVersion
+  ))
+  .dependsOn(twitterServer)
 
 lazy val twitterServerDoc = (project in file("doc"))
   .enablePlugins(
@@ -275,14 +261,15 @@ lazy val twitterServerDoc = (project in file("doc"))
     sharedSettings,
     Seq(
       scalacOptions in doc ++= Seq("-doc-title", "TwitterServer", "-doc-version", version.value),
-      includeFilter in Sphinx := ("*.html" | "*.png" | "*.js" | "*.css" | "*.gif" | "*.txt")))
-  .configs(DocTest).settings(
-    inConfig(DocTest)(Defaults.testSettings): _*)
+      includeFilter in Sphinx := ("*.html" | "*.png" | "*.js" | "*.css" | "*.gif" | "*.txt")
+    )
+  )
+  .configs(DocTest).settings(inConfig(DocTest)(Defaults.testSettings): _*)
   .settings(
     unmanagedSourceDirectories in DocTest += baseDirectory.value / "src/sphinx/code",
-
     // Make the "test" command run both, test and doctest:test
-    test := Seq(test in Test, test in DocTest).dependOn.value)
+    test := Seq(test in Test, test in DocTest).dependOn.value
+  )
   .dependsOn(twitterServer)
 
 /* Test Configuration for running tests on doc sources */

diff --git a/opencensus/src/main/scala/com/twitter/server/opencensus/ZPagesAdminRoutes.scala b/opencensus/src/main/scala/com/twitter/server/opencensus/ZPagesAdminRoutes.scala
@@ -20,9 +20,7 @@ private object ZPagesAdminRoutes {
       def apply(request: Request): Future[Response] = {
         val requestParams =
           request
-            .getParamNames().asScala.map { name =>
-              name -> request.getParam(name)
-            }.toMap.asJava
+            .getParamNames().asScala.map { name => name -> request.getParam(name) }.toMap.asJava
 
         // process in a FuturePool to handle the possibility
         // of zpages having blocking code.

diff --git a/project/build.sbt b/project/build.sbt
@@ -2,5 +2,6 @@ scalacOptions ++= Seq(
   "-deprecation",
   "-unchecked",
   "-feature",
-  "-encoding", "utf8"
+  "-encoding",
+  "utf8"
 )
diff --git a/server/src/main/scala/com/twitter/server/AdminHttpServer.scala b/server/src/main/scala/com/twitter/server/AdminHttpServer.scala
@@ -220,9 +220,7 @@ trait AdminHttpServer { self: App with Stats =>
         muxer.withHandler(route.path, service)
     }
 
-    val endpoints = allRoutes.map { route =>
-      s"\t${route.path} => ${route.handler.toString}"
-    }
+    val endpoints = allRoutes.map { route => s"\t${route.path} => ${route.handler.toString}" }
 
     log.debug(s"AdminHttpServer Muxer endpoints:\n" + endpoints.mkString("\n"))
     adminHttpMuxer.underlying = HttpUtils.combine(Seq(localMuxer, HttpMuxer))

diff --git a/server/src/main/scala/com/twitter/server/Hooks.scala b/server/src/main/scala/com/twitter/server/Hooks.scala
@@ -7,9 +7,7 @@ import com.twitter.finagle.util.LoadService
  * Mix-in to include service-loaded hooks.
  */
 trait Hooks { self: App =>
-  private val hooks = LoadService[NewHook]().map { newHook =>
-    newHook(self)
-  }
+  private val hooks = LoadService[NewHook]().map { newHook => newHook(self) }
 
   premain {
     for (hook <- hooks)

diff --git a/server/src/main/scala/com/twitter/server/handler/AttachedClientsHandler.scala b/server/src/main/scala/com/twitter/server/handler/AttachedClientsHandler.scala
@@ -46,9 +46,7 @@ private[handler] object AttachedClientsHandler {
                     sessionId = clientConnection.sslSessionInfo.sessionId,
                     cipherSuite = clientConnection.sslSessionInfo.cipherSuite,
                     peerCertificate = clientConnection.sslSessionInfo.peerCertificates.headOption
-                      .map { peerCertificate =>
-                        PeerCertInfo(peerCertificate.getSubjectDN.getName)
-                      }
+                      .map { peerCertificate => PeerCertInfo(peerCertificate.getSubjectDN.getName) }
                   ))
                 }
               )

diff --git a/server/src/main/scala/com/twitter/server/handler/HistogramQueryHandler.scala b/server/src/main/scala/com/twitter/server/handler/HistogramQueryHandler.scala
@@ -46,9 +46,7 @@ object HistogramQueryHandler {
   // For each key return a percentage
   private[server] def pdf(counts: Seq[BucketAndCount]): Seq[BucketAndPercentage] = {
     val count = countPoints(counts)
-    counts.map { v =>
-      BucketAndPercentage(v.lowerLimit, v.upperLimit, v.count.toFloat / count)
-    }
+    counts.map { v => BucketAndPercentage(v.lowerLimit, v.upperLimit, v.count.toFloat / count) }
   }
 
   // For each key return a cumulative percentage

diff --git a/server/src/main/scala/com/twitter/server/handler/IndexHandler.scala b/server/src/main/scala/com/twitter/server/handler/IndexHandler.scala
@@ -16,9 +16,7 @@ class IndexHandler(prefix: String = "/", patterns: Seq[String] = HttpMuxer.patte
     extends Service[Request, Response] {
   def apply(req: Request): Future[Response] = {
     val paths = patterns.filter(_.startsWith(prefix))
-    val links = paths map { p =>
-      s"<a href='$p'>${escapeHtml(p)}</a>"
-    }
+    val links = paths map { p => s"<a href='$p'>${escapeHtml(p)}</a>" }
     if (!expectsHtml(req)) newOk(paths.mkString("\n"))
     else
       newResponse(

diff --git a/server/src/main/scala/com/twitter/server/handler/LintHandler.scala b/server/src/main/scala/com/twitter/server/handler/LintHandler.scala
@@ -174,9 +174,7 @@ private object LintHandler {
         .map {
           case (rule, issues) =>
             issues
-              .map { issue =>
-                failedRow(rule, issue)
-              }
+              .map { issue => failedRow(rule, issue) }
               .mkString("")
         }
         .mkString("")

diff --git a/server/src/main/scala/com/twitter/server/handler/ToggleHandler.scala b/server/src/main/scala/com/twitter/server/handler/ToggleHandler.scala
@@ -289,14 +289,12 @@ class ToggleHandler private[handler] (registeredLibrariesFn: () => Map[String, T
     val libraryFilter: String => Boolean = parsedPath.libraryName match {
       case Some(name) => _ == name
       case None =>
-        _ =>
-          true
+        _ => true
     }
     val idFilter: String => Boolean = parsedPath.id match {
       case Some(name) => _ == name
       case None =>
-        _ =>
-          true
+        _ => true
     }
 
     val registered = registeredLibrariesFn()
@@ -317,9 +315,7 @@ class ToggleHandler private[handler] (registeredLibrariesFn: () => Map[String, T
 
   private[this] def toLibraryToggles(toggleMap: ToggleMap): Seq[LibraryToggle] = {
     // create a map of id to metadata for faster lookups
-    val idToMetadata = toggleMap.iterator.map { md =>
-      md.id -> md
-    }.toMap
+    val idToMetadata = toggleMap.iterator.map { md => md.id -> md }.toMap
 
     // create a mapping of id to a seq of its components.
     val idToComponents = mutable.Map.empty[String, mutable.ArrayBuffer[Component]]

diff --git a/server/src/main/scala/com/twitter/server/lint/DuplicateFlagDefinitions.scala b/server/src/main/scala/com/twitter/server/lint/DuplicateFlagDefinitions.scala
@@ -23,8 +23,6 @@ object DuplicateFlagDefinitions {
     if (dupes.isEmpty) {
       Nil
     } else {
-      dupes.map { dupe =>
-        Issue(s"Duplicate flag named: $dupe")
-      }.toSeq
+      dupes.map { dupe => Issue(s"Duplicate flag named: $dupe") }.toSeq
     }
 }
diff --git a/server/src/main/scala/com/twitter/server/lint/DuplicateLoadServiceBindings.scala b/server/src/main/scala/com/twitter/server/lint/DuplicateLoadServiceBindings.scala
@@ -27,9 +27,7 @@ object DuplicateLoadServiceBindings {
     if (dupes.isEmpty) {
       Nil
     } else {
-      dupes.map { dupe =>
-        Issue(s"Duplicate for interface: ${dupe.getName}")
-      }.toSeq
+      dupes.map { dupe => Issue(s"Duplicate for interface: ${dupe.getName}") }.toSeq
     }
 
 }
diff --git a/server/src/main/scala/com/twitter/server/lint/LoggingRules.scala b/server/src/main/scala/com/twitter/server/lint/LoggingRules.scala
@@ -15,9 +15,7 @@ object LoggingRules {
 
   private[lint] def issues(jarPaths: Seq[String]): Seq[Issue] = {
     if (jarPaths.length > 1) {
-      jarPaths.map { jarPath =>
-        Issue(jarName(jarPath))
-      }
+      jarPaths.map { jarPath => Issue(jarName(jarPath)) }
     } else {
       Nil
     }

diff --git a/server/src/main/scala/com/twitter/server/util/MetricSchemaSource.scala b/server/src/main/scala/com/twitter/server/util/MetricSchemaSource.scala
@@ -32,9 +32,7 @@ private[server] class MetricSchemaSource(
   /** Returns all schemas */
   def schemaList(): Iterable[MetricSchema] = synchronized {
     registry
-      .foldLeft(IndexedSeq[MetricSchema]()) { (seq, r) =>
-        seq ++ r.schemas().values
-      }
+      .foldLeft(IndexedSeq[MetricSchema]()) { (seq, r) => seq ++ r.schemas().values }
   }
 
   /** Returns true if the map contains `key` and false otherwise. */
@@ -45,8 +43,6 @@ private[server] class MetricSchemaSource(
   /** Returns the set of stat keys. */
   def keySet: Set[String] = synchronized {
     registry
-      .foldLeft(Set[String]()) { (set, r) =>
-        set ++ r.schemas().keySet
-      }
+      .foldLeft(Set[String]()) { (set, r) => set ++ r.schemas().keySet }
   }
 }
diff --git a/server/src/main/scala/com/twitter/server/util/MetricSource.scala b/server/src/main/scala/com/twitter/server/util/MetricSource.scala
@@ -17,18 +17,14 @@ private[server] object MetricSource {
  * which allows for stale StatEntries up to `refreshInterval`.
  */
 private[server] class MetricSource(
-  registry: () => Seq[StatsRegistry] = { () =>
-    MetricSource.registry
-  },
+  registry: () => Seq[StatsRegistry] = { () => MetricSource.registry },
   refreshInterval: Duration = 1.second) {
   private[this] var lastRefresh = Time.now - refreshInterval
   private[this] var underlying: Map[String, StatEntry] = Map.empty
 
   private[this] def refresh(): Unit = {
     if (Time.now - lastRefresh > refreshInterval) {
-      val newStats = registry().foldLeft(Map[String, StatEntry]()) { (map, r) =>
-        map ++ r()
-      }
+      val newStats = registry().foldLeft(Map[String, StatEntry]()) { (map, r) => map ++ r() }
       underlying = newStats
       lastRefresh = Time.now
     }