Merged 5.2.N (5.2.1) to HEAD (5.2)

129892 amorarasu: REPO-1155 / REPO-160 / REPO-340: Remove "includeChildren" option for Lock / Unlock in the rest api (REPO-1163)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130237 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-09-06 14:44:30 +00:00
parent 26a1e7b69f
commit a98859b185
7 changed files with 31 additions and 261 deletions

View File

@@ -38,7 +38,6 @@ import org.codehaus.jackson.annotate.JsonIgnoreProperties;
public class LockInfo
{
private Integer timeToExpire;
private Boolean includeChildren;
private LockType2 type;
private Lifetime lifetime;
@@ -77,16 +76,6 @@ public class LockInfo
return timeToExpire;
}
public void setIncludeChildren(Boolean includeChildren)
{
this.includeChildren = includeChildren;
}
public Boolean getIncludeChildren()
{
return includeChildren;
}
public LockType getMappedType()
{
return type != null ? type.getType() : null;
@@ -116,7 +105,6 @@ public class LockInfo
public String toString()
{
final StringBuilder sb = new StringBuilder("LockInfo{");
sb.append("includeChildren='").append(includeChildren).append('\'');
sb.append(", timeToExpire='").append(timeToExpire).append('\'');
sb.append(", type='").append(type).append('\'');
sb.append(", lifetime='").append(lifetime).append('\'');