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

review changes

Browse Source
This commit is contained in:
Rodica Sutu
2018-04-25 11:07:14 +03:00
parent 62d4840ae1
commit 0b44e3fd70
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -112,7 +112,9 @@ public class PojoUtility
{ {
mandatoryObject("model", classz); mandatoryObject("model", classz);
mandatoryObject("jsonObject", json); mandatoryObject("jsonObject", json);
ObjectMapper mapper = new ObjectMapper(); ObjectMapper mapper = new ObjectMapper();
T obj = null; T obj = null;
try try
{ {
@@ -123,7 +125,7 @@ public class PojoUtility
LOGGER.error("Unable to convert the json into a java object.", e.toString()); LOGGER.error("Unable to convert the json into a java object.", e.toString());
} }
return (T) obj; return obj;
} }
/** /**

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

@@ -59,7 +59,7 @@ public class RMAuditAPI extends BaseAPI
private static final String RM_AUDIT_LOG_API = RM_AUDIT_API + "?{1}"; private static final String RM_AUDIT_LOG_API = RM_AUDIT_API + "?{1}";
/** /**
* Returns a list of audit entries audit of Records Management events. . * Returns a list of rm audit entries .
* *
* @param user The username of the user to use. * @param user The username of the user to use.
* @param password The password of the user. * @param password The password of the user.
@@ -72,7 +72,7 @@ public class RMAuditAPI extends BaseAPI
String parameters = null; String parameters = null;
try try
{ {
parameters = "size=" + size + (event != null ? "&event=" + URLEncoder.encode(event, "UTF-8"): null ); parameters = "size=" + size + (event != null ? "&event=" + URLEncoder.encode(event, "UTF-8"):"");
} }
catch (UnsupportedEncodingException e) catch (UnsupportedEncodingException e)
{ {
@@ -85,7 +85,7 @@ public class RMAuditAPI extends BaseAPI
} }
/** /**
* Clear the list of audit entries audit of Records Management events. . * Clear the list of audit entries.
* *
* @param username The username of the user to use. * @param username The username of the user to use.
* @param password The password of the user. * @param password The password of the user.
@@ -96,7 +96,7 @@ public class RMAuditAPI extends BaseAPI
JSONObject deleteStatus = doDeleteRequest(username, password, RM_AUDIT_API); JSONObject deleteStatus = doDeleteRequest(username, password, RM_AUDIT_API);
assertTrue(deleteStatus != null assertTrue(deleteStatus != null
//audit clear and audit login returned //audit clear and login events are returned
&& getRMAuditLog(username, password, 100, null).size() == 2); && getRMAuditLog(username, password, 100, null).size() == 2);
} }