Added key-value audit query

- Currently supports lookups on string values (RM use-case)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16133 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/repo/audit/hibernate/HibernateAuditDAO.java

@@ -698,4 +698,18 @@ public class HibernateAuditDAO extends HibernateDaoSupport implements AuditDAO,
     {
         throw new UnsupportedOperationException();
     }
+
+    /**
+     * Fallout implementation from new audit DAO
+     * 
+     * @throws UnsupportedOperationException always
+     * @since 3.2
+     */
+    public void findAuditEntries(
+            AuditQueryCallback callback,
+            String applicationName, String user, Long from, Long to, int maxResults,
+            String searchKey, String searchString)
+    {
+        throw new UnsupportedOperationException();
+    }
 }

source/java/org/alfresco/repo/domain/audit/AbstractAuditDAOImpl.java

@@ -346,10 +346,20 @@ public abstract class AbstractAuditDAOImpl implements AuditDAO
             String applicationName, String user, Long from, Long to, int maxResults)
     {
         AuditQueryRowHandler rowHandler = new AuditQueryRowHandler(callback);
-        findAuditEntries(rowHandler, applicationName, user, from, to, maxResults);
+        findAuditEntries(rowHandler, applicationName, user, from, to, maxResults, null, null);
+    }
+    
+    public void findAuditEntries(
+            AuditQueryCallback callback,
+            String applicationName, String user, Long from, Long to, int maxResults,
+            String searchKey, String searchString)
+    {
+        AuditQueryRowHandler rowHandler = new AuditQueryRowHandler(callback);
+        findAuditEntries(rowHandler, applicationName, user, from, to, maxResults, searchKey, searchString);
     }
     
     protected abstract void findAuditEntries(
             AuditQueryRowHandler rowHandler,
-            String applicationName, String user, Long from, Long to, int maxResults);
+            String applicationName, String user, Long from, Long to, int maxResults,
+            String searchKey, String searchString);
 }

source/java/org/alfresco/repo/domain/audit/AuditDAO.java

@@ -98,4 +98,9 @@ public interface AuditDAO
     void findAuditEntries(
             AuditQueryCallback callback,
             String applicationName, String user, Long from, Long to, int maxResults);
+    
+    void findAuditEntries(
+            AuditQueryCallback callback,
+            String applicationName, String user, Long from, Long to, int maxResults,
+            String searchKey, String searchString);
 }

source/java/org/alfresco/repo/domain/audit/AuditDAOTest.java

@@ -37,6 +37,7 @@ import org.alfresco.repo.domain.contentdata.ContentDataDAO;
 import org.alfresco.repo.transaction.RetryingTransactionHelper;
 import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
 import org.alfresco.service.ServiceRegistry;
+import org.alfresco.service.cmr.audit.AuditService.AuditQueryCallback;
 import org.alfresco.service.cmr.repository.ContentData;
 import org.alfresco.service.transaction.TransactionService;
 import org.alfresco.util.ApplicationContextHelper;
@@ -124,6 +125,13 @@ public class AuditDAOTest extends TestCase
     }
     
     public void testAuditEntry() throws Exception
+    {
+        doAuditEntryImpl(1000);
+    }
+    /**
+     * @return              Returns the name of the application
+     */
+    private String doAuditEntryImpl(final int count) throws Exception
     {
         final File file = AbstractContentTransformerTest.loadQuickTestFile("pdf");
         assertNotNull(file);
@@ -140,7 +148,6 @@ public class AuditDAOTest extends TestCase
         };
         final Long sessionId = txnHelper.doInTransaction(createAppCallback);
         
-        final int count = 1000;
         final String username = "alexi";
         RetryingTransactionCallback<Void> createEntryCallback = new RetryingTransactionCallback<Void>()
         {
@@ -161,5 +168,38 @@ public class AuditDAOTest extends TestCase
         System.out.println(
                 "Time for " + count + " entry creations was " +
                 ((double)(after - before)/(10E6)) + "ms");
+        // Done
+        return appName;
+    }
+    
+    public void testAuditQuery() throws Exception
+    {
+        // Some entries
+        doAuditEntryImpl(1);
+        
+        // Find everything, bug look for a specific key
+        final AuditQueryCallback callback = new AuditQueryCallback()
+        {
+            public boolean handleAuditEntry(
+                    Long entryId,
+                    String applicationName,
+                    String user,
+                    long time,
+                    Map<String, Serializable> values)
+            {
+                System.out.println(values);
+                return true;
+            }
+        };
+        
+        RetryingTransactionCallback<Void> findCallback = new RetryingTransactionCallback<Void>()
+        {
+            public Void execute() throws Throwable
+            {
+                auditDAO.findAuditEntries(callback, null, null, null, null, -1, "/a/b/c", null);
+                return null;
+            }
+        };
+        txnHelper.doInTransaction(findCallback);
     }
 }

source/java/org/alfresco/repo/domain/audit/AuditQueryParameters.java

@@ -41,6 +41,8 @@ public class AuditQueryParameters
     private Pair<String, Long> auditUserCrcPair;
     private Long auditFromTime;
     private Long auditToTime;
+    private String searchKey;
+    private String searchValueString;
     
     public AuditQueryParameters()
     {
@@ -56,6 +58,8 @@ public class AuditQueryParameters
           .append(", auditUserCrcPair=").append(auditUserCrcPair)
           .append(", auditFromTime").append(new Date(auditFromTime))
           .append(", auditToTime").append(new Date(auditToTime))
+          .append(", searchKey").append(searchKey)
+          .append(", searchValueString").append(searchValueString)
           .append("]");
         return sb.toString();
     }
@@ -119,4 +123,24 @@ public class AuditQueryParameters
     {
         this.auditToTime = to;
     }
+
+    public String getSearchKey()
+    {
+        return searchKey;
+    }
+
+    public void setSearchKey(String searchKey)
+    {
+        this.searchKey = searchKey;
+    }
+
+    public String getSearchValueString()
+    {
+        return searchValueString;
+    }
+
+    public void setSearchValueString(String searchValueString)
+    {
+        this.searchValueString = searchValueString;
+    }
 }

source/java/org/alfresco/repo/domain/audit/ibatis/AuditDAOImpl.java

@@ -155,11 +155,8 @@ public class AuditDAOImpl extends AbstractAuditDAOImpl
     @Override
     protected void findAuditEntries(
             final AuditQueryRowHandler rowHandler,
-            String appName,
-            String user,
-            Long from,
-            Long to,
-            int maxResults)
+            String appName, String user, Long from, Long to, int maxResults,
+            String searchKey, String searchString)
     {
         AuditQueryParameters params = new AuditQueryParameters();
         if (appName != null)
@@ -175,6 +172,8 @@ public class AuditDAOImpl extends AbstractAuditDAOImpl
         }
         params.setAuditFromTime(from);
         params.setAuditToTime(to);
+        params.setSearchKey(searchKey);
+        params.setSearchValueString(searchString);
         
         // RowHandlers in RowHandlers: See 'groupBy' issue https://issues.apache.org/jira/browse/IBATIS-503
         RowHandler shreddedRowHandler = new RowHandler()