From 2cfd6ee016ab5c5f4981c6e5c70c17a5f0a3d31f Mon Sep 17 00:00:00 2001
From: Ancuta Morarasu <ancuta.morarasu@ness.com>
Date: Wed, 11 May 2016 12:01:38 +0000
Subject: [PATCH] Merged HEAD (5.2) to 5.2.N (5.2.1)    126531 jkaabimofrad:
 Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)       123163 jvonka: RA-706,
 ACE-5113: Platform - OwnableService - when setting owner check that username
 currently exists (at time of property update)       - update Nodes API
 (remove extra check)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126875 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 config/alfresco/public-rest-context.xml        |  1 +
 .../org/alfresco/rest/api/impl/NodesImpl.java  | 18 ------------------
 .../alfresco/rest/api/tests/NodeApiTest.java   |  2 +-
 3 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/config/alfresco/public-rest-context.xml b/config/alfresco/public-rest-context.xml
index 087344e713..c4ccbdc933 100644
--- a/config/alfresco/public-rest-context.xml
+++ b/config/alfresco/public-rest-context.xml
@@ -146,6 +146,7 @@
                 <entry key="org.alfresco.rest.framework.core.exceptions.DisabledServiceException" value="#{T(org.springframework.extensions.webscripts.Status).STATUS_NOT_IMPLEMENTED}" />
                 <entry key="org.alfresco.rest.framework.core.exceptions.InsufficientStorageException" value="507" />
                 <entry key="org.alfresco.repo.node.integrity.IntegrityException" value="422" />
+                <entry key="org.alfresco.service.cmr.security.NoSuchPersonException" value="422" />
             </map>
         </property>
     </bean>
diff --git a/source/java/org/alfresco/rest/api/impl/NodesImpl.java b/source/java/org/alfresco/rest/api/impl/NodesImpl.java
index 0d089d8365..29e77875b8 100644
--- a/source/java/org/alfresco/rest/api/impl/NodesImpl.java
+++ b/source/java/org/alfresco/rest/api/impl/NodesImpl.java
@@ -1273,8 +1273,6 @@ public class NodesImpl implements Nodes
         }
         props.put(ContentModel.PROP_NAME, nodeName);
 
-        validatePropValues(props);
-
         QName assocQName = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, QName.createValidLocalName(nodeName));
         try
         {
@@ -1301,20 +1299,6 @@ public class NodesImpl implements Nodes
         }
     }
 
-    // special cases: additional validation of property values (if not done by underlying foundation services)
-    private void validatePropValues(Map<QName, Serializable> props)
-    {
-        String newOwner = (String)props.get(ContentModel.PROP_OWNER);
-        if (newOwner != null)
-        {
-            // validate that user exists
-            if (! personService.personExists(newOwner))
-            {
-                throw new InvalidArgumentException("Unknown owner: "+newOwner);
-            }
-        }
-    }
-
     @Override
     public Node updateNode(String nodeId, Node nodeInfo, Parameters parameters)
     {
@@ -1446,8 +1430,6 @@ public class NodesImpl implements Nodes
 
         if (props.size() > 0)
         {
-            validatePropValues(props);
-
             try
             {
                 // update node properties - note: null will unset the specified property
diff --git a/source/test-java/org/alfresco/rest/api/tests/NodeApiTest.java b/source/test-java/org/alfresco/rest/api/tests/NodeApiTest.java
index bd711fce63..517656dd27 100644
--- a/source/test-java/org/alfresco/rest/api/tests/NodeApiTest.java
+++ b/source/test-java/org/alfresco/rest/api/tests/NodeApiTest.java
@@ -2010,7 +2010,7 @@ public class NodeApiTest extends AbstractBaseApiTest
         dUpdate = new Document();
         dUpdate.setProperties(props);
 
-        put(URL_NODES, user1, d1Id, toJsonAsStringNonNull(dUpdate), null, 400);
+        put(URL_NODES, user1, d1Id, toJsonAsStringNonNull(dUpdate), null, 422);
 
         AuthenticationUtil.setFullyAuthenticatedUser(user2);