inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-08 14:51:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

40
source/java/org/alfresco/repo/domain/contentdata/ContentDataDAO.java
View File

@@ -58,7 +58,7 @@ public interface ContentDataDAO
* Creates an immediately-orphaned content URL, if possible
*
* @param contentUrl the URL to create if it doesn't exist
* @parma orphanTime the recorded orphan time or <tt>null</tt> to apply the current time
* @param orphanTime the recorded orphan time or <tt>null</tt> to apply the current time
* @return Returns the ID-URL pair
* @throws DataIntegrityViolationException if the URL already exists
*/
@@ -136,6 +136,8 @@ public interface ContentDataDAO
* @return <tt>null</tt> if the url does not exist
*
* @since 5.0
* @param contentUrl
* @return
*/
ContentUrlEntity getContentUrl(String contentUrl);
@@ -145,6 +147,8 @@ public interface ContentDataDAO
* @return <tt>null</tt> if the url does not exist
*
* @since 5.0
* @param contentUrlId
* @return
*/
ContentUrlEntity getContentUrl(Long contentUrlId);
@@ -152,6 +156,7 @@ public interface ContentDataDAO
* Get a content URL or create one if it does not exist
*
* @since 5.1
* @param contentUrlEntity
*/
ContentUrlEntity getOrCreateContentUrl(String contentUrl);
@@ -159,31 +164,36 @@ public interface ContentDataDAO
* Updates the content key for the given content url
*
* @since 5.0
* @param contentUrl
* @param contentUrlKeyEntity
*/
boolean updateContentUrlKey(String contentUrl, ContentUrlKeyEntity contentUrlKeyEntity);
/**
* Updates the content key for the given content url
*
* @since 5.0
*/
boolean updateContentUrlKey(long contentUrlId, ContentUrlKeyEntity contentUrlKey);
*
* @since 5.0
* @param contentUrlId
*/
boolean updateContentUrlKey(long contentUrlId, ContentUrlKeyEntity contentUrlKey);
/**
* Get symmetric keys entities for symmetric keys that have been encrypted using the given
* master key, starting from 'fromId' and returning at most 'maxResults' entities.
*
* @since 5.0
* @param masterKeyAlias master key alias
* @param fromId id
* @param maxResults max results
*/
List<ContentUrlKeyEntity> getSymmetricKeysByMasterKeyAlias(String masterKeyAlias, long fromId, int maxResults);
* master key, starting from 'fromId' and returning at most 'maxResults' entities.
*
* @since 5.0
* @param masterKeyAlias master key alias
* @param fromId id
* @param maxResults max results
* @return
*/
List<ContentUrlKeyEntity> getSymmetricKeysByMasterKeyAlias(String masterKeyAlias, long fromId, int maxResults);
/**
* Count symmetric keys entities for symmetric keys for all master keys
*
* @since 5.0
* @return
*/
Map<String, Integer> countSymmetricKeysForMasterKeys();
@@ -192,6 +202,8 @@ public interface ContentDataDAO
* master key
*
* @since 5.0
* @param masterKeyAlias
* @return
*/
int countSymmetricKeysForMasterKeyAlias(String masterKeyAlias);
}