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

@@ -67,13 +67,13 @@ public interface NodeDAO extends NodeBulkLoader
/*
* Transaction
*/
/**
* @param ensureNew <tt>true</tt> to ensure that a new transaction entry is created
* if the current transaction does not have one.
* @return Returns the ID of the current transaction entry or <tt>null</tt> if
* there have not been any modifications to nodes registered in the
*/
/**
* @param ensureNew <tt>true</tt> to ensure that a new transaction entry is created
* if the current transaction does not have one.
* @return Returns the ID of the current transaction entry or <tt>null</tt> if
* there have not been any modifications to nodes registered in the
* transaction and <tt>forceNew</tt> is <tt>false</tt>
*/
public Long getCurrentTransactionId(boolean ensureNew);
@@ -190,7 +190,7 @@ public interface NodeDAO extends NodeBulkLoader
* @param storeRef the store to which the node must belong
* @param uuid the node store-unique identifier, or <tt>null</tt> to assign a GUID
* @param nodeTypeQName the type of the node
* @parma nodeLocale the locale of the node
* @param nodeLocale the locale of the node
* @param childNodeName the <b>cm:name</b> of the child node or <tt>null</tt> to use the node's UUID
* @param auditableProperties a map containing any <b>cm:auditable</b> properties for the node
* @return Returns the details of the child association created
@@ -349,13 +349,13 @@ public interface NodeDAO extends NodeBulkLoader
/**
* Pull the <b>cm:modified</b> up to the current time without changing any other
* <b>cm:auditable</b> properties. The change may be done in the current transaction
* or in a later transaction.
*
* @param nodeId the node to change
* @param date the date to set for <b>cm:modified</b>
* @return Returns <tt>true</tt> if the <b>cm:modified</b> property was actually set
* @deprecated Use {@link #setModifiedProperties(Long, Date, String)} to also change the <b>cm:modifier</b> property
*/
* or in a later transaction.
*
* @param nodeId the node to change
* @param date the date to set for <b>cm:modified</b>
* @return Returns <tt>true</tt> if the <b>cm:modified</b> property was actually set
* @deprecated Use {@link #setModifiedProperties(Long, Date, String)} to also change the <b>cm:modifier</b> property
*/
public boolean setModifiedDate(Long nodeId, Date date);
/**
@@ -419,15 +419,15 @@ public interface NodeDAO extends NodeBulkLoader
*/
public void setNodeAssocIndex(Long id, int assocIndex);
/**
* Remove a specific node association
*
* @param sourceNodeId the source node ID
* @param targetNodeId the target node id
* @param assocTypeQName the node association QName
* @return Returns the number of associations removed
*/
public int removeNodeAssoc(Long sourceNodeId, Long targetNodeId, QName assocTypeQName);
/**
* Remove a specific node association
*
* @param sourceNodeId the source node ID
* @param targetNodeId the target node id
* @param assocTypeQName the node association QName
* @return Returns the number of associations removed
*/
public int removeNodeAssoc(Long sourceNodeId, Long targetNodeId, QName assocTypeQName);
/**
* Remove all node associations of given IDs
@@ -532,13 +532,13 @@ public interface NodeDAO extends NodeBulkLoader
* Sets the association index ordering.
*
* @param parentNodeId the parent node ID
* @param childNodeId the child node ID
* @param assocTypeQName the association type
* @param assocQName the association path qualified name
* @param index the new index
* @return Returns the number of associations modified
*/
public int setChildAssocIndex(
* @param childNodeId the child node ID
* @param assocTypeQName the association type
* @param assocQName the association path qualified name
* @param index the new index
* @return Returns the number of associations modified
*/
public int setChildAssocIndex(
Long parentNodeId,
Long childNodeId,
QName assocTypeQName,
@@ -615,7 +615,6 @@ public interface NodeDAO extends NodeBulkLoader
* @param maxResults the maximum number of results to return. The query will be terminated efficiently
* after that number of results
* @param resultsCallback the callback that will be called with the results
* @return a list of child associations
*/
public void getChildAssocs(
Long parentNodeId,
@@ -723,13 +722,13 @@ public interface NodeDAO extends NodeBulkLoader
/**
* Build the paths for a node.
*
* When searching for <code>primaryOnly == true</code>, checks that there is exactly
* one path.
*
* @param nodePair the leave or child node to start with
* @param primaryOnly <tt>true</tt> to follow only primary parent associations
*/
public List<Path> getPaths(Pair<Long, NodeRef> nodePair, boolean primaryOnly) throws InvalidNodeRefException;
* When searching for <code>primaryOnly == true</code>, checks that there is exactly
* one path.
*
* @param nodePair the leave or child node to start with
* @param primaryOnly <tt>true</tt> to follow only primary parent associations
*/
public List<Path> getPaths(Pair<Long, NodeRef> nodePair, boolean primaryOnly) throws InvalidNodeRefException;
/**
* Perform a check for cyclic relationships
@@ -808,7 +807,7 @@ public interface NodeDAO extends NodeBulkLoader
* @param fromCommitTime delete unused transactions from commit time
* @param toCommitTime delete unused transactions to commit time
*
* @return
* @return int
*/
public int deleteTxnsUnused(long fromCommitTime, long toCommitTime);