From 35057d18b376268343b5f36c99efed376c78ad74 Mon Sep 17 00:00:00 2001 From: David Smiley Date: Wed, 5 Feb 2025 15:56:42 -0500 Subject: [PATCH] no null params --- .../src/java/org/apache/solr/search/facet/FacetRequest.java | 3 ++- .../java/org/apache/solr/servlet/DirectSolrConnection.java | 2 -- .../org/apache/solr/handler/admin/TestApiFramework.java | 1 - .../solr/search/SignificantTermsQParserPluginTest.java | 6 ++---- .../src/test/org/apache/solr/search/TestMinHashQParser.java | 3 ++- .../test/org/apache/solr/update/MaxSizeAutoCommitTest.java | 5 +---- 6 files changed, 7 insertions(+), 13 deletions(-) diff --git a/solr/core/src/java/org/apache/solr/search/facet/FacetRequest.java b/solr/core/src/java/org/apache/solr/search/facet/FacetRequest.java index 55c852d098c..1b1af03ff25 100644 --- a/solr/core/src/java/org/apache/solr/search/facet/FacetRequest.java +++ b/solr/core/src/java/org/apache/solr/search/facet/FacetRequest.java @@ -329,7 +329,8 @@ public Query createDomainQuery(FacetContext fcontext) { // does... wrappedFromQuery.setCache(false); - GraphQueryParser graphParser = new GraphQueryParser(null, localParams, null, fcontext.req); + GraphQueryParser graphParser = + new GraphQueryParser(null, localParams, fcontext.req.getParams(), fcontext.req); try { GraphQuery graphQuery = (GraphQuery) graphParser.parse(); graphQuery.setQ(wrappedFromQuery); diff --git a/solr/core/src/java/org/apache/solr/servlet/DirectSolrConnection.java b/solr/core/src/java/org/apache/solr/servlet/DirectSolrConnection.java index 8cb62df84d1..9b54f9319df 100644 --- a/solr/core/src/java/org/apache/solr/servlet/DirectSolrConnection.java +++ b/solr/core/src/java/org/apache/solr/servlet/DirectSolrConnection.java @@ -18,11 +18,9 @@ import java.io.StringWriter; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import org.apache.solr.common.SolrException; import org.apache.solr.common.params.CommonParams; -import org.apache.solr.common.params.MapSolrParams; import org.apache.solr.common.params.SolrParams; import org.apache.solr.common.util.ContentStream; import org.apache.solr.common.util.ContentStreamBase; diff --git a/solr/core/src/test/org/apache/solr/handler/admin/TestApiFramework.java b/solr/core/src/test/org/apache/solr/handler/admin/TestApiFramework.java index 515ad6f2d49..24c0f6c88a4 100644 --- a/solr/core/src/test/org/apache/solr/handler/admin/TestApiFramework.java +++ b/solr/core/src/test/org/apache/solr/handler/admin/TestApiFramework.java @@ -43,7 +43,6 @@ import org.apache.solr.api.V2HttpCall.CompositeApi; import org.apache.solr.client.solrj.SolrRequest; import org.apache.solr.common.annotation.JsonProperty; -import org.apache.solr.common.params.MapSolrParams; import org.apache.solr.common.params.ModifiableSolrParams; import org.apache.solr.common.params.SolrParams; import org.apache.solr.common.util.CommandOperation; diff --git a/solr/core/src/test/org/apache/solr/search/SignificantTermsQParserPluginTest.java b/solr/core/src/test/org/apache/solr/search/SignificantTermsQParserPluginTest.java index 361fd854ea6..1b623d73b12 100644 --- a/solr/core/src/test/org/apache/solr/search/SignificantTermsQParserPluginTest.java +++ b/solr/core/src/test/org/apache/solr/search/SignificantTermsQParserPluginTest.java @@ -69,8 +69,7 @@ public void testEmptyCollectionDoesNotThrow() throws Exception { QParserPlugin qParserPlugin = QParserPlugin.standardPlugins.get(SignificantTermsQParserPlugin.NAME); QParser parser = - qParserPlugin.createParser( - "", SolrParams.of("field", "cat"), SolrParams.of(), null); + qParserPlugin.createParser("", SolrParams.of("field", "cat"), SolrParams.of(), null); AnalyticsQuery query = (AnalyticsQuery) parser.parse(); SolrQueryResponse resp = new SolrQueryResponse(); @@ -103,8 +102,7 @@ public void testCollectionWithDocuments() throws Exception { Map params = new HashMap<>(); params.put("field", "cat"); QParser parser = - qParserPlugin.createParser( - "", new MapSolrParams(params), SolrParams.of(), null); + qParserPlugin.createParser("", new MapSolrParams(params), SolrParams.of(), null); AnalyticsQuery query = (AnalyticsQuery) parser.parse(); SolrQueryResponse resp = new SolrQueryResponse(); diff --git a/solr/core/src/test/org/apache/solr/search/TestMinHashQParser.java b/solr/core/src/test/org/apache/solr/search/TestMinHashQParser.java index 9f3084a9bba..dda2ce2ad38 100644 --- a/solr/core/src/test/org/apache/solr/search/TestMinHashQParser.java +++ b/solr/core/src/test/org/apache/solr/search/TestMinHashQParser.java @@ -417,7 +417,8 @@ public void testBandsWrap() throws SyntaxError { QParser qparser = h.getCore() .getQueryPlugin("minhash") - .createParser("1, 2, 3, 4, 5, 6, 7, 8, 9, 10", par.toSolrParams(), SolrParams.of(), null); + .createParser( + "1, 2, 3, 4, 5, 6, 7, 8, 9, 10", par.toSolrParams(), SolrParams.of(), null); Query query = qparser.getQuery(); BooleanQuery bq = (BooleanQuery) query; diff --git a/solr/core/src/test/org/apache/solr/update/MaxSizeAutoCommitTest.java b/solr/core/src/test/org/apache/solr/update/MaxSizeAutoCommitTest.java index 91aa6c283c8..749283cd4e7 100644 --- a/solr/core/src/test/org/apache/solr/update/MaxSizeAutoCommitTest.java +++ b/solr/core/src/test/org/apache/solr/update/MaxSizeAutoCommitTest.java @@ -19,7 +19,6 @@ import java.lang.invoke.MethodHandles; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; @@ -27,7 +26,6 @@ import java.util.function.Function; import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.client.solrj.util.ClientUtils; -import org.apache.solr.common.params.MapSolrParams; import org.apache.solr.common.params.SolrParams; import org.apache.solr.common.util.ContentStream; import org.apache.solr.core.SolrCore; @@ -231,8 +229,7 @@ private SolrQueryRequestBase constructBatchDeleteDocRequest(int batchSize) { */ private SolrQueryRequestBase constructBatchRequestHelper( int batchSize, Function requestFn) { - SolrQueryRequestBase updateReq = - new SolrQueryRequestBase(core, SolrParams.of()) {}; + SolrQueryRequestBase updateReq = new SolrQueryRequestBase(core, SolrParams.of()) {}; List docs = new ArrayList<>(); for (int i = 0; i < batchSize; i++) { docs.add(requestFn.apply(i));