@@ -102,7 +102,7 @@ public class TaskAction implements CeWsAction { | |||
Set<AdditionalField> additionalFields = AdditionalField.getFromRequest(wsRequest); | |||
maskErrorStacktrace(ceActivityDto, additionalFields); | |||
wsTaskResponse.setTask( | |||
wsTaskFormatter.formatActivity(dbSession, ceActivityDto, extractScannerContext(dbSession, taskUuid, additionalFields))); | |||
wsTaskFormatter.formatActivity(dbSession, ceActivityDto, extractScannerContext(dbSession, ceActivityDto, additionalFields))); | |||
} else { | |||
throw new NotFoundException(); | |||
} | |||
@@ -128,9 +128,9 @@ public class TaskAction implements CeWsAction { | |||
} | |||
@CheckForNull | |||
private String extractScannerContext(DbSession dbSession, String taskUuid, Set<AdditionalField> additionalFields) { | |||
private String extractScannerContext(DbSession dbSession, CeActivityDto activityDto, Set<AdditionalField> additionalFields) { | |||
if (additionalFields.contains(AdditionalField.SCANNER_CONTEXT)) { | |||
return dbClient.scannerContextDao().selectScannerContext(dbSession, taskUuid) | |||
return dbClient.scannerContextDao().selectScannerContext(dbSession, activityDto.getAnalysisUuid()) | |||
.orElse(null); | |||
} | |||
return null; |
@@ -136,6 +136,7 @@ public class TaskFormatter { | |||
if (scannerContext != null) { | |||
builder.setScannerContext(scannerContext); | |||
} | |||
builder.setHasScannerContext(dto.isHasScannerContext()); | |||
return builder.build(); | |||
} | |||
@@ -15,7 +15,8 @@ | |||
"executedAt": "2015-08-13T23:35:10+0200", | |||
"executionTimeMs": 10000, | |||
"logs": false, | |||
"hasErrorStacktrace": false | |||
"hasErrorStacktrace": false, | |||
"hasScannerContext": true | |||
}, | |||
{ | |||
"id": "AU_dO1vsORa8_beWCwmP", | |||
@@ -31,7 +32,8 @@ | |||
"executionTimeMs": 120000, | |||
"logs": false, | |||
"errorMessage": "Failed to unzip analysis report", | |||
"hasErrorStacktrace": true | |||
"hasErrorStacktrace": true, | |||
"hasScannerContext": true | |||
} | |||
] | |||
} |
@@ -26,6 +26,7 @@ | |||
"finishedAt": "2015-09-21T19:25:58+0200", | |||
"executionTimeMs": 1371, | |||
"logs": false, | |||
"hasErrorStacktrace": false | |||
"hasErrorStacktrace": false, | |||
"hasScannerContext": true | |||
} | |||
} |
@@ -16,6 +16,7 @@ | |||
"logs": false, | |||
"hasErrorStacktrace": true, | |||
"errorStacktrace": "java.lang.IllegalStateException: Fail to extract report AVaXuGAi_te3Ldc_YItm from database\n\tat org.sonar.server.computation.task.projectanalysis.step.ExtractReportStep.execute(ExtractReportStep.java:50)", | |||
"scannerContext": "SonarQube plugins:\n\t- Git 1.0 (scmgit)\n\t- Java 3.13.1 (java)" | |||
"scannerContext": "SonarQube plugins:\n\t- Git 1.0 (scmgit)\n\t- Java 3.13.1 (java)", | |||
"hasScannerContext": true | |||
} | |||
} |
@@ -80,6 +80,7 @@ message Task { | |||
optional string errorMessage = 16; | |||
optional string errorStacktrace = 17; | |||
optional string scannerContext = 18; | |||
optional bool hasScannerContext = 19; | |||
} | |||
enum TaskStatus { |