diff options
| author | Simon Brandhof <simon.brandhof@sonarsource.com> | 2017-09-28 13:51:00 +0200 |
|---|---|---|
| committer | Simon Brandhof <simon.brandhof@sonarsource.com> | 2017-09-28 16:45:25 +0200 |
| commit | ea68f20a89103552774c3d3e784d752f6c281644 (patch) | |
| tree | 85a18ce4209d0ad7d4412c3f743e4b890b73bb61 /server | |
| parent | 17fbd7aefed098e78a6a639efdc7d4f29ed5b685 (diff) | |
| download | sonarqube-ea68f20a89103552774c3d3e784d752f6c281644.tar.gz sonarqube-ea68f20a89103552774c3d3e784d752f6c281644.zip | |
Add field "errorType" to tasks returned in api/ce/*
Diffstat (limited to 'server')
3 files changed, 11 insertions, 6 deletions
diff --git a/server/sonar-server/src/main/java/org/sonar/server/ce/ws/TaskFormatter.java b/server/sonar-server/src/main/java/org/sonar/server/ce/ws/TaskFormatter.java index 1e8bf7ee9cd..a059c766289 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/ce/ws/TaskFormatter.java +++ b/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(); diff --git a/server/sonar-server/src/main/resources/org/sonar/server/ce/ws/component-example.json b/server/sonar-server/src/main/resources/org/sonar/server/ce/ws/component-example.json index 7576f2bfc98..2c2dfe3ca15 100644 --- a/server/sonar-server/src/main/resources/org/sonar/server/ce/ws/component-example.json +++ b/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 } diff --git a/server/sonar-server/src/test/java/org/sonar/server/ce/ws/TaskFormatterTest.java b/server/sonar-server/src/test/java/org/sonar/server/ce/ws/TaskFormatterTest.java index 44cc1612ab5..c2e32f7b895 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/ce/ws/TaskFormatterTest.java +++ b/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(); |