From b04cef45d1e8e4e407bfc0e30a13364aa417c95a Mon Sep 17 00:00:00 2001
From: Ancuta Morarasu <ancuta.morarasu@ness.com>
Date: Tue, 23 Aug 2016 20:24:18 +0000
Subject: [PATCH] REPO-340 / REPO-1136 - V1 REST API: Unlock Node    - Removed
 the allowCheckedOut option from the unlock body

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129804 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../org/alfresco/rest/api/impl/NodesImpl.java |  7 +-----
 .../alfresco/rest/api/model/UnlockInfo.java   | 22 +++++++++----------
 .../alfresco/rest/api/tests/NodeApiTest.java  |  3 ---
 3 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/source/java/org/alfresco/rest/api/impl/NodesImpl.java b/source/java/org/alfresco/rest/api/impl/NodesImpl.java
index 4d3682fc21..26bc6d4691 100644
--- a/source/java/org/alfresco/rest/api/impl/NodesImpl.java
+++ b/source/java/org/alfresco/rest/api/impl/NodesImpl.java
@@ -2991,12 +2991,7 @@ public class NodesImpl implements Nodes
         {
             unlockInfo.setIncludeChildren(false);
         }
-        if (unlockInfo.getAllowCheckedOut() == null)
-        {
-            unlockInfo.setAllowCheckedOut(false);
-        }
-        
-        lockService.unlock(nodeRef, unlockInfo.getIncludeChildren(), unlockInfo.getAllowCheckedOut());
+        lockService.unlock(nodeRef, unlockInfo.getIncludeChildren());
         return getFolderOrDocument(nodeId, parameters);
     }
 
diff --git a/source/java/org/alfresco/rest/api/model/UnlockInfo.java b/source/java/org/alfresco/rest/api/model/UnlockInfo.java
index 74b7b36a7f..b16e51c045 100644
--- a/source/java/org/alfresco/rest/api/model/UnlockInfo.java
+++ b/source/java/org/alfresco/rest/api/model/UnlockInfo.java
@@ -34,7 +34,7 @@ package org.alfresco.rest.api.model;
 public class UnlockInfo
 {
     private Boolean includeChildren;
-    private Boolean allowCheckedOut;
+//    private Boolean allowCheckedOut;
     
     public UnlockInfo() {}
 
@@ -47,14 +47,14 @@ public class UnlockInfo
     {
         this.includeChildren = includeChildren;
     }
-
-    public Boolean getAllowCheckedOut()
-    {
-        return allowCheckedOut;
-    }
-
-    public void setAllowCheckedOut(Boolean allowCheckedOut)
-    {
-        this.allowCheckedOut = allowCheckedOut;
-    }
+//
+//    public Boolean getAllowCheckedOut()
+//    {
+//        return allowCheckedOut;
+//    }
+//
+//    public void setAllowCheckedOut(Boolean allowCheckedOut)
+//    {
+//        this.allowCheckedOut = allowCheckedOut;
+//    }
 }
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 c7ce5fbd78..84f603c2e1 100644
--- a/source/test-java/org/alfresco/rest/api/tests/NodeApiTest.java
+++ b/source/test-java/org/alfresco/rest/api/tests/NodeApiTest.java
@@ -87,7 +87,6 @@ import org.alfresco.service.cmr.security.PermissionService;
 import org.alfresco.service.cmr.site.SiteVisibility;
 import org.alfresco.util.GUID;
 import org.alfresco.util.TempFileProvider;
-import org.apache.http.HttpStatus;
 import org.json.simple.JSONObject;
 import org.junit.After;
 import org.junit.Before;
@@ -3786,7 +3785,6 @@ public class NodeApiTest extends AbstractSingleNetworkSiteTest
 
        UnlockInfo unlockInfo = new UnlockInfo();
        unlockInfo.setIncludeChildren(true);
-       unlockInfo.setAllowCheckedOut(true);
 
        HttpResponse response = post(getNodeOperationUrl(d1Id, "unlock"), toJsonAsStringNonNull(unlockInfo), null, 200);
        Document documentResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
@@ -3910,7 +3908,6 @@ public class NodeApiTest extends AbstractSingleNetworkSiteTest
        // Unlock folder and children
        UnlockInfo unlockInfo = new UnlockInfo();
        unlockInfo.setIncludeChildren(true);
-       unlockInfo.setAllowCheckedOut(true);
        post(getNodeOperationUrl(folderAId, "unlock"), toJsonAsStringNonNull(unlockInfo), null, 200);
 
        params = Collections.singletonMap("include", "aspectNames,properties,isLocked");