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

137892 eknizat: REPO-1298 Enable/Disable Application Auditing


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137961 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
2017-07-12 12:09:29 +00:00
parent 02d812a0cd
commit bbfd3a75a6
3 changed files with 28 additions and 4 deletions

View File

@@ -62,8 +62,7 @@ public interface Audit
* @param parameters
* @return an audit entry
*/
// AuditApp update(String auditAppId, AuditApp auditApp, Parameters
// parameters);
AuditApp update(String auditAppId, AuditApp auditApp, Parameters parameters);
/**
* Gets a single audit entry by id

View File

@@ -70,8 +70,7 @@ public class AuditApplicationsEntityResource implements EntityResourceAction.Rea
@WebApiDescription(title = "Update audit", description = "Update audit")
public AuditApp update(String auditAppId, AuditApp auditApp, Parameters parameters)
{
// return audit.update(auditAppId, auditApp, parameters);
return null; // TODO fixme
return audit.update(auditAppId, auditApp, parameters);
}
@Override

View File

@@ -140,4 +140,30 @@ public class AuditImpl implements Audit
return CollectionWithPagingInfo.asPaged(paging, auditApps, hasMoreItems, totalItems);
}
@Override
public AuditApp update(String auditAppId, AuditApp auditApp, Parameters parameters)
{
checkEnabled();
AuditService.AuditApplication auditApplication = findAuditAppById(auditAppId);
// Check if id is valid
if (auditApplication == null)
{
throw new EntityNotFoundException(auditAppId);
}
// Enable/Disable audit application
if (auditApp.getIsEnabled() && !auditApplication.isEnabled())
{
auditService.enableAudit(auditApplication.getName(), auditApplication.getKey());
}
else if (!auditApp.getIsEnabled() && auditApplication.isEnabled())
{
auditService.disableAudit(auditApplication.getName(), auditApplication.getKey());
}
return new AuditApp(auditApplication.getKey().substring(1), auditApplication.getName(), auditApp.getIsEnabled());
}
}