inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-21 18:09:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Alexandru Epure
2016-08-09 14:13:02 +00:00
parent 8076a3abb3
commit b3eda064b3
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/alfresco/messages/rest-framework-messages.properties
View File

@@ -2,6 +2,7 @@
framework.exception.ApiDefault=Unknown error calling the Rest API framework.exception.ApiDefault=Unknown error calling the Rest API
framework.exception.ConstraintViolated=A constraint was violated framework.exception.ConstraintViolated=A constraint was violated
framework.exception.InvalidArgument=An invalid argument was received {0} 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.InvalidQuery=An invalid WHERE query was received. {0}
framework.exception.InvalidSelect=An invalid {1} query was received. {0} framework.exception.InvalidSelect=An invalid {1} query was received. {0}
framework.exception.NotFound={0} was not found framework.exception.NotFound={0} was not found

19
source/java/org/alfresco/rest/workflow/api/impl/MapBasedQueryWalker.java
View File

@@ -177,7 +177,7 @@ public class MapBasedQueryWalker extends WalkerCallbackAdapter
@Override @Override
public void comparison(int type, String propertyName, String propertyValue) public void comparison(int type, String propertyName, String propertyValue)
{ {
boolean throwError = false; boolean throwError = false;
if (variablesEnabled && propertyName.startsWith("variables/")) if (variablesEnabled && propertyName.startsWith("variables/"))
{ {
@@ -193,7 +193,7 @@ public class MapBasedQueryWalker extends WalkerCallbackAdapter
} }
else else
{ {
throwError = !handleUnmatchedComparison(type, propertyName, propertyValue); throwError = !handleUnmatchedComparison(type, propertyName, propertyValue);
} }
} }
else if (type == WhereClauseParser.MATCHES) else if (type == WhereClauseParser.MATCHES)
@@ -204,7 +204,7 @@ public class MapBasedQueryWalker extends WalkerCallbackAdapter
} }
else else
{ {
throwError = !handleUnmatchedComparison(type, propertyName, propertyValue); throwError = !handleUnmatchedComparison(type, propertyName, propertyValue);
} }
} }
else if (type == WhereClauseParser.GREATERTHAN) else if (type == WhereClauseParser.GREATERTHAN)
@@ -215,7 +215,7 @@ public class MapBasedQueryWalker extends WalkerCallbackAdapter
} }
else else
{ {
throwError = !handleUnmatchedComparison(type, propertyName, propertyValue); throwError = !handleUnmatchedComparison(type, propertyName, propertyValue);
} }
} }
else if (type == WhereClauseParser.GREATERTHANOREQUALS) else if (type == WhereClauseParser.GREATERTHANOREQUALS)
@@ -226,7 +226,7 @@ public class MapBasedQueryWalker extends WalkerCallbackAdapter
} }
else else
{ {
throwError = !handleUnmatchedComparison(type, propertyName, propertyValue); throwError = !handleUnmatchedComparison(type, propertyName, propertyValue);
} }
} }
else if (type == WhereClauseParser.LESSTHAN) else if (type == WhereClauseParser.LESSTHAN)
@@ -237,7 +237,7 @@ public class MapBasedQueryWalker extends WalkerCallbackAdapter
} }
else else
{ {
throwError = !handleUnmatchedComparison(type, propertyName, propertyValue); throwError = !handleUnmatchedComparison(type, propertyName, propertyValue);
} }
} }
else if (type == WhereClauseParser.LESSTHANOREQUALS) else if (type == WhereClauseParser.LESSTHANOREQUALS)
@@ -248,7 +248,7 @@ public class MapBasedQueryWalker extends WalkerCallbackAdapter
} }
else else
{ {
throwError = !handleUnmatchedComparison(type, propertyName, propertyValue); throwError = !handleUnmatchedComparison(type, propertyName, propertyValue);
} }
} }
else else
@@ -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) public String getProperty(String propertyName, int type)