Apache Solr open-source search software
SOLR-12539: handle extra spaces in JSON facet shorthand syntax
Munendra S Nd7fd3d8c20e8
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex e9d54f11079..b6e74bb1b4e 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -307,6 +307,9 @@ Bug Fixesmatches the dynamic rule. The copyFields are rebuilt with replace-field and replace-field-type, if required(Andrew Shumway, Munendra S N)+* SOLR-12539: Handle parsing of values for 'other', 'include', and 'excludeTags' in JSON facets when specified as+ comma-separated values with extra spaces (hossman, Munendra S N)+Other Changes---------------------diff --git a/solr/core/src/java/org/apache/solr/search/facet/FacetParser.java b/solr/core/src/java/org/apache/solr/search/facet/FacetParser.javaindex d8bb697503a..393dc59791a 100644--- a/solr/core/src/java/org/apache/solr/search/facet/FacetParser.java+++ b/solr/core/src/java/org/apache/solr/search/facet/FacetParser.java@@ -20,6 +20,7 @@ import java.util.List;import java.util.ArrayList;import java.util.Map;import java.util.Optional;+import java.util.stream.Collectors;import org.apache.solr.common.SolrException;import org.apache.solr.common.params.SolrParams;@@ -388,8 +389,10 @@ abstract class FacetParser<FacetRequestT extends FacetRequest> {return (List<String>)o;}if (o instanceof String) {- // TODO: SOLR-12539 handle spaces in b/w comma & value ie, should the values be trimmed before returning??- return StrUtils.splitSmart((String)o, ",", decode);+ return StrUtils.splitSmart((String)o, ",", decode).stream()+ .map(String::trim)+ .filter(s -> !s.isEmpty())+ .collect(Collectors.toList());}throw err("Expected list of string or comma separated string values for '" + paramName +diff --git a/solr/core/src/test/org/apache/solr/search/facet/RangeFacetCloudTest.java b/solr/core/src/test/org/apache/solr/search/facet/RangeFacetCloudTest.javaindex 009b864a144..bfc3a483aa0 100644--- a/solr/core/src/test/org/apache/solr/search/facet/RangeFacetCloudTest.java+++ b/solr/core/src/test/org/apache/solr/search/facet/RangeFacetCloudTest.java@@ -936,12 +936,6 @@ public class RangeFacetCloudTest extends SolrCloudTestCase {// - a JSON list of items (conveniently the default toString of EnumSet),// - a single quoted string containing the comma separated listval = val.replaceAll("\\[|\\]","'");-- // HACK: work around SOLR-12539...- //- // when sending a single string containing a comma separated list of values, JSON Facets 'other'- // parsing can't handle any leading (or trailing?) whitespace- val = val.replaceAll("\\s","");}return ", other:" + val;}diff --git a/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacets.java b/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacets.javaindex bf622b4abfa..c5a7a1d6c50 100644--- a/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacets.java+++ b/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacets.java@@ -2203,7 +2203,7 @@ public class TestJsonFacets extends SolrTestCaseHS {, "json.facet", "{ processEmpty:true," +" f1:{query:{q:'${cat_s}:B', facet:{nj:{query:'${where_s}:NJ'}, ny:{query:'${where_s}:NY'}} , excludeTags:[xyz,qaz]}}" +",f2:{query:{q:'${cat_s}:B', facet:{nj:{query:'${where_s}:NJ'}, ny:{query:'${where_s}:NY'}} , excludeTags:abc }}" +- ",f3:{query:{q:'${cat_s}:B', facet:{nj:{query:'${where_s}:NJ'}, ny:{query:'${where_s}:NY'}} , excludeTags:'xyz,abc,qaz' }}" ++ ",f3:{query:{q:'${cat_s}:B', facet:{nj:{query:'${where_s}:NJ'}, ny:{query:'${where_s}:NY'}} , excludeTags:'xyz ,abc ,qaz' }}" +",f4:{query:{q:'${cat_s}:B', facet:{nj:{query:'${where_s}:NJ'}, ny:{query:'${where_s}:NY'}} , excludeTags:[xyz , abc , qaz] }}" +",f5:{query:{q:'${cat_s}:B', facet:{nj:{query:'${where_s}:NJ'}, ny:{query:'${where_s}:NY'}} , excludeTags:[xyz,qaz]}}" + // this is repeated, but it did fail when a single context was shared among sub-facets",f6:{query:{q:'${cat_s}:B', facet:{processEmpty:true, nj:{query:'${where_s}:NJ'}, ny:{ type:query, q:'${where_s}:NY', excludeTags:abc}} }}" + // exclude in a sub-facet