inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
129184 mmuller: Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1)
      128681 jvonka: V1 REST API: version history - add api sanity check for auto-version on metadata-only updates
      REPO-348, REPO-313, REPO-905


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@129358 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alexandru Epure
2016-08-09 14:15:11 +00:00
parent 9cba5fc5b5
commit dbf2ae6c03
5 changed files with 153 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
source/java/org/alfresco/rest/api/impl/NodesImpl.java
View File

@@ -1611,8 +1611,27 @@ public class NodesImpl implements Nodes
assocTypeQName = getAssocType(nodeInfo.getAssociation().getAssocType());
}
Boolean versionMajor = null;
String str = parameters.getParameter(PARAM_VERSION_MAJOR);
if (str != null)
{
versionMajor = new Boolean(str);
}
String versionComment = parameters.getParameter(PARAM_VERSION_COMMENT);
// Create the node
NodeRef nodeRef = createNodeImpl(parentNodeRef, nodeName, nodeTypeQName, props, assocTypeQName);
NodeRef nodeRef;
if (isContent)
{
// create empty file node - note: currently will be set to default encoding only (UTF-8)
nodeRef = createNewFile(parentNodeRef, nodeName, nodeTypeQName, null, props, assocTypeQName, parameters, versionMajor, versionComment);
}
else
{
// create non-content node
nodeRef = createNodeImpl(parentNodeRef, nodeName, nodeTypeQName, props, assocTypeQName);
}
List<String> aspectNames = nodeInfo.getAspectNames();
if (aspectNames != null)
@@ -1630,12 +1649,6 @@ public class NodesImpl implements Nodes
}
}
if (isContent)
{
// add empty file - note: currently will be set to default encoding only (UTF-8)
writeContent(nodeRef, nodeName, new ByteArrayInputStream("".getBytes()), false);
}
// eg. to create mandatory assoc(s)
if (nodeInfo.getTargets() != null)
@@ -2449,9 +2462,9 @@ public class NodesImpl implements Nodes
String fileName = null;
Content content = null;
boolean autoRename = false;
QName nodeTypeQName = null;
QName nodeTypeQName = ContentModel.TYPE_CONTENT;
boolean overwrite = false; // If a fileName clashes for a versionable file
Boolean majorVersion = null;
Boolean versionMajor = null;
String versionComment = null;
String relativePath = null;
String renditionNames = null;
@@ -2496,7 +2509,7 @@ public class NodesImpl implements Nodes
break;
case "majorversion":
majorVersion = Boolean.valueOf(field.getValue());
versionMajor = Boolean.valueOf(field.getValue());
break;
case "comment":
@@ -2571,7 +2584,7 @@ public class NodesImpl implements Nodes
{
// overwrite existing (versionable) file
BasicContentInfo contentInfo = new ContentInfoImpl(content.getMimetype(), content.getEncoding(), -1, null);
return updateExistingFile(parentNodeRef, existingFile, fileName, contentInfo, content.getInputStream(), parameters, majorVersion, versionComment);
return updateExistingFile(parentNodeRef, existingFile, fileName, contentInfo, content.getInputStream(), parameters, versionMajor, versionComment);
}
else
{
@@ -2580,8 +2593,17 @@ public class NodesImpl implements Nodes
}
}
// Note: pending REPO-159, we currently auto-enable versioning on new upload (but not when creating empty file)
if (versionMajor == null)
{
versionMajor = true;
}
// Create a new file.
final Node fileNode = createNewFile(parentNodeRef, fileName, nodeTypeQName, content, properties, assocTypeQName, parameters, majorVersion, versionComment);
NodeRef nodeRef = createNewFile(parentNodeRef, fileName, nodeTypeQName, content, properties, assocTypeQName, parameters, versionMajor, versionComment);
// Create the response
final Node fileNode = getFolderOrDocumentFullInfo(nodeRef, parentNodeRef, nodeTypeQName, parameters);
// RA-1052
try
@@ -2633,25 +2655,30 @@ public class NodesImpl implements Nodes
}
}
private Node createNewFile(NodeRef parentNodeRef, String fileName, QName nodeType, Content content, Map<QName, Serializable> props, QName assocTypeQName, Parameters params,
private NodeRef createNewFile(NodeRef parentNodeRef, String fileName, QName nodeType, Content content, Map<QName, Serializable> props, QName assocTypeQName, Parameters params,
Boolean versionMajor, String versionComment)
{
if (nodeType == null)
{
nodeType = ContentModel.TYPE_CONTENT;
}
NodeRef nodeRef = createNodeImpl(parentNodeRef, fileName, nodeType, props, assocTypeQName);
if (content == null)
{
// Write "empty" content
writeContent(nodeRef, fileName, new ByteArrayInputStream("".getBytes()), false);
}
else
{
// Write content
writeContent(nodeRef, fileName, content.getInputStream(), true);
}
if ((versionMajor != null) || (versionComment != null))
{
behaviourFilter.disableBehaviour(nodeRef, ContentModel.ASPECT_VERSIONABLE);
try
{
// by default, first version is major, unless specified otherwise
VersionType versionType = VersionType.MAJOR;
if ((versionMajor != null) && (! versionMajor))
if ((versionMajor != null) && (!versionMajor))
{
versionType = VersionType.MINOR;
}
@@ -2659,14 +2686,13 @@ public class NodesImpl implements Nodes
createVersion(nodeRef, false, versionType, versionComment);
extractMetadata(nodeRef);
}
finally
} finally
{
behaviourFilter.enableBehaviour(nodeRef, ContentModel.ASPECT_VERSIONABLE);
}
}
// Create the response
return getFolderOrDocumentFullInfo(nodeRef, parentNodeRef, nodeType, params);
return nodeRef;
}
private String getStringOrNull(String value)

8
source/test-java/org/alfresco/rest/DeletedNodesTest.java
View File

@@ -86,12 +86,13 @@ public class DeletedNodesTest extends AbstractSingleNetworkSiteTest
String folder1 = "folder-testCreateAndDelete-" + now.getTime() + "_1";
Folder createdFolder = createFolder(tDocLibNodeId, folder1, null);
assertNotNull(createdFolder);
String f1Id = createdFolder.getId();
//Create a folder outside a site
Folder createdFolderNonSite = createFolder(Nodes.PATH_MY, folder1, null);
assertNotNull(createdFolderNonSite);
Document document = createEmptyTextFile(createdFolder, "d1.txt");
Document document = createEmptyTextFile(f1Id, "d1.txt");
PublicApiClient.Paging paging = getPaging(0, 100);
@@ -176,16 +177,17 @@ public class DeletedNodesTest extends AbstractSingleNetworkSiteTest
String folder1 = "folder" + now.getTime() + "_1";
Folder createdFolder = createFolder(tDocLibNodeId, folder1, null);
assertNotNull(createdFolder);
String f1Id = createdFolder.getId();
//Create a folder outside a site
Folder createdFolderNonSite = createFolder(Nodes.PATH_MY, folder1, null);
assertNotNull(createdFolderNonSite);
Document document = createEmptyTextFile(createdFolder, "restoreme.txt");
Document document = createEmptyTextFile(f1Id, "restoreme.txt");
deleteNode(document.getId());
//Create another document with the same name
Document documentSameName = createEmptyTextFile(createdFolder, "restoreme.txt");
Document documentSameName = createEmptyTextFile(f1Id, "restoreme.txt");
//Can't restore a node of the same name
post(URL_DELETED_NODES+"/"+document.getId()+"/restore", null, null, Status.STATUS_CONFLICT);

13
source/test-java/org/alfresco/rest/api/tests/AbstractBaseApiTest.java
View File

@@ -742,7 +742,12 @@ public abstract class AbstractBaseApiTest extends EnterpriseTestApi
return RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
}
protected Document createEmptyTextFile(Folder parentFolder, String docName) throws Exception
protected Document createEmptyTextFile(String parentFolderId, String docName) throws Exception
{
return createEmptyTextFile(parentFolderId, docName, null, 201);
}
protected Document createEmptyTextFile(String parentFolderId, String docName, Map<String, String> params, int expectedStatus) throws Exception
{
Document d1 = new Document();
d1.setName(docName);
@@ -752,17 +757,17 @@ public abstract class AbstractBaseApiTest extends EnterpriseTestApi
d1.setContent(ci);
// create empty file
HttpResponse response = post(getNodeChildrenUrl(parentFolder.getId()), toJsonAsStringNonNull(d1), 201);
HttpResponse response = post(getNodeChildrenUrl(parentFolderId), toJsonAsStringNonNull(d1), params, null, "alfresco", expectedStatus);
return RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
}
protected Document updateTextFile(String contentId, String textContent, Map<String, String> parameters) throws IOException, Exception
protected Document updateTextFile(String contentId, String textContent, Map<String, String> params) throws IOException, Exception
{
ByteArrayInputStream inputStream = new ByteArrayInputStream(textContent.getBytes());
File txtFile = TempFileProvider.createTempFile(inputStream, getClass().getSimpleName(), ".txt");
BinaryPayload payload = new BinaryPayload(txtFile);
HttpResponse response = putBinary(getNodeContentUrl(contentId), payload, null, parameters, 200);
HttpResponse response = putBinary(getNodeContentUrl(contentId), payload, null, params, 200);
return RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
}

7
source/test-java/org/alfresco/rest/api/tests/ActivitiesPostingTest.java
View File

@@ -69,9 +69,10 @@ public class ActivitiesPostingTest extends AbstractSingleNetworkSiteTest
String folder1 = "folder" + System.currentTimeMillis() + "_1";
Folder createdFolder = createFolder(tDocLibNodeId, folder1, null);
assertNotNull(createdFolder);
String f1Id = createdFolder.getId();
String docName = "d1.txt";
Document documentResp = createEmptyTextFile(createdFolder, docName);
Document documentResp = createEmptyTextFile(f1Id, docName);
//Update the file
Document dUpdate = new Document();
@@ -141,12 +142,14 @@ public class ActivitiesPostingTest extends AbstractSingleNetworkSiteTest
List<Activity> activities = getMyActivities();
String folder1 = "nonSitefolder" + System.currentTimeMillis() + "_1";
//Create a folder outside a site
Folder createdFolder = createFolder(Nodes.PATH_MY, folder1, null);
assertNotNull(createdFolder);
String f1Id = createdFolder.getId();
String docName = "nonsite_d1.txt";
Document documentResp = createEmptyTextFile(createdFolder, docName);
Document documentResp = createEmptyTextFile(f1Id, docName);
assertNotNull(documentResp);
//Update the file

68
source/test-java/org/alfresco/rest/api/tests/NodeApiTest.java
View File

@@ -2873,6 +2873,74 @@ public class NodeApiTest extends AbstractSingleNetworkSiteTest
f1.setNodeType("app:glossary");
f1.expected(folderResp);
{
// test versioning for metadata-only updates
Map params = new HashMap<>();
params.put("majorVersion", "true");
params.put("comment", "Initial empty file :-)");
String fileName = "My File";
Node nodeResp = createEmptyTextFile(f0Id, fileName, params, 201);
assertEquals("1.0", nodeResp.getProperties().get("cm:versionLabel"));
props = new HashMap<>();
props.put("cm:title", "my file title");
dUpdate = new Document();
dUpdate.setProperties(props);
response = put(URL_NODES, dId, toJsonAsStringNonNull(dUpdate), null, 200);
nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
assertEquals("1.0", nodeResp.getProperties().get("cm:versionLabel"));
// turn-off auto-version on metadata-only updates (OOTB this is now false by default, as per MNT-12226)
props = new HashMap<>();
props.put("cm:autoVersionOnUpdateProps", true);
dUpdate = new Document();
dUpdate.setProperties(props);
response = put(URL_NODES, dId, toJsonAsStringNonNull(dUpdate), null, 200);
nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
assertEquals("1.1", nodeResp.getProperties().get("cm:versionLabel"));
props = new HashMap<>();
props.put("cm:title","my file title 2");
dUpdate = new Document();
dUpdate.setProperties(props);
response = put(URL_NODES, dId, toJsonAsStringNonNull(dUpdate), null, 200);
nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
assertEquals("1.2", nodeResp.getProperties().get("cm:versionLabel"));
props = new HashMap<>();
props.put("cm:title","my file title 3");
dUpdate = new Document();
dUpdate.setProperties(props);
response = put(URL_NODES, dId, toJsonAsStringNonNull(dUpdate), null, 200);
nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
assertEquals("1.3", nodeResp.getProperties().get("cm:versionLabel"));
// turn-off auto-version on metadata-only updates
props = new HashMap<>();
props.put("cm:autoVersionOnUpdateProps", false);
dUpdate = new Document();
dUpdate.setProperties(props);
response = put(URL_NODES, dId, toJsonAsStringNonNull(dUpdate), null, 200);
nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
assertEquals("1.3", nodeResp.getProperties().get("cm:versionLabel"));
props = new HashMap<>();
props.put("cm:title","my file title 4");
dUpdate = new Document();
dUpdate.setProperties(props);
response = put(URL_NODES, dId, toJsonAsStringNonNull(dUpdate), null, 200);
nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
assertEquals("1.3", nodeResp.getProperties().get("cm:versionLabel"));
}
// -ve test - fail on unknown property
props = new HashMap<>();
props.put("cm:xyz","my unknown property");