From a556657daff4103b3fb55b5398b0cc035184f1b2 Mon Sep 17 00:00:00 2001 From: Felipe Evangelista Date: Mon, 15 Jul 2024 08:01:00 -0300 Subject: [PATCH 1/2] added private access modifiers to VolumeVO and fixed an occurrence where a field was being accessed without a getter --- .../main/java/com/cloud/storage/VolumeVO.java | 54 +++++++++---------- .../cloud/storage/VolumeApiServiceImpl.java | 2 +- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/engine/schema/src/main/java/com/cloud/storage/VolumeVO.java b/engine/schema/src/main/java/com/cloud/storage/VolumeVO.java index c105acf40b8d..00451c179cf8 100644 --- a/engine/schema/src/main/java/com/cloud/storage/VolumeVO.java +++ b/engine/schema/src/main/java/com/cloud/storage/VolumeVO.java @@ -48,31 +48,31 @@ public class VolumeVO implements Volume { @TableGenerator(name = "volume_sq", table = "sequence", pkColumnName = "name", valueColumnName = "value", pkColumnValue = "volume_seq", allocationSize = 1) @GeneratedValue(strategy = GenerationType.TABLE) @Column(name = "id") - long id; + private long id; @Column(name = "name") - String name; + private String name; @Column(name = "pool_id") - Long poolId; + private Long poolId; @Column(name = "last_pool_id") - Long lastPoolId; + private Long lastPoolId; @Column(name = "account_id") - long accountId; + private long accountId; @Column(name = "domain_id") - long domainId; + private long domainId; @Column(name = "instance_id") - Long instanceId = null; + private Long instanceId = null; @Column(name = "device_id") - Long deviceId = null; + private Long deviceId = null; @Column(name = "size") - Long size; + private Long size; @Column(name = "min_iops") private Long minIops; @@ -81,50 +81,50 @@ public class VolumeVO implements Volume { private Long maxIops; @Column(name = "folder") - String folder; + private String folder; @Column(name = "path") - String path; + private String path; @Column(name = "pod_id") - Long podId; + private Long podId; @Column(name = "created") - Date created; + private Date created; @Column(name = "attached") @Temporal(value = TemporalType.TIMESTAMP) - Date attached; + private Date attached; @Column(name = "data_center_id") - long dataCenterId; + private long dataCenterId; @Column(name = "host_ip") - String hostip; + private String hostip; @Column(name = "disk_offering_id") - long diskOfferingId; + private long diskOfferingId; @Column(name = "template_id") - Long templateId; + private Long templateId; @Column(name = "first_snapshot_backup_uuid") - String firstSnapshotBackupUuid; + private String firstSnapshotBackupUuid; @Column(name = "volume_type") @Enumerated(EnumType.STRING) - Type volumeType = Volume.Type.UNKNOWN; + private Type volumeType = Volume.Type.UNKNOWN; @Column(name = "pool_type") @Convert(converter = StoragePoolTypeConverter.class) - StoragePoolType poolType; + private StoragePoolType poolType; @Column(name = GenericDao.REMOVED_COLUMN) - Date removed; + private Date removed; @Column(name = "updated") @Temporal(value = TemporalType.TIMESTAMP) - Date updated; + private Date updated; @Column(name = "update_count", updatable = true, nullable = false) protected long updatedCount; // This field should be updated everytime the @@ -133,17 +133,17 @@ public class VolumeVO implements Volume { // dao code. @Column(name = "recreatable") - boolean recreatable; + private boolean recreatable; @Column(name = "state") @Enumerated(value = EnumType.STRING) private State state; @Column(name = "chain_info", length = 65535) - String chainInfo; + private String chainInfo; @Column(name = "uuid") - String uuid; + private String uuid; @Column(name = "format") private Storage.ImageFormat format; @@ -168,7 +168,7 @@ public class VolumeVO implements Volume { @Transient // @Column(name="reservation") - String reservationId; + private String reservationId; @Column(name = "hv_ss_reserve") private Integer hypervisorSnapshotReserve; diff --git a/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java b/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java index 6caa95a4b635..ae55b03c139e 100644 --- a/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java +++ b/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java @@ -3336,7 +3336,7 @@ public Volume migrateVolume(MigrateVolumeCmd cmd) { } // In case of VMware, if ROOT volume is being cold-migrated, then ensure destination storage pool is in the same Datacenter as the VM. if (vm != null && vm.getHypervisorType().equals(HypervisorType.VMware)) { - if (!liveMigrateVolume && vol.volumeType.equals(Volume.Type.ROOT)) { + if (!liveMigrateVolume && vol.getVolumeType().equals(Volume.Type.ROOT)) { Long hostId = vm.getHostId() != null ? vm.getHostId() : vm.getLastHostId(); HostVO host = _hostDao.findById(hostId); if (host != null) { From 67dbfe3f8cb0dd7c1bd16888b93c0401e98111ba Mon Sep 17 00:00:00 2001 From: Felipe Evangelista Date: Fri, 2 Aug 2024 08:18:46 -0300 Subject: [PATCH 2/2] renamed the field hostip to hostIp and removed duplicated methods https://github.com/apache/cloudstack/pull/9394#issuecomment-2264816580 --- engine/schema/src/main/java/com/cloud/storage/VolumeVO.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/engine/schema/src/main/java/com/cloud/storage/VolumeVO.java b/engine/schema/src/main/java/com/cloud/storage/VolumeVO.java index 00451c179cf8..4e8fd5ba79cb 100644 --- a/engine/schema/src/main/java/com/cloud/storage/VolumeVO.java +++ b/engine/schema/src/main/java/com/cloud/storage/VolumeVO.java @@ -100,7 +100,7 @@ public class VolumeVO implements Volume { private long dataCenterId; @Column(name = "host_ip") - private String hostip; + private String hostIp; @Column(name = "disk_offering_id") private long diskOfferingId; @@ -428,11 +428,11 @@ public void setPath(String path) { } public String getHostIp() { - return hostip; + return hostIp; } public void setHostIp(String hostip) { - this.hostip = hostip; + this.hostIp = hostip; } public void setPodId(Long podId) {