Allon Mureinik has uploaded a new change for review. Change subject: core: Remove StringHelper usages in jaxrs module ......................................................................
core: Remove StringHelper usages in jaxrs module Removed all the usages of the deprecated StringHelper class and replaced them with standard calls to StringUtils. Change-Id: I86d4266462bb936db9be551a1a321cdcb8f5929f Signed-off-by: Allon Mureinik <[email protected]> --- M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendGroupsResourceBase.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostNicResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendUsersResourceBase.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BaseBackendResource.java 4 files changed, 11 insertions(+), 14 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/54/13654/1 diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendGroupsResourceBase.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendGroupsResourceBase.java index f19b410..4225c64 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendGroupsResourceBase.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendGroupsResourceBase.java @@ -8,6 +8,7 @@ import javax.ws.rs.core.Response; +import org.apache.commons.lang.StringUtils; import org.ovirt.engine.api.common.security.auth.Principal; import org.ovirt.engine.api.common.util.QueryHelper; import org.ovirt.engine.api.model.Group; @@ -22,7 +23,6 @@ import org.ovirt.engine.core.common.queries.SearchParameters; import org.ovirt.engine.core.common.queries.VdcQueryType; import org.ovirt.engine.core.compat.Guid; -import org.ovirt.engine.core.compat.StringHelper; public class BackendGroupsResourceBase extends AbstractBackendCollectionResource<Group, LdapGroup> { @@ -116,7 +116,7 @@ : domain)); - sb.append(StringHelper.isNullOrEmpty(constraint)? + sb.append(StringUtils.isEmpty(constraint) ? "name="+param : constraint); diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostNicResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostNicResource.java index 86df96e..b116628 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostNicResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostNicResource.java @@ -7,6 +7,7 @@ import javax.ws.rs.core.Response; +import org.apache.commons.lang.StringUtils; import org.ovirt.engine.api.model.Action; import org.ovirt.engine.api.model.BootProtocol; import org.ovirt.engine.api.model.HostNIC; @@ -14,8 +15,6 @@ import org.ovirt.engine.api.model.Option; import org.ovirt.engine.api.resource.HostNicResource; import org.ovirt.engine.api.resource.StatisticsResource; -import org.ovirt.engine.api.restapi.resource.AbstractBackendResource.EntityIdResolver; - import org.ovirt.engine.core.common.action.AttachNetworkToVdsParameters; import org.ovirt.engine.core.common.action.UpdateNetworkToVdsParameters; import org.ovirt.engine.core.common.action.VdcActionType; @@ -24,7 +23,6 @@ import org.ovirt.engine.core.common.queries.InterfaceAndIdQueryParameters; import org.ovirt.engine.core.common.queries.VdcQueryType; import org.ovirt.engine.core.compat.Guid; -import org.ovirt.engine.core.compat.StringHelper; public class BackendHostNicResource extends AbstractBackendActionableResource<HostNIC, VdsNetworkInterface> @@ -154,7 +152,7 @@ private org.ovirt.engine.core.common.businessentities.network.Network getOldNetwork(VdsNetworkInterface originalInter) { String oldNetworkName = originalInter.getNetworkName(); - if (!StringHelper.isNullOrEmpty(oldNetworkName)) { + if (!StringUtils.isEmpty(oldNetworkName)) { return lookupAtachedNetwork(originalInter.getNetworkName()); } else { InterfaceAndIdQueryParameters params = new InterfaceAndIdQueryParameters( @@ -170,7 +168,7 @@ } private org.ovirt.engine.core.common.businessentities.network.Network lookupAtachedNetwork(String networkName) { - if(!StringHelper.isNullOrEmpty(networkName)){ + if(!StringUtils.isEmpty(networkName)){ for(org.ovirt.engine.core.common.businessentities.network.Network nwk : parent.getClusterNetworks()){ if(nwk.getName().equals(networkName)) return nwk; } diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendUsersResourceBase.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendUsersResourceBase.java index f25c363..66139bb 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendUsersResourceBase.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendUsersResourceBase.java @@ -8,24 +8,23 @@ import javax.ws.rs.core.Response; +import org.apache.commons.lang.StringUtils; import org.ovirt.engine.api.common.security.auth.Principal; import org.ovirt.engine.api.common.util.QueryHelper; import org.ovirt.engine.api.model.BaseResource; import org.ovirt.engine.api.model.User; import org.ovirt.engine.api.model.Users; -import org.ovirt.engine.api.restapi.resource.BaseBackendResource.WebFaultException; import org.ovirt.engine.core.common.action.AdElementParametersBase; import org.ovirt.engine.core.common.action.VdcActionType; -import org.ovirt.engine.core.common.businessentities.LdapUser; import org.ovirt.engine.core.common.businessentities.DbUser; +import org.ovirt.engine.core.common.businessentities.LdapUser; import org.ovirt.engine.core.common.interfaces.SearchType; -import org.ovirt.engine.core.common.users.VdcUser; import org.ovirt.engine.core.common.queries.GetDbUserByUserIdParameters; import org.ovirt.engine.core.common.queries.VdcQueryParametersBase; import org.ovirt.engine.core.common.queries.VdcQueryType; +import org.ovirt.engine.core.common.users.VdcUser; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.compat.NGuid; -import org.ovirt.engine.core.compat.StringHelper; public class BackendUsersResourceBase extends AbstractBackendCollectionResource<User, DbUser> { @@ -94,7 +93,7 @@ : domain)); - sb.append(StringHelper.isNullOrEmpty(constraint)? + sb.append(StringUtils.isEmpty(constraint) ? "allnames=" + username : constraint); diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BaseBackendResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BaseBackendResource.java index cf37705..ecd9e63 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BaseBackendResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BaseBackendResource.java @@ -13,6 +13,7 @@ import javax.ws.rs.core.Response.Status; import javax.ws.rs.core.UriInfo; +import org.apache.commons.lang.StringUtils; import org.ovirt.engine.api.common.invocation.Current; import org.ovirt.engine.api.common.util.CompletenessAssertor; import org.ovirt.engine.api.common.util.EnumValidator; @@ -27,7 +28,6 @@ import org.ovirt.engine.core.common.queries.VdcQueryParametersBase; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.compat.NGuid; -import org.ovirt.engine.core.compat.StringHelper; import org.ovirt.engine.core.utils.log.Log; import org.ovirt.engine.core.utils.log.LogFactory; @@ -215,7 +215,7 @@ protected <T> T handleError(Class<T> clz, Exception e, boolean notFoundAs404) { if ((e instanceof EntityNotFoundException) && (notFoundAs404)) { throw new WebApplicationException(Response.status(Response.Status.NOT_FOUND).build()); - } else if ((e instanceof BackendFailureException) && (!StringHelper.isNullOrEmpty(e.getMessage()))) { + } else if ((e instanceof BackendFailureException) && (!StringUtils.isEmpty(e.getMessage()))) { LOG.errorFormat(localize(Messages.BACKEND_FAILED_TEMPLATE), e.getMessage(), null); throw new WebFaultException(null, e.getMessage(), Response.Status.BAD_REQUEST); } else { -- To view, visit http://gerrit.ovirt.org/13654 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I86d4266462bb936db9be551a1a321cdcb8f5929f 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
