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

130027 gjames: SEARCH-120: Implementing facet queries


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@130288 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/test-java/org/alfresco/rest/api/search/ResultMapperTests.java

@@ -43,6 +43,7 @@ import org.alfresco.rest.api.model.UserInfo;
 import org.alfresco.rest.api.search.impl.ResultMapper;
 import org.alfresco.rest.api.search.model.SearchQuery;
 import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.SearchContext;
 import org.alfresco.service.ServiceRegistry;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
@@ -62,6 +63,7 @@ import org.mockito.stubbing.Answer;
 
 import java.io.Serializable;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -123,7 +125,15 @@ public class ResultMapperTests
         assertEquals(found.intValue(), collectionWithPage.getTotalItems().intValue());
         Node firstNode = collectionWithPage.getCollection().stream().findFirst().get();
         assertNotNull(firstNode.getSearch().getScore());
-        assertEquals(34l, collectionWithPage.getContext().getConsistency().getlastTxId());
+    }
+
+    @Test
+    public void testToSearchContext() throws Exception
+    {
+        ResultSet results = mockResultset(Collections.emptyList());
+        SearchContext searchContext = mapper.toSearchContext((SolrJSONResultSet) results);
+        assertEquals(34l, searchContext.getConsistency().getlastTxId());
+        assertNotNull(searchContext.getFacetQueries());
     }
 
     private ResultSet mockResultset(List<Long> archivedNodes) throws JSONException

source/test-java/org/alfresco/rest/api/search/SearchMapperTests.java

@@ -35,6 +35,7 @@ import static org.alfresco.service.cmr.search.SearchService.LANGUAGE_LUCENE;
 import static org.junit.Assert.assertNull;
 import org.alfresco.rest.api.search.impl.SearchMapper;
 import org.alfresco.rest.api.search.model.Default;
+import org.alfresco.rest.api.search.model.FacetQuery;
 import org.alfresco.rest.api.search.model.FilterQuery;
 import org.alfresco.rest.api.search.model.Query;
 import org.alfresco.rest.api.search.model.SearchQuery;
@@ -286,10 +287,27 @@ public class SearchMapperTests
         //tags aren't used at the moment
     }
 
+    @Test
+    public void fromFacetQuery() throws Exception
+    {
+        SearchParameters searchParameters = new SearchParameters();
+        //Doesn't error
+        searchMapper.fromFacetQuery(searchParameters, null);
+
+        searchMapper.fromFacetQuery(searchParameters, Arrays.asList(new FacetQuery("ping", null), new FacetQuery("pong", "table"), new FacetQuery("pang", "tennis")));
+        assertEquals(3 ,searchParameters.getFacetQueries().size());
+        assertEquals("ping" ,searchParameters.getFacetQueries().get(0));
+        assertEquals("pong" ,searchParameters.getFacetQueries().get(1));
+        assertEquals("pang" ,searchParameters.getFacetQueries().get(2));
+
+        //label isn't used at the moment
+    }
+
+
     private SearchQuery minimalQuery()
     {
         Query query = new Query("cmis", "foo", "");
-        SearchQuery sq = new SearchQuery(query,null, null, null, null, null, null);
+        SearchQuery sq = new SearchQuery(query,null, null, null, null, null, null, null);
         return sq;
     }
 }

source/test-java/org/alfresco/rest/api/search/SearchQuerySerializerTests.java

@@ -27,22 +27,18 @@ package org.alfresco.rest.api.search;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-import org.alfresco.rest.api.model.Comment;
 import org.alfresco.rest.api.search.model.Default;
 import org.alfresco.rest.api.search.model.SearchQuery;
-import org.alfresco.rest.framework.jacksonextensions.JacksonHelper;
-import org.alfresco.rest.framework.jacksonextensions.RestJsonModule;
-import org.alfresco.rest.framework.tools.ApiAssistant;
-import org.alfresco.rest.framework.tools.RequestReader;
+import org.alfresco.rest.framework.jacksonextensions.ExecutionResult;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.SearchContext;
+import org.alfresco.rest.framework.resource.parameters.SearchContext.FacetQueryResult;
+import org.alfresco.rest.framework.tests.api.mocks.Farmer;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.springframework.extensions.surf.util.Content;
-import org.springframework.extensions.webscripts.WebScriptRequest;
 
 import java.io.IOException;
-import java.io.StringReader;
+import java.util.Arrays;
 
 /**
  * Tests json -> SearchQuery deserialization
@@ -86,6 +82,25 @@ public class SearchQuerySerializerTests
         assertEquals("myquery",searchQuery.getFilterQueries().get(0).getQuery());
         assertEquals(2, searchQuery.getFilterQueries().get(0).getTags().size());
         assertEquals("myquery2",searchQuery.getFilterQueries().get(1).getQuery());
+        assertEquals(1, searchQuery.getFacetQueries().size());
+        assertEquals("facquery",searchQuery.getFacetQueries().get(0).getQuery());
+        assertEquals("facnoused",searchQuery.getFacetQueries().get(0).getLabel());
     }
 
+
+    @Test
+    public void testSerializeContext() throws IOException
+    {
+        ExecutionResult exec1 = new ExecutionResult(new Farmer("180"),null);
+        SearchContext searchContext = new SearchContext(23l, Arrays.asList(new FacetQueryResult("f1", 15), new FacetQueryResult("f2", 20)));
+        CollectionWithPagingInfo<ExecutionResult> coll = CollectionWithPagingInfo.asPaged(null, Arrays.asList(exec1), false, 2, null, searchContext);
+        String out = helper.writeResponse(coll);
+        assertTrue("There must 'context' json output", out.contains("\"context\":{\"consistency\":{\"lastTxId\":23}"));
+        assertTrue("There must 'facetQueries' json output", out.contains("\"facetQueries\":"));
+        assertTrue("There must 'facetQueries f1' json output", out.contains("{\"label\":\"f1\",\"count\":15}"));
+        assertTrue("There must 'facetQueries f2' json output", out.contains("{\"label\":\"f2\",\"count\":20}"));
+
+    }
+
+
 }

source/test-java/org/alfresco/rest/api/search/SerializerTestHelper.java

@@ -29,12 +29,18 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 import org.alfresco.rest.api.search.model.SearchQuery;
 import org.alfresco.rest.framework.jacksonextensions.JacksonHelper;
+import org.alfresco.rest.framework.jacksonextensions.JacksonHelper.Writer;
 import org.alfresco.rest.framework.jacksonextensions.RestJsonModule;
 import org.alfresco.rest.framework.tools.RequestReader;
+import org.codehaus.jackson.JsonGenerationException;
+import org.codehaus.jackson.JsonGenerator;
+import org.codehaus.jackson.map.JsonMappingException;
+import org.codehaus.jackson.map.ObjectMapper;
 import org.junit.BeforeClass;
 import org.springframework.extensions.surf.util.Content;
 import org.springframework.extensions.webscripts.WebScriptRequest;
 
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.StringReader;
 
@@ -54,6 +60,7 @@ public class SerializerTestHelper implements RequestReader
                 + "\"templates\": [{\"name\": \"mytemp\",\"template\": \"ATEMP\"}, {\"name\": \"yourtemp\",\"template\": \"%cm:content\"}],"
                 + "\"defaults\": {\"namespace\": \"namesp\",\"defaultFieldName\": \"myfield\",\"defaultFTSOperator\": \"AND\", \"textAttributes\": [\"roy\", \"king\"]},"
                 + "\"filterQueries\": [{\"query\": \"myquery\",\"tags\": [\"tag1\", \"tag2\"]},{\"query\": \"myquery2\"}],"
+                + "\"facetQueries\": [{\"query\": \"facquery\",\"label\": \"facnoused\"}],"
                 + "\"include\": [\"aspectNames\", \"properties\"]}";
 
     public SerializerTestHelper()
@@ -84,4 +91,20 @@ public class SerializerTestHelper implements RequestReader
     {
         return extractFromJson(JSON);
     }
+
+    public String writeResponse(final Object respons) throws IOException
+    {
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        jsonHelper.withWriter(out, new Writer()
+        {
+            @Override
+            public void writeContents(JsonGenerator generator, ObjectMapper objectMapper)
+                        throws JsonGenerationException, JsonMappingException, IOException
+            {
+                objectMapper.writeValue(generator, respons);
+            }
+        });
+        System.out.println(out.toString());
+        return out.toString();
+    }
 }

source/test-java/org/alfresco/rest/framework/tests/core/SerializeTests.java

@@ -236,21 +236,6 @@ public class SerializeTests extends AbstractContextTest implements RecognizedPar
         assertTrue("There must 'source' json output", StringUtils.contains(out, "\"source\":{\"name\":\"Dolly\",\"age\":3,\"sheepGuid\":\"barbie\""));
     }
 
-
-    @Test
-    public void testIncludeContext() throws IOException
-    {
-        ExecutionResult exec1 = new ExecutionResult(new Farmer("180"),null);
-        ExecutionResult exec2 = new ExecutionResult(new Farmer("456"),getFilter("age"));
-        SearchContext searchContext = new SearchContext(23l);
-        CollectionWithPagingInfo<ExecutionResult> coll = CollectionWithPagingInfo.asPaged(null, Arrays.asList(exec1, exec2), false, 2, null, searchContext);
-        Object resultCollection =  helper.processAdditionsToTheResponse(mock(WebScriptResponse.class), api, null,ParamsExtender.valueOf(false,null),coll);
-        assertNotNull(resultCollection);
-        String out = writeResponse(resultCollection);
-        assertTrue("There must 'context' json output", StringUtils.contains(out, "\"context\":{\"consistency\":{\"lastTxId\":23}}"));
-
-    }
-
     @Test
     public void testExpandRecursiveRelations() throws IOException
     {