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

REPO-210: changes after review.

Browse Source
This commit is contained in:
Andreea Nechifor
2018-02-20 14:02:13 +02:00
parent c2e25f75c2
commit fc1491bafb
4 changed files with 23 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/org/alfresco/rest/api/impl/NodesImpl.java
View File

@@ -809,7 +809,7 @@ public class NodesImpl implements Nodes
String path = parameters.getParameter(PARAM_RELATIVE_PATH); String path = parameters.getParameter(PARAM_RELATIVE_PATH);
NodeRef nodeRef = validateOrLookupNode(nodeId, path); NodeRef nodeRef = validateOrLookupNode(nodeId, path);
Node node = getFolderOrDocumentFullInfo(nodeRef, null, null, parameters); Node node = getFolderOrDocumentFullInfo(nodeRef, null, null, parameters);
node.setFavorite(isFavorite(node)); node.setIsFavorite(isFavorite(node));
return node; return node;
} }
@@ -1322,7 +1322,7 @@ public class NodesImpl implements Nodes
calculateRelativePath(parentFolderNodeId, node); calculateRelativePath(parentFolderNodeId, node);
} }
node.setFavorite(isFavorite(node)); node.setIsFavorite(isFavorite(node));
return node; return node;
} }
@@ -1372,9 +1372,7 @@ public class NodesImpl implements Nodes
{ {
sourceEntity = getFolderOrDocumentFullInfo(parentNodeRef, null, null, null, mapUserInfo); sourceEntity = getFolderOrDocumentFullInfo(parentNodeRef, null, null, null, mapUserInfo);
} }
return CollectionWithPagingInfo.asPaged(paging, nodes, pagingResults.hasMoreItems(), pagingResults.getTotalResultCount().getFirst(), sourceEntity); return CollectionWithPagingInfo.asPaged(paging, nodes, pagingResults.hasMoreItems(), pagingResults.getTotalResultCount().getFirst(), sourceEntity);
} }

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

@@ -99,7 +99,7 @@ public class Node implements Comparable<Node>
//optional SearchEntry (only ever returned from a search) //optional SearchEntry (only ever returned from a search)
protected SearchEntry search = null; protected SearchEntry search = null;
protected String location; protected String location;
private Boolean favorite; protected Boolean isFavorite;
public Node(NodeRef nodeRef, NodeRef parentNodeRef, Map<QName, Serializable> nodeProps, Map<String, UserInfo> mapUserInfo, ServiceRegistry sr) public Node(NodeRef nodeRef, NodeRef parentNodeRef, Map<QName, Serializable> nodeProps, Map<String, UserInfo> mapUserInfo, ServiceRegistry sr)
{ {
@@ -332,15 +332,15 @@ public class Node implements Comparable<Node>
{ {
this.isLocked = isLocked; this.isLocked = isLocked;
} }
public Boolean getFavorite() public Boolean getIsFavorite()
{ {
return favorite; return isFavorite;
} }
public void setFavorite(Boolean favorite) public void setIsFavorite(Boolean isFavorite)
{ {
this.favorite = favorite; this.isFavorite = isFavorite;
} }
public List<String> getAllowableOperations() public List<String> getAllowableOperations()

7
src/test/java/org/alfresco/rest/api/tests/TestFavourites.java
View File

@@ -1886,8 +1886,7 @@ public class TestFavourites extends AbstractBaseApiTest
assertNotNull("There should be a site JSON object.", siteJsonObject); assertNotNull("There should be a site JSON object.", siteJsonObject);
assertNull("Path info should not be returned for sites.", siteJsonObject.get("path")); assertNull("Path info should not be returned for sites.", siteJsonObject.get("path"));
} }
@Test @Test
public void testVerifyFavorite() throws Exception public void testVerifyFavorite() throws Exception
{ {
@@ -1908,10 +1907,10 @@ public class TestFavourites extends AbstractBaseApiTest
HttpResponse response = getAll(getNodeChildrenUrl(folderNodeRef.getId()), null, null, 200); HttpResponse response = getAll(getNodeChildrenUrl(folderNodeRef.getId()), null, null, 200);
List<Node> nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class); List<Node> nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
assertTrue(nodes.size() == 1); assertTrue(nodes.size() == 1);
assertTrue(nodes.get(0).getFavorite()); assertTrue(nodes.get(0).getIsFavorite());
response = getAll(getNode(nodeRef1.getId()), null, null, 200); response = getAll(getNode(nodeRef1.getId()), null, null, 200);
Node node1 = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class); Node node1 = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
assertTrue(node1.getFavorite()); assertTrue(node1.getIsFavorite());
} }
private void assertPathInfo(PathInfo expectedPathInfo, String expectedPathName, boolean expectedIsComplete) private void assertPathInfo(PathInfo expectedPathInfo, String expectedPathName, boolean expectedIsComplete)

22
src/test/java/org/alfresco/rest/api/tests/client/data/Node.java
View File

@@ -87,17 +87,7 @@ public class Node
protected SearchResultEntry search; protected SearchResultEntry search;
protected Boolean favorite; protected Boolean isFavorite;
public Boolean getFavorite()
{
return favorite;
}
public void setFavorite(Boolean favorite)
{
this.favorite = favorite;
}
public Node() public Node()
{ {
@@ -356,6 +346,16 @@ public class Node
{ {
this.search = search; this.search = search;
} }
public Boolean getIsFavorite()
{
return isFavorite;
}
public void setIsFavorite(Boolean isFavorite)
{
this.isFavorite = isFavorite;
}
public void expected(Object o) public void expected(Object o)
{ {