Skip to content

Commit 03e8aa9

Browse files
bernardodemarcobernardodemarco
committed
add constants to ConsoleSessionDaoImpl
1 parent 69c21a0 commit 03e8aa9

File tree

1 file changed

+43
-28
lines changed

1 file changed

+43
-28
lines changed

‎engine/schema/src/main/java/com/cloud/vm/dao/ConsoleSessionDaoImpl.java‎

Lines changed: 43 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,28 @@
3232
import com.cloud.vm.ConsoleSessionVO;
3333

3434
public class ConsoleSessionDaoImpl extends GenericDaoBase<ConsoleSessionVO, Long> implements ConsoleSessionDao {
35+
private static final String ID = "id";
36+
private static final String DOMAIN_IDS = "domainIds";
37+
private static final String ACCOUNT_ID = "accountId";
38+
private static final String USER_ID = "userId";
39+
private static final String HOST_ID = "hostId";
40+
private static final String INSTANCE_ID = "instanceId";
41+
private static final String VM_IDS = "vmIds";
42+
private static final String START_DATE = "startDate";
43+
private static final String END_DATE = "endDate";
44+
private static final String CREATOR_ADDRESS = "creatorAddress";
45+
private static final String CLIENT_ADDRESS = "clientAddress";
46+
private static final String ACQUIRED = "acquired";
47+
private static final String CREATED = "created";
48+
private static final String REMOVED = "removed";
49+
private static final String REMOVED_NOT_NULL = "removedNotNull";
3550

3651
private final SearchBuilder<ConsoleSessionVO> searchByRemovedDate;
3752

3853
public ConsoleSessionDaoImpl() {
3954
searchByRemovedDate = createSearchBuilder();
40-
searchByRemovedDate.and("removedNotNull", searchByRemovedDate.entity().getRemoved(), SearchCriteria.Op.NNULL);
41-
searchByRemovedDate.and("removed", searchByRemovedDate.entity().getRemoved(), SearchCriteria.Op.LTEQ);
55+
searchByRemovedDate.and(REMOVED_NOT_NULL, searchByRemovedDate.entity().getRemoved(), SearchCriteria.Op.NNULL);
56+
searchByRemovedDate.and(REMOVED, searchByRemovedDate.entity().getRemoved(), SearchCriteria.Op.LTEQ);
4257
}
4358

4459
@Override
@@ -59,7 +74,7 @@ public boolean isSessionAllowed(String sessionUuid) {
5974
@Override
6075
public int expungeSessionsOlderThanDate(Date date) {
6176
SearchCriteria<ConsoleSessionVO> searchCriteria = searchByRemovedDate.create();
62-
searchCriteria.setParameters("removed", date);
77+
searchCriteria.setParameters(REMOVED, date);
6378
return expunge(searchCriteria);
6479
}
6580

@@ -77,9 +92,9 @@ public int expungeByVmList(List<Long> vmIds, Long batchSize) {
7792
return 0;
7893
}
7994
SearchBuilder<ConsoleSessionVO> sb = createSearchBuilder();
80-
sb.and("vmIds", sb.entity().getInstanceId(), SearchCriteria.Op.IN);
95+
sb.and(VM_IDS, sb.entity().getInstanceId(), SearchCriteria.Op.IN);
8196
SearchCriteria<ConsoleSessionVO> sc = sb.create();
82-
sc.setParameters("vmIds", vmIds.toArray());
97+
sc.setParameters(VM_IDS, vmIds.toArray());
8398
return batchExpunge(sc, batchSize);
8499
}
85100

@@ -88,7 +103,7 @@ public Pair<List<ConsoleSessionVO>, Integer> listConsoleSessions(Long id, List<L
88103
Date startDate, Date endDate, Long instanceId,
89104
String consoleEndpointCreatorAddress, String clientAddress,
90105
boolean activeOnly, Long pageSizeVal, Long startIndex) {
91-
Filter filter = new Filter(ConsoleSessionVO.class, "created", false, startIndex, pageSizeVal);
106+
Filter filter = new Filter(ConsoleSessionVO.class, CREATED, false, startIndex, pageSizeVal);
92107
SearchCriteria<ConsoleSessionVO> searchCriteria = createListConsoleSessionsSearchCriteria(id, domainIds, accountId, userId, hostId,
93108
startDate, endDate, instanceId, consoleEndpointCreatorAddress, clientAddress, activeOnly);
94109

@@ -101,37 +116,37 @@ private SearchCriteria<ConsoleSessionVO> createListConsoleSessionsSearchCriteria
101116
boolean activeOnly) {
102117
SearchCriteria<ConsoleSessionVO> searchCriteria = createListConsoleSessionsSearchBuilder(activeOnly).create();
103118

104-
searchCriteria.setParametersIfNotNull("id", id);
105-
searchCriteria.setParametersIfNotNull("domainIds", domainIds.toArray());
106-
searchCriteria.setParametersIfNotNull("accountId", accountId);
107-
searchCriteria.setParametersIfNotNull("userId", userId);
108-
searchCriteria.setParametersIfNotNull("hostId", hostId);
109-
searchCriteria.setParametersIfNotNull("instanceId", instanceId);
110-
searchCriteria.setParametersIfNotNull("startDate", startDate);
111-
searchCriteria.setParametersIfNotNull("endDate", endDate);
112-
searchCriteria.setParametersIfNotNull("creatorAddress", consoleEndpointCreatorAddress);
113-
searchCriteria.setParametersIfNotNull("clientAddress", clientAddress);
119+
searchCriteria.setParametersIfNotNull(ID, id);
120+
searchCriteria.setParametersIfNotNull(DOMAIN_IDS, domainIds.toArray());
121+
searchCriteria.setParametersIfNotNull(ACCOUNT_ID, accountId);
122+
searchCriteria.setParametersIfNotNull(USER_ID, userId);
123+
searchCriteria.setParametersIfNotNull(HOST_ID, hostId);
124+
searchCriteria.setParametersIfNotNull(INSTANCE_ID, instanceId);
125+
searchCriteria.setParametersIfNotNull(START_DATE, startDate);
126+
searchCriteria.setParametersIfNotNull(END_DATE, endDate);
127+
searchCriteria.setParametersIfNotNull(CREATOR_ADDRESS, consoleEndpointCreatorAddress);
128+
searchCriteria.setParametersIfNotNull(CLIENT_ADDRESS, clientAddress);
114129

115130
return searchCriteria;
116131
}
117132

118133
private SearchBuilder<ConsoleSessionVO> createListConsoleSessionsSearchBuilder(boolean activeOnly) {
119134
SearchBuilder<ConsoleSessionVO> searchBuilder = createSearchBuilder();
120135

121-
searchBuilder.and("id", searchBuilder.entity().getId(), SearchCriteria.Op.EQ);
122-
searchBuilder.and("domainIds", searchBuilder.entity().getDomainId(), SearchCriteria.Op.IN);
123-
searchBuilder.and("accountId", searchBuilder.entity().getAccountId(), SearchCriteria.Op.EQ);
124-
searchBuilder.and("userId", searchBuilder.entity().getUserId(), SearchCriteria.Op.EQ);
125-
searchBuilder.and("hostId", searchBuilder.entity().getHostId(), SearchCriteria.Op.EQ);
126-
searchBuilder.and("instanceId", searchBuilder.entity().getInstanceId(), SearchCriteria.Op.EQ);
127-
searchBuilder.and("startDate", searchBuilder.entity().getAcquired(), SearchCriteria.Op.GTEQ);
128-
searchBuilder.and("endDate", searchBuilder.entity().getAcquired(), SearchCriteria.Op.LTEQ);
129-
searchBuilder.and("creatorAddress", searchBuilder.entity().getConsoleEndpointCreatorAddress(), SearchCriteria.Op.EQ);
130-
searchBuilder.and("clientAddress", searchBuilder.entity().getClientAddress(), SearchCriteria.Op.EQ);
136+
searchBuilder.and(ID, searchBuilder.entity().getId(), SearchCriteria.Op.EQ);
137+
searchBuilder.and(DOMAIN_IDS, searchBuilder.entity().getDomainId(), SearchCriteria.Op.IN);
138+
searchBuilder.and(ACCOUNT_ID, searchBuilder.entity().getAccountId(), SearchCriteria.Op.EQ);
139+
searchBuilder.and(USER_ID, searchBuilder.entity().getUserId(), SearchCriteria.Op.EQ);
140+
searchBuilder.and(HOST_ID, searchBuilder.entity().getHostId(), SearchCriteria.Op.EQ);
141+
searchBuilder.and(INSTANCE_ID, searchBuilder.entity().getInstanceId(), SearchCriteria.Op.EQ);
142+
searchBuilder.and(START_DATE, searchBuilder.entity().getAcquired(), SearchCriteria.Op.GTEQ);
143+
searchBuilder.and(END_DATE, searchBuilder.entity().getAcquired(), SearchCriteria.Op.LTEQ);
144+
searchBuilder.and(CREATOR_ADDRESS, searchBuilder.entity().getConsoleEndpointCreatorAddress(), SearchCriteria.Op.EQ);
145+
searchBuilder.and(CLIENT_ADDRESS, searchBuilder.entity().getClientAddress(), SearchCriteria.Op.EQ);
131146

132147
if (activeOnly) {
133-
searchBuilder.and("acquired", searchBuilder.entity().getAcquired(), SearchCriteria.Op.NNULL);
134-
searchBuilder.and("removed", searchBuilder.entity().getRemoved(), SearchCriteria.Op.NULL);
148+
searchBuilder.and(ACQUIRED, searchBuilder.entity().getAcquired(), SearchCriteria.Op.NNULL);
149+
searchBuilder.and(REMOVED, searchBuilder.entity().getRemoved(), SearchCriteria.Op.NULL);
135150
}
136151

137152
searchBuilder.done();

0 commit comments

Comments
 (0)