From fc1491bafbed8dc94c1859b4d8c41adcc536e82f Mon Sep 17 00:00:00 2001
From: Andreea Nechifor <Andreea.Nechifor@ness.com>
Date: Tue, 20 Feb 2018 14:02:13 +0200
Subject: [PATCH] REPO-210: changes after review.

---
 .../org/alfresco/rest/api/impl/NodesImpl.java |  8 +++----
 .../org/alfresco/rest/api/model/Node.java     | 12 +++++-----
 .../rest/api/tests/TestFavourites.java        |  7 +++---
 .../rest/api/tests/client/data/Node.java      | 22 +++++++++----------
 4 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/src/main/java/org/alfresco/rest/api/impl/NodesImpl.java b/src/main/java/org/alfresco/rest/api/impl/NodesImpl.java
index a4a50ea71a..34c2739d03 100644
--- a/src/main/java/org/alfresco/rest/api/impl/NodesImpl.java
+++ b/src/main/java/org/alfresco/rest/api/impl/NodesImpl.java
@@ -809,7 +809,7 @@ public class NodesImpl implements Nodes
         String path = parameters.getParameter(PARAM_RELATIVE_PATH);
         NodeRef nodeRef = validateOrLookupNode(nodeId, path);
         Node node = getFolderOrDocumentFullInfo(nodeRef, null, null, parameters);
-        node.setFavorite(isFavorite(node));
+        node.setIsFavorite(isFavorite(node));
         return node;
 
     }
@@ -1322,7 +1322,7 @@ public class NodesImpl implements Nodes
                     calculateRelativePath(parentFolderNodeId, node);
                 }
 
-                node.setFavorite(isFavorite(node));
+                node.setIsFavorite(isFavorite(node));
                 return node;
             }
 
@@ -1372,9 +1372,7 @@ public class NodesImpl implements Nodes
         {
             sourceEntity = getFolderOrDocumentFullInfo(parentNodeRef, null, null, null, mapUserInfo);
         }
-
-          
-        
+ 
         return CollectionWithPagingInfo.asPaged(paging, nodes, pagingResults.hasMoreItems(), pagingResults.getTotalResultCount().getFirst(), sourceEntity);
     }
 
diff --git a/src/main/java/org/alfresco/rest/api/model/Node.java b/src/main/java/org/alfresco/rest/api/model/Node.java
index 650025742b..2532c27755 100644
--- a/src/main/java/org/alfresco/rest/api/model/Node.java
+++ b/src/main/java/org/alfresco/rest/api/model/Node.java
@@ -99,7 +99,7 @@ public class Node implements Comparable<Node>
     //optional SearchEntry (only ever returned from a search)
     protected SearchEntry search = null;
     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)
     {
@@ -332,15 +332,15 @@ public class Node implements Comparable<Node>
     {
         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()
diff --git a/src/test/java/org/alfresco/rest/api/tests/TestFavourites.java b/src/test/java/org/alfresco/rest/api/tests/TestFavourites.java
index 0f7e95232f..3229d5221f 100644
--- a/src/test/java/org/alfresco/rest/api/tests/TestFavourites.java
+++ b/src/test/java/org/alfresco/rest/api/tests/TestFavourites.java
@@ -1886,8 +1886,7 @@ public class TestFavourites extends AbstractBaseApiTest
         assertNotNull("There should be a site JSON object.", siteJsonObject);
         assertNull("Path info should not be returned for sites.", siteJsonObject.get("path"));
     }
-    
-    
+        
     @Test
     public void testVerifyFavorite() throws Exception
     {
@@ -1908,10 +1907,10 @@ public class TestFavourites extends AbstractBaseApiTest
         HttpResponse response = getAll(getNodeChildrenUrl(folderNodeRef.getId()), null, null, 200);
         List<Node> nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
         assertTrue(nodes.size() == 1);
-        assertTrue(nodes.get(0).getFavorite());
+        assertTrue(nodes.get(0).getIsFavorite());
         response = getAll(getNode(nodeRef1.getId()), null, null, 200);
         Node node1 = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
-        assertTrue(node1.getFavorite());
+        assertTrue(node1.getIsFavorite());
     }
 
     private void assertPathInfo(PathInfo expectedPathInfo, String expectedPathName, boolean expectedIsComplete)
diff --git a/src/test/java/org/alfresco/rest/api/tests/client/data/Node.java b/src/test/java/org/alfresco/rest/api/tests/client/data/Node.java
index b2d47a249b..ff191acaed 100644
--- a/src/test/java/org/alfresco/rest/api/tests/client/data/Node.java
+++ b/src/test/java/org/alfresco/rest/api/tests/client/data/Node.java
@@ -87,17 +87,7 @@ public class Node
 
     protected SearchResultEntry search;
     
-    protected Boolean favorite;
-
-    public Boolean getFavorite()
-    {
-        return favorite;
-    }
-
-    public void setFavorite(Boolean favorite)
-    {
-        this.favorite = favorite;
-    }
+    protected Boolean isFavorite;
 
     public Node()
     {
@@ -356,6 +346,16 @@ public class Node
     {
         this.search = search;
     }
+    
+    public Boolean getIsFavorite()
+    {
+        return isFavorite;
+    }
+
+    public void setIsFavorite(Boolean isFavorite)
+    {
+        this.isFavorite = isFavorite;
+    }
 
     public void expected(Object o)
     {