Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)

118728 jvonka: RA-613 / RA-655
   - fix for TestFavourites failure (+ related backwards compat' for Favorites API response format)


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

source/java/org/alfresco/rest/api/model/Document.java

@@ -37,11 +37,6 @@ import org.alfresco.service.namespace.QName;
  */
 public class Document extends Node
 {
-    // TODO backward compat' - favourites etc
-	private String mimeType;
-	private BigInteger sizeInBytes;
-    private String versionLabel;
-
     private ContentInfo contentInfo;
 
     public Document() {
@@ -60,25 +55,8 @@ public class Document extends Node
             String mimeTypeName = sr.getMimetypeService().getDisplaysByMimetype().get(mimeType);
             this.contentInfo = new ContentInfo(mimeType, mimeTypeName, cd.getSize(), cd.getEncoding());
         }
-
-        //this.versionLabel = (String)nodeProps.get(ContentModel.PROP_VERSION_LABEL);
     }
 
-	public String getMimeType()
-	{
-		return mimeType;
-	}
-
-	public BigInteger getSizeInBytes()
-	{
-		return sizeInBytes;
-	}
-
-	public String getVersionLabel()
-	{
-		return versionLabel;
-	}
-
 	public Boolean getIsFolder()
 	{
 		return false;
@@ -97,4 +75,58 @@ public class Document extends Node
 				+ ", modifiedAt=" + modifiedAt + ", createdBy=" + createdBy
 				+ ", modifiedBy=" + modifiedBy + "]";
 	}
+
+	// TODO for backwards compat' - set explicitly when needed (ie. favourites)
+	private String mimeType;
+	private BigInteger sizeInBytes;
+	private String versionLabel;
+
+	/**
+	 * @deprecated
+     */
+	public String getMimeType()
+	{
+		return mimeType;
+	}
+
+	/**
+	 * @deprecated
+	 */
+	public BigInteger getSizeInBytes()
+	{
+		return sizeInBytes;
+	}
+
+	/**
+	 * @deprecated
+	 */
+	public String getVersionLabel()
+	{
+		return versionLabel;
+	}
+
+	/**
+	 * @deprecated
+	 */
+	public void setMimeType(String mimeType)
+	{
+		this.mimeType = mimeType;
+	}
+
+	/**
+	 * @deprecated
+	 */
+	public void setSizeInBytes(BigInteger sizeInBytes)
+	{
+		this.sizeInBytes = sizeInBytes;
+	}
+
+	/**
+	 * @deprecated
+	 */
+	public void setVersionLabel(String versionLabel)
+	{
+		this.versionLabel = versionLabel;
+	}
+
 }