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

RM-2402 (Extend classification REST API)

Browse Source 
+review RM-143

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@109184 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tuna Aksoy
2015-07-29 20:11:28 +00:00
parent ced35ff207
commit 2a2afa0589
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/classification/ClassifyContentBase.java
View File

@@ -22,7 +22,6 @@ import static org.alfresco.util.WebScriptUtils.getJSONArrayFromJSONObject;
import static org.alfresco.util.WebScriptUtils.getJSONArrayValue; import static org.alfresco.util.WebScriptUtils.getJSONArrayValue;
import static org.alfresco.util.WebScriptUtils.getRequestContentAsJsonObject; import static org.alfresco.util.WebScriptUtils.getRequestContentAsJsonObject;
import static org.alfresco.util.WebScriptUtils.getStringValueFromJSONObject; import static org.alfresco.util.WebScriptUtils.getStringValueFromJSONObject;
import static org.apache.commons.lang3.StringUtils.isNotBlank;
import static org.apache.commons.lang3.time.DateFormatUtils.ISO_DATE_FORMAT; import static org.apache.commons.lang3.time.DateFormatUtils.ISO_DATE_FORMAT;
import static org.springframework.extensions.webscripts.Status.STATUS_BAD_REQUEST; import static org.springframework.extensions.webscripts.Status.STATUS_BAD_REQUEST;
@@ -110,10 +109,10 @@ public abstract class ClassifyContentBase extends AbstractRmWebScript
String classifiedBy = getStringValueFromJSONObject(jsonObject, CLASSIFIED_BY); String classifiedBy = getStringValueFromJSONObject(jsonObject, CLASSIFIED_BY);
String classificationAgency = getStringValueFromJSONObject(jsonObject, CLASSIFICATION_AGENCY, false, false); String classificationAgency = getStringValueFromJSONObject(jsonObject, CLASSIFICATION_AGENCY, false, false);
Set<String> classificationReasonIds = getClassificationReasonIds(jsonObject); Set<String> classificationReasonIds = getClassificationReasonIds(jsonObject);
String downgradeDate = getStringValueFromJSONObject(jsonObject, DOWNGRADE_DATE, false, false); Object downgradeDate = jsonObject.isNull(DOWNGRADE_DATE) ? null : getStringValueFromJSONObject(jsonObject, DOWNGRADE_DATE, false, false);
String downgradeEvent = getStringValueFromJSONObject(jsonObject, DOWNGRADE_EVENT, false, false); String downgradeEvent = getStringValueFromJSONObject(jsonObject, DOWNGRADE_EVENT, false, false);
String downgradeInstructions = getStringValueFromJSONObject(jsonObject, DOWNGRADE_INSTRUCTIONS, false, false); String downgradeInstructions = getStringValueFromJSONObject(jsonObject, DOWNGRADE_INSTRUCTIONS, false, false);
String declassificationDate = getStringValueFromJSONObject(jsonObject, DECLASSIFICATION_DATE, false, false); Object declassificationDate = jsonObject.isNull(DECLASSIFICATION_DATE) ? null : getStringValueFromJSONObject(jsonObject, DECLASSIFICATION_DATE, false, false);
String declassificationEvent = getStringValueFromJSONObject(jsonObject, DECLASSIFICATION_EVENT, false, false); String declassificationEvent = getStringValueFromJSONObject(jsonObject, DECLASSIFICATION_EVENT, false, false);
Set<String> exemptionCategoryIds = getExemptionCategoryIds(jsonObject); Set<String> exemptionCategoryIds = getExemptionCategoryIds(jsonObject);
@@ -190,21 +189,20 @@ public abstract class ClassifyContentBase extends AbstractRmWebScript
} }
/** /**
* Parses the given string as date * Parses the given date
* *
* @param date The {@link String} which will be parsed * @param date The {@link Object} which will be parsed
* @return The parsed date, if the given date is blank then <code>null</code> will be returned. * @return The parsed date. If the given date is <code>null</code> then <code>null</code> will be returned.
*/ */
private Date parseDate(String date) private Date parseDate(Object date)
{ {
Date parsedDate = null; Date parsedDate = null;
// FIXME: "null" check if (date != null)
if (isNotBlank(date) && !date.equalsIgnoreCase("null"))
{ {
try try
{ {
parsedDate = DateUtils.parseDate(date, ISO_DATE_FORMAT.getPattern()); parsedDate = DateUtils.parseDate((String) date, ISO_DATE_FORMAT.getPattern());
} }
catch (ParseException error) catch (ParseException error)
{ {