Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

107541: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
      107413: Merged DEV to 5.0.N (5.0.3)
         106858 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Cleaning of Javadoc,
   107565: MNT-13545 Fix compilation after merge of Javadoc


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@107633 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tatyana Valkevych
2015-07-02 16:13:03 +00:00
parent 4c30e52dc3
commit 7dd2291753
784 changed files with 5454 additions and 5487 deletions

View File

@@ -57,13 +57,13 @@ public interface CannedQueryDAO
*
* @param <R> the return value's type
* @param sqlNamespace the query namespace (defined by config file) e.g. <b>alfresco.query.usage</b>
* @param queryName the name of the query e.g. <b>select_userCount</b>
* @param parameterObj the values to drive the selection (may be <tt>null</tt> if not required)
* @return the unique result (never <tt>null</tt>)
* @throws IllegalArgumentException concurrency-related exception if a single object was not found
*/
<R> R executeQueryUnique(String sqlNamespace, String queryName, Object parameterObj);
* @param queryName the name of the query e.g. <b>select_userCount</b>
* @param parameterObj the values to drive the selection (may be <tt>null</tt> if not required)
* @return the unique result (never <tt>null</tt>)
* @throws IllegalArgumentException concurrency-related exception if a single object was not found
*/
<R> R executeQueryUnique(String sqlNamespace, String queryName, Object parameterObj);
/**
* Execute a query that returns one or more results.
*
@@ -90,7 +90,6 @@ public interface CannedQueryDAO
* @param offset the number of results to skip
* @param limit the maximum number of results to retrieve or <code>Integer.MAX_VALUE</code>
* for no limit
* @return the list of results
*/
<R> void executeQuery(
String sqlNamespace,