From 16d38f24d578b80de03d46cdb3c6ba6c37760d06 Mon Sep 17 00:00:00 2001 From: Julien Lancelot Date: Thu, 29 Mar 2018 15:02:12 +0200 Subject: [PATCH] SONAR-10383 Fix changelog about pull request in api/ce/activity --- .../java/org/sonar/server/ce/ws/ActivityAction.java | 12 +++++++----- .../java/org/sonar/server/ce/ws/TaskFormatter.java | 10 ++++------ .../org/sonar/server/ce/ws/TaskFormatterTest.java | 2 -- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/server/sonar-server/src/main/java/org/sonar/server/ce/ws/ActivityAction.java b/server/sonar-server/src/main/java/org/sonar/server/ce/ws/ActivityAction.java index dcbe6290f97..67724db7f62 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/ce/ws/ActivityAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/ce/ws/ActivityAction.java @@ -58,9 +58,6 @@ import static org.sonar.api.utils.DateUtils.parseEndingDateOrDateTime; import static org.sonar.api.utils.DateUtils.parseStartingDateOrDateTime; import static org.sonar.core.util.stream.MoreCollectors.toList; import static org.sonar.db.Pagination.forPage; -import static org.sonar.server.ws.WsUtils.checkFoundWithOptional; -import static org.sonar.server.ws.WsUtils.checkRequest; -import static org.sonar.server.ws.WsUtils.writeProtobuf; import static org.sonar.server.ce.ws.CeWsParameters.PARAM_COMPONENT_ID; import static org.sonar.server.ce.ws.CeWsParameters.PARAM_COMPONENT_QUERY; import static org.sonar.server.ce.ws.CeWsParameters.PARAM_MAX_EXECUTED_AT; @@ -68,6 +65,9 @@ import static org.sonar.server.ce.ws.CeWsParameters.PARAM_MIN_SUBMITTED_AT; import static org.sonar.server.ce.ws.CeWsParameters.PARAM_ONLY_CURRENTS; import static org.sonar.server.ce.ws.CeWsParameters.PARAM_STATUS; import static org.sonar.server.ce.ws.CeWsParameters.PARAM_TYPE; +import static org.sonar.server.ws.WsUtils.checkFoundWithOptional; +import static org.sonar.server.ws.WsUtils.checkRequest; +import static org.sonar.server.ws.WsUtils.writeProtobuf; public class ActivityAction implements CeWsAction { private static final int MAX_PAGE_SIZE = 1000; @@ -101,7 +101,7 @@ public class ActivityAction implements CeWsAction { new Change("5.5", "it's no more possible to specify the page parameter."), new Change("6.1", "field \"logs\" is deprecated and its value is always false"), new Change("6.6", "fields \"branch\" and \"branchType\" added"), - new Change("7.1", "fields \"pullRequest\" and \"pullRequestTitle\" added")) + new Change("7.1", "field \"pullRequest\" added")) .setSince("5.2"); action.createParam(PARAM_COMPONENT_ID) @@ -238,7 +238,9 @@ public class ActivityAction implements CeWsAction { if (component != null) { query.setComponentUuid(component.uuid()); } else if (componentQuery != null) { - query.setComponentUuids(loadComponents(dbSession, componentQuery).stream().map(ComponentDto::uuid).collect(toList())); + query.setComponentUuids(loadComponents(dbSession, componentQuery).stream() + .map(ComponentDto::uuid) + .collect(toList())); } return query; } 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 23f1ba3e091..2fe083766dd 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 @@ -75,7 +75,6 @@ public class TaskFormatter { private Ce.Task formatQueue(CeQueueDto dto, DtoCache componentDtoCache) { Ce.Task.Builder builder = Ce.Task.newBuilder(); String organizationKey = componentDtoCache.getOrganizationKey(dto.getComponentUuid()); - // FIXME organization field should be set from the CeQueueDto rather than from the ComponentDto setNullable(organizationKey, builder::setOrganization); if (dto.getComponentUuid() != null) { builder.setComponentId(dto.getComponentUuid()); @@ -107,7 +106,6 @@ public class TaskFormatter { private static Ce.Task formatActivity(CeActivityDto dto, DtoCache componentDtoCache, @Nullable String scannerContext) { Ce.Task.Builder builder = Ce.Task.newBuilder(); String organizationKey = componentDtoCache.getOrganizationKey(dto.getComponentUuid()); - // FIXME organization field should be set from the CeActivityDto rather than from the ComponentDto setNullable(organizationKey, builder::setOrganization); builder.setId(dto.getUuid()); builder.setStatus(Ce.TaskStatus.valueOf(dto.getStatus().name())); @@ -174,7 +172,7 @@ public class TaskFormatter { } static DtoCache forQueueDtos(DbClient dbClient, DbSession dbSession, Collection ceQueueDtos) { - Map componentsByUuid = dbClient.componentDao().selectByUuids(dbSession, uuidOfCeQueueDtos(ceQueueDtos)) + Map componentsByUuid = dbClient.componentDao().selectByUuids(dbSession, componentUuidsOfCeQueues(ceQueueDtos)) .stream() .collect(MoreCollectors.uniqueIndex(ComponentDto::uuid)); Multimap characteristicsByTaskUuid = dbClient.ceTaskCharacteristicsDao() @@ -183,7 +181,7 @@ public class TaskFormatter { return new DtoCache(componentsByUuid, buildOrganizationsByUuid(dbClient, dbSession, componentsByUuid), characteristicsByTaskUuid); } - private static Set uuidOfCeQueueDtos(Collection ceQueueDtos) { + private static Set componentUuidsOfCeQueues(Collection ceQueueDtos) { return ceQueueDtos.stream() .filter(Objects::nonNull) .map(CeQueueDto::getComponentUuid) @@ -194,7 +192,7 @@ public class TaskFormatter { static DtoCache forActivityDtos(DbClient dbClient, DbSession dbSession, Collection ceActivityDtos) { Map componentsByUuid = dbClient.componentDao().selectByUuids( dbSession, - uuidOfCeActivityDtos(ceActivityDtos)) + getComponentUuidsOfCeActivities(ceActivityDtos)) .stream() .collect(MoreCollectors.uniqueIndex(ComponentDto::uuid)); Multimap characteristicsByTaskUuid = dbClient.ceTaskCharacteristicsDao() @@ -203,7 +201,7 @@ public class TaskFormatter { return new DtoCache(componentsByUuid, buildOrganizationsByUuid(dbClient, dbSession, componentsByUuid), characteristicsByTaskUuid); } - private static Set uuidOfCeActivityDtos(Collection ceActivityDtos) { + private static Set getComponentUuidsOfCeActivities(Collection ceActivityDtos) { return ceActivityDtos.stream() .filter(Objects::nonNull) .map(CeActivityDto::getComponentUuid) 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 b88a3dfe702..e3b9201dfc9 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 @@ -19,7 +19,6 @@ */ package org.sonar.server.ce.ws; -import java.io.IOException; import java.util.Collections; import java.util.Date; import org.junit.Rule; @@ -32,7 +31,6 @@ import org.sonar.db.ce.CeQueueDto; import org.sonar.db.ce.CeTaskTypes; import org.sonar.db.organization.OrganizationDto; import org.sonarqube.ws.Ce; -import org.sonarqube.ws.Ce; import static java.util.Arrays.asList; import static org.assertj.core.api.Assertions.assertThat; -- 2.39.5