Skip to content

Commit 39824a8

Browse files
committed
Fix Scalastyle errors.
1 parent 18dbd6f commit 39824a8

File tree

6 files changed

+16
-6
lines changed

6 files changed

+16
-6
lines changed

core/src/main/scala/org/apache/spark/deploy/master/ui/MasterPage.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,8 @@ private[ui] class MasterPage(parent: MasterWebUI) extends WebUIPage("") {
5858
if (parent.killEnabled &&
5959
parent.master.securityMgr.checkModifyPermissions(request.getRemoteUser)) {
6060
// stripXSS is called first to remove suspicious characters used in XSS attacks
61-
val killFlag = Option(UIUtils.stripXSS(request.getParameter("terminate"))).getOrElse("false").toBoolean
61+
val killFlag =
62+
Option(UIUtils.stripXSS(request.getParameter("terminate"))).getOrElse("false").toBoolean
6263
val id = Option(UIUtils.stripXSS(request.getParameter("id")))
6364
if (id.isDefined && killFlag) {
6465
action(id.get)

core/src/main/scala/org/apache/spark/deploy/worker/ui/LogPage.scala

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,9 @@ private[ui] class LogPage(parent: WorkerWebUI) extends WebUIPage("logPage") with
4040
val driverId = Option(UIUtils.stripXSS(request.getParameter("driverId")))
4141
val logType = UIUtils.stripXSS(request.getParameter("logType"))
4242
val offset = Option(UIUtils.stripXSS(request.getParameter("offset"))).map(_.toLong)
43-
val byteLength = Option(UIUtils.stripXSS(request.getParameter("byteLength"))).map(_.toInt).getOrElse(defaultBytes)
43+
val byteLength =
44+
Option(UIUtils.stripXSS(request.getParameter("byteLength"))).map(_.toInt)
45+
.getOrElse(defaultBytes)
4446

4547
val logDir = (appId, executorId, driverId) match {
4648
case (Some(a), Some(e), None) =>
@@ -63,7 +65,9 @@ private[ui] class LogPage(parent: WorkerWebUI) extends WebUIPage("logPage") with
6365
val driverId = Option(UIUtils.stripXSS(request.getParameter("driverId")))
6466
val logType = UIUtils.stripXSS(request.getParameter("logType"))
6567
val offset = Option(UIUtils.stripXSS(request.getParameter("offset"))).map(_.toLong)
66-
val byteLength = Option(UIUtils.stripXSS(request.getParameter("byteLength"))).map(_.toInt).getOrElse(defaultBytes)
68+
val byteLength =
69+
Option(UIUtils.stripXSS(request.getParameter("byteLength"))).map(_.toInt)
70+
.getOrElse(defaultBytes)
6771

6872
val (logDir, params, pageName) = (appId, executorId, driverId) match {
6973
case (Some(a), Some(e), None) =>

core/src/main/scala/org/apache/spark/ui/UIUtils.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -545,5 +545,6 @@ private[spark] object UIUtils extends Logging {
545545
// Remove new lines and single quotes, followed by escaping HTML version 4.0
546546
StringEscapeUtils.escapeHtml4(
547547
NEWLINE_AND_SINGLE_QUOTE_REGEX.replaceAllIn(requestParameter, ""))
548+
}
548549
}
549550
}

core/src/main/scala/org/apache/spark/ui/exec/ExecutorThreadDumpPage.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ private[ui] class ExecutorThreadDumpPage(parent: ExecutorsTab) extends WebUIPage
3030

3131
// stripXSS is called first to remove suspicious characters used in XSS attacks
3232
def render(request: HttpServletRequest): Seq[Node] = {
33-
val executorId = Option(UIUtils.stripXSS(request.getParameter("executorId"))).map { executorId =>
33+
val executorId =
34+
Option(UIUtils.stripXSS(request.getParameter("executorId"))).map { executorId =>
3435
UIUtils.decodeURLParameter(executorId)
3536
}.getOrElse {
3637
throw new IllegalArgumentException(s"Missing executorId parameter")

core/src/main/scala/org/apache/spark/ui/jobs/StageTable.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ private[ui] class StageTableBase(
5151
val parameterStageSortColumn = UIUtils.stripXSS(request.getParameter(stageTag + ".sort"))
5252
val parameterStageSortDesc = UIUtils.stripXSS(request.getParameter(stageTag + ".desc"))
5353
val parameterStagePageSize = UIUtils.stripXSS(request.getParameter(stageTag + ".pageSize"))
54-
val parameterStagePrevPageSize = UIUtils.stripXSS(request.getParameter(stageTag + ".prevPageSize"))
54+
val parameterStagePrevPageSize =
55+
UIUtils.stripXSS(request.getParameter(stageTag + ".prevPageSize"))
5556

5657
val stagePage = Option(parameterStagePage).map(_.toInt).getOrElse(1)
5758
val stageSortColumn = Option(parameterStageSortColumn).map { sortColumn =>

streaming/src/main/scala/org/apache/spark/streaming/ui/BatchPage.scala

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,9 @@ private[ui] class BatchPage(parent: StreamingTab) extends WebUIPage("batch") {
305305

306306
def render(request: HttpServletRequest): Seq[Node] = streamingListener.synchronized {
307307
// stripXSS is called first to remove suspicious characters used in XSS attacks
308-
val batchTime = Option(SparkUIUtils.stripXSS(request.getParameter("id"))).map(id => Time(id.toLong)).getOrElse {
308+
val batchTime =
309+
Option(SparkUIUtils.stripXSS(request.getParameter("id"))).map(id => Time(id.toLong))
310+
.getOrElse {
309311
throw new IllegalArgumentException(s"Missing id parameter")
310312
}
311313
val formattedBatchTime =

0 commit comments

Comments
 (0)