From 150c78cf099df70817cb3bcd348fa4f198909508 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Tue, 6 Sep 2016 22:05:00 +0000 Subject: [PATCH] Merged 5.2.N (5.2.1) to HEAD (5.2) 130182 gjames: Merged searchapi (5.2.1) to 5.2.N (5.2.1) 129822 gjames: SEARCH-150: Adding Association git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130333 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 8ecf316e30..7cbbe56e2a 100644 --- a/source/java/org/alfresco/rest/api/search/impl/SearchMapper.java +++ b/source/java/org/alfresco/rest/api/search/impl/SearchMapper.java @@ -43,6 +43,7 @@ import org.alfresco.util.ParameterCheck; import org.apache.commons.lang.NotImplementedException; import static org.alfresco.rest.api.Nodes.PARAM_INCLUDE_ALLOWABLEOPERATIONS; +import static org.alfresco.rest.api.Nodes.PARAM_INCLUDE_ASSOCIATION; import static org.alfresco.rest.api.Nodes.PARAM_INCLUDE_ISLINK; import static org.alfresco.rest.api.Nodes.PARAM_INCLUDE_PATH; import static org.alfresco.rest.api.Nodes.PARAM_INCLUDE_ASPECTNAMES; @@ -63,7 +64,8 @@ public class SearchMapper { public static final List PERMITTED_INCLUDES = Arrays.asList(PARAM_INCLUDE_ALLOWABLEOPERATIONS,PARAM_INCLUDE_ASPECTNAMES, - PARAM_INCLUDE_ISLINK, PARAM_INCLUDE_PATH, PARAM_INCLUDE_PROPERTIES); + PARAM_INCLUDE_ISLINK, PARAM_INCLUDE_PATH, PARAM_INCLUDE_PROPERTIES, + PARAM_INCLUDE_ASSOCIATION); /** * Turn the params into the Java SearchParameters object