This is an automated email from the ASF dual-hosted git repository.
dsmiley pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/main by this push:
new 29451d95371 SOLR-17634: Remove version param (#3336)
29451d95371 is described below
commit 29451d95371fb2906741f6b4728c9deba26a9a3c
Author: David Smiley <[email protected]>
AuthorDate: Fri May 16 00:10:24 2025 -0400
SOLR-17634: Remove version param (#3336)
This param was in relation to the version of the response type parsing
("wt").
Not used in forever; XML format is stable. Today would more likely use a
user-agent Solr version.
---
solr/CHANGES.txt | 3 ++
.../client/solrj/embedded/EmbeddedSolrServer.java | 10 +-----
.../java/org/apache/solr/handler/BlobHandler.java | 3 +-
.../solr/handler/component/HttpShardHandler.java | 1 -
.../java/org/apache/solr/response/XMLWriter.java | 13 --------
.../org/apache/solr/BasicFunctionalityTest.java | 3 --
.../test/org/apache/solr/ConvertedLegacyTest.java | 2 --
.../org/apache/solr/DisMaxRequestHandlerTest.java | 24 ++-------------
.../src/test/org/apache/solr/EchoParamsTest.java | 23 +-------------
.../test/org/apache/solr/MinimalSchemaTest.java | 3 --
.../src/test/org/apache/solr/OutputWriterTest.java | 11 +------
solr/core/src/test/org/apache/solr/SampleTest.java | 6 +---
.../test/org/apache/solr/cli/PostLogsToolTest.java | 4 +--
.../org/apache/solr/handler/TestCSVLoader.java | 3 --
.../DistributedFacetPivotWhiteBoxTest.java | 2 --
.../solr/search/function/TestFunctionQuery.java | 2 --
.../solr/servlet/DirectSolrConnectionTest.java | 3 +-
.../apache/solr/client/solrj/ResponseParser.java | 7 -----
.../solrj/impl/ConcurrentUpdateSolrClient.java | 8 ++---
.../solr/client/solrj/impl/HttpSolrClient.java | 4 +--
.../solr/client/solrj/impl/HttpSolrClientBase.java | 4 +--
.../client/solrj/impl/JavaBinResponseParser.java | 5 ---
.../client/solrj/impl/JsonMapResponseParser.java | 5 ---
.../apache/solr/common/cloud/PerReplicaStates.java | 3 +-
.../apache/solr/common/params/CommonParams.java | 3 --
.../client/solrj/impl/BasicHttpSolrClientTest.java | 36 ----------------------
.../client/solrj/impl/Http2SolrClientTest.java | 6 +---
.../client/solrj/impl/HttpJdkSolrClientTest.java | 8 ++---
.../client/solrj/impl/HttpSolrClientTestBase.java | 16 ++--------
.../src/java/org/apache/solr/SolrTestCaseJ4.java | 10 +++---
30 files changed, 31 insertions(+), 200 deletions(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index db2e7aed119..2a58dd1560b 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -125,6 +125,9 @@ Deprecation Removals
* SOLR-17738: Removed deprecated `transform()` from `DocTransformer`.
(Abhishek Umarjikar, Houston Putman)
+* SOLR-17634: Removed the "version" parameter that the SolrJ client would add
to almost all Solr
+ requests in relation to the version of the response format parsing ("wt"
param). (David Smiley)
+
Dependency Upgrades
---------------------
(No changes)
diff --git
a/solr/core/src/java/org/apache/solr/client/solrj/embedded/EmbeddedSolrServer.java
b/solr/core/src/java/org/apache/solr/client/solrj/embedded/EmbeddedSolrServer.java
index f31b58fb81a..dcf07988c82 100644
---
a/solr/core/src/java/org/apache/solr/client/solrj/embedded/EmbeddedSolrServer.java
+++
b/solr/core/src/java/org/apache/solr/client/solrj/embedded/EmbeddedSolrServer.java
@@ -26,7 +26,6 @@ import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import java.util.Map;
import java.util.Properties;
import java.util.function.Supplier;
import org.apache.lucene.search.TotalHits.Relation;
@@ -45,7 +44,6 @@ import org.apache.solr.common.SolrDocument;
import org.apache.solr.common.SolrDocumentList;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.CommonParams;
-import org.apache.solr.common.params.MapSolrParams;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.ContentStream;
import org.apache.solr.common.util.ContentStreamBase;
@@ -248,13 +246,7 @@ public class EmbeddedSolrServer extends SolrClient {
if (responseParser == null) {
responseParser = new JavaBinResponseParser();
}
- var addParams =
- new MapSolrParams(
- Map.of(
- CommonParams.WT,
- responseParser.getWriterType(),
- CommonParams.VERSION,
- responseParser.getVersion()));
+ var addParams = SolrParams.of(CommonParams.WT,
responseParser.getWriterType());
return SolrParams.wrapDefaults(addParams, params);
}
diff --git a/solr/core/src/java/org/apache/solr/handler/BlobHandler.java
b/solr/core/src/java/org/apache/solr/handler/BlobHandler.java
index 3f3bebca025..1befa4f6e77 100644
--- a/solr/core/src/java/org/apache/solr/handler/BlobHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/BlobHandler.java
@@ -20,7 +20,6 @@ import static java.util.Collections.singletonMap;
import static org.apache.solr.common.params.CommonParams.ID;
import static org.apache.solr.common.params.CommonParams.JSON;
import static org.apache.solr.common.params.CommonParams.SORT;
-import static org.apache.solr.common.params.CommonParams.VERSION;
import java.io.IOException;
import java.io.InputStream;
@@ -158,7 +157,7 @@ public class BlobHandler extends RequestHandlerBase
md5,
"blobName",
blobName,
- VERSION,
+ "version",
version,
"timestamp",
new Date(),
diff --git
a/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandler.java
b/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandler.java
index d5cb3954a81..d0100275807 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandler.java
@@ -204,7 +204,6 @@ public class HttpShardHandler extends ShardHandler {
private LBSolrClient.Req prepareLBRequest(
ShardRequest sreq, String shard, ModifiableSolrParams params,
List<String> urls) {
params.remove(CommonParams.WT); // use default (currently javabin)
- params.remove(CommonParams.VERSION);
QueryRequest req = createQueryRequest(sreq, params, shard);
req.setMethod(SolrRequest.METHOD.POST);
SolrRequestInfo requestInfo = SolrRequestInfo.getRequestInfo();
diff --git a/solr/core/src/java/org/apache/solr/response/XMLWriter.java
b/solr/core/src/java/org/apache/solr/response/XMLWriter.java
index d35dba0c138..e8748e2ae78 100644
--- a/solr/core/src/java/org/apache/solr/response/XMLWriter.java
+++ b/solr/core/src/java/org/apache/solr/response/XMLWriter.java
@@ -27,7 +27,6 @@ import java.util.Map;
import org.apache.solr.common.IteratorWriter;
import org.apache.solr.common.MapWriter;
import org.apache.solr.common.SolrDocument;
-import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.XML;
@@ -43,8 +42,6 @@ import org.slf4j.LoggerFactory;
public class XMLWriter extends TextResponseWriter {
private static final Logger log =
LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
- public static float CURRENT_VERSION = 2.2f;
-
private static final char[] XML_START1 =
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n".toCharArray();
@@ -61,8 +58,6 @@ public class XMLWriter extends TextResponseWriter {
private static final char[] XML_START2_NOSCHEMA =
("<response>\n").toCharArray();
- final int version;
-
public static void writeResponse(Writer writer, SolrQueryRequest req,
SolrQueryResponse rsp)
throws IOException {
XMLWriter xmlWriter = null;
@@ -76,14 +71,6 @@ public class XMLWriter extends TextResponseWriter {
public XMLWriter(Writer writer, SolrQueryRequest req, SolrQueryResponse rsp)
{
super(writer, req, rsp);
-
- String version = req.getParams().get(CommonParams.VERSION);
- float ver = version == null ? CURRENT_VERSION : Float.parseFloat(version);
- this.version = (int) (ver * 1000);
- if (this.version < 2200) {
- throw new SolrException(
- SolrException.ErrorCode.BAD_REQUEST, "XMLWriter does not support
version: " + version);
- }
}
public void writeResponse() throws IOException {
diff --git a/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java
b/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java
index 3a58135b4a0..025db3d529d 100644
--- a/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java
+++ b/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java
@@ -105,7 +105,6 @@ public class BasicFunctionalityTest extends SolrTestCaseJ4 {
@Test
public void testIgnoredFields() {
- lrf.args.put(CommonParams.VERSION, "2.2");
assertU("adding doc with ignored field", adoc("id", "42", "foo_ignored",
"blah blah"));
assertU("commit", commit());
@@ -137,7 +136,6 @@ public class BasicFunctionalityTest extends SolrTestCaseJ4 {
Gauge<Number> g = (Gauge<Number>) metrics.get("CORE.refCount");
assertTrue(g.getValue().intValue() > 0);
- lrf.args.put(CommonParams.VERSION, "2.2");
assertQ(
"test query on empty index",
req("qlkciyopsbgzyvkylsjhchghjrdf"),
@@ -644,7 +642,6 @@ public class BasicFunctionalityTest extends SolrTestCaseJ4 {
@Test
public void testDefaultFieldValues() {
clearIndex();
- lrf.args.put(CommonParams.VERSION, "2.2");
assertU(
adoc(
"id", "4055",
diff --git a/solr/core/src/test/org/apache/solr/ConvertedLegacyTest.java
b/solr/core/src/test/org/apache/solr/ConvertedLegacyTest.java
index 5c9507d9f9a..9142db8bdf8 100644
--- a/solr/core/src/test/org/apache/solr/ConvertedLegacyTest.java
+++ b/solr/core/src/test/org/apache/solr/ConvertedLegacyTest.java
@@ -18,7 +18,6 @@ package org.apache.solr;
import java.util.HashMap;
import java.util.Map;
-import org.apache.solr.common.params.CommonParams;
import org.apache.solr.request.LocalSolrQueryRequest;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.util.ErrorLogMuter;
@@ -42,7 +41,6 @@ public class ConvertedLegacyTest extends SolrTestCaseJ4 {
// these may be reused by things that need a special query
SolrQueryRequest req = null;
Map<String, String> args = new HashMap<>();
- lrf.args.put(CommonParams.VERSION, "2.2");
// compact the index, keep things from getting out of hand
diff --git a/solr/core/src/test/org/apache/solr/DisMaxRequestHandlerTest.java
b/solr/core/src/test/org/apache/solr/DisMaxRequestHandlerTest.java
index c5da6805c22..e82df1e4bfb 100644
--- a/solr/core/src/test/org/apache/solr/DisMaxRequestHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/DisMaxRequestHandlerTest.java
@@ -26,9 +26,7 @@ public class DisMaxRequestHandlerTest extends SolrTestCaseJ4 {
@BeforeClass
public static void beforeClass() throws Exception {
initCore("solrconfig.xml", "schema.xml");
- lrf =
- h.getRequestFactory(
- "/dismax", 0, 20, CommonParams.VERSION, "2.2", "facet", "true",
"facet.field", "t_s");
+ lrf = h.getRequestFactory("/dismax", 0, 20, "facet", "true",
"facet.field", "t_s");
// Add some documents to the index
assertNull(
h.validateUpdate(
@@ -129,17 +127,7 @@ public class DisMaxRequestHandlerTest extends
SolrTestCaseJ4 {
assertQ(
"multi qf",
- req(
- "q",
- "cool",
- "qt",
- qt,
- CommonParams.VERSION,
- "2.2",
- "qf",
- "subject",
- "qf",
- "features_t"),
+ req("q", "cool", "qt", qt, "qf", "subject", "qf", "features_t"),
"//*[@numFound='3']");
assertQ(
@@ -149,7 +137,7 @@ public class DisMaxRequestHandlerTest extends
SolrTestCaseJ4 {
assertQ(
"boost query",
- req("q", "cool stuff", "qt", qt, CommonParams.VERSION, "2.2", "bq",
"subject:hell^400"),
+ req("q", "cool stuff", "qt", qt, "bq", "subject:hell^400"),
"//*[@numFound='3']",
"//result/doc[1]/str[@name='id'][.='666']",
"//result/doc[2]/str[@name='id'][.='42']",
@@ -162,8 +150,6 @@ public class DisMaxRequestHandlerTest extends
SolrTestCaseJ4 {
"cool stuff",
"qt",
qt,
- CommonParams.VERSION,
- "2.2",
"bq",
"subject:hell^400",
"bq",
@@ -247,8 +233,6 @@ public class DisMaxRequestHandlerTest extends
SolrTestCaseJ4 {
"cool stuff",
"qt",
"/dismax",
- CommonParams.VERSION,
- "2.2",
"bq",
"subject:hell OR subject:cool",
CommonParams.DEBUG_QUERY,
@@ -263,8 +247,6 @@ public class DisMaxRequestHandlerTest extends
SolrTestCaseJ4 {
"cool stuff",
"qt",
"/dismax",
- CommonParams.VERSION,
- "2.2",
"bq",
"subject:hell OR subject:cool",
"bq",
diff --git a/solr/core/src/test/org/apache/solr/EchoParamsTest.java
b/solr/core/src/test/org/apache/solr/EchoParamsTest.java
index 1ed909defc2..1d65d1800df 100644
--- a/solr/core/src/test/org/apache/solr/EchoParamsTest.java
+++ b/solr/core/src/test/org/apache/solr/EchoParamsTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.solr;
-import org.apache.solr.common.params.CommonParams;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -33,7 +32,6 @@ public class EchoParamsTest extends SolrTestCaseJ4 {
@Test
public void test() {
defaultEchoParams();
- defaultEchoParamsDefaultVersion();
explicitEchoParams();
allEchoParams();
}
@@ -43,21 +41,12 @@ public class EchoParamsTest extends SolrTestCaseJ4 {
private void defaultEchoParams() {
lrf.args.put("wt", "xml");
- lrf.args.put(CommonParams.VERSION, "2.2");
- assertQ(req("foo"), HEADER_XPATH + "/int[@name='status']");
- assertQ(req("foo"), "not(//lst[@name='params'])");
- }
-
- private void defaultEchoParamsDefaultVersion() {
- lrf.args.put("wt", "xml");
- lrf.args.remove(CommonParams.VERSION);
assertQ(req("foo"), HEADER_XPATH + "/int[@name='status']");
assertQ(req("foo"), "not(//lst[@name='params'])");
}
private void explicitEchoParams() {
lrf.args.put("wt", "xml");
- lrf.args.put(CommonParams.VERSION, "2.2");
lrf.args.put("echoParams", "explicit");
assertQ(req("foo"), HEADER_XPATH + "/int[@name='status']");
assertQ(req("foo"), HEADER_XPATH + "/lst[@name='params']");
@@ -67,17 +56,7 @@ public class EchoParamsTest extends SolrTestCaseJ4 {
private void allEchoParams() {
lrf =
h.getRequestFactory(
- "/crazy_custom_qt",
- 0,
- 20,
- CommonParams.VERSION,
- "2.2",
- "wt",
- "xml",
- "echoParams",
- "all",
- "echoHandler",
- "true");
+ "/crazy_custom_qt", 0, 20, "wt", "xml", "echoParams", "all",
"echoHandler", "true");
assertQ(req("foo"), HEADER_XPATH +
"/lst[@name='params']/str[@name='fl'][.='implicit']");
assertQ(
diff --git a/solr/core/src/test/org/apache/solr/MinimalSchemaTest.java
b/solr/core/src/test/org/apache/solr/MinimalSchemaTest.java
index 3366bc02fe1..2241f4d58b7 100644
--- a/solr/core/src/test/org/apache/solr/MinimalSchemaTest.java
+++ b/solr/core/src/test/org/apache/solr/MinimalSchemaTest.java
@@ -17,7 +17,6 @@
package org.apache.solr;
import java.util.Set;
-import org.apache.solr.common.params.CommonParams;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -40,8 +39,6 @@ public class MinimalSchemaTest extends SolrTestCaseJ4 {
*/
assertNull("UniqueKey Field isn't null",
h.getCore().getLatestSchema().getUniqueKeyField());
- lrf.args.put(CommonParams.VERSION, "2.2");
-
assertNull(
"Simple assertion that adding a document works",
h.validateUpdate(
diff --git a/solr/core/src/test/org/apache/solr/OutputWriterTest.java
b/solr/core/src/test/org/apache/solr/OutputWriterTest.java
index f230733383c..30df9ed98fa 100644
--- a/solr/core/src/test/org/apache/solr/OutputWriterTest.java
+++ b/solr/core/src/test/org/apache/solr/OutputWriterTest.java
@@ -18,7 +18,6 @@ package org.apache.solr;
import java.io.IOException;
import java.io.Writer;
-import org.apache.solr.common.params.CommonParams;
import org.apache.solr.core.PluginBag;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.response.QueryResponseWriter;
@@ -44,15 +43,7 @@ public class OutputWriterTest extends SolrTestCaseJ4 {
*/
@Test
public void testSOLR59responseHeaderVersions() {
- // default version is 2.2, with "new" responseHeader
- lrf.args.remove(CommonParams.VERSION);
- lrf.args.put("wt", "standard");
- assertQ(req("foo"),
"/response/lst[@name='responseHeader']/int[@name='status'][.='0']");
- lrf.args.remove("wt");
- assertQ(req("foo"),
"/response/lst[@name='responseHeader']/int[@name='QTime']");
-
- // and explicit 2.2 works as default
- // lrf.args.put("version", "2.2");
+ // default results in "new" responseHeader
lrf.args.put("wt", "standard");
assertQ(req("foo"),
"/response/lst[@name='responseHeader']/int[@name='status'][.='0']");
lrf.args.remove("wt");
diff --git a/solr/core/src/test/org/apache/solr/SampleTest.java
b/solr/core/src/test/org/apache/solr/SampleTest.java
index 3914fc2f401..210669dabe4 100644
--- a/solr/core/src/test/org/apache/solr/SampleTest.java
+++ b/solr/core/src/test/org/apache/solr/SampleTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.solr;
-import org.apache.solr.common.params.CommonParams;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.util.TestHarness;
import org.junit.BeforeClass;
@@ -39,7 +38,6 @@ public class SampleTest extends SolrTestCaseJ4 {
/** Demonstration of some simple ways to use the base class */
@Test
public void testSimple() {
- lrf.args.put(CommonParams.VERSION, "2.2");
assertU(
"Simple assertion that adding a document works",
adoc(
@@ -65,7 +63,6 @@ public class SampleTest extends SolrTestCaseJ4 {
/** Demonstration of some of the more complex ways to use the base class */
@Test
public void testAdvanced() throws Exception {
- lrf.args.put(CommonParams.VERSION, "2.2");
assertU(
"less common case, a complex addition with options",
add(
@@ -101,8 +98,7 @@ public class SampleTest extends SolrTestCaseJ4 {
*
* Note: the qt proves we are using our custom config...
*/
- TestHarness.LocalRequestFactory l =
- h.getRequestFactory("/crazy_custom_qt", 100, 200,
CommonParams.VERSION, "2.2");
+ TestHarness.LocalRequestFactory l =
h.getRequestFactory("/crazy_custom_qt", 100, 200);
assertQ("how did i find Mack Daddy? ", l.makeRequest("Mack Daddy"),
"//result[@numFound=0]");
/* you can access the harness directly as well*/
diff --git a/solr/core/src/test/org/apache/solr/cli/PostLogsToolTest.java
b/solr/core/src/test/org/apache/solr/cli/PostLogsToolTest.java
index 6240c5443b1..dfde71b4bda 100644
--- a/solr/core/src/test/org/apache/solr/cli/PostLogsToolTest.java
+++ b/solr/core/src/test/org/apache/solr/cli/PostLogsToolTest.java
@@ -116,7 +116,7 @@ public class PostLogsToolTest extends SolrTestCaseJ4 {
public void testRTGRecord() throws Exception {
final String record =
sometimesSolr9Format(
- "2020-03-19 20:00:30.845 INFO (qtp1635378213-20354) [c:logs4
s:shard8 r:core_node63 x:logs4_shard8_replica_n60] o.a.s.c.S.Request
[logs4_shard8_replica_n60] webapp=/solr path=/get
params={qt=/get&_stateVer_=logs4:104&ids=id1&ids=id2&ids=id3&wt=javabin&version=2}
status=0 QTime=61");
+ "2020-03-19 20:00:30.845 INFO (qtp1635378213-20354) [c:logs4
s:shard8 r:core_node63 x:logs4_shard8_replica_n60] o.a.s.c.S.Request
[logs4_shard8_replica_n60] webapp=/solr path=/get
params={qt=/get&_stateVer_=logs4:104&ids=id1&ids=id2&ids=id3&wt=javabin}
status=0 QTime=61");
List<SolrInputDocument> docs = readDocs(record);
assertEquals(docs.size(), 1);
@@ -270,7 +270,7 @@ public class PostLogsToolTest extends SolrTestCaseJ4 {
@Test
public void testCommit() throws Exception {
String record =
- "2021-10-08 16:42:10.636 INFO (qtp1080476785-26) [c:collection1
s:shard1 r:core_node2 x:collection1_shard1_replica_n1]
o.a.s.u.p.LogUpdateProcessorFactory [collection1_shard1_replica_n1]
webapp=/solr path=/update
params={waitSearcher=true&commit=true&softCommit=false&wt=javabin&version=2}{commit=}
0 152";
+ "2021-10-08 16:42:10.636 INFO (qtp1080476785-26) [c:collection1
s:shard1 r:core_node2 x:collection1_shard1_replica_n1]
o.a.s.u.p.LogUpdateProcessorFactory [collection1_shard1_replica_n1]
webapp=/solr path=/update
params={waitSearcher=true&commit=true&softCommit=false&wt=javabin}{commit=} 0
152";
List<SolrInputDocument> docs = readDocs(record);
assertEquals(docs.size(), 1);
SolrInputDocument doc = docs.get(0);
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 94fe9195d08..e02ba5447dd 100644
--- a/solr/core/src/test/org/apache/solr/handler/TestCSVLoader.java
+++ b/solr/core/src/test/org/apache/solr/handler/TestCSVLoader.java
@@ -23,7 +23,6 @@ import java.nio.file.Path;
import java.util.ArrayList;
import java.util.List;
import org.apache.solr.SolrTestCaseJ4;
-import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.util.ContentStream;
import org.apache.solr.common.util.ContentStreamBase;
import org.apache.solr.request.LocalSolrQueryRequest;
@@ -143,8 +142,6 @@ public class TestCSVLoader extends SolrTestCaseJ4 {
@Test
public void testCSV() throws Exception {
- lrf.args.put(CommonParams.VERSION, "2.2");
-
makeFile("id,str_s\n100,\"quoted\"\n101,\n102,\"\"\n103,");
loadLocal("commit", "true");
assertQ(req("id:[100 TO 110]"), "//*[@numFound='4']");
diff --git
a/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotWhiteBoxTest.java
b/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotWhiteBoxTest.java
index 1f86e97e477..fa008726918 100644
---
a/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotWhiteBoxTest.java
+++
b/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotWhiteBoxTest.java
@@ -115,7 +115,6 @@ public class DistributedFacetPivotWhiteBoxTest extends
BaseDistributedSearchTest
// "wt", "javabin",
"facet.pivot",
"{!stats=s1}place_t,company_t",
- // "version", "2",
"start",
"0",
"rows",
@@ -168,7 +167,6 @@ public class DistributedFacetPivotWhiteBoxTest extends
BaseDistributedSearchTest
"facet.limit", "4",
"distrib", "false",
// "wt", "javabin",
- // "version", "2",
"rows", "0",
"facet.sort", "index",
"fpt0", "~krakow",
diff --git
a/solr/core/src/test/org/apache/solr/search/function/TestFunctionQuery.java
b/solr/core/src/test/org/apache/solr/search/function/TestFunctionQuery.java
index 726ad95b1c1..2ad042f7d9b 100644
--- a/solr/core/src/test/org/apache/solr/search/function/TestFunctionQuery.java
+++ b/solr/core/src/test/org/apache/solr/search/function/TestFunctionQuery.java
@@ -38,7 +38,6 @@ public class TestFunctionQuery extends SolrTestCaseJ4 {
}
void createIndex(String field, int... values) {
- // lrf.args.put("version","2.0");
for (int val : values) {
String s = Integer.toString(val);
@@ -120,7 +119,6 @@ public class TestFunctionQuery extends SolrTestCaseJ4 {
void doTest(String field) {
clearIndex();
- // lrf.args.put("version","2.0");
int[] vals = {100, -4, 0, 10, 25, 5};
createIndex(field, vals);
createIndex(null, 88); // id with no value
diff --git
a/solr/core/src/test/org/apache/solr/servlet/DirectSolrConnectionTest.java
b/solr/core/src/test/org/apache/solr/servlet/DirectSolrConnectionTest.java
index 8166578f8e2..0e4ecbd63ee 100644
--- a/solr/core/src/test/org/apache/solr/servlet/DirectSolrConnectionTest.java
+++ b/solr/core/src/test/org/apache/solr/servlet/DirectSolrConnectionTest.java
@@ -22,6 +22,7 @@ import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.common.params.CommonParams;
import org.junit.BeforeClass;
+@Deprecated
public class DirectSolrConnectionTest extends SolrTestCaseJ4 {
@BeforeClass
@@ -40,7 +41,7 @@ public class DirectSolrConnectionTest extends SolrTestCaseJ4 {
// Check that a request gets back the echoParams call
public void testSimpleRequest() throws Exception {
- String pathAndParams =
"/select?wt=xml&version=2.2&echoParams=explicit&q=*:*";
+ String pathAndParams = "/select?wt=xml&echoParams=explicit&q=*:*";
String got = direct.request(pathAndParams, null);
diff --git
a/solr/solrj/src/java/org/apache/solr/client/solrj/ResponseParser.java
b/solr/solrj/src/java/org/apache/solr/client/solrj/ResponseParser.java
index 06b9e5402be..dbca336e2e3 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/ResponseParser.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/ResponseParser.java
@@ -41,11 +41,4 @@ public abstract class ResponseParser {
* no enforcement.
*/
public abstract Collection<String> getContentTypes();
-
- /**
- * @return the version param passed to solr
- */
- public String getVersion() {
- return "2.2";
- }
}
diff --git
a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClient.java
b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClient.java
index 1eff51e4a5c..98ef90980bd 100644
---
a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClient.java
+++
b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClient.java
@@ -322,11 +322,9 @@ public class ConcurrentUpdateSolrClient extends SolrClient
{
}
});
- // The parser 'wt=' and 'version=' params are used instead of the
- // original params
- ModifiableSolrParams requestParams = new
ModifiableSolrParams(origParams);
- requestParams.set(CommonParams.WT, client.parser.getWriterType());
- requestParams.set(CommonParams.VERSION, client.parser.getVersion());
+ // The parser 'wt=' param is used instead of the original params
+ var addParams = SolrParams.of(CommonParams.WT,
client.parser.getWriterType());
+ var requestParams = SolrParams.wrapDefaults(addParams, origParams);
String basePath = client.getBaseURL();
if (update.getCollection() != null) {
diff --git
a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClient.java
b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClient.java
index 1bea292b042..17754ea8cf5 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClient.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClient.java
@@ -343,12 +343,10 @@ public class HttpSolrClient extends BaseHttpSolrClient {
Header[] contextHeaders = buildRequestSpecificHeaders(request);
- // The parser 'wt=' and 'version=' params are used instead of the original
- // params
+ // The parser 'wt=' param is used instead of the original params
ModifiableSolrParams wparams = new ModifiableSolrParams(params);
if (parser != null) {
wparams.set(CommonParams.WT, parser.getWriterType());
- wparams.set(CommonParams.VERSION, parser.getVersion());
}
if (invariantParams != null) {
wparams.add(invariantParams);
diff --git
a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClientBase.java
b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClientBase.java
index b4b84541cc6..15b7f12deba 100644
---
a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClientBase.java
+++
b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClientBase.java
@@ -133,11 +133,9 @@ public abstract class HttpSolrClientBase extends
SolrClient {
protected ModifiableSolrParams initializeSolrParams(
SolrRequest<?> solrRequest, ResponseParser parserToUse) {
- // The parser 'wt=' and 'version=' params are used instead of the original
- // params
+ // The parser 'wt=' param is used instead of the original params
ModifiableSolrParams wparams = new
ModifiableSolrParams(solrRequest.getParams());
wparams.set(CommonParams.WT, parserToUse.getWriterType());
- wparams.set(CommonParams.VERSION, parserToUse.getVersion());
return wparams;
}
diff --git
a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/JavaBinResponseParser.java
b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/JavaBinResponseParser.java
index 06f348111dc..8962077a55b 100644
---
a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/JavaBinResponseParser.java
+++
b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/JavaBinResponseParser.java
@@ -57,9 +57,4 @@ public class JavaBinResponseParser extends ResponseParser {
public Collection<String> getContentTypes() {
return Set.of(JAVABIN_CONTENT_TYPE, JAVABIN_CONTENT_TYPE_V2);
}
-
- @Override
- public String getVersion() {
- return "2";
- }
}
diff --git
a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/JsonMapResponseParser.java
b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/JsonMapResponseParser.java
index 8128bcb69a7..45438944d6d 100644
---
a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/JsonMapResponseParser.java
+++
b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/JsonMapResponseParser.java
@@ -59,9 +59,4 @@ public class JsonMapResponseParser extends ResponseParser {
public Collection<String> getContentTypes() {
return Set.of("application/json");
}
-
- @Override
- public String getVersion() {
- return "2.2";
- }
}
diff --git
a/solr/solrj/src/java/org/apache/solr/common/cloud/PerReplicaStates.java
b/solr/solrj/src/java/org/apache/solr/common/cloud/PerReplicaStates.java
index 783729e2edf..0eb9d68ee0c 100644
--- a/solr/solrj/src/java/org/apache/solr/common/cloud/PerReplicaStates.java
+++ b/solr/solrj/src/java/org/apache/solr/common/cloud/PerReplicaStates.java
@@ -18,7 +18,6 @@
package org.apache.solr.common.cloud;
import static org.apache.solr.common.params.CommonParams.NAME;
-import static org.apache.solr.common.params.CommonParams.VERSION;
import java.io.IOException;
import java.lang.invoke.MethodHandles;
@@ -231,7 +230,7 @@ public class PerReplicaStates implements ReflectMapWriter {
@Override
public void writeMap(EntryWriter ew) throws IOException {
ew.put(NAME, replica);
- ew.put(VERSION, version);
+ ew.put("version", version);
ew.put(ReplicaStateProps.STATE, state.toString());
if (isLeader) ew.put(ReplicaStateProps.LEADER, isLeader);
ew.putIfNotNull("duplicate", duplicate);
diff --git
a/solr/solrj/src/java/org/apache/solr/common/params/CommonParams.java
b/solr/solrj/src/java/org/apache/solr/common/params/CommonParams.java
index 86ba3d4452d..1982c7a122b 100644
--- a/solr/solrj/src/java/org/apache/solr/common/params/CommonParams.java
+++ b/solr/solrj/src/java/org/apache/solr/common/params/CommonParams.java
@@ -92,9 +92,6 @@ public interface CommonParams {
/** stylesheet to apply to XML results */
String XSL = "xsl";
- /** version parameter to check request-response compatibility */
- String VERSION = "version";
-
/** query and init param for field list */
String FL = "fl";
diff --git
a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/BasicHttpSolrClientTest.java
b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/BasicHttpSolrClientTest.java
index 6707bc32394..2dd1466c882 100644
---
a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/BasicHttpSolrClientTest.java
+++
b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/BasicHttpSolrClientTest.java
@@ -266,10 +266,6 @@ public class BasicHttpSolrClientTest extends
SolrJettyTestBase {
// default wt
assertEquals(1, DebugServlet.parameters.get(CommonParams.WT).length);
assertEquals("javabin", DebugServlet.parameters.get(CommonParams.WT)[0]);
- // default version
- assertEquals(1,
DebugServlet.parameters.get(CommonParams.VERSION).length);
- assertEquals(
- client.getParser().getVersion(),
DebugServlet.parameters.get(CommonParams.VERSION)[0]);
// agent
assertEquals(
"Solr[" + HttpSolrClient.class.getName() + "] " + UA_VERSION,
@@ -293,9 +289,6 @@ public class BasicHttpSolrClientTest extends
SolrJettyTestBase {
DebugServlet.headers.get("User-Agent"));
assertEquals(1, DebugServlet.parameters.get(CommonParams.WT).length);
assertEquals("javabin", DebugServlet.parameters.get(CommonParams.WT)[0]);
- assertEquals(1,
DebugServlet.parameters.get(CommonParams.VERSION).length);
- assertEquals(
- client.getParser().getVersion(),
DebugServlet.parameters.get(CommonParams.VERSION)[0]);
assertEquals(1, DebugServlet.parameters.get("a").length);
assertEquals("\u1234", DebugServlet.parameters.get("a")[0]);
assertEquals(
@@ -317,9 +310,6 @@ public class BasicHttpSolrClientTest extends
SolrJettyTestBase {
DebugServlet.headers.get("User-Agent"));
assertEquals(1, DebugServlet.parameters.get(CommonParams.WT).length);
assertEquals("javabin", DebugServlet.parameters.get(CommonParams.WT)[0]);
- assertEquals(1,
DebugServlet.parameters.get(CommonParams.VERSION).length);
- assertEquals(
- client.getParser().getVersion(),
DebugServlet.parameters.get(CommonParams.VERSION)[0]);
assertEquals(1, DebugServlet.parameters.get("a").length);
assertEquals("\u1234", DebugServlet.parameters.get("a")[0]);
assertEquals(
@@ -347,9 +337,6 @@ public class BasicHttpSolrClientTest extends
SolrJettyTestBase {
DebugServlet.headers.get("User-Agent"));
assertEquals(1, DebugServlet.parameters.get(CommonParams.WT).length);
assertEquals("xml", DebugServlet.parameters.get(CommonParams.WT)[0]);
- assertEquals(1,
DebugServlet.parameters.get(CommonParams.VERSION).length);
- assertEquals(
- client.getParser().getVersion(),
DebugServlet.parameters.get(CommonParams.VERSION)[0]);
assertEquals(1, DebugServlet.parameters.get("a").length);
assertEquals("\u1234", DebugServlet.parameters.get("a")[0]);
assertEquals(
@@ -368,9 +355,6 @@ public class BasicHttpSolrClientTest extends
SolrJettyTestBase {
DebugServlet.headers.get("User-Agent"));
assertEquals(1, DebugServlet.parameters.get(CommonParams.WT).length);
assertEquals("xml", DebugServlet.parameters.get(CommonParams.WT)[0]);
- assertEquals(1,
DebugServlet.parameters.get(CommonParams.VERSION).length);
- assertEquals(
- client.getParser().getVersion(),
DebugServlet.parameters.get(CommonParams.VERSION)[0]);
assertEquals(1, DebugServlet.parameters.get("a").length);
assertEquals("\u1234", DebugServlet.parameters.get("a")[0]);
assertEquals(
@@ -391,9 +375,6 @@ public class BasicHttpSolrClientTest extends
SolrJettyTestBase {
DebugServlet.headers.get("User-Agent"));
assertEquals(1, DebugServlet.parameters.get(CommonParams.WT).length);
assertEquals("xml", DebugServlet.parameters.get(CommonParams.WT)[0]);
- assertEquals(1,
DebugServlet.parameters.get(CommonParams.VERSION).length);
- assertEquals(
- client.getParser().getVersion(),
DebugServlet.parameters.get(CommonParams.VERSION)[0]);
assertEquals(1, DebugServlet.parameters.get("a").length);
assertEquals("\u1234", DebugServlet.parameters.get("a")[0]);
assertEquals(
@@ -426,10 +407,6 @@ public class BasicHttpSolrClientTest extends
SolrJettyTestBase {
// default wt
assertEquals(1, DebugServlet.parameters.get(CommonParams.WT).length);
assertEquals("javabin", DebugServlet.parameters.get(CommonParams.WT)[0]);
- // default version
- assertEquals(1,
DebugServlet.parameters.get(CommonParams.VERSION).length);
- assertEquals(
- client.getParser().getVersion(),
DebugServlet.parameters.get(CommonParams.VERSION)[0]);
// agent
assertEquals(
"Solr[" + HttpSolrClient.class.getName() + "] " + UA_VERSION,
@@ -456,9 +433,6 @@ public class BasicHttpSolrClientTest extends
SolrJettyTestBase {
DebugServlet.headers.get("User-Agent"));
assertEquals(1, DebugServlet.parameters.get(CommonParams.WT).length);
assertEquals("xml", DebugServlet.parameters.get(CommonParams.WT)[0]);
- assertEquals(1,
DebugServlet.parameters.get(CommonParams.VERSION).length);
- assertEquals(
- client.getParser().getVersion(),
DebugServlet.parameters.get(CommonParams.VERSION)[0]);
assertEquals(
"Solr[" + HttpSolrClient.class.getName() + "] " + UA_VERSION,
DebugServlet.headers.get("User-Agent"));
@@ -499,10 +473,6 @@ public class BasicHttpSolrClientTest extends
SolrJettyTestBase {
// default wt
assertEquals(1, DebugServlet.parameters.get(CommonParams.WT).length);
assertEquals("javabin", DebugServlet.parameters.get(CommonParams.WT)[0]);
- // default version
- assertEquals(1,
DebugServlet.parameters.get(CommonParams.VERSION).length);
- assertEquals(
- client.getParser().getVersion(),
DebugServlet.parameters.get(CommonParams.VERSION)[0]);
// content type
assertEquals("application/javabin",
DebugServlet.headers.get("Content-Type"));
// parameter encoding
@@ -529,9 +499,6 @@ public class BasicHttpSolrClientTest extends
SolrJettyTestBase {
DebugServlet.headers.get("User-Agent"));
assertEquals(1, DebugServlet.parameters.get(CommonParams.WT).length);
assertEquals("xml", DebugServlet.parameters.get(CommonParams.WT)[0]);
- assertEquals(1,
DebugServlet.parameters.get(CommonParams.VERSION).length);
- assertEquals(
- client.getParser().getVersion(),
DebugServlet.parameters.get(CommonParams.VERSION)[0]);
assertEquals("application/xml; charset=UTF-8",
DebugServlet.headers.get("Content-Type"));
assertEquals(1, DebugServlet.parameters.get("a").length);
assertEquals("\u1234", DebugServlet.parameters.get("a")[0]);
@@ -556,9 +523,6 @@ public class BasicHttpSolrClientTest extends
SolrJettyTestBase {
DebugServlet.headers.get("User-Agent"));
assertEquals(1, DebugServlet.parameters.get(CommonParams.WT).length);
assertEquals("javabin", DebugServlet.parameters.get(CommonParams.WT)[0]);
- assertEquals(1,
DebugServlet.parameters.get(CommonParams.VERSION).length);
- assertEquals(
- client.getParser().getVersion(),
DebugServlet.parameters.get(CommonParams.VERSION)[0]);
assertEquals("application/javabin",
DebugServlet.headers.get("Content-Type"));
assertEquals(1, DebugServlet.parameters.get("a").length);
assertEquals("\u1234", DebugServlet.parameters.get("a")[0]);
diff --git
a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientTest.java
b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientTest.java
index a1e5996e54e..43c04076c38 100644
---
a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientTest.java
+++
b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientTest.java
@@ -157,7 +157,7 @@ public class Http2SolrClientTest extends
HttpSolrClientTestBase {
try (Http2SolrClient client = b.build()) {
client.query(q, method);
assertEquals(
- client.getParser().getVersion(),
DebugServlet.parameters.get(CommonParams.VERSION)[0]);
+ client.getParser().getWriterType(),
DebugServlet.parameters.get(CommonParams.WT)[0]);
} catch (SolrClient.RemoteSolrException ignored) {
}
}
@@ -240,8 +240,6 @@ public class Http2SolrClientTest extends
HttpSolrClientTestBase {
client.deleteById("id");
} catch (SolrClient.RemoteSolrException ignored) {
}
- assertEquals(
- client.getParser().getVersion(),
DebugServlet.parameters.get(CommonParams.VERSION)[0]);
assertEquals("javabin", DebugServlet.parameters.get(CommonParams.WT)[0]);
validateDelete();
}
@@ -260,8 +258,6 @@ public class Http2SolrClientTest extends
HttpSolrClientTestBase {
client.deleteByQuery("*:*");
} catch (SolrClient.RemoteSolrException ignored) {
}
- assertEquals(
- client.getParser().getVersion(),
DebugServlet.parameters.get(CommonParams.VERSION)[0]);
assertEquals("xml", DebugServlet.parameters.get(CommonParams.WT)[0]);
validateDelete();
}
diff --git
a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpJdkSolrClientTest.java
b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpJdkSolrClientTest.java
index 49627a52cd7..e6a47680bc8 100644
---
a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpJdkSolrClientTest.java
+++
b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpJdkSolrClientTest.java
@@ -105,8 +105,6 @@ public class HttpJdkSolrClientTest extends
HttpSolrClientTestBase {
client.deleteById("id");
} catch (SolrClient.RemoteSolrException ignored) {
}
- assertEquals(
- client.getParser().getVersion(),
DebugServlet.parameters.get(CommonParams.VERSION)[0]);
assertEquals("javabin", DebugServlet.parameters.get(CommonParams.WT)[0]);
validateDelete();
}
@@ -122,8 +120,6 @@ public class HttpJdkSolrClientTest extends
HttpSolrClientTestBase {
client.deleteByQuery("*:*");
} catch (SolrClient.RemoteSolrException ignored) {
}
- assertEquals(
- client.getParser().getVersion(),
DebugServlet.parameters.get(CommonParams.VERSION)[0]);
assertEquals("xml", DebugServlet.parameters.get(CommonParams.WT)[0]);
validateDelete();
}
@@ -152,7 +148,7 @@ public class HttpJdkSolrClientTest extends
HttpSolrClientTestBase {
try (HttpJdkSolrClient client = b.build()) {
client.query(q, method);
assertEquals(
- client.getParser().getVersion(),
DebugServlet.parameters.get(CommonParams.VERSION)[0]);
+ client.getParser().getWriterType(),
DebugServlet.parameters.get(CommonParams.WT)[0]);
}
}
@@ -171,7 +167,7 @@ public class HttpJdkSolrClientTest extends
HttpSolrClientTestBase {
try (HttpJdkSolrClient client = b.build()) {
client.requestWithBaseUrl(intendedUrl, new QueryRequest(q,
SolrRequest.METHOD.GET), null);
assertEquals(
- client.getParser().getVersion(),
DebugServlet.parameters.get(CommonParams.VERSION)[0]);
+ client.getParser().getWriterType(),
DebugServlet.parameters.get(CommonParams.WT)[0]);
}
}
diff --git
a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientTestBase.java
b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientTestBase.java
index 694d808a9ce..f15521eb992 100644
---
a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientTestBase.java
+++
b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientTestBase.java
@@ -107,8 +107,6 @@ public abstract class HttpSolrClientTestBase extends
SolrJettyTestBase {
// default wt
assertEquals(1, DebugServlet.parameters.get(CommonParams.WT).length);
assertEquals("javabin", DebugServlet.parameters.get(CommonParams.WT)[0]);
- // default version
- assertEquals(1, DebugServlet.parameters.get(CommonParams.VERSION).length);
// agent
assertEquals(expectedUserAgent(), DebugServlet.headers.get("user-agent"));
// content-type
@@ -130,7 +128,6 @@ public abstract class HttpSolrClientTestBase extends
SolrJettyTestBase {
assertEquals(expectedUserAgent(), DebugServlet.headers.get("user-agent"));
assertEquals(1, DebugServlet.parameters.get(CommonParams.WT).length);
assertEquals("javabin", DebugServlet.parameters.get(CommonParams.WT)[0]);
- assertEquals(1, DebugServlet.parameters.get(CommonParams.VERSION).length);
assertEquals(1, DebugServlet.parameters.get("a").length);
assertEquals(MUST_ENCODE, DebugServlet.parameters.get("a")[0]);
assertEquals(1,
DebugServlet.parameters.get("case_sensitive_param").length);
@@ -140,7 +137,7 @@ public abstract class HttpSolrClientTestBase extends
SolrJettyTestBase {
assertEquals(expectedUserAgent(), DebugServlet.headers.get("user-agent"));
assertEquals("application/x-www-form-urlencoded",
DebugServlet.headers.get("content-type"));
// this validates that URI encoding has been applied - the content-length
is smaller if not
- assertEquals("103", DebugServlet.headers.get("content-length"));
+ assertEquals("93", DebugServlet.headers.get("content-length"));
}
public void testQueryPut() throws Exception {
@@ -150,7 +147,6 @@ public abstract class HttpSolrClientTestBase extends
SolrJettyTestBase {
assertEquals(expectedUserAgent(), DebugServlet.headers.get("user-agent"));
assertEquals(1, DebugServlet.parameters.get(CommonParams.WT).length);
assertEquals("javabin", DebugServlet.parameters.get(CommonParams.WT)[0]);
- assertEquals(1, DebugServlet.parameters.get(CommonParams.VERSION).length);
assertEquals(1, DebugServlet.parameters.get("a").length);
assertEquals(MUST_ENCODE, DebugServlet.parameters.get("a")[0]);
assertEquals(1,
DebugServlet.parameters.get("case_sensitive_param").length);
@@ -159,7 +155,7 @@ public abstract class HttpSolrClientTestBase extends
SolrJettyTestBase {
assertEquals("uppercase",
DebugServlet.parameters.get("CASE_SENSITIVE_PARAM")[0]);
assertEquals(expectedUserAgent(), DebugServlet.headers.get("user-agent"));
assertEquals("application/x-www-form-urlencoded",
DebugServlet.headers.get("content-type"));
- assertEquals("103", DebugServlet.headers.get("content-length"));
+ assertEquals("93", DebugServlet.headers.get("content-length"));
}
public void testQueryXmlGet() throws Exception {
@@ -169,7 +165,6 @@ public abstract class HttpSolrClientTestBase extends
SolrJettyTestBase {
assertEquals(expectedUserAgent(), DebugServlet.headers.get("user-agent"));
assertEquals(1, DebugServlet.parameters.get(CommonParams.WT).length);
assertEquals("xml", DebugServlet.parameters.get(CommonParams.WT)[0]);
- assertEquals(1, DebugServlet.parameters.get(CommonParams.VERSION).length);
assertEquals(1, DebugServlet.parameters.get("a").length);
assertEquals(MUST_ENCODE, DebugServlet.parameters.get("a")[0]);
assertEquals(1,
DebugServlet.parameters.get("case_sensitive_param").length);
@@ -186,7 +181,6 @@ public abstract class HttpSolrClientTestBase extends
SolrJettyTestBase {
assertEquals(expectedUserAgent(), DebugServlet.headers.get("user-agent"));
assertEquals(1, DebugServlet.parameters.get(CommonParams.WT).length);
assertEquals("xml", DebugServlet.parameters.get(CommonParams.WT)[0]);
- assertEquals(1, DebugServlet.parameters.get(CommonParams.VERSION).length);
assertEquals(1, DebugServlet.parameters.get("a").length);
assertEquals(MUST_ENCODE, DebugServlet.parameters.get("a")[0]);
assertEquals(1,
DebugServlet.parameters.get("case_sensitive_param").length);
@@ -204,7 +198,6 @@ public abstract class HttpSolrClientTestBase extends
SolrJettyTestBase {
assertEquals(expectedUserAgent(), DebugServlet.headers.get("user-agent"));
assertEquals(1, DebugServlet.parameters.get(CommonParams.WT).length);
assertEquals("xml", DebugServlet.parameters.get(CommonParams.WT)[0]);
- assertEquals(1, DebugServlet.parameters.get(CommonParams.VERSION).length);
assertEquals(1, DebugServlet.parameters.get("a").length);
assertEquals(MUST_ENCODE, DebugServlet.parameters.get("a")[0]);
assertEquals(1,
DebugServlet.parameters.get("case_sensitive_param").length);
@@ -222,8 +215,6 @@ public abstract class HttpSolrClientTestBase extends
SolrJettyTestBase {
assertEquals(expectedUserAgent(), DebugServlet.headers.get("user-agent"));
// default wt
assertEquals(1, DebugServlet.parameters.get(CommonParams.WT).length);
- // default version
- assertEquals(1, DebugServlet.parameters.get(CommonParams.VERSION).length);
// agent
assertEquals(expectedUserAgent(), DebugServlet.headers.get("user-agent"));
}
@@ -303,9 +294,6 @@ public abstract class HttpSolrClientTestBase extends
SolrJettyTestBase {
assertEquals(1, DebugServlet.parameters.get(CommonParams.WT).length);
assertEquals(
wt.toString().toLowerCase(Locale.ROOT),
DebugServlet.parameters.get(CommonParams.WT)[0]);
- assertEquals(1, DebugServlet.parameters.get(CommonParams.VERSION).length);
- assertEquals(
- client.getParser().getVersion(),
DebugServlet.parameters.get(CommonParams.VERSION)[0]);
assertEquals(contentType, DebugServlet.headers.get("content-type"));
assertEquals(1, DebugServlet.parameters.get("a").length);
assertEquals(MUST_ENCODE, DebugServlet.parameters.get("a")[0]);
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 126698945ee..55ba5f42ef4 100644
--- a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
@@ -467,7 +467,7 @@ public abstract class SolrTestCaseJ4 extends SolrTestCase {
Files.write(
solrHome.resolve(SolrXmlConfig.SOLR_XML_FILE),
xmlStr.getBytes(StandardCharsets.UTF_8));
h = new TestHarness(SolrXmlConfig.fromSolrHome(solrHome, new
Properties()));
- lrf = h.getRequestFactory("/select", 0, 20, CommonParams.VERSION, "2.2");
+ lrf = h.getRequestFactory("/select", 0, 20);
}
/**
@@ -730,21 +730,21 @@ public abstract class SolrTestCaseJ4 extends SolrTestCase
{
h =
new TestHarness(
coreName, initAndGetDataDir().toAbsolutePath().toString(),
solrConfig, getSchemaFile());
- lrf = h.getRequestFactory("", 0, 20, CommonParams.VERSION, "2.2");
+ lrf = h.getRequestFactory("", 0, 20);
}
public static CoreContainer createCoreContainer(Path solrHome, String
solrXML) {
testSolrHome = requireNonNull(solrHome);
System.setProperty("solr.solr.home", solrHome.toAbsolutePath().toString());
h = new TestHarness(solrHome, solrXML);
- lrf = h.getRequestFactory("", 0, 20, CommonParams.VERSION, "2.2");
+ lrf = h.getRequestFactory("", 0, 20);
return h.getCoreContainer();
}
public static CoreContainer createCoreContainer(NodeConfig config,
CoresLocator locator) {
testSolrHome = config.getSolrHome();
h = new TestHarness(config, locator);
- lrf = h.getRequestFactory("", 0, 20, CommonParams.VERSION, "2.2");
+ lrf = h.getRequestFactory("", 0, 20);
return h.getCoreContainer();
}
@@ -766,7 +766,7 @@ public abstract class SolrTestCaseJ4 extends SolrTestCase {
initAndGetDataDir().toAbsolutePath().toString(),
"solrconfig.xml",
"schema.xml");
- lrf = h.getRequestFactory("", 0, 20, CommonParams.VERSION, "2.2");
+ lrf = h.getRequestFactory("", 0, 20);
return h.getCoreContainer();
}
