upper case enums

squito · squito · commit ba3d9d29dc30 · 2015-04-27T14:59:27.000-05:00
diff --git a/core/src/main/java/org/apache/spark/status/api/v1/StageStatus.java b/core/src/main/java/org/apache/spark/status/api/v1/StageStatus.java
@@ -20,10 +20,10 @@
 import org.apache.spark.util.EnumUtil;
 
 public enum StageStatus {
-  Active,
-  Complete,
-  Failed,
-  Pending;
+  ACTIVE,
+  COMPLETE,
+  FAILED,
+  PENDING;
 
   public static StageStatus fromString(String str) {
     return EnumUtil.parseIgnoreCase(StageStatus.class, str);
diff --git a/core/src/main/scala/org/apache/spark/status/api/v1/AllStagesResource.scala b/core/src/main/scala/org/apache/spark/status/api/v1/AllStagesResource.scala
@@ -122,10 +122,10 @@ private[v1] object AllStagesResource {
     val listener = ui.jobProgressListener
     listener.synchronized {
       Seq(
-        StageStatus.Active -> listener.activeStages.values.toSeq,
-        StageStatus.Complete -> listener.completedStages.reverse.toSeq,
-        StageStatus.Failed -> listener.failedStages.reverse.toSeq,
-        StageStatus.Pending -> listener.pendingStages.values.toSeq
+        StageStatus.ACTIVE -> listener.activeStages.values.toSeq,
+        StageStatus.COMPLETE -> listener.completedStages.reverse.toSeq,
+        StageStatus.FAILED -> listener.failedStages.reverse.toSeq,
+        StageStatus.PENDING -> listener.pendingStages.values.toSeq
       )
     }
   }
diff --git a/core/src/main/scala/org/apache/spark/status/api/v1/OneStageResource.scala b/core/src/main/scala/org/apache/spark/status/api/v1/OneStageResource.scala
@@ -122,10 +122,10 @@ private[v1] class OneStageResource(uiRoot: UIRoot) {
           StageStatusInfoUi(status, info, ui)
         }
       }
-      getStatusInfoUi(Active, listener.activeStages.values.toSeq) ++
-        getStatusInfoUi(Complete, listener.completedStages) ++
-        getStatusInfoUi(Failed, listener.failedStages) ++
-        getStatusInfoUi(Pending, listener.pendingStages.values.toSeq)
+      getStatusInfoUi(ACTIVE, listener.activeStages.values.toSeq) ++
+        getStatusInfoUi(COMPLETE, listener.completedStages) ++
+        getStatusInfoUi(FAILED, listener.failedStages) ++
+        getStatusInfoUi(PENDING, listener.pendingStages.values.toSeq)
     }
   }
 
diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/stages/1/0/json_expectation b/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/stages/1/0/json_expectation
@@ -1,5 +1,5 @@
 {
-  "status" : "Complete",
+  "status" : "COMPLETE",
   "stageId" : 1,
   "attemptId" : 0,
   "numActiveTasks" : 0,
diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/stages/1/json_expectation b/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/stages/1/json_expectation
@@ -1,5 +1,5 @@
 [ {
-  "status" : "Complete",
+  "status" : "COMPLETE",
   "stageId" : 1,
   "attemptId" : 0,
   "numActiveTasks" : 0,
diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/stages/json_expectation b/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/stages/json_expectation
@@ -1,5 +1,5 @@
 [ {
-  "status" : "Complete",
+  "status" : "COMPLETE",
   "stageId" : 3,
   "attemptId" : 0,
   "numActiveTasks" : 0,
@@ -21,7 +21,7 @@
   "schedulingPool" : "default",
   "accumulatorUpdates" : [ ]
 }, {
-  "status" : "Complete",
+  "status" : "COMPLETE",
   "stageId" : 1,
   "attemptId" : 0,
   "numActiveTasks" : 0,
@@ -43,7 +43,7 @@
   "schedulingPool" : "default",
   "accumulatorUpdates" : [ ]
 }, {
-  "status" : "Complete",
+  "status" : "COMPLETE",
   "stageId" : 0,
   "attemptId" : 0,
   "numActiveTasks" : 0,
@@ -65,7 +65,7 @@
   "schedulingPool" : "default",
   "accumulatorUpdates" : [ ]
 }, {
-  "status" : "Failed",
+  "status" : "FAILED",
   "stageId" : 2,
   "attemptId" : 0,
   "numActiveTasks" : 0,
diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/stages?status=complete/json_expectation b/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/stages?status=complete/json_expectation
@@ -1,5 +1,5 @@
 [ {
-  "status" : "Complete",
+  "status" : "COMPLETE",
   "stageId" : 3,
   "attemptId" : 0,
   "numActiveTasks" : 0,
@@ -21,7 +21,7 @@
   "schedulingPool" : "default",
   "accumulatorUpdates" : [ ]
 }, {
-  "status" : "Complete",
+  "status" : "COMPLETE",
   "stageId" : 1,
   "attemptId" : 0,
   "numActiveTasks" : 0,
@@ -43,7 +43,7 @@
   "schedulingPool" : "default",
   "accumulatorUpdates" : [ ]
 }, {
-  "status" : "Complete",
+  "status" : "COMPLETE",
   "stageId" : 0,
   "attemptId" : 0,
   "numActiveTasks" : 0,
diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/stages?status=failed/json_expectation b/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/stages?status=failed/json_expectation
@@ -1,5 +1,5 @@
 [ {
-  "status" : "Failed",
+  "status" : "FAILED",
   "stageId" : 2,
   "attemptId" : 0,
   "numActiveTasks" : 0,
diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1426533911241/stages/0/0/json_expectation b/core/src/test/resources/HistoryServerExpectations/applications/local-1426533911241/stages/0/0/json_expectation
@@ -1,5 +1,5 @@
 {
-  "status" : "Complete",
+  "status" : "COMPLETE",
   "stageId" : 0,
   "attemptId" : 0,
   "numActiveTasks" : 0,
diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1426533911241/stages/json_expectation b/core/src/test/resources/HistoryServerExpectations/applications/local-1426533911241/stages/json_expectation
@@ -1,5 +1,5 @@
 [ {
-  "status" : "Complete",
+  "status" : "COMPLETE",
   "stageId" : 0,
   "attemptId" : 0,
   "numActiveTasks" : 0,
diff --git a/core/src/test/scala/org/apache/spark/ui/UISeleniumSuite.scala b/core/src/test/scala/org/apache/spark/ui/UISeleniumSuite.scala
@@ -133,7 +133,7 @@ class UISeleniumSuite extends FunSuite with WebBrowser with Matchers with Before
       }
       val stageJson = getJson(sc.ui.get, "stages")
       stageJson.children.length should be (1)
-      (stageJson \ "status").extract[String] should be (StageStatus.Failed.name())
+      (stageJson \ "status").extract[String] should be (StageStatus.FAILED.name())
 
       // Regression test for SPARK-2105
       class NotSerializable
@@ -255,15 +255,15 @@ class UISeleniumSuite extends FunSuite with WebBrowser with Matchers with Before
         JInt(stageId) <- stage \ "stageId"
         JInt(attemptId) <- stage \ "attemptId"
       } {
-        val exp = if (attemptId == 0 && stageId == 1) StageStatus.Failed else StageStatus.Complete
+        val exp = if (attemptId == 0 && stageId == 1) StageStatus.FAILED else StageStatus.COMPLETE
         status should be (exp.name())
       }
 
       for {
         stageId <- 0 to 1
         attemptId <- 0 to 1
       } {
-        val exp = if (attemptId == 0 && stageId == 1) StageStatus.Failed else StageStatus.Complete
+        val exp = if (attemptId == 0 && stageId == 1) StageStatus.FAILED else StageStatus.COMPLETE
         val stageJson = getJson(sc.ui.get, s"stages/$stageId/$attemptId")
         (stageJson \ "status").extract[String] should be (exp.name())
       }

Original file line number	Diff line number	Diff line change
`@@ -122,10 +122,10 @@ private[v1] object AllStagesResource {`
`122`	`122`	`val listener = ui.jobProgressListener`
`123`	`123`	`listener.synchronized {`
`124`	`124`	`Seq(`
`125`		`- StageStatus.Active -> listener.activeStages.values.toSeq,`
`126`		`- StageStatus.Complete -> listener.completedStages.reverse.toSeq,`
`127`		`- StageStatus.Failed -> listener.failedStages.reverse.toSeq,`
`128`		`- StageStatus.Pending -> listener.pendingStages.values.toSeq`
	`125`	`+ StageStatus.ACTIVE -> listener.activeStages.values.toSeq,`
	`126`	`+ StageStatus.COMPLETE -> listener.completedStages.reverse.toSeq,`
	`127`	`+ StageStatus.FAILED -> listener.failedStages.reverse.toSeq,`
	`128`	`+ StageStatus.PENDING -> listener.pendingStages.values.toSeq`
`129`	`129`	`)`
`130`	`130`	`}`
`131`	`131`	`}`
Original file line number	Diff line number	Diff line change
`@@ -122,10 +122,10 @@ private[v1] class OneStageResource(uiRoot: UIRoot) {`
`122`	`122`	`StageStatusInfoUi(status, info, ui)`
`123`	`123`	`}`
`124`	`124`	`}`
`125`		`- getStatusInfoUi(Active, listener.activeStages.values.toSeq) ++`
`126`		`- getStatusInfoUi(Complete, listener.completedStages) ++`
`127`		`- getStatusInfoUi(Failed, listener.failedStages) ++`
`128`		`- getStatusInfoUi(Pending, listener.pendingStages.values.toSeq)`
	`125`	`+ getStatusInfoUi(ACTIVE, listener.activeStages.values.toSeq) ++`
	`126`	`+ getStatusInfoUi(COMPLETE, listener.completedStages) ++`
	`127`	`+ getStatusInfoUi(FAILED, listener.failedStages) ++`
	`128`	`+ getStatusInfoUi(PENDING, listener.pendingStages.values.toSeq)`
`129`	`129`	`}`
`130`	`130`	`}`
`131`	`131`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "status" : "Complete",`
	`2`	`+ "status" : "COMPLETE",`
`3`	`3`	`"stageId" : 1,`
`4`	`4`	`"attemptId" : 0,`
`5`	`5`	`"numActiveTasks" : 0,`