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

getExpired queries return list of String instead of WorkspaceActivity 

Signed-off-by: Tom George <tgeorge@redhat.com>
7.20.x
Tom George 2020-07-14 08:32:56 -05:00
parent e3eb0d9b87
commit c32cb855b5
No known key found for this signature in database
GPG Key ID: 5EA5B2F05A51EF05
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -67,12 +67,10 @@ public class JpaWorkspaceActivityDao implements WorkspaceActivityDao {
try {
return managerProvider
.get()
.createNamedQuery("WorkspaceActivity.getExpiredRunTimeout", WorkspaceActivity.class)
.setParameter("timestamp", timestamp)
.setParameter("runTimeout", runTimeout)
.createNamedQuery("WorkspaceActivity.getExpiredRunTimeout", String.class)
.setParameter("timeDifference", timestamp - runTimeout)
.getResultList()
.stream()
.map(WorkspaceActivity::getWorkspaceId)
.collect(Collectors.toList());
} catch (RuntimeException x) {
throw new ServerException(x.getLocalizedMessage(), x);
@ -85,11 +83,10 @@ public class JpaWorkspaceActivityDao implements WorkspaceActivityDao {
try {
return managerProvider
.get()
.createNamedQuery("WorkspaceActivity.getExpiredIdle", WorkspaceActivity.class)
.createNamedQuery("WorkspaceActivity.getExpiredIdle", String.class)
.setParameter("expiration", timestamp)
.getResultList()
.stream()
.map(WorkspaceActivity::getWorkspaceId)
.collect(Collectors.toList());
} catch (RuntimeException x) {
throw new ServerException(x.getLocalizedMessage(), x);

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

@ -27,13 +27,13 @@ import org.eclipse.che.api.core.model.workspace.WorkspaceStatus;
@NamedQueries({
@NamedQuery(
name = "WorkspaceActivity.getExpiredIdle",
query = "SELECT a FROM WorkspaceActivity a WHERE a.expiration < :expiration"),
query = "SELECT a.workspaceId FROM WorkspaceActivity a WHERE a.expiration < :expiration"),
@NamedQuery(
name = "WorkspaceActivity.getExpiredRunTimeout",
query =
"SELECT a FROM WorkspaceActivity a WHERE "
"SELECT a.workspaceId FROM WorkspaceActivity a WHERE "
+ "(a.status = org.eclipse.che.api.core.model.workspace.WorkspaceStatus.RUNNING AND "
+ "a.lastRunning < :timestamp - :runTimeout)"),
+ "a.lastRunning < :timeDifference)"),
@NamedQuery(
name = "WorkspaceActivity.getStoppedSince",
query =