This is an automated email from the ASF dual-hosted git repository.
gutoveronezi pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/main by this push:
new d26ce15 Fix camel case (#5898)
d26ce15 is described below
commit d26ce157dbc4a7b355a9ef4b825effbbc0da3788
Author: Daniel Augusto Veronezi Salvador
<38945620+gutoveron...@users.noreply.github.com>
AuthorDate: Wed Jan 26 19:20:18 2022 -0300
Fix camel case (#5898)
Co-authored-by: GutoVeronezi <dan...@scclouds.com.br>
---
api/src/main/java/com/cloud/storage/Snapshot.java | 2 +-
engine/schema/src/main/java/com/cloud/host/dao/HostDaoImpl.java | 2 +-
engine/schema/src/main/java/com/cloud/host/dao/HostTagsDao.java | 2 +-
engine/schema/src/main/java/com/cloud/host/dao/HostTagsDaoImpl.java | 2 +-
engine/schema/src/main/java/com/cloud/storage/SnapshotVO.java | 2 +-
.../schema/src/main/java/com/cloud/storage/dao/SnapshotDaoImpl.java | 4 ++--
.../java/org/apache/cloudstack/storage/snapshot/SnapshotObject.java | 4 ++--
.../org/apache/cloudstack/storage/snapshot/SnapshotEntityImpl.java | 2 +-
.../main/java/com/cloud/configuration/ConfigurationManagerImpl.java | 2 +-
server/src/main/java/com/cloud/resource/ResourceManagerImpl.java | 4 ++--
.../main/java/com/cloud/resource/RollingMaintenanceManagerImpl.java | 4 ++--
.../src/main/java/com/cloud/storage/snapshot/SnapshotManagerImpl.java | 4 ++--
12 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/api/src/main/java/com/cloud/storage/Snapshot.java
b/api/src/main/java/com/cloud/storage/Snapshot.java
index 2f3a595..6b87de6 100644
--- a/api/src/main/java/com/cloud/storage/Snapshot.java
+++ b/api/src/main/java/com/cloud/storage/Snapshot.java
@@ -92,7 +92,7 @@ public interface Snapshot extends ControlledEntity, Identity,
InternalIdentity,
boolean isRecursive();
- short getsnapshotType();
+ short getSnapshotType();
LocationType getLocationType(); // This type is in reference to the
location where the snapshot resides (ex. primary storage, archive on secondary
storage, etc.)
}
diff --git a/engine/schema/src/main/java/com/cloud/host/dao/HostDaoImpl.java
b/engine/schema/src/main/java/com/cloud/host/dao/HostDaoImpl.java
index d3f3f9d..8b54c48 100644
--- a/engine/schema/src/main/java/com/cloud/host/dao/HostDaoImpl.java
+++ b/engine/schema/src/main/java/com/cloud/host/dao/HostDaoImpl.java
@@ -830,7 +830,7 @@ public class HostDaoImpl extends GenericDaoBase<HostVO,
Long> implements HostDao
@Override
public void loadHostTags(HostVO host) {
- List<String> hostTags = _hostTagsDao.gethostTags(host.getId());
+ List<String> hostTags = _hostTagsDao.getHostTags(host.getId());
host.setHostTags(hostTags);
}
diff --git a/engine/schema/src/main/java/com/cloud/host/dao/HostTagsDao.java
b/engine/schema/src/main/java/com/cloud/host/dao/HostTagsDao.java
index c811de9..0fb5370d 100644
--- a/engine/schema/src/main/java/com/cloud/host/dao/HostTagsDao.java
+++ b/engine/schema/src/main/java/com/cloud/host/dao/HostTagsDao.java
@@ -25,7 +25,7 @@ public interface HostTagsDao extends GenericDao<HostTagVO,
Long> {
void persist(long hostId, List<String> hostTags);
- List<String> gethostTags(long hostId);
+ List<String> getHostTags(long hostId);
List<String> getDistinctImplicitHostTags(List<Long> hostIds, String[]
implicitHostTags);
diff --git
a/engine/schema/src/main/java/com/cloud/host/dao/HostTagsDaoImpl.java
b/engine/schema/src/main/java/com/cloud/host/dao/HostTagsDaoImpl.java
index 48eb8f1..a73899b 100644
--- a/engine/schema/src/main/java/com/cloud/host/dao/HostTagsDaoImpl.java
+++ b/engine/schema/src/main/java/com/cloud/host/dao/HostTagsDaoImpl.java
@@ -48,7 +48,7 @@ public class HostTagsDaoImpl extends
GenericDaoBase<HostTagVO, Long> implements
}
@Override
- public List<String> gethostTags(long hostId) {
+ public List<String> getHostTags(long hostId) {
SearchCriteria<HostTagVO> sc = HostSearch.create();
sc.setParameters("hostId", hostId);
diff --git a/engine/schema/src/main/java/com/cloud/storage/SnapshotVO.java
b/engine/schema/src/main/java/com/cloud/storage/SnapshotVO.java
index f104159..e70bdc8 100644
--- a/engine/schema/src/main/java/com/cloud/storage/SnapshotVO.java
+++ b/engine/schema/src/main/java/com/cloud/storage/SnapshotVO.java
@@ -168,7 +168,7 @@ public class SnapshotVO implements Snapshot {
}
@Override
- public short getsnapshotType() {
+ public short getSnapshotType() {
return snapshotType;
}
diff --git
a/engine/schema/src/main/java/com/cloud/storage/dao/SnapshotDaoImpl.java
b/engine/schema/src/main/java/com/cloud/storage/dao/SnapshotDaoImpl.java
index 5a3998a..4c5bb3c 100755
--- a/engine/schema/src/main/java/com/cloud/storage/dao/SnapshotDaoImpl.java
+++ b/engine/schema/src/main/java/com/cloud/storage/dao/SnapshotDaoImpl.java
@@ -130,12 +130,12 @@ public class SnapshotDaoImpl extends
GenericDaoBase<SnapshotVO, Long> implements
VolumeIdTypeSearch = createSearchBuilder();
VolumeIdTypeSearch.and("volumeId",
VolumeIdTypeSearch.entity().getVolumeId(), SearchCriteria.Op.EQ);
- VolumeIdTypeSearch.and("type",
VolumeIdTypeSearch.entity().getsnapshotType(), SearchCriteria.Op.EQ);
+ VolumeIdTypeSearch.and("type",
VolumeIdTypeSearch.entity().getSnapshotType(), SearchCriteria.Op.EQ);
VolumeIdTypeSearch.done();
VolumeIdTypeNotDestroyedSearch = createSearchBuilder();
VolumeIdTypeNotDestroyedSearch.and("volumeId",
VolumeIdTypeNotDestroyedSearch.entity().getVolumeId(), SearchCriteria.Op.EQ);
- VolumeIdTypeNotDestroyedSearch.and("type",
VolumeIdTypeNotDestroyedSearch.entity().getsnapshotType(),
SearchCriteria.Op.EQ);
+ VolumeIdTypeNotDestroyedSearch.and("type",
VolumeIdTypeNotDestroyedSearch.entity().getSnapshotType(),
SearchCriteria.Op.EQ);
VolumeIdTypeNotDestroyedSearch.and("status",
VolumeIdTypeNotDestroyedSearch.entity().getState(), SearchCriteria.Op.NEQ);
VolumeIdTypeNotDestroyedSearch.done();
diff --git
a/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/SnapshotObject.java
b/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/SnapshotObject.java
index 1d343ab..5b46342 100644
---
a/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/SnapshotObject.java
+++
b/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/SnapshotObject.java
@@ -298,8 +298,8 @@ public class SnapshotObject implements SnapshotInfo {
}
@Override
- public short getsnapshotType() {
- return snapshot.getsnapshotType();
+ public short getSnapshotType() {
+ return snapshot.getSnapshotType();
}
@Override
diff --git
a/engine/storage/src/main/java/org/apache/cloudstack/storage/snapshot/SnapshotEntityImpl.java
b/engine/storage/src/main/java/org/apache/cloudstack/storage/snapshot/SnapshotEntityImpl.java
index 24e77a8..b09077c 100644
---
a/engine/storage/src/main/java/org/apache/cloudstack/storage/snapshot/SnapshotEntityImpl.java
+++
b/engine/storage/src/main/java/org/apache/cloudstack/storage/snapshot/SnapshotEntityImpl.java
@@ -119,7 +119,7 @@ public class SnapshotEntityImpl implements SnapshotEntity {
}
@Override
- public short getsnapshotType() {
+ public short getSnapshotType() {
// TODO Auto-generated method stub
return 0;
}
diff --git
a/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
b/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
index f38dd5e..5634210 100755
--- a/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -3750,7 +3750,7 @@ public class ConfigurationManagerImpl extends ManagerBase
implements Configurati
if (CollectionUtils.isNotEmpty(hosts)) {
List<String> listOfHostTags =
Arrays.asList(hostTags.split(","));
for (HostVO host : hosts) {
- List<String> tagsOnHost =
hostTagDao.gethostTags(host.getId());
+ List<String> tagsOnHost =
hostTagDao.getHostTags(host.getId());
if (CollectionUtils.isEmpty(tagsOnHost) ||
!tagsOnHost.containsAll(listOfHostTags)) {
throw new
InvalidParameterValueException(String.format("There are active VMs using
offering [%s], and the hosts [%s] don't have the new tags", offering.getId(),
hosts));
}
diff --git a/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java
b/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java
index ed169b9..70d205a 100755
--- a/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java
+++ b/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java
@@ -2160,7 +2160,7 @@ public class ResourceManagerImpl extends ManagerBase
implements ResourceManager,
final List<String> implicitHostTags = ssCmd.getHostTags();
if (!implicitHostTags.isEmpty()) {
if (hostTags == null) {
- hostTags = _hostTagsDao.gethostTags(host.getId());
+ hostTags = _hostTagsDao.getHostTags(host.getId());
}
if (hostTags != null) {
implicitHostTags.removeAll(hostTags);
@@ -3172,7 +3172,7 @@ public class ResourceManagerImpl extends ManagerBase
implements ResourceManager,
@Override
public String getHostTags(final long hostId) {
- final List<String> hostTags = _hostTagsDao.gethostTags(hostId);
+ final List<String> hostTags = _hostTagsDao.getHostTags(hostId);
if (hostTags == null) {
return null;
} else {
diff --git
a/server/src/main/java/com/cloud/resource/RollingMaintenanceManagerImpl.java
b/server/src/main/java/com/cloud/resource/RollingMaintenanceManagerImpl.java
index 80a2431..f298d25 100644
--- a/server/src/main/java/com/cloud/resource/RollingMaintenanceManagerImpl.java
+++ b/server/src/main/java/com/cloud/resource/RollingMaintenanceManagerImpl.java
@@ -612,14 +612,14 @@ public class RollingMaintenanceManagerImpl extends
ManagerBase implements Rollin
if (CollectionUtils.isEmpty(vmsRunning)) {
return new Pair<>(true, "OK");
}
- List<String> hostTags = hostTagsDao.gethostTags(host.getId());
+ List<String> hostTags = hostTagsDao.getHostTags(host.getId());
int sucessfullyCheckedVmMigrations = 0;
for (VMInstanceVO runningVM : vmsRunning) {
boolean canMigrateVm = false;
ServiceOfferingVO serviceOffering =
serviceOfferingDao.findById(runningVM.getServiceOfferingId());
for (Host hostInCluster : hostsInCluster) {
- if (!checkHostTags(hostTags,
hostTagsDao.gethostTags(hostInCluster.getId()), serviceOffering.getHostTag())) {
+ if (!checkHostTags(hostTags,
hostTagsDao.getHostTags(hostInCluster.getId()), serviceOffering.getHostTag())) {
s_logger.debug(String.format("Host tags mismatch between
%s and %s Skipping it from the capacity check", host, hostInCluster));
continue;
}
diff --git
a/server/src/main/java/com/cloud/storage/snapshot/SnapshotManagerImpl.java
b/server/src/main/java/com/cloud/storage/snapshot/SnapshotManagerImpl.java
index d94811a..f7ec977 100755
--- a/server/src/main/java/com/cloud/storage/snapshot/SnapshotManagerImpl.java
+++ b/server/src/main/java/com/cloud/storage/snapshot/SnapshotManagerImpl.java
@@ -672,8 +672,8 @@ public class SnapshotManagerImpl extends
MutualExclusiveIdsManagerBase implement
sb.and("name", sb.entity().getName(), SearchCriteria.Op.LIKE);
sb.and("id", sb.entity().getId(), SearchCriteria.Op.EQ);
sb.and("idIN", sb.entity().getId(), SearchCriteria.Op.IN);
- sb.and("snapshotTypeEQ", sb.entity().getsnapshotType(),
SearchCriteria.Op.IN);
- sb.and("snapshotTypeNEQ", sb.entity().getsnapshotType(),
SearchCriteria.Op.NEQ);
+ sb.and("snapshotTypeEQ", sb.entity().getSnapshotType(),
SearchCriteria.Op.IN);
+ sb.and("snapshotTypeNEQ", sb.entity().getSnapshotType(),
SearchCriteria.Op.NEQ);
sb.and("dataCenterId", sb.entity().getDataCenterId(),
SearchCriteria.Op.EQ);
if (tags != null && !tags.isEmpty()) {
