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

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

Browse Source 
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
This commit is contained in:
Jamal Kaabi-Mofrad
2016-05-10 10:26:50 +00:00
parent 17012b17b6
commit 09eac586f6
3 changed files with 169 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

132
source/java/org/alfresco/rest/api/model/Node.java
View File

@@ -45,13 +45,6 @@ public class Node implements Comparable<Node>
protected NodeRef nodeRef;
protected String name;
// TODO needed for favourties - backwards compat' - we could also choose to split of NodeInfo / Node impl's etc
protected String title;
protected NodeRef guid;
protected String description;
protected String createdBy;
protected String modifiedBy;
protected Date createdAt;
protected Date modifiedAt;
protected UserInfo createdByUser;
@@ -77,7 +70,7 @@ public class Node implements Comparable<Node>
this.nodeRef = nodeRef;
this.parentNodeRef = parentNodeRef;
mapBasicInfo(nodeProps, sr);
mapMinimalInfo(nodeProps, sr);
}
protected Object getValue(Map<String, PropertyData<?>> props, String name)
@@ -91,7 +84,7 @@ public class Node implements Comparable<Node>
{
}
protected void mapBasicInfo(Map<QName, Serializable> nodeProps, ServiceRegistry sr)
protected void mapMinimalInfo(Map<QName, Serializable> nodeProps, ServiceRegistry sr)
{
PersonService personService = sr.getPersonService();
@@ -126,20 +119,6 @@ public class Node implements Comparable<Node>
}
}
public void setGuid(NodeRef guid)
{
this.guid = guid;
}
public NodeRef getGuid() {
return guid;
}
public String getTitle()
{
return title;
}
@UniqueId
public NodeRef getNodeRef()
{
@@ -166,11 +145,6 @@ public class Node implements Comparable<Node>
return modifiedAt;
}
public String getModifiedBy()
{
return modifiedBy;
}
public UserInfo getModifiedByUser() {
return modifiedByUser;
}
@@ -179,11 +153,6 @@ public class Node implements Comparable<Node>
return createdByUser;
}
public String getDescription()
{
return description;
}
public String getName()
{
return this.name;
@@ -194,16 +163,6 @@ public class Node implements Comparable<Node>
this.name = name;
}
public String getCreatedBy()
{
return this.createdBy;
}
public void setCreatedBy(String createdBy)
{
this.createdBy = createdBy;
}
public PathInfo getPath()
{
return pathInfo;
@@ -275,4 +234,91 @@ public class Node implements Comparable<Node>
+ createdAt + ", modifiedAt=" + modifiedAt + ", createdByUser=" + createdByUser + ", modifiedBy="
+ modifiedByUser + ", pathInfo =" + pathInfo +"]";
}
// TODO for backwards compat' - set explicitly when needed (ie. favourites) (note: we could choose to have separate old Node/NodeImpl etc)
protected String title;
protected NodeRef guid;
protected String description;
protected String createdBy;
protected String modifiedBy;
/**
* @deprecated
*/
public NodeRef getGuid() {
return guid;
}
/**
* @deprecated
*/
public void setGuid(NodeRef guid)
{
this.guid = guid;
}
/**
* @deprecated
*/
public String getTitle()
{
return title;
}
/**
* @deprecated
*/
public void setTitle(String title)
{
this.title = title;
}
/**
* @deprecated
*/
public String getDescription()
{
return description;
}
/**
* @deprecated
*/
public void setDescription(String description)
{
this.description = description;
}
/**
* @deprecated
*/
public String getCreatedBy()
{
return this.createdBy;
}
/**
* @deprecated
*/
public void setCreatedBy(String createdBy)
{
this.createdBy = createdBy;
}
/**
* @deprecated
*/
public String getModifiedBy()
{
return modifiedBy;
}
/**
* @deprecated
*/
public void setModifiedBy(String modifiedBy)
{
this.modifiedBy = modifiedBy;
}
}