diff --git a/source/java/org/alfresco/rest/api/impl/NodesImpl.java b/source/java/org/alfresco/rest/api/impl/NodesImpl.java index d622e52e54..96f5a5d615 100644 --- a/source/java/org/alfresco/rest/api/impl/NodesImpl.java +++ b/source/java/org/alfresco/rest/api/impl/NodesImpl.java @@ -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)) { diff --git a/source/java/org/alfresco/rest/api/model/Document.java b/source/java/org/alfresco/rest/api/model/Document.java index c2008e9b2c..98eeb52276 100644 --- a/source/java/org/alfresco/rest/api/model/Document.java +++ b/source/java/org/alfresco/rest/api/model/Document.java @@ -63,7 +63,7 @@ public class Document extends Node } setIsFolder(false); - setIsContent(true); + setIsFile(true); } @Override diff --git a/source/java/org/alfresco/rest/api/model/Folder.java b/source/java/org/alfresco/rest/api/model/Folder.java index 29e14a5667..82f6b203b3 100644 --- a/source/java/org/alfresco/rest/api/model/Folder.java +++ b/source/java/org/alfresco/rest/api/model/Folder.java @@ -51,7 +51,7 @@ public class Folder extends Node super(nodeRef, parentNodeRef, nodeProps, mapUserInfo, sr); setIsFolder(true); - setIsContent(false); + setIsFile(false); } @Override diff --git a/source/java/org/alfresco/rest/api/model/Node.java b/source/java/org/alfresco/rest/api/model/Node.java index a1d25cfd7d..29c01a8040 100644 --- a/source/java/org/alfresco/rest/api/model/Node.java +++ b/source/java/org/alfresco/rest/api/model/Node.java @@ -64,7 +64,7 @@ public class Node implements Comparable 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 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 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 diff --git a/source/test-java/org/alfresco/rest/api/tests/NodeApiTest.java b/source/test-java/org/alfresco/rest/api/tests/NodeApiTest.java index 73abf6090a..a4e47de3dc 100644 --- a/source/test-java/org/alfresco/rest/api/tests/NodeApiTest.java +++ b/source/test-java/org/alfresco/rest/api/tests/NodeApiTest.java @@ -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()); diff --git a/source/test-java/org/alfresco/rest/api/tests/client/data/Node.java b/source/test-java/org/alfresco/rest/api/tests/client/data/Node.java index f48029ab8b..4aba8de7b4 100644 --- a/source/test-java/org/alfresco/rest/api/tests/client/data/Node.java +++ b/source/test-java/org/alfresco/rest/api/tests/client/data/Node.java @@ -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) {