Moti Asayag has uploaded a new change for review. Change subject: engine: Use typed empty map ......................................................................
engine: Use typed empty map Change-Id: Id8eb94354b479d4606a325380216e1f8b4969903 Signed-off-by: Moti Asayag <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/HaReservationHandling.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/hostdeploy/AddVdsCommandTest.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBase.java 3 files changed, 4 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/33/40933/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/HaReservationHandling.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/HaReservationHandling.java index 7c65e83..ffca721 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/HaReservationHandling.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/HaReservationHandling.java @@ -184,14 +184,13 @@ return hostsUnutilizedResources; } - @SuppressWarnings("unchecked") public static Map<Guid, List<VM>> mapHaVmToHostByCluster(Guid clusterId) { List<VM> vms = DbFacade.getInstance().getVmDao().getAllForVdsGroup(clusterId); if (vms == null || vms.isEmpty()) { log.debug("No VMs available for this cluster with id '{}'", clusterId); // return empty map - return Collections.EMPTY_MAP; + return Collections.emptyMap(); } vms = LinqUtils.filter(vms, new Predicate<VM>() { diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/hostdeploy/AddVdsCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/hostdeploy/AddVdsCommandTest.java index e2b9eb0..d1c8bba 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/hostdeploy/AddVdsCommandTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/hostdeploy/AddVdsCommandTest.java @@ -141,7 +141,6 @@ setupCommonMock(false); } - @SuppressWarnings("unchecked") private void setupGlusterMock(boolean clusterHasServers, VDS upServer, boolean hasPeers) throws Exception { setupCommonMock(true); @@ -151,7 +150,7 @@ when(commandMock.getGlusterUtil()).thenReturn(glusterUtil); when(glusterUtil.getPeers(any(EngineSSHClient.class))).thenReturn(hasPeers ? Collections.singleton(PEER_1) - : Collections.EMPTY_SET); + : Collections.<String> emptySet()); when(commandMock.getGlusterDBUtils()).thenReturn(glusterDBUtils); diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBase.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBase.java index d71497e..78a3773 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBase.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBase.java @@ -530,8 +530,8 @@ } private void allocateCustomValues() { - if (Collections.EMPTY_MAP.equals(customValues)) { - customValues = new HashMap<String, String>(); + if (Collections.emptyMap().equals(customValues)) { + customValues = new HashMap<>(); } } -- To view, visit https://gerrit.ovirt.org/40933 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id8eb94354b479d4606a325380216e1f8b4969903 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Moti Asayag <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
