Muli Salem has uploaded a new change for review. Change subject: engine: Change Anonymous class to For Loop ......................................................................
engine: Change Anonymous class to For Loop This patch changes the use of LinqUtils with a simple for loop, for simplicity and readability. Change-Id: Ifc68ade0e5f7e45d357bcbd394b2beec7805bd88 Signed-off-by: Muli Salem <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/AddNetworkCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java 2 files changed, 23 insertions(+), 24 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/07/10607/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/AddNetworkCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/AddNetworkCommand.java index 0a950ea..51df08e 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/AddNetworkCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/AddNetworkCommand.java @@ -15,8 +15,6 @@ import org.ovirt.engine.core.common.validation.group.CreateEntity; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.dal.VdcBllMessages; -import org.ovirt.engine.core.utils.linq.LinqUtils; -import org.ovirt.engine.core.utils.linq.Predicate; @SuppressWarnings("serial") public class AddNetworkCommand<T extends AddNetworkStoragePoolParameters> extends NetworkCommon<T> { @@ -122,11 +120,11 @@ } private Network getNetworkByName(List<Network> networks) { - return LinqUtils.firstOrNull(networks, new Predicate<Network>() { - @Override - public boolean eval(Network network) { - return network.getName().equals(getNetworkName()); + for (Network network : networks) { + if (network.getName().equals(getNetworkName())) { + return network; } - }); + } + return null; } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java index f71985b..8d832fb 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java @@ -13,8 +13,6 @@ import org.ovirt.engine.core.common.config.ConfigValues; import org.ovirt.engine.core.common.validation.group.UpdateEntity; import org.ovirt.engine.core.dal.VdcBllMessages; -import org.ovirt.engine.core.utils.linq.LinqUtils; -import org.ovirt.engine.core.utils.linq.Predicate; @SuppressWarnings("serial") public class UpdateNetworkCommand<T extends AddNetworkStoragePoolParameters> extends NetworkCommon<T> { @@ -100,12 +98,12 @@ } private Network getNetworkById(List<Network> networks) { - return LinqUtils.firstOrNull(networks, new Predicate<Network>() { - @Override - public boolean eval(Network network) { - return network.getId().equals(getNetwork().getId()); + for (Network network : networks) { + if (network.getId().equals(getNetwork().getId())) { + return network; } - }); + } + return null; } private ValidationResult storagePoolExists() { @@ -121,21 +119,24 @@ } private ValidationResult networkNameNotUsed(List<Network> networks) { - Network networkWithSameName = LinqUtils.firstOrNull(networks, new Predicate<Network>() { - @Override - public boolean eval(Network network) { - return network.getName().trim().toLowerCase() - .equals(getNetworkName().trim().toLowerCase()) - && !network.getId().equals(getNetwork().getId()) - && getNetwork().getDataCenterId().equals(network.getDataCenterId()); - } - }); - + Network networkWithSameName = getOtherNetworkWithSameName(networks); return networkWithSameName != null ? new ValidationResult(VdcBllMessages.NETWORK_IN_USE) : ValidationResult.VALID; } + private Network getOtherNetworkWithSameName(List<Network> networks) { + for (Network network : networks) { + if (network.getName().trim().toLowerCase() + .equals(getNetworkName().trim().toLowerCase()) + && !network.getId().equals(getNetwork().getId()) + && getNetwork().getDataCenterId().equals(network.getDataCenterId())) { + return network; + } + } + return null; + } + private ValidationResult networkNotUsedByRunningVm() { for (VDSGroup cluster : getVdsGroupDAO().getAllForStoragePool(getStoragePool().getId())) { List<VmStatic> vms = getVmStaticDAO().getAllByGroupAndNetworkName(cluster.getId(), getNetworkName()); -- To view, visit http://gerrit.ovirt.org/10607 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifc68ade0e5f7e45d357bcbd394b2beec7805bd88 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Muli Salem <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
