inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-21 18:09:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged 5.2.N (5.2.1) to HEAD (5.2)

Browse Source 
125783 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125605 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         125498 slanglois: MNT-16155 Update source headers - remove svn:eol-style property on Java and JSP source files


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127809 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-06-03 16:45:04 +00:00
parent da8101a5ba
commit 19fcf2c411
325 changed files with 59952 additions and 59952 deletions
Download Patch File Download Diff File Expand all files Collapse all files

170
source/java/org/alfresco/repo/web/scripts/audit/AuditEntryDelete.java
View File

@@ -1,86 +1,86 @@
package org.alfresco.repo.web.scripts.audit;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.alfresco.service.cmr.audit.AuditQueryParameters;
import org.alfresco.service.cmr.audit.AuditService.AuditApplication;
import org.alfresco.service.cmr.audit.AuditService.AuditQueryCallback;
import org.springframework.extensions.webscripts.Cache;
import org.springframework.extensions.webscripts.Status;
import org.springframework.extensions.webscripts.WebScriptException;
import org.springframework.extensions.webscripts.WebScriptRequest;
/**
* @author Mark Rogers
* @since 4.2
*/
public class AuditEntryDelete extends AbstractAuditWebScript
{
@Override
protected Map<String, Object> executeImpl(WebScriptRequest req, Status status, Cache cache)
{
Map<String, Object> model = new HashMap<String, Object>(7);
Long id = getId(req);
if (id == null)
{
throw new WebScriptException(Status.STATUS_BAD_REQUEST, "audit.err.entry.id.notProvided");
}
final List<Long> auditEntryIds = new ArrayList<Long>();
// Need to check that the audit entry actually exists - otherwise we get into a concurrency retry loop
AuditQueryParameters params = new AuditQueryParameters();
AuditQueryCallback callback = new AuditQueryCallback(){
@Override
public boolean valuesRequired() {
return false;
}
@Override
public boolean handleAuditEntry(Long entryId,
String applicationName,
String user, long time,
Map<String, Serializable> values) {
auditEntryIds.add(entryId);
return false;
}
@Override
public boolean handleAuditEntryError(Long entryId, String errorMsg,
Throwable error)
{
return true;
}
};
params.setToId(id);
params.setFromId(id);
auditService.auditQuery(callback, params, 1);
if(auditEntryIds.size() > 0)
{
//
int deleted = auditService.clearAudit(auditEntryIds);
model.put(JSON_KEY_DELETED, deleted);
// Done
if (logger.isDebugEnabled())
{
logger.debug("Result: \n\tRequest: " + req + "\n\tModel: " + model);
}
return model;
}
else
{
// Not found
throw new WebScriptException(Status.STATUS_NOT_FOUND, "audit.err.entry.id.notfound", id);
}
}
package org.alfresco.repo.web.scripts.audit;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.alfresco.service.cmr.audit.AuditQueryParameters;
import org.alfresco.service.cmr.audit.AuditService.AuditApplication;
import org.alfresco.service.cmr.audit.AuditService.AuditQueryCallback;
import org.springframework.extensions.webscripts.Cache;
import org.springframework.extensions.webscripts.Status;
import org.springframework.extensions.webscripts.WebScriptException;
import org.springframework.extensions.webscripts.WebScriptRequest;
/**
* @author Mark Rogers
* @since 4.2
*/
public class AuditEntryDelete extends AbstractAuditWebScript
{
@Override
protected Map<String, Object> executeImpl(WebScriptRequest req, Status status, Cache cache)
{
Map<String, Object> model = new HashMap<String, Object>(7);
Long id = getId(req);
if (id == null)
{
throw new WebScriptException(Status.STATUS_BAD_REQUEST, "audit.err.entry.id.notProvided");
}
final List<Long> auditEntryIds = new ArrayList<Long>();
// Need to check that the audit entry actually exists - otherwise we get into a concurrency retry loop
AuditQueryParameters params = new AuditQueryParameters();
AuditQueryCallback callback = new AuditQueryCallback(){
@Override
public boolean valuesRequired() {
return false;
}
@Override
public boolean handleAuditEntry(Long entryId,
String applicationName,
String user, long time,
Map<String, Serializable> values) {
auditEntryIds.add(entryId);
return false;
}
@Override
public boolean handleAuditEntryError(Long entryId, String errorMsg,
Throwable error)
{
return true;
}
};
params.setToId(id);
params.setFromId(id);
auditService.auditQuery(callback, params, 1);
if(auditEntryIds.size() > 0)
{
//
int deleted = auditService.clearAudit(auditEntryIds);
model.put(JSON_KEY_DELETED, deleted);
// Done
if (logger.isDebugEnabled())
{
logger.debug("Result: \n\tRequest: " + req + "\n\tModel: " + model);
}
return model;
}
else
{
// Not found
throw new WebScriptException(Status.STATUS_NOT_FOUND, "audit.err.entry.id.notfound", id);
}
}
}