Allon Mureinik has uploaded a new change for review. Change subject: core: Java conventions for DbFacade method names ......................................................................
core: Java conventions for DbFacade method names Renamed DbFacade's methods to use Java camelCase conventions, with a lower-case first letter. Change-Id: I4f4543175c736f4ac09350947a6895598a5adc54 Signed-off-by: Allon Mureinik <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CheckDBConnectionQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetSystemStatisticsQuery.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/DbFacade.java M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DbFacadeDAOTest.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java 6 files changed, 21 insertions(+), 21 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/00/11900/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java index 3158691..8bfd70c 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java @@ -125,7 +125,7 @@ long waitBetweenInterval = DbFacade.getInstance().getConnectionCheckInterval(); while (!dbUp && System.currentTimeMillis() < expectedTimeout) { try { - dbUp = DbFacade.getInstance().CheckDBConnection(); + dbUp = DbFacade.getInstance().checkDBConnection(); } catch (RuntimeException ex) { log.error("Error in getting DB connection. The database is inaccessible. " + "Original exception is: " + ExceptionUtils.getMessage(ex)); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CheckDBConnectionQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CheckDBConnectionQuery.java index 1fc1b3d..fc7d82c 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CheckDBConnectionQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CheckDBConnectionQuery.java @@ -11,7 +11,7 @@ @Override protected void executeQueryCommand() { log.debug("Start checking connection to db"); - getQueryReturnValue().setReturnValue(getDbFacade().CheckDBConnection()); + getQueryReturnValue().setReturnValue(getDbFacade().checkDBConnection()); log.debug("Completed checking connection to db"); } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetSystemStatisticsQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetSystemStatisticsQuery.java index c350704..98b0435 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetSystemStatisticsQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetSystemStatisticsQuery.java @@ -58,7 +58,7 @@ java.util.HashMap<String, Integer> res = new java.util.HashMap<String, Integer>(); // VMs: - int total_vms = DbFacade.getInstance().GetSystemStatisticsValue("VM", ""); + int total_vms = DbFacade.getInstance().getSystemStatisticsValue("VM", ""); String[] activeVmStatuses = { (String.valueOf(VMStatus.Up.getValue())), (String.valueOf(VMStatus.PoweringUp.getValue())), (String.valueOf(VMStatus.PoweredDown.getValue())), @@ -69,28 +69,28 @@ (String.valueOf(VMStatus.Paused.getValue())), (String.valueOf(VMStatus.Unknown.getValue())) }; int active_vms = DbFacade.getInstance() - .GetSystemStatisticsValue("VM", StringUtils.join(activeVmStatuses, ',')); + .getSystemStatisticsValue("VM", StringUtils.join(activeVmStatuses, ',')); int down_vms = (total_vms - active_vms) < 0 ? 0 : (total_vms - active_vms); // Hosts: - int total_vds = DbFacade.getInstance().GetSystemStatisticsValue("HOST", ""); + int total_vds = DbFacade.getInstance().getSystemStatisticsValue("HOST", ""); String[] activeVdsStatuses = { (String.valueOf(VDSStatus.Up.getValue())), (String.valueOf(VDSStatus.PreparingForMaintenance.getValue()))}; - int active_vds = DbFacade.getInstance().GetSystemStatisticsValue("HOST", + int active_vds = DbFacade.getInstance().getSystemStatisticsValue("HOST", StringUtils.join(activeVdsStatuses, ',')); - int maintenance_vds = DbFacade.getInstance().GetSystemStatisticsValue("HOST", + int maintenance_vds = DbFacade.getInstance().getSystemStatisticsValue("HOST", (String.valueOf(VDSStatus.Maintenance.getValue()))); int down_vds = (total_vds - active_vds - maintenance_vds) < 0 ? 0 : (total_vds - active_vds - maintenance_vds); // Users: - int total_users = DbFacade.getInstance().GetSystemStatisticsValue("USER", ""); - int active_users = DbFacade.getInstance().GetSystemStatisticsValue("USER", "1"); + int total_users = DbFacade.getInstance().getSystemStatisticsValue("USER", ""); + int active_users = DbFacade.getInstance().getSystemStatisticsValue("USER", "1"); // Storage Domains: - int total_storage_domains = DbFacade.getInstance().GetSystemStatisticsValue("TSD", ""); - int active_storage_domains = DbFacade.getInstance().GetSystemStatisticsValue("ASD", + int total_storage_domains = DbFacade.getInstance().getSystemStatisticsValue("TSD", ""); + int active_storage_domains = DbFacade.getInstance().getSystemStatisticsValue("ASD", (Integer.toString(StorageDomainStatus.Active.getValue()))); res.put("total_vms", total_vms); diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/DbFacade.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/DbFacade.java index 0e00401..23acdf0 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/DbFacade.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/DbFacade.java @@ -277,7 +277,7 @@ return dbResults.get(resultKey) != null ? ((Integer)dbResults.get(resultKey)).intValue() : -1; } - public boolean IsStoragePoolMasterUp(Guid storagePoolId) { + public boolean isStoragePoolMasterUp(Guid storagePoolId) { List<storage_domains> domains = getStorageDomainDao().getAllForStoragePool(storagePoolId); storage_domains master = LinqUtils.firstOrNull(domains, new Predicate<storage_domains>() { @Override @@ -289,7 +289,7 @@ && (master.getstatus() == StorageDomainStatus.Active || master.getstatus() == StorageDomainStatus.Unknown); } - public Integer GetSystemStatisticsValue(String entity, String status) { + public Integer getSystemStatisticsValue(String entity, String status) { MapSqlParameterSource parameterSource = getCustomMapSqlParameterSource().addValue("entity", entity).addValue( "status", status); @@ -352,7 +352,7 @@ * * @return True if DB is up & running. */ - public boolean CheckDBConnection() { + public boolean checkDBConnection() { return (new SimpleJdbcCall(jdbcTemplate).withProcedureName("CheckDBConnection").execute() != null); } diff --git a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DbFacadeDAOTest.java b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DbFacadeDAOTest.java index 53ad1c3..af749ac 100644 --- a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DbFacadeDAOTest.java +++ b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DbFacadeDAOTest.java @@ -113,7 +113,7 @@ */ @Test public void testDBConnectionWithConnection() { - assertTrue(dbFacade.CheckDBConnection()); + assertTrue(dbFacade.checkDBConnection()); } /** @@ -143,7 +143,7 @@ DbFacade localDbFacade = new DbFacade(); localDbFacade.setDbEngineDialect(DbFacadeLocator.loadDbEngineDialect()); localDbFacade.setTemplate(localDbFacade.getDbEngineDialect().createJdbcTemplate(result)); - localDbFacade.CheckDBConnection(); + localDbFacade.checkDBConnection(); fail("Connection should be down since the DataSource has an invalid username"); // If DataAccessException is thrown - the test has succeeded. Was unable to do // with "expected" annotation, presumably since we are using DbUnit @@ -358,13 +358,13 @@ @Test public void testGetSystemStatisticsValueWithSpecifiedStatus() { - int numOfVmWithStatusMigratingFrom = dbFacade.GetSystemStatisticsValue("VM", Integer.toString(VMStatus.MigratingFrom.getValue())); + int numOfVmWithStatusMigratingFrom = dbFacade.getSystemStatisticsValue("VM", Integer.toString(VMStatus.MigratingFrom.getValue())); assertTrue(numOfVmWithStatusMigratingFrom == NUM_OF_VM_IN_FIXTURES_WITH_STATUS_MIGRATING_FROM); } @Test public void testGetSystemStatisticsValueWithoutSpecifiedStatus() { - int numOfUsers = dbFacade.GetSystemStatisticsValue("User", ""); + int numOfUsers = dbFacade.getSystemStatisticsValue("User", ""); assertTrue(numOfUsers == NUM_OF_USERS_IN_FIXTURES); } @@ -383,12 +383,12 @@ storagePoolIsoMapToCheck.setstatus(StorageDomainStatus.InActive); dbFacade.getStoragePoolIsoMapDao().update(storagePoolIsoMapToCheck); - assertFalse(dbFacade.IsStoragePoolMasterUp(STORAGE_POOL_WITH_MASTER_DOWN)); + assertFalse(dbFacade.isStoragePoolMasterUp(STORAGE_POOL_WITH_MASTER_DOWN)); } @Test public void testIsStoragePoolMasterUpWhenUp() { - assertTrue(dbFacade.IsStoragePoolMasterUp(STORAGE_POOL_WITH_MASTER_UP)); + assertTrue(dbFacade.isStoragePoolMasterUp(STORAGE_POOL_WITH_MASTER_UP)); } @Test diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java index 9f020f9..95e9253 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java @@ -537,7 +537,7 @@ @Override public void run() { try { - if (DbFacade.getInstance().IsStoragePoolMasterUp(_storagePoolId)) { + if (DbFacade.getInstance().isStoragePoolMasterUp(_storagePoolId)) { ResourceManager.getInstance() .getEventListener() .storagePoolUpEvent(storagePool, _isSpmStartCalled); -- To view, visit http://gerrit.ovirt.org/11900 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4f4543175c736f4ac09350947a6895598a5adc54 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
