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

RM-5837 Use constants for status codes.

Browse Source 
Also code review fixes for new test.
This commit is contained in:
Tom Page
2017-11-08 14:02:22 +00:00
parent a35860011b
commit 94d259ed6d
5 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/RMRolesAndActionsAPI.java
View File

@@ -27,6 +27,7 @@
package org.alfresco.rest.v0; package org.alfresco.rest.v0;
import static org.alfresco.dataprep.AlfrescoHttpClient.MIME_TYPE_JSON; import static org.alfresco.dataprep.AlfrescoHttpClient.MIME_TYPE_JSON;
import static org.apache.http.HttpStatus.SC_OK;
import static org.testng.AssertJUnit.assertNotNull; import static org.testng.AssertJUnit.assertNotNull;
import java.io.IOException; import java.io.IOException;
@@ -238,7 +239,7 @@ public class RMRolesAndActionsAPI extends BaseAPI
) )
); );
} }
return doPostJsonRequest(user, password, 200, requestParams, RM_ACTIONS_API); return doPostJsonRequest(user, password, SC_OK, requestParams, RM_ACTIONS_API);
} }
/** /**
@@ -303,7 +304,7 @@ public class RMRolesAndActionsAPI extends BaseAPI
requestParams.put("prop_rma_holdReason", reason); requestParams.put("prop_rma_holdReason", reason);
// Make the POST request and throw an assertion error if it fails. // Make the POST request and throw an assertion error if it fails.
HttpResponse httpResponse = doPostJsonRequest(user, password, 200, requestParams, CREATE_HOLDS_API); HttpResponse httpResponse = doPostJsonRequest(user, password, SC_OK, requestParams, CREATE_HOLDS_API);
assertNotNull("Expected object to have been created at " + fullHoldPath, assertNotNull("Expected object to have been created at " + fullHoldPath,
getObjectByPath(user, password, fullHoldPath)); getObjectByPath(user, password, fullHoldPath));
return httpResponse; return httpResponse;
@@ -325,6 +326,6 @@ public class RMRolesAndActionsAPI extends BaseAPI
addPropertyToRequest(requestParams, "prop_cm_description", properties, RMProperty.DESCRIPTION); addPropertyToRequest(requestParams, "prop_cm_description", properties, RMProperty.DESCRIPTION);
addPropertyToRequest(requestParams, "prop_cm_author", properties, RMProperty.AUTHOR); addPropertyToRequest(requestParams, "prop_cm_author", properties, RMProperty.AUTHOR);
return doPostJsonRequest(username, password, 200, requestParams, MessageFormat.format(UPDATE_METADATA_API, "{0}", itemNodeRef)); return doPostJsonRequest(username, password, SC_OK, requestParams, MessageFormat.format(UPDATE_METADATA_API, "{0}", itemNodeRef));
} }
} }

8
rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/RecordCategoriesAPI.java
View File

@@ -26,6 +26,8 @@
*/ */
package org.alfresco.rest.v0; package org.alfresco.rest.v0;
import static org.apache.http.HttpStatus.SC_OK;
import java.text.MessageFormat; import java.text.MessageFormat;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@@ -66,7 +68,7 @@ public class RecordCategoriesAPI extends BaseAPI
requestParams.put("name", "createDispositionSchedule"); requestParams.put("name", "createDispositionSchedule");
requestParams.put("nodeRef", catNodeRef); requestParams.put("nodeRef", catNodeRef);
return doPostJsonRequest(user, password, 200, requestParams, RM_ACTIONS_API); return doPostJsonRequest(user, password, SC_OK, requestParams, RM_ACTIONS_API);
} }
/** /**
@@ -85,7 +87,7 @@ public class RecordCategoriesAPI extends BaseAPI
requestParams.put("prop_rma_dispositionAuthority", getPropertyValue(retentionProperties, RETENTION_SCHEDULE.RETENTION_AUTHORITY)); requestParams.put("prop_rma_dispositionAuthority", getPropertyValue(retentionProperties, RETENTION_SCHEDULE.RETENTION_AUTHORITY));
requestParams.put("prop_rma_dispositionInstructions", getPropertyValue(retentionProperties, RETENTION_SCHEDULE.RETENTION_INSTRUCTIONS)); requestParams.put("prop_rma_dispositionInstructions", getPropertyValue(retentionProperties, RETENTION_SCHEDULE.RETENTION_INSTRUCTIONS));
requestParams.put("prop_rma_recordLevelDisposition", appliedToRecords.toString()); requestParams.put("prop_rma_recordLevelDisposition", appliedToRecords.toString());
return doPostJsonRequest(user, password, 200, requestParams, MessageFormat.format(UPDATE_METADATA_API, "{0}", dispRetentionNodeRef)); return doPostJsonRequest(user, password, SC_OK, requestParams, MessageFormat.format(UPDATE_METADATA_API, "{0}", dispRetentionNodeRef));
} }
/** /**
@@ -109,7 +111,7 @@ public class RecordCategoriesAPI extends BaseAPI
addPropertyToRequest(requestParams, "events", properties, RETENTION_SCHEDULE.RETENTION_EVENTS); addPropertyToRequest(requestParams, "events", properties, RETENTION_SCHEDULE.RETENTION_EVENTS);
addPropertyToRequest(requestParams, "eligibleOnFirstCompleteEvent", properties, RETENTION_SCHEDULE.RETENTION_ELIGIBLE_FIRST_EVENT); addPropertyToRequest(requestParams, "eligibleOnFirstCompleteEvent", properties, RETENTION_SCHEDULE.RETENTION_ELIGIBLE_FIRST_EVENT);
return doPostJsonRequest(user, password, 200, requestParams, MessageFormat.format(DISPOSITION_ACTIONS_API, "{0}", catNodeRef)); return doPostJsonRequest(user, password, SC_OK, requestParams, MessageFormat.format(DISPOSITION_ACTIONS_API, "{0}", catNodeRef));
} }
/** /**

4
rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/RecordFoldersAPI.java
View File

@@ -26,6 +26,8 @@
*/ */
package org.alfresco.rest.v0; package org.alfresco.rest.v0;
import static org.apache.http.HttpStatus.SC_OK;
import org.alfresco.dataprep.ContentService; import org.alfresco.dataprep.ContentService;
import org.alfresco.rest.core.v0.BaseAPI; import org.alfresco.rest.core.v0.BaseAPI;
import org.apache.http.HttpResponse; import org.apache.http.HttpResponse;
@@ -68,7 +70,7 @@ public class RecordFoldersAPI extends BaseAPI
requestParams.put("name", "closeRecordFolder"); requestParams.put("name", "closeRecordFolder");
requestParams.put("nodeRef", recNodeRef); requestParams.put("nodeRef", recNodeRef);
return doPostJsonRequest(user, password, 200, requestParams, RM_ACTIONS_API); return doPostJsonRequest(user, password, SC_OK, requestParams, RM_ACTIONS_API);
} }
catch (JSONException error) catch (JSONException error)
{ {

14
rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/RecordsAPI.java
View File

@@ -26,6 +26,8 @@
*/ */
package org.alfresco.rest.v0; package org.alfresco.rest.v0;
import static org.apache.http.HttpStatus.SC_OK;
import java.text.MessageFormat; import java.text.MessageFormat;
import java.util.Map; import java.util.Map;
@@ -77,7 +79,7 @@ public class RecordsAPI extends BaseAPI
requestParams.put("actionedUponNode", docNodeRef); requestParams.put("actionedUponNode", docNodeRef);
requestParams.put("actionDefinitionName", "create-record"); requestParams.put("actionDefinitionName", "create-record");
return doPostJsonRequest(user, password, 200, requestParams, ACTIONS_API); return doPostJsonRequest(user, password, SC_OK, requestParams, ACTIONS_API);
} }
/** /**
@@ -96,7 +98,7 @@ public class RecordsAPI extends BaseAPI
requestParams.put("name", "declareRecord"); requestParams.put("name", "declareRecord");
requestParams.put("nodeRef", recNodeRef); requestParams.put("nodeRef", recNodeRef);
return doPostJsonRequest(user, password, 200, requestParams, RM_ACTIONS_API); return doPostJsonRequest(user, password, SC_OK, requestParams, RM_ACTIONS_API);
} }
/** /**
@@ -111,7 +113,7 @@ public class RecordsAPI extends BaseAPI
*/ */
public HttpResponse rejectRecord(String user, String password, String recordName, String reason) public HttpResponse rejectRecord(String user, String password, String recordName, String reason)
{ {
return rejectRecord(user, password, 200, recordName, reason); return rejectRecord(user, password, SC_OK, recordName, reason);
} }
/** /**
@@ -155,7 +157,7 @@ public class RecordsAPI extends BaseAPI
requestParams.put("actionedUponNode", docNodeRef); requestParams.put("actionedUponNode", docNodeRef);
requestParams.put("actionDefinitionName", "declare-as-version-record"); requestParams.put("actionDefinitionName", "declare-as-version-record");
return doPostJsonRequest(user, password, 200, requestParams, ACTIONS_API); return doPostJsonRequest(user, password, SC_OK, requestParams, ACTIONS_API);
} }
/** /**
@@ -217,7 +219,7 @@ public class RecordsAPI extends BaseAPI
requestParams.put("prop_rma_box", box); requestParams.put("prop_rma_box", box);
requestParams.put("prop_rma_file", file); requestParams.put("prop_rma_file", file);
return doPostJsonRequest(username, password, 200, requestParams, CREATE_NON_ELECTRONIC_RECORD_API); return doPostJsonRequest(username, password, SC_OK, requestParams, CREATE_NON_ELECTRONIC_RECORD_API);
} }
/** /**
@@ -343,7 +345,7 @@ public class RecordsAPI extends BaseAPI
requestParams.put("actionedUponNode", docNodeRef); requestParams.put("actionedUponNode", docNodeRef);
requestParams.put("actionDefinitionName", "hide-record"); requestParams.put("actionDefinitionName", "hide-record");
return doPostJsonRequest(user, password, 200, requestParams, ACTIONS_API); return doPostJsonRequest(user, password, SC_OK, requestParams, ACTIONS_API);
} }
} }

8
rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/RulesAPI.java
View File

@@ -29,6 +29,8 @@ package org.alfresco.rest.v0;
import static java.util.Arrays.asList; import static java.util.Arrays.asList;
import static org.apache.http.HttpStatus.SC_OK;
import java.text.MessageFormat; import java.text.MessageFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@@ -71,7 +73,7 @@ public class RulesAPI extends BaseAPI
{ {
try try
{ {
return doPostJsonRequest(username, password, 200, getRuleRequest(ruleProperties), MessageFormat.format(RULES_API, "{0}", containerNodeRef)); return doPostJsonRequest(username, password, SC_OK, getRuleRequest(ruleProperties), MessageFormat.format(RULES_API, "{0}", containerNodeRef));
} }
catch (JSONException error) catch (JSONException error)
{ {
@@ -316,7 +318,7 @@ public class RulesAPI extends BaseAPI
{ {
if(containerInheritsRulesFromParent(username, password, containerNodeRef)) if(containerInheritsRulesFromParent(username, password, containerNodeRef))
{ {
return doPostJsonRequest(username, password, 200, new JSONObject(), MessageFormat.format(INHERIT_RULES_API, "{0}", containerNodeRef)); return doPostJsonRequest(username, password, SC_OK, new JSONObject(), MessageFormat.format(INHERIT_RULES_API, "{0}", containerNodeRef));
} }
return null; return null;
} }
@@ -333,7 +335,7 @@ public class RulesAPI extends BaseAPI
{ {
if (!containerInheritsRulesFromParent(username, password, containerNodeRef)) if (!containerInheritsRulesFromParent(username, password, containerNodeRef))
{ {
return doPostJsonRequest(username, password, 200, new JSONObject(), MessageFormat.format(INHERIT_RULES_API, "{0}", containerNodeRef)); return doPostJsonRequest(username, password, SC_OK, new JSONObject(), MessageFormat.format(INHERIT_RULES_API, "{0}", containerNodeRef));
} }
return null; return null;
} }