From 846f24ed4792dfe5c32e145cae2fdff315ae3ca7 Mon Sep 17 00:00:00 2001 From: Jamal Kaabi-Mofrad Date: Tue, 10 May 2016 11:42:56 +0000 Subject: [PATCH] Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2) 124813 jkaabimofrad: RA-889: Changed multipart field's name from "filename" to "name". git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126588 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- source/java/org/alfresco/rest/api/impl/NodesImpl.java | 2 +- .../org/alfresco/rest/api/tests/util/MultiPartBuilder.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/java/org/alfresco/rest/api/impl/NodesImpl.java b/source/java/org/alfresco/rest/api/impl/NodesImpl.java index f2f12c0bab..d4dd865ef1 100644 --- a/source/java/org/alfresco/rest/api/impl/NodesImpl.java +++ b/source/java/org/alfresco/rest/api/impl/NodesImpl.java @@ -2086,7 +2086,7 @@ public class NodesImpl implements Nodes { switch (field.getName().toLowerCase()) { - case "filename": + case "name": String str = getStringOrNull(field.getValue()); if ((str != null) && (! str.isEmpty())) { diff --git a/source/test-java/org/alfresco/rest/api/tests/util/MultiPartBuilder.java b/source/test-java/org/alfresco/rest/api/tests/util/MultiPartBuilder.java index 75bf45bc08..9797ea9012 100644 --- a/source/test-java/org/alfresco/rest/api/tests/util/MultiPartBuilder.java +++ b/source/test-java/org/alfresco/rest/api/tests/util/MultiPartBuilder.java @@ -257,7 +257,7 @@ public class MultiPartBuilder fp.setCharSet(fileData.getEncoding()); fp.setContentType(fileData.getMimetype()); parts.add(fp); - addPartIfNotNull(parts, "filename", fileData.getFileName()); + addPartIfNotNull(parts, "name", fileData.getFileName()); } addPartIfNotNull(parts, "relativepath", relativePath); addPartIfNotNull(parts, "updatenoderef", updateNodeRef);