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

129170 mmuller: Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1)
      128526 amorarasu: REPO-853: Improve REST fwk: Where parameter with invalid operator like where=(inval=true)
          - Added proper error message.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@129344 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

config/alfresco/messages/rest-framework-messages.properties

@@ -2,6 +2,7 @@
 framework.exception.ApiDefault=Unknown error calling the Rest API
 framework.exception.ConstraintViolated=A constraint was violated
 framework.exception.InvalidArgument=An invalid argument was received {0}
+framework.exception.InvalidProperty=The property ''{0}'' with value ''{1}'' is invalid for {2} comparison.
 framework.exception.InvalidQuery=An invalid WHERE query was received. {0}
 framework.exception.InvalidSelect=An invalid {1} query was received. {0}
 framework.exception.NotFound={0} was not found

source/java/org/alfresco/rest/workflow/api/impl/MapBasedQueryWalker.java

@@ -257,7 +257,10 @@ public class MapBasedQueryWalker extends WalkerCallbackAdapter
             }
         }
 
-        if (throwError) { throw new InvalidArgumentException(type + " is not allowed for 'scope' comparison."); }
+        if (throwError) 
+        { 
+            throw new InvalidArgumentException("framework.exception.InvalidProperty", new Object[] {propertyName, propertyValue, WhereClauseParser.tokenNames[type]});
+        }
     }
 
     public String getProperty(String propertyName, int type)