Mike Kolesnik has uploaded a new change for review. Change subject: engine: Fix networking commands warnings ......................................................................
engine: Fix networking commands warnings Fixed warnings in networking commands/queries: 1. Added suppression of serial version UUID warning as the commands are not serialized. 2. Removed usage of deprecated classes: 2.1. LongCompat replaced by Long 2.2. StringHelper replaced by StringUtils 2.3. Regex replaced by Pattern Change-Id: I89af2a49e4d0f273bc4a784626e93b14d00806cb Signed-off-by: Mike Kolesnik <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/MacPoolManager.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/AttachNetworkToVdsGroupCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/DetachNetworkToVdsGroupCommand.java 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/RemoveNetworkCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/AddBondCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/AttachNetworkToVdsInterfaceCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/CommitNetworkChangesCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetAllSiblingVlanInterfacesQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/RemoveBondCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/SetupNetworksCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/VdsBondCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/VdsNetworkCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/AddVmTemplateInterfaceCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/RemoveVmTemplateInterfaceCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/UpdateVmTemplateInterfaceCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/ActivateDeactivateVmNicCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AddVmInterfaceCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/UpdateVmInterfaceCommand.java 20 files changed, 36 insertions(+), 23 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/61/10461/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/MacPoolManager.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/MacPoolManager.java index ec5fa30..c881e40 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/MacPoolManager.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/MacPoolManager.java @@ -6,15 +6,13 @@ import java.util.Set; import java.util.concurrent.locks.ReentrantReadWriteLock; +import org.apache.commons.lang.StringUtils; import org.ovirt.engine.core.common.AuditLogType; import org.ovirt.engine.core.common.businessentities.VmNetworkInterface; import org.ovirt.engine.core.common.config.Config; import org.ovirt.engine.core.common.config.ConfigValues; import org.ovirt.engine.core.common.errors.VdcBLLException; import org.ovirt.engine.core.common.errors.VdcBllErrors; -import org.ovirt.engine.core.compat.LongCompat; -import org.ovirt.engine.core.compat.NumberStyles; -import org.ovirt.engine.core.compat.StringHelper; import org.ovirt.engine.core.dal.dbbroker.DbFacade; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogDirector; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogableBase; @@ -23,6 +21,7 @@ public class MacPoolManager { + private static final int HEX_RADIX = 16; private static final MacPoolManager INSTANCE = new MacPoolManager(); public static MacPoolManager getInstance() { @@ -95,8 +94,8 @@ if (parsedRangeEnd == null || parsedRangeStart == null) { return false; } - long startNum = LongCompat.parseLong(parseRangePart(start), NumberStyles.HexNumber); - long endNum = LongCompat.parseLong(parseRangePart(end), NumberStyles.HexNumber); + long startNum = Long.parseLong(parseRangePart(start), HEX_RADIX); + long endNum = Long.parseLong(parseRangePart(end), HEX_RADIX); if (startNum > endNum) { // throw new // VdcBLLException(VdcBllErrors.MAC_POOL_INITIALIZATION_FAILED); @@ -109,7 +108,7 @@ // VdcBLLException(VdcBllErrors.MAC_POOL_INITIALIZATION_FAILED); return false; } else if (value.length() < 12) { - value = StringHelper.padLeft(value, 12, '0'); + value = StringUtils.leftPad(value, 12, '0'); } StringBuilder builder = new StringBuilder(); for (int j = 0; j < value.length(); j += 2) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/AttachNetworkToVdsGroupCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/AttachNetworkToVdsGroupCommand.java index 9fe3d35..e00ac19 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/AttachNetworkToVdsGroupCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/AttachNetworkToVdsGroupCommand.java @@ -10,8 +10,8 @@ import org.ovirt.engine.core.common.action.AttachNetworkToVdsGroupParameter; import org.ovirt.engine.core.common.businessentities.ActionGroup; import org.ovirt.engine.core.common.businessentities.Network; -import org.ovirt.engine.core.common.businessentities.NetworkStatus; import org.ovirt.engine.core.common.businessentities.NetworkCluster; +import org.ovirt.engine.core.common.businessentities.NetworkStatus; import org.ovirt.engine.core.common.config.Config; import org.ovirt.engine.core.common.config.ConfigValues; import org.ovirt.engine.core.compat.Guid; @@ -19,6 +19,7 @@ import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogField; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields; +@SuppressWarnings("serial") @CustomLogFields({ @CustomLogField("NetworkName") }) public class AttachNetworkToVdsGroupCommand<T extends AttachNetworkToVdsGroupParameter> extends VdsGroupCommandBase<T> { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/DetachNetworkToVdsGroupCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/DetachNetworkToVdsGroupCommand.java index 960a1fa..0d4b508 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/DetachNetworkToVdsGroupCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/DetachNetworkToVdsGroupCommand.java @@ -3,6 +3,7 @@ import java.util.Collections; import java.util.List; +import org.apache.commons.lang.StringUtils; import org.ovirt.engine.core.bll.Backend; import org.ovirt.engine.core.bll.VdsGroupCommandBase; import org.ovirt.engine.core.bll.utils.PermissionSubject; @@ -22,13 +23,13 @@ import org.ovirt.engine.core.common.queries.VdcQueryReturnValue; import org.ovirt.engine.core.common.queries.VdcQueryType; import org.ovirt.engine.core.compat.Guid; -import org.ovirt.engine.core.compat.StringHelper; import org.ovirt.engine.core.dal.VdcBllMessages; import org.ovirt.engine.core.dal.dbbroker.DbFacade; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogField; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields; import org.ovirt.engine.core.utils.NetworkUtils; +@SuppressWarnings("serial") @CustomLogFields({ @CustomLogField("NetworkName") }) public class DetachNetworkToVdsGroupCommand<T extends AttachNetworkToVdsGroupParameter> extends VdsGroupCommandBase<T> { @@ -46,7 +47,7 @@ @Override protected boolean canDoAction() { // check that we are not removing the management network - if (StringHelper.EqOp(getParameters().getNetwork().getname(), + if (StringUtils.equals(getParameters().getNetwork().getname(), Config.<String> GetValue(ConfigValues.ManagementNetwork))) { addCanDoActionMessage(VdcBllMessages.NETWORK_CANNOT_REMOVE_MANAGEMENT_NETWORK); getReturnValue().getCanDoActionMessages().add(String.format("$NetworkName %1$s", @@ -85,6 +86,7 @@ SearchReturnValue ret = (SearchReturnValue) ((tempVar instanceof SearchReturnValue) ? tempVar : null); if (ret != null && ret.getSucceeded()) { + @SuppressWarnings("unchecked") List<IVdcQueryable> vmList = (List<IVdcQueryable>) ret.getReturnValue(); for (IVdcQueryable vm_helper : vmList) { VM vm = (VM) vm_helper; 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 cd98aeb..b3809a2 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 @@ -18,6 +18,7 @@ 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> { public AddNetworkCommand(T parameters) { super(parameters); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/RemoveNetworkCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/RemoveNetworkCommand.java index 274ea6f..53d20fd 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/RemoveNetworkCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/RemoveNetworkCommand.java @@ -9,6 +9,7 @@ import org.ovirt.engine.core.dal.VdcBllMessages; import org.ovirt.engine.core.dal.dbbroker.DbFacade; +@SuppressWarnings("serial") public class RemoveNetworkCommand<T extends AddNetworkStoragePoolParameters> extends NetworkCommon<T> { public RemoveNetworkCommand(T parameters) { super(parameters); 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 b8b1f73..a59d1e7 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 @@ -16,6 +16,7 @@ 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> { private List<VDSGroup> clusters; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/AddBondCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/AddBondCommand.java index fcbb427..a6dcf03 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/AddBondCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/AddBondCommand.java @@ -7,9 +7,9 @@ import org.ovirt.engine.core.bll.network.cluster.NetworkClusterHelper; import org.ovirt.engine.core.common.AuditLogType; import org.ovirt.engine.core.common.action.AddBondParameters; +import org.ovirt.engine.core.common.businessentities.Network; import org.ovirt.engine.core.common.businessentities.VdsNetworkInterface; import org.ovirt.engine.core.common.businessentities.VdsStatic; -import org.ovirt.engine.core.common.businessentities.Network; import org.ovirt.engine.core.common.vdscommands.NetworkVdsmVDSCommandParameters; import org.ovirt.engine.core.common.vdscommands.VDSCommandType; import org.ovirt.engine.core.common.vdscommands.VDSReturnValue; @@ -20,6 +20,7 @@ import org.ovirt.engine.core.utils.linq.LinqUtils; import org.ovirt.engine.core.utils.linq.Predicate; +@SuppressWarnings("serial") public class AddBondCommand<T extends AddBondParameters> extends VdsBondCommand<T> { public AddBondCommand(T parameters) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/AttachNetworkToVdsInterfaceCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/AttachNetworkToVdsInterfaceCommand.java index 18b3ddd..09e64f5 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/AttachNetworkToVdsInterfaceCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/AttachNetworkToVdsInterfaceCommand.java @@ -21,11 +21,11 @@ import org.ovirt.engine.core.common.vdscommands.VDSReturnValue; import org.ovirt.engine.core.common.vdscommands.VdsIdAndVdsVDSCommandParametersBase; import org.ovirt.engine.core.compat.Guid; -import org.ovirt.engine.core.compat.StringHelper; import org.ovirt.engine.core.dal.VdcBllMessages; import org.ovirt.engine.core.dal.dbbroker.DbFacade; import org.ovirt.engine.core.utils.NetworkUtils; +@SuppressWarnings("serial") public class AttachNetworkToVdsInterfaceCommand<T extends AttachNetworkToVdsParameters> extends VdsNetworkCommand<T> { private Network logicalNetwork; @@ -53,7 +53,7 @@ params.getVdsId()); for (VdsNetworkInterface i : interfaces) { - if (StringHelper.EqOp(i.getBondName(), params.getInterface().getName())) { + if (StringUtils.equals(i.getBondName(), params.getInterface().getName())) { nics.add(i.getName()); } } @@ -149,6 +149,7 @@ VdcQueryType.GetAllChildVlanInterfaces, new GetAllChildVlanInterfacesQueryParameters(params.getVdsId(), params .getInterface())); + @SuppressWarnings("unchecked") ArrayList<VdsNetworkInterface> vlanIfaces = (ArrayList<VdsNetworkInterface>) ret.getReturnValue(); if (vlanIfaces.size() > 0) { addCanDoActionMessage(VdcBllMessages.NETWORK_INTERFACE_CONNECT_TO_VLAN); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/CommitNetworkChangesCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/CommitNetworkChangesCommand.java index 4507911..b81dc01 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/CommitNetworkChangesCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/CommitNetworkChangesCommand.java @@ -9,6 +9,7 @@ import org.ovirt.engine.core.common.vdscommands.VdsIdVDSCommandParametersBase; import org.ovirt.engine.core.dal.dbbroker.DbFacade; +@SuppressWarnings("serial") public class CommitNetworkChangesCommand<T extends VdsActionParameters> extends VdsCommand<T> { public CommitNetworkChangesCommand(T param) { super(param); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetAllSiblingVlanInterfacesQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetAllSiblingVlanInterfacesQuery.java index 007811b..b5deca4 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetAllSiblingVlanInterfacesQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetAllSiblingVlanInterfacesQuery.java @@ -2,10 +2,10 @@ import java.util.List; +import org.apache.commons.lang.StringUtils; import org.ovirt.engine.core.bll.QueriesCommandBase; import org.ovirt.engine.core.common.businessentities.VdsNetworkInterface; import org.ovirt.engine.core.common.queries.GetAllChildVlanInterfacesQueryParameters; -import org.ovirt.engine.core.compat.StringHelper; import org.ovirt.engine.core.dal.dbbroker.DbFacade; import org.ovirt.engine.core.utils.NetworkUtils; @@ -27,9 +27,9 @@ .getInterfaceDao().getAllInterfacesForVds(getParameters().getVdsId()); for (int i = 0; i < vdsInterfaces.size(); i++) { if (vdsInterfaces.get(i).getVlanId() != null - && !StringHelper.EqOp(getParameters().getInterface().getName(), vdsInterfaces.get(i) + && !StringUtils.equals(getParameters().getInterface().getName(), vdsInterfaces.get(i) .getName())) { - if (StringHelper.EqOp(NetworkUtils.StripVlan(getParameters().getInterface().getName()), + if (StringUtils.equals(NetworkUtils.StripVlan(getParameters().getInterface().getName()), NetworkUtils.StripVlan(vdsInterfaces.get(i).getName()))) { retVal.add(vdsInterfaces.get(i)); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/RemoveBondCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/RemoveBondCommand.java index 9433ed1..7c800f8 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/RemoveBondCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/RemoveBondCommand.java @@ -149,6 +149,7 @@ VdcQueryReturnValue tempVar = Backend.getInstance().runInternalQuery(VdcQueryType.Search, searchParams); SearchReturnValue ret = (SearchReturnValue) ((tempVar instanceof SearchReturnValue) ? tempVar : null); if (ret != null && ret.getSucceeded()) { + @SuppressWarnings("unchecked") Iterable<IVdcQueryable> vmList = (Iterable<IVdcQueryable>) ret.getReturnValue(); for (IVdcQueryable vm_helper : vmList) { VM vm = (VM) vm_helper; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/SetupNetworksCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/SetupNetworksCommand.java index 672f1ca..cd41f6c 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/SetupNetworksCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/SetupNetworksCommand.java @@ -31,6 +31,7 @@ import org.ovirt.engine.core.utils.transaction.TransactionMethod; import org.ovirt.engine.core.utils.transaction.TransactionSupport; +@SuppressWarnings("serial") @NonTransactiveCommandAttribute public class SetupNetworksCommand<T extends SetupNetworksParameters> extends VdsCommand<T> { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/VdsBondCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/VdsBondCommand.java index 6e5cdb3..c9f3069 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/VdsBondCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/VdsBondCommand.java @@ -5,6 +5,7 @@ import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogField; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields; +@SuppressWarnings("serial") @CustomLogFields({ @CustomLogField("BondName") }) public abstract class VdsBondCommand<T extends BondParametersBase> extends VdsCommand<T> { public VdsBondCommand(T parameters) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/VdsNetworkCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/VdsNetworkCommand.java index 2272bb9..fb66f54 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/VdsNetworkCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/VdsNetworkCommand.java @@ -5,6 +5,7 @@ import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogField; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields; +@SuppressWarnings("serial") @CustomLogFields({ @CustomLogField("NetworkName") }) public abstract class VdsNetworkCommand<T extends AttachNetworkToVdsParameters> extends VdsCommand<T> { public VdsNetworkCommand(T parameters) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/AddVmTemplateInterfaceCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/AddVmTemplateInterfaceCommand.java index 86fbaf4..6c2d0aa 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/AddVmTemplateInterfaceCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/AddVmTemplateInterfaceCommand.java @@ -28,6 +28,7 @@ import org.ovirt.engine.core.utils.linq.LinqUtils; import org.ovirt.engine.core.utils.linq.Predicate; +@SuppressWarnings("serial") @CustomLogFields({ @CustomLogField("InterfaceName") }) public class AddVmTemplateInterfaceCommand<T extends AddVmTemplateInterfaceParameters> extends VmTemplateCommand<T> { public AddVmTemplateInterfaceCommand(T parameters) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/RemoveVmTemplateInterfaceCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/RemoveVmTemplateInterfaceCommand.java index b80bcb3..c1aef8b 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/RemoveVmTemplateInterfaceCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/RemoveVmTemplateInterfaceCommand.java @@ -8,6 +8,7 @@ import org.ovirt.engine.core.common.businessentities.VmNetworkInterface; import org.ovirt.engine.core.dal.dbbroker.DbFacade; +@SuppressWarnings("serial") public class RemoveVmTemplateInterfaceCommand<T extends RemoveVmTemplateInterfaceParameters> extends VmTemplateCommand<T> { public RemoveVmTemplateInterfaceCommand(T parameters) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/UpdateVmTemplateInterfaceCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/UpdateVmTemplateInterfaceCommand.java index bb2b8f2..3b10b5b 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/UpdateVmTemplateInterfaceCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/UpdateVmTemplateInterfaceCommand.java @@ -15,13 +15,13 @@ import org.ovirt.engine.core.common.businessentities.VmInterfaceType; import org.ovirt.engine.core.common.businessentities.VmNetworkInterface; import org.ovirt.engine.core.common.validation.group.UpdateEntity; -import org.ovirt.engine.core.compat.StringHelper; import org.ovirt.engine.core.dal.VdcBllMessages; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogField; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields; import org.ovirt.engine.core.utils.linq.LinqUtils; import org.ovirt.engine.core.utils.linq.Predicate; +@SuppressWarnings("serial") @CustomLogFields({ @CustomLogField("NetworkName"), @CustomLogField("InterfaceName") }) public class UpdateVmTemplateInterfaceCommand<T extends AddVmTemplateInterfaceParameters> extends VmTemplateCommand<T> { public UpdateVmTemplateInterfaceCommand(T parameters) { @@ -71,7 +71,7 @@ return false; } - if (!StringHelper.EqOp(oldIface.getName(), getParameters().getInterface().getName())) { + if (!StringUtils.equals(oldIface.getName(), getParameters().getInterface().getName())) { if (!VmHandler.IsNotDuplicateInterfaceName(interfaces, getParameters().getInterface().getName(), getReturnValue().getCanDoActionMessages())) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/ActivateDeactivateVmNicCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/ActivateDeactivateVmNicCommand.java index 360ed8c..5f97ed3 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/ActivateDeactivateVmNicCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/ActivateDeactivateVmNicCommand.java @@ -25,6 +25,7 @@ * Activate or deactivate a virtual network interface of a VM in case it is in a valid status. If the VM is down, simply * update the device, if it is Up - HotPlug / HotUnPlug the virtual network interface */ +@SuppressWarnings("serial") @NonTransactiveCommandAttribute public class ActivateDeactivateVmNicCommand<T extends ActivateDeactivateVmNicParameters> extends VmCommand<T> { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AddVmInterfaceCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AddVmInterfaceCommand.java index d5658fc..2c669e5 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AddVmInterfaceCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AddVmInterfaceCommand.java @@ -2,6 +2,7 @@ import java.util.ArrayList; import java.util.List; +import java.util.regex.Pattern; import org.apache.commons.lang.StringUtils; import org.ovirt.engine.core.bll.NonTransactiveCommandAttribute; @@ -27,7 +28,6 @@ import org.ovirt.engine.core.common.utils.ValidationUtils; import org.ovirt.engine.core.common.validation.group.CreateEntity; import org.ovirt.engine.core.compat.Guid; -import org.ovirt.engine.core.compat.Regex; import org.ovirt.engine.core.dal.VdcBllMessages; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogField; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields; @@ -167,8 +167,7 @@ } if (!StringUtils.isEmpty(getMacAddress())) { - Regex re = new Regex(ValidationUtils.INVALID_NULLABLE_MAC_ADDRESS); - if (re.IsMatch(getMacAddress())) { + if (Pattern.matches(ValidationUtils.INVALID_NULLABLE_MAC_ADDRESS, getMacAddress())) { addCanDoActionMessage(VdcBllMessages.NETWORK_INVALID_MAC_ADDRESS); return false; } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/UpdateVmInterfaceCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/UpdateVmInterfaceCommand.java index b99240f..e14eae3 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/UpdateVmInterfaceCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/UpdateVmInterfaceCommand.java @@ -1,6 +1,7 @@ package org.ovirt.engine.core.bll.network.vm; import java.util.List; +import java.util.regex.Pattern; import org.apache.commons.lang.StringUtils; import org.ovirt.engine.core.bll.NonTransactiveCommandAttribute; @@ -28,7 +29,6 @@ import org.ovirt.engine.core.common.validation.group.UpdateVmNic; import org.ovirt.engine.core.common.vdscommands.VDSCommandType; import org.ovirt.engine.core.common.vdscommands.VmNicDeviceVDSParameters; -import org.ovirt.engine.core.compat.Regex; import org.ovirt.engine.core.dal.VdcBllMessages; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogField; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields; @@ -228,8 +228,7 @@ macAddressChanged = !StringUtils.equals(oldIface.getMacAddress(), getMacAddress()); if (macAddressChanged) { - Regex re = new Regex(ValidationUtils.INVALID_NULLABLE_MAC_ADDRESS); - if (re.IsMatch(getMacAddress())) { + if (Pattern.matches(ValidationUtils.INVALID_NULLABLE_MAC_ADDRESS, getMacAddress())) { addCanDoActionMessage(VdcBllMessages.NETWORK_INVALID_MAC_ADDRESS); return false; } -- To view, visit http://gerrit.ovirt.org/10461 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I89af2a49e4d0f273bc4a784626e93b14d00806cb Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Mike Kolesnik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
