Moti Asayag has uploaded a new change for review. Change subject: engine: Fix findbugs warnings about Map values iteration ......................................................................
engine: Fix findbugs warnings about Map values iteration Change-Id: I4f549d800737d7e32e90b407f901d545a32b051e Signed-off-by: Moti Asayag <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/RemoveNetworksByLabelParametersBuilder.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/AttachNetworksToClusterCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/DetachNetworksFromClusterCommand.java 3 files changed, 13 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/91/23491/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/RemoveNetworksByLabelParametersBuilder.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/RemoveNetworksByLabelParametersBuilder.java index 3c69067..4f45c60 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/RemoveNetworksByLabelParametersBuilder.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/RemoveNetworksByLabelParametersBuilder.java @@ -3,6 +3,7 @@ import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import org.apache.commons.lang.StringUtils; @@ -49,9 +50,9 @@ Map<String, VdsNetworkInterface> nicsBylabels) { SetupNetworksParameters parameters = createSetupNetworksParameters(hostId); - for (String label : nicsBylabels.keySet()) { + for (Entry<String, VdsNetworkInterface> entry : nicsBylabels.entrySet()) { VdsNetworkInterface nicToConfigure = - getNicToConfigure(parameters.getInterfaces(), nicsBylabels.get(label).getId()); + getNicToConfigure(parameters.getInterfaces(), entry.getValue().getId()); if (nicToConfigure == null) { throw new VdcBLLException(VdcBllErrors.LABELED_NETWORK_INTERFACE_NOT_FOUND); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/AttachNetworksToClusterCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/AttachNetworksToClusterCommand.java index 0b392e0..0e91ef9 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/AttachNetworksToClusterCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/AttachNetworksToClusterCommand.java @@ -6,6 +6,7 @@ import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import org.ovirt.engine.core.bll.InternalCommandAttribute; @@ -83,9 +84,11 @@ private void configureNetworksOnHosts(Map<Guid, List<Network>> networksByHost, Map<Guid, Map<String, VdsNetworkInterface>> labelsToNicsByHost) { ArrayList<VdcActionParametersBase> parameters = new ArrayList<>(); - for (Guid hostId : networksByHost.keySet()) { + for (Entry<Guid, List<Network>> entry : networksByHost.entrySet()) { AddNetworksByLabelParametersBuilder builder = new AddNetworksByLabelParametersBuilder(); - parameters.add(builder.buildParameters(hostId, networksByHost.get(hostId), labelsToNicsByHost.get(hostId))); + parameters.add(builder.buildParameters(entry.getKey(), + entry.getValue(), + labelsToNicsByHost.get(entry.getKey()))); } getBackend().runInternalMultipleActions(VdcActionType.PersistentSetupNetworks, parameters); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/DetachNetworksFromClusterCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/DetachNetworksFromClusterCommand.java index f1cbed2..6ee9d82 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/DetachNetworksFromClusterCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/DetachNetworksFromClusterCommand.java @@ -6,6 +6,7 @@ import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import org.ovirt.engine.core.bll.InternalCommandAttribute; @@ -82,9 +83,11 @@ private void removeNetworksFromHosts(Map<Guid, List<Network>> networksByHost, Map<Guid, Map<String, VdsNetworkInterface>> labelsToNicsByHost) { ArrayList<VdcActionParametersBase> parameters = new ArrayList<>(); - for (Guid hostId : networksByHost.keySet()) { + for (Entry<Guid, List<Network>> entry : networksByHost.entrySet()) { RemoveNetworksByLabelParametersBuilder builder = new RemoveNetworksByLabelParametersBuilder(); - parameters.add(builder.buildParameters(hostId, networksByHost.get(hostId), labelsToNicsByHost.get(hostId))); + parameters.add(builder.buildParameters(entry.getKey(), + entry.getValue(), + labelsToNicsByHost.get(entry.getKey()))); } getBackend().runInternalMultipleActions(VdcActionType.PersistentSetupNetworks, parameters); -- To view, visit http://gerrit.ovirt.org/23491 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4f549d800737d7e32e90b407f901d545a32b051e 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
