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 HEAD (5.2) to 5.2.N (5.2.1)

Browse Source 
126481 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      122580 jvonka: Nodes (FileFolder) API - return isFile in node info (renamed from isContent) in addition to isFolder
      RA-828, RA-741


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126825 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ancuta Morarasu
2016-05-11 11:37:52 +00:00
parent 5690ddd7cc
commit fbe19dfc15
6 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/java/org/alfresco/rest/api/impl/NodesImpl.java
View File

@@ -705,7 +705,7 @@ public class NodesImpl implements Nodes
// might be sub-type of cm:cmobject (or a cm:link pointing to cm:cmobject or possibly even another cm:link)
node = new Node(nodeRef, parentNodeRef, properties, mapUserInfo, sr);
node.setIsFolder(false);
node.setIsContent(false);
node.setIsFile(false);
}
else if (type.equals(Type.DOCUMENT))
{

2
source/java/org/alfresco/rest/api/model/Document.java
View File

@@ -63,7 +63,7 @@ public class Document extends Node
}
setIsFolder(false);
setIsContent(true);
setIsFile(true);
}
@Override

2
source/java/org/alfresco/rest/api/model/Folder.java
View File

@@ -51,7 +51,7 @@ public class Folder extends Node
super(nodeRef, parentNodeRef, nodeProps, mapUserInfo, sr);
setIsFolder(true);
setIsContent(false);
setIsFile(false);
}
@Override

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

@@ -64,7 +64,7 @@ public class Node implements Comparable<Node>
protected UserInfo modifiedByUser;
protected Boolean isFolder;
protected Boolean isContent;
protected Boolean isFile;
protected Boolean isLink;
protected NodeRef parentNodeRef;
@@ -261,14 +261,14 @@ public class Node implements Comparable<Node>
this.isFolder = isFolder;
}
public Boolean getIsContent()
public Boolean getIsFile()
{
return isContent;
return isFile;
}
public void setIsContent(Boolean isContent)
public void setIsFile(Boolean isFile)
{
this.isContent = isContent;
this.isFile = isFile;
}
public Boolean getIsLink()
@@ -309,7 +309,7 @@ public class Node implements Comparable<Node>
return "Node [nodeRef=" + nodeRef + ", type=" + prefixTypeQName + ", name=" + name + ", title="
+ title + ", description=" + description + ", createdAt="
+ createdAt + ", modifiedAt=" + modifiedAt + ", createdByUser=" + createdByUser + ", modifiedBy="
+ modifiedByUser + ", isFolder =" + isFolder + ", isContent =" + isContent + ", pathInfo =" + pathInfo +"]";
+ modifiedByUser + ", isFolder =" + isFolder + ", isFile =" + isFile + ", pathInfo =" + pathInfo +"]";
}
// here to allow POST /nodes/{id}/children when creating empty file with specified content.mimeType

22
source/test-java/org/alfresco/rest/api/tests/NodeApiTest.java
View File

@@ -214,16 +214,16 @@ public class NodeApiTest extends AbstractBaseApiTest
assertEquals(4, nodes.size());
assertEquals(folder2, nodes.get(0).getName());
assertTrue(nodes.get(0).getIsFolder());
assertFalse(nodes.get(0).getIsContent());
assertFalse(nodes.get(0).getIsFile());
assertEquals(folder1, nodes.get(1).getName());
assertTrue(nodes.get(1).getIsFolder());
assertFalse(nodes.get(1).getIsContent());
assertFalse(nodes.get(1).getIsFile());
assertEquals(content2, nodes.get(2).getName());
assertFalse(nodes.get(2).getIsFolder());
assertTrue(nodes.get(2).getIsContent());
assertTrue(nodes.get(2).getIsFile());
assertEquals(content1, nodes.get(3).getName());
assertFalse(nodes.get(3).getIsFolder());
assertTrue(nodes.get(3).getIsContent());
assertTrue(nodes.get(3).getIsFile());
// Order by folders last and modified date first
orderBy = Collections.singletonMap("orderBy", "isFolder ASC,modifiedAt DESC");
@@ -408,11 +408,11 @@ public class NodeApiTest extends AbstractBaseApiTest
assertEquals(2, nodes.size());
assertTrue(nodes.get(0).getIsFolder());
assertFalse(nodes.get(0).getIsContent());
assertFalse(nodes.get(0).getIsFile());
assertTrue(folderIds.contains(nodes.get(0).getId()));
assertTrue(nodes.get(1).getIsFolder());
assertFalse(nodes.get(1).getIsContent());
assertFalse(nodes.get(1).getIsFile());
assertTrue(folderIds.contains(nodes.get(1).getId()));
// filtering, via where clause - content only
@@ -422,7 +422,7 @@ public class NodeApiTest extends AbstractBaseApiTest
nodes = jacksonUtil.parseEntries(response.getJsonResponse(), Document.class);
assertEquals(1, nodes.size());
assertFalse(nodes.get(0).getIsFolder());
assertTrue(nodes.get(0).getIsContent());
assertTrue(nodes.get(0).getIsFile());
assertTrue(contentIds.contains(nodes.get(0).getId()));
// list children via relativePath
@@ -569,7 +569,7 @@ public class NodeApiTest extends AbstractBaseApiTest
assertNotNull(myFilesNodeId);
assertEquals(user1, node.getName());
assertTrue(node.getIsFolder());
assertFalse(node.getIsContent());
assertFalse(node.getIsFile());
NodeRef myHomeNodeRef = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, myFilesNodeId);
NodeRef userHomesNodeRef = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, node.getParentId());
@@ -715,7 +715,7 @@ public class NodeApiTest extends AbstractBaseApiTest
assertNotNull(myFilesNodeId);
assertEquals(user1, node.getName());
assertTrue(node.getIsFolder());
assertFalse(node.getIsContent());
assertFalse(node.getIsFile());
assertNull(node.getPath()); // note: path can be optionally "select"'ed - see separate test
response = getSingle(NodesEntityResource.class, user1, Nodes.PATH_SHARED, null, 200);
@@ -724,7 +724,7 @@ public class NodeApiTest extends AbstractBaseApiTest
assertNotNull(sharedFilesNodeId);
assertEquals("Shared", node.getName());
assertTrue(node.getIsFolder());
assertFalse(node.getIsContent());
assertFalse(node.getIsFile());
assertNull(node.getPath());
//Delete user1's home
@@ -2009,7 +2009,7 @@ public class NodeApiTest extends AbstractBaseApiTest
assertNotNull(docResp.getModifiedAt());
assertNotNull(docResp.getModifiedByUser());
assertFalse(docResp.getIsFolder());
assertTrue(docResp.getIsContent());
assertTrue(docResp.getIsFile());
assertNull(docResp.getIsLink());
assertEquals("cm:content", docResp.getNodeType());
assertNotNull(docResp.getParentId());

12
source/test-java/org/alfresco/rest/api/tests/client/data/Node.java
View File

@@ -52,7 +52,7 @@ public class Node
protected UserInfo modifiedByUser;
protected Boolean isFolder;
protected Boolean isContent;
protected Boolean isFile;
protected Boolean isLink;
protected String parentId;
@@ -127,14 +127,14 @@ public class Node
this.isFolder = isFolder;
}
public Boolean getIsContent()
public Boolean getIsFile()
{
return isContent;
return isFile;
}
public void setIsContent(Boolean isContent)
public void setIsFile(Boolean isFile)
{
this.isContent = isContent;
this.isFile = isFile;
}
public Boolean getIsLink()
@@ -280,7 +280,7 @@ public class Node
}
AssertUtil.assertEquals("isFolder", isFolder, other.getIsFolder());
AssertUtil.assertEquals("isContent", isContent, other.getIsContent());
AssertUtil.assertEquals("isFile", isFile, other.getIsFile());
AssertUtil.assertEquals("isLink", isLink, other.getIsLink());
if (path != null) {