From ca15a2f6fb85a31baa31c8ea2cbb43760e89698d Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Tue, 6 Sep 2016 22:07:18 +0000
Subject: [PATCH] Merged 5.2.N (5.2.1) to HEAD (5.2)    130271 gjames: Merged
 searchapi (5.2.1) to 5.2.N (5.2.1)       130008 gjames: Merged 5.2.N-AHIND
 (5.2.1) to searchapi (5.2.1)          129751 amorarasu: REPO-164 / REPO-1086
 - V1 REST API: Lock Node             - review suggestions             - added
 more test cases + utility methods

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130348 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 source/java/org/alfresco/rest/api/Nodes.java          | 10 ----------
 source/java/org/alfresco/rest/api/model/LockInfo.java |  8 ++++----
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/source/java/org/alfresco/rest/api/Nodes.java b/source/java/org/alfresco/rest/api/Nodes.java
index 0aaf0fd772..46ee98ef89 100644
--- a/source/java/org/alfresco/rest/api/Nodes.java
+++ b/source/java/org/alfresco/rest/api/Nodes.java
@@ -36,7 +36,6 @@ import org.alfresco.rest.api.model.Document;
 import org.alfresco.rest.api.model.Folder;
 import org.alfresco.rest.api.model.LockInfo;
 import org.alfresco.rest.api.model.Node;
-import org.alfresco.rest.api.model.UnlockInfo;
 import org.alfresco.rest.api.model.UserInfo;
 import org.alfresco.rest.framework.resource.content.BasicContentInfo;
 import org.alfresco.rest.framework.resource.content.BinaryResource;
@@ -256,15 +255,6 @@ public interface Nodes
      */
     Node lock(String nodeId, LockInfo lockInfo, Parameters parameters);
     
-    /**
-     * Unlock a node
-     * @param nodeId
-     * @param unlockInfo
-     * @param parameters
-     * @return
-     */
-    Node unlock(String nodeId, UnlockInfo unlockInfo, Parameters parameters);
-
     /**
      * Unlock a node
      * @param nodeId
diff --git a/source/java/org/alfresco/rest/api/model/LockInfo.java b/source/java/org/alfresco/rest/api/model/LockInfo.java
index 47351c8f4c..72bfbeb1f9 100644
--- a/source/java/org/alfresco/rest/api/model/LockInfo.java
+++ b/source/java/org/alfresco/rest/api/model/LockInfo.java
@@ -48,8 +48,8 @@ public class LockInfo
     @SuppressWarnings("deprecation")
     public static enum LockType2
     {
-        FULL(LockType.READ_ONLY_LOCK), 
-        ALLOW_OWNER_CHANGES(LockType.WRITE_LOCK); 
+        FULL(LockType.READ_ONLY_LOCK),
+        ALLOW_OWNER_CHANGES(LockType.WRITE_LOCK);
         // ALLOW_ADD_CHILDREN(LockType.NODE_LOCK); // removed for now, as per REPO-1187
         
         private LockType type;
@@ -58,7 +58,7 @@ public class LockInfo
         {
             this.type = type;
         }
-        
+
         public LockType getType()
         {
             return type;
@@ -81,7 +81,7 @@ public class LockInfo
     {
         return type != null ? type.getType() : null;
     }
-    
+
     public LockType2 getType()
     {
         return type;