inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor changes to WebScriptUtils.

Browse Source 
I'm not sure which static import was being used previously, but since we
had an explicit reference to lang3 I went with that.

+review RM

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@101243 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tom Page
2015-04-07 13:55:44 +00:00
parent b8e6ea3912
commit 5ea9e93c51
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rm-server/source/java/org/alfresco/util/WebScriptUtils.java
View File

@@ -20,14 +20,12 @@ package org.alfresco.util;
import static org.alfresco.util.ParameterCheck.mandatory; import static org.alfresco.util.ParameterCheck.mandatory;
import static org.alfresco.util.ParameterCheck.mandatoryString; import static org.alfresco.util.ParameterCheck.mandatoryString;
import static org.apache.commons.lang.StringUtils.isBlank;
import static org.apache.commons.lang3.StringUtils.isBlank; import static org.apache.commons.lang3.StringUtils.isBlank;
import java.io.IOException; import java.io.IOException;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import org.apache.commons.lang3.StringUtils;
import org.json.JSONArray; import org.json.JSONArray;
import org.json.JSONException; import org.json.JSONException;
import org.json.JSONObject; import org.json.JSONObject;
@@ -139,7 +137,7 @@ public final class WebScriptUtils
throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Could not get content from the request.", error); throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Could not get content from the request.", error);
} }
if (StringUtils.isBlank(content)) if (isBlank(content))
{ {
throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Content does not exist."); throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Content does not exist.");
} }
@@ -172,7 +170,7 @@ public final class WebScriptUtils
if (!jsonObject.has(paramName)) if (!jsonObject.has(paramName))
{ {
throw new WebScriptException(Status.STATUS_BAD_REQUEST, "The json object does not contain en entry with parameter '" + paramName + "'."); throw new WebScriptException(Status.STATUS_BAD_REQUEST, "The json object does not contain an entry with parameter '" + paramName + "'.");
} }
} }
@@ -234,7 +232,7 @@ public final class WebScriptUtils
value = jsonObject.getString(key); value = jsonObject.getString(key);
if (checkValue && isBlank(value)) if (checkValue && isBlank(value))
{ {
throw new WebScriptException(Status.STATUS_BAD_REQUEST, "The vale is missing for the key '" + key + "'."); throw new WebScriptException(Status.STATUS_BAD_REQUEST, "The value is missing for the key '" + key + "'.");
} }
} }
catch (JSONException error) catch (JSONException error)