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

136097 gjames: Merged searchbcr (5.2.1) to 5.2.N (5.2.1)
      135953 msuzuki: SEARCH-374, added new response to display group faceting in buckets


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137469 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Andrei Rebegea
2017-06-15 11:00:37 +00:00
parent 1f5f8cf0ee
commit 203a0a2bb3
5 changed files with 138 additions and 24 deletions

View File

@@ -94,7 +94,7 @@ public class SerializerTestHelper implements RequestReader
}
}
private SearchQuery extractFromJson(String json) throws IOException
public SearchQuery extractFromJson(String json) throws IOException
{
Content content = mock(Content.class);
when(content.getReader()).thenReturn(new StringReader(json));