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

Merged 5.2.N-AUDIT-API (5.2.2) to 5.2.N (5.2.2)

Browse Source 
137952 jvonka: REPO-2555: Retrieve Audit Application Entries - fix compilation issue & minor refactor/cleanup
   - see sub-task REPO-2619


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137980 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
2017-07-12 12:11:58 +00:00
parent 0e86382a6b
commit e50e49d525
1 changed files with 66 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
source/java/org/alfresco/rest/api/impl/AuditImpl.java
View File

@@ -26,7 +26,6 @@
package org.alfresco.rest.api.impl; package org.alfresco.rest.api.impl;
import java.io.Serializable; import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
@@ -44,7 +43,6 @@ import org.alfresco.rest.antlr.WhereClauseParser;
import org.alfresco.rest.api.Audit; import org.alfresco.rest.api.Audit;
import org.alfresco.rest.api.model.AuditApp; import org.alfresco.rest.api.model.AuditApp;
import org.alfresco.rest.api.model.AuditEntry; import org.alfresco.rest.api.model.AuditEntry;
import org.alfresco.rest.api.model.SiteMembershipRequest;
import org.alfresco.rest.api.model.UserInfo; import org.alfresco.rest.api.model.UserInfo;
import org.alfresco.rest.framework.core.exceptions.DisabledServiceException; import org.alfresco.rest.framework.core.exceptions.DisabledServiceException;
import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException; import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
@@ -60,10 +58,7 @@ import org.alfresco.service.cmr.audit.AuditQueryParameters;
import org.alfresco.service.cmr.audit.AuditService; import org.alfresco.service.cmr.audit.AuditService;
import org.alfresco.service.cmr.audit.AuditService.AuditApplication; import org.alfresco.service.cmr.audit.AuditService.AuditApplication;
import org.alfresco.service.cmr.audit.AuditService.AuditQueryCallback; import org.alfresco.service.cmr.audit.AuditService.AuditQueryCallback;
import org.alfresco.service.cmr.invitation.Invitation;
import org.alfresco.service.cmr.invitation.ModeratedInvitation;
import org.alfresco.util.Pair; import org.alfresco.util.Pair;
import org.apache.commons.beanutils.ConvertUtils;
import org.springframework.extensions.surf.util.ISO8601DateFormat; import org.springframework.extensions.surf.util.ISO8601DateFormat;
/** /**
@@ -110,6 +105,13 @@ public class AuditImpl implements Audit
{ {
checkEnabled(); checkEnabled();
AuditService.AuditApplication auditApplication = findAuditAppByIdOr404(auditAppId);
return new AuditApp(auditApplication.getKey().substring(1), auditApplication.getName(), auditApplication.isEnabled());
}
private AuditService.AuditApplication findAuditAppByIdOr404(String auditAppId)
{
AuditService.AuditApplication auditApplication = findAuditAppById(auditAppId); AuditService.AuditApplication auditApplication = findAuditAppById(auditAppId);
if (auditApplication == null) if (auditApplication == null)
@@ -117,7 +119,7 @@ public class AuditImpl implements Audit
throw new EntityNotFoundException(auditAppId); throw new EntityNotFoundException(auditAppId);
} }
return new AuditApp(auditApplication.getKey().substring(1), auditApplication.getName(), auditApplication.isEnabled()); return auditApplication;
} }
private AuditService.AuditApplication findAuditAppById(String auditAppId) private AuditService.AuditApplication findAuditAppById(String auditAppId)
@@ -183,7 +185,7 @@ public class AuditImpl implements Audit
{ {
checkEnabled(); checkEnabled();
validateAuditAppId(auditAppId); AuditService.AuditApplication auditApplication = findAuditAppByIdOr404(auditAppId);
// adding orderBy property // adding orderBy property
Pair<String, Boolean> sortProp = getAuditEntrySortProp(parameters); Pair<String, Boolean> sortProp = getAuditEntrySortProp(parameters);
@@ -207,7 +209,7 @@ public class AuditImpl implements Audit
// filtering via "where" clause // filtering via "where" clause
AuditEntryQueryWalker propertyWalker = new AuditEntryQueryWalker(); AuditEntryQueryWalker propertyWalker = new AuditEntryQueryWalker();
QueryHelper.walk(q, propertyWalker); QueryHelper.walk(q, propertyWalker);
entriesAudit = getQueryResultAuditEntries(auditAppId, propertyWalker, parameters.getInclude(), limit, forward); entriesAudit = getQueryResultAuditEntries(auditApplication, propertyWalker, parameters.getInclude(), limit, forward);
} }
// clear null elements // clear null elements
@@ -227,19 +229,6 @@ public class AuditImpl implements Audit
entriesAudit = entriesAudit.subList(skipCount, end); entriesAudit = entriesAudit.subList(skipCount, end);
return CollectionWithPagingInfo.asPaged(paging, entriesAudit, hasMoreItems, totalItems); return CollectionWithPagingInfo.asPaged(paging, entriesAudit, hasMoreItems, totalItems);
} }
}
private void validateAuditAppId(String auditAppId)
{
AuditService.AuditApplication auditApplication = findAuditAppById(auditAppId);
// Check if id is valid
if (auditApplication == null)
{
throw new EntityNotFoundException(auditAppId);
}
} }
/** /**
@@ -361,13 +350,12 @@ public class AuditImpl implements Audit
* @param forward * @param forward
* @return * @return
*/ */
public List<AuditEntry> getQueryResultAuditEntries(String auditAppId, AuditEntryQueryWalker propertyWalker, List<String> includeParam, public List<AuditEntry> getQueryResultAuditEntries(AuditService.AuditApplication auditApplication, AuditEntryQueryWalker propertyWalker, List<String> includeParam,
int maxItem, Boolean forward) int maxItem, Boolean forward)
{ {
final List<AuditEntry> results = new ArrayList<AuditEntry>(); final List<AuditEntry> results = new ArrayList<>();
AuditApplication auditApplication = findAuditAppById(auditAppId);
if (auditApplication != null) final String auditAppId = auditApplication.getKey().substring(1);
{
String auditApplicationName = auditApplication.getName(); String auditApplicationName = auditApplication.getName();
// Execute the query // Execute the query
@@ -421,8 +409,6 @@ public class AuditImpl implements Audit
}; };
auditService.auditQuery(callback, params, maxItem); auditService.auditQuery(callback, params, maxItem);
}
return results; return results;
} }
@@ -431,7 +417,7 @@ public class AuditImpl implements Audit
{ {
checkEnabled(); checkEnabled();
validateAuditAppId(auditAppId); AuditService.AuditApplication auditApplication = findAuditAppByIdOr404(auditAppId);
// Enable/Disable audit application // Enable/Disable audit application
if (auditApp.getIsEnabled() && !auditApplication.isEnabled()) if (auditApp.getIsEnabled() && !auditApplication.isEnabled())