From 0e86382a6b87bb130e1f33fb92d573ca5f079a43 Mon Sep 17 00:00:00 2001
From: Jan Vonka <jan.vonka@alfresco.com>
Date: Wed, 12 Jul 2017 12:11:51 +0000
Subject: [PATCH] Merged 5.2.N-AUDIT-API (5.2.2) to 5.2.N (5.2.2)    137949
 anechifor: REPO-2555 validate auditAppId

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137979 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 ...AuditApplicationsAuditEntriesRelation.java |  3 +++
 .../org/alfresco/rest/api/impl/AuditImpl.java | 22 +++++++++++++------
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/source/java/org/alfresco/rest/api/audit/AuditApplicationsAuditEntriesRelation.java b/source/java/org/alfresco/rest/api/audit/AuditApplicationsAuditEntriesRelation.java
index ae6d269e8f..268af74d78 100644
--- a/source/java/org/alfresco/rest/api/audit/AuditApplicationsAuditEntriesRelation.java
+++ b/source/java/org/alfresco/rest/api/audit/AuditApplicationsAuditEntriesRelation.java
@@ -54,6 +54,9 @@ public class AuditApplicationsAuditEntriesRelation implements RelationshipResour
         ParameterCheck.mandatory("audit", this.audit);
     }
 
+    /**
+     * If auditAppId does not exist, EntityNotFoundException (status 404).
+     */
     @WebApiDescription(title = "Returns audit entries for audit app id")
     @Override
     public CollectionWithPagingInfo<AuditEntry> readAll(String auditAppId, Parameters parameters)
diff --git a/source/java/org/alfresco/rest/api/impl/AuditImpl.java b/source/java/org/alfresco/rest/api/impl/AuditImpl.java
index 7abaa86665..41976988f1 100644
--- a/source/java/org/alfresco/rest/api/impl/AuditImpl.java
+++ b/source/java/org/alfresco/rest/api/impl/AuditImpl.java
@@ -182,6 +182,8 @@ public class AuditImpl implements Audit
     public CollectionWithPagingInfo<AuditEntry> listAuditEntries(String auditAppId, Parameters parameters)
     {
         checkEnabled();
+        
+        validateAuditAppId(auditAppId);
 
         // adding orderBy property
         Pair<String, Boolean> sortProp = getAuditEntrySortProp(parameters);
@@ -228,6 +230,18 @@ public class AuditImpl implements Audit
         
     }
 
+    private void validateAuditAppId(String auditAppId)
+    {
+        AuditService.AuditApplication auditApplication = findAuditAppById(auditAppId);
+
+        // Check if id is valid
+        if (auditApplication == null)
+        {
+            throw new EntityNotFoundException(auditAppId);
+        }
+        
+    }
+
     /**
      * 
      * @param parameters
@@ -417,13 +431,7 @@ public class AuditImpl implements Audit
     {
         checkEnabled();
 
-        AuditService.AuditApplication auditApplication = findAuditAppById(auditAppId);
-
-        // Check if id is valid
-        if (auditApplication == null)
-        {
-            throw new EntityNotFoundException(auditAppId);
-        }
+        validateAuditAppId(auditAppId);
 
         // Enable/Disable audit application
         if (auditApp.getIsEnabled() && !auditApplication.isEnabled())