diff --git a/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java b/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java index 3c41e4e87da..410119cd818 100644 --- a/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java +++ b/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java @@ -38,7 +38,7 @@ import org.apache.solr.common.util.NamedList; import org.apache.solr.core.SolrCore; import org.apache.solr.handler.RequestHandlerBase; -import org.apache.solr.request.LocalSolrQueryRequest; +import org.apache.solr.request.SimpleSolrQueryRequest; import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.request.SolrRequestHandler; import org.apache.solr.response.ResultContext; @@ -503,7 +503,7 @@ public void testLocalSolrQueryRequestParams() { HashMap args = new HashMap<>(); args.put("string", "string value"); args.put("array", new String[] {"array", "value"}); - SolrQueryRequest req = new LocalSolrQueryRequest(null, null, null, 0, 20, args); + SolrQueryRequest req = new SimpleSolrQueryRequest(null, null, null, 0, 20, args); assertEquals("string value", req.getParams().get("string")); assertEquals("array", req.getParams().get("array")); @@ -592,7 +592,7 @@ public void testSolrParams() { m.put("s", "BBB"); m.put("ss", "SSS"); - LocalSolrQueryRequest req = new LocalSolrQueryRequest(null, nl); + SimpleSolrQueryRequest req = new SimpleSolrQueryRequest(null, nl); SolrParams p = req.getParams(); assertEquals(p.get("i"), "555"); diff --git a/solr/core/src/test/org/apache/solr/ConvertedLegacyTest.java b/solr/core/src/test/org/apache/solr/ConvertedLegacyTest.java index 9142db8bdf8..17f02fcaa6c 100644 --- a/solr/core/src/test/org/apache/solr/ConvertedLegacyTest.java +++ b/solr/core/src/test/org/apache/solr/ConvertedLegacyTest.java @@ -18,7 +18,7 @@ import java.util.HashMap; import java.util.Map; -import org.apache.solr.request.LocalSolrQueryRequest; +import org.apache.solr.request.SimpleSolrQueryRequest; import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.util.ErrorLogMuter; import org.junit.BeforeClass; @@ -106,7 +106,7 @@ public void testABunchOfConvertedStuff() { assertU(""); assertQ(req("val_s:[a TO z]"), "//*[@numFound='3'] ", "*[count(//doc)=3] ", "//*[@start='0']"); args = new HashMap<>(); - req = new LocalSolrQueryRequest(h.getCore(), "val_s:[a TO z]", "/select", 2, 5, args); + req = new SimpleSolrQueryRequest(h.getCore(), "val_s:[a TO z]", "/select", 2, 5, args); assertQ( req, "//*[@numFound='3'] ", @@ -114,42 +114,42 @@ public void testABunchOfConvertedStuff() { "*//doc[1]/str[.='pear'] ", "//*[@start='2']"); args = new HashMap<>(); - req = new LocalSolrQueryRequest(h.getCore(), "val_s:[a TO z]", "/select", 3, 5, args); + req = new SimpleSolrQueryRequest(h.getCore(), "val_s:[a TO z]", "/select", 3, 5, args); assertQ(req, "//*[@numFound='3'] ", "*[count(//doc)=0]"); args = new HashMap<>(); - req = new LocalSolrQueryRequest(h.getCore(), "val_s:[a TO z]", "/select", 4, 5, args); + req = new SimpleSolrQueryRequest(h.getCore(), "val_s:[a TO z]", "/select", 4, 5, args); assertQ(req, "//*[@numFound='3'] ", "*[count(//doc)=0]"); args = new HashMap<>(); - req = new LocalSolrQueryRequest(h.getCore(), "val_s:[a TO z]", "/select", 25, 5, args); + req = new SimpleSolrQueryRequest(h.getCore(), "val_s:[a TO z]", "/select", 25, 5, args); assertQ(req, "//*[@numFound='3'] ", "*[count(//doc)=0]"); args = new HashMap<>(); - req = new LocalSolrQueryRequest(h.getCore(), "val_s:[a TO z]", "/select", 0, 1, args); + req = new SimpleSolrQueryRequest(h.getCore(), "val_s:[a TO z]", "/select", 0, 1, args); assertQ(req, "//*[@numFound='3'] ", "*[count(//doc)=1] ", "*//doc[1]/str[.='apple']"); args = new HashMap<>(); - req = new LocalSolrQueryRequest(h.getCore(), "val_s:[a TO z]", "/select", 0, 2, args); + req = new SimpleSolrQueryRequest(h.getCore(), "val_s:[a TO z]", "/select", 0, 2, args); assertQ(req, "//*[@numFound='3'] ", "*[count(//doc)=2] ", "*//doc[2]/str[.='banana']"); args = new HashMap<>(); - req = new LocalSolrQueryRequest(h.getCore(), "val_s:[a TO z]", "/select", 1, 1, args); + req = new SimpleSolrQueryRequest(h.getCore(), "val_s:[a TO z]", "/select", 1, 1, args); assertQ(req, "//*[@numFound='3'] ", "*[count(//doc)=1] ", "*//doc[1]/str[.='banana']"); args = new HashMap<>(); - req = new LocalSolrQueryRequest(h.getCore(), "val_s:[a TO z]", "/select", 3, 1, args); + req = new SimpleSolrQueryRequest(h.getCore(), "val_s:[a TO z]", "/select", 3, 1, args); assertQ(req, "//*[@numFound='3'] ", "*[count(//doc)=0]"); args = new HashMap<>(); - req = new LocalSolrQueryRequest(h.getCore(), "val_s:[a TO z]", "/select", 4, 1, args); + req = new SimpleSolrQueryRequest(h.getCore(), "val_s:[a TO z]", "/select", 4, 1, args); assertQ(req, "//*[@numFound='3'] ", "*[count(//doc)=0]"); args = new HashMap<>(); - req = new LocalSolrQueryRequest(h.getCore(), "val_s:[a TO z]", "/select", 1, 0, args); + req = new SimpleSolrQueryRequest(h.getCore(), "val_s:[a TO z]", "/select", 1, 0, args); assertQ(req, "//*[@numFound='3'] ", "*[count(//doc)=0]"); args = new HashMap<>(); - req = new LocalSolrQueryRequest(h.getCore(), "val_s:[a TO z]", "/select", 0, 0, args); + req = new SimpleSolrQueryRequest(h.getCore(), "val_s:[a TO z]", "/select", 0, 0, args); assertQ(req, "//*[@numFound='3'] ", "*[count(//doc)=0]"); args = new HashMap<>(); args.put("sort", "val_s1 asc"); - req = new LocalSolrQueryRequest(h.getCore(), "val_s:[a TO z]", "/select", 0, 0, args); + req = new SimpleSolrQueryRequest(h.getCore(), "val_s:[a TO z]", "/select", 0, 0, args); assertQ(req, "//*[@numFound='3'] ", "*[count(//doc)=0]"); args = new HashMap<>(); args.put("sort", "val_s1 desc"); - req = new LocalSolrQueryRequest(h.getCore(), "val_s:[a TO z]", "/select", 0, 0, args); + req = new SimpleSolrQueryRequest(h.getCore(), "val_s:[a TO z]", "/select", 0, 0, args); assertQ(req, "//*[@numFound='3'] ", "*[count(//doc)=0]"); assertQ(req("val_s:[a TO b]"), "//*[@numFound='1']"); assertQ(req("val_s:[a TO cat]"), "//*[@numFound='2']"); @@ -808,18 +808,18 @@ public void testABunchOfConvertedStuff() { assertQ(req("id:44")); args = new HashMap<>(); args.put("fl", "fname_s,arr_f "); - req = new LocalSolrQueryRequest(h.getCore(), "id:44", "/select", 0, 10, args); + req = new SimpleSolrQueryRequest(h.getCore(), "id:44", "/select", 0, 10, args); assertQ(req, "//str[.='Yonik'] ", "//float[.='1.4142135']"); args = new HashMap<>(); args.put("fl", "fname_s,score"); - req = new LocalSolrQueryRequest(h.getCore(), "id:44", "/select", 0, 10, args); + req = new SimpleSolrQueryRequest(h.getCore(), "id:44", "/select", 0, 10, args); assertQ(req, "//str[.='Yonik']", "//float[@name='score' and . > 0]"); // test addition of score field args = new HashMap<>(); args.put("fl", "score,* "); - req = new LocalSolrQueryRequest(h.getCore(), "id:44", "/select", 0, 10, args); + req = new SimpleSolrQueryRequest(h.getCore(), "id:44", "/select", 0, 10, args); assertQ( req, "//str[.='Yonik'] ", @@ -828,7 +828,7 @@ public void testABunchOfConvertedStuff() { "*[count(//doc/*)>=13]"); args = new HashMap<>(); args.put("fl", "*,score "); - req = new LocalSolrQueryRequest(h.getCore(), "id:44", "/select", 0, 10, args); + req = new SimpleSolrQueryRequest(h.getCore(), "id:44", "/select", 0, 10, args); assertQ( req, "//str[.='Yonik'] ", @@ -837,33 +837,33 @@ public void testABunchOfConvertedStuff() { "*[count(//doc/*)>=13]"); args = new HashMap<>(); args.put("fl", "* "); - req = new LocalSolrQueryRequest(h.getCore(), "id:44", "/select", 0, 10, args); + req = new SimpleSolrQueryRequest(h.getCore(), "id:44", "/select", 0, 10, args); assertQ(req, "//str[.='Yonik'] ", "//float[.='1.4142135'] ", "*[count(//doc/*)>=12]"); // test maxScore args = new HashMap<>(); args.put("fl", "score "); - req = new LocalSolrQueryRequest(h.getCore(), "id:44", "/select", 0, 10, args); + req = new SimpleSolrQueryRequest(h.getCore(), "id:44", "/select", 0, 10, args); assertQ(req, "//result[@maxScore>0]"); args = new HashMap<>(); args.put("fl", "score "); args.put("sort", "id desc"); - req = new LocalSolrQueryRequest(h.getCore(), "id:44", "/select", 0, 10, args); + req = new SimpleSolrQueryRequest(h.getCore(), "id:44", "/select", 0, 10, args); assertQ(req, "//result[@maxScore>0]"); args = new HashMap<>(); args.put("fl", "score "); - req = new LocalSolrQueryRequest(h.getCore(), "id:44", "/select", 0, 10, args); + req = new SimpleSolrQueryRequest(h.getCore(), "id:44", "/select", 0, 10, args); assertQ(req, "//@maxScore = //doc/float[@name='score']"); args = new HashMap<>(); args.put("fl", "score "); args.put("sort", "id desc"); - req = new LocalSolrQueryRequest(h.getCore(), "id:44", "/select", 0, 10, args); + req = new SimpleSolrQueryRequest(h.getCore(), "id:44", "/select", 0, 10, args); assertQ(req, "//@maxScore = //doc/float[@name='score']"); args = new HashMap<>(); args.put("fl", "*,score"); args.put("sort", "id desc"); - req = new LocalSolrQueryRequest(h.getCore(), "id:44", "/select", 0, 0, args); + req = new SimpleSolrQueryRequest(h.getCore(), "id:44", "/select", 0, 0, args); assertQ(req, "//result[@maxScore>0]"); // test schema field attribute inheritance and overriding diff --git a/solr/core/src/test/org/apache/solr/TestCrossCoreJoin.java b/solr/core/src/test/org/apache/solr/TestCrossCoreJoin.java index a4ba1f26e68..d4f23906a77 100644 --- a/solr/core/src/test/org/apache/solr/TestCrossCoreJoin.java +++ b/solr/core/src/test/org/apache/solr/TestCrossCoreJoin.java @@ -22,7 +22,7 @@ import org.apache.solr.common.params.ModifiableSolrParams; import org.apache.solr.core.CoreContainer; import org.apache.solr.core.SolrCore; -import org.apache.solr.request.LocalSolrQueryRequest; +import org.apache.solr.request.SimpleSolrQueryRequest; import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.request.SolrRequestHandler; import org.apache.solr.request.SolrRequestInfo; @@ -213,7 +213,7 @@ void doTestJoin(String joinPrefix) throws Exception { public void testCoresAreDifferent() throws Exception { assertQEx("schema12.xml" + " has no \"cat\" field", req("cat:*"), ErrorCode.BAD_REQUEST); try (var req = - new LocalSolrQueryRequest(fromCore, "cat:*", "/select", 0, 100, Collections.emptyMap())) { + new SimpleSolrQueryRequest(fromCore, "cat:*", "/select", 0, 100, Collections.emptyMap())) { final String resp = query(fromCore, req); assertTrue(resp, resp.contains("numFound=\"1\"")); assertTrue(resp, resp.contains("10")); diff --git a/solr/core/src/test/org/apache/solr/core/TestLazyCores.java b/solr/core/src/test/org/apache/solr/core/TestLazyCores.java index 87e8c336920..63535143e8c 100644 --- a/solr/core/src/test/org/apache/solr/core/TestLazyCores.java +++ b/solr/core/src/test/org/apache/solr/core/TestLazyCores.java @@ -31,7 +31,7 @@ import org.apache.solr.common.SolrException; import org.apache.solr.common.params.CoreAdminParams; import org.apache.solr.handler.admin.CoreAdminHandler; -import org.apache.solr.request.LocalSolrQueryRequest; +import org.apache.solr.request.SimpleSolrQueryRequest; import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.response.SolrQueryResponse; import org.apache.solr.update.AddUpdateCommand; @@ -590,8 +590,8 @@ private void addLazy(SolrCore core, String... fieldValues) throws IOException { updater.addDoc(cmd); } - private LocalSolrQueryRequest makeReq(SolrCore core, String... paramPairs) { - return new LocalSolrQueryRequest(core, params(paramPairs)); + private SimpleSolrQueryRequest makeReq(SolrCore core, String... paramPairs) { + return new SimpleSolrQueryRequest(core, params(paramPairs)); } @Test diff --git a/solr/core/src/test/org/apache/solr/handler/FieldAnalysisRequestHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/FieldAnalysisRequestHandlerTest.java index 36b293ed8ab..d2f61915c4d 100644 --- a/solr/core/src/test/org/apache/solr/handler/FieldAnalysisRequestHandlerTest.java +++ b/solr/core/src/test/org/apache/solr/handler/FieldAnalysisRequestHandlerTest.java @@ -41,7 +41,7 @@ import org.apache.solr.common.params.CommonParams; import org.apache.solr.common.params.ModifiableSolrParams; import org.apache.solr.common.util.NamedList; -import org.apache.solr.request.LocalSolrQueryRequest; +import org.apache.solr.request.SimpleSolrQueryRequest; import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.schema.FieldType; import org.apache.solr.schema.TextField; @@ -101,7 +101,7 @@ public void testResolveAnalysisRequest() { params.add(AnalysisParams.FIELD_VALUE, "the quick red fox jumped over the lazy brown dogs"); params.add(CommonParams.Q, "fox brown"); - SolrQueryRequest req = new LocalSolrQueryRequest(h.getCore(), params); + SolrQueryRequest req = new SimpleSolrQueryRequest(h.getCore(), params); FieldAnalysisRequest request = handler.resolveAnalysisRequest(req); List fieldNames = request.getFieldNames(); assertEquals("Expecting 2 field names", 2, fieldNames.size()); @@ -118,20 +118,20 @@ public void testResolveAnalysisRequest() { // testing override of query value using analysis.query param params.add(AnalysisParams.QUERY, "quick lazy"); - req = new LocalSolrQueryRequest(h.getCore(), params); + req = new SimpleSolrQueryRequest(h.getCore(), params); request = handler.resolveAnalysisRequest(req); assertEquals("quick lazy", request.getQuery()); req.close(); // testing analysis.showmatch param params.add(AnalysisParams.SHOW_MATCH, "false"); - req = new LocalSolrQueryRequest(h.getCore(), params); + req = new SimpleSolrQueryRequest(h.getCore(), params); request = handler.resolveAnalysisRequest(req); assertFalse(request.isShowMatch()); req.close(); params.set(AnalysisParams.SHOW_MATCH, "true"); - req = new LocalSolrQueryRequest(h.getCore(), params); + req = new SimpleSolrQueryRequest(h.getCore(), params); request = handler.resolveAnalysisRequest(req); assertTrue(request.isShowMatch()); req.close(); @@ -139,7 +139,7 @@ public void testResolveAnalysisRequest() { // testing absence of query value params.remove(CommonParams.Q); params.remove(AnalysisParams.QUERY); - req = new LocalSolrQueryRequest(h.getCore(), params); + req = new SimpleSolrQueryRequest(h.getCore(), params); request = handler.resolveAnalysisRequest(req); assertNull(request.getQuery()); req.close(); @@ -162,7 +162,7 @@ public void testResolveAnalysisRequest() { params.remove(CommonParams.Q); params.remove(AnalysisParams.QUERY); params.remove(AnalysisParams.FIELD_VALUE); - try (SolrQueryRequest solrQueryRequest = new LocalSolrQueryRequest(h.getCore(), params)) { + try (SolrQueryRequest solrQueryRequest = new SimpleSolrQueryRequest(h.getCore(), params)) { SolrException ex = expectThrows(SolrException.class, () -> handler.resolveAnalysisRequest(solrQueryRequest)); assertEquals(SolrException.ErrorCode.BAD_REQUEST.code, ex.code()); @@ -813,7 +813,7 @@ public TokenStream create(TokenStream input) { public void testNoDefaultField() { ModifiableSolrParams params = new ModifiableSolrParams(); params.add(CommonParams.Q, "fox brown"); - SolrQueryRequest req = new LocalSolrQueryRequest(h.getCore(), params); + SolrQueryRequest req = new SimpleSolrQueryRequest(h.getCore(), params); handler.resolveAnalysisRequest(req); } diff --git a/solr/core/src/test/org/apache/solr/handler/MoreLikeThisHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/MoreLikeThisHandlerTest.java index df7ec8ecb38..7c3673bbd7b 100644 --- a/solr/core/src/test/org/apache/solr/handler/MoreLikeThisHandlerTest.java +++ b/solr/core/src/test/org/apache/solr/handler/MoreLikeThisHandlerTest.java @@ -26,7 +26,7 @@ import org.apache.solr.common.util.ContentStreamBase; import org.apache.solr.core.SolrCore; import org.apache.solr.handler.component.FacetComponent; -import org.apache.solr.request.LocalSolrQueryRequest; +import org.apache.solr.request.SimpleSolrQueryRequest; import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.request.SolrQueryRequestBase; import org.apache.solr.response.SolrQueryResponse; @@ -169,7 +169,7 @@ public void testInterface() { params.set(CommonParams.Q, "id:42"); - try (SolrQueryRequest mltreq = new LocalSolrQueryRequest(core, params)) { + try (SolrQueryRequest mltreq = new SimpleSolrQueryRequest(core, params)) { assertQ( "morelikethis - tom cruise", mltreq, @@ -179,7 +179,7 @@ public void testInterface() { params.set(MoreLikeThisParams.BOOST, "true"); - try (SolrQueryRequest mltreq = new LocalSolrQueryRequest(core, params)) { + try (SolrQueryRequest mltreq = new SimpleSolrQueryRequest(core, params)) { assertQ( "morelikethis - tom cruise", mltreq, @@ -188,13 +188,13 @@ public void testInterface() { } params.set(CommonParams.Q, "id:44"); - try (SolrQueryRequest mltreq = new LocalSolrQueryRequest(core, params)) { + try (SolrQueryRequest mltreq = new SimpleSolrQueryRequest(core, params)) { assertQ("morelike this - harrison ford", mltreq, "//result/doc[1]/str[@name='id'][.='45']"); } // test MoreLikeThis debug params.set(CommonParams.DEBUG_QUERY, "true"); - try (SolrQueryRequest mltreq = new LocalSolrQueryRequest(core, params)) { + try (SolrQueryRequest mltreq = new SimpleSolrQueryRequest(core, params)) { assertQ( "morelike this - harrison ford", mltreq, @@ -207,13 +207,13 @@ public void testInterface() { // test that qparser plugins work params.remove(CommonParams.DEBUG_QUERY); params.set(CommonParams.Q, "{!field f=id}44"); - try (SolrQueryRequest mltreq = new LocalSolrQueryRequest(core, params)) { + try (SolrQueryRequest mltreq = new SimpleSolrQueryRequest(core, params)) { assertQ(mltreq, "//result/doc[1]/str[@name='id'][.='45']"); } params.set(CommonParams.Q, "id:42"); params.set(MoreLikeThisParams.QF, "name^5.0 subword^0.1"); - try (SolrQueryRequest mltreq = new LocalSolrQueryRequest(core, params)) { + try (SolrQueryRequest mltreq = new SimpleSolrQueryRequest(core, params)) { assertQ( "morelikethis with weights", mltreq, @@ -224,14 +224,14 @@ public void testInterface() { // test that qparser plugins work w/ the MoreLikeThisHandler params.set(CommonParams.QT, "/mlt"); params.set(CommonParams.Q, "{!field f=id}44"); - try (SolrQueryRequest mltreq = new LocalSolrQueryRequest(core, params)) { + try (SolrQueryRequest mltreq = new SimpleSolrQueryRequest(core, params)) { assertQ(mltreq, "//result/doc[1]/str[@name='id'][.='45']"); } // test that debugging works (test for MoreLikeThis*Handler*) params.set(CommonParams.QT, "/mlt"); params.set(CommonParams.DEBUG_QUERY, "true"); - try (SolrQueryRequest mltreq = new LocalSolrQueryRequest(core, params)) { + try (SolrQueryRequest mltreq = new SimpleSolrQueryRequest(core, params)) { assertQ( mltreq, "//result/doc[1]/str[@name='id'][.='45']", @@ -240,7 +240,7 @@ public void testInterface() { params.set(FacetComponent.COMPONENT_NAME, "true"); params.set("facet.field", "name"); - try (SolrQueryRequest mltreq = new LocalSolrQueryRequest(core, params)) { + try (SolrQueryRequest mltreq = new SimpleSolrQueryRequest(core, params)) { assertQ( mltreq, "//result/doc[1]/str[@name='id'][.='45']", @@ -248,7 +248,7 @@ public void testInterface() { } params.set("facet.field", "{!ex=tg}name"); params.set("fq", "{!tag=tg}name:George"); - try (SolrQueryRequest mltreq = new LocalSolrQueryRequest(core, params)) { + try (SolrQueryRequest mltreq = new SimpleSolrQueryRequest(core, params)) { assertQ( mltreq, "//result/doc[1]/str[@name='id'][.='45']", diff --git a/solr/core/src/test/org/apache/solr/handler/RequestHandlerBaseTest.java b/solr/core/src/test/org/apache/solr/handler/RequestHandlerBaseTest.java index b1a88291a2d..70ae8b602d9 100644 --- a/solr/core/src/test/org/apache/solr/handler/RequestHandlerBaseTest.java +++ b/solr/core/src/test/org/apache/solr/handler/RequestHandlerBaseTest.java @@ -39,7 +39,7 @@ import org.apache.solr.core.CoreContainer; import org.apache.solr.core.SolrCore; import org.apache.solr.metrics.SolrMetricsContext; -import org.apache.solr.request.LocalSolrQueryRequest; +import org.apache.solr.request.SimpleSolrQueryRequest; import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.search.SyntaxError; import org.junit.Before; @@ -110,7 +110,7 @@ public void testEach4xxSolrExceptionIncrementsTheClientErrorCount() { @Test public void testReceivedSyntaxErrorsAreWrappedIn400SolrException() { final SolrQueryRequest solrQueryRequest = - new LocalSolrQueryRequest(solrCore, new ModifiableSolrParams()) { + new SimpleSolrQueryRequest(solrCore, new ModifiableSolrParams()) { @Override public CoreContainer getCoreContainer() { return coreContainer; @@ -128,7 +128,7 @@ public CoreContainer getCoreContainer() { @Test public void testReceivedNonTragicNonSolrExceptionsAreNotModified() { final SolrQueryRequest solrQueryRequest = - new LocalSolrQueryRequest(solrCore, new ModifiableSolrParams()) { + new SimpleSolrQueryRequest(solrCore, new ModifiableSolrParams()) { @Override public CoreContainer getCoreContainer() { return coreContainer; @@ -145,7 +145,7 @@ public CoreContainer getCoreContainer() { public void testTragicNonSolrExceptionsAreWrappedInA500SolrException() { when(coreContainer.checkTragicException(solrCore)).thenReturn(true); final SolrQueryRequest solrQueryRequest = - new LocalSolrQueryRequest(solrCore, new ModifiableSolrParams()) { + new SimpleSolrQueryRequest(solrCore, new ModifiableSolrParams()) { @Override public CoreContainer getCoreContainer() { return coreContainer; @@ -163,7 +163,7 @@ public CoreContainer getCoreContainer() { @Test public void testIsInternalShardRequest() { final SolrQueryRequest solrQueryRequest = - new LocalSolrQueryRequest(solrCore, new ModifiableSolrParams()) { + new SimpleSolrQueryRequest(solrCore, new ModifiableSolrParams()) { @Override public CoreContainer getCoreContainer() { return coreContainer; diff --git a/solr/core/src/test/org/apache/solr/handler/TestCSVLoader.java b/solr/core/src/test/org/apache/solr/handler/TestCSVLoader.java index 9f1f0beefb1..1fd5676dc39 100644 --- a/solr/core/src/test/org/apache/solr/handler/TestCSVLoader.java +++ b/solr/core/src/test/org/apache/solr/handler/TestCSVLoader.java @@ -25,7 +25,7 @@ import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.common.util.ContentStream; import org.apache.solr.common.util.ContentStreamBase; -import org.apache.solr.request.LocalSolrQueryRequest; +import org.apache.solr.request.SimpleSolrQueryRequest; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; @@ -77,7 +77,7 @@ void cleanup() { } void loadLocal(String... args) throws Exception { - LocalSolrQueryRequest req = (LocalSolrQueryRequest) req(args); + SimpleSolrQueryRequest req = (SimpleSolrQueryRequest) req(args); // TODO: stop using locally defined streams once stream.file and // stream.body work everywhere diff --git a/solr/core/src/test/org/apache/solr/handler/V2ClusterAPIMappingTest.java b/solr/core/src/test/org/apache/solr/handler/V2ClusterAPIMappingTest.java index 6410dc60a47..1d6ecb144ee 100644 --- a/solr/core/src/test/org/apache/solr/handler/V2ClusterAPIMappingTest.java +++ b/solr/core/src/test/org/apache/solr/handler/V2ClusterAPIMappingTest.java @@ -37,7 +37,7 @@ import org.apache.solr.common.util.ContentStreamBase; import org.apache.solr.handler.admin.CollectionsHandler; import org.apache.solr.handler.admin.ConfigSetsHandler; -import org.apache.solr.request.LocalSolrQueryRequest; +import org.apache.solr.request.SimpleSolrQueryRequest; import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.response.SolrQueryResponse; import org.junit.Before; @@ -138,8 +138,8 @@ private SolrParams doCaptureParams( final HashMap parts = new HashMap<>(); final Api api = apiBag.lookup(path, method, parts); final SolrQueryResponse rsp = new SolrQueryResponse(); - final LocalSolrQueryRequest req = - new LocalSolrQueryRequest(null, Map.of()) { + final SimpleSolrQueryRequest req = + new SimpleSolrQueryRequest(null, Map.of()) { @Override public List getCommands(boolean validateInput) { if (v2RequestBody == null) return Collections.emptyList(); diff --git a/solr/core/src/test/org/apache/solr/handler/V2UpdateAPIMappingTest.java b/solr/core/src/test/org/apache/solr/handler/V2UpdateAPIMappingTest.java index f030525fb03..5c09c305faf 100644 --- a/solr/core/src/test/org/apache/solr/handler/V2UpdateAPIMappingTest.java +++ b/solr/core/src/test/org/apache/solr/handler/V2UpdateAPIMappingTest.java @@ -29,7 +29,7 @@ import org.apache.solr.api.ApiBag; import org.apache.solr.common.util.CommandOperation; import org.apache.solr.handler.admin.api.UpdateAPI; -import org.apache.solr.request.LocalSolrQueryRequest; +import org.apache.solr.request.SimpleSolrQueryRequest; import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.response.SolrQueryResponse; import org.junit.Before; @@ -89,8 +89,8 @@ private SolrQueryRequest runUpdateApi(String path) { final HashMap parts = new HashMap<>(); final Api api = apiBag.lookup(path, "POST", parts); final SolrQueryResponse rsp = new SolrQueryResponse(); - final LocalSolrQueryRequest req = - new LocalSolrQueryRequest(null, Map.of()) { + final SimpleSolrQueryRequest req = + new SimpleSolrQueryRequest(null, Map.of()) { @Override public List getCommands(boolean validateInput) { return Collections.emptyList(); diff --git a/solr/core/src/test/org/apache/solr/handler/admin/SecurityConfHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/SecurityConfHandlerTest.java index c9335b2a7b6..92567b7324a 100644 --- a/solr/core/src/test/org/apache/solr/handler/admin/SecurityConfHandlerTest.java +++ b/solr/core/src/test/org/apache/solr/handler/admin/SecurityConfHandlerTest.java @@ -28,7 +28,7 @@ import org.apache.solr.common.util.CommandOperation; import org.apache.solr.common.util.ContentStreamBase; import org.apache.solr.common.util.Utils; -import org.apache.solr.request.LocalSolrQueryRequest; +import org.apache.solr.request.SimpleSolrQueryRequest; import org.apache.solr.response.SolrQueryResponse; import org.apache.solr.security.BasicAuthPlugin; import org.apache.solr.security.RuleBasedAuthorizationPlugin; @@ -43,7 +43,7 @@ public void testEdit() throws Exception { + "'set-user': {'tom':'TomIsCool'},\n" + "'set-user':{ 'tom':'TomIsUberCool'}\n" + "}"; - LocalSolrQueryRequest req = new LocalSolrQueryRequest(null, new ModifiableSolrParams()); + SimpleSolrQueryRequest req = new SimpleSolrQueryRequest(null, new ModifiableSolrParams()); req.getContext().put("httpMethod", "POST"); req.getContext().put("path", "/admin/authentication"); ContentStreamBase.ByteArrayStream o = @@ -76,7 +76,7 @@ public void testEdit() throws Exception { + " 'role': 'admin'}\n" + "}"; - req = new LocalSolrQueryRequest(null, new ModifiableSolrParams()); + req = new SimpleSolrQueryRequest(null, new ModifiableSolrParams()); req.getContext().put("httpMethod", "POST"); req.getContext().put("path", "/admin/authorization"); o = new ContentStreamBase.ByteArrayStream(command.getBytes(StandardCharsets.UTF_8), ""); @@ -100,7 +100,7 @@ public void testEdit() throws Exception { + "'set-permission':{index : 2, name : security-edit,\n" + " 'role': ['admin','dev']\n" + " }}"; - req = new LocalSolrQueryRequest(null, new ModifiableSolrParams()); + req = new SimpleSolrQueryRequest(null, new ModifiableSolrParams()); req.getContext().put("httpMethod", "POST"); req.getContext().put("path", "/admin/authorization"); o = new ContentStreamBase.ByteArrayStream(command.getBytes(StandardCharsets.UTF_8), ""); @@ -121,7 +121,7 @@ public void testEdit() throws Exception { + "'update-permission':{'index': 1,\n" + " 'role': ['guest','admin']\n" + " }}"; - req = new LocalSolrQueryRequest(null, new ModifiableSolrParams()); + req = new SimpleSolrQueryRequest(null, new ModifiableSolrParams()); req.getContext().put("httpMethod", "POST"); req.getContext().put("path", "/admin/authorization"); o = new ContentStreamBase.ByteArrayStream(command.getBytes(StandardCharsets.UTF_8), ""); @@ -138,7 +138,7 @@ public void testEdit() throws Exception { assertEquals("admin", rol.get(1)); command = "{\n" + "delete-permission: 1,\n" + " set-user-role : { tom :null}\n" + "}"; - req = new LocalSolrQueryRequest(null, new ModifiableSolrParams()); + req = new SimpleSolrQueryRequest(null, new ModifiableSolrParams()); req.getContext().put("httpMethod", "POST"); req.getContext().put("path", "/admin/authorization"); o = new ContentStreamBase.ByteArrayStream(command.getBytes(StandardCharsets.UTF_8), ""); @@ -162,7 +162,7 @@ public void testEdit() throws Exception { + " 'method':'POST'," + " 'role': 'admin'\n" + " }}"; - req = new LocalSolrQueryRequest(null, new ModifiableSolrParams()); + req = new SimpleSolrQueryRequest(null, new ModifiableSolrParams()); req.getContext().put("httpMethod", "POST"); req.getContext().put("path", "/admin/authorization"); o = new ContentStreamBase.ByteArrayStream(command.getBytes(StandardCharsets.UTF_8), ""); @@ -236,7 +236,7 @@ protected boolean persistConf(SecurityConfig props) { public String getStandardJson() throws Exception { String command = "{\n" + "'set-user': {'solr':'SolrRocks'}\n" + "}"; - LocalSolrQueryRequest req = new LocalSolrQueryRequest(null, new ModifiableSolrParams()); + SimpleSolrQueryRequest req = new SimpleSolrQueryRequest(null, new ModifiableSolrParams()); req.getContext().put("httpMethod", "POST"); req.getContext().put("path", "/admin/authentication"); ContentStreamBase.ByteArrayStream o = @@ -248,7 +248,7 @@ public String getStandardJson() throws Exception { "{'set-user-role': { 'solr': 'admin'},\n" + "'set-permission':{'name': 'security-edit', 'role': 'admin'}" + "}"; - req = new LocalSolrQueryRequest(null, new ModifiableSolrParams()); + req = new SimpleSolrQueryRequest(null, new ModifiableSolrParams()); req.getContext().put("httpMethod", "POST"); req.getContext().put("path", "/admin/authorization"); o = new ContentStreamBase.ByteArrayStream(command.getBytes(StandardCharsets.UTF_8), ""); diff --git a/solr/core/src/test/org/apache/solr/handler/admin/ShowFileRequestHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/ShowFileRequestHandlerTest.java index 2edb04cb47b..4cce7e8424a 100644 --- a/solr/core/src/test/org/apache/solr/handler/admin/ShowFileRequestHandlerTest.java +++ b/solr/core/src/test/org/apache/solr/handler/admin/ShowFileRequestHandlerTest.java @@ -34,7 +34,7 @@ import org.apache.solr.common.util.ContentStreamBase; import org.apache.solr.common.util.NamedList; import org.apache.solr.core.SolrCore; -import org.apache.solr.request.LocalSolrQueryRequest; +import org.apache.solr.request.SimpleSolrQueryRequest; import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.request.SolrRequestHandler; import org.apache.solr.response.SolrQueryResponse; @@ -125,7 +125,7 @@ public Set getContentTypes() { public void testContentTypeHtmlBecomesTextPlain() { SolrRequestHandler handler = h.getCore().getRequestHandler("/admin/file"); SolrQueryRequest req = - new LocalSolrQueryRequest( + new SimpleSolrQueryRequest( h.getCore(), params("file", "schema.xml", "contentType", "text/html")); SolrQueryResponse rsp = new SolrQueryResponse(); handler.handleRequest(req, rsp); @@ -136,7 +136,7 @@ public void testContentTypeHtmlBecomesTextPlain() { public void testContentTypeHtmlDefault() { SolrRequestHandler handler = h.getCore().getRequestHandler("/admin/file"); - SolrQueryRequest req = new LocalSolrQueryRequest(h.getCore(), params("file", "example.html")); + SolrQueryRequest req = new SimpleSolrQueryRequest(h.getCore(), params("file", "example.html")); SolrQueryResponse rsp = new SolrQueryResponse(); handler.handleRequest(req, rsp); ContentStreamBase.FileStream content = 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 9704269bbbd..a2993b64958 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 @@ -64,7 +64,7 @@ import org.apache.solr.handler.PingRequestHandler; import org.apache.solr.handler.SchemaHandler; import org.apache.solr.handler.SolrConfigHandler; -import org.apache.solr.request.LocalSolrQueryRequest; +import org.apache.solr.request.SimpleSolrQueryRequest; import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.request.SolrQueryRequestBase; import org.apache.solr.request.SolrRequestHandler; @@ -304,8 +304,8 @@ private SolrQueryResponse invoke( } SolrQueryResponse rsp = new SolrQueryResponse(); - LocalSolrQueryRequest req = - new LocalSolrQueryRequest(null, SolrParams.of()) { + SimpleSolrQueryRequest req = + new SimpleSolrQueryRequest(null, SolrParams.of()) { @Override public List getCommands(boolean validateInput) { return Collections.emptyList(); diff --git a/solr/core/src/test/org/apache/solr/handler/admin/TestCollectionAPIs.java b/solr/core/src/test/org/apache/solr/handler/admin/TestCollectionAPIs.java index a8dde0459f5..b63567e3c40 100644 --- a/solr/core/src/test/org/apache/solr/handler/admin/TestCollectionAPIs.java +++ b/solr/core/src/test/org/apache/solr/handler/admin/TestCollectionAPIs.java @@ -45,7 +45,7 @@ import org.apache.solr.common.util.Utils; import org.apache.solr.core.CoreContainer; import org.apache.solr.handler.ClusterAPI; -import org.apache.solr.request.LocalSolrQueryRequest; +import org.apache.solr.request.SimpleSolrQueryRequest; import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.response.SolrQueryResponse; import org.apache.solr.servlet.SolrRequestParsers; @@ -150,8 +150,8 @@ public static Pair makeCall( Api api = apiBag.lookup(path, method.toString(), parts); if (api == null) throw new RuntimeException("No handler at path :" + path); SolrQueryResponse rsp = new SolrQueryResponse(); - LocalSolrQueryRequest req = - new LocalSolrQueryRequest(null, queryParams) { + SimpleSolrQueryRequest req = + new SimpleSolrQueryRequest(null, queryParams) { @Override public List getCommands(boolean validateInput) { if (payload == null) return Collections.emptyList(); @@ -194,7 +194,7 @@ private static String errorMessage(Map expected, ZkNodeProps actual) { } static class MockCollectionsHandler extends CollectionsHandler { - LocalSolrQueryRequest req; + SimpleSolrQueryRequest req; MockCollectionsHandler() {} diff --git a/solr/core/src/test/org/apache/solr/handler/admin/V2ApiMappingTest.java b/solr/core/src/test/org/apache/solr/handler/admin/V2ApiMappingTest.java index bb36cf353d8..4feb6b64bbc 100644 --- a/solr/core/src/test/org/apache/solr/handler/admin/V2ApiMappingTest.java +++ b/solr/core/src/test/org/apache/solr/handler/admin/V2ApiMappingTest.java @@ -35,7 +35,7 @@ import org.apache.solr.common.util.ContentStream; import org.apache.solr.common.util.ContentStreamBase; import org.apache.solr.handler.RequestHandlerBase; -import org.apache.solr.request.LocalSolrQueryRequest; +import org.apache.solr.request.SimpleSolrQueryRequest; import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.response.SolrQueryResponse; import org.junit.Before; @@ -111,8 +111,8 @@ protected SolrQueryRequest captureConvertedV1Request( final HashMap parts = new HashMap<>(); final Api api = apiBag.lookup(v2Path, v2Method, parts); final SolrQueryResponse rsp = new SolrQueryResponse(); - final LocalSolrQueryRequest req = - new LocalSolrQueryRequest(null, Map.of()) { + final SimpleSolrQueryRequest req = + new SimpleSolrQueryRequest(null, Map.of()) { @Override public List getCommands(boolean validateInput) { if (v2RequestBody == null) return Collections.emptyList(); @@ -151,8 +151,8 @@ protected SolrParams captureConvertedV1Params( final HashMap parts = new HashMap<>(); final Api api = apiBag.lookup(path, method, parts); final SolrQueryResponse rsp = new SolrQueryResponse(); - final LocalSolrQueryRequest req = - new LocalSolrQueryRequest(null, queryParams) { + final SimpleSolrQueryRequest req = + new SimpleSolrQueryRequest(null, queryParams) { @Override public List getCommands(boolean validateInput) { return Collections.emptyList(); @@ -185,8 +185,8 @@ protected SolrParams captureConvertedV1Params( final HashMap parts = new HashMap<>(); final Api api = apiBag.lookup(path, method, parts); final SolrQueryResponse rsp = new SolrQueryResponse(); - final LocalSolrQueryRequest req = - new LocalSolrQueryRequest(null, queryParams) { + final SimpleSolrQueryRequest req = + new SimpleSolrQueryRequest(null, queryParams) { @Override public List getCommands(boolean validateInput) { if (v2RequestBody == null) return Collections.emptyList(); diff --git a/solr/core/src/test/org/apache/solr/handler/admin/api/RestoreCollectionAPITest.java b/solr/core/src/test/org/apache/solr/handler/admin/api/RestoreCollectionAPITest.java index ce9833771f9..c057861f7af 100644 --- a/solr/core/src/test/org/apache/solr/handler/admin/api/RestoreCollectionAPITest.java +++ b/solr/core/src/test/org/apache/solr/handler/admin/api/RestoreCollectionAPITest.java @@ -42,7 +42,7 @@ import org.apache.solr.common.util.NamedList; import org.apache.solr.core.CoreContainer; import org.apache.solr.core.NodeConfig; -import org.apache.solr.request.LocalSolrQueryRequest; +import org.apache.solr.request.SimpleSolrQueryRequest; import org.junit.BeforeClass; import org.junit.Test; @@ -57,7 +57,7 @@ public static void setUpApi() { new RestoreCollection( new CoreContainer( new NodeConfig.NodeConfigBuilder("testnode", createTempDir()).build()), - new LocalSolrQueryRequest(null, new NamedList<>()), + new SimpleSolrQueryRequest(null, new NamedList<>()), null); } diff --git a/solr/core/src/test/org/apache/solr/handler/admin/api/V2NodeAPIMappingTest.java b/solr/core/src/test/org/apache/solr/handler/admin/api/V2NodeAPIMappingTest.java index f4dfa3d198d..f88ed92f66c 100644 --- a/solr/core/src/test/org/apache/solr/handler/admin/api/V2NodeAPIMappingTest.java +++ b/solr/core/src/test/org/apache/solr/handler/admin/api/V2NodeAPIMappingTest.java @@ -42,7 +42,7 @@ import org.apache.solr.handler.admin.PropertiesRequestHandler; import org.apache.solr.handler.admin.SystemInfoHandler; import org.apache.solr.handler.admin.ThreadDumpHandler; -import org.apache.solr.request.LocalSolrQueryRequest; +import org.apache.solr.request.SimpleSolrQueryRequest; import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.response.SolrQueryResponse; import org.junit.Before; @@ -212,8 +212,8 @@ private SolrParams doCaptureParams( }); final Api api = apiBag.lookup(path, method, parts); final SolrQueryResponse rsp = new SolrQueryResponse(); - final LocalSolrQueryRequest req = - new LocalSolrQueryRequest(null, inputParamsMap) { + final SimpleSolrQueryRequest req = + new SimpleSolrQueryRequest(null, inputParamsMap) { @Override public List getCommands(boolean validateInput) { if (v2RequestBody == null) return Collections.emptyList(); diff --git a/solr/core/src/test/org/apache/solr/handler/component/MoreLikeThisComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/MoreLikeThisComponentTest.java index e11d9b570f8..0246fbd2387 100644 --- a/solr/core/src/test/org/apache/solr/handler/component/MoreLikeThisComponentTest.java +++ b/solr/core/src/test/org/apache/solr/handler/component/MoreLikeThisComponentTest.java @@ -21,7 +21,7 @@ import org.apache.solr.common.params.ModifiableSolrParams; import org.apache.solr.common.params.MoreLikeThisParams; import org.apache.solr.core.SolrCore; -import org.apache.solr.request.LocalSolrQueryRequest; +import org.apache.solr.request.SimpleSolrQueryRequest; import org.apache.solr.request.SolrQueryRequest; import org.junit.BeforeClass; import org.junit.Test; @@ -137,7 +137,7 @@ public void testMLT_baseParams_shouldReturnSimilarDocuments() { initCommonMoreLikeThisParams(params); params.set(CommonParams.Q, "id:42"); - SolrQueryRequest mltreq = new LocalSolrQueryRequest(core, params); + SolrQueryRequest mltreq = new SimpleSolrQueryRequest(core, params); assertQ( "morelikethis - tom cruise", mltreq, @@ -146,7 +146,7 @@ public void testMLT_baseParams_shouldReturnSimilarDocuments() { params.set(CommonParams.Q, "id:44"); mltreq.close(); - mltreq = new LocalSolrQueryRequest(h.getCore(), params); + mltreq = new SimpleSolrQueryRequest(h.getCore(), params); assertQ("morelike this - harrison ford", mltreq, "//result/doc[1]/str[@name='id'][.='45']"); mltreq.close(); } @@ -161,7 +161,7 @@ public void testMLT_baseParams_shouldReturnSimilarDocuments() { params.set(MoreLikeThisParams.INTERESTING_TERMS, "details"); params.set(CommonParams.Q, "id:42"); - SolrQueryRequest mltreq = new LocalSolrQueryRequest(core, params); + SolrQueryRequest mltreq = new SimpleSolrQueryRequest(core, params); assertQ( "morelikethis - tom cruise", mltreq, @@ -182,7 +182,7 @@ public void testMLT_baseParams_shouldReturnSimilarDocuments() { params.set(MoreLikeThisParams.INTERESTING_TERMS, "list"); params.set(CommonParams.Q, "id:42"); - SolrQueryRequest mltreq = new LocalSolrQueryRequest(core, params); + SolrQueryRequest mltreq = new SimpleSolrQueryRequest(core, params); assertQ( "morelikethis - tom cruise", mltreq, @@ -202,7 +202,7 @@ public void testMLT_boostEnabled_shouldReturnSimilarDocumentsConsideringBoost() params.set(MoreLikeThisParams.BOOST, "true"); params.set(CommonParams.Q, "id:42"); - SolrQueryRequest mltreq = new LocalSolrQueryRequest(core, params); + SolrQueryRequest mltreq = new SimpleSolrQueryRequest(core, params); assertQ( "morelikethis - tom cruise", mltreq, @@ -212,7 +212,7 @@ public void testMLT_boostEnabled_shouldReturnSimilarDocumentsConsideringBoost() params.set(CommonParams.Q, "id:42"); params.set(MoreLikeThisParams.QF, "name^5.0 subword^0.1"); mltreq.close(); - mltreq = new LocalSolrQueryRequest(h.getCore(), params); + mltreq = new SimpleSolrQueryRequest(h.getCore(), params); assertQ( "morelikethis with weights", mltreq, @@ -233,7 +233,7 @@ public void testMLT_boostEnabled_shouldReturnSimilarDocumentsConsideringBoost() params.set(MoreLikeThisParams.INTERESTING_TERMS, "details"); params.set(CommonParams.Q, "id:42"); - SolrQueryRequest mltreq = new LocalSolrQueryRequest(core, params); + SolrQueryRequest mltreq = new SimpleSolrQueryRequest(core, params); assertQ( "morelikethis - tom cruise", mltreq, @@ -244,7 +244,7 @@ public void testMLT_boostEnabled_shouldReturnSimilarDocumentsConsideringBoost() params.set(MoreLikeThisParams.QF, "name^5.0 subword^0.1"); mltreq.close(); - mltreq = new LocalSolrQueryRequest(h.getCore(), params); + mltreq = new SimpleSolrQueryRequest(h.getCore(), params); assertQ( "morelikethis with weights", mltreq, @@ -267,7 +267,7 @@ public void testMLT_boostEnabled_shouldReturnSimilarDocumentsConsideringBoost() params.set(MoreLikeThisParams.INTERESTING_TERMS, "list"); params.set(CommonParams.Q, "id:42"); - SolrQueryRequest mltreq = new LocalSolrQueryRequest(core, params); + SolrQueryRequest mltreq = new SimpleSolrQueryRequest(core, params); assertQ( "morelikethis - tom cruise", mltreq, @@ -278,7 +278,7 @@ public void testMLT_boostEnabled_shouldReturnSimilarDocumentsConsideringBoost() params.set(MoreLikeThisParams.QF, "name^5.0 subword^0.1"); mltreq.close(); - mltreq = new LocalSolrQueryRequest(h.getCore(), params); + mltreq = new SimpleSolrQueryRequest(h.getCore(), params); assertQ( "morelikethis with weights", mltreq, @@ -299,7 +299,7 @@ public void testMLT_debugEnabled_shouldReturnSimilarDocumentsWithDebug() { params.set(CommonParams.Q, "id:44"); params.set(CommonParams.DEBUG_QUERY, "true"); - SolrQueryRequest mltreq = new LocalSolrQueryRequest(h.getCore(), params); + SolrQueryRequest mltreq = new SimpleSolrQueryRequest(h.getCore(), params); assertQ( "morelike this - harrison ford", mltreq, @@ -311,7 +311,7 @@ public void testMLT_debugEnabled_shouldReturnSimilarDocumentsWithDebug() { params.remove(CommonParams.DEBUG_QUERY); params.set(CommonParams.Q, "{!field f=id}44"); mltreq.close(); - mltreq = new LocalSolrQueryRequest(h.getCore(), params); + mltreq = new SimpleSolrQueryRequest(h.getCore(), params); assertQ(mltreq, "//result/doc[1]/str[@name='id'][.='45']"); mltreq.close(); } @@ -327,7 +327,7 @@ public void testMLT_debugEnabled_shouldReturnSimilarDocumentsWithDebug() { params.set(CommonParams.Q, "id:44"); params.set(CommonParams.DEBUG_QUERY, "true"); - SolrQueryRequest mltreq = new LocalSolrQueryRequest(h.getCore(), params); + SolrQueryRequest mltreq = new SimpleSolrQueryRequest(h.getCore(), params); assertQ( "morelike this - harrison ford", mltreq, @@ -341,7 +341,7 @@ public void testMLT_debugEnabled_shouldReturnSimilarDocumentsWithDebug() { params.remove(CommonParams.DEBUG_QUERY); params.set(CommonParams.Q, "{!field f=id}44"); mltreq.close(); - mltreq = new LocalSolrQueryRequest(h.getCore(), params); + mltreq = new SimpleSolrQueryRequest(h.getCore(), params); assertQ( mltreq, "//result/doc[1]/str[@name='id'][.='45']", @@ -362,7 +362,7 @@ public void testMLT_debugEnabled_shouldReturnSimilarDocumentsWithDebug() { params.set(CommonParams.Q, "id:44"); params.set(CommonParams.DEBUG_QUERY, "true"); - SolrQueryRequest mltreq = new LocalSolrQueryRequest(h.getCore(), params); + SolrQueryRequest mltreq = new SimpleSolrQueryRequest(h.getCore(), params); assertQ( "morelike this - harrison ford", mltreq, @@ -376,7 +376,7 @@ public void testMLT_debugEnabled_shouldReturnSimilarDocumentsWithDebug() { params.remove(CommonParams.DEBUG_QUERY); params.set(CommonParams.Q, "{!field f=id}44"); mltreq.close(); - mltreq = new LocalSolrQueryRequest(h.getCore(), params); + mltreq = new SimpleSolrQueryRequest(h.getCore(), params); assertQ( mltreq, "//result/doc[1]/str[@name='id'][.='45']", diff --git a/solr/core/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java index 0cbd5104a91..5307b15ec77 100644 --- a/solr/core/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java +++ b/solr/core/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java @@ -29,7 +29,7 @@ import org.apache.solr.common.util.NamedList; import org.apache.solr.common.util.SimpleOrderedMap; import org.apache.solr.core.SolrCore; -import org.apache.solr.request.LocalSolrQueryRequest; +import org.apache.solr.request.SimpleSolrQueryRequest; import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.request.SolrRequestHandler; import org.apache.solr.response.SolrQueryResponse; @@ -622,7 +622,7 @@ public void testThresholdTokenFrequency() throws Exception { SolrRequestHandler handler = core.getRequestHandler("/spellCheckCompRH"); SolrQueryResponse rsp = new SolrQueryResponse(); rsp.addResponseHeader(new SimpleOrderedMap<>()); - SolrQueryRequest req = new LocalSolrQueryRequest(core, params); + SolrQueryRequest req = new SimpleSolrQueryRequest(core, params); handler.handleRequest(req, rsp); req.close(); NamedList values = rsp.getValues(); @@ -635,7 +635,7 @@ public void testThresholdTokenFrequency() throws Exception { params.add(SpellingParams.SPELLCHECK_DICT, "threshold_direct"); rsp = new SolrQueryResponse(); rsp.addResponseHeader(new SimpleOrderedMap<>()); - req = new LocalSolrQueryRequest(core, params); + req = new SimpleSolrQueryRequest(core, params); handler.handleRequest(req, rsp); req.close(); values = rsp.getValues(); diff --git a/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java index 0476aa583bf..43869df8d41 100644 --- a/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java +++ b/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java @@ -51,7 +51,7 @@ import org.apache.solr.core.SolrCore; import org.apache.solr.handler.component.StatsField.HllOptions; import org.apache.solr.handler.component.StatsField.Stat; -import org.apache.solr.request.LocalSolrQueryRequest; +import org.apache.solr.request.SimpleSolrQueryRequest; import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.response.SolrQueryResponse; import org.apache.solr.schema.SchemaField; @@ -571,7 +571,7 @@ public void testFieldStatisticsResultsDateField() { args.put(StatsParams.STATS_FIELD, "active_dt"); args.put("f.active_dt.stats.calcdistinct", "true"); args.put("indent", "true"); - SolrQueryRequest req = new LocalSolrQueryRequest(core, new MapSolrParams(args)); + SolrQueryRequest req = new SimpleSolrQueryRequest(core, new MapSolrParams(args)); assertQ( "test date statistics values", @@ -604,7 +604,7 @@ public void testFieldStatisticsResultsDateFieldOverflow() { args.put(StatsParams.STATS, "true"); args.put(StatsParams.STATS_FIELD, "active_dt"); args.put("indent", "true"); - SolrQueryRequest req = new LocalSolrQueryRequest(core, new MapSolrParams(args)); + SolrQueryRequest req = new SimpleSolrQueryRequest(core, new MapSolrParams(args)); assertQ( "test date statistics values", @@ -911,7 +911,7 @@ public void testFieldStatisticsResultsNumericFieldAlwaysMissing() { args.put(StatsParams.STATS, "true"); args.put(StatsParams.STATS_FIELD, "active_i"); args.put("indent", "true"); - SolrQueryRequest req = new LocalSolrQueryRequest(core, new MapSolrParams(args)); + SolrQueryRequest req = new SimpleSolrQueryRequest(core, new MapSolrParams(args)); assertQ( "test string statistics values", @@ -949,7 +949,7 @@ public void testFieldStatisticsResultsStringFieldAlwaysMissing() { args.put(StatsParams.STATS, "true"); args.put(StatsParams.STATS_FIELD, "active_s"); args.put("indent", "true"); - SolrQueryRequest req = new LocalSolrQueryRequest(core, new MapSolrParams(args)); + SolrQueryRequest req = new SimpleSolrQueryRequest(core, new MapSolrParams(args)); assertQ( "test string statistics values", @@ -982,7 +982,7 @@ public void testFieldStatisticsResultsDateFieldAlwaysMissing() { args.put(StatsParams.STATS, "true"); args.put(StatsParams.STATS_FIELD, "active_dt"); args.put("indent", "true"); - SolrQueryRequest req = new LocalSolrQueryRequest(core, new MapSolrParams(args)); + SolrQueryRequest req = new SimpleSolrQueryRequest(core, new MapSolrParams(args)); assertQ( "test string statistics values", @@ -1046,7 +1046,7 @@ public void testStatsExcludeFilterQuery() { args.put(StatsParams.STATS, "true"); args.put(StatsParams.STATS_FIELD, "{!ex=id}id_i"); args.put("fq", "{!tag=id}id_i:[2 TO 3]"); - SolrQueryRequest req = new LocalSolrQueryRequest(core, new MapSolrParams(args)); + SolrQueryRequest req = new SimpleSolrQueryRequest(core, new MapSolrParams(args)); assertQ( "test excluding filter query", @@ -1059,7 +1059,7 @@ public void testStatsExcludeFilterQuery() { args.put(StatsParams.STATS, "true"); args.put(StatsParams.STATS_FIELD, "{!key=id2}id_i"); args.put("fq", "{!tag=id}id_i:[2 TO 3]"); - req = new LocalSolrQueryRequest(core, new MapSolrParams(args)); + req = new SimpleSolrQueryRequest(core, new MapSolrParams(args)); assertQ( "test rename field", @@ -1105,7 +1105,7 @@ public void testFieldStatisticsDocValuesAndMultiValued() throws Exception { args.put(StatsParams.STATS, "true"); args.put(StatsParams.STATS_FIELD, "cat_docValues"); args.put("indent", "true"); - SolrQueryRequest req = new LocalSolrQueryRequest(core, new MapSolrParams(args)); + SolrQueryRequest req = new SimpleSolrQueryRequest(core, new MapSolrParams(args)); assertQ( "test min/max on docValues and multiValued", @@ -1156,7 +1156,7 @@ public void testFieldStatisticsDocValuesAndMultiValuedInteger() throws Exception args.put(StatsParams.STATS_CALC_DISTINCT, "true"); args.put("indent", "true"); - SolrQueryRequest req = new LocalSolrQueryRequest(core, new MapSolrParams(args)); + SolrQueryRequest req = new SimpleSolrQueryRequest(core, new MapSolrParams(args)); assertQ( "test min/max on docValues and multiValued", @@ -1215,7 +1215,7 @@ public void testFieldStatisticsDocValuesAndMultiValuedIntegerFacetStats() throws args.put(StatsParams.STATS_CALC_DISTINCT, "true"); args.put("indent", "true"); - SolrQueryRequest req = new LocalSolrQueryRequest(core, new MapSolrParams(args)); + SolrQueryRequest req = new SimpleSolrQueryRequest(core, new MapSolrParams(args)); assertQEx("can not use FieldCache on multivalued field: cat_intDocValues", req, 400); } diff --git a/solr/core/src/test/org/apache/solr/request/TestSolrRequestInfo.java b/solr/core/src/test/org/apache/solr/request/TestSolrRequestInfo.java index 0864a67d43f..c2afd0ae66f 100644 --- a/solr/core/src/test/org/apache/solr/request/TestSolrRequestInfo.java +++ b/solr/core/src/test/org/apache/solr/request/TestSolrRequestInfo.java @@ -39,7 +39,7 @@ public static void beforeClass() throws Exception { public void testCloseHookTwice() { final SolrRequestInfo info = new SolrRequestInfo( - new LocalSolrQueryRequest(h.getCore(), params()), new SolrQueryResponse()); + new SimpleSolrQueryRequest(h.getCore(), params()), new SolrQueryResponse()); AtomicInteger counter = new AtomicInteger(); info.addCloseHook(counter::incrementAndGet); SolrRequestInfo.setRequestInfo(info); @@ -54,7 +54,7 @@ public void testCloseHookTwice() { public void testThreadPool() throws InterruptedException { final SolrRequestInfo info = new SolrRequestInfo( - new LocalSolrQueryRequest(h.getCore(), params()), new SolrQueryResponse()); + new SimpleSolrQueryRequest(h.getCore(), params()), new SolrQueryResponse()); AtomicInteger counter = new AtomicInteger(); SolrRequestInfo.setRequestInfo(info); @@ -89,10 +89,10 @@ public void testThreadPool() throws InterruptedException { */ public void testLimitsMaintained() { try { - LocalSolrQueryRequest timeAllowed1000 = - new LocalSolrQueryRequest(h.getCore(), params("timeAllowed", "1000")); - LocalSolrQueryRequest timeAllowed20000 = - new LocalSolrQueryRequest(h.getCore(), params("timeAllowed", "20000")); + SimpleSolrQueryRequest timeAllowed1000 = + new SimpleSolrQueryRequest(h.getCore(), params("timeAllowed", "1000")); + SimpleSolrQueryRequest timeAllowed20000 = + new SimpleSolrQueryRequest(h.getCore(), params("timeAllowed", "20000")); assertNull(timeAllowed1000.getContext().get(LIMITS_KEY)); assertNull(timeAllowed20000.getContext().get(LIMITS_KEY)); diff --git a/solr/core/src/test/org/apache/solr/response/SmileWriterTest.java b/solr/core/src/test/org/apache/solr/response/SmileWriterTest.java index 9c368baa91d..37a75f69e3b 100644 --- a/solr/core/src/test/org/apache/solr/response/SmileWriterTest.java +++ b/solr/core/src/test/org/apache/solr/response/SmileWriterTest.java @@ -43,7 +43,7 @@ import org.apache.solr.common.params.ModifiableSolrParams; import org.apache.solr.common.util.NamedList; import org.apache.solr.common.util.Utils; -import org.apache.solr.request.LocalSolrQueryRequest; +import org.apache.solr.request.SimpleSolrQueryRequest; import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.search.ReturnFields; import org.apache.solr.search.SolrReturnFields; @@ -157,7 +157,7 @@ public void test10Docs() throws IOException { SolrDocumentList l = constructSolrDocList(response); ByteArrayOutputStream baos = new ByteArrayOutputStream(); new SmileResponseWriter() - .write(baos, new LocalSolrQueryRequest(null, new ModifiableSolrParams()), response); + .write(baos, new SimpleSolrQueryRequest(null, new ModifiableSolrParams()), response); byte[] bytes = baos.toByteArray(); Map m = (Map) decodeSmile(new ByteArrayInputStream(bytes, 0, bytes.length)); diff --git a/solr/core/src/test/org/apache/solr/response/TestJavaBinResponseWriter.java b/solr/core/src/test/org/apache/solr/response/TestJavaBinResponseWriter.java index e5becc61dc2..78e1ae4f35c 100644 --- a/solr/core/src/test/org/apache/solr/response/TestJavaBinResponseWriter.java +++ b/solr/core/src/test/org/apache/solr/response/TestJavaBinResponseWriter.java @@ -29,7 +29,7 @@ import org.apache.solr.common.util.ByteUtils; import org.apache.solr.common.util.JavaBinCodec; import org.apache.solr.common.util.NamedList; -import org.apache.solr.request.LocalSolrQueryRequest; +import org.apache.solr.request.SimpleSolrQueryRequest; import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.response.JavaBinResponseWriter.Resolver; import org.apache.solr.search.SolrReturnFields; @@ -72,7 +72,7 @@ public void testUUID() throws Exception { String s = UUID.randomUUID().toString().toLowerCase(Locale.ROOT); assertU(adoc("id", "101", "uuid", s)); assertU(commit()); - LocalSolrQueryRequest req = lrf.makeRequest("q", "*:*"); + SimpleSolrQueryRequest req = lrf.makeRequest("q", "*:*"); SolrQueryResponse rsp = h.queryAndResponse(req.getParams().get(CommonParams.QT), req); ByteArrayOutputStream baos = new ByteArrayOutputStream(); h.getCore().getQueryResponseWriter("javabin").write(baos, req, rsp); @@ -109,7 +109,7 @@ public void testOmitHeader() throws Exception { } public void testResolverSolrDocumentPartialFields() throws Exception { - LocalSolrQueryRequest req = + SimpleSolrQueryRequest req = lrf.makeRequest( "q", "*:*", "fl", "id,xxx,ddd_s"); diff --git a/solr/core/src/test/org/apache/solr/response/TestPushWriter.java b/solr/core/src/test/org/apache/solr/response/TestPushWriter.java index bbfb4500d85..18e0de8f387 100644 --- a/solr/core/src/test/org/apache/solr/response/TestPushWriter.java +++ b/solr/core/src/test/org/apache/solr/response/TestPushWriter.java @@ -33,7 +33,7 @@ import org.apache.solr.common.util.JavaBinCodec; import org.apache.solr.common.util.TextWriter; import org.apache.solr.common.util.Utils; -import org.apache.solr.request.LocalSolrQueryRequest; +import org.apache.solr.request.SimpleSolrQueryRequest; import org.apache.solr.util.BaseTestHarness; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -49,7 +49,7 @@ public void testStandardResponse() throws IOException { JSONWriter pw = new JSONWriter( osw, - new LocalSolrQueryRequest(null, new ModifiableSolrParams()), + new SimpleSolrQueryRequest(null, new ModifiableSolrParams()), new SolrQueryResponse()); writeData(null, pw); osw.flush(); @@ -73,7 +73,7 @@ public void testXmlWriter() throws Exception { XMLWriter xml = new XMLWriter( osw, - new LocalSolrQueryRequest(null, new ModifiableSolrParams()), + new SimpleSolrQueryRequest(null, new ModifiableSolrParams()), new SolrQueryResponse()); writeData(null, xml); osw.flush(); diff --git a/solr/core/src/test/org/apache/solr/schema/ChangedSchemaMergeTest.java b/solr/core/src/test/org/apache/solr/schema/ChangedSchemaMergeTest.java index 9e43e0c8a6e..b89fbfda0a5 100644 --- a/solr/core/src/test/org/apache/solr/schema/ChangedSchemaMergeTest.java +++ b/solr/core/src/test/org/apache/solr/schema/ChangedSchemaMergeTest.java @@ -27,7 +27,7 @@ import org.apache.solr.common.util.NamedList; import org.apache.solr.core.CoreContainer; import org.apache.solr.core.SolrCore; -import org.apache.solr.request.LocalSolrQueryRequest; +import org.apache.solr.request.SimpleSolrQueryRequest; import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.search.similarities.LMJelinekMercerSimilarityFactory; import org.apache.solr.search.similarities.SchemaSimilarityFactory; @@ -77,7 +77,7 @@ public static void beforeClass() throws Exception { private void addDoc(SolrCore core, String... fieldValues) throws IOException { UpdateHandler updater = core.getUpdateHandler(); - AddUpdateCommand cmd = new AddUpdateCommand(new LocalSolrQueryRequest(core, new NamedList<>())); + AddUpdateCommand cmd = new AddUpdateCommand(new SimpleSolrQueryRequest(core, new NamedList<>())); cmd.solrDoc = sdoc((Object[]) fieldValues); updater.addDoc(cmd); } @@ -121,7 +121,7 @@ public void testOptimizeDiffSchemas() throws Exception { addDoc(changed, "id", "2", "which", "15", "text", "some stuff with which"); addDoc(changed, "id", "3", "which", "15", "text", "some stuff with which"); addDoc(changed, "id", "4", "which", "15", "text", "some stuff with which"); - SolrQueryRequest req = new LocalSolrQueryRequest(changed, new NamedList<>()); + SolrQueryRequest req = new SimpleSolrQueryRequest(changed, new NamedList<>()); changed.getUpdateHandler().commit(new CommitUpdateCommand(req, false)); // write the new schema out and make it current diff --git a/solr/core/src/test/org/apache/solr/schema/CopyFieldTest.java b/solr/core/src/test/org/apache/solr/schema/CopyFieldTest.java index a09c5003d36..bb30a5c9616 100644 --- a/solr/core/src/test/org/apache/solr/schema/CopyFieldTest.java +++ b/solr/core/src/test/org/apache/solr/schema/CopyFieldTest.java @@ -22,7 +22,7 @@ import org.apache.solr.common.params.CommonParams; import org.apache.solr.common.params.MapSolrParams; import org.apache.solr.core.SolrCore; -import org.apache.solr.request.LocalSolrQueryRequest; +import org.apache.solr.request.SimpleSolrQueryRequest; import org.apache.solr.request.SolrQueryRequest; import org.junit.BeforeClass; import org.junit.Test; @@ -155,7 +155,7 @@ public void testCopyFieldFunctionality() { Map args = new HashMap<>(); args.put(CommonParams.Q, "text_en:simple"); args.put("indent", "true"); - SolrQueryRequest req = new LocalSolrQueryRequest(core, new MapSolrParams(args)); + SolrQueryRequest req = new SimpleSolrQueryRequest(core, new MapSolrParams(args)); assertQ( "Make sure they got in", @@ -166,7 +166,7 @@ public void testCopyFieldFunctionality() { args = new HashMap<>(); args.put(CommonParams.Q, "highlight:simple"); args.put("indent", "true"); - req = new LocalSolrQueryRequest(core, new MapSolrParams(args)); + req = new SimpleSolrQueryRequest(core, new MapSolrParams(args)); assertQ( "dynamic source", req, @@ -177,13 +177,13 @@ public void testCopyFieldFunctionality() { args = new HashMap<>(); args.put(CommonParams.Q, "text_en:functionality"); args.put("indent", "true"); - req = new LocalSolrQueryRequest(core, new MapSolrParams(args)); + req = new SimpleSolrQueryRequest(core, new MapSolrParams(args)); assertQ("Make sure they got in", req, "//*[@numFound='1']"); args = new HashMap<>(); args.put(CommonParams.Q, "highlight:functionality"); args.put("indent", "true"); - req = new LocalSolrQueryRequest(core, new MapSolrParams(args)); + req = new SimpleSolrQueryRequest(core, new MapSolrParams(args)); assertQ("dynamic source", req, "//*[@numFound='0']"); } @@ -231,14 +231,14 @@ public void testExplicitSourceGlob() { Map args = new HashMap<>(); args.put(CommonParams.Q, "text:AAM46"); args.put("indent", "true"); - SolrQueryRequest req = new LocalSolrQueryRequest(core, new MapSolrParams(args)); + SolrQueryRequest req = new SimpleSolrQueryRequest(core, new MapSolrParams(args)); assertQ( "sku2 copied to text", req, "//*[@numFound='1']", "//result/doc[1]/str[@name='id'][.='5']"); args = new HashMap<>(); args.put(CommonParams.Q, "1_s:10-1839ACX-93"); args.put("indent", "true"); - req = new LocalSolrQueryRequest(core, new MapSolrParams(args)); + req = new SimpleSolrQueryRequest(core, new MapSolrParams(args)); assertQ( "sku1 copied to dynamic dest *_s", req, @@ -249,13 +249,13 @@ public void testExplicitSourceGlob() { args = new HashMap<>(); args.put(CommonParams.Q, "1_dest_sub_s:10-1839ACX-93"); args.put("indent", "true"); - req = new LocalSolrQueryRequest(core, new MapSolrParams(args)); + req = new SimpleSolrQueryRequest(core, new MapSolrParams(args)); assertQ("sku1 copied to *_dest_sub_s (*_s subset pattern)", req, "//*[@numFound='1']"); args = new HashMap<>(); args.put(CommonParams.Q, "dest_sub_no_ast_s:AAM46"); args.put("indent", "true"); - req = new LocalSolrQueryRequest(core, new MapSolrParams(args)); + req = new SimpleSolrQueryRequest(core, new MapSolrParams(args)); assertQ( "sku2 copied to dest_sub_no_ast_s (*_s subset pattern no asterisk)", req, @@ -281,7 +281,7 @@ public void testSourceGlobMatchesNoDynamicOrExplicitField() { Map args = new HashMap<>(); args.put(CommonParams.Q, "text:AAM46"); args.put("indent", "true"); - SolrQueryRequest req = new LocalSolrQueryRequest(core, new MapSolrParams(args)); + SolrQueryRequest req = new SimpleSolrQueryRequest(core, new MapSolrParams(args)); assertQ( "sku2 copied to text", req, "//*[@numFound='1']", "//result/doc[1]/str[@name='id'][.='5']"); } diff --git a/solr/core/src/test/org/apache/solr/schema/IndexSchemaRuntimeFieldTest.java b/solr/core/src/test/org/apache/solr/schema/IndexSchemaRuntimeFieldTest.java index 1572dd13e6a..c68fa339e2c 100644 --- a/solr/core/src/test/org/apache/solr/schema/IndexSchemaRuntimeFieldTest.java +++ b/solr/core/src/test/org/apache/solr/schema/IndexSchemaRuntimeFieldTest.java @@ -19,7 +19,7 @@ import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.client.solrj.SolrQuery; import org.apache.solr.core.SolrCore; -import org.apache.solr.request.LocalSolrQueryRequest; +import org.apache.solr.request.SimpleSolrQueryRequest; import org.apache.solr.request.SolrQueryRequest; import org.junit.BeforeClass; import org.junit.Test; @@ -53,7 +53,7 @@ public void testRuntimeFieldCreation() { SolrQuery query = new SolrQuery(fieldName + ":aaa"); query.set("indent", "true"); - SolrQueryRequest req = new LocalSolrQueryRequest(core, query); + SolrQueryRequest req = new SimpleSolrQueryRequest(core, query); assertQ( "Make sure they got in", diff --git a/solr/core/src/test/org/apache/solr/schema/IndexSchemaTest.java b/solr/core/src/test/org/apache/solr/schema/IndexSchemaTest.java index 16b0490b33d..7b3a2703cd8 100644 --- a/solr/core/src/test/org/apache/solr/schema/IndexSchemaTest.java +++ b/solr/core/src/test/org/apache/solr/schema/IndexSchemaTest.java @@ -25,7 +25,7 @@ import org.apache.solr.common.params.CommonParams; import org.apache.solr.common.params.MapSolrParams; import org.apache.solr.core.SolrCore; -import org.apache.solr.request.LocalSolrQueryRequest; +import org.apache.solr.request.SimpleSolrQueryRequest; import org.apache.solr.request.SolrQueryRequest; import org.junit.BeforeClass; import org.junit.Test; @@ -54,7 +54,7 @@ public void testDynamicCopy() { Map args = new HashMap<>(); args.put(CommonParams.Q, "title:test"); args.put("indent", "true"); - SolrQueryRequest req = new LocalSolrQueryRequest(core, new MapSolrParams(args)); + SolrQueryRequest req = new SimpleSolrQueryRequest(core, new MapSolrParams(args)); assertQ( "Make sure they got in", @@ -65,13 +65,13 @@ public void testDynamicCopy() { args = new HashMap<>(); args.put(CommonParams.Q, "aaa_dynamic:aaa"); args.put("indent", "true"); - req = new LocalSolrQueryRequest(core, new MapSolrParams(args)); + req = new SimpleSolrQueryRequest(core, new MapSolrParams(args)); assertQ("dynamic source", req, "//*[@numFound='1']", "//result/doc[1]/str[@name='id'][.='10']"); args = new HashMap<>(); args.put(CommonParams.Q, "dynamic_aaa:aaa"); args.put("indent", "true"); - req = new LocalSolrQueryRequest(core, new MapSolrParams(args)); + req = new SimpleSolrQueryRequest(core, new MapSolrParams(args)); assertQ( "dynamic destination", req, 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 a961ebd17e2..ee9a083422d 100644 --- a/solr/core/src/test/org/apache/solr/search/SignificantTermsQParserPluginTest.java +++ b/solr/core/src/test/org/apache/solr/search/SignificantTermsQParserPluginTest.java @@ -32,7 +32,7 @@ import org.apache.solr.common.params.SolrParams; import org.apache.solr.core.SolrCore; import org.apache.solr.handler.component.ResponseBuilder; -import org.apache.solr.request.LocalSolrQueryRequest; +import org.apache.solr.request.SimpleSolrQueryRequest; import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.response.SolrQueryResponse; import org.apache.solr.update.AddUpdateCommand; @@ -132,7 +132,7 @@ public void testCollectionWithDocuments() throws Exception { } private void addTestDocs(SolrCore core) throws IOException { - SolrQueryRequest coreReq = new LocalSolrQueryRequest(core, new ModifiableSolrParams()); + SolrQueryRequest coreReq = new SimpleSolrQueryRequest(core, new ModifiableSolrParams()); AddUpdateCommand cmd = new AddUpdateCommand(coreReq); cmd.solrDoc = new SolrInputDocument(); cmd.solrDoc.addField("id", "1"); @@ -144,7 +144,7 @@ private void addTestDocs(SolrCore core) throws IOException { } private void deleteTestDocs(SolrCore core) throws IOException { - SolrQueryRequest coreReq = new LocalSolrQueryRequest(core, new ModifiableSolrParams()); + SolrQueryRequest coreReq = new SimpleSolrQueryRequest(core, new ModifiableSolrParams()); DeleteUpdateCommand cmd = new DeleteUpdateCommand(coreReq); cmd.id = "1"; core.getUpdateHandler().delete(cmd); diff --git a/solr/core/src/test/org/apache/solr/search/SpatialFilterTest.java b/solr/core/src/test/org/apache/solr/search/SpatialFilterTest.java index 48a837cd3f9..9cdce29c67d 100644 --- a/solr/core/src/test/org/apache/solr/search/SpatialFilterTest.java +++ b/solr/core/src/test/org/apache/solr/search/SpatialFilterTest.java @@ -201,7 +201,7 @@ private void checkHits( ModifiableSolrParams params = new ModifiableSolrParams(); params.add(SpatialParams.POINT, "5.0,5.0"); params.add(SpatialParams.DISTANCE, "3"); - SolrQueryRequest req = new LocalSolrQueryRequest(h.getCore(), "", "", 0, 10, new HashMap()); + SolrQueryRequest req = new SimpleSolrQueryRequest(h.getCore(), "", "", 0, 10, new HashMap()); SpatialFilterQParserPlugin parserPlugin; Query query; @@ -217,7 +217,7 @@ private void checkHits( params = new ModifiableSolrParams(); params.add(SpatialParams.POINT, "5.0"); params.add(SpatialParams.DISTANCE, "3"); - req = new LocalSolrQueryRequest(h.getCore(), "", "", 0, 10, new HashMap()); + req = new SimpleSolrQueryRequest(h.getCore(), "", "", 0, 10, new HashMap()); parser = parserPlugin.createParser("'foo'", local, params, req); query = parser.parse(); assertNotNull("Query is null", query); diff --git a/solr/core/src/test/org/apache/solr/security/TestPKIAuthenticationPlugin.java b/solr/core/src/test/org/apache/solr/security/TestPKIAuthenticationPlugin.java index 9d5fed99204..8139735d6c7 100644 --- a/solr/core/src/test/org/apache/solr/security/TestPKIAuthenticationPlugin.java +++ b/solr/core/src/test/org/apache/solr/security/TestPKIAuthenticationPlugin.java @@ -43,7 +43,7 @@ import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.common.params.ModifiableSolrParams; import org.apache.solr.metrics.SolrMetricsContext; -import org.apache.solr.request.LocalSolrQueryRequest; +import org.apache.solr.request.SimpleSolrQueryRequest; import org.apache.solr.request.SolrRequestInfo; import org.apache.solr.response.SolrQueryResponse; import org.apache.solr.util.CryptoKeys; @@ -88,8 +88,8 @@ boolean isSolrThread() { final CryptoKeys.RSAKeyPair aKeyPair = new CryptoKeys.RSAKeyPair(); - final LocalSolrQueryRequest localSolrQueryRequest = - new LocalSolrQueryRequest(null, new ModifiableSolrParams()) { + final SimpleSolrQueryRequest localSolrQueryRequest = + new SimpleSolrQueryRequest(null, new ModifiableSolrParams()) { @Override public Principal getUserPrincipal() { return principal.get(); diff --git a/solr/core/src/test/org/apache/solr/spelling/SpellCheckCollatorTest.java b/solr/core/src/test/org/apache/solr/spelling/SpellCheckCollatorTest.java index f7687441d02..a72a0fb5204 100644 --- a/solr/core/src/test/org/apache/solr/spelling/SpellCheckCollatorTest.java +++ b/solr/core/src/test/org/apache/solr/spelling/SpellCheckCollatorTest.java @@ -33,7 +33,7 @@ import org.apache.solr.core.SolrCore; import org.apache.solr.handler.component.SearchComponent; import org.apache.solr.handler.component.SpellCheckComponent; -import org.apache.solr.request.LocalSolrQueryRequest; +import org.apache.solr.request.SimpleSolrQueryRequest; import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.request.SolrRequestHandler; import org.apache.solr.response.SolrQueryResponse; @@ -151,7 +151,7 @@ public void testCollationWithRangeQuery() { SolrRequestHandler handler = core.getRequestHandler("/spellCheckCompRH"); SolrQueryResponse rsp = new SolrQueryResponse(); rsp.addResponseHeader(new SimpleOrderedMap()); - SolrQueryRequest req = new LocalSolrQueryRequest(core, params); + SolrQueryRequest req = new SimpleSolrQueryRequest(core, params); handler.handleRequest(req, rsp); req.close(); NamedList values = rsp.getValues(); @@ -184,7 +184,7 @@ public void testCollationWithHypens() { SolrRequestHandler handler = core.getRequestHandler("/spellCheckCompRH"); SolrQueryResponse rsp = new SolrQueryResponse(); rsp.addResponseHeader(new SimpleOrderedMap()); - SolrQueryRequest req = new LocalSolrQueryRequest(core, params); + SolrQueryRequest req = new SimpleSolrQueryRequest(core, params); handler.handleRequest(req, rsp); req.close(); NamedList values = rsp.getValues(); @@ -204,7 +204,7 @@ public void testCollationWithHypens() { SolrRequestHandler handler = core.getRequestHandler("/spellCheckCompRH"); SolrQueryResponse rsp = new SolrQueryResponse(); rsp.add("responseHeader", new SimpleOrderedMap()); - SolrQueryRequest req = new LocalSolrQueryRequest(core, params); + SolrQueryRequest req = new SimpleSolrQueryRequest(core, params); handler.handleRequest(req, rsp); req.close(); NamedList values = rsp.getValues(); @@ -295,7 +295,7 @@ public void testCollateWithFilter() { SolrRequestHandler handler = core.getRequestHandler("/spellCheckCompRH"); SolrQueryResponse rsp = new SolrQueryResponse(); rsp.addResponseHeader(new SimpleOrderedMap()); - SolrQueryRequest req = new LocalSolrQueryRequest(core, params); + SolrQueryRequest req = new SimpleSolrQueryRequest(core, params); handler.handleRequest(req, rsp); req.close(); NamedList values = rsp.getValues(); @@ -330,7 +330,7 @@ public void testCollateWithMultipleRequestHandlers() { SolrRequestHandler handler = core.getRequestHandler("/spellCheckCompRH"); SolrQueryResponse rsp = new SolrQueryResponse(); rsp.addResponseHeader(new SimpleOrderedMap()); - SolrQueryRequest req = new LocalSolrQueryRequest(core, params); + SolrQueryRequest req = new SimpleSolrQueryRequest(core, params); handler.handleRequest(req, rsp); req.close(); NamedList values = rsp.getValues(); @@ -345,7 +345,7 @@ public void testCollateWithMultipleRequestHandlers() { handler = core.getRequestHandler("/spellCheckCompRH1"); rsp = new SolrQueryResponse(); rsp.addResponseHeader(new SimpleOrderedMap()); - req = new LocalSolrQueryRequest(core, params); + req = new SimpleSolrQueryRequest(core, params); handler.handleRequest(req, rsp); req.close(); values = rsp.getValues(); @@ -378,7 +378,7 @@ public void testExtendedCollate() { SolrRequestHandler handler = core.getRequestHandler("/spellCheckCompRH"); SolrQueryResponse rsp = new SolrQueryResponse(); rsp.addResponseHeader(new SimpleOrderedMap()); - SolrQueryRequest req = new LocalSolrQueryRequest(core, params); + SolrQueryRequest req = new SimpleSolrQueryRequest(core, params); handler.handleRequest(req, rsp); req.close(); NamedList values = rsp.getValues(); @@ -395,7 +395,7 @@ public void testExtendedCollate() { handler = core.getRequestHandler("/spellCheckCompRH"); rsp = new SolrQueryResponse(); rsp.addResponseHeader(new SimpleOrderedMap()); - req = new LocalSolrQueryRequest(core, params); + req = new SimpleSolrQueryRequest(core, params); handler.handleRequest(req, rsp); req.close(); values = rsp.getValues(); @@ -413,7 +413,7 @@ public void testExtendedCollate() { handler = core.getRequestHandler("/spellCheckCompRH"); rsp = new SolrQueryResponse(); rsp.addResponseHeader(new SimpleOrderedMap()); - req = new LocalSolrQueryRequest(core, params); + req = new SimpleSolrQueryRequest(core, params); handler.handleRequest(req, rsp); req.close(); values = rsp.getValues(); @@ -433,7 +433,7 @@ public void testExtendedCollate() { handler = core.getRequestHandler("/spellCheckCompRH"); rsp = new SolrQueryResponse(); rsp.addResponseHeader(new SimpleOrderedMap()); - req = new LocalSolrQueryRequest(core, params); + req = new SimpleSolrQueryRequest(core, params); handler.handleRequest(req, rsp); req.close(); values = rsp.getValues(); @@ -489,7 +489,7 @@ public void testCollateWithGrouping() { SolrRequestHandler handler = core.getRequestHandler("/spellCheckCompRH"); SolrQueryResponse rsp = new SolrQueryResponse(); rsp.addResponseHeader(new SimpleOrderedMap()); - SolrQueryRequest req = new LocalSolrQueryRequest(core, params); + SolrQueryRequest req = new SimpleSolrQueryRequest(core, params); handler.handleRequest(req, rsp); req.close(); NamedList values = rsp.getValues(); @@ -717,7 +717,7 @@ public void testZeroTries() { SolrRequestHandler handler = core.getRequestHandler("/spellCheckCompRH"); SolrQueryResponse rsp = new SolrQueryResponse(); rsp.addResponseHeader(new SimpleOrderedMap()); - SolrQueryRequest req = new LocalSolrQueryRequest(core, params); + SolrQueryRequest req = new SimpleSolrQueryRequest(core, params); handler.handleRequest(req, rsp); req.close(); NamedList values = rsp.getValues(); @@ -747,7 +747,7 @@ public void testWithCursorMark() { SolrRequestHandler handler = core.getRequestHandler("/spellCheckCompRH"); SolrQueryResponse rsp = new SolrQueryResponse(); rsp.addResponseHeader(new SimpleOrderedMap()); - SolrQueryRequest req = new LocalSolrQueryRequest(core, params); + SolrQueryRequest req = new SimpleSolrQueryRequest(core, params); handler.handleRequest(req, rsp); req.close(); NamedList values = rsp.getValues(); diff --git a/solr/core/src/test/org/apache/solr/update/AddBlockUpdateTest.java b/solr/core/src/test/org/apache/solr/update/AddBlockUpdateTest.java index 2a2a0e0aa63..e679bb419c3 100644 --- a/solr/core/src/test/org/apache/solr/update/AddBlockUpdateTest.java +++ b/solr/core/src/test/org/apache/solr/update/AddBlockUpdateTest.java @@ -64,7 +64,7 @@ import org.apache.solr.common.util.JavaBinCodec; import org.apache.solr.common.util.SolrNamedThreadFactory; import org.apache.solr.handler.loader.XMLLoader; -import org.apache.solr.request.LocalSolrQueryRequest; +import org.apache.solr.request.SimpleSolrQueryRequest; import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.search.SolrIndexSearcher; import org.apache.solr.util.RandomNoReverseMergePolicyFactory; @@ -977,7 +977,7 @@ private void attachSubDocs(Document document, Element parent, String relation, i } private void indexSolrInputDocumentsDirectly(SolrInputDocument... docs) throws IOException { - SolrQueryRequest coreReq = new LocalSolrQueryRequest(h.getCore(), new ModifiableSolrParams()); + SolrQueryRequest coreReq = new SimpleSolrQueryRequest(h.getCore(), new ModifiableSolrParams()); AddUpdateCommand updateCmd = new AddUpdateCommand(coreReq); for (SolrInputDocument doc : docs) { updateCmd.solrDoc = doc; diff --git a/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java b/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java index ee774416e48..e01493a7695 100644 --- a/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java +++ b/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java @@ -35,7 +35,7 @@ import org.apache.solr.core.SolrCore; import org.apache.solr.core.SolrEventListener; import org.apache.solr.index.TieredMergePolicyFactory; -import org.apache.solr.request.LocalSolrQueryRequest; +import org.apache.solr.request.SimpleSolrQueryRequest; import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.search.SolrIndexSearcher; import org.apache.solr.util.LogLevel; @@ -360,7 +360,7 @@ public void testAddRollback() throws Exception { Map args = new HashMap<>(); args.put(CommonParams.Q, "id:A OR id:B"); args.put("indent", "true"); - SolrQueryRequest req = new LocalSolrQueryRequest(core, new MapSolrParams(args)); + SolrQueryRequest req = new SimpleSolrQueryRequest(core, new MapSolrParams(args)); assertQ( "\"B\" should not be found.", req, @@ -424,7 +424,7 @@ public void testDeleteRollback() throws Exception { Map args = new HashMap<>(); args.put(CommonParams.Q, "id:A OR id:B"); args.put("indent", "true"); - SolrQueryRequest req = new LocalSolrQueryRequest(core, new MapSolrParams(args)); + SolrQueryRequest req = new SimpleSolrQueryRequest(core, new MapSolrParams(args)); assertQ( "\"A\" and \"B\" should be found.", req, diff --git a/solr/core/src/test/org/apache/solr/update/SolrIndexSplitterTest.java b/solr/core/src/test/org/apache/solr/update/SolrIndexSplitterTest.java index 678b115fa77..233ba29c481 100644 --- a/solr/core/src/test/org/apache/solr/update/SolrIndexSplitterTest.java +++ b/solr/core/src/test/org/apache/solr/update/SolrIndexSplitterTest.java @@ -36,7 +36,7 @@ import org.apache.solr.common.util.NamedList; import org.apache.solr.core.DirectoryFactory; import org.apache.solr.core.SolrCore; -import org.apache.solr.request.LocalSolrQueryRequest; +import org.apache.solr.request.SimpleSolrQueryRequest; import org.apache.solr.response.SolrQueryResponse; import org.junit.Before; import org.junit.BeforeClass; @@ -82,7 +82,7 @@ public void testSplitByPathsLink() throws Exception { } private void doTestSplitByPaths(SolrIndexSplitter.SplitMethod splitMethod) throws Exception { - LocalSolrQueryRequest request = null; + SimpleSolrQueryRequest request = null; try { // add two docs String id1 = "dorothy"; @@ -169,7 +169,7 @@ public void testSplitDeletesLink() throws Exception { } private void doTestSplitDeletes(SolrIndexSplitter.SplitMethod splitMethod) throws Exception { - LocalSolrQueryRequest request = null; + SimpleSolrQueryRequest request = null; try { // add two docs String id1 = "dorothy"; @@ -272,7 +272,7 @@ private void doTestSplitByCores(SolrIndexSplitter.SplitMethod splitMethod) throw .create( "split2", Map.of("dataDir", indexDir2.toString(), "configSet", "cloud-minimal")); - LocalSolrQueryRequest request = null; + SimpleSolrQueryRequest request = null; try { request = lrf.makeRequest("q", "dummy"); SolrQueryResponse rsp = new SolrQueryResponse(); @@ -330,7 +330,7 @@ public void testSplitAlternatelyLink() throws Exception { } private void doTestSplitAlternately(SolrIndexSplitter.SplitMethod splitMethod) throws Exception { - LocalSolrQueryRequest request = null; + SimpleSolrQueryRequest request = null; Directory directory = null; try { // add an even number of docs @@ -441,7 +441,7 @@ private void doTestSplitByRouteKey(SolrIndexSplitter.SplitMethod splitMethod) th DocRouter.Range splitKeyRange = r1.keyHashRange(splitKey); - LocalSolrQueryRequest request = null; + SimpleSolrQueryRequest request = null; Directory directory = null; try { request = lrf.makeRequest("q", "dummy"); @@ -532,7 +532,7 @@ public void doTestSplitWithChildDocs(SolrIndexSplitter.SplitMethod splitMethod) .create( "split2", Map.of("dataDir", indexDir2.toString(), "configSet", "cloud-minimal")); - LocalSolrQueryRequest request = null; + SimpleSolrQueryRequest request = null; try { request = lrf.makeRequest("q", "dummy"); SolrQueryResponse rsp = new SolrQueryResponse(); diff --git a/solr/core/src/test/org/apache/solr/update/processor/AtomicUpdateProcessorFactoryTest.java b/solr/core/src/test/org/apache/solr/update/processor/AtomicUpdateProcessorFactoryTest.java index c464bd4c561..f2ff4aa46ee 100644 --- a/solr/core/src/test/org/apache/solr/update/processor/AtomicUpdateProcessorFactoryTest.java +++ b/solr/core/src/test/org/apache/solr/update/processor/AtomicUpdateProcessorFactoryTest.java @@ -25,7 +25,7 @@ import org.apache.solr.common.SolrException; import org.apache.solr.common.SolrInputDocument; import org.apache.solr.common.params.ModifiableSolrParams; -import org.apache.solr.request.LocalSolrQueryRequest; +import org.apache.solr.request.SimpleSolrQueryRequest; import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.response.SolrQueryResponse; import org.apache.solr.update.AddUpdateCommand; @@ -46,7 +46,7 @@ public void testWrongAtomicOpPassed() throws Exception { .add("processor", "Atomic") .add("atomic.cat", "delete") .add("commit", "true"); - try (SolrQueryRequest req = new LocalSolrQueryRequest(h.getCore(), params)) { + try (SolrQueryRequest req = new SimpleSolrQueryRequest(h.getCore(), params)) { AddUpdateCommand cmd = new AddUpdateCommand(req); AtomicUpdateProcessorFactory factory = new AtomicUpdateProcessorFactory(); factory.inform(h.getCore()); @@ -64,7 +64,7 @@ public void testNoUniqueIdPassed() throws Exception { // TODO .add("processor", "atomic") .add("atomic.cat", "add") .add("commit", "true"); - try (SolrQueryRequest req = new LocalSolrQueryRequest(h.getCore(), params)) { + try (SolrQueryRequest req = new SimpleSolrQueryRequest(h.getCore(), params)) { AddUpdateCommand cmd = new AddUpdateCommand(req); cmd.solrDoc = new SolrInputDocument(); cmd.solrDoc.addField("title", 1); @@ -87,7 +87,7 @@ public void testBasics() throws Exception { .add("atomic.name_s", "set") .add("atomic.multiDefault", "set") .add("commit", "true"); - try (SolrQueryRequest req = new LocalSolrQueryRequest(h.getCore(), params)) { + try (SolrQueryRequest req = new SimpleSolrQueryRequest(h.getCore(), params)) { AddUpdateCommand cmd = new AddUpdateCommand(req); cmd.solrDoc = new SolrInputDocument(); @@ -128,7 +128,7 @@ public void testBasics() throws Exception { .add("atomic.name_s", "remove") .add("atomic.multiDefault", "removeregex") .add("commit", "true"); - try (SolrQueryRequest req = new LocalSolrQueryRequest(h.getCore(), params)) { + try (SolrQueryRequest req = new SimpleSolrQueryRequest(h.getCore(), params)) { AddUpdateCommand cmd = new AddUpdateCommand(req); cmd.solrDoc = new SolrInputDocument(); @@ -194,7 +194,7 @@ public void run() { .add("atomic.cat", "add") .add("atomic.int_i", "inc") .add("commit", "true"); - try (SolrQueryRequest req = new LocalSolrQueryRequest(h.getCore(), params)) { + try (SolrQueryRequest req = new SimpleSolrQueryRequest(h.getCore(), params)) { AddUpdateCommand cmd = new AddUpdateCommand(req); cmd.solrDoc = new SolrInputDocument(); cmd.solrDoc.addField("id", 10); // hardcoded id=10 diff --git a/solr/core/src/test/org/apache/solr/update/processor/DefaultValueUpdateProcessorTest.java b/solr/core/src/test/org/apache/solr/update/processor/DefaultValueUpdateProcessorTest.java index 58be0854dac..7e0e0b0e7fd 100644 --- a/solr/core/src/test/org/apache/solr/update/processor/DefaultValueUpdateProcessorTest.java +++ b/solr/core/src/test/org/apache/solr/update/processor/DefaultValueUpdateProcessorTest.java @@ -25,7 +25,7 @@ import org.apache.solr.common.SolrInputField; import org.apache.solr.common.params.ModifiableSolrParams; import org.apache.solr.core.SolrCore; -import org.apache.solr.request.LocalSolrQueryRequest; +import org.apache.solr.request.SimpleSolrQueryRequest; import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.request.SolrRequestInfo; import org.apache.solr.response.SolrQueryResponse; @@ -116,7 +116,7 @@ SolrInputDocument processAdd(final String chain, final SolrInputDocument docIn) SolrQueryResponse rsp = new SolrQueryResponse(); - SolrQueryRequest req = new LocalSolrQueryRequest(core, new ModifiableSolrParams()); + SolrQueryRequest req = new SimpleSolrQueryRequest(core, new ModifiableSolrParams()); try { SolrRequestInfo.setRequestInfo(new SolrRequestInfo(req, rsp)); AddUpdateCommand cmd = new AddUpdateCommand(req); diff --git a/solr/core/src/test/org/apache/solr/update/processor/DistributedUpdateProcessorTest.java b/solr/core/src/test/org/apache/solr/update/processor/DistributedUpdateProcessorTest.java index e5bf79c4c41..c4351732300 100644 --- a/solr/core/src/test/org/apache/solr/update/processor/DistributedUpdateProcessorTest.java +++ b/solr/core/src/test/org/apache/solr/update/processor/DistributedUpdateProcessorTest.java @@ -32,7 +32,7 @@ import org.apache.solr.common.SolrInputDocument; import org.apache.solr.common.params.ModifiableSolrParams; import org.apache.solr.common.util.ExecutorUtil; -import org.apache.solr.request.LocalSolrQueryRequest; +import org.apache.solr.request.SimpleSolrQueryRequest; import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.update.AddUpdateCommand; import org.apache.solr.update.DeleteUpdateCommand; @@ -64,7 +64,7 @@ public static void afterClass() { @Test public void testShouldBufferUpdateZk() throws IOException { - SolrQueryRequest req = new LocalSolrQueryRequest(h.getCore(), new ModifiableSolrParams()); + SolrQueryRequest req = new SimpleSolrQueryRequest(h.getCore(), new ModifiableSolrParams()); try (DistributedUpdateProcessor processor = new DistributedUpdateProcessor(req, null, null, null)) { AddUpdateCommand cmd = new AddUpdateCommand(req); @@ -81,7 +81,7 @@ public void testShouldBufferUpdateZk() throws IOException { @Test public void testVersionAdd() throws IOException { - SolrQueryRequest req = new LocalSolrQueryRequest(h.getCore(), new ModifiableSolrParams()); + SolrQueryRequest req = new SimpleSolrQueryRequest(h.getCore(), new ModifiableSolrParams()); int threads = 5; Function versionAddFunc = (DistributedUpdateProcessor process) -> { @@ -105,7 +105,7 @@ public void testVersionAdd() throws IOException { @Test public void testVersionDelete() throws IOException { - SolrQueryRequest req = new LocalSolrQueryRequest(h.getCore(), new ModifiableSolrParams()); + SolrQueryRequest req = new SimpleSolrQueryRequest(h.getCore(), new ModifiableSolrParams()); int threads = 5; Function versionDeleteFunc = diff --git a/solr/core/src/test/org/apache/solr/update/processor/IgnoreCommitOptimizeUpdateProcessorFactoryTest.java b/solr/core/src/test/org/apache/solr/update/processor/IgnoreCommitOptimizeUpdateProcessorFactoryTest.java index 71933920415..cf50c95f0bd 100644 --- a/solr/core/src/test/org/apache/solr/update/processor/IgnoreCommitOptimizeUpdateProcessorFactoryTest.java +++ b/solr/core/src/test/org/apache/solr/update/processor/IgnoreCommitOptimizeUpdateProcessorFactoryTest.java @@ -20,7 +20,7 @@ import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.common.params.ModifiableSolrParams; import org.apache.solr.core.SolrCore; -import org.apache.solr.request.LocalSolrQueryRequest; +import org.apache.solr.request.SimpleSolrQueryRequest; import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.request.SolrRequestInfo; import org.apache.solr.response.SolrQueryResponse; @@ -72,7 +72,7 @@ SolrQueryResponse processCommit(final String chain, boolean optimize, Boolean co assertNotNull("No Chain named: " + chain, pc); SolrQueryResponse rsp = new SolrQueryResponse(); - SolrQueryRequest req = new LocalSolrQueryRequest(core, new ModifiableSolrParams()); + SolrQueryRequest req = new SimpleSolrQueryRequest(core, new ModifiableSolrParams()); if (commitEndPoint != null) { ((ModifiableSolrParams) req.getParams()) diff --git a/solr/core/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java b/solr/core/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java index 35ec90a7ffd..df04aba8d16 100644 --- a/solr/core/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java +++ b/solr/core/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java @@ -31,7 +31,7 @@ import org.apache.solr.common.util.NamedList; import org.apache.solr.core.SolrCore; import org.apache.solr.handler.UpdateRequestHandler; -import org.apache.solr.request.LocalSolrQueryRequest; +import org.apache.solr.request.SimpleSolrQueryRequest; import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.response.SolrQueryResponse; import org.junit.Before; @@ -292,7 +292,7 @@ public void testNonStringFieldsValues() throws Exception { ureq.add(doc); } - LocalSolrQueryRequest req = new LocalSolrQueryRequest(h.getCore(), mmparams); + SimpleSolrQueryRequest req = new SimpleSolrQueryRequest(h.getCore(), mmparams); try { req.setContentStreams( Collections.singletonList(ContentStreamBase.create(new JavaBinRequestWriter(), ureq))); diff --git a/solr/core/src/test/org/apache/solr/update/processor/SkipExistingDocumentsProcessorFactoryTest.java b/solr/core/src/test/org/apache/solr/update/processor/SkipExistingDocumentsProcessorFactoryTest.java index 19752e1ac7f..ee8184a4260 100644 --- a/solr/core/src/test/org/apache/solr/update/processor/SkipExistingDocumentsProcessorFactoryTest.java +++ b/solr/core/src/test/org/apache/solr/update/processor/SkipExistingDocumentsProcessorFactoryTest.java @@ -27,7 +27,7 @@ import org.apache.solr.common.SolrException; import org.apache.solr.common.SolrInputDocument; import org.apache.solr.common.util.NamedList; -import org.apache.solr.request.LocalSolrQueryRequest; +import org.apache.solr.request.SimpleSolrQueryRequest; import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.response.SolrQueryResponse; import org.apache.solr.update.AddUpdateCommand; @@ -41,7 +41,7 @@ public class SkipExistingDocumentsProcessorFactoryTest extends SolrTestCaseJ4 { private BytesRef docId = new BytesRef(); @SuppressWarnings({"rawtypes"}) - private SolrQueryRequest defaultRequest = new LocalSolrQueryRequest(null, new NamedList()); + private SolrQueryRequest defaultRequest = new SimpleSolrQueryRequest(null, new NamedList()); @BeforeClass public static void beforeClass() { @@ -170,7 +170,7 @@ public void testSkipInsertsFalseIfInitArgsTrueButFalseStringInRequest() { factory.init(initArgs); NamedList requestArgs = new NamedList<>(); requestArgs.add("skipInsertIfExists", "false"); - SolrQueryRequest req = new LocalSolrQueryRequest(null, requestArgs); + SolrQueryRequest req = new SimpleSolrQueryRequest(null, requestArgs); UpdateRequestProcessor next = Mockito.mock(DistributedUpdateProcessor.class); SkipExistingDocumentsUpdateProcessor processor = @@ -187,7 +187,7 @@ public void testSkipUpdatesFalseIfInitArgsTrueButFalseBooleanInRequest() { factory.init(initArgs); NamedList requestArgs = new NamedList<>(); requestArgs.add("skipUpdateIfMissing", false); - SolrQueryRequest req = new LocalSolrQueryRequest(null, requestArgs); + SolrQueryRequest req = new SimpleSolrQueryRequest(null, requestArgs); UpdateRequestProcessor next = Mockito.mock(DistributedUpdateProcessor.class); SkipExistingDocumentsUpdateProcessor processor = @@ -205,7 +205,7 @@ public void testSkipUpdatesTrueIfInitArgsFalseButTrueStringInRequest() { factory.init(initArgs); NamedList requestArgs = new NamedList<>(); requestArgs.add("skipUpdateIfMissing", "true"); - SolrQueryRequest req = new LocalSolrQueryRequest(null, requestArgs); + SolrQueryRequest req = new SimpleSolrQueryRequest(null, requestArgs); UpdateRequestProcessor next = Mockito.mock(DistributedUpdateProcessor.class); SkipExistingDocumentsUpdateProcessor processor = diff --git a/solr/core/src/test/org/apache/solr/update/processor/TemplateUpdateProcessorTest.java b/solr/core/src/test/org/apache/solr/update/processor/TemplateUpdateProcessorTest.java index ffa5cdc7d8d..962ac391aca 100644 --- a/solr/core/src/test/org/apache/solr/update/processor/TemplateUpdateProcessorTest.java +++ b/solr/core/src/test/org/apache/solr/update/processor/TemplateUpdateProcessorTest.java @@ -26,7 +26,7 @@ import org.apache.solr.common.params.ModifiableSolrParams; import org.apache.solr.common.util.NamedList; import org.apache.solr.common.util.Utils; -import org.apache.solr.request.LocalSolrQueryRequest; +import org.apache.solr.request.SimpleSolrQueryRequest; import org.apache.solr.response.SolrQueryResponse; import org.apache.solr.update.AddUpdateCommand; import org.junit.After; @@ -49,7 +49,7 @@ public void testSimple() throws Exception { var cmd = new AddUpdateCommand( - new LocalSolrQueryRequest( + new SimpleSolrQueryRequest( null, new ModifiableSolrParams() .add("processor", "template") diff --git a/solr/core/src/test/org/apache/solr/update/processor/TolerantUpdateProcessorTest.java b/solr/core/src/test/org/apache/solr/update/processor/TolerantUpdateProcessorTest.java index 7eaec9480e7..3dd3155822d 100644 --- a/solr/core/src/test/org/apache/solr/update/processor/TolerantUpdateProcessorTest.java +++ b/solr/core/src/test/org/apache/solr/update/processor/TolerantUpdateProcessorTest.java @@ -34,7 +34,7 @@ import org.apache.solr.common.util.IOUtils; import org.apache.solr.common.util.SimpleOrderedMap; import org.apache.solr.core.SolrCore; -import org.apache.solr.request.LocalSolrQueryRequest; +import org.apache.solr.request.SimpleSolrQueryRequest; import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.request.SolrRequestHandler; import org.apache.solr.response.SolrQueryResponse; @@ -435,7 +435,7 @@ protected SolrQueryResponse add( SolrQueryResponse rsp = new SolrQueryResponse(); rsp.add("responseHeader", new SimpleOrderedMap<>()); - SolrQueryRequest req = new LocalSolrQueryRequest(core, requestParams); + SolrQueryRequest req = new SimpleSolrQueryRequest(core, requestParams); UpdateRequestProcessor processor = null; try { processor = pc.createProcessor(req, rsp); diff --git a/solr/core/src/test/org/apache/solr/update/processor/UUIDUpdateProcessorFallbackTest.java b/solr/core/src/test/org/apache/solr/update/processor/UUIDUpdateProcessorFallbackTest.java index 46858324829..25fba86a9bd 100644 --- a/solr/core/src/test/org/apache/solr/update/processor/UUIDUpdateProcessorFallbackTest.java +++ b/solr/core/src/test/org/apache/solr/update/processor/UUIDUpdateProcessorFallbackTest.java @@ -26,7 +26,7 @@ import org.apache.solr.common.params.ModifiableSolrParams; import org.apache.solr.common.params.SolrParams; import org.apache.solr.core.SolrCore; -import org.apache.solr.request.LocalSolrQueryRequest; +import org.apache.solr.request.SimpleSolrQueryRequest; import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.request.SolrRequestInfo; import org.apache.solr.response.SolrQueryResponse; @@ -134,7 +134,7 @@ public void testProcessorPrefixReqParam() throws Exception { assertTrue(processorFactory instanceof UUIDUpdateProcessorFactory); SolrQueryResponse rsp = new SolrQueryResponse(); - SolrQueryRequest req = new LocalSolrQueryRequest(h.getCore(), new ModifiableSolrParams()); + SolrQueryRequest req = new SimpleSolrQueryRequest(h.getCore(), new ModifiableSolrParams()); AddUpdateCommand cmd = new AddUpdateCommand(req); cmd.solrDoc = new SolrInputDocument(); cmd.solrDoc.addField("random_s", "random_val"); @@ -182,7 +182,7 @@ SolrInputDocument processAdd(final String chain, final SolrInputDocument docIn, SolrQueryResponse rsp = new SolrQueryResponse(); - SolrQueryRequest req = new LocalSolrQueryRequest(core, params); + SolrQueryRequest req = new SimpleSolrQueryRequest(core, params); try { SolrRequestInfo.setRequestInfo(new SolrRequestInfo(req, rsp)); AddUpdateCommand cmd = new AddUpdateCommand(req); diff --git a/solr/modules/clustering/src/test/org/apache/solr/handler/clustering/ClusteringComponentTest.java b/solr/modules/clustering/src/test/org/apache/solr/handler/clustering/ClusteringComponentTest.java index 90b264649df..ea8619d4806 100644 --- a/solr/modules/clustering/src/test/org/apache/solr/handler/clustering/ClusteringComponentTest.java +++ b/solr/modules/clustering/src/test/org/apache/solr/handler/clustering/ClusteringComponentTest.java @@ -40,7 +40,7 @@ import org.apache.solr.common.util.SimpleOrderedMap; import org.apache.solr.core.SolrCore; import org.apache.solr.handler.component.SearchHandler; -import org.apache.solr.request.LocalSolrQueryRequest; +import org.apache.solr.request.SimpleSolrQueryRequest; import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.response.ResultContext; import org.apache.solr.response.SolrQueryResponse; @@ -385,7 +385,7 @@ private List> clusters( SolrQueryResponse rsp = new SolrQueryResponse(); rsp.addResponseHeader(new SimpleOrderedMap<>()); - try (SolrQueryRequest req = new LocalSolrQueryRequest(core, reqParams)) { + try (SolrQueryRequest req = new SimpleSolrQueryRequest(core, reqParams)) { handler.handleRequest(req, rsp); NamedList values = rsp.getValues(); @SuppressWarnings("unchecked") diff --git a/solr/modules/cross-dc/src/test/org/apache/solr/crossdc/handler/MirroringCollectionsHandlerTest.java b/solr/modules/cross-dc/src/test/org/apache/solr/crossdc/handler/MirroringCollectionsHandlerTest.java index a4cb9a97cc3..0b6fc438faf 100644 --- a/solr/modules/cross-dc/src/test/org/apache/solr/crossdc/handler/MirroringCollectionsHandlerTest.java +++ b/solr/modules/cross-dc/src/test/org/apache/solr/crossdc/handler/MirroringCollectionsHandlerTest.java @@ -35,7 +35,7 @@ import org.apache.solr.crossdc.common.KafkaCrossDcConf; import org.apache.solr.crossdc.common.KafkaMirroringSink; import org.apache.solr.crossdc.common.MirroredSolrRequest; -import org.apache.solr.request.LocalSolrQueryRequest; +import org.apache.solr.request.SimpleSolrQueryRequest; import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.response.SolrQueryResponse; import org.apache.solr.util.SolrKafkaTestsIgnoredThreadsFilter; @@ -136,7 +136,7 @@ private void runCommand(SolrParams params, boolean expectResult) throws Exceptio MirroringCollectionsHandler handler = Mockito.spy(new MirroringCollectionsHandler(coreContainer, sink)); Mockito.doNothing().when(handler).baseHandleRequestBody(Mockito.any(), Mockito.any()); - SolrQueryRequest req = new LocalSolrQueryRequest(null, params); + SolrQueryRequest req = new SimpleSolrQueryRequest(null, params); SolrQueryResponse rsp = new SolrQueryResponse(); handler.handleRequestBody(req, rsp); if (expectResult) { diff --git a/solr/modules/cross-dc/src/test/org/apache/solr/crossdc/handler/MirroringConfigSetsHandlerTest.java b/solr/modules/cross-dc/src/test/org/apache/solr/crossdc/handler/MirroringConfigSetsHandlerTest.java index 21a8d378208..f8476c7977e 100644 --- a/solr/modules/cross-dc/src/test/org/apache/solr/crossdc/handler/MirroringConfigSetsHandlerTest.java +++ b/solr/modules/cross-dc/src/test/org/apache/solr/crossdc/handler/MirroringConfigSetsHandlerTest.java @@ -41,7 +41,7 @@ import org.apache.solr.core.SolrXmlConfig; import org.apache.solr.crossdc.common.KafkaMirroringSink; import org.apache.solr.crossdc.common.MirroredSolrRequest; -import org.apache.solr.request.LocalSolrQueryRequest; +import org.apache.solr.request.SimpleSolrQueryRequest; import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.response.SolrQueryResponse; import org.apache.solr.util.SolrKafkaTestsIgnoredThreadsFilter; @@ -80,7 +80,7 @@ private static SolrQueryRequest createRequest( String zipResource) throws Exception { ModifiableSolrParams params = new ModifiableSolrParams(); - LocalSolrQueryRequest req = new LocalSolrQueryRequest(solrCore, params); + SimpleSolrQueryRequest req = new SimpleSolrQueryRequest(solrCore, params); params.set(ConfigSetParams.ACTION, action.toLower()); String method = "GET"; if (action == ConfigSetParams.ConfigSetAction.UPLOAD) { diff --git a/solr/modules/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTestAbstract.java b/solr/modules/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTestAbstract.java index e5a50c55e79..352c550ea53 100644 --- a/solr/modules/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTestAbstract.java +++ b/solr/modules/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTestAbstract.java @@ -24,7 +24,7 @@ import org.apache.solr.common.util.ContentStream; import org.apache.solr.common.util.ContentStreamBase; import org.apache.solr.common.util.NamedList; -import org.apache.solr.request.LocalSolrQueryRequest; +import org.apache.solr.request.SimpleSolrQueryRequest; import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.response.SolrQueryResponse; import org.apache.solr.update.AddUpdateCommand; @@ -1046,7 +1046,7 @@ public void testPasswordProtected() throws Exception { SolrQueryResponse loadLocalFromHandler(String handler, String filename, String... args) throws Exception { - try (LocalSolrQueryRequest req = (LocalSolrQueryRequest) req(args)) { + try (SimpleSolrQueryRequest req = (SimpleSolrQueryRequest) req(args)) { // TODO: stop using locally defined streams once stream.file and // stream.body work everywhere List cs = new ArrayList<>(); diff --git a/solr/modules/ltr/src/test/org/apache/solr/ltr/TestLTRReRankingPipeline.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/TestLTRReRankingPipeline.java index 86b7d6181d7..08054c4b98f 100644 --- a/solr/modules/ltr/src/test/org/apache/solr/ltr/TestLTRReRankingPipeline.java +++ b/solr/modules/ltr/src/test/org/apache/solr/ltr/TestLTRReRankingPipeline.java @@ -43,7 +43,7 @@ import org.apache.solr.ltr.model.TestLinearModel; import org.apache.solr.ltr.norm.IdentityNormalizer; import org.apache.solr.ltr.norm.Normalizer; -import org.apache.solr.request.LocalSolrQueryRequest; +import org.apache.solr.request.SimpleSolrQueryRequest; import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.search.SolrIndexSearcher; import org.junit.BeforeClass; @@ -112,7 +112,7 @@ public void testRescorer() throws Exception { assertU(commit()); try (SolrQueryRequest solrQueryRequest = - new LocalSolrQueryRequest(h.getCore(), new ModifiableSolrParams())) { + new SimpleSolrQueryRequest(h.getCore(), new ModifiableSolrParams())) { final BooleanQuery.Builder bqBuilder = new BooleanQuery.Builder(); bqBuilder.add(new TermQuery(new Term("field", "wizard")), BooleanClause.Occur.SHOULD); @@ -162,7 +162,7 @@ public void testDifferentTopN() throws IOException { assertU(commit()); try (SolrQueryRequest solrQueryRequest = - new LocalSolrQueryRequest(h.getCore(), new ModifiableSolrParams())) { + new SimpleSolrQueryRequest(h.getCore(), new ModifiableSolrParams())) { // Do ordinary BooleanQuery: final BooleanQuery.Builder bqBuilder = new BooleanQuery.Builder(); bqBuilder.add(new TermQuery(new Term("field", "wizard")), BooleanClause.Occur.SHOULD); @@ -235,7 +235,7 @@ public void testDifferentTopN() throws IOException { @Test public void testDocParam() throws Exception { try (SolrQueryRequest solrQueryRequest = - new LocalSolrQueryRequest(h.getCore(), new ModifiableSolrParams())) { + new SimpleSolrQueryRequest(h.getCore(), new ModifiableSolrParams())) { List features = makeFieldValueFeatures(new int[] {0}, "finalScore"); List norms = new ArrayList( diff --git a/solr/modules/scripting/src/test/org/apache/solr/scripting/xslt/XSLTUpdateRequestHandlerTest.java b/solr/modules/scripting/src/test/org/apache/solr/scripting/xslt/XSLTUpdateRequestHandlerTest.java index 4e3eff4b6a5..2e8dfbaa7cd 100644 --- a/solr/modules/scripting/src/test/org/apache/solr/scripting/xslt/XSLTUpdateRequestHandlerTest.java +++ b/solr/modules/scripting/src/test/org/apache/solr/scripting/xslt/XSLTUpdateRequestHandlerTest.java @@ -26,7 +26,7 @@ import org.apache.solr.common.util.NamedList; import org.apache.solr.core.SolrCore; import org.apache.solr.handler.loader.ContentStreamLoader; -import org.apache.solr.request.LocalSolrQueryRequest; +import org.apache.solr.request.SimpleSolrQueryRequest; import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.response.SolrQueryResponse; import org.apache.solr.update.AddUpdateCommand; @@ -68,7 +68,7 @@ public void testUpdate() throws Exception { args.put("tr", "xsl-update-handler-test.xsl"); SolrCore core = h.getCore(); - LocalSolrQueryRequest req = new LocalSolrQueryRequest(core, new MapSolrParams(args)); + SimpleSolrQueryRequest req = new SimpleSolrQueryRequest(core, new MapSolrParams(args)); ArrayList streams = new ArrayList<>(); streams.add(new ContentStreamBase.StringStream(xml)); req.setContentStreams(streams); diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/routing/ReplicaListTransformerTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/routing/ReplicaListTransformerTest.java index 11d1893ae8f..4d55dd62fd4 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/routing/ReplicaListTransformerTest.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/routing/ReplicaListTransformerTest.java @@ -28,7 +28,7 @@ import org.apache.solr.common.params.ModifiableSolrParams; import org.apache.solr.common.params.SolrParams; import org.apache.solr.handler.component.HttpShardHandlerFactory; -import org.apache.solr.request.LocalSolrQueryRequest; +import org.apache.solr.request.SimpleSolrQueryRequest; import org.apache.solr.request.SolrQueryRequest; import org.junit.Test; import org.slf4j.Logger; @@ -100,7 +100,7 @@ protected ReplicaListTransformer getReplicaListTransformer(final SolrQueryReques return super.getReplicaListTransformer(req); } }.getReplicaListTransformer( - new LocalSolrQueryRequest(null, new ModifiableSolrParams().add("toyRegEx", regex))); + new SimpleSolrQueryRequest(null, new ModifiableSolrParams().add("toyRegEx", regex))); } final List inputs = new ArrayList<>(); diff --git a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java index da99074d3a8..151c8ea3b24 100644 --- a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java +++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java @@ -118,7 +118,7 @@ import org.apache.solr.core.SolrXmlConfig; import org.apache.solr.embedded.JettySolrRunner; import org.apache.solr.handler.UpdateRequestHandler; -import org.apache.solr.request.LocalSolrQueryRequest; +import org.apache.solr.request.SimpleSolrQueryRequest; import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.request.SolrQueryRequestBase; import org.apache.solr.request.SolrRequestHandler; @@ -1321,7 +1321,7 @@ public static SolrQueryRequest req(SolrParams params, String... moreParams) { for (int i = 0; i < moreParams.length; i += 2) { mp.add(moreParams[i], moreParams[i + 1]); } - return new LocalSolrQueryRequest(h.getCore(), mp); + return new SimpleSolrQueryRequest(h.getCore(), mp); } /** Necessary to make method signatures un-ambiguous */ diff --git a/solr/test-framework/src/java/org/apache/solr/request/SimpleSolrQueryRequest.java b/solr/test-framework/src/java/org/apache/solr/request/SimpleSolrQueryRequest.java new file mode 100644 index 00000000000..dee4fd8afc2 --- /dev/null +++ b/solr/test-framework/src/java/org/apache/solr/request/SimpleSolrQueryRequest.java @@ -0,0 +1,69 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.solr.request; + +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; +import org.apache.solr.common.params.CommonParams; +import org.apache.solr.common.params.MultiMapSolrParams; +import org.apache.solr.common.params.SolrParams; +import org.apache.solr.common.util.NamedList; +import org.apache.solr.core.SolrCore; + +/** + * Simple concrete implementation of {@link SolrQueryRequestBase} for use in tests. This class + * provides convenient constructors for creating test requests. + * + *

This is a replacement for the deprecated {@code LocalSolrQueryRequest}. + */ +public class SimpleSolrQueryRequest extends SolrQueryRequestBase { + + protected static SolrParams makeParams( + String query, String qtype, int start, int limit, Map args) { + Map map = new HashMap<>(); + for (Iterator> iter = args.entrySet().iterator(); iter.hasNext(); ) { + Map.Entry e = iter.next(); + String k = e.getKey().toString(); + Object v = e.getValue(); + if (v instanceof String[]) map.put(k, (String[]) v); + else map.put(k, new String[] {v.toString()}); + } + if (query != null) map.put(CommonParams.Q, new String[] {query}); + if (qtype != null) map.put(CommonParams.QT, new String[] {qtype}); + map.put(CommonParams.START, new String[] {Integer.toString(start)}); + map.put(CommonParams.ROWS, new String[] {Integer.toString(limit)}); + return new MultiMapSolrParams(map); + } + + public SimpleSolrQueryRequest( + SolrCore core, String query, String qtype, int start, int limit, Map args) { + super(core, makeParams(query, qtype, start, limit, args)); + } + + public SimpleSolrQueryRequest(SolrCore core, NamedList args) { + super(core, args.toSolrParams()); + } + + public SimpleSolrQueryRequest(SolrCore core, Map args) { + super(core, new MultiMapSolrParams(args)); + } + + public SimpleSolrQueryRequest(SolrCore core, SolrParams args) { + super(core, args); + } +} diff --git a/solr/test-framework/src/java/org/apache/solr/update/processor/UpdateProcessorTestBase.java b/solr/test-framework/src/java/org/apache/solr/update/processor/UpdateProcessorTestBase.java index 97227e5e3a0..63530630be2 100644 --- a/solr/test-framework/src/java/org/apache/solr/update/processor/UpdateProcessorTestBase.java +++ b/solr/test-framework/src/java/org/apache/solr/update/processor/UpdateProcessorTestBase.java @@ -24,7 +24,7 @@ import org.apache.solr.common.params.SolrParams; import org.apache.solr.common.util.IOUtils; import org.apache.solr.core.SolrCore; -import org.apache.solr.request.LocalSolrQueryRequest; +import org.apache.solr.request.SimpleSolrQueryRequest; import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.request.SolrRequestInfo; import org.apache.solr.response.SolrQueryResponse; @@ -58,7 +58,7 @@ protected SolrInputDocument processAdd( SolrQueryResponse rsp = new SolrQueryResponse(); - SolrQueryRequest req = new LocalSolrQueryRequest(core, requestParams); + SolrQueryRequest req = new SimpleSolrQueryRequest(core, requestParams); try { SolrRequestInfo.setRequestInfo(new SolrRequestInfo(req, rsp)); AddUpdateCommand cmd = new AddUpdateCommand(req); @@ -84,7 +84,7 @@ protected void processCommit(final String chain) throws IOException { SolrQueryResponse rsp = new SolrQueryResponse(); - SolrQueryRequest req = new LocalSolrQueryRequest(core, new ModifiableSolrParams()); + SolrQueryRequest req = new SimpleSolrQueryRequest(core, new ModifiableSolrParams()); CommitUpdateCommand cmd = new CommitUpdateCommand(req, false); UpdateRequestProcessor processor = pc.createProcessor(req, rsp); @@ -102,7 +102,7 @@ protected void processDeleteById(final String chain, String id) throws IOExcepti SolrQueryResponse rsp = new SolrQueryResponse(); - SolrQueryRequest req = new LocalSolrQueryRequest(core, new ModifiableSolrParams()); + SolrQueryRequest req = new SimpleSolrQueryRequest(core, new ModifiableSolrParams()); DeleteUpdateCommand cmd = new DeleteUpdateCommand(req); cmd.setId(id); @@ -120,7 +120,7 @@ protected void finish(final String chain) throws IOException { assertNotNull("No Chain named: " + chain, pc); SolrQueryResponse rsp = new SolrQueryResponse(); - SolrQueryRequest req = new LocalSolrQueryRequest(core, new ModifiableSolrParams()); + SolrQueryRequest req = new SimpleSolrQueryRequest(core, new ModifiableSolrParams()); UpdateRequestProcessor processor = pc.createProcessor(req, rsp); try { diff --git a/solr/test-framework/src/java/org/apache/solr/util/TestHarness.java b/solr/test-framework/src/java/org/apache/solr/util/TestHarness.java index 300aa7c3185..bc80365e246 100644 --- a/solr/test-framework/src/java/org/apache/solr/util/TestHarness.java +++ b/solr/test-framework/src/java/org/apache/solr/util/TestHarness.java @@ -39,7 +39,7 @@ import org.apache.solr.core.SolrXmlConfig; import org.apache.solr.handler.UpdateRequestHandler; import org.apache.solr.logging.MDCSnapshot; -import org.apache.solr.request.LocalSolrQueryRequest; +import org.apache.solr.request.SimpleSolrQueryRequest; import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.request.SolrRequestHandler; import org.apache.solr.request.SolrRequestInfo; @@ -296,7 +296,7 @@ public String update(String xml) { * @return null if all good, otherwise the first test that fails. * @exception Exception any exception in the response. * @exception IOException if there is a problem writing the XML - * @see LocalSolrQueryRequest + * @see SimpleSolrQueryRequest */ public String validateQuery(SolrQueryRequest req, String... tests) throws Exception { @@ -311,7 +311,7 @@ public String validateQuery(SolrQueryRequest req, String... tests) throws Except * @return The XML response to the query * @exception Exception any exception in the response. * @exception IOException if there is a problem writing the XML - * @see LocalSolrQueryRequest + * @see SimpleSolrQueryRequest */ public String query(SolrQueryRequest req) throws Exception { return query(req.getParams().get(CommonParams.QT), req); @@ -326,7 +326,7 @@ public String query(SolrQueryRequest req) throws Exception { * @return The XML response to the query * @exception Exception any exception in the response. * @exception IOException if there is a problem writing the XML - * @see LocalSolrQueryRequest + * @see SimpleSolrQueryRequest */ public String query(String handler, SolrQueryRequest req) throws Exception { try (var mdcSnap = MDCSnapshot.create()) { @@ -396,7 +396,7 @@ public LocalRequestFactory getRequestFactory( } /** - * A Factory that generates LocalSolrQueryRequest objects using a specified set of default + * A Factory that generates SimpleSolrQueryRequest objects using a specified set of default * options. */ public class LocalRequestFactory { @@ -408,16 +408,16 @@ public class LocalRequestFactory { public LocalRequestFactory() {} /** - * Creates a LocalSolrQueryRequest based on variable args; for historical reasons, this method + * Creates a SimpleSolrQueryRequest based on variable args; for historical reasons, this method * has some peculiar behavior: * *

    *
  • If there is a single arg, then it is treated as the "q" param, and the - * LocalSolrQueryRequest consists of that query string along with "qt", "start", and + * SimpleSolrQueryRequest consists of that query string along with "qt", "start", and * "rows" params (based on the qtype, start, and limit properties of this factory) along * with any other default "args" set on this factory. *
  • If there are multiple args, then there must be an even number of them, and each pair of - * args is used as a key=value param in the LocalSolrQueryRequest. NOTE: In this usage, + * args is used as a key=value param in the SimpleSolrQueryRequest. NOTE: In this usage, * the "qtype", "start", "limit", and "args" properties of this factory are ignored. *
* @@ -425,9 +425,9 @@ public LocalRequestFactory() {} * increment the core reference count and decrement it in the request close() method? */ @SuppressWarnings({"unchecked"}) - public LocalSolrQueryRequest makeRequest(String... q) { + public SimpleSolrQueryRequest makeRequest(String... q) { if (q.length == 1) { - return new LocalSolrQueryRequest( + return new SimpleSolrQueryRequest( TestHarness.this.getCore(), q[0], qtype, start, limit, args); } if (q.length % 2 != 0) { @@ -442,7 +442,7 @@ public LocalSolrQueryRequest makeRequest(String... q) { @SuppressWarnings({"rawtypes"}) NamedList nl = new NamedList(entries); if (nl.get("wt") == null) nl.add("wt", "xml"); - return new LocalSolrQueryRequest(TestHarness.this.getCore(), nl); + return new SimpleSolrQueryRequest(TestHarness.this.getCore(), nl); } } }