inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-08 14:51:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
136071 gjames: SEARCH-334: Adding pivot to the request


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@136101 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gethin James
2017-03-24 13:18:28 +00:00
parent 724ff9c30e
commit 696eb94564
2 changed files with 70 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
source/java/org/alfresco/repo/search/impl/solr/SolrQueryHTTPClient.java
View File

@@ -1,28 +1,28 @@
/* /*
* #%L * #%L
* Alfresco Repository * Alfresco Repository
* %% * %%
* Copyright (C) 2005 - 2016 Alfresco Software Limited * Copyright (C) 2005 - 2016 Alfresco Software Limited
* %% * %%
* This file is part of the Alfresco software. * This file is part of the Alfresco software.
* If the software was purchased under a paid Alfresco license, the terms of * If the software was purchased under a paid Alfresco license, the terms of
* the paid license agreement will prevail. Otherwise, the software is * the paid license agreement will prevail. Otherwise, the software is
* provided under the following open source license terms: * provided under the following open source license terms:
* *
* Alfresco is free software: you can redistribute it and/or modify * Alfresco is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by * it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* Alfresco is distributed in the hope that it will be useful, * Alfresco is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details. * GNU Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public License * You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>. * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
* #L% * #L%
*/ */
package org.alfresco.repo.search.impl.solr; package org.alfresco.repo.search.impl.solr;
import static org.alfresco.util.SearchDateConversion.parseDateInterval; import static org.alfresco.util.SearchDateConversion.parseDateInterval;
@@ -634,6 +634,7 @@ public class SolrQueryHTTPClient implements BeanFactoryAware, InitializingBean
} }
buildFacetParameters(searchParameters, isSharded, encoder, url); buildFacetParameters(searchParameters, isSharded, encoder, url);
buildPivotParameters(searchParameters, encoder, url);
buildFacetIntervalParameters(searchParameters, encoder, url); buildFacetIntervalParameters(searchParameters, encoder, url);
buildHightlightParameters(searchParameters, encoder, url); buildHightlightParameters(searchParameters, encoder, url);
} }
@@ -735,6 +736,15 @@ public class SolrQueryHTTPClient implements BeanFactoryAware, InitializingBean
} }
} }
protected void buildPivotParameters(SearchParameters searchParameters, URLCodec encoder, StringBuilder url) throws UnsupportedEncodingException
{
if (searchParameters.getPivots() != null && !searchParameters.getPivots().isEmpty())
{
url.append("&facet=").append(encoder.encode("true", "UTF-8"));
url.append("&facet.pivot=").append(encoder.encode(String.join(",", searchParameters.getPivots()), "UTF-8"));
}
}
protected void buildHightlightParameters(SearchParameters searchParameters, URLCodec encoder, StringBuilder url) throws UnsupportedEncodingException protected void buildHightlightParameters(SearchParameters searchParameters, URLCodec encoder, StringBuilder url) throws UnsupportedEncodingException
{ {
if (searchParameters.getHighlight() != null) if (searchParameters.getHighlight() != null)

44
source/test-java/org/alfresco/repo/search/impl/solr/SolrQueryHTTPClientTest.java
View File

@@ -101,8 +101,7 @@ public class SolrQueryHTTPClientTest
when(namespaceDAO.getPrefixes()).thenReturn(Arrays.asList(CONTENT_MODEL_PREFIX, "exif")); when(namespaceDAO.getPrefixes()).thenReturn(Arrays.asList(CONTENT_MODEL_PREFIX, "exif"));
when(namespaceDAO.getNamespaceURI(anyString())).thenReturn(NamespaceService.CONTENT_MODEL_1_0_URI); when(namespaceDAO.getNamespaceURI(anyString())).thenReturn(NamespaceService.CONTENT_MODEL_1_0_URI);
when(dictionaryService.getProperty(notNull(QName.class))).thenAnswer(invocation -> when(dictionaryService.getProperty(notNull(QName.class))).thenAnswer(invocation -> {
{
Object[] args = invocation.getArguments(); Object[] args = invocation.getArguments();
QName qName = (QName) args[0]; QName qName = (QName) args[0];
if (qName.getLocalName().contains("created")) if (qName.getLocalName().contains("created"))
@@ -309,7 +308,7 @@ public class SolrQueryHTTPClientTest
assertTrue(url.contains("&facet=true")); assertTrue(url.contains("&facet=true"));
assertTrue(url.contains("facet.field=creator")); assertTrue(url.contains("facet.field=creator"));
assertTrue(url.contains("f.creator.facet.limit=100")); assertTrue(url.contains("f.creator.facet.limit=100"));
assertTrue(url.contains("facet.field="+encoder.encode("{!afts something=right}modifier", "UTF-8"))); assertTrue(url.contains("facet.field=" + encoder.encode("{!afts something=right}modifier", "UTF-8")));
assertTrue(url.contains("f.modifier.facet.limit=100")); assertTrue(url.contains("f.modifier.facet.limit=100"));
prefixff.setLabel("myLabel"); prefixff.setLabel("myLabel");
@@ -320,9 +319,9 @@ public class SolrQueryHTTPClientTest
url = urlBuilder.toString(); url = urlBuilder.toString();
assertNotNull(url); assertNotNull(url);
assertTrue(url.contains("&facet=true")); assertTrue(url.contains("&facet=true"));
assertTrue(url.contains("facet.field="+encoder.encode("{!afts key=yourLabel}creator", "UTF-8"))); assertTrue(url.contains("facet.field=" + encoder.encode("{!afts key=yourLabel}creator", "UTF-8")));
assertTrue(url.contains("f.creator.facet.limit=100")); assertTrue(url.contains("f.creator.facet.limit=100"));
assertTrue(url.contains("facet.field="+encoder.encode("{!afts key=myLabel something=right}modifier", "UTF-8"))); assertTrue(url.contains("facet.field=" + encoder.encode("{!afts key=myLabel something=right}modifier", "UTF-8")));
assertTrue(url.contains("f.modifier.facet.limit=100")); assertTrue(url.contains("f.modifier.facet.limit=100"));
prefixff.setExcludeFilters(Arrays.asList("x", "y")); prefixff.setExcludeFilters(Arrays.asList("x", "y"));
@@ -333,9 +332,9 @@ public class SolrQueryHTTPClientTest
url = urlBuilder.toString(); url = urlBuilder.toString();
assertNotNull(url); assertNotNull(url);
assertTrue(url.contains("&facet=true")); assertTrue(url.contains("&facet=true"));
assertTrue(url.contains("facet.field="+encoder.encode("{!afts ex=B key=yourLabel}creator", "UTF-8"))); assertTrue(url.contains("facet.field=" + encoder.encode("{!afts ex=B key=yourLabel}creator", "UTF-8")));
assertTrue(url.contains("f.creator.facet.limit=100")); assertTrue(url.contains("f.creator.facet.limit=100"));
assertTrue(url.contains("facet.field="+encoder.encode("{!afts ex=x,y key=myLabel something=right}modifier", "UTF-8"))); assertTrue(url.contains("facet.field=" + encoder.encode("{!afts ex=x,y key=myLabel something=right}modifier", "UTF-8")));
assertTrue(url.contains("f.modifier.facet.limit=100")); assertTrue(url.contains("f.modifier.facet.limit=100"));
prefixff.setField("bill"); prefixff.setField("bill");
@@ -348,10 +347,37 @@ public class SolrQueryHTTPClientTest
url = urlBuilder.toString(); url = urlBuilder.toString();
assertNotNull(url); assertNotNull(url);
assertTrue(url.contains("&facet=true")); assertTrue(url.contains("&facet=true"));
assertTrue(url.contains("facet.field="+encoder.encode("{!afts ex=B}ben", "UTF-8"))); assertTrue(url.contains("facet.field=" + encoder.encode("{!afts ex=B}ben", "UTF-8")));
assertTrue(url.contains("f.ben.facet.limit=100")); assertTrue(url.contains("f.ben.facet.limit=100"));
assertTrue(url.contains("facet.field="+encoder.encode("{!afts key=myLabel}bill", "UTF-8"))); assertTrue(url.contains("facet.field=" + encoder.encode("{!afts key=myLabel}bill", "UTF-8")));
assertTrue(url.contains("f.bill.facet.limit=100")); assertTrue(url.contains("f.bill.facet.limit=100"));
} }
@Test
public void testBuildPivots() throws UnsupportedEncodingException
{
SearchParameters params = new SearchParameters();
params.setSearchTerm("bob");
params.addPivot("creator");
StringBuilder urlBuilder = new StringBuilder();
client.buildPivotParameters(params, encoder, urlBuilder);
String url = urlBuilder.toString();
assertNotNull(url);
assertTrue(url.contains("&facet=true"));
assertTrue(url.contains("facet.pivot=creator"));
params.addPivot("cm:name");
params.addPivot("{!stats=piv1}cat");
urlBuilder = new StringBuilder();
client.buildPivotParameters(params, encoder, urlBuilder);
url = urlBuilder.toString();
assertNotNull(url);
assertTrue(url.contains("&facet=true"));
assertTrue(url.contains("facet.pivot="+ encoder.encode("creator,cm:name,{!stats=piv1}cat", "UTF-8")));
}
} }