Arik Hadas has uploaded a new change for review. Change subject: core: refactor VdsUpdateRunTimeInfo to use diamond operator ......................................................................
core: refactor VdsUpdateRunTimeInfo to use diamond operator VdsUpdateRunTimeInfo class has many members which are data structures. Initialize them using the diamond operator makes the code a bit more organized and shorter. Change-Id: Ieb0d5f931aee3749a2aad46e34991b97e46ccf8e Signed-off-by: Arik Hadas <[email protected]> --- M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java 1 file changed, 17 insertions(+), 20 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/03/19503/1 diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java index 2cb1363..860ef2e 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java @@ -86,27 +86,24 @@ @SuppressWarnings({ "synthetic-access", "unchecked", "rawtypes" }) public class VdsUpdateRunTimeInfo { private Map<Guid, VmInternalData> _runningVms; - private final Map<Guid, VmDynamic> _vmDynamicToSave = new HashMap<Guid, VmDynamic>(); - private final Map<Guid, VmStatistics> _vmStatisticsToSave = new HashMap<Guid, VmStatistics>(); - private final Map<Guid, List<VmNetworkInterface>> _vmInterfaceStatisticsToSave = - new HashMap<Guid, List<VmNetworkInterface>>(); - private final Map<Guid, DiskImageDynamic> _vmDiskImageDynamicToSave = - new HashMap<Guid, DiskImageDynamic>(); - private final Map<VmDeviceId, VmDevice> vmDeviceToSave = new HashMap<VmDeviceId, VmDevice>(); - private final List<VmDevice> newVmDevices = new ArrayList<VmDevice>(); - private final List<VmDeviceId> removedDeviceIds = new ArrayList<VmDeviceId>(); - private final Map<VM, VmDynamic> _vmsClientIpChanged = new HashMap<VM, VmDynamic>(); - private final Map<Guid, List<VmGuestAgentInterface>> vmGuestAgentNics = - new HashMap<Guid, List<VmGuestAgentInterface>>(); - private final List<VmDynamic> _poweringUpVms = new ArrayList<VmDynamic>(); - private final List<Guid> _vmsToRerun = new ArrayList<Guid>(); - private final List<Guid> _autoVmsToRun = new ArrayList<Guid>(); - private final List<Guid> _vmsMovedToDown = new ArrayList<Guid>(); - private final List<Guid> _vmsToRemoveFromAsync = new ArrayList<Guid>(); - private final List<Guid> _succededToRunVms = new ArrayList<Guid>(); + private final Map<Guid, VmDynamic> _vmDynamicToSave = new HashMap<>(); + private final Map<Guid, VmStatistics> _vmStatisticsToSave = new HashMap<>(); + private final Map<Guid, List<VmNetworkInterface>> _vmInterfaceStatisticsToSave = new HashMap<>(); + private final Map<Guid, DiskImageDynamic> _vmDiskImageDynamicToSave = new HashMap<>(); + private final Map<VmDeviceId, VmDevice> vmDeviceToSave = new HashMap<>(); + private final List<VmDevice> newVmDevices = new ArrayList<>(); + private final List<VmDeviceId> removedDeviceIds = new ArrayList<>(); + private final Map<VM, VmDynamic> _vmsClientIpChanged = new HashMap<>(); + private final Map<Guid, List<VmGuestAgentInterface>> vmGuestAgentNics = new HashMap<>(); + private final List<VmDynamic> _poweringUpVms = new ArrayList<>(); + private final List<Guid> _vmsToRerun = new ArrayList<>(); + private final List<Guid> _autoVmsToRun = new ArrayList<>(); + private final List<Guid> _vmsMovedToDown = new ArrayList<>(); + private final List<Guid> _vmsToRemoveFromAsync = new ArrayList<>(); + private final List<Guid> _succededToRunVms = new ArrayList<>(); private static final Map<Guid,Integer> vmsWithBalloonDriverProblem = new HashMap<>(); private static final Map<Guid,Integer> vmsWithUncontrolledBalloon = new HashMap<>(); - private final List<VmStatic> _externalVmsToAdd = new ArrayList(); + private final List<VmStatic> _externalVmsToAdd = new ArrayList<>(); private boolean _saveVdsDynamic; private VDSStatus _firstStatus = VDSStatus.forValue(0); private boolean _saveVdsStatistics; @@ -116,7 +113,7 @@ private final Map<Guid, VM> _vmDict; private boolean processHardwareCapsNeeded; private boolean refreshedCapabilities = false; - private static Map<Guid, Long> hostDownTimes = new HashMap<Guid, Long>(); + private static Map<Guid, Long> hostDownTimes = new HashMap<>(); private boolean runningVmsInTransition; private static final Log log = LogFactory.getLog(VdsUpdateRunTimeInfo.class); -- To view, visit http://gerrit.ovirt.org/19503 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ieb0d5f931aee3749a2aad46e34991b97e46ccf8e 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
