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 
137945 anechifor: REPO-2555 audit Entries


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

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

@@ -44,6 +44,7 @@ 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;
@@ -59,6 +60,8 @@ 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.apache.commons.beanutils.ConvertUtils;
import org.springframework.extensions.surf.util.ISO8601DateFormat; import org.springframework.extensions.surf.util.ISO8601DateFormat;
@@ -72,7 +75,6 @@ public class AuditImpl implements Audit
{ {
private final static String DISABLED = "Audit is disabled system-wide"; private final static String DISABLED = "Audit is disabled system-wide";
private final static int MAX_ITEMS_AUDIT_ENTRIES = 100;
// list of equals filter's auditEntry (via where clause) // list of equals filter's auditEntry (via where clause)
private final static Set<String> LIST_AUDIT_ENTRY_EQUALS_QUERY_PROPERTIES = new HashSet<>( private final static Set<String> LIST_AUDIT_ENTRY_EQUALS_QUERY_PROPERTIES = new HashSet<>(
@@ -190,22 +192,22 @@ public class AuditImpl implements Audit
// Parse where clause properties. // Parse where clause properties.
List<AuditEntry> entriesAudit = new ArrayList<AuditEntry>(); List<AuditEntry> entriesAudit = new ArrayList<AuditEntry>();
Query q = parameters.getQuery(); Query q = parameters.getQuery();
// paging
Paging paging = parameters.getPaging();
int skipCount = paging.getSkipCount();
int maxItems = paging.getMaxItems();
int limit = skipCount + maxItems + 1; // to detect hasMoreItems
if (q != null) if (q != null)
{ {
// 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(), MAX_ITEMS_AUDIT_ENTRIES, forward); entriesAudit = getQueryResultAuditEntries(auditAppId, propertyWalker, parameters.getInclude(), limit, forward);
} }
// clear null elements // clear null elements
entriesAudit.removeAll(Collections.singleton(null)); entriesAudit.removeAll(Collections.singleton(null));
// paging
Paging paging = parameters.getPaging();
int skipCount = paging.getSkipCount();
int maxItems = paging.getMaxItems();
int max = skipCount + maxItems; // to detect hasMoreItems
int totalItems = entriesAudit.size(); int totalItems = entriesAudit.size();
if(skipCount >= totalItems) if(skipCount >= totalItems)
@@ -215,12 +217,13 @@ public class AuditImpl implements Audit
} }
else else
{ {
int end = Math.min(max, totalItems); int end = Math.min(limit - 1, totalItems);
boolean hasMoreItems = totalItems > end; boolean hasMoreItems = totalItems > end;
entriesAudit = entriesAudit.subList(skipCount, end); entriesAudit = entriesAudit.subList(skipCount, end);
return CollectionWithPagingInfo.asPaged(paging, entriesAudit, hasMoreItems, totalItems); return CollectionWithPagingInfo.asPaged(paging, entriesAudit, hasMoreItems, totalItems);
} }
} }
/** /**
@@ -292,7 +295,7 @@ public class AuditImpl implements Audit
if (propertyName.equals(ID)) if (propertyName.equals(ID))
{ {
fromId = new Long(firstValue); fromId = new Long(firstValue);
toId = new Long(secondValue); toId = new Long(secondValue) + 1;
} }
} }