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/BRANCHES/DEV/5.2.N/root@130271 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gethin James
2016-09-06 15:27:33 +00:00
parent 59a1186522
commit 3596c251a8
2 changed files with 4 additions and 14 deletions

View File

@@ -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;