Add field "errorType" to tasks returned in api/ce/*

server/sonar-server/src/main/java/org/sonar/server/ce/ws/TaskFormatter.java

@@ -127,6 +127,7 @@ public class TaskFormatter {
     setNullable(dto.getExecutionTimeMs(), builder::setExecutionTimeMs);
     setNullable(dto.getErrorMessage(), builder::setErrorMessage);
     setNullable(dto.getErrorStacktrace(), builder::setErrorStacktrace);
+    setNullable(dto.getErrorType(), builder::setErrorType);
     setNullable(scannerContext, builder::setScannerContext);
     builder.setHasScannerContext(dto.isHasScannerContext());
     return builder.build();

server/sonar-server/src/main/resources/org/sonar/server/ce/ws/component-example.json

@@ -22,12 +22,14 @@
     "componentName": "HttpRequest",
     "componentQualifier": "TRK",
     "analysisId": "123456",
-    "status": "SUCCESS",
+    "status": "FAILED",
     "submittedAt": "2015-09-21T19:25:49+0200",
     "startedAt": "2015-09-21T19:25:57+0200",
     "finishedAt": "2015-09-21T19:25:58+0200",
     "executionTimeMs": 1371,
     "logs": false,
+    "errorMessage": "the error message",
+    "errorType": "the optional error type",
     "hasErrorStacktrace": false,
     "hasScannerContext": true
   }

server/sonar-server/src/test/java/org/sonar/server/ce/ws/TaskFormatterTest.java

@@ -134,7 +134,7 @@ public class TaskFormatterTest {
 
     WsCe.Task wsTask = underTest.formatQueue(db.getSession(), dto);
 
-    assertThat(wsTask.getExecutionTimeMs()).isEqualTo(now-startedAt);
+    assertThat(wsTask.getExecutionTimeMs()).isEqualTo(now - startedAt);
   }
 
   @Test
@@ -195,19 +195,21 @@ public class TaskFormatterTest {
   @Test
   public void formatActivity_with_both_error_message_and_stacktrace() {
     CeActivityDto dto = newActivity("UUID", "COMPONENT_UUID", CeActivityDto.Status.FAILED)
-        .setErrorMessage("error msg")
-        .setErrorStacktrace("error stacktrace");
+      .setErrorMessage("error msg")
+      .setErrorStacktrace("error stacktrace")
+      .setErrorType("anErrorType");
 
     WsCe.Task task = underTest.formatActivity(db.getSession(), Collections.singletonList(dto)).iterator().next();
 
     assertThat(task.getErrorMessage()).isEqualTo(dto.getErrorMessage());
     assertThat(task.getErrorStacktrace()).isEqualTo(dto.getErrorStacktrace());
+    assertThat(task.getErrorType()).isEqualTo(dto.getErrorType());
   }
 
   @Test
   public void formatActivity_with_both_error_message_only() {
     CeActivityDto dto = newActivity("UUID", "COMPONENT_UUID", CeActivityDto.Status.FAILED)
-        .setErrorMessage("error msg");
+      .setErrorMessage("error msg");
 
     WsCe.Task task = underTest.formatActivity(db.getSession(), Collections.singletonList(dto)).iterator().next();
 
@@ -218,7 +220,7 @@ public class TaskFormatterTest {
   @Test
   public void formatActivity_with_both_error_message_and_only_stacktrace_flag() {
     CeActivityDto dto = newActivity("UUID", "COMPONENT_UUID", CeActivityDto.Status.FAILED)
-        .setErrorMessage("error msg");
+      .setErrorMessage("error msg");
 
     WsCe.Task task = underTest.formatActivity(db.getSession(), Collections.singletonList(dto)).iterator().next();
 

sonar-ws/src/main/protobuf/ws-ce.proto

@@ -91,6 +91,7 @@ message Task {
   optional string organization = 20;
   optional string branch = 21;
   optional sonarqube.ws.commons.BranchType branchType = 22;
+  optional string errorType = 23;
 }
 
 enum TaskStatus {