From 710af2f318da35029a428b742b481b638d0d0d7f Mon Sep 17 00:00:00 2001 From: Gethin James Date: Thu, 1 Jun 2017 11:23:01 +0000 Subject: [PATCH] Merged searchrep (5.2.1) to 5.2.N (5.2.1) 137015 gjames: SEARCH-451: Better error message for pivot key reuse git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137087 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../java/org/alfresco/rest/api/search/impl/SearchMapper.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/source/java/org/alfresco/rest/api/search/impl/SearchMapper.java b/source/java/org/alfresco/rest/api/search/impl/SearchMapper.java index 2d389b800f..3da76c3d49 100644 --- a/source/java/org/alfresco/rest/api/search/impl/SearchMapper.java +++ b/source/java/org/alfresco/rest/api/search/impl/SearchMapper.java @@ -655,8 +655,10 @@ public class SearchMapper if (pivotKey == null) { + String invalidMessage = searchRequestContext.getPivotKeys().values().contains(aPivot.getKey()) + ? " cannot be used more than once.":" does not reference a facet Field, range or stats."; throw new InvalidArgumentException(InvalidArgumentException.DEFAULT_MESSAGE_ID, - new Object[] { ": Pivot parameter " + aPivot.getKey() + " does not reference a facet Field, range or stats." }); + new Object[] { ": Pivot parameter " + aPivot.getKey() + invalidMessage }); } if (aPivot.getPivots() != null && !aPivot.getPivots().isEmpty() && aPivot.getPivots().size()>1)