Allon Mureinik has uploaded a new change for review. Change subject: core: Remove StringHelper usages in types module ......................................................................
core: Remove StringHelper usages in types module Removed all the usages of the deprecated StringHelper class and replaced them with standard calls to StringUtils. Change-Id: If571a276077252672577f63b160a95c81f8bdeb4 Signed-off-by: Allon Mureinik <[email protected]> --- M backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/CdRomMapper.java M backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/GroupMapper.java M backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/HostNicMapper.java M backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/UserMapper.java M backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmMapper.java 5 files changed, 15 insertions(+), 16 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/55/13655/1 diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/CdRomMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/CdRomMapper.java index 33085ab..36a225d 100644 --- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/CdRomMapper.java +++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/CdRomMapper.java @@ -1,11 +1,11 @@ package org.ovirt.engine.api.restapi.types; +import org.apache.commons.lang.StringUtils; import org.ovirt.engine.api.model.CdRom; import org.ovirt.engine.api.model.File; import org.ovirt.engine.core.common.businessentities.VM; import org.ovirt.engine.core.common.businessentities.VmTemplate; import org.ovirt.engine.core.compat.Guid; -import org.ovirt.engine.core.compat.StringHelper; public class CdRomMapper { @@ -24,7 +24,7 @@ public static CdRom map(VM entity, CdRom template) { CdRom model = template != null ? template : new CdRom(); model.setId(CDROM_ID.toString()); - if (!StringHelper.isNullOrEmpty(entity.getStaticData().getIsoPath())) { + if (!StringUtils.isEmpty(entity.getStaticData().getIsoPath())) { model.setFile(new File()); model.getFile().setId(entity.getStaticData().getIsoPath()); } @@ -39,7 +39,7 @@ public static CdRom map(VmTemplate entity, CdRom template) { CdRom model = template != null ? template : new CdRom(); model.setId(CDROM_ID.toString()); - if (!StringHelper.isNullOrEmpty(entity.getIsoPath())) { + if (!StringUtils.isEmpty(entity.getIsoPath())) { model.setFile(new File()); model.getFile().setId(entity.getIsoPath()); } diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/GroupMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/GroupMapper.java index eefb5d7..0ec328c 100644 --- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/GroupMapper.java +++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/GroupMapper.java @@ -1,13 +1,12 @@ package org.ovirt.engine.api.restapi.types; +import org.apache.commons.lang.StringUtils; import org.ovirt.engine.api.model.Domain; import org.ovirt.engine.api.model.Group; - import org.ovirt.engine.core.common.businessentities.DbUser; import org.ovirt.engine.core.common.businessentities.LdapGroup; import org.ovirt.engine.core.compat.NGuid; -import org.ovirt.engine.core.compat.StringHelper; public class GroupMapper { @@ -16,7 +15,7 @@ Group model = template != null ? template : new Group(); model.setName(entity.getname()); model.setId(entity.getid().toString()); - if(!StringHelper.isNullOrEmpty(entity.getdomain())){ + if (!StringUtils.isEmpty(entity.getdomain())) { Domain dom = new Domain(); dom.setName(entity.getdomain()); dom.setId(new NGuid(entity.getdomain().getBytes(), true).toString()); @@ -30,7 +29,7 @@ Group model = template != null ? template : new Group(); model.setName(entity.getname()); model.setId(entity.getuser_id().toString()); - if(!StringHelper.isNullOrEmpty(entity.getdomain())){ + if (!StringUtils.isEmpty(entity.getdomain())) { Domain dom = new Domain(); dom.setName(entity.getdomain()); dom.setId(new NGuid(entity.getdomain().getBytes(), true).toString()); diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/HostNicMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/HostNicMapper.java index 952daa4..3c9cdd2 100644 --- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/HostNicMapper.java +++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/HostNicMapper.java @@ -1,5 +1,6 @@ package org.ovirt.engine.api.restapi.types; +import org.apache.commons.lang.StringUtils; import org.ovirt.engine.api.common.util.StatusUtils; import org.ovirt.engine.api.model.Bonding; import org.ovirt.engine.api.model.BootProtocol; @@ -14,7 +15,6 @@ import org.ovirt.engine.core.common.businessentities.network.InterfaceStatus; import org.ovirt.engine.core.common.businessentities.network.NetworkBootProtocol; import org.ovirt.engine.core.common.businessentities.network.VdsNetworkInterface; -import org.ovirt.engine.core.compat.StringHelper; public class HostNicMapper { private static final String OPTIONS_DELIMITER = "\\ "; @@ -108,7 +108,7 @@ if(entity.getSpeed()!=null && entity.getSpeed()>0){ model.setSpeed(entity.getSpeed() * 1000L * 1000); } - if(!StringHelper.isNullOrEmpty(entity.getBondOptions())){ + if (!StringUtils.isEmpty(entity.getBondOptions())) { if(model.getBonding() == null) model.setBonding(new Bonding()); model.getBonding().setOptions(new Options()); for(String opt : entity.getBondOptions().split(OPTIONS_DELIMITER)){ @@ -136,7 +136,7 @@ } private static String getType(final String[] optionPair) { - if(!StringHelper.isNullOrEmpty(optionPair[0]) && optionPair[0].equals("mode") && !StringHelper.isNullOrEmpty(optionPair[1])){ + if (!StringUtils.isEmpty(optionPair[0]) && optionPair[0].equals("mode") && !StringUtils.isEmpty(optionPair[1])) { Integer mode = tryParse(optionPair[1]); if(mode != null && mode > 0 && mode < 6){ return BONDING_MODS[mode - 1]; diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/UserMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/UserMapper.java index d067287..09063b0 100644 --- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/UserMapper.java +++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/UserMapper.java @@ -1,15 +1,15 @@ package org.ovirt.engine.api.restapi.types; +import org.apache.commons.lang.StringUtils; import org.ovirt.engine.api.model.Domain; import org.ovirt.engine.api.model.Group; import org.ovirt.engine.api.model.Groups; import org.ovirt.engine.api.model.User; -import org.ovirt.engine.core.common.businessentities.LdapUser; import org.ovirt.engine.core.common.businessentities.DbUser; import org.ovirt.engine.core.common.businessentities.LdapGroup; +import org.ovirt.engine.core.common.businessentities.LdapUser; import org.ovirt.engine.core.common.users.VdcUser; import org.ovirt.engine.core.compat.NGuid; -import org.ovirt.engine.core.compat.StringHelper; public class UserMapper { @@ -30,7 +30,7 @@ model.getGroups().getGroups().add(group); } } - if(!StringHelper.isNullOrEmpty(entity.getdomain())){ + if (!StringUtils.isEmpty(entity.getdomain())) { Domain dom = new Domain(); dom.setName(entity.getdomain()); dom.setId(new NGuid(entity.getdomain().getBytes(), true).toString()); @@ -66,7 +66,7 @@ model.getGroups().getGroups().add(group); } } - if(!StringHelper.isNullOrEmpty(entity.getDomainControler())){ + if (!StringUtils.isEmpty(entity.getDomainControler())) { Domain dom = new Domain(); dom.setName(entity.getDomainControler()); dom.setId(new NGuid(entity.getDomainControler().getBytes(), true).toString()); diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmMapper.java index 859609e..dce4257 100644 --- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmMapper.java +++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmMapper.java @@ -7,6 +7,7 @@ import java.util.List; import java.util.Set; +import org.apache.commons.lang.StringUtils; import org.ovirt.engine.api.common.util.StatusUtils; import org.ovirt.engine.api.common.util.TimeZoneMapping; import org.ovirt.engine.api.model.Boot; @@ -58,7 +59,6 @@ import org.ovirt.engine.core.common.businessentities.VmTemplate; import org.ovirt.engine.core.common.utils.VmDeviceType; import org.ovirt.engine.core.compat.NGuid; -import org.ovirt.engine.core.compat.StringHelper; import org.ovirt.engine.core.compat.Version; public class VmMapper { @@ -409,7 +409,7 @@ policy.setGuaranteed(new Long(entity.getMinAllocatedMem()) * BYTES_PER_MB); model.setMemoryPolicy(policy); model.setTimezone(TimeZoneMapping.getJava(entity.getTimeZone())); - if (!StringHelper.isNullOrEmpty(entity.getCustomProperties())) { + if (!StringUtils.isEmpty(entity.getCustomProperties())) { CustomProperties hooks = new CustomProperties(); hooks.getCustomProperty().addAll(CustomPropertiesParser.parse(entity.getCustomProperties(), false)); model.setCustomProperties(hooks); -- To view, visit http://gerrit.ovirt.org/13655 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If571a276077252672577f63b160a95c81f8bdeb4 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
