Arik Hadas has uploaded a new change for review. Change subject: core: cleanup - rename cpu_over_commit_time_stamp ......................................................................
core: cleanup - rename cpu_over_commit_time_stamp Rename cpu_over_commit_time_stamp to conform Java conventions Change-Id: Ib86f2600305d7c8718f1184be5cc3a4c5a3c2b65 Signed-off-by: Arik Hadas <[email protected]> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsStatistics.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsStatisticsDAODbFacadeImpl.java 3 files changed, 12 insertions(+), 12 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/34/33734/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java index 4270d18..2fd0c10 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java @@ -846,11 +846,11 @@ } public Date getCpuOverCommitTimestamp() { - return mVdsStatistics.getcpu_over_commit_time_stamp(); + return mVdsStatistics.getCpuOverCommitTimeStamp(); } public void setCpuOverCommitTimestamp(Date value) { - mVdsStatistics.setcpu_over_commit_time_stamp(value); + mVdsStatistics.setCpuOverCommitTimeStamp(value); } public int getVdsStrength() { diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsStatistics.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsStatistics.java index a6699c2..4a049fd 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsStatistics.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsStatistics.java @@ -38,7 +38,7 @@ private boolean highlyAvailableIsActive; private boolean highlyAvailableGlobalMaintenance; private boolean highlyAvailableLocalMaintenance; - private Date cpu_over_commit_time_stamp; + private Date cpuOverCommitTimeStamp; private List<CpuStatistics> cpuCoreStatistics; @@ -97,7 +97,7 @@ result = prime * result + (highlyAvailableGlobalMaintenance ? 1231 : 1237); result = prime * result + (highlyAvailableLocalMaintenance ? 1231 : 1237); result = prime * result + ((cpuCoreStatistics == null) ? 0 : cpuCoreStatistics.hashCode()); - result = prime * result + ((cpu_over_commit_time_stamp == null) ? 0 : cpu_over_commit_time_stamp.hashCode()); + result = prime * result + ((cpuOverCommitTimeStamp == null) ? 0 : cpuOverCommitTimeStamp.hashCode()); return result; } @@ -136,7 +136,7 @@ && (highlyAvailableGlobalMaintenance == other.highlyAvailableGlobalMaintenance) && (highlyAvailableLocalMaintenance == other.highlyAvailableLocalMaintenance) && ObjectUtils.objectsEqual(cpuCoreStatistics, other.cpuCoreStatistics) - && ObjectUtils.objectsEqual(cpu_over_commit_time_stamp, other.cpu_over_commit_time_stamp)); + && ObjectUtils.objectsEqual(cpuOverCommitTimeStamp, other.cpuOverCommitTimeStamp)); } public Double getcpu_idle() { @@ -338,11 +338,11 @@ this.cpuCoreStatistics = cpuCoreStatistics; } - public Date getcpu_over_commit_time_stamp() { - return this.cpu_over_commit_time_stamp; + public Date getCpuOverCommitTimeStamp() { + return this.cpuOverCommitTimeStamp; } - public void setcpu_over_commit_time_stamp(Date value) { - this.cpu_over_commit_time_stamp = value; + public void setCpuOverCommitTimeStamp(Date value) { + this.cpuOverCommitTimeStamp = value; } } diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsStatisticsDAODbFacadeImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsStatisticsDAODbFacadeImpl.java index 90ea511..8c6940f 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsStatisticsDAODbFacadeImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsStatisticsDAODbFacadeImpl.java @@ -53,7 +53,7 @@ entity.setHighlyAvailableIsActive(rs.getBoolean("ha_active")); entity.setHighlyAvailableGlobalMaintenance(rs.getBoolean("ha_global_maintenance")); entity.setHighlyAvailableLocalMaintenance(rs.getBoolean("ha_local_maintenance")); - entity.setcpu_over_commit_time_stamp(DbFacadeUtils.fromDate(rs + entity.setCpuOverCommitTimeStamp(DbFacadeUtils.fromDate(rs .getTimestamp("cpu_over_commit_time_stamp"))); return entity; } @@ -96,7 +96,7 @@ .addValue("ha_active", stats.getHighlyAvailableIsActive()) .addValue("ha_global_maintenance", stats.getHighlyAvailableGlobalMaintenance()) .addValue("ha_local_maintenance", stats.getHighlyAvailableLocalMaintenance()) - .addValue("cpu_over_commit_time_stamp", stats.getcpu_over_commit_time_stamp()); + .addValue("cpu_over_commit_time_stamp", stats.getCpuOverCommitTimeStamp()); getCallsHandler().executeModification("InsertVdsStatistics", parameterSource); } @@ -128,7 +128,7 @@ .addValue("ha_active", stats.getHighlyAvailableIsActive()) .addValue("ha_global_maintenance", stats.getHighlyAvailableGlobalMaintenance()) .addValue("ha_local_maintenance", stats.getHighlyAvailableLocalMaintenance()) - .addValue("cpu_over_commit_time_stamp", stats.getcpu_over_commit_time_stamp()); + .addValue("cpu_over_commit_time_stamp", stats.getCpuOverCommitTimeStamp()); getCallsHandler().executeModification("UpdateVdsStatistics", parameterSource); } -- To view, visit http://gerrit.ovirt.org/33734 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib86f2600305d7c8718f1184be5cc3a4c5a3c2b65 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Arik Hadas <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
