RM: Fix up unit test and event web script

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@51947 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Roy Wetherall
2013-07-02 06:11:34 +00:00
parent 338472e090
commit 40db3b7787
2 changed files with 16 additions and 2 deletions

View File

@@ -41,6 +41,9 @@ import org.springframework.extensions.webscripts.WebScriptRequest;
*/
public class RmEventPut extends RMEventBase
{
/** Parameter names */
public static final String PARAM_EVENTNAME = "eventname";
/** Records management event service */
private RecordsManagementEventService rmEventService;
@@ -72,8 +75,14 @@ public class RmEventPut extends RMEventBase
json = new JSONObject(new JSONTokener(req.getContent().getContent()));
// Check the event name
String eventName = getValue(json, "eventName");
doCheck(eventName, "No event name was provided.");
Map<String, String> templateVars = req.getServiceMatch().getTemplateVars();
String eventName = templateVars.get(PARAM_EVENTNAME);
if (eventName == null ||
eventName.isEmpty() ||
rmEventService.existsEvent(eventName) == false)
{
throw new WebScriptException(Status.STATUS_NOT_FOUND, "No event name was provided.");
}
// Check the event display label
String eventDisplayLabel = getValue(json, "eventDisplayLabel");