Browse Source

SONAR-8913 Replace "snapshotDate" by "analysisDate" in api/navigation/component

tags/6.4-RC3
Julien Lancelot 7 years ago
parent
commit
5d0455588b

+ 2
- 2
it/it-tests/src/test/java/util/ItUtils.java View File

@@ -380,14 +380,14 @@ public class ItUtils {

public static class ComponentNavigation {
private String version;
private String snapshotDate;
private String analysisDate;

public String getVersion() {
return version;
}

public Date getDate() {
return toDatetime(snapshotDate);
return toDatetime(analysisDate);
}

public static ComponentNavigation parse(String json) {

+ 3
- 2
server/sonar-server/src/main/java/org/sonar/server/ui/ws/ComponentAction.java View File

@@ -38,7 +38,6 @@ import org.sonar.api.server.ws.Request;
import org.sonar.api.server.ws.Response;
import org.sonar.api.server.ws.WebService.NewAction;
import org.sonar.api.server.ws.WebService.NewController;
import org.sonar.api.utils.DateUtils;
import org.sonar.api.utils.text.JsonWriter;
import org.sonar.api.web.UserRole;
import org.sonar.api.web.page.Page;
@@ -64,6 +63,7 @@ import org.sonar.server.ui.PageRepository;
import org.sonar.server.user.UserSession;

import static org.sonar.api.measures.CoreMetrics.QUALITY_PROFILES_KEY;
import static org.sonar.api.utils.DateUtils.formatDateTime;
import static org.sonar.api.web.UserRole.ADMIN;
import static org.sonar.api.web.UserRole.USER;
import static org.sonar.db.permission.OrganizationPermission.ADMINISTER_QUALITY_GATES;
@@ -181,7 +181,8 @@ public class ComponentAction implements NavigationWsAction {
List<Page> pages = pageRepository.getComponentPages(false, component.qualifier());
writeExtensions(json, component, pages);
if (analysis != null) {
json.prop("version", analysis.getVersion()).prop("snapshotDate", DateUtils.formatDateTime(new Date(analysis.getCreatedAt())));
json.prop("version", analysis.getVersion())
.prop("analysisDate", formatDateTime(new Date(analysis.getCreatedAt())));
}
}


+ 1
- 1
server/sonar-server/src/main/resources/org/sonar/server/ui/ws/component-example.json View File

@@ -6,7 +6,7 @@
"description": "Open source platform for continuous inspection of code quality",
"isFavorite": true,
"version": "6.3",
"snapshotDate": "2016-12-06T11:44:00+0200",
"analysisDate": "2016-12-06T11:44:00+0200",
"extensions": [
{
"key": "my_plugin/first_page",

+ 1
- 1
server/sonar-server/src/test/resources/org/sonar/server/ui/ws/ComponentActionTest/return_component_info_when_snapshot.json View File

@@ -5,7 +5,7 @@
"name": "Polop",
"description": "test project",
"isFavorite": false,
"snapshotDate": "2015-04-22T11:44:00+0200",
"analysisDate": "2015-04-22T11:44:00+0200",
"version": "3.14",
"breadcrumbs": [
{

Loading…
Cancel
Save