seg_yinzy
/
che-server
mirror of https://github.com/eclipse-che/che-server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix the output of the GET /activity to just contain the array of ws ids (#12271) 

not the full page object.

Signed-off-by: Lukas Krejci <lkrejci@redhat.com>
6.19.x
Lukas Krejci 2018-12-24 12:50:32 +01:00 committed by Sergii Kabashniuk
parent bac76ac5ee
commit 80596fbbb9
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wsmaster/che-core-api-workspace-activity/src/main/java/org/eclipse/che/api/workspace/activity/WorkspaceActivityService.java
View File

@ -130,6 +130,6 @@ public class WorkspaceActivityService extends Service {
Page<String> data =
workspaceActivityManager.findWorkspacesInStatus(status, limit, maxItems, skipCount);
return Response.ok(data).header("Link", createLinkHeader(data)).build();
return Response.ok(data.getItems()).header("Link", createLinkHeader(data)).build();
}
}

4
wsmaster/che-core-api-workspace-activity/src/test/java/org/eclipse/che/api/workspace/activity/WorkspaceActivityServiceTest.java
View File

@ -13,6 +13,7 @@ package org.eclipse.che.api.workspace.activity;
import static com.jayway.restassured.RestAssured.given;
import static java.util.Collections.emptyList;
import static java.util.Collections.singletonList;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyLong;
@ -134,7 +135,7 @@ public class WorkspaceActivityServiceTest {
public void shouldIgnoredMinDurationWhenThresholdSpecified() throws Exception {
when(workspaceActivityManager.findWorkspacesInStatus(
eq(WorkspaceStatus.STOPPED), anyLong(), anyInt(), anyLong()))
.thenReturn(new Page<>(emptyList(), 0, 1, 0));
.thenReturn(new Page<>(singletonList("ws-1"), 0, 1, 1));
Response response =
given()
@ -142,6 +143,7 @@ public class WorkspaceActivityServiceTest {
.get(URI.create(SERVICE_PATH + "?status=STOPPED&threshold=15&minDuration=55"));
assertEquals(response.getStatusCode(), 200);
assertEquals(response.getBody().print(), "[\"ws-1\"]");
verify(workspaceActivityManager, times(1))
.findWorkspacesInStatus(
eq(WorkspaceStatus.STOPPED), eq(15L), eq(Pages.DEFAULT_PAGE_SIZE), eq(0L));