Skip to content

Commit d26ce15

Browse files
GutoVeroneziGutoVeronezi
andauthored
Fix camel case (#5898)
Co-authored-by: GutoVeronezi <daniel@scclouds.com.br>
1 parent 982eef2 commit d26ce15

File tree

12 files changed

+17
-17
lines changed

12 files changed

+17
-17
lines changed

api/src/main/java/com/cloud/storage/Snapshot.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ enum LocationType {
9292

9393
boolean isRecursive();
9494

95-
short getsnapshotType();
95+
short getSnapshotType();
9696

9797
LocationType getLocationType(); // This type is in reference to the location where the snapshot resides (ex. primary storage, archive on secondary storage, etc.)
9898
}

engine/schema/src/main/java/com/cloud/host/dao/HostDaoImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -830,7 +830,7 @@ public void loadDetails(HostVO host) {
830830

831831
@Override
832832
public void loadHostTags(HostVO host) {
833-
List<String> hostTags = _hostTagsDao.gethostTags(host.getId());
833+
List<String> hostTags = _hostTagsDao.getHostTags(host.getId());
834834
host.setHostTags(hostTags);
835835
}
836836

engine/schema/src/main/java/com/cloud/host/dao/HostTagsDao.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public interface HostTagsDao extends GenericDao<HostTagVO, Long> {
2525

2626
void persist(long hostId, List<String> hostTags);
2727

28-
List<String> gethostTags(long hostId);
28+
List<String> getHostTags(long hostId);
2929

3030
List<String> getDistinctImplicitHostTags(List<Long> hostIds, String[] implicitHostTags);
3131

engine/schema/src/main/java/com/cloud/host/dao/HostTagsDaoImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public HostTagsDaoImpl() {
4848
}
4949

5050
@Override
51-
public List<String> gethostTags(long hostId) {
51+
public List<String> getHostTags(long hostId) {
5252
SearchCriteria<HostTagVO> sc = HostSearch.create();
5353
sc.setParameters("hostId", hostId);
5454

engine/schema/src/main/java/com/cloud/storage/SnapshotVO.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ public long getSnapshotId() {
168168
}
169169

170170
@Override
171-
public short getsnapshotType() {
171+
public short getSnapshotType() {
172172
return snapshotType;
173173
}
174174

engine/schema/src/main/java/com/cloud/storage/dao/SnapshotDaoImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,12 +130,12 @@ protected void init() {
130130

131131
VolumeIdTypeSearch = createSearchBuilder();
132132
VolumeIdTypeSearch.and("volumeId", VolumeIdTypeSearch.entity().getVolumeId(), SearchCriteria.Op.EQ);
133-
VolumeIdTypeSearch.and("type", VolumeIdTypeSearch.entity().getsnapshotType(), SearchCriteria.Op.EQ);
133+
VolumeIdTypeSearch.and("type", VolumeIdTypeSearch.entity().getSnapshotType(), SearchCriteria.Op.EQ);
134134
VolumeIdTypeSearch.done();
135135

136136
VolumeIdTypeNotDestroyedSearch = createSearchBuilder();
137137
VolumeIdTypeNotDestroyedSearch.and("volumeId", VolumeIdTypeNotDestroyedSearch.entity().getVolumeId(), SearchCriteria.Op.EQ);
138-
VolumeIdTypeNotDestroyedSearch.and("type", VolumeIdTypeNotDestroyedSearch.entity().getsnapshotType(), SearchCriteria.Op.EQ);
138+
VolumeIdTypeNotDestroyedSearch.and("type", VolumeIdTypeNotDestroyedSearch.entity().getSnapshotType(), SearchCriteria.Op.EQ);
139139
VolumeIdTypeNotDestroyedSearch.and("status", VolumeIdTypeNotDestroyedSearch.entity().getState(), SearchCriteria.Op.NEQ);
140140
VolumeIdTypeNotDestroyedSearch.done();
141141

engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/SnapshotObject.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -298,8 +298,8 @@ public boolean isRecursive() {
298298
}
299299

300300
@Override
301-
public short getsnapshotType() {
302-
return snapshot.getsnapshotType();
301+
public short getSnapshotType() {
302+
return snapshot.getSnapshotType();
303303
}
304304

305305
@Override

engine/storage/src/main/java/org/apache/cloudstack/storage/snapshot/SnapshotEntityImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ public boolean isRecursive() {
119119
}
120120

121121
@Override
122-
public short getsnapshotType() {
122+
public short getSnapshotType() {
123123
// TODO Auto-generated method stub
124124
return 0;
125125
}

server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3750,7 +3750,7 @@ protected void updateServiceOfferingHostTagsIfNotNull(String hostTags, ServiceOf
37503750
if (CollectionUtils.isNotEmpty(hosts)) {
37513751
List<String> listOfHostTags = Arrays.asList(hostTags.split(","));
37523752
for (HostVO host : hosts) {
3753-
List<String> tagsOnHost = hostTagDao.gethostTags(host.getId());
3753+
List<String> tagsOnHost = hostTagDao.getHostTags(host.getId());
37543754
if (CollectionUtils.isEmpty(tagsOnHost) || !tagsOnHost.containsAll(listOfHostTags)) {
37553755
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));
37563756
}

server/src/main/java/com/cloud/resource/ResourceManagerImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2160,7 +2160,7 @@ protected HostVO createHostVO(final StartupCommand[] cmds, final ServerResource
21602160
final List<String> implicitHostTags = ssCmd.getHostTags();
21612161
if (!implicitHostTags.isEmpty()) {
21622162
if (hostTags == null) {
2163-
hostTags = _hostTagsDao.gethostTags(host.getId());
2163+
hostTags = _hostTagsDao.getHostTags(host.getId());
21642164
}
21652165
if (hostTags != null) {
21662166
implicitHostTags.removeAll(hostTags);
@@ -3172,7 +3172,7 @@ public Long getGuestOSCategoryId(final long hostId) {
31723172

31733173
@Override
31743174
public String getHostTags(final long hostId) {
3175-
final List<String> hostTags = _hostTagsDao.gethostTags(hostId);
3175+
final List<String> hostTags = _hostTagsDao.getHostTags(hostId);
31763176
if (hostTags == null) {
31773177
return null;
31783178
} else {

0 commit comments

Comments
 (0)