Skip to content

Commit 2c681b8

Browse files
Kui-Liuyadvr
authored andcommitted
CLOUDSTACK-10363: refactor the "getXXX" and "listXXX" method names to "findXXX" (#2599)
These three methods are not direct getter or list. They try to find the target objects with the related arguments. So that, renaming them as "findXXX" should be more intuitive.
1 parent 93509a4 commit 2c681b8

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ private AsyncJobDispatcher getDispatcher(String dispatcherName) {
482482
throw new CloudRuntimeException("Unable to find dispatcher name: " + dispatcherName);
483483
}
484484

485-
private AsyncJobDispatcher getWakeupDispatcher(AsyncJob job) {
485+
private AsyncJobDispatcher findWakeupDispatcher(AsyncJob job) {
486486
if (_jobDispatchers != null) {
487487
List<AsyncJobJoinMapVO> joinRecords = _joinMapDao.listJoinRecords(job.getId());
488488
if (joinRecords.size() > 0) {
@@ -567,7 +567,7 @@ protected void runInContext() {
567567
}
568568

569569
if ((getAndResetPendingSignals(job) & AsyncJob.Constants.SIGNAL_MASK_WAKEUP) != 0) {
570-
AsyncJobDispatcher jobDispatcher = getWakeupDispatcher(job);
570+
AsyncJobDispatcher jobDispatcher = findWakeupDispatcher(job);
571571
if (jobDispatcher != null) {
572572
jobDispatcher.runJob(job);
573573
} else {

plugins/network-elements/ovs/src/main/java/com/cloud/network/ovs/OvsTunnelManagerImpl.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ private void handleCreateTunnelAnswer(Answer[] answers) {
212212
Long from = r.getFrom();
213213
Long to = r.getTo();
214214
long networkId = r.getNetworkId();
215-
OvsTunnelNetworkVO tunnel = _tunnelNetworkDao.getByFromToNetwork(from, to, networkId);
215+
OvsTunnelNetworkVO tunnel = _tunnelNetworkDao.findByFromToNetwork(from, to, networkId);
216216
if (tunnel == null) {
217217
throw new CloudRuntimeException(
218218
String.format("Unable find tunnelNetwork record" +
@@ -321,7 +321,7 @@ protected void checkAndCreateTunnel(Network nw, Host host) {
321321
if (rh == hostId) {
322322
continue;
323323
}
324-
OvsTunnelNetworkVO ta = _tunnelNetworkDao.getByFromToNetwork(hostId, rh.longValue(), nw.getId());
324+
OvsTunnelNetworkVO ta = _tunnelNetworkDao.findByFromToNetwork(hostId, rh.longValue(), nw.getId());
325325
// Try and create the tunnel even if a previous attempt failed
326326
if (ta == null || ta.getState().equals(OvsTunnel.State.Failed.name())) {
327327
s_logger.debug("Attempting to create tunnel from:" + hostId + " to:" + rh.longValue());
@@ -333,7 +333,7 @@ protected void checkAndCreateTunnel(Network nw, Host host) {
333333
}
334334
}
335335

336-
ta = _tunnelNetworkDao.getByFromToNetwork(rh.longValue(),
336+
ta = _tunnelNetworkDao.findByFromToNetwork(rh.longValue(),
337337
hostId, nw.getId());
338338
// Try and create the tunnel even if a previous attempt failed
339339
if (ta == null || ta.getState().equals(OvsTunnel.State.Failed.name())) {
@@ -605,7 +605,7 @@ protected void checkAndCreateVpcTunnelNetworks(Host host, long vpcId) {
605605
if (rh == hostId) {
606606
continue;
607607
}
608-
tunnelRecord = _tunnelNetworkDao.getByFromToNetwork(hostId, rh.longValue(), vpcNetwork.getId());
608+
tunnelRecord = _tunnelNetworkDao.findByFromToNetwork(hostId, rh.longValue(), vpcNetwork.getId());
609609
// Try and create the tunnel if does not exit or previous attempt failed
610610
if (tunnelRecord == null || tunnelRecord.getState().equals(OvsTunnel.State.Failed.name())) {
611611
s_logger.debug("Attempting to create tunnel from:" + hostId + " to:" + rh.longValue());
@@ -616,7 +616,7 @@ protected void checkAndCreateVpcTunnelNetworks(Host host, long vpcId) {
616616
toHostIds.add(rh);
617617
}
618618
}
619-
tunnelRecord = _tunnelNetworkDao.getByFromToNetwork(rh.longValue(), hostId, vpcNetwork.getId());
619+
tunnelRecord = _tunnelNetworkDao.findByFromToNetwork(rh.longValue(), hostId, vpcNetwork.getId());
620620
// Try and create the tunnel if does not exit or previous attempt failed
621621
if (tunnelRecord == null || tunnelRecord.getState().equals(OvsTunnel.State.Failed.name())) {
622622
s_logger.debug("Attempting to create tunnel from:" + rh.longValue() + " to:" + hostId);

plugins/network-elements/ovs/src/main/java/com/cloud/network/ovs/dao/OvsTunnelNetworkDao.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import com.cloud.utils.db.GenericDao;
2323

2424
public interface OvsTunnelNetworkDao extends GenericDao<OvsTunnelNetworkVO, Long> {
25-
OvsTunnelNetworkVO getByFromToNetwork(long from, long to, long networkId);
25+
OvsTunnelNetworkVO findByFromToNetwork(long from, long to, long networkId);
2626

2727
void removeByFromNetwork(long from, long networkId);
2828

plugins/network-elements/ovs/src/main/java/com/cloud/network/ovs/dao/OvsTunnelNetworkDaoImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public OvsTunnelNetworkDaoImpl() {
5353
}
5454

5555
@Override
56-
public OvsTunnelNetworkVO getByFromToNetwork(long from, long to, long networkId) {
56+
public OvsTunnelNetworkVO findByFromToNetwork(long from, long to, long networkId) {
5757
SearchCriteria<OvsTunnelNetworkVO> sc = fromToNetworkSearch.create();
5858
sc.setParameters("from", from);
5959
sc.setParameters("to", to);

services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/PremiumSecondaryStorageManagerImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ public Pair<AfterScanAction, Object> scanPool(Long pool) {
136136

137137
alreadyRunning = _secStorageVmDao.getSecStorageVmListInStates(null, dataCenterId, State.Running, State.Migrating, State.Starting);
138138

139-
List<CommandExecLogVO> activeCmds = listActiveCommands(dataCenterId, cutTime);
139+
List<CommandExecLogVO> activeCmds = findActiveCommands(dataCenterId, cutTime);
140140
if (alreadyRunning.size() * _capacityPerSSVM - activeCmds.size() < _standbyCapacity) {
141141
s_logger.info("secondary storage command execution standby capactiy low (running VMs: " + alreadyRunning.size() + ", active cmds: " + activeCmds.size() +
142142
"), starting a new one");
@@ -163,7 +163,7 @@ public Pair<HostVO, SecondaryStorageVmVO> assignSecStorageVm(long zoneId, Comman
163163
return null;
164164
}
165165

166-
private List<CommandExecLogVO> listActiveCommands(long dcId, Date cutTime) {
166+
private List<CommandExecLogVO> findActiveCommands(long dcId, Date cutTime) {
167167
SearchCriteria<CommandExecLogVO> sc = activeCommandSearch.create();
168168

169169
sc.setParameters("created", cutTime);

0 commit comments

Comments
 (0)