mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-14 17:58:59 +00:00
Merged HEAD (5.2) to 5.2.N (5.2.1)
128106 jvonka: Merged RETURN-OF-THE-API (5.2.0) to HEAD (5.2)
128071: REPO-495: Update + add tests.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@128127 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Andrei Rebegea
@@ -536,7 +536,7 @@ public abstract class AbstractBaseApiTest extends EnterpriseTestApi
|
||||
File txtFile = TempFileProvider.createTempFile(inputStream, getClass().getSimpleName(), ".txt");
|
||||
|
||||
MultiPartBuilder.MultiPartRequest reqBody = MultiPartBuilder.create()
|
||||
.setFileData(new MultiPartBuilder.FileData(fileName, txtFile, MimetypeMap.MIMETYPE_TEXT_PLAIN, encoding))
|
||||
.setFileData(new MultiPartBuilder.FileData(fileName, txtFile))
|
||||
.setProperties(props)
|
||||
.build();
|
||||
|
||||
@@ -554,7 +554,7 @@ public abstract class AbstractBaseApiTest extends EnterpriseTestApi
|
||||
{
|
||||
ByteArrayInputStream inputStream = new ByteArrayInputStream(textContent.getBytes());
|
||||
File txtFile = TempFileProvider.createTempFile(inputStream, getClass().getSimpleName(), ".txt");
|
||||
BinaryPayload payload = new BinaryPayload(txtFile, MimetypeMap.MIMETYPE_TEXT_PLAIN);
|
||||
BinaryPayload payload = new BinaryPayload(txtFile);
|
||||
|
||||
HttpResponse response = putBinary(getNodeContentUrl(contentId), userId, payload, null, parameters, 200);
|
||||
return RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
|
||||
|
||||
@@ -681,13 +681,13 @@ public class NodeApiTest extends AbstractBaseApiTest
|
||||
d1.setName(contentName);
|
||||
d1.setNodeType(TYPE_CM_CONTENT);
|
||||
|
||||
ContentInfo ci = new ContentInfo();
|
||||
ci.setMimeType("text/plain");
|
||||
ci.setMimeTypeName("Plain Text");
|
||||
ci.setSizeInBytes(44L);
|
||||
ci.setEncoding("ISO-8859-1");
|
||||
ContentInfo ciExpected = new ContentInfo();
|
||||
ciExpected.setMimeType("text/plain");
|
||||
ciExpected.setMimeTypeName("Plain Text");
|
||||
ciExpected.setSizeInBytes(44L);
|
||||
ciExpected.setEncoding("ISO-8859-1");
|
||||
|
||||
d1.setContent(ci);
|
||||
d1.setContent(ciExpected);
|
||||
d1.setCreatedByUser(expectedUser);
|
||||
d1.setModifiedByUser(expectedUser);
|
||||
|
||||
@@ -808,6 +808,137 @@ public class NodeApiTest extends AbstractBaseApiTest
|
||||
getSingle(NodesEntityResource.class, user1, Nodes.PATH_MY, null, 404); // Not found
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests guess mimetype & guess encoding when uploading file/content (create or update) - also empty file/content
|
||||
* <p>POST:</p>
|
||||
* {@literal <host>:<port>/alfresco/api/-default-/public/alfresco/versions/1/nodes/<nodeId>/children}
|
||||
* <p>PUT:</p>
|
||||
* {@literal <host>:<port>/alfresco/api/-default-/public/alfresco/versions/1/nodes/<nodeId>/content}
|
||||
*/
|
||||
@Test
|
||||
public void testGuessMimeTypeAndEncoding() throws Exception
|
||||
{
|
||||
String fId = createFolder(user1, getMyNodeId(user1), "test-folder-guess-"+System.currentTimeMillis()).getId();
|
||||
|
||||
// create empty files
|
||||
|
||||
Document d = new Document();
|
||||
d.setName("my doc");
|
||||
d.setNodeType(TYPE_CM_CONTENT);
|
||||
|
||||
HttpResponse response = post(getNodeChildrenUrl(fId), user1, toJsonAsStringNonNull(d), 201);
|
||||
Document documentResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
|
||||
assertEquals(MimetypeMap.MIMETYPE_BINARY, documentResp.getContent().getMimeType());
|
||||
assertEquals("Binary File (Octet Stream)", documentResp.getContent().getMimeTypeName());
|
||||
assertEquals(0L, documentResp.getContent().getSizeInBytes().longValue());
|
||||
assertEquals("UTF-8", documentResp.getContent().getEncoding());
|
||||
|
||||
d = new Document();
|
||||
d.setName("my doc.txt");
|
||||
d.setNodeType(TYPE_CM_CONTENT);
|
||||
|
||||
response = post(getNodeChildrenUrl(fId), user1, toJsonAsStringNonNull(d), 201);
|
||||
documentResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
|
||||
assertEquals(MimetypeMap.MIMETYPE_TEXT_PLAIN, documentResp.getContent().getMimeType());
|
||||
assertEquals("Plain Text", documentResp.getContent().getMimeTypeName());
|
||||
assertEquals(0L, documentResp.getContent().getSizeInBytes().longValue());
|
||||
assertEquals("UTF-8", documentResp.getContent().getEncoding());
|
||||
|
||||
d = new Document();
|
||||
d.setName("my doc.pdf");
|
||||
d.setNodeType(TYPE_CM_CONTENT);
|
||||
|
||||
response = post(getNodeChildrenUrl(fId), user1, toJsonAsStringNonNull(d), 201);
|
||||
documentResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
|
||||
assertEquals(MimetypeMap.MIMETYPE_PDF, documentResp.getContent().getMimeType());
|
||||
assertEquals("Adobe PDF Document", documentResp.getContent().getMimeTypeName());
|
||||
assertEquals(0L, documentResp.getContent().getSizeInBytes().longValue());
|
||||
assertEquals("UTF-8", documentResp.getContent().getEncoding());
|
||||
|
||||
// upload files
|
||||
|
||||
String fileName = "quick.pdf";
|
||||
File file = getResourceFile(fileName);
|
||||
|
||||
MultiPartBuilder multiPartBuilder = MultiPartBuilder.create()
|
||||
.setFileData(new FileData(fileName, file));
|
||||
MultiPartRequest reqBody = multiPartBuilder.build();
|
||||
|
||||
response = post(getNodeChildrenUrl(fId), user1, reqBody.getBody(), null, reqBody.getContentType(), 201);
|
||||
Document document = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
|
||||
ContentInfo contentInfo = document.getContent();
|
||||
assertEquals(MimetypeMap.MIMETYPE_PDF, contentInfo.getMimeType());
|
||||
assertEquals("UTF-8", contentInfo.getEncoding());
|
||||
|
||||
fileName = "example-1.txt";
|
||||
file = getResourceFile(fileName);
|
||||
|
||||
multiPartBuilder = MultiPartBuilder.create()
|
||||
.setFileData(new FileData(fileName, file));
|
||||
reqBody = multiPartBuilder.build();
|
||||
|
||||
response = post(getNodeChildrenUrl(fId), user1, reqBody.getBody(), null, reqBody.getContentType(), 201);
|
||||
document = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
|
||||
contentInfo = document.getContent();
|
||||
assertEquals(MimetypeMap.MIMETYPE_TEXT_PLAIN, contentInfo.getMimeType());
|
||||
assertEquals("ISO-8859-1", contentInfo.getEncoding());
|
||||
|
||||
fileName = "example-2.txt";
|
||||
file = getResourceFile(fileName);
|
||||
|
||||
multiPartBuilder = MultiPartBuilder.create()
|
||||
.setFileData(new FileData(fileName, file));
|
||||
reqBody = multiPartBuilder.build();
|
||||
|
||||
response = post(getNodeChildrenUrl(fId), user1, reqBody.getBody(), null, reqBody.getContentType(), 201);
|
||||
document = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
|
||||
contentInfo = document.getContent();
|
||||
assertEquals(MimetypeMap.MIMETYPE_TEXT_PLAIN, contentInfo.getMimeType());
|
||||
assertEquals("UTF-8", contentInfo.getEncoding());
|
||||
|
||||
fileName = "shift-jis.txt";
|
||||
file = getResourceFile(fileName);
|
||||
|
||||
multiPartBuilder = MultiPartBuilder.create()
|
||||
.setFileData(new FileData(fileName, file));
|
||||
reqBody = multiPartBuilder.build();
|
||||
|
||||
response = post(getNodeChildrenUrl(fId), user1, reqBody.getBody(), null, reqBody.getContentType(), 201);
|
||||
document = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
|
||||
contentInfo = document.getContent();
|
||||
assertEquals(MimetypeMap.MIMETYPE_TEXT_PLAIN, contentInfo.getMimeType());
|
||||
assertEquals("Shift_JIS", contentInfo.getEncoding());
|
||||
|
||||
fileName = "example-1.xml";
|
||||
file = getResourceFile(fileName);
|
||||
|
||||
multiPartBuilder = MultiPartBuilder.create()
|
||||
.setFileData(new FileData(fileName, file));
|
||||
reqBody = multiPartBuilder.build();
|
||||
|
||||
response = post(getNodeChildrenUrl(fId), user1, reqBody.getBody(), null, reqBody.getContentType(), 201);
|
||||
document = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
|
||||
contentInfo = document.getContent();
|
||||
assertEquals(MimetypeMap.MIMETYPE_XML, contentInfo.getMimeType());
|
||||
assertEquals("ISO-8859-1", contentInfo.getEncoding());
|
||||
|
||||
fileName = "example-2.xml";
|
||||
file = getResourceFile(fileName);
|
||||
|
||||
multiPartBuilder = MultiPartBuilder.create()
|
||||
.setFileData(new FileData(fileName, file));
|
||||
reqBody = multiPartBuilder.build();
|
||||
|
||||
response = post(getNodeChildrenUrl(fId), user1, reqBody.getBody(), null, reqBody.getContentType(), 201);
|
||||
document = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
|
||||
contentInfo = document.getContent();
|
||||
assertEquals(MimetypeMap.MIMETYPE_XML, contentInfo.getMimeType());
|
||||
assertEquals("UTF-8", contentInfo.getEncoding());
|
||||
|
||||
// cleanup
|
||||
delete(URL_NODES, user1, fId, 204);
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests Multipart upload to user's home (a.k.a My Files).
|
||||
* <p>POST:</p>
|
||||
@@ -826,7 +957,7 @@ public class NodeApiTest extends AbstractBaseApiTest
|
||||
final int numOfNodes = pagingResult.getCount();
|
||||
|
||||
MultiPartBuilder multiPartBuilder = MultiPartBuilder.create()
|
||||
.setFileData(new FileData(fileName, file, MimetypeMap.MIMETYPE_PDF));
|
||||
.setFileData(new FileData(fileName, file));
|
||||
MultiPartRequest reqBody = multiPartBuilder.build();
|
||||
|
||||
// Try to upload into a non-existent folder
|
||||
@@ -894,7 +1025,7 @@ public class NodeApiTest extends AbstractBaseApiTest
|
||||
final String fileName1 = "quick-1.txt";
|
||||
final File file1 = getResourceFile(fileName1);
|
||||
reqBody = MultiPartBuilder.create()
|
||||
.setFileData(new FileData(null, file1, null))
|
||||
.setFileData(new FileData(null, file1))
|
||||
.build();
|
||||
response = post(getNodeChildrenUrl(Nodes.PATH_MY), user1, reqBody.getBody(), null, reqBody.getContentType(), 201);
|
||||
document = jacksonUtil.parseEntry(response.getJsonResponse(), Document.class);
|
||||
@@ -907,7 +1038,7 @@ public class NodeApiTest extends AbstractBaseApiTest
|
||||
final String fileName2b = "quick-2b.txt";
|
||||
final File file2 = getResourceFile(fileName2);
|
||||
reqBody = MultiPartBuilder.create()
|
||||
.setFileData(new FileData(fileName2b, file2, MimetypeMap.MIMETYPE_BINARY))
|
||||
.setFileData(new FileData(fileName2b, file2))
|
||||
.build();
|
||||
response = post(getNodeChildrenUrl(Nodes.PATH_MY), user1, reqBody.getBody(), null, reqBody.getContentType(), 201);
|
||||
document = jacksonUtil.parseEntry(response.getJsonResponse(), Document.class);
|
||||
@@ -915,12 +1046,13 @@ public class NodeApiTest extends AbstractBaseApiTest
|
||||
assertEquals(fileName2b, document.getName());
|
||||
assertEquals(MimetypeMap.MIMETYPE_TEXT_PLAIN, document.getContent().getMimeType());
|
||||
|
||||
|
||||
// User2 tries to upload a new file into the user1's home folder.
|
||||
response = getSingle(NodesEntityResource.class, user1, Nodes.PATH_MY, null, 200);
|
||||
Folder user1Home = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Folder.class);
|
||||
final File file3 = getResourceFile(fileName2);
|
||||
reqBody = MultiPartBuilder.create()
|
||||
.setFileData(new FileData(fileName2, file3, MimetypeMap.MIMETYPE_TEXT_PLAIN))
|
||||
.setFileData(new FileData(fileName2, file3))
|
||||
.build();
|
||||
post(getNodeChildrenUrl(user1Home.getId()), user2, reqBody.getBody(), null, reqBody.getContentType(), 403);
|
||||
|
||||
@@ -938,7 +1070,7 @@ public class NodeApiTest extends AbstractBaseApiTest
|
||||
|
||||
// Test unsupported node type
|
||||
reqBody = MultiPartBuilder.create()
|
||||
.setFileData(new FileData(fileName2, file2, null))
|
||||
.setFileData(new FileData(fileName2, file2))
|
||||
.setAutoRename(true)
|
||||
.setNodeType("cm:link")
|
||||
.build();
|
||||
@@ -966,7 +1098,7 @@ public class NodeApiTest extends AbstractBaseApiTest
|
||||
{
|
||||
// quick.pdf size is about 23 KB
|
||||
reqBody = MultiPartBuilder.create()
|
||||
.setFileData(new FileData(fileName, file, MimetypeMap.MIMETYPE_PDF))
|
||||
.setFileData(new FileData(fileName, file))
|
||||
.setAutoRename(true)
|
||||
.build();
|
||||
|
||||
@@ -1002,7 +1134,7 @@ public class NodeApiTest extends AbstractBaseApiTest
|
||||
final int numOfNodes = pagingResult.getCount();
|
||||
|
||||
MultiPartBuilder multiPartBuilder = MultiPartBuilder.create()
|
||||
.setFileData(new FileData(fileName, file, null));
|
||||
.setFileData(new FileData(fileName, file));
|
||||
MultiPartRequest reqBody = multiPartBuilder.build();
|
||||
// Try to upload
|
||||
response = post(getNodeChildrenUrl(folderA_id), userOneN1.getId(), reqBody.getBody(), null, reqBody.getContentType(), 201);
|
||||
@@ -1039,7 +1171,7 @@ public class NodeApiTest extends AbstractBaseApiTest
|
||||
final String fileName2 = "quick-2.txt";
|
||||
final File file2 = getResourceFile(fileName2);
|
||||
reqBody = MultiPartBuilder.create()
|
||||
.setFileData(new FileData(fileName2, file2, MimetypeMap.MIMETYPE_TEXT_PLAIN))
|
||||
.setFileData(new FileData(fileName2, file2))
|
||||
.build();
|
||||
// userTwoN1 tries to upload a new file into the folderA of userOneN1
|
||||
post(getNodeChildrenUrl(folderA_id), userTwoN1.getId(), reqBody.getBody(), null, reqBody.getContentType(), 403);
|
||||
@@ -1061,7 +1193,7 @@ public class NodeApiTest extends AbstractBaseApiTest
|
||||
props.put("cm:title", "test title");
|
||||
props.put("cm:description", "test description");
|
||||
reqBody = MultiPartBuilder.create()
|
||||
.setFileData(new FileData(fileName2, file2, MimetypeMap.MIMETYPE_TEXT_PLAIN))
|
||||
.setFileData(new FileData(fileName2, file2))
|
||||
.setAutoRename(true)
|
||||
.setProperties(props)
|
||||
.build();
|
||||
@@ -1082,7 +1214,7 @@ public class NodeApiTest extends AbstractBaseApiTest
|
||||
props = new HashMap<>(1);
|
||||
props.put("unknownPrefix" + System.currentTimeMillis() + ":description", "test description");
|
||||
reqBody = MultiPartBuilder.create()
|
||||
.setFileData(new FileData(fileName2, file2, MimetypeMap.MIMETYPE_TEXT_PLAIN))
|
||||
.setFileData(new FileData(fileName2, file2))
|
||||
.setAutoRename(true)
|
||||
.setProperties(props)
|
||||
.build();
|
||||
@@ -1092,7 +1224,7 @@ public class NodeApiTest extends AbstractBaseApiTest
|
||||
// Test relativePath multi-part field.
|
||||
// Any folders in the relativePath that do not exist, are created before the content is created.
|
||||
multiPartBuilder = MultiPartBuilder.create()
|
||||
.setFileData(new FileData(fileName, file, MimetypeMap.MIMETYPE_TEXT_PLAIN))
|
||||
.setFileData(new FileData(fileName, file))
|
||||
.setRelativePath("X/Y/Z");
|
||||
reqBody = multiPartBuilder.build();
|
||||
|
||||
@@ -1727,9 +1859,6 @@ public class NodeApiTest extends AbstractBaseApiTest
|
||||
Document d1 = new Document();
|
||||
d1.setName("d1.txt");
|
||||
d1.setNodeType(TYPE_CM_CONTENT);
|
||||
ContentInfo ci = new ContentInfo();
|
||||
ci.setMimeType("text/plain");
|
||||
d1.setContent(ci);
|
||||
|
||||
response = post(postUrl, user1, toJsonAsStringNonNull(d1), 201);
|
||||
Document documentResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
|
||||
@@ -2100,9 +2229,6 @@ public class NodeApiTest extends AbstractBaseApiTest
|
||||
Document d1 = new Document();
|
||||
d1.setName("d1.txt");
|
||||
d1.setNodeType(TYPE_CM_CONTENT);
|
||||
ContentInfo ci = new ContentInfo();
|
||||
ci.setMimeType("text/plain");
|
||||
d1.setContent(ci);
|
||||
|
||||
HttpResponse response = post(getNodeChildrenUrl(f1Id), user1, toJsonAsStringNonNull(d1), 201);
|
||||
Document documentResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
|
||||
@@ -2281,9 +2407,6 @@ public class NodeApiTest extends AbstractBaseApiTest
|
||||
Document d1 = new Document();
|
||||
d1.setName("d1.txt");
|
||||
d1.setNodeType(TYPE_CM_CONTENT);
|
||||
ContentInfo ci = new ContentInfo();
|
||||
ci.setMimeType("text/plain");
|
||||
d1.setContent(ci);
|
||||
|
||||
// create empty file
|
||||
HttpResponse response = post(postUrl, user1, toJsonAsStringNonNull(d1), 201);
|
||||
@@ -2297,9 +2420,12 @@ public class NodeApiTest extends AbstractBaseApiTest
|
||||
d1.setCreatedByUser(expectedUser);
|
||||
d1.setModifiedByUser(expectedUser);
|
||||
|
||||
d1.getContent().setMimeTypeName("Plain Text");
|
||||
d1.getContent().setSizeInBytes(0L);
|
||||
d1.getContent().setEncoding("UTF-8");
|
||||
ContentInfo ciExpected = new ContentInfo();
|
||||
ciExpected.setMimeType("text/plain");
|
||||
ciExpected.setMimeTypeName("Plain Text");
|
||||
ciExpected.setSizeInBytes(0L);
|
||||
ciExpected.setEncoding("UTF-8");
|
||||
d1.setContent(ciExpected);
|
||||
|
||||
d1.expected(documentResp);
|
||||
|
||||
@@ -2324,7 +2450,7 @@ public class NodeApiTest extends AbstractBaseApiTest
|
||||
d2.setCreatedByUser(expectedUser);
|
||||
d2.setModifiedByUser(expectedUser);
|
||||
|
||||
ContentInfo ciExpected = new ContentInfo();
|
||||
ciExpected = new ContentInfo();
|
||||
ciExpected.setMimeType("text/plain");
|
||||
ciExpected.setMimeTypeName("Plain Text");
|
||||
ciExpected.setSizeInBytes(0L);
|
||||
@@ -2443,9 +2569,6 @@ public class NodeApiTest extends AbstractBaseApiTest
|
||||
Document d1 = new Document();
|
||||
d1.setName("d1.txt");
|
||||
d1.setNodeType(TYPE_CM_CONTENT);
|
||||
ContentInfo ci = new ContentInfo();
|
||||
ci.setMimeType("text/plain");
|
||||
d1.setContent(ci);
|
||||
|
||||
HttpResponse response = post(postUrl, user1, toJsonAsStringNonNull(d1), 201);
|
||||
Document documentResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
|
||||
@@ -2459,9 +2582,12 @@ public class NodeApiTest extends AbstractBaseApiTest
|
||||
d1.setCreatedByUser(expectedUser);
|
||||
d1.setModifiedByUser(expectedUser);
|
||||
|
||||
d1.getContent().setMimeTypeName("Plain Text");
|
||||
d1.getContent().setSizeInBytes(0L);
|
||||
d1.getContent().setEncoding("UTF-8");
|
||||
ContentInfo ciExpected = new ContentInfo();
|
||||
ciExpected.setMimeType("text/plain");
|
||||
ciExpected.setMimeTypeName("Plain Text");
|
||||
ciExpected.setSizeInBytes(0L);
|
||||
ciExpected.setEncoding("UTF-8");
|
||||
d1.setContent(ciExpected);
|
||||
|
||||
d1.expected(documentResp);
|
||||
|
||||
@@ -2857,9 +2983,6 @@ public class NodeApiTest extends AbstractBaseApiTest
|
||||
Document d1 = new Document();
|
||||
d1.setName("d1.txt");
|
||||
d1.setNodeType(TYPE_CM_CONTENT);
|
||||
ContentInfo ci = new ContentInfo();
|
||||
ci.setMimeType("text/plain");
|
||||
d1.setContent(ci);
|
||||
|
||||
// create *empty* text file - as of now, versioning is not enabled by default
|
||||
HttpResponse response = post(getNodeChildrenUrl(myNodeId), user1, toJsonAsStringNonNull(d1), 201);
|
||||
@@ -3170,7 +3293,7 @@ public class NodeApiTest extends AbstractBaseApiTest
|
||||
File file = getResourceFile(fileName);
|
||||
|
||||
MultiPartBuilder multiPartBuilder = MultiPartBuilder.create()
|
||||
.setFileData(new FileData(fileName, file, MimetypeMap.MIMETYPE_TEXT_PLAIN));
|
||||
.setFileData(new FileData(fileName, file));
|
||||
MultiPartRequest reqBody = multiPartBuilder.build();
|
||||
|
||||
// Upload text content
|
||||
@@ -3233,7 +3356,7 @@ public class NodeApiTest extends AbstractBaseApiTest
|
||||
byte[] originalBytes = Files.readAllBytes(Paths.get(file.getAbsolutePath()));
|
||||
|
||||
multiPartBuilder = MultiPartBuilder.create()
|
||||
.setFileData(new FileData(fileName, file, MimetypeMap.MIMETYPE_PDF));
|
||||
.setFileData(new FileData(fileName, file));
|
||||
reqBody = multiPartBuilder.build();
|
||||
|
||||
// Upload binary content
|
||||
|
||||
@@ -121,7 +121,7 @@ public class RenditionsTest extends AbstractBaseApiTest
|
||||
// Create multipart request
|
||||
String fileName = "quick.pdf";
|
||||
File file = getResourceFile(fileName);
|
||||
MultiPartBuilder multiPartBuilder = MultiPartBuilder.create().setFileData(new FileData(fileName, file, MimetypeMap.MIMETYPE_PDF));
|
||||
MultiPartBuilder multiPartBuilder = MultiPartBuilder.create().setFileData(new FileData(fileName, file));
|
||||
MultiPartRequest reqBody = multiPartBuilder.build();
|
||||
|
||||
// Upload quick.pdf file into 'folder'
|
||||
@@ -259,7 +259,7 @@ public class RenditionsTest extends AbstractBaseApiTest
|
||||
// Create multipart request
|
||||
String fileName = "quick.pdf";
|
||||
File file = getResourceFile(fileName);
|
||||
MultiPartBuilder multiPartBuilder = MultiPartBuilder.create().setFileData(new FileData(fileName, file, MimetypeMap.MIMETYPE_PDF));
|
||||
MultiPartBuilder multiPartBuilder = MultiPartBuilder.create().setFileData(new FileData(fileName, file));
|
||||
MultiPartRequest reqBody = multiPartBuilder.build();
|
||||
|
||||
// Upload quick.pdf file into 'folder'
|
||||
@@ -307,7 +307,7 @@ public class RenditionsTest extends AbstractBaseApiTest
|
||||
String jpgFileName = "quick.jpg";
|
||||
File jpgFile = getResourceFile(fileName);
|
||||
reqBody = MultiPartBuilder.create()
|
||||
.setFileData(new FileData(jpgFileName, jpgFile, MimetypeMap.MIMETYPE_IMAGE_JPEG))
|
||||
.setFileData(new FileData(jpgFileName, jpgFile))
|
||||
.build();
|
||||
|
||||
// Upload quick.jpg file into 'folder'
|
||||
@@ -341,7 +341,7 @@ public class RenditionsTest extends AbstractBaseApiTest
|
||||
// Create multipart request
|
||||
String fileName = "quick.pdf";
|
||||
File file = getResourceFile(fileName);
|
||||
MultiPartBuilder multiPartBuilder = MultiPartBuilder.create().setFileData(new FileData(fileName, file, MimetypeMap.MIMETYPE_PDF));
|
||||
MultiPartBuilder multiPartBuilder = MultiPartBuilder.create().setFileData(new FileData(fileName, file));
|
||||
MultiPartRequest reqBody = multiPartBuilder.build();
|
||||
|
||||
// Upload quick.pdf file into 'folder'
|
||||
@@ -419,7 +419,7 @@ public class RenditionsTest extends AbstractBaseApiTest
|
||||
|
||||
String content = "The quick brown fox jumps over the lazy dog.";
|
||||
file = TempFileProvider.createTempFile(new ByteArrayInputStream(content.getBytes()), getClass().getSimpleName(), ".bin");
|
||||
multiPartBuilder = MultiPartBuilder.create().setFileData(new FileData("binaryFileName", file, MimetypeMap.MIMETYPE_BINARY));
|
||||
multiPartBuilder = MultiPartBuilder.create().setFileData(new FileData("binaryFileName", file));
|
||||
reqBody = multiPartBuilder.build();
|
||||
response = post(getNodeChildrenUrl(folder_Id), userOneN1.getId(), reqBody.getBody(), null, reqBody.getContentType(), 201);
|
||||
Document binaryDocument = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
|
||||
@@ -435,7 +435,7 @@ public class RenditionsTest extends AbstractBaseApiTest
|
||||
// Create multipart request
|
||||
String txtFileName = "quick-1.txt";
|
||||
File txtFile = getResourceFile(fileName);
|
||||
reqBody = MultiPartBuilder.create().setFileData(new FileData(txtFileName, txtFile, MimetypeMap.MIMETYPE_TEXT_PLAIN)).build();
|
||||
reqBody = MultiPartBuilder.create().setFileData(new FileData(txtFileName, txtFile)).build();
|
||||
|
||||
// Upload quick-1.txt file into 'folder'
|
||||
response = post(getNodeChildrenUrl(folder_Id), userOneN1.getId(), reqBody.getBody(), null, reqBody.getContentType(), 201);
|
||||
@@ -476,7 +476,7 @@ public class RenditionsTest extends AbstractBaseApiTest
|
||||
String fileName = "quick.pdf";
|
||||
File file = getResourceFile(fileName);
|
||||
MultiPartRequest reqBody = MultiPartBuilder.create()
|
||||
.setFileData(new FileData(fileName, file, MimetypeMap.MIMETYPE_PDF))
|
||||
.setFileData(new FileData(fileName, file))
|
||||
.setRenditions(Collections.singletonList(renditionName))
|
||||
.build();
|
||||
|
||||
@@ -498,7 +498,7 @@ public class RenditionsTest extends AbstractBaseApiTest
|
||||
fileName = "farmers_markets_list_2003.doc";
|
||||
file = getResourceFile(fileName);
|
||||
reqBody = MultiPartBuilder.create()
|
||||
.setFileData(new FileData(fileName, file, MimetypeMap.MIMETYPE_WORD))
|
||||
.setFileData(new FileData(fileName, file))
|
||||
.setRenditions(Collections.singletonList(renditionName))
|
||||
.build();
|
||||
|
||||
@@ -541,7 +541,7 @@ public class RenditionsTest extends AbstractBaseApiTest
|
||||
|
||||
// Currently we do not support multiple rendition requests on create
|
||||
reqBody = MultiPartBuilder.create()
|
||||
.setFileData(new FileData(fileName, file, MimetypeMap.MIMETYPE_PDF))
|
||||
.setFileData(new FileData(fileName, file))
|
||||
.setAutoRename(true)
|
||||
.setRenditions(Arrays.asList(new String[]{"doclib,imgpreview"}))
|
||||
.build();
|
||||
@@ -550,7 +550,7 @@ public class RenditionsTest extends AbstractBaseApiTest
|
||||
|
||||
// Unknown rendition
|
||||
reqBody = MultiPartBuilder.create()
|
||||
.setFileData(new FileData(fileName, file, MimetypeMap.MIMETYPE_PDF))
|
||||
.setFileData(new FileData(fileName, file))
|
||||
.setAutoRename(true)
|
||||
.setRenditions(Arrays.asList(new String[]{"unknown"}))
|
||||
.build();
|
||||
@@ -566,7 +566,7 @@ public class RenditionsTest extends AbstractBaseApiTest
|
||||
String txtFileName = "quick-1.txt";
|
||||
File txtFile = getResourceFile(fileName);
|
||||
reqBody = MultiPartBuilder.create()
|
||||
.setFileData(new FileData(txtFileName, txtFile, MimetypeMap.MIMETYPE_TEXT_PLAIN))
|
||||
.setFileData(new FileData(txtFileName, txtFile))
|
||||
.setRenditions(Arrays.asList(new String[]{"doclib"}))
|
||||
.build();
|
||||
|
||||
@@ -594,7 +594,7 @@ public class RenditionsTest extends AbstractBaseApiTest
|
||||
String fileName = "quick.pdf";
|
||||
File file = getResourceFile(fileName);
|
||||
MultiPartBuilder multiPartBuilder = MultiPartBuilder.create()
|
||||
.setFileData(new FileData(fileName, file, MimetypeMap.MIMETYPE_PDF));
|
||||
.setFileData(new FileData(fileName, file));
|
||||
MultiPartRequest reqBody = multiPartBuilder.build();
|
||||
|
||||
// Upload quick.pdf file into 'folder'
|
||||
@@ -701,7 +701,7 @@ public class RenditionsTest extends AbstractBaseApiTest
|
||||
// the old fileName and setting overwrite field to true
|
||||
file = getResourceFile("quick-2.pdf");
|
||||
multiPartBuilder = MultiPartBuilder.create()
|
||||
.setFileData(new FileData(fileName, file, MimetypeMap.MIMETYPE_PDF))
|
||||
.setFileData(new FileData(fileName, file))
|
||||
.setOverwrite(true);
|
||||
reqBody = multiPartBuilder.build();
|
||||
|
||||
@@ -731,7 +731,7 @@ public class RenditionsTest extends AbstractBaseApiTest
|
||||
InputStream inputStream = new ByteArrayInputStream("The quick brown fox jumps over the lazy dog".getBytes());
|
||||
file = TempFileProvider.createTempFile(inputStream, "RenditionsTest-", ".abcdef");
|
||||
reqBody = MultiPartBuilder.create()
|
||||
.setFileData(new FileData(file.getName(), file, MimetypeMap.MIMETYPE_TEXT_PLAIN))
|
||||
.setFileData(new FileData(file.getName(), file))
|
||||
.build();
|
||||
// Upload temp file into 'folder'
|
||||
response = post(getNodeChildrenUrl(folder_Id), userOneN1.getId(), reqBody.getBody(), null, reqBody.getContentType(), 201);
|
||||
|
||||
3
source/test-resources/publicapi/upload/example-1.txt
Normal file
3
source/test-resources/publicapi/upload/example-1.txt
Normal file
@@ -0,0 +1,3 @@
|
||||
The quick brown fox jumps over the lazy dog
|
||||
The quick brown fox jumps over the lazy dog
|
||||
The quick brown fox jumps over the lazy dog
|
||||
6
source/test-resources/publicapi/upload/example-1.xml
Normal file
6
source/test-resources/publicapi/upload/example-1.xml
Normal file
@@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<text>
|
||||
The quick brown fox jumps over the lazy dog
|
||||
The quick brown fox jumps over the lazy dog
|
||||
</text>
|
||||
</xml>
|
||||
3
source/test-resources/publicapi/upload/example-2.txt
Normal file
3
source/test-resources/publicapi/upload/example-2.txt
Normal file
@@ -0,0 +1,3 @@
|
||||
The quick brown fox jumps over the lazy dog
|
||||
The á é í ó ô ú jumps over the lazy dog
|
||||
The quick brown fox jumps over the lazy dog
|
||||
7
source/test-resources/publicapi/upload/example-2.xml
Normal file
7
source/test-resources/publicapi/upload/example-2.xml
Normal file
@@ -0,0 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<text>
|
||||
The quick brown fox jumps over the lazy dog
|
||||
The á é í ó ô ú jumps over the lazy dog
|
||||
The quick brown fox jumps over the lazy dog
|
||||
</text>
|
||||
</xml>
|
||||
6
source/test-resources/publicapi/upload/shift-jis.txt
Normal file
6
source/test-resources/publicapi/upload/shift-jis.txt
Normal file
@@ -0,0 +1,6 @@
|
||||
|
||||
<EFBFBD>d<EFBFBD>q<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>i<EFBFBD>G<EFBFBD><EFBFBD><EFBFBD>N<EFBFBD>g<EFBFBD><EFBFBD><EFBFBD>j<EFBFBD>b<EFBFBD>N<EFBFBD>R<EFBFBD>}<7D>[<5B>X<EFBFBD>j<EFBFBD>A<EFBFBD>I<EFBFBD><49><EFBFBD><EFBFBD><EFBFBD>C<EFBFBD><43><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>A<F18B9F81>C<EFBFBD><43><EFBFBD>^<5E><><EFBFBD>N<EFBFBD>e<EFBFBD>B<EFBFBD>u<EFBFBD><75><EFBFBD>f<EFBFBD>B<EFBFBD>A<EFBFBD>i<EFBFBD>o<EFBFBD><6F><EFBFBD><EFBFBD><EFBFBD>ʐM<CA90>j<EFBFBD>B<EFBFBD>C<EFBFBD><43><EFBFBD>^<5E>[<5B>l<EFBFBD>b<EFBFBD>g<EFBFBD>ɑ<EFBFBD><C991>\<5C><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>R<EFBFBD><52><EFBFBD>s<EFBFBD><73><EFBFBD>[<5B>^<5E>[<5B>ƃl<C683>b<EFBFBD>g<EFBFBD><67><EFBFBD>[<5B>N<EFBFBD>̏[<5B><><EFBFBD>͎<EFBFBD><CD8E><EFBFBD><EFBFBD><EFBFBD><EFBFBD>̐<EFBFBD><CC90><EFBFBD><EFBFBD><EFBFBD><EFBFBD>傫<EFBFBD><E582AB><EFBFBD>ς<EFBFBD><CF82>Ă<EFBFBD><C482>܂<EFBFBD><DC82>B
|
||||
|
||||
<EFBFBD>̃T<EFBFBD>[<5B>o<EFBFBD>[<5B>́A<CD81><41><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>C<EFBFBD><43><EFBFBD>^<5E>[<5B>l<EFBFBD>b<EFBFBD>g<EFBFBD>r<EFBFBD>W<EFBFBD>l<EFBFBD>X<EFBFBD>ɑΉ<C991><CE89><EFBFBD><EFBFBD>Ă<EFBFBD><C482>܂<EFBFBD><DC82>B<EFBFBD>C<EFBFBD>[<5B>R<EFBFBD>}<7D>[<5B>X<EFBFBD>A<EFBFBD>R<EFBFBD><52><EFBFBD>e<EFBFBD><65><EFBFBD>c<EFBFBD>T<EFBFBD>[<5B>r<EFBFBD>X<EFBFBD>A<EFBFBD>摜<EFBFBD>z<EFBFBD>M<EFBFBD>A<EFBFBD><41><EFBFBD><EFBFBD><EFBFBD>z<EFBFBD>M<EFBFBD>A<EFBFBD>X<EFBFBD>g<EFBFBD><67><EFBFBD>[<5B>~<7E><><EFBFBD>O<EFBFBD><4F><EFBFBD>̑<EFBFBD><CC91><EFBFBD><EFBFBD>I<EFBFBD><49><EFBFBD>A<EFBFBD>v<EFBFBD><76><EFBFBD>t<EFBFBD>F<EFBFBD>b<EFBFBD>V<EFBFBD><56><EFBFBD>i<EFBFBD><69><EFBFBD><EFBFBD><EFBFBD>[<5B>Y<EFBFBD>Ȋ<C88A><C28B><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><F18B9F82><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82>B
|
||||
|
||||
<EFBFBD><EFBFBD><EFBFBD>Ђ̃e<EFBFBD>N<EFBFBD>j<EFBFBD>J<EFBFBD><EFBFBD><EFBFBD>́A<EFBFBD>펞24<EFBFBD><EFBFBD><EFBFBD>ԑ̐<EFBFBD><EFBFBD>őΉ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ă<EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><EFBFBD>̂ł<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ȃ鎖<EFBFBD>Ԃɂ<EFBFBD><EFBFBD>v<EFBFBD><EFBFBD><EFBFBD>ɑΉ<EFBFBD><EFBFBD>v<EFBFBD><EFBFBD><EFBFBD>Ă<EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><EFBFBD>B<EFBFBD><EFBFBD><EFBFBD>X<EFBFBD>̃<EFBFBD><EFBFBD><EFBFBD><EFBFBD>e<EFBFBD>i<EFBFBD><EFBFBD><EFBFBD>X<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>S<EFBFBD><EFBFBD><EFBFBD>Ă<EFBFBD><EFBFBD>C<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><EFBFBD>B <20><><EFBFBD><EFBFBD><EFBFBD>ɐ<EFBFBD><C990>p<EFBFBD><70><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><F18B9F82>Ă<EFBFBD><C482><EFBFBD><EFBFBD>܂<EFBFBD><DC82>̂ŁA<C581>G<EFBFBD><47><EFBFBD>h<EFBFBD><68><EFBFBD>[<5B>U<EFBFBD>[<5B>l<EFBFBD>ɂ͑<C982><CD91>ł͑̊<CD91><CC8A><EFBFBD><EFBFBD>邱<EFBFBD>Ƃ̂ł<CC82><C582>Ȃ<EFBFBD><C882>A<EFBFBD>C<EFBFBD><43><EFBFBD>^<5E>[<5B>l<EFBFBD>b<EFBFBD>g<EFBFBD>u<EFBFBD><75><EFBFBD>E<EFBFBD>W<EFBFBD><57><EFBFBD>O<EFBFBD><4F><EFBFBD><EFBFBD><EFBFBD>v<F191A992><76><EFBFBD>܂<EFBFBD><DC82>B
|
||||
Reference in New Issue
Block a user