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

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

Browse Source 
84811: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      82464: ACE-1246 "Allow the customer to change the document encryption key"
      Encrypting content store


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85170 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
2014-09-20 08:36:54 +00:00
parent 0620f5019b
commit afe200fbd5
31 changed files with 1162 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
source/java/org/alfresco/repo/domain/contentdata/ContentDataEntity.java
View File

@@ -36,7 +36,6 @@ public class ContentDataEntity
private Long id;
private Long version;
private Long contentUrlId;
private String contentUrl;
private Long size;
private Long mimetypeId;
private Long encodingId;
@@ -45,8 +44,8 @@ public class ContentDataEntity
public ContentDataEntity()
{
}
@Override
@Override
public int hashCode()
{
return (id == null ? 0 : id.hashCode());
@@ -69,15 +68,14 @@ public class ContentDataEntity
return false;
}
}
@Override
@Override
public String toString()
{
StringBuilder sb = new StringBuilder(512);
sb.append("ContentDataEntity")
.append("[ ID=").append(id)
.append(", contentUrlId=").append(contentUrlId)
.append(", contentUrl=").append(contentUrl)
.append(", size=").append(size)
.append(", mimetype=").append(mimetypeId)
.append(", encoding=").append(encodingId)
@@ -128,16 +126,6 @@ public class ContentDataEntity
this.contentUrlId = contentUrlId;
}
public String getContentUrl()
{
return contentUrl;
}
public void setContentUrl(String contentUrl)
{
this.contentUrl = contentUrl;
}
public Long getSize()
{
return size;