Apache Solr open-source search software
BIG: Move some SolrJ classes (#3889)
David Smileyfbec447130aa
diff --git a/changelog/unreleased/solrj-class-moves.yml b/changelog/unreleased/solrj-class-moves.ymlnew file mode 100644index 00000000000..927c900b5e6--- /dev/null+++ b/changelog/unreleased/solrj-class-moves.yml@@ -0,0 +1,8 @@+# See https://github.com/apache/solr/blob/main/dev-docs/changelog.adoc+title: 'SolrJ: move classes out of .solrj, .impl, .cloud to better homes, like .request and .response.'+type: other # added, changed, fixed, deprecated, removed, dependency_update, security, other+authors:+ - name: David Smiley+links:+ - name: PR#3889+ url: https://github.com/apache/solr/pull/3889diff --git a/solr/benchmark/src/java/org/apache/solr/bench/MiniClusterState.java b/solr/benchmark/src/java/org/apache/solr/bench/MiniClusterState.javaindex 87dba1cb477..4c4946a3ae8 100755--- a/solr/benchmark/src/java/org/apache/solr/bench/MiniClusterState.java+++ b/solr/benchmark/src/java/org/apache/solr/bench/MiniClusterState.java@@ -36,11 +36,11 @@ import java.util.concurrent.ExecutorService;import java.util.concurrent.Executors;import java.util.concurrent.ScheduledExecutorService;import java.util.concurrent.TimeUnit;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.jetty.HttpJettySolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.QueryRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.cloud.MiniSolrCloudCluster;import org.apache.solr.common.SolrInputDocument;diff --git a/solr/benchmark/src/java/org/apache/solr/bench/search/FilterCache.java b/solr/benchmark/src/java/org/apache/solr/bench/search/FilterCache.javaindex 4b1bf9485e8..197a346bb3d 100644--- a/solr/benchmark/src/java/org/apache/solr/bench/search/FilterCache.java+++ b/solr/benchmark/src/java/org/apache/solr/bench/search/FilterCache.java@@ -27,10 +27,10 @@ import org.apache.solr.bench.Docs;import org.apache.solr.bench.MiniClusterState;import org.apache.solr.bench.SolrRandomnessSource;import org.apache.solr.bench.generators.SolrGen;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.QueryRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.openjdk.jmh.annotations.Benchmark;import org.openjdk.jmh.annotations.Fork;import org.openjdk.jmh.annotations.Level;diff --git a/solr/benchmark/src/java/org/apache/solr/bench/search/NumericSearch.java b/solr/benchmark/src/java/org/apache/solr/bench/search/NumericSearch.javaindex 7717b005fb3..e7f574cd341 100644--- a/solr/benchmark/src/java/org/apache/solr/bench/search/NumericSearch.java+++ b/solr/benchmark/src/java/org/apache/solr/bench/search/NumericSearch.java@@ -29,10 +29,10 @@ import org.apache.solr.bench.CircularIterator;import org.apache.solr.bench.Docs;import org.apache.solr.bench.MiniClusterState;import org.apache.solr.bench.generators.SolrGen;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.QueryRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.response.FacetField;import org.apache.solr.client.solrj.response.QueryResponse;import org.openjdk.jmh.annotations.Benchmark;diff --git a/solr/benchmark/src/java/org/apache/solr/bench/search/QueryResponseWriters.java b/solr/benchmark/src/java/org/apache/solr/bench/search/QueryResponseWriters.javaindex 2a7088f88d4..67d931c9217 100644--- a/solr/benchmark/src/java/org/apache/solr/bench/search/QueryResponseWriters.java+++ b/solr/benchmark/src/java/org/apache/solr/bench/search/QueryResponseWriters.java@@ -26,8 +26,8 @@ import org.apache.solr.bench.Docs;import org.apache.solr.bench.MiniClusterState;import org.apache.solr.bench.MiniClusterState.MiniClusterBenchState;import org.apache.solr.client.solrj.SolrServerException;-import org.apache.solr.client.solrj.impl.InputStreamResponseParser;import org.apache.solr.client.solrj.request.QueryRequest;+import org.apache.solr.client.solrj.response.InputStreamResponseParser;import org.apache.solr.common.params.CommonParams;import org.apache.solr.common.params.ModifiableSolrParams;import org.apache.solr.core.SolrCore;diff --git a/solr/benchmark/src/java/org/apache/solr/bench/search/SimpleSearch.java b/solr/benchmark/src/java/org/apache/solr/bench/search/SimpleSearch.javaindex 46982b33b89..2e888b8d878 100644--- a/solr/benchmark/src/java/org/apache/solr/bench/search/SimpleSearch.java+++ b/solr/benchmark/src/java/org/apache/solr/bench/search/SimpleSearch.java@@ -20,10 +20,10 @@ import java.io.IOException;import java.util.concurrent.atomic.AtomicLong;import org.apache.solr.bench.BaseBenchState;import org.apache.solr.bench.MiniClusterState;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.QueryRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.openjdk.jmh.annotations.Benchmark;import org.openjdk.jmh.annotations.Fork;import org.openjdk.jmh.annotations.Level;diff --git a/solr/core/src/java/org/apache/solr/cli/ApiTool.java b/solr/core/src/java/org/apache/solr/cli/ApiTool.javaindex 548f29f2485..9da7d0495a8 100644--- a/solr/core/src/java/org/apache/solr/cli/ApiTool.java+++ b/solr/core/src/java/org/apache/solr/cli/ApiTool.java@@ -22,8 +22,8 @@ import org.apache.commons.cli.CommandLine;import org.apache.commons.cli.Option;import org.apache.commons.cli.Options;import org.apache.solr.client.solrj.SolrRequest;-import org.apache.solr.client.solrj.impl.JsonMapResponseParser;import org.apache.solr.client.solrj.request.GenericSolrRequest;+import org.apache.solr.client.solrj.response.json.JsonMapResponseParser;import org.apache.solr.common.params.ModifiableSolrParams;import org.apache.solr.common.util.NamedList;import org.noggit.CharArr;diff --git a/solr/core/src/java/org/apache/solr/cli/CreateTool.java b/solr/core/src/java/org/apache/solr/cli/CreateTool.javaindex 78eb6eb2901..b6790b4a4fa 100644--- a/solr/core/src/java/org/apache/solr/cli/CreateTool.java+++ b/solr/core/src/java/org/apache/solr/cli/CreateTool.java@@ -32,12 +32,12 @@ import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.impl.CloudSolrClient;-import org.apache.solr.client.solrj.impl.JsonMapResponseParser;import org.apache.solr.client.solrj.jetty.HttpJettySolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.CoreAdminRequest;import org.apache.solr.client.solrj.request.GenericSolrRequest;import org.apache.solr.client.solrj.response.CoreAdminResponse;+import org.apache.solr.client.solrj.response.json.JsonMapResponseParser;import org.apache.solr.cloud.ZkConfigSetService;import org.apache.solr.common.cloud.ZkStateReader;import org.apache.solr.common.params.CommonParams;diff --git a/solr/core/src/java/org/apache/solr/cli/DeleteTool.java b/solr/core/src/java/org/apache/solr/cli/DeleteTool.javaindex 25be18d95f5..3675098f8ee 100644--- a/solr/core/src/java/org/apache/solr/cli/DeleteTool.java+++ b/solr/core/src/java/org/apache/solr/cli/DeleteTool.java@@ -28,10 +28,10 @@ import org.apache.commons.cli.Options;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.impl.CloudSolrClient;-import org.apache.solr.client.solrj.impl.JsonMapResponseParser;import org.apache.solr.client.solrj.jetty.HttpJettySolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.CoreAdminRequest;+import org.apache.solr.client.solrj.response.json.JsonMapResponseParser;import org.apache.solr.common.cloud.ZkStateReader;import org.apache.solr.common.util.NamedList;import org.noggit.CharArr;diff --git a/solr/core/src/java/org/apache/solr/cli/ExportTool.java b/solr/core/src/java/org/apache/solr/cli/ExportTool.javaindex fc1930cd658..57336d2f7f9 100644--- a/solr/core/src/java/org/apache/solr/cli/ExportTool.java+++ b/solr/core/src/java/org/apache/solr/cli/ExportTool.java@@ -56,16 +56,16 @@ import org.apache.commons.cli.Option;import org.apache.commons.cli.Options;import org.apache.lucene.util.SuppressForbidden;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrServerException;-import org.apache.solr.client.solrj.StreamingResponseCallback;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.impl.ClusterStateProvider;-import org.apache.solr.client.solrj.impl.StreamingJavaBinResponseParser;import org.apache.solr.client.solrj.jetty.HttpJettySolrClient;import org.apache.solr.client.solrj.request.GenericSolrRequest;import org.apache.solr.client.solrj.request.QueryRequest;+import org.apache.solr.client.solrj.request.SolrQuery;+import org.apache.solr.client.solrj.response.StreamingJavaBinResponseParser;+import org.apache.solr.client.solrj.response.StreamingResponseCallback;import org.apache.solr.common.SolrDocument;import org.apache.solr.common.SolrDocumentList;import org.apache.solr.common.cloud.DocCollection;diff --git a/solr/core/src/java/org/apache/solr/cli/HealthcheckTool.java b/solr/core/src/java/org/apache/solr/cli/HealthcheckTool.javaindex c8b6b78e6ce..ef0f61bebda 100644--- a/solr/core/src/java/org/apache/solr/cli/HealthcheckTool.java+++ b/solr/core/src/java/org/apache/solr/cli/HealthcheckTool.java@@ -30,10 +30,10 @@ import java.util.Set;import org.apache.commons.cli.CommandLine;import org.apache.commons.cli.Option;import org.apache.commons.cli.Options;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.GenericSolrRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.common.cloud.ClusterState;import org.apache.solr.common.cloud.DocCollection;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.javaindex dcf07988c82..df749dedeec 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@@ -29,17 +29,17 @@ import java.util.List;import java.util.Properties;import java.util.function.Supplier;import org.apache.lucene.search.TotalHits.Relation;-import org.apache.solr.client.solrj.ResponseParser;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrServerException;-import org.apache.solr.client.solrj.StreamingResponseCallback;-import org.apache.solr.client.solrj.impl.InputStreamResponseParser;-import org.apache.solr.client.solrj.impl.JavaBinRequestWriter;-import org.apache.solr.client.solrj.impl.JavaBinResponseParser;-import org.apache.solr.client.solrj.impl.XMLRequestWriter;import org.apache.solr.client.solrj.request.ContentStreamUpdateRequest;+import org.apache.solr.client.solrj.request.JavaBinRequestWriter;import org.apache.solr.client.solrj.request.RequestWriter;+import org.apache.solr.client.solrj.request.XMLRequestWriter;+import org.apache.solr.client.solrj.response.InputStreamResponseParser;+import org.apache.solr.client.solrj.response.JavaBinResponseParser;+import org.apache.solr.client.solrj.response.ResponseParser;+import org.apache.solr.client.solrj.response.StreamingResponseCallback;import org.apache.solr.common.SolrDocument;import org.apache.solr.common.SolrDocumentList;import org.apache.solr.common.SolrException;diff --git a/solr/core/src/java/org/apache/solr/cloud/RecoveringCoreTermWatcher.java b/solr/core/src/java/org/apache/solr/cloud/RecoveringCoreTermWatcher.javaindex 6bba8e99319..40b340b283c 100644--- a/solr/core/src/java/org/apache/solr/cloud/RecoveringCoreTermWatcher.java+++ b/solr/core/src/java/org/apache/solr/cloud/RecoveringCoreTermWatcher.java@@ -19,7 +19,6 @@ package org.apache.solr.cloud;import java.lang.invoke.MethodHandles;import java.util.concurrent.atomic.AtomicLong;-import org.apache.solr.client.solrj.cloud.ShardTerms;import org.apache.solr.core.CoreContainer;import org.apache.solr.core.CoreDescriptor;import org.apache.solr.core.SolrCore;diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/ShardTerms.java b/solr/core/src/java/org/apache/solr/cloud/ShardTerms.javasimilarity index 99%rename from solr/solrj/src/java/org/apache/solr/client/solrj/cloud/ShardTerms.javarename to solr/core/src/java/org/apache/solr/cloud/ShardTerms.javaindex 103e7cba74f..323342c8353 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/ShardTerms.java+++ b/solr/core/src/java/org/apache/solr/cloud/ShardTerms.java@@ -15,7 +15,7 @@* limitations under the License.*/-package org.apache.solr.client.solrj.cloud;+package org.apache.solr.cloud;import java.io.IOException;import java.util.Collections;diff --git a/solr/core/src/java/org/apache/solr/cloud/ZkShardTerms.java b/solr/core/src/java/org/apache/solr/cloud/ZkShardTerms.javaindex 5c0f5186e91..e3b23127b18 100644--- a/solr/core/src/java/org/apache/solr/cloud/ZkShardTerms.java+++ b/solr/core/src/java/org/apache/solr/cloud/ZkShardTerms.java@@ -25,7 +25,6 @@ import java.util.Set;import java.util.concurrent.atomic.AtomicBoolean;import java.util.concurrent.atomic.AtomicReference;import java.util.function.Function;-import org.apache.solr.client.solrj.cloud.ShardTerms;import org.apache.solr.common.SolrException;import org.apache.solr.common.cloud.SolrZkClient;import org.apache.solr.common.cloud.ZkStateReader;diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/CategoryRoutedAlias.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/CategoryRoutedAlias.javaindex e8ea258a3de..b9b7f1afca7 100644--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/CategoryRoutedAlias.java+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/CategoryRoutedAlias.java@@ -27,7 +27,7 @@ import java.util.Map;import java.util.Set;import java.util.regex.Pattern;import java.util.regex.PatternSyntaxException;-import org.apache.solr.client.solrj.RoutedAliasTypes;+import org.apache.solr.client.solrj.request.RoutedAliasTypes;import org.apache.solr.common.SolrException;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.common.cloud.Aliases;diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/CreateCollectionCmd.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/CreateCollectionCmd.javaindex 80cc02664bd..76a18e64d9e 100644--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/CreateCollectionCmd.java+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/CreateCollectionCmd.java@@ -43,12 +43,12 @@ import java.util.concurrent.TimeoutException;import org.apache.solr.client.solrj.cloud.AlreadyExistsException;import org.apache.solr.client.solrj.cloud.BadVersionException;import org.apache.solr.client.solrj.cloud.DelegatingCloudManager;-import org.apache.solr.client.solrj.cloud.DelegatingClusterStateProvider;import org.apache.solr.client.solrj.cloud.DistribStateManager;import org.apache.solr.client.solrj.cloud.NotEmptyException;import org.apache.solr.client.solrj.cloud.SolrCloudManager;import org.apache.solr.client.solrj.cloud.VersionedData;import org.apache.solr.client.solrj.impl.ClusterStateProvider;+import org.apache.solr.client.solrj.impl.DelegatingClusterStateProvider;import org.apache.solr.cloud.DistributedClusterStateUpdater;import org.apache.solr.cloud.Overseer;import org.apache.solr.cloud.RefreshCollectionMessage;diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/DimensionalRoutedAlias.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/DimensionalRoutedAlias.javaindex a96496819e2..0b2cb49678c 100644--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/DimensionalRoutedAlias.java+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/DimensionalRoutedAlias.java@@ -32,7 +32,7 @@ import java.util.function.Function;import java.util.regex.Matcher;import java.util.regex.Pattern;import java.util.stream.Collectors;-import org.apache.solr.client.solrj.RoutedAliasTypes;+import org.apache.solr.client.solrj.request.RoutedAliasTypes;import org.apache.solr.common.SolrException;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.common.cloud.Aliases;diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/RoutedAlias.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/RoutedAlias.javaindex 7dec30d1a8d..de37b58eee6 100644--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/RoutedAlias.java+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/RoutedAlias.java@@ -32,7 +32,7 @@ import java.util.Map;import java.util.Objects;import java.util.Set;import java.util.stream.Collectors;-import org.apache.solr.client.solrj.RoutedAliasTypes;+import org.apache.solr.client.solrj.request.RoutedAliasTypes;import org.apache.solr.cloud.ZkController;import org.apache.solr.common.SolrException;import org.apache.solr.common.SolrInputDocument;diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/TimeRoutedAlias.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/TimeRoutedAlias.javaindex 3e5ad4c52a3..8d8a85d105e 100644--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/TimeRoutedAlias.java+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/TimeRoutedAlias.java@@ -46,7 +46,7 @@ import java.util.Set;import java.util.TimeZone;import java.util.concurrent.TimeUnit;import java.util.stream.Collectors;-import org.apache.solr.client.solrj.RoutedAliasTypes;+import org.apache.solr.client.solrj.request.RoutedAliasTypes;import org.apache.solr.common.SolrException;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.common.cloud.Aliases;diff --git a/solr/core/src/java/org/apache/solr/core/SolrCore.java b/solr/core/src/java/org/apache/solr/core/SolrCore.javaindex fadde05cf70..adaca2acd66 100644--- a/solr/core/src/java/org/apache/solr/core/SolrCore.java+++ b/solr/core/src/java/org/apache/solr/core/SolrCore.java@@ -84,7 +84,7 @@ import org.apache.lucene.store.IndexInput;import org.apache.lucene.store.IndexOutput;import org.apache.lucene.store.LockObtainFailedException;import org.apache.lucene.util.ResourceLoader;-import org.apache.solr.client.solrj.impl.JavaBinResponseParser;+import org.apache.solr.client.solrj.response.JavaBinResponseParser;import org.apache.solr.cloud.CloudDescriptor;import org.apache.solr.cloud.RecoveryStrategy;import org.apache.solr.cloud.ZkSolrResourceLoader;diff --git a/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java b/solr/core/src/java/org/apache/solr/handler/IndexFetcher.javaindex dc496f3084b..70480602807 100644--- a/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java+++ b/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java@@ -91,10 +91,10 @@ import org.apache.lucene.store.IndexOutput;import org.apache.solr.client.api.model.FileMetaData;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrServerException;-import org.apache.solr.client.solrj.impl.InputStreamResponseParser;import org.apache.solr.client.solrj.impl.SolrHttpConstants;import org.apache.solr.client.solrj.jetty.HttpJettySolrClient;import org.apache.solr.client.solrj.request.GenericSolrRequest;+import org.apache.solr.client.solrj.response.InputStreamResponseParser;import org.apache.solr.cloud.CloudDescriptor;import org.apache.solr.cloud.ZkController;import org.apache.solr.common.SolrException;diff --git a/solr/core/src/java/org/apache/solr/handler/admin/ZookeeperRead.java b/solr/core/src/java/org/apache/solr/handler/admin/ZookeeperRead.javaindex 996d62b0d56..c3299f6d49b 100644--- a/solr/core/src/java/org/apache/solr/handler/admin/ZookeeperRead.java+++ b/solr/core/src/java/org/apache/solr/handler/admin/ZookeeperRead.java@@ -32,8 +32,8 @@ import java.util.Map;import org.apache.solr.client.api.endpoint.ZooKeeperReadApis;import org.apache.solr.client.api.model.ZooKeeperListChildrenResponse;import org.apache.solr.client.api.model.ZooKeeperStat;-import org.apache.solr.client.solrj.impl.JavaBinResponseParser;-import org.apache.solr.client.solrj.impl.XMLResponseParser;+import org.apache.solr.client.solrj.response.JavaBinResponseParser;+import org.apache.solr.client.solrj.response.XMLResponseParser;import org.apache.solr.common.SolrException;import org.apache.solr.common.params.CommonParams;import org.apache.solr.core.CoreContainer;diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/CreateAlias.java b/solr/core/src/java/org/apache/solr/handler/admin/api/CreateAlias.javaindex d11116f0e69..bbeafb210e5 100644--- a/solr/core/src/java/org/apache/solr/handler/admin/api/CreateAlias.java+++ b/solr/core/src/java/org/apache/solr/handler/admin/api/CreateAlias.java@@ -46,8 +46,8 @@ import org.apache.solr.client.api.model.RoutedAliasProperties;import org.apache.solr.client.api.model.SolrJerseyResponse;import org.apache.solr.client.api.model.SubResponseAccumulatingJerseyResponse;import org.apache.solr.client.api.model.TimeRoutedAliasProperties;-import org.apache.solr.client.solrj.RoutedAliasTypes;import org.apache.solr.client.solrj.SolrResponse;+import org.apache.solr.client.solrj.request.RoutedAliasTypes;import org.apache.solr.client.solrj.util.SolrIdentifierValidator;import org.apache.solr.cloud.api.collections.RoutedAlias;import org.apache.solr.cloud.api.collections.TimeRoutedAlias;diff --git a/solr/core/src/java/org/apache/solr/handler/api/V2ApiUtils.java b/solr/core/src/java/org/apache/solr/handler/api/V2ApiUtils.javaindex d05de0fc0c7..9a69d4e2364 100644--- a/solr/core/src/java/org/apache/solr/handler/api/V2ApiUtils.java+++ b/solr/core/src/java/org/apache/solr/handler/api/V2ApiUtils.java@@ -17,7 +17,7 @@package org.apache.solr.handler.api;-import static org.apache.solr.client.solrj.impl.JavaBinResponseParser.JAVABIN_CONTENT_TYPE_V2;+import static org.apache.solr.client.solrj.response.JavaBinResponseParser.JAVABIN_CONTENT_TYPE_V2;import static org.apache.solr.common.params.CommonParams.WT;import static org.apache.solr.handler.admin.api.ReplicationAPIBase.FILE_STREAM;diff --git a/solr/core/src/java/org/apache/solr/handler/designer/SchemaDesignerAPI.java b/solr/core/src/java/org/apache/solr/handler/designer/SchemaDesignerAPI.javaindex b7f7521ba48..5e8acc3bcfd 100644--- a/solr/core/src/java/org/apache/solr/handler/designer/SchemaDesignerAPI.java+++ b/solr/core/src/java/org/apache/solr/handler/designer/SchemaDesignerAPI.java@@ -50,10 +50,10 @@ import java.util.concurrent.ConcurrentHashMap;import java.util.concurrent.TimeUnit;import java.util.stream.Collectors;import org.apache.solr.api.EndPoint;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.cloud.ZkConfigSetService;import org.apache.solr.cloud.ZkSolrResourceLoader;diff --git a/solr/core/src/java/org/apache/solr/handler/designer/SchemaDesignerConfigSetHelper.java b/solr/core/src/java/org/apache/solr/handler/designer/SchemaDesignerConfigSetHelper.javaindex 77cbcc7e900..95b9190ba3d 100644--- a/solr/core/src/java/org/apache/solr/handler/designer/SchemaDesignerConfigSetHelper.java+++ b/solr/core/src/java/org/apache/solr/handler/designer/SchemaDesignerConfigSetHelper.java@@ -62,11 +62,11 @@ import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrResponse;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.impl.CloudSolrClient;-import org.apache.solr.client.solrj.impl.JsonMapResponseParser;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.GenericSolrRequest;import org.apache.solr.client.solrj.request.schema.FieldTypeDefinition;import org.apache.solr.client.solrj.request.schema.SchemaRequest;+import org.apache.solr.client.solrj.response.json.JsonMapResponseParser;import org.apache.solr.client.solrj.response.schema.SchemaResponse;import org.apache.solr.cloud.ZkConfigSetService;import org.apache.solr.cloud.ZkSolrResourceLoader;diff --git a/solr/core/src/java/org/apache/solr/handler/export/ExportWriter.java b/solr/core/src/java/org/apache/solr/handler/export/ExportWriter.javaindex 94cd9253f44..ba88e3ce763 100644--- a/solr/core/src/java/org/apache/solr/handler/export/ExportWriter.java+++ b/solr/core/src/java/org/apache/solr/handler/export/ExportWriter.java@@ -39,7 +39,6 @@ import org.apache.lucene.search.Sort;import org.apache.lucene.search.SortField;import org.apache.lucene.util.BitSetIterator;import org.apache.lucene.util.FixedBitSet;-import org.apache.solr.client.solrj.impl.JavaBinResponseParser;import org.apache.solr.client.solrj.io.Tuple;import org.apache.solr.client.solrj.io.stream.StreamContext;import org.apache.solr.client.solrj.io.stream.TupleStream;@@ -47,6 +46,7 @@ import org.apache.solr.client.solrj.io.stream.expr.StreamExpression;import org.apache.solr.client.solrj.io.stream.expr.StreamExpressionNamedParameter;import org.apache.solr.client.solrj.io.stream.expr.StreamExpressionParser;import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;+import org.apache.solr.client.solrj.response.JavaBinResponseParser;import org.apache.solr.common.IteratorWriter;import org.apache.solr.common.MapWriter;import org.apache.solr.common.MapWriter.EntryWriter;diff --git a/solr/core/src/java/org/apache/solr/jersey/MessageBodyWriters.java b/solr/core/src/java/org/apache/solr/jersey/MessageBodyWriters.javaindex 61a2967375a..4af087ead58 100644--- a/solr/core/src/java/org/apache/solr/jersey/MessageBodyWriters.java+++ b/solr/core/src/java/org/apache/solr/jersey/MessageBodyWriters.java@@ -17,7 +17,7 @@package org.apache.solr.jersey;-import static org.apache.solr.client.solrj.impl.JavaBinResponseParser.JAVABIN_CONTENT_TYPE_V2;+import static org.apache.solr.client.solrj.response.JavaBinResponseParser.JAVABIN_CONTENT_TYPE_V2;import static org.apache.solr.jersey.RequestContextKeys.SOLR_QUERY_REQUEST;import static org.apache.solr.jersey.RequestContextKeys.SOLR_QUERY_RESPONSE;import static org.apache.solr.response.QueryResponseWriter.CONTENT_TYPE_TEXT_UTF8;diff --git a/solr/core/src/java/org/apache/solr/packagemanager/PackageUtils.java b/solr/core/src/java/org/apache/solr/packagemanager/PackageUtils.javaindex 4e3aaa5ab71..e08cc7775d1 100644--- a/solr/core/src/java/org/apache/solr/packagemanager/PackageUtils.java+++ b/solr/core/src/java/org/apache/solr/packagemanager/PackageUtils.java@@ -39,9 +39,9 @@ import org.apache.solr.client.api.model.UploadToFileStoreResponse;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrServerException;-import org.apache.solr.client.solrj.impl.JsonMapResponseParser;import org.apache.solr.client.solrj.request.FileStoreApi;import org.apache.solr.client.solrj.request.GenericSolrRequest;+import org.apache.solr.client.solrj.response.json.JsonMapResponseParser;import org.apache.solr.common.SolrException;import org.apache.solr.common.SolrException.ErrorCode;import org.apache.solr.common.params.ModifiableSolrParams;diff --git a/solr/core/src/java/org/apache/solr/pkg/PackageAPI.java b/solr/core/src/java/org/apache/solr/pkg/PackageAPI.javaindex aaa12ef5a87..16ed45ef0ab 100644--- a/solr/core/src/java/org/apache/solr/pkg/PackageAPI.java+++ b/solr/core/src/java/org/apache/solr/pkg/PackageAPI.java@@ -36,9 +36,9 @@ import org.apache.solr.api.EndPoint;import org.apache.solr.api.PayloadObj;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrServerException;-import org.apache.solr.client.solrj.impl.JavaBinResponseParser;import org.apache.solr.client.solrj.request.GenericSolrRequest;import org.apache.solr.client.solrj.request.beans.PackagePayload;+import org.apache.solr.client.solrj.response.JavaBinResponseParser;import org.apache.solr.common.SolrException;import org.apache.solr.common.annotation.JsonProperty;import org.apache.solr.common.cloud.SolrZkClient;diff --git a/solr/core/src/java/org/apache/solr/response/CborResponseWriter.java b/solr/core/src/java/org/apache/solr/response/CborResponseWriter.javaindex fd5bc68f113..8aa473e03ee 100644--- a/solr/core/src/java/org/apache/solr/response/CborResponseWriter.java+++ b/solr/core/src/java/org/apache/solr/response/CborResponseWriter.java@@ -22,7 +22,7 @@ import java.io.IOException;import java.io.OutputStream;import java.math.BigDecimal;import java.math.BigInteger;-import org.apache.solr.client.solrj.impl.JavaBinResponseParser;+import org.apache.solr.client.solrj.response.JavaBinResponseParser;import org.apache.solr.common.util.NamedList;import org.apache.solr.request.SolrQueryRequest;diff --git a/solr/core/src/java/org/apache/solr/response/JavaBinResponseWriter.java b/solr/core/src/java/org/apache/solr/response/JavaBinResponseWriter.javaindex 5c6b6001366..a11dd693d88 100644--- a/solr/core/src/java/org/apache/solr/response/JavaBinResponseWriter.java+++ b/solr/core/src/java/org/apache/solr/response/JavaBinResponseWriter.java@@ -30,7 +30,7 @@ import java.util.List;import java.util.function.Consumer;import org.apache.lucene.index.IndexableField;import org.apache.lucene.search.TotalHits;-import org.apache.solr.client.solrj.impl.JavaBinResponseParser;+import org.apache.solr.client.solrj.response.JavaBinResponseParser;import org.apache.solr.common.SolrDocument;import org.apache.solr.common.params.CommonParams;import org.apache.solr.common.util.JavaBinCodec;diff --git a/solr/core/src/java/org/apache/solr/response/SchemaXmlResponseWriter.java b/solr/core/src/java/org/apache/solr/response/SchemaXmlResponseWriter.javaindex 1480004d03b..c653661adab 100644--- a/solr/core/src/java/org/apache/solr/response/SchemaXmlResponseWriter.java+++ b/solr/core/src/java/org/apache/solr/response/SchemaXmlResponseWriter.java@@ -18,7 +18,7 @@ package org.apache.solr.response;import java.io.IOException;import java.io.Writer;-import org.apache.solr.client.solrj.impl.XMLResponseParser;+import org.apache.solr.client.solrj.response.XMLResponseParser;import org.apache.solr.request.SolrQueryRequest;/** */diff --git a/solr/core/src/java/org/apache/solr/response/XMLResponseWriter.java b/solr/core/src/java/org/apache/solr/response/XMLResponseWriter.javaindex 6dbfdddd873..4e57e31728a 100644--- a/solr/core/src/java/org/apache/solr/response/XMLResponseWriter.java+++ b/solr/core/src/java/org/apache/solr/response/XMLResponseWriter.java@@ -18,7 +18,7 @@ package org.apache.solr.response;import java.io.IOException;import java.io.Writer;-import org.apache.solr.client.solrj.impl.XMLResponseParser;+import org.apache.solr.client.solrj.response.XMLResponseParser;import org.apache.solr.request.SolrQueryRequest;/** An XML {@link QueryResponseWriter}. */diff --git a/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java b/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.javaindex ec4e7c1f14c..839c8a9c619 100644--- a/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java+++ b/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java@@ -35,9 +35,9 @@ import java.util.concurrent.Future;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.impl.ConcurrentUpdateBaseSolrClient;-import org.apache.solr.client.solrj.impl.JavaBinResponseParser;import org.apache.solr.client.solrj.request.AbstractUpdateRequest;import org.apache.solr.client.solrj.request.UpdateRequest;+import org.apache.solr.client.solrj.response.JavaBinResponseParser;import org.apache.solr.common.SolrException;import org.apache.solr.common.cloud.ZkCoreNodeProps;import org.apache.solr.common.cloud.ZkStateReader;diff --git a/solr/core/src/test/org/apache/solr/AnalysisAfterCoreReloadTest.java b/solr/core/src/test/org/apache/solr/AnalysisAfterCoreReloadTest.javaindex 900768ae42b..ba2946ee814 100644--- a/solr/core/src/test/org/apache/solr/AnalysisAfterCoreReloadTest.java+++ b/solr/core/src/test/org/apache/solr/AnalysisAfterCoreReloadTest.java@@ -25,10 +25,10 @@ import java.nio.file.Path;import java.nio.file.StandardCopyOption;import org.apache.commons.io.file.PathUtils;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.embedded.EmbeddedSolrServer;import org.apache.solr.client.solrj.request.AbstractUpdateRequest.ACTION;import org.apache.solr.client.solrj.request.QueryRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.core.SolrCore;diff --git a/solr/core/src/test/org/apache/solr/DistributedIntervalFacetingTest.java b/solr/core/src/test/org/apache/solr/DistributedIntervalFacetingTest.javaindex 380f5d9fb28..49abc00a862 100644--- a/solr/core/src/test/org/apache/solr/DistributedIntervalFacetingTest.java+++ b/solr/core/src/test/org/apache/solr/DistributedIntervalFacetingTest.java@@ -19,7 +19,7 @@ package org.apache.solr;import java.util.Arrays;import java.util.List;import org.apache.solr.SolrTestCaseJ4.SuppressSSL;-import org.apache.solr.client.solrj.SolrQuery;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.response.IntervalFacet.Count;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.common.params.ModifiableSolrParams;diff --git a/solr/core/src/test/org/apache/solr/HelloWorldSolrCloudTestCase.java b/solr/core/src/test/org/apache/solr/HelloWorldSolrCloudTestCase.javaindex 270ab6cabe7..38aca2c9b2b 100644--- a/solr/core/src/test/org/apache/solr/HelloWorldSolrCloudTestCase.java+++ b/solr/core/src/test/org/apache/solr/HelloWorldSolrCloudTestCase.java@@ -16,9 +16,9 @@*/package org.apache.solr;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.cloud.SolrCloudTestCase;diff --git a/solr/core/src/test/org/apache/solr/TestCpuTimeSearch.java b/solr/core/src/test/org/apache/solr/TestCpuTimeSearch.javaindex 2c1e8d1da2e..427205d300c 100644--- a/solr/core/src/test/org/apache/solr/TestCpuTimeSearch.java+++ b/solr/core/src/test/org/apache/solr/TestCpuTimeSearch.java@@ -19,9 +19,9 @@ package org.apache.solr;import java.io.IOException;import java.util.List;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.request.CollectionAdminRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.cloud.SolrCloudTestCase;diff --git a/solr/core/src/test/org/apache/solr/TestDistributedSearch.java b/solr/core/src/test/org/apache/solr/TestDistributedSearch.javaindex 4993a96c30e..4b76ed51b17 100644--- a/solr/core/src/test/org/apache/solr/TestDistributedSearch.java+++ b/solr/core/src/test/org/apache/solr/TestDistributedSearch.java@@ -33,8 +33,8 @@ import java.util.concurrent.ExecutorCompletionService;import java.util.concurrent.Future;import org.apache.solr.SolrTestCaseJ4.SuppressSSL;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.response.FacetField;import org.apache.solr.client.solrj.response.FieldStatsInfo;import org.apache.solr.client.solrj.response.QueryResponse;diff --git a/solr/core/src/test/org/apache/solr/TestGroupingSearch.java b/solr/core/src/test/org/apache/solr/TestGroupingSearch.javaindex 419c7b369be..e82223ec13c 100644--- a/solr/core/src/test/org/apache/solr/TestGroupingSearch.java+++ b/solr/core/src/test/org/apache/solr/TestGroupingSearch.java@@ -29,7 +29,7 @@ import java.util.List;import java.util.Map;import java.util.Objects;import java.util.TreeMap;-import org.apache.solr.client.solrj.impl.JavaBinResponseParser;+import org.apache.solr.client.solrj.response.JavaBinResponseParser;import org.apache.solr.common.SolrException;import org.apache.solr.common.params.CommonParams;import org.apache.solr.common.params.GroupParams;diff --git a/solr/core/src/test/org/apache/solr/TestTolerantSearch.java b/solr/core/src/test/org/apache/solr/TestTolerantSearch.javaindex 63dd8cec87d..6ec872d9ac0 100644--- a/solr/core/src/test/org/apache/solr/TestTolerantSearch.java+++ b/solr/core/src/test/org/apache/solr/TestTolerantSearch.java@@ -23,9 +23,9 @@ import java.nio.file.Path;import java.nio.file.StandardCopyOption;import org.apache.commons.io.FileUtils;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.request.CoreAdminRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.common.SolrException;import org.apache.solr.common.SolrInputDocument;diff --git a/solr/core/src/test/org/apache/solr/cli/TestExportTool.java b/solr/core/src/test/org/apache/solr/cli/TestExportTool.javaindex 13ad5859e3d..8a2d605640b 100644--- a/solr/core/src/test/org/apache/solr/cli/TestExportTool.java+++ b/solr/core/src/test/org/apache/solr/cli/TestExportTool.java@@ -33,11 +33,11 @@ import java.util.zip.GZIPInputStream;import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.jetty.HttpJettySolrClient;import org.apache.solr.client.solrj.request.AbstractUpdateRequest;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.JavaBinUpdateRequestCodec;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.cloud.SolrCloudTestCase;diff --git a/solr/core/src/test/org/apache/solr/cli/TestSolrCLIRunExample.java b/solr/core/src/test/org/apache/solr/cli/TestSolrCLIRunExample.javaindex 8b1122151c3..55a70326e87 100644--- a/solr/core/src/test/org/apache/solr/cli/TestSolrCLIRunExample.java+++ b/solr/core/src/test/org/apache/solr/cli/TestSolrCLIRunExample.java@@ -38,8 +38,8 @@ import org.apache.commons.exec.ExecuteResultHandler;import org.apache.lucene.tests.util.LuceneTestCase;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.impl.CloudSolrClient;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.cloud.MiniSolrCloudCluster;import org.apache.solr.common.SolrInputDocument;diff --git a/solr/core/src/test/org/apache/solr/client/solrj/embedded/TestEmbeddedSolrServerConstructors.java b/solr/core/src/test/org/apache/solr/client/solrj/embedded/TestEmbeddedSolrServerConstructors.javaindex e6a87783a7f..26cde12052c 100644--- a/solr/core/src/test/org/apache/solr/client/solrj/embedded/TestEmbeddedSolrServerConstructors.java+++ b/solr/core/src/test/org/apache/solr/client/solrj/embedded/TestEmbeddedSolrServerConstructors.java@@ -24,8 +24,8 @@ import java.util.List;import java.util.Map;import org.apache.commons.io.file.PathUtils;import org.apache.solr.SolrTestCaseJ4;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.request.CoreAdminRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.core.NodeConfig;import org.junit.Test;diff --git a/solr/core/src/test/org/apache/solr/cloud/AliasIntegrationTest.java b/solr/core/src/test/org/apache/solr/cloud/AliasIntegrationTest.javaindex 194b5b3b1aa..a8f36698f4f 100644--- a/solr/core/src/test/org/apache/solr/cloud/AliasIntegrationTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/AliasIntegrationTest.java@@ -35,7 +35,6 @@ import org.apache.http.entity.StringEntity;import org.apache.http.impl.client.CloseableHttpClient;import org.apache.http.util.EntityUtils;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.apache.CloudLegacySolrClient;@@ -44,6 +43,7 @@ import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.impl.ClusterStateProvider;import org.apache.solr.client.solrj.impl.ZkClientClusterStateProvider;import org.apache.solr.client.solrj.request.CollectionAdminRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.client.solrj.request.V2Request;import org.apache.solr.client.solrj.response.QueryResponse;diff --git a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeWithPullReplicasTest.java b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeWithPullReplicasTest.javaindex 9082928a828..cd0f2fcf41f 100644--- a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeWithPullReplicasTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeWithPullReplicasTest.java@@ -25,9 +25,9 @@ import java.util.Set;import java.util.concurrent.TimeUnit;import org.apache.lucene.tests.util.LuceneTestCase;import org.apache.solr.SolrTestCaseJ4.SuppressSSL;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.apache.CloudLegacySolrClient;import org.apache.solr.client.solrj.impl.CloudSolrClient;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.common.cloud.DocCollection;import org.apache.solr.common.cloud.Replica;diff --git a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderWithPullReplicasTest.java b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderWithPullReplicasTest.javaindex b097ebea968..95d1c1789ee 100644--- a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderWithPullReplicasTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderWithPullReplicasTest.java@@ -22,9 +22,9 @@ import java.util.EnumSet;import java.util.List;import java.util.concurrent.TimeUnit;import org.apache.lucene.tests.util.LuceneTestCase;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.impl.CloudSolrClient;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.common.SolrException;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.common.cloud.DocCollection;diff --git a/solr/core/src/test/org/apache/solr/cloud/CreateRoutedAliasTest.java b/solr/core/src/test/org/apache/solr/cloud/CreateRoutedAliasTest.javaindex 0972c7abba9..aa2c2e1e8fe 100644--- a/solr/core/src/test/org/apache/solr/cloud/CreateRoutedAliasTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/CreateRoutedAliasTest.java@@ -17,7 +17,7 @@package org.apache.solr.cloud;-import static org.apache.solr.client.solrj.RoutedAliasTypes.TIME;+import static org.apache.solr.client.solrj.request.RoutedAliasTypes.TIME;import java.io.IOException;import java.time.Duration;diff --git a/solr/core/src/test/org/apache/solr/cloud/DistributedVersionInfoTest.java b/solr/core/src/test/org/apache/solr/cloud/DistributedVersionInfoTest.javaindex 28c63f91df2..409adfdc26a 100644--- a/solr/core/src/test/org/apache/solr/cloud/DistributedVersionInfoTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/DistributedVersionInfoTest.java@@ -34,11 +34,11 @@ import org.apache.lucene.tests.util.LuceneTestCase;import org.apache.solr.JSONTestUtil;import org.apache.solr.SolrTestCaseJ4.SuppressSSL;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.CoreAdminRequest;import org.apache.solr.client.solrj.request.QueryRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.client.solrj.response.CoreAdminResponse;import org.apache.solr.client.solrj.response.QueryResponse;diff --git a/solr/core/src/test/org/apache/solr/cloud/DocValuesNotIndexedTest.java b/solr/core/src/test/org/apache/solr/cloud/DocValuesNotIndexedTest.javaindex c65da110ec7..2a08aaf4759 100644--- a/solr/core/src/test/org/apache/solr/cloud/DocValuesNotIndexedTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/DocValuesNotIndexedTest.java@@ -29,10 +29,10 @@ import java.util.LinkedHashMap;import java.util.List;import java.util.Locale;import java.util.Map;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.client.solrj.request.schema.FieldTypeDefinition;import org.apache.solr.client.solrj.request.schema.SchemaRequest;diff --git a/solr/core/src/test/org/apache/solr/cloud/ForceLeaderTest.java b/solr/core/src/test/org/apache/solr/cloud/ForceLeaderTest.javaindex f4b8d94113e..5364c1f32a0 100644--- a/solr/core/src/test/org/apache/solr/cloud/ForceLeaderTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/ForceLeaderTest.java@@ -25,7 +25,6 @@ import java.util.Optional;import java.util.concurrent.TimeUnit;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.apache.CloudLegacySolrClient;-import org.apache.solr.client.solrj.cloud.SocketProxy;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.common.SolrException;@@ -37,6 +36,7 @@ import org.apache.solr.common.cloud.ZkStateReader;import org.apache.solr.common.params.ModifiableSolrParams;import org.apache.solr.common.util.TimeSource;import org.apache.solr.embedded.JettySolrRunner;+import org.apache.solr.util.SocketProxy;import org.apache.solr.util.TimeOut;import org.junit.BeforeClass;import org.junit.Ignore;diff --git a/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudDistribCmdsTest.java b/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudDistribCmdsTest.javaindex 5f075644d35..c0d11b5c34f 100644--- a/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudDistribCmdsTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudDistribCmdsTest.java@@ -29,11 +29,10 @@ import java.util.concurrent.TimeUnit;import java.util.concurrent.atomic.AtomicInteger;import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.apache.ConcurrentUpdateSolrClient;-import org.apache.solr.client.solrj.cloud.SocketProxy;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.client.solrj.response.RequestStatusState;import org.apache.solr.client.solrj.response.UpdateResponse;@@ -49,6 +48,7 @@ import org.apache.solr.common.params.ModifiableSolrParams;import org.apache.solr.common.params.SolrParams;import org.apache.solr.common.util.ExecutorUtil;import org.apache.solr.embedded.JettySolrRunner;+import org.apache.solr.util.SocketProxy;import org.junit.After;import org.junit.BeforeClass;import org.junit.Test;diff --git a/solr/core/src/test/org/apache/solr/cloud/HttpPartitionOnCommitTest.java b/solr/core/src/test/org/apache/solr/cloud/HttpPartitionOnCommitTest.javaindex 16859664139..6068d788045 100644--- a/solr/core/src/test/org/apache/solr/cloud/HttpPartitionOnCommitTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/HttpPartitionOnCommitTest.java@@ -21,12 +21,12 @@ import java.nio.file.Path;import java.util.List;import org.apache.http.NoHttpResponseException;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.cloud.SocketProxy;import org.apache.solr.common.SolrException;import org.apache.solr.common.cloud.Replica;import org.apache.solr.common.cloud.ZkStateReader;import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.util.RTimer;+import org.apache.solr.util.SocketProxy;import org.junit.BeforeClass;import org.junit.Test;import org.slf4j.Logger;diff --git a/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java b/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.javaindex 8332d2646d2..3f1e3c19c1b 100644--- a/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java@@ -37,7 +37,6 @@ import org.apache.solr.SolrTestCaseJ4.SuppressSSL;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.apache.HttpSolrClient;-import org.apache.solr.client.solrj.cloud.SocketProxy;import org.apache.solr.client.solrj.request.QueryRequest;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.common.SolrException;@@ -52,6 +51,7 @@ import org.apache.solr.core.CoreContainer;import org.apache.solr.core.SolrCore;import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.util.RTimer;+import org.apache.solr.util.SocketProxy;import org.apache.solr.util.TestInjection;import org.apache.zookeeper.KeeperException;import org.junit.BeforeClass;diff --git a/solr/core/src/test/org/apache/solr/cloud/LeaderFailoverAfterPartitionTest.java b/solr/core/src/test/org/apache/solr/cloud/LeaderFailoverAfterPartitionTest.javaindex 5011ba3abe6..14408681acb 100644--- a/solr/core/src/test/org/apache/solr/cloud/LeaderFailoverAfterPartitionTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/LeaderFailoverAfterPartitionTest.java@@ -24,11 +24,11 @@ import java.util.Set;import java.util.concurrent.TimeUnit;import org.apache.solr.SolrTestCaseJ4.SuppressSSL;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.cloud.SocketProxy;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.common.cloud.Replica;import org.apache.solr.common.cloud.ZkStateReader;import org.apache.solr.embedded.JettySolrRunner;+import org.apache.solr.util.SocketProxy;import org.junit.Test;import org.slf4j.Logger;import org.slf4j.LoggerFactory;diff --git a/solr/core/src/test/org/apache/solr/cloud/LeaderTragicEventTest.java b/solr/core/src/test/org/apache/solr/cloud/LeaderTragicEventTest.javaindex 49b0fdc5072..40653362c5d 100644--- a/solr/core/src/test/org/apache/solr/cloud/LeaderTragicEventTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/LeaderTragicEventTest.java@@ -25,11 +25,11 @@ import java.lang.invoke.MethodHandles;import org.apache.lucene.store.AlreadyClosedException;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrClient.RemoteSolrException;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.apache.HttpSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.QueryRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.client.solrj.response.UpdateResponse;diff --git a/solr/core/src/test/org/apache/solr/cloud/LeaderVoteWaitTimeoutTest.java b/solr/core/src/test/org/apache/solr/cloud/LeaderVoteWaitTimeoutTest.javaindex a81204dfee5..72f062e44c4 100644--- a/solr/core/src/test/org/apache/solr/cloud/LeaderVoteWaitTimeoutTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/LeaderVoteWaitTimeoutTest.java@@ -35,7 +35,6 @@ import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrRequest.SolrRequestType;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.apache.HttpSolrClient;-import org.apache.solr.client.solrj.cloud.SocketProxy;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.GenericSolrRequest;import org.apache.solr.common.SolrInputDocument;@@ -43,6 +42,7 @@ import org.apache.solr.common.cloud.Replica;import org.apache.solr.common.cloud.ZkStateReader;import org.apache.solr.common.util.NamedList;import org.apache.solr.embedded.JettySolrRunner;+import org.apache.solr.util.SocketProxy;import org.junit.After;import org.junit.AfterClass;import org.junit.Before;diff --git a/solr/core/src/test/org/apache/solr/cloud/MigrateRouteKeyTest.java b/solr/core/src/test/org/apache/solr/cloud/MigrateRouteKeyTest.javaindex c01d9b3f242..4c64bb8d624 100644--- a/solr/core/src/test/org/apache/solr/cloud/MigrateRouteKeyTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/MigrateRouteKeyTest.java@@ -21,10 +21,10 @@ import java.lang.invoke.MethodHandles;import java.util.Map;import java.util.concurrent.TimeUnit;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.common.cloud.DocCollection;diff --git a/solr/core/src/test/org/apache/solr/cloud/MissingSegmentRecoveryTest.java b/solr/core/src/test/org/apache/solr/cloud/MissingSegmentRecoveryTest.javaindex 93610a7cff1..d6e2af67301 100644--- a/solr/core/src/test/org/apache/solr/cloud/MissingSegmentRecoveryTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/MissingSegmentRecoveryTest.java@@ -23,9 +23,9 @@ import java.nio.file.StandardOpenOption;import java.util.ArrayList;import java.util.List;import java.util.stream.Stream;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.request.CollectionAdminRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.common.cloud.DocCollection;diff --git a/solr/core/src/test/org/apache/solr/cloud/PeerSyncReplicationTest.java b/solr/core/src/test/org/apache/solr/cloud/PeerSyncReplicationTest.javaindex c24bcba8481..47b75827a70 100644--- a/solr/core/src/test/org/apache/solr/cloud/PeerSyncReplicationTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/PeerSyncReplicationTest.java@@ -33,8 +33,8 @@ import java.util.List;import java.util.Set;import java.util.concurrent.TimeUnit;import java.util.stream.Collectors;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.cloud.ZkTestServer.LimitViolationAction;import org.apache.solr.common.SolrInputDocument;diff --git a/solr/core/src/test/org/apache/solr/cloud/RecoveryAfterSoftCommitTest.java b/solr/core/src/test/org/apache/solr/cloud/RecoveryAfterSoftCommitTest.javaindex ea013dfed46..bcdea64ae31 100644--- a/solr/core/src/test/org/apache/solr/cloud/RecoveryAfterSoftCommitTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/RecoveryAfterSoftCommitTest.java@@ -19,12 +19,12 @@ package org.apache.solr.cloud;import java.nio.file.Path;import java.util.List;import org.apache.solr.SolrTestCaseJ4;-import org.apache.solr.client.solrj.cloud.SocketProxy;import org.apache.solr.client.solrj.request.AbstractUpdateRequest;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.common.cloud.Replica;import org.apache.solr.embedded.JettySolrRunner;+import org.apache.solr.util.SocketProxy;import org.apache.solr.util.TestInjection;import org.junit.AfterClass;import org.junit.BeforeClass;diff --git a/solr/core/src/test/org/apache/solr/cloud/RecoveryStrategyStressTest.java b/solr/core/src/test/org/apache/solr/cloud/RecoveryStrategyStressTest.javaindex 16d63e2ea58..9e66bee3867 100644--- a/solr/core/src/test/org/apache/solr/cloud/RecoveryStrategyStressTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/RecoveryStrategyStressTest.java@@ -23,11 +23,11 @@ import java.util.concurrent.CountDownLatch;import java.util.concurrent.Executors;import java.util.concurrent.TimeUnit;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.apache.CloudLegacySolrClient;import org.apache.solr.client.solrj.apache.HttpSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.common.cloud.DocCollection;import org.apache.solr.common.cloud.Replica;diff --git a/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTestWithAuth.java b/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTestWithAuth.javaindex 688543c8487..e1dc4528995 100644--- a/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTestWithAuth.java+++ b/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTestWithAuth.java@@ -22,7 +22,6 @@ import java.io.IOException;import java.util.List;import java.util.concurrent.TimeUnit;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrResponse;import org.apache.solr.client.solrj.SolrServerException;@@ -32,6 +31,7 @@ import org.apache.solr.client.solrj.impl.SolrHttpConstants;import org.apache.solr.client.solrj.jetty.PreemptiveBasicAuthClientBuilderFactory;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.QueryRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.client.solrj.response.RequestStatusState;diff --git a/solr/core/src/test/org/apache/solr/cloud/SegmentTerminateEarlyTestState.java b/solr/core/src/test/org/apache/solr/cloud/SegmentTerminateEarlyTestState.javaindex d4822d718e3..ed36efb5362 100644--- a/solr/core/src/test/org/apache/solr/cloud/SegmentTerminateEarlyTestState.java+++ b/solr/core/src/test/org/apache/solr/cloud/SegmentTerminateEarlyTestState.java@@ -21,8 +21,8 @@ import java.util.HashSet;import java.util.Map;import java.util.Random;import java.util.Set;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.impl.CloudSolrClient;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.common.SolrDocument;import org.apache.solr.common.SolrInputDocument;diff --git a/solr/core/src/test/org/apache/solr/cloud/ShardTermsTest.java b/solr/core/src/test/org/apache/solr/cloud/ShardTermsTest.javaindex a7a4685b380..586706a92fb 100644--- a/solr/core/src/test/org/apache/solr/cloud/ShardTermsTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/ShardTermsTest.java@@ -21,7 +21,6 @@ import java.util.Collections;import java.util.HashMap;import java.util.Map;import org.apache.solr.SolrTestCase;-import org.apache.solr.client.solrj.cloud.ShardTerms;import org.junit.Test;public class ShardTermsTest extends SolrTestCase {diff --git a/solr/core/src/test/org/apache/solr/cloud/SolrCloudExampleTest.java b/solr/core/src/test/org/apache/solr/cloud/SolrCloudExampleTest.javaindex e55a4bb9807..c7a6e70ef29 100644--- a/solr/core/src/test/org/apache/solr/cloud/SolrCloudExampleTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/SolrCloudExampleTest.java@@ -31,7 +31,7 @@ import org.apache.solr.cli.HealthcheckTool;import org.apache.solr.cli.PostTool;import org.apache.solr.cli.SolrCLI;import org.apache.solr.cli.ToolRuntime;-import org.apache.solr.client.solrj.SolrQuery;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.common.cloud.ZkStateReader;import org.apache.solr.util.ExternalPaths;diff --git a/solr/core/src/test/org/apache/solr/cloud/SplitShardTest.java b/solr/core/src/test/org/apache/solr/cloud/SplitShardTest.javaindex ba5949b7a13..1fc7baa77d8 100644--- a/solr/core/src/test/org/apache/solr/cloud/SplitShardTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/SplitShardTest.java@@ -32,11 +32,11 @@ import java.util.concurrent.TimeUnit;import java.util.concurrent.atomic.AtomicBoolean;import java.util.concurrent.atomic.AtomicInteger;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.QueryRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.client.solrj.response.UpdateResponse;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestAuthenticationFramework.java b/solr/core/src/test/org/apache/solr/cloud/TestAuthenticationFramework.javaindex 9e38a8c9aef..88c80d73f33 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestAuthenticationFramework.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestAuthenticationFramework.java@@ -23,10 +23,10 @@ import java.lang.invoke.MethodHandles;import java.util.Map;import org.apache.http.HttpRequestInterceptor;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.apache.HttpClientUtil;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.security.AuthenticationPlugin;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestBaseStatsCacheCloud.java b/solr/core/src/test/org/apache/solr/cloud/TestBaseStatsCacheCloud.javaindex 17844bc68cc..11cff8c431c 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestBaseStatsCacheCloud.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestBaseStatsCacheCloud.java@@ -26,10 +26,10 @@ import org.apache.solr.client.solrj.SolrRequest.METHOD;import org.apache.solr.client.solrj.SolrRequest.SolrRequestType;import org.apache.solr.client.solrj.embedded.EmbeddedSolrServer;import org.apache.solr.client.solrj.impl.CloudSolrClient;-import org.apache.solr.client.solrj.impl.InputStreamResponseParser;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.GenericSolrRequest;import org.apache.solr.client.solrj.request.UpdateRequest;+import org.apache.solr.client.solrj.response.InputStreamResponseParser;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.common.SolrDocument;import org.apache.solr.common.SolrInputDocument;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestCloudConsistency.java b/solr/core/src/test/org/apache/solr/cloud/TestCloudConsistency.javaindex 4360f7c5d76..84035e40e90 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestCloudConsistency.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestCloudConsistency.java@@ -33,13 +33,13 @@ import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrRequest.SolrRequestType;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.apache.HttpSolrClient;-import org.apache.solr.client.solrj.cloud.SocketProxy;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.GenericSolrRequest;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.common.cloud.Replica;import org.apache.solr.common.util.NamedList;import org.apache.solr.embedded.JettySolrRunner;+import org.apache.solr.util.SocketProxy;import org.junit.After;import org.junit.Before;import org.junit.Test;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestCloudRecovery2.java b/solr/core/src/test/org/apache/solr/cloud/TestCloudRecovery2.javaindex 84f8dbf3086..d4af2692573 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestCloudRecovery2.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestCloudRecovery2.java@@ -18,8 +18,8 @@package org.apache.solr.cloud;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.request.CollectionAdminRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.common.cloud.Replica;import org.apache.solr.embedded.JettySolrRunner;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestCloudSearcherWarming.java b/solr/core/src/test/org/apache/solr/cloud/TestCloudSearcherWarming.javaindex 7f219b9b675..bc44ef1ba00 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestCloudSearcherWarming.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestCloudSearcherWarming.java@@ -22,9 +22,9 @@ import java.util.Set;import java.util.concurrent.atomic.AtomicInteger;import java.util.concurrent.atomic.AtomicReference;import java.util.function.Predicate;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.common.cloud.CollectionStateWatcher;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestDownShardTolerantSearch.java b/solr/core/src/test/org/apache/solr/cloud/TestDownShardTolerantSearch.javaindex 8285d15d206..bb4a53d5377 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestDownShardTolerantSearch.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestDownShardTolerantSearch.java@@ -18,9 +18,9 @@ package org.apache.solr.cloud;import static org.hamcrest.CoreMatchers.is;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.request.CollectionAdminRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.common.params.ShardParams;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestDynamicFieldNamesIndexCorrectly.java b/solr/core/src/test/org/apache/solr/cloud/TestDynamicFieldNamesIndexCorrectly.javaindex c94bfcd9605..bae34f52d85 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestDynamicFieldNamesIndexCorrectly.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestDynamicFieldNamesIndexCorrectly.java@@ -29,9 +29,9 @@ import java.util.concurrent.TimeUnit;import java.util.stream.Collectors;import org.apache.solr.BaseDistributedSearchTestCase;import org.apache.solr.SolrTestCaseJ4;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.request.QueryRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.common.SolrDocument;import org.apache.solr.common.SolrDocumentList;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestLeaderElectionWithEmptyReplica.java b/solr/core/src/test/org/apache/solr/cloud/TestLeaderElectionWithEmptyReplica.javaindex d9cf6fc7128..dccb8aadc57 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestLeaderElectionWithEmptyReplica.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestLeaderElectionWithEmptyReplica.java@@ -21,12 +21,12 @@ import java.io.IOException;import java.util.List;import java.util.concurrent.TimeUnit;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.apache.CloudLegacySolrClient;import org.apache.solr.client.solrj.apache.HttpSolrClient.Builder;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.common.cloud.Replica;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestPullReplica.java b/solr/core/src/test/org/apache/solr/cloud/TestPullReplica.javaindex d96bca09215..0d9d6cfbfc0 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestPullReplica.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestPullReplica.java@@ -38,11 +38,11 @@ import org.apache.http.client.methods.HttpGet;import org.apache.http.client.methods.HttpPost;import org.apache.http.entity.StringEntity;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.apache.CloudLegacySolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.QueryRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.response.CollectionAdminResponse;import org.apache.solr.common.SolrDocument;import org.apache.solr.common.SolrDocumentList;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestPullReplicaErrorHandling.java b/solr/core/src/test/org/apache/solr/cloud/TestPullReplicaErrorHandling.javaindex 3dd8f01e614..5d0ee95b541 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestPullReplicaErrorHandling.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestPullReplicaErrorHandling.java@@ -28,10 +28,9 @@ import java.util.Map;import java.util.concurrent.TimeUnit;import org.apache.solr.SolrTestCaseJ4.SuppressSSL;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;-import org.apache.solr.client.solrj.cloud.SocketProxy;import org.apache.solr.client.solrj.request.CollectionAdminRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.common.SolrException;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.common.cloud.CollectionStatePredicate;@@ -42,6 +41,7 @@ import org.apache.solr.common.cloud.ZkStateReader;import org.apache.solr.common.util.TimeSource;import org.apache.solr.core.SolrCore;import org.apache.solr.embedded.JettySolrRunner;+import org.apache.solr.util.SocketProxy;import org.apache.solr.util.TestInjection;import org.apache.solr.util.TimeOut;import org.apache.zookeeper.KeeperException;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestPullReplicaWithAuth.java b/solr/core/src/test/org/apache/solr/cloud/TestPullReplicaWithAuth.javaindex d0e1bb78f20..2006b16005b 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestPullReplicaWithAuth.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestPullReplicaWithAuth.java@@ -25,13 +25,13 @@ import java.io.IOException;import java.util.EnumSet;import java.util.List;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrResponse;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.QueryRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.client.solrj.response.CollectionAdminResponse;import org.apache.solr.client.solrj.response.QueryResponse;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestQueryingOnDownCollection.java b/solr/core/src/test/org/apache/solr/cloud/TestQueryingOnDownCollection.javaindex cc353b3ff60..003ca168c0e 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestQueryingOnDownCollection.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestQueryingOnDownCollection.java@@ -19,11 +19,11 @@ package org.apache.solr.cloud;import java.util.List;import java.util.Map;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.jetty.HttpJettySolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.QueryRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.common.SolrException;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestRandomFlRTGCloud.java b/solr/core/src/test/org/apache/solr/cloud/TestRandomFlRTGCloud.javaindex 15cfa0d2c0a..a45413f2b46 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestRandomFlRTGCloud.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestRandomFlRTGCloud.java@@ -40,11 +40,11 @@ import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.apache.HttpSolrClient;import org.apache.solr.client.solrj.impl.CloudSolrClient;-import org.apache.solr.client.solrj.impl.JsonMapResponseParser;-import org.apache.solr.client.solrj.impl.XMLResponseParser;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.QueryRequest;import org.apache.solr.client.solrj.response.QueryResponse;+import org.apache.solr.client.solrj.response.XMLResponseParser;+import org.apache.solr.client.solrj.response.json.JsonMapResponseParser;import org.apache.solr.common.SolrDocument;import org.apache.solr.common.SolrDocumentList;import org.apache.solr.common.SolrInputDocument;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestRandomRequestDistribution.java b/solr/core/src/test/org/apache/solr/cloud/TestRandomRequestDistribution.javaindex d82addc73c1..218bff726e1 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestRandomRequestDistribution.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestRandomRequestDistribution.java@@ -29,9 +29,9 @@ import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.BaseDistributedSearchTestCase;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.apache.HttpSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.cloud.overseer.OverseerAction;import org.apache.solr.common.cloud.ClusterState;import org.apache.solr.common.cloud.DocCollection;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestShardsInfoResponse.java b/solr/core/src/test/org/apache/solr/cloud/TestShardsInfoResponse.javaindex f7e0ce2242c..36c6f8e34ad 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestShardsInfoResponse.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestShardsInfoResponse.java@@ -20,8 +20,8 @@ import static org.hamcrest.core.IsIterableContaining.hasItems;import java.util.ArrayList;import java.util.Collection;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.request.CollectionAdminRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.common.params.ShardParams;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestShortCircuitedRequests.java b/solr/core/src/test/org/apache/solr/cloud/TestShortCircuitedRequests.javaindex 950a6a35fe5..35b463c2ea3 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestShortCircuitedRequests.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestShortCircuitedRequests.java@@ -17,7 +17,7 @@package org.apache.solr.cloud;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.common.cloud.Replica;import org.apache.solr.common.params.ShardParams;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestTlogReplayVsRecovery.java b/solr/core/src/test/org/apache/solr/cloud/TestTlogReplayVsRecovery.javaindex 2545933f575..efc7935813a 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestTlogReplayVsRecovery.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestTlogReplayVsRecovery.java@@ -32,13 +32,13 @@ import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrRequest.SolrRequestType;import org.apache.solr.client.solrj.SolrServerException;-import org.apache.solr.client.solrj.cloud.SocketProxy;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.GenericSolrRequest;import org.apache.solr.client.solrj.response.RequestStatusState;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.common.cloud.Replica;import org.apache.solr.embedded.JettySolrRunner;+import org.apache.solr.util.SocketProxy;import org.apache.solr.util.TestInjection;import org.junit.After;import org.junit.Before;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestTlogReplica.java b/solr/core/src/test/org/apache/solr/cloud/TestTlogReplica.javaindex 43ae6866825..d6f455c052f 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestTlogReplica.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestTlogReplica.java@@ -44,7 +44,6 @@ import org.apache.http.entity.StringEntity;import org.apache.http.util.EntityUtils;import org.apache.lucene.index.IndexWriter;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.apache.CloudLegacySolrClient;@@ -52,6 +51,7 @@ import org.apache.solr.client.solrj.apache.HttpSolrClient;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.GenericSolrRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.client.solrj.response.CollectionAdminResponse;import org.apache.solr.client.solrj.response.QueryResponse;diff --git a/solr/core/src/test/org/apache/solr/cloud/ZkFailoverTest.java b/solr/core/src/test/org/apache/solr/cloud/ZkFailoverTest.javaindex e26d0fb45f4..d97fdfe84be 100644--- a/solr/core/src/test/org/apache/solr/cloud/ZkFailoverTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/ZkFailoverTest.java@@ -18,9 +18,9 @@package org.apache.solr.cloud;import java.lang.invoke.MethodHandles;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.QueryRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.common.cloud.ZkStateReader;diff --git a/solr/core/src/test/org/apache/solr/cloud/api/collections/CollectionsAPIAsyncDistributedZkTest.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/CollectionsAPIAsyncDistributedZkTest.javaindex da75f561f1c..bdc47a6a82e 100644--- a/solr/core/src/test/org/apache/solr/cloud/api/collections/CollectionsAPIAsyncDistributedZkTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/CollectionsAPIAsyncDistributedZkTest.java@@ -28,11 +28,11 @@ import java.util.concurrent.TimeUnit;import java.util.concurrent.atomic.AtomicInteger;import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.apache.HttpSolrClient;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.response.RequestStatusState;import org.apache.solr.cloud.SolrCloudTestCase;import org.apache.solr.common.SolrException;diff --git a/solr/core/src/test/org/apache/solr/cloud/api/collections/ConcurrentDeleteAndCreateCollectionTest.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/ConcurrentDeleteAndCreateCollectionTest.javaindex b87d9af578d..9be9f8e9574 100644--- a/solr/core/src/test/org/apache/solr/cloud/api/collections/ConcurrentDeleteAndCreateCollectionTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/ConcurrentDeleteAndCreateCollectionTest.java@@ -23,8 +23,8 @@ import java.util.concurrent.atomic.AtomicReference;import org.apache.lucene.tests.util.LuceneTestCase.Nightly;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.request.CollectionAdminRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.response.CollectionAdminResponse;import org.apache.solr.cloud.MiniSolrCloudCluster;import org.apache.solr.common.util.IOUtils;diff --git a/solr/core/src/test/org/apache/solr/cloud/api/collections/CustomCollectionTest.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/CustomCollectionTest.javaindex 2c2f4e8e2e2..29c9ee04505 100644--- a/solr/core/src/test/org/apache/solr/cloud/api/collections/CustomCollectionTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/CustomCollectionTest.java@@ -22,8 +22,8 @@ import static org.apache.solr.common.params.ShardParams._ROUTE_;import java.util.Map;import org.apache.lucene.tests.util.TestUtil;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.request.CollectionAdminRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.cloud.SolrCloudTestCase;import org.apache.solr.common.SolrInputDocument;diff --git a/solr/core/src/test/org/apache/solr/cloud/api/collections/LocalFSCloudIncrementalBackupTest.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/LocalFSCloudIncrementalBackupTest.javaindex 7661e6ce71e..eabd8101480 100644--- a/solr/core/src/test/org/apache/solr/cloud/api/collections/LocalFSCloudIncrementalBackupTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/LocalFSCloudIncrementalBackupTest.java@@ -21,9 +21,9 @@ import java.util.List;import java.util.Map;import java.util.Properties;import org.apache.lucene.tests.util.LuceneTestCase;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.response.CollectionAdminResponse;import org.apache.solr.cloud.AbstractFullDistribZkTestBase;import org.apache.solr.common.cloud.ZkStateReader;diff --git a/solr/core/src/test/org/apache/solr/cloud/api/collections/ShardSplitTest.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/ShardSplitTest.javaindex f231974cc90..eb7c37fec5c 100644--- a/solr/core/src/test/org/apache/solr/cloud/api/collections/ShardSplitTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/ShardSplitTest.java@@ -39,13 +39,13 @@ import java.util.concurrent.atomic.AtomicInteger;import java.util.concurrent.atomic.AtomicReference;import org.apache.lucene.tests.util.LuceneTestCase;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.apache.CloudLegacySolrClient;import org.apache.solr.client.solrj.apache.HttpSolrClient;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.QueryRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.response.CollectionAdminResponse;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.client.solrj.response.RequestStatusState;diff --git a/solr/core/src/test/org/apache/solr/cloud/api/collections/TestCollectionAPI.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/TestCollectionAPI.javaindex 7898520960e..0623a459acf 100644--- a/solr/core/src/test/org/apache/solr/cloud/api/collections/TestCollectionAPI.java+++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/TestCollectionAPI.java@@ -31,10 +31,10 @@ import org.apache.solr.client.solrj.SolrRequest.METHOD;import org.apache.solr.client.solrj.SolrRequest.SolrRequestType;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.impl.CloudSolrClient;-import org.apache.solr.client.solrj.impl.InputStreamResponseParser;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.GenericSolrRequest;import org.apache.solr.client.solrj.response.CollectionAdminResponse;+import org.apache.solr.client.solrj.response.InputStreamResponseParser;import org.apache.solr.cloud.MiniSolrCloudCluster;import org.apache.solr.cloud.ZkConfigSetService;import org.apache.solr.cloud.ZkTestServer;diff --git a/solr/core/src/test/org/apache/solr/cloud/api/collections/TestCollectionsAPIViaSolrCloudCluster.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/TestCollectionsAPIViaSolrCloudCluster.javaindex a836b07401e..7f8634e448a 100644--- a/solr/core/src/test/org/apache/solr/cloud/api/collections/TestCollectionsAPIViaSolrCloudCluster.java+++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/TestCollectionsAPIViaSolrCloudCluster.java@@ -30,10 +30,10 @@ import org.apache.http.HttpResponse;import org.apache.http.client.methods.HttpGet;import org.apache.http.client.methods.HttpPost;import org.apache.http.entity.StringEntity;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.apache.CloudLegacySolrClient;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.client.solrj.response.CollectionAdminResponse;import org.apache.solr.client.solrj.response.QueryResponse;diff --git a/solr/core/src/test/org/apache/solr/core/TestConfigSetImmutable.java b/solr/core/src/test/org/apache/solr/core/TestConfigSetImmutable.javaindex dc45e63380c..5da12a8048b 100644--- a/solr/core/src/test/org/apache/solr/core/TestConfigSetImmutable.java+++ b/solr/core/src/test/org/apache/solr/core/TestConfigSetImmutable.java@@ -23,7 +23,7 @@ import java.nio.file.Path;import java.util.Map;import org.apache.commons.io.file.PathUtils;import org.apache.solr.SolrTestCaseJ4;-import org.apache.solr.client.solrj.impl.XMLResponseParser;+import org.apache.solr.client.solrj.response.XMLResponseParser;import org.apache.solr.common.util.NamedList;import org.apache.solr.common.util.Utils;import org.apache.solr.util.RestTestBase;diff --git a/solr/core/src/test/org/apache/solr/handler/BinaryUpdateRequestHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/BinaryUpdateRequestHandlerTest.javaindex f44e0b86279..0ccdb4044f0 100644--- a/solr/core/src/test/org/apache/solr/handler/BinaryUpdateRequestHandlerTest.java+++ b/solr/core/src/test/org/apache/solr/handler/BinaryUpdateRequestHandlerTest.java@@ -18,7 +18,7 @@ package org.apache.solr.handler;import java.io.ByteArrayOutputStream;import org.apache.solr.SolrTestCaseJ4;-import org.apache.solr.client.solrj.impl.JavaBinRequestWriter;+import org.apache.solr.client.solrj.request.JavaBinRequestWriter;import org.apache.solr.client.solrj.request.RequestWriter;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.common.SolrInputDocument;diff --git a/solr/core/src/test/org/apache/solr/handler/RequestHandlerMetricsTest.java b/solr/core/src/test/org/apache/solr/handler/RequestHandlerMetricsTest.javaindex 4c7685692b1..29b8b36a680 100644--- a/solr/core/src/test/org/apache/solr/handler/RequestHandlerMetricsTest.java+++ b/solr/core/src/test/org/apache/solr/handler/RequestHandlerMetricsTest.java@@ -19,10 +19,10 @@ package org.apache.solr.handler;import io.prometheus.metrics.model.snapshots.CounterSnapshot;import io.prometheus.metrics.model.snapshots.Labels;import java.io.IOException;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.cloud.SolrCloudTestCase;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.core.SolrCore;diff --git a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.javaindex e3bb54c27cf..839d832c155 100644--- a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java+++ b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java@@ -50,13 +50,13 @@ import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.SolrTestCaseJ4.SuppressSSL;import org.apache.solr.client.api.model.IndexVersionResponse;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrRequest.SolrRequestType;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.request.CoresApi;import org.apache.solr.client.solrj.request.GenericSolrRequest;import org.apache.solr.client.solrj.request.ReplicationApi;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.client.solrj.response.SimpleSolrResponse;diff --git a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandlerDiskOverFlow.java b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandlerDiskOverFlow.javaindex 71ac5c59b6c..055b8423f5a 100644--- a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandlerDiskOverFlow.java+++ b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandlerDiskOverFlow.java@@ -36,7 +36,7 @@ import java.util.function.Function;import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.common.SolrException;import org.apache.solr.common.util.Utils;diff --git a/solr/core/src/test/org/apache/solr/handler/TestUserManagedReplicationWithAuth.java b/solr/core/src/test/org/apache/solr/handler/TestUserManagedReplicationWithAuth.javaindex a004ce614a2..39352913b44 100644--- a/solr/core/src/test/org/apache/solr/handler/TestUserManagedReplicationWithAuth.java+++ b/solr/core/src/test/org/apache/solr/handler/TestUserManagedReplicationWithAuth.java@@ -29,13 +29,13 @@ import java.nio.file.Path;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.SolrTestCaseJ4.SuppressSSL;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrResponse;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.jetty.HttpJettySolrClient;import org.apache.solr.client.solrj.request.HealthCheckRequest;import org.apache.solr.client.solrj.request.QueryRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.common.SolrInputDocument;diff --git a/solr/core/src/test/org/apache/solr/handler/V2ApiIntegrationTest.java b/solr/core/src/test/org/apache/solr/handler/V2ApiIntegrationTest.javaindex e903dfabb82..e00a0bd2e9b 100644--- a/solr/core/src/test/org/apache/solr/handler/V2ApiIntegrationTest.java+++ b/solr/core/src/test/org/apache/solr/handler/V2ApiIntegrationTest.java@@ -26,19 +26,19 @@ import org.apache.http.client.HttpClient;import org.apache.http.client.methods.HttpGet;import org.apache.http.client.methods.HttpRequestBase;import org.apache.http.client.utils.URIBuilder;-import org.apache.solr.client.solrj.ResponseParser;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.apache.CloudLegacySolrClient;import org.apache.solr.client.solrj.impl.CloudSolrClient;-import org.apache.solr.client.solrj.impl.InputStreamResponseParser;-import org.apache.solr.client.solrj.impl.JavaBinResponseParser;-import org.apache.solr.client.solrj.impl.JsonMapResponseParser;-import org.apache.solr.client.solrj.impl.XMLResponseParser;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.V2Request;+import org.apache.solr.client.solrj.response.InputStreamResponseParser;+import org.apache.solr.client.solrj.response.JavaBinResponseParser;+import org.apache.solr.client.solrj.response.ResponseParser;import org.apache.solr.client.solrj.response.V2Response;+import org.apache.solr.client.solrj.response.XMLResponseParser;+import org.apache.solr.client.solrj.response.json.JsonMapResponseParser;import org.apache.solr.cloud.SolrCloudTestCase;import org.apache.solr.common.SolrDocumentList;import org.apache.solr.common.params.ModifiableSolrParams;diff --git a/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminCreateDiscoverTest.java b/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminCreateDiscoverTest.javaindex 3281b4eb36a..be401b8cadd 100644--- a/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminCreateDiscoverTest.java+++ b/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminCreateDiscoverTest.java@@ -26,7 +26,7 @@ import java.util.Map;import java.util.Properties;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.api.model.CoreStatusResponse;-import org.apache.solr.client.solrj.JacksonContentWriter;+import org.apache.solr.client.solrj.request.json.JacksonContentWriter;import org.apache.solr.common.SolrException;import org.apache.solr.common.params.CoreAdminParams;import org.apache.solr.core.CorePropertiesLocator;diff --git a/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.javaindex 59ec9c9bdf5..6feae5d21f5 100644--- a/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java+++ b/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java@@ -33,11 +33,11 @@ import org.apache.commons.io.file.PathUtils;import org.apache.lucene.util.Constants;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.api.model.CoreStatusResponse;-import org.apache.solr.client.solrj.JacksonContentWriter;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.apache.HttpSolrClient;import org.apache.solr.client.solrj.request.CoreAdminRequest;+import org.apache.solr.client.solrj.request.SolrQuery;+import org.apache.solr.client.solrj.request.json.JacksonContentWriter;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.common.SolrException;import org.apache.solr.common.SolrInputDocument;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.javaindex 2edb04cb47b..e1d02085a42 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@@ -21,13 +21,13 @@ import java.io.InputStream;import java.util.Set;import java.util.concurrent.atomic.AtomicBoolean;import org.apache.solr.SolrJettyTestBase;-import org.apache.solr.client.solrj.ResponseParser;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrRequest.SolrRequestType;import org.apache.solr.client.solrj.SolrServerException;-import org.apache.solr.client.solrj.impl.InputStreamResponseParser;import org.apache.solr.client.solrj.request.GenericSolrRequest;+import org.apache.solr.client.solrj.response.InputStreamResponseParser;+import org.apache.solr.client.solrj.response.ResponseParser;import org.apache.solr.common.SolrException;import org.apache.solr.common.params.ModifiableSolrParams;import org.apache.solr.common.params.SolrParams;diff --git a/solr/core/src/test/org/apache/solr/handler/admin/ZookeeperStatusHandlerFailureTest.java b/solr/core/src/test/org/apache/solr/handler/admin/ZookeeperStatusHandlerFailureTest.javaindex e4e5a737ae8..b73f7cfab9d 100644--- a/solr/core/src/test/org/apache/solr/handler/admin/ZookeeperStatusHandlerFailureTest.java+++ b/solr/core/src/test/org/apache/solr/handler/admin/ZookeeperStatusHandlerFailureTest.java@@ -27,8 +27,8 @@ import java.util.concurrent.TimeoutException;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.apache.HttpSolrClient;-import org.apache.solr.client.solrj.impl.JsonMapResponseParser;import org.apache.solr.client.solrj.request.GenericSolrRequest;+import org.apache.solr.client.solrj.response.json.JsonMapResponseParser;import org.apache.solr.cloud.SolrCloudTestCase;import org.apache.solr.common.util.NamedList;import org.junit.BeforeClass;diff --git a/solr/core/src/test/org/apache/solr/handler/admin/ZookeeperStatusHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/ZookeeperStatusHandlerTest.javaindex 4c54a96e8b3..e69626ef5ff 100644--- a/solr/core/src/test/org/apache/solr/handler/admin/ZookeeperStatusHandlerTest.java+++ b/solr/core/src/test/org/apache/solr/handler/admin/ZookeeperStatusHandlerTest.java@@ -34,8 +34,8 @@ import java.util.concurrent.TimeoutException;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.apache.HttpSolrClient;-import org.apache.solr.client.solrj.impl.JsonMapResponseParser;import org.apache.solr.client.solrj.request.GenericSolrRequest;+import org.apache.solr.client.solrj.response.json.JsonMapResponseParser;import org.apache.solr.cloud.SolrCloudTestCase;import org.apache.solr.common.SolrException;import org.apache.solr.common.cloud.ZkDynamicConfig;diff --git a/solr/core/src/test/org/apache/solr/handler/api/V2ApiUtilsTest.java b/solr/core/src/test/org/apache/solr/handler/api/V2ApiUtilsTest.javaindex 1c64f41b3db..9c00837a434 100644--- a/solr/core/src/test/org/apache/solr/handler/api/V2ApiUtilsTest.java+++ b/solr/core/src/test/org/apache/solr/handler/api/V2ApiUtilsTest.java@@ -16,7 +16,7 @@*/package org.apache.solr.handler.api;-import static org.apache.solr.client.solrj.impl.JavaBinResponseParser.JAVABIN_CONTENT_TYPE_V2;+import static org.apache.solr.client.solrj.response.JavaBinResponseParser.JAVABIN_CONTENT_TYPE_V2;import static org.apache.solr.handler.admin.api.ReplicationAPIBase.FILE_STREAM;import jakarta.ws.rs.core.MediaType;diff --git a/solr/core/src/test/org/apache/solr/handler/component/CustomHighlightComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/CustomHighlightComponentTest.javaindex 299940aff9a..a72cdf52759 100644--- a/solr/core/src/test/org/apache/solr/handler/component/CustomHighlightComponentTest.java+++ b/solr/core/src/test/org/apache/solr/handler/component/CustomHighlightComponentTest.java@@ -22,9 +22,9 @@ import java.util.HashSet;import java.util.List;import java.util.Map;import java.util.Set;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.QueryRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.cloud.AbstractFullDistribZkTestBase;diff --git a/solr/core/src/test/org/apache/solr/handler/component/DistributedDebugComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/DistributedDebugComponentTest.javaindex 694cc687b0e..75bed7e1907 100644--- a/solr/core/src/test/org/apache/solr/handler/component/DistributedDebugComponentTest.java+++ b/solr/core/src/test/org/apache/solr/handler/component/DistributedDebugComponentTest.java@@ -29,9 +29,9 @@ import java.util.Set;import org.apache.commons.io.file.PathUtils;import org.apache.solr.SolrJettyTestBase;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.request.CoreAdminRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.common.SolrException;import org.apache.solr.common.SolrInputDocument;diff --git a/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryComponentOptimizationTest.java b/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryComponentOptimizationTest.javaindex c40d002632a..349d6dda711 100644--- a/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryComponentOptimizationTest.java+++ b/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryComponentOptimizationTest.java@@ -24,8 +24,8 @@ import java.util.Map;import java.util.Set;import java.util.concurrent.TimeUnit;import org.apache.solr.BaseDistributedSearchTestCase;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.request.CollectionAdminRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.cloud.SolrCloudTestCase;diff --git a/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryElevationComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryElevationComponentTest.javaindex 6e31daac172..2c66147212e 100644--- a/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryElevationComponentTest.java+++ b/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryElevationComponentTest.java@@ -19,9 +19,9 @@ package org.apache.solr.handler.component;import org.apache.lucene.util.Constants;import org.apache.solr.BaseDistributedSearchTestCase;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.apache.HttpSolrClient;-import org.apache.solr.client.solrj.impl.JavaBinResponseParser;+import org.apache.solr.client.solrj.request.SolrQuery;+import org.apache.solr.client.solrj.response.JavaBinResponseParser;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.common.SolrDocument;import org.apache.solr.common.SolrInputDocument;diff --git a/solr/core/src/test/org/apache/solr/handler/component/DistributedTermsComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/DistributedTermsComponentTest.javaindex fa0886f1122..a64d5d5bfaf 100644--- a/solr/core/src/test/org/apache/solr/handler/component/DistributedTermsComponentTest.java+++ b/solr/core/src/test/org/apache/solr/handler/component/DistributedTermsComponentTest.java@@ -23,14 +23,14 @@ import java.util.List;import java.util.Random;import java.util.stream.Stream;import org.apache.solr.BaseDistributedSearchTestCase;-import org.apache.solr.client.solrj.ResponseParser;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrServerException;-import org.apache.solr.client.solrj.impl.JavaBinResponseParser;-import org.apache.solr.client.solrj.impl.JsonMapResponseParser;-import org.apache.solr.client.solrj.impl.XMLResponseParser;import org.apache.solr.client.solrj.request.QueryRequest;+import org.apache.solr.client.solrj.response.JavaBinResponseParser;import org.apache.solr.client.solrj.response.QueryResponse;+import org.apache.solr.client.solrj.response.ResponseParser;+import org.apache.solr.client.solrj.response.XMLResponseParser;+import org.apache.solr.client.solrj.response.json.JsonMapResponseParser;import org.apache.solr.common.params.ModifiableSolrParams;import org.apache.solr.common.params.SolrParams;import org.apache.solr.common.util.NamedList;diff --git a/solr/core/src/test/org/apache/solr/handler/component/SearchHandlerAppendsCloudTest.java b/solr/core/src/test/org/apache/solr/handler/component/SearchHandlerAppendsCloudTest.javaindex cb6b60b2681..844daec2cba 100644--- a/solr/core/src/test/org/apache/solr/handler/component/SearchHandlerAppendsCloudTest.java+++ b/solr/core/src/test/org/apache/solr/handler/component/SearchHandlerAppendsCloudTest.java@@ -21,9 +21,9 @@ import java.util.HashSet;import java.util.List;import java.util.Map;import java.util.Set;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.QueryRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.cloud.AbstractFullDistribZkTestBase;diff --git a/solr/core/src/test/org/apache/solr/handler/component/ShardsAllowListTest.java b/solr/core/src/test/org/apache/solr/handler/component/ShardsAllowListTest.javaindex 0bf6140dad9..d6b19fad4f1 100644--- a/solr/core/src/test/org/apache/solr/handler/component/ShardsAllowListTest.java+++ b/solr/core/src/test/org/apache/solr/handler/component/ShardsAllowListTest.java@@ -27,8 +27,8 @@ import java.net.URI;import java.util.ArrayList;import java.util.List;import java.util.Map;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.cloud.MiniSolrCloudCluster;import org.apache.solr.cloud.MultiSolrCloudTestCase;import org.apache.solr.common.SolrException;diff --git a/solr/core/src/test/org/apache/solr/handler/component/TestTrackingShardHandlerFactory.java b/solr/core/src/test/org/apache/solr/handler/component/TestTrackingShardHandlerFactory.javaindex 4c9626618ec..332fd0e12d3 100644--- a/solr/core/src/test/org/apache/solr/handler/component/TestTrackingShardHandlerFactory.java+++ b/solr/core/src/test/org/apache/solr/handler/component/TestTrackingShardHandlerFactory.java@@ -21,7 +21,7 @@ import java.util.List;import java.util.Map;import org.apache.solr.BaseDistributedSearchTestCase;import org.apache.solr.SolrTestCaseJ4;-import org.apache.solr.client.solrj.SolrQuery;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.cloud.AbstractFullDistribZkTestBase;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.common.cloud.ZkStateReader;diff --git a/solr/core/src/test/org/apache/solr/handler/designer/TestSchemaDesignerAPI.java b/solr/core/src/test/org/apache/solr/handler/designer/TestSchemaDesignerAPI.javaindex 35b64f89daf..c1848c0d2f8 100644--- a/solr/core/src/test/org/apache/solr/handler/designer/TestSchemaDesignerAPI.java+++ b/solr/core/src/test/org/apache/solr/handler/designer/TestSchemaDesignerAPI.java@@ -34,7 +34,7 @@ import java.util.List;import java.util.Map;import java.util.Optional;import java.util.stream.Stream;-import org.apache.solr.client.solrj.SolrQuery;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.cloud.SolrCloudTestCase;import org.apache.solr.common.SolrDocumentList;diff --git a/solr/core/src/test/org/apache/solr/handler/tagger/EmbeddedSolrNoSerializeTest.java b/solr/core/src/test/org/apache/solr/handler/tagger/EmbeddedSolrNoSerializeTest.javaindex 84b23dea383..b6c3d324ad8 100644--- a/solr/core/src/test/org/apache/solr/handler/tagger/EmbeddedSolrNoSerializeTest.java+++ b/solr/core/src/test/org/apache/solr/handler/tagger/EmbeddedSolrNoSerializeTest.java@@ -30,11 +30,11 @@ import java.util.function.BiFunction;import org.apache.lucene.document.Field;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.SolrServerException;-import org.apache.solr.client.solrj.StreamingResponseCallback;import org.apache.solr.client.solrj.embedded.EmbeddedSolrServer;import org.apache.solr.client.solrj.request.QueryRequest;import org.apache.solr.client.solrj.request.RequestWriter;import org.apache.solr.client.solrj.response.QueryResponse;+import org.apache.solr.client.solrj.response.StreamingResponseCallback;import org.apache.solr.common.SolrDocument;import org.apache.solr.common.SolrDocumentList;import org.apache.solr.common.params.ModifiableSolrParams;diff --git a/solr/core/src/test/org/apache/solr/pkg/TestPackages.java b/solr/core/src/test/org/apache/solr/pkg/TestPackages.javaindex 07468d138d0..9a7c084f6b6 100644--- a/solr/core/src/test/org/apache/solr/pkg/TestPackages.java+++ b/solr/core/src/test/org/apache/solr/pkg/TestPackages.java@@ -43,7 +43,6 @@ import org.apache.lucene.analysis.pattern.PatternReplaceCharFilterFactory;import org.apache.lucene.util.ResourceLoader;import org.apache.lucene.util.ResourceLoaderAware;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.apache.HttpClientUtil;@@ -52,6 +51,7 @@ import org.apache.solr.client.solrj.impl.RemoteExecutionException;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.GenericSolrRequest;import org.apache.solr.client.solrj.request.RequestWriter;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.client.solrj.request.V2Request;import org.apache.solr.client.solrj.request.beans.PackagePayload;diff --git a/solr/core/src/test/org/apache/solr/request/TestIntervalFaceting.java b/solr/core/src/test/org/apache/solr/request/TestIntervalFaceting.javaindex 85c0ee433bb..5c7c2d798e5 100644--- a/solr/core/src/test/org/apache/solr/request/TestIntervalFaceting.java+++ b/solr/core/src/test/org/apache/solr/request/TestIntervalFaceting.java@@ -25,8 +25,8 @@ import java.util.Locale;import org.apache.lucene.util.BytesRef;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.embedded.EmbeddedSolrServer;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.common.SolrException;import org.apache.solr.common.params.ModifiableSolrParams;diff --git a/solr/core/src/test/org/apache/solr/request/TestRemoteStreaming.java b/solr/core/src/test/org/apache/solr/request/TestRemoteStreaming.javaindex 4ac59bbd3cb..3ff6d04d5ee 100644--- a/solr/core/src/test/org/apache/solr/request/TestRemoteStreaming.java+++ b/solr/core/src/test/org/apache/solr/request/TestRemoteStreaming.java@@ -28,8 +28,8 @@ import org.apache.lucene.tests.util.LuceneTestCase;import org.apache.solr.SolrJettyTestBase;import org.apache.solr.SolrTestCaseJ4.SuppressSSL;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.common.SolrException;import org.apache.solr.common.SolrException.ErrorCode;diff --git a/solr/core/src/test/org/apache/solr/request/TestStreamBody.java b/solr/core/src/test/org/apache/solr/request/TestStreamBody.javaindex 2bf3cd38852..ec0c6b6c77c 100644--- a/solr/core/src/test/org/apache/solr/request/TestStreamBody.java+++ b/solr/core/src/test/org/apache/solr/request/TestStreamBody.java@@ -21,8 +21,8 @@ import java.nio.file.Path;import java.util.SortedMap;import java.util.TreeMap;import org.apache.commons.io.file.PathUtils;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.request.QueryRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.common.SolrException;import org.apache.solr.common.params.CommonParams;import org.apache.solr.util.RestTestBase;diff --git a/solr/core/src/test/org/apache/solr/request/TestWriterPerf.java b/solr/core/src/test/org/apache/solr/request/TestWriterPerf.javaindex f1b5a51804a..c72426dd6e4 100644--- a/solr/core/src/test/org/apache/solr/request/TestWriterPerf.java+++ b/solr/core/src/test/org/apache/solr/request/TestWriterPerf.java@@ -21,9 +21,9 @@ import java.io.ByteArrayOutputStream;import java.lang.invoke.MethodHandles;import java.util.ArrayList;import org.apache.solr.SolrTestCaseJ4;-import org.apache.solr.client.solrj.ResponseParser;-import org.apache.solr.client.solrj.impl.JavaBinResponseParser;-import org.apache.solr.client.solrj.impl.XMLResponseParser;+import org.apache.solr.client.solrj.response.JavaBinResponseParser;+import org.apache.solr.client.solrj.response.ResponseParser;+import org.apache.solr.client.solrj.response.XMLResponseParser;import org.apache.solr.response.QueryResponseWriter;import org.apache.solr.response.SolrQueryResponse;import org.apache.solr.util.RTimer;diff --git a/solr/core/src/test/org/apache/solr/response/TestPrometheusResponseWriter.java b/solr/core/src/test/org/apache/solr/response/TestPrometheusResponseWriter.javaindex 91aa72aa43a..2c86fc41bfb 100644--- a/solr/core/src/test/org/apache/solr/response/TestPrometheusResponseWriter.java+++ b/solr/core/src/test/org/apache/solr/response/TestPrometheusResponseWriter.java@@ -16,7 +16,7 @@*/package org.apache.solr.response;-import static org.apache.solr.client.solrj.impl.InputStreamResponseParser.STREAM_KEY;+import static org.apache.solr.client.solrj.response.InputStreamResponseParser.STREAM_KEY;import java.io.InputStream;import java.lang.invoke.MethodHandles;@@ -31,8 +31,8 @@ import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrRequest.METHOD;import org.apache.solr.client.solrj.SolrRequest.SolrRequestType;-import org.apache.solr.client.solrj.impl.InputStreamResponseParser;import org.apache.solr.client.solrj.request.GenericSolrRequest;+import org.apache.solr.client.solrj.response.InputStreamResponseParser;import org.apache.solr.common.params.ModifiableSolrParams;import org.apache.solr.common.util.NamedList;import org.apache.solr.util.ExternalPaths;diff --git a/solr/core/src/test/org/apache/solr/response/TestPrometheusResponseWriterCloud.java b/solr/core/src/test/org/apache/solr/response/TestPrometheusResponseWriterCloud.javaindex 47c8d50791f..cd5149ca37f 100644--- a/solr/core/src/test/org/apache/solr/response/TestPrometheusResponseWriterCloud.java+++ b/solr/core/src/test/org/apache/solr/response/TestPrometheusResponseWriterCloud.java@@ -19,12 +19,12 @@ package org.apache.solr.response;import java.io.InputStream;import java.nio.charset.StandardCharsets;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrRequest.METHOD;import org.apache.solr.client.solrj.SolrRequest.SolrRequestType;-import org.apache.solr.client.solrj.impl.InputStreamResponseParser;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.GenericSolrRequest;+import org.apache.solr.client.solrj.request.SolrQuery;+import org.apache.solr.client.solrj.response.InputStreamResponseParser;import org.apache.solr.cloud.SolrCloudTestCase;import org.apache.solr.common.params.SolrParams;import org.apache.solr.common.util.NamedList;diff --git a/solr/core/src/test/org/apache/solr/response/TestRawResponseWriter.java b/solr/core/src/test/org/apache/solr/response/TestRawResponseWriter.javaindex fea9ad10a4a..901223a362b 100644--- a/solr/core/src/test/org/apache/solr/response/TestRawResponseWriter.java+++ b/solr/core/src/test/org/apache/solr/response/TestRawResponseWriter.java@@ -22,7 +22,7 @@ import java.io.IOException;import java.nio.charset.StandardCharsets;import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.SolrTestCaseJ4;-import org.apache.solr.client.solrj.impl.JavaBinResponseParser;+import org.apache.solr.client.solrj.response.JavaBinResponseParser;import org.apache.solr.common.util.ContentStreamBase.ByteArrayStream;import org.apache.solr.common.util.ContentStreamBase.StringStream;import org.apache.solr.common.util.NamedList;diff --git a/solr/core/src/test/org/apache/solr/response/TestRawTransformer.java b/solr/core/src/test/org/apache/solr/response/TestRawTransformer.javaindex ed581e24ef3..469558a4599 100644--- a/solr/core/src/test/org/apache/solr/response/TestRawTransformer.java+++ b/solr/core/src/test/org/apache/solr/response/TestRawTransformer.java@@ -27,9 +27,9 @@ import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.embedded.EmbeddedSolrServer;import org.apache.solr.client.solrj.impl.CloudSolrClient;-import org.apache.solr.client.solrj.impl.InputStreamResponseParser;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.QueryRequest;+import org.apache.solr.client.solrj.response.InputStreamResponseParser;import org.apache.solr.cloud.MiniSolrCloudCluster;import org.apache.solr.cloud.SolrCloudTestCase;import org.apache.solr.common.SolrInputDocument;diff --git a/solr/core/src/test/org/apache/solr/rest/schema/TestBulkSchemaAPI.java b/solr/core/src/test/org/apache/solr/rest/schema/TestBulkSchemaAPI.javaindex d6357a6cf16..0cc4ba3a989 100644--- a/solr/core/src/test/org/apache/solr/rest/schema/TestBulkSchemaAPI.java+++ b/solr/core/src/test/org/apache/solr/rest/schema/TestBulkSchemaAPI.java@@ -36,7 +36,7 @@ import org.apache.lucene.search.similarities.BM25Similarity;import org.apache.lucene.search.similarities.DFISimilarity;import org.apache.lucene.search.similarities.PerFieldSimilarityWrapper;import org.apache.lucene.search.similarities.Similarity;-import org.apache.solr.client.solrj.SolrQuery;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.request.schema.SchemaRequest;import org.apache.solr.common.SolrDocumentList;import org.apache.solr.core.CoreContainer;diff --git a/solr/core/src/test/org/apache/solr/schema/IndexSchemaRuntimeFieldTest.java b/solr/core/src/test/org/apache/solr/schema/IndexSchemaRuntimeFieldTest.javaindex 1572dd13e6a..12aba6b99a8 100644--- a/solr/core/src/test/org/apache/solr/schema/IndexSchemaRuntimeFieldTest.java+++ b/solr/core/src/test/org/apache/solr/schema/IndexSchemaRuntimeFieldTest.java@@ -17,7 +17,7 @@package org.apache.solr.schema;import org.apache.solr.SolrTestCaseJ4;-import org.apache.solr.client.solrj.SolrQuery;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.core.SolrCore;import org.apache.solr.request.LocalSolrQueryRequest;import org.apache.solr.request.SolrQueryRequest;diff --git a/solr/core/src/test/org/apache/solr/schema/TestBinaryField.java b/solr/core/src/test/org/apache/solr/schema/TestBinaryField.javaindex e7fe3013bc4..daeac88eb92 100644--- a/solr/core/src/test/org/apache/solr/schema/TestBinaryField.java+++ b/solr/core/src/test/org/apache/solr/schema/TestBinaryField.java@@ -28,8 +28,8 @@ import org.apache.solr.SolrJettyTestBase;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.SolrTestCaseJ4.SuppressSSL;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.beans.Field;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.common.SolrDocument;import org.apache.solr.common.SolrDocumentList;diff --git a/solr/core/src/test/org/apache/solr/schema/TestCloudManagedSchema.java b/solr/core/src/test/org/apache/solr/schema/TestCloudManagedSchema.javaindex bb6c2a78ca8..0709dd48d64 100644--- a/solr/core/src/test/org/apache/solr/schema/TestCloudManagedSchema.java+++ b/solr/core/src/test/org/apache/solr/schema/TestCloudManagedSchema.java@@ -22,10 +22,10 @@ import java.util.List;import java.util.Map;import java.util.concurrent.TimeUnit;import org.apache.solr.client.api.model.CoreStatusResponse;-import org.apache.solr.client.solrj.JacksonContentWriter;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.apache.HttpSolrClient;import org.apache.solr.client.solrj.request.QueryRequest;+import org.apache.solr.client.solrj.request.json.JacksonContentWriter;import org.apache.solr.cloud.AbstractFullDistribZkTestBase;import org.apache.solr.common.cloud.SolrZkClient;import org.apache.solr.common.params.CoreAdminParams;diff --git a/solr/core/src/test/org/apache/solr/schema/TestManagedSchema.java b/solr/core/src/test/org/apache/solr/schema/TestManagedSchema.javaindex 2bb9aa3b95b..7ad3ad1513f 100644--- a/solr/core/src/test/org/apache/solr/schema/TestManagedSchema.java+++ b/solr/core/src/test/org/apache/solr/schema/TestManagedSchema.java@@ -30,7 +30,7 @@ import java.util.regex.Pattern;import org.apache.commons.io.file.PathUtils;import org.apache.lucene.tests.mockfile.FilterPath;import org.apache.solr.client.api.model.CoreStatusResponse;-import org.apache.solr.client.solrj.JacksonContentWriter;+import org.apache.solr.client.solrj.request.json.JacksonContentWriter;import org.apache.solr.common.SolrException;import org.apache.solr.common.params.CoreAdminParams;import org.apache.solr.common.util.NamedList;diff --git a/solr/core/src/test/org/apache/solr/schema/TestManagedSchemaWithMultipleAdd.java b/solr/core/src/test/org/apache/solr/schema/TestManagedSchemaWithMultipleAdd.javaindex 0ba0ae282a5..d57bd5cc2fb 100644--- a/solr/core/src/test/org/apache/solr/schema/TestManagedSchemaWithMultipleAdd.java+++ b/solr/core/src/test/org/apache/solr/schema/TestManagedSchemaWithMultipleAdd.java@@ -21,10 +21,10 @@ import java.io.IOException;import java.lang.invoke.MethodHandles;import java.util.LinkedHashMap;import java.util.Map;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.client.solrj.request.schema.SchemaRequest;import org.apache.solr.client.solrj.response.schema.SchemaResponse;diff --git a/solr/core/src/test/org/apache/solr/search/CurrencyRangeFacetCloudTest.java b/solr/core/src/test/org/apache/solr/search/CurrencyRangeFacetCloudTest.javaindex 73f1a81ae86..fe24a7050ea 100644--- a/solr/core/src/test/org/apache/solr/search/CurrencyRangeFacetCloudTest.java+++ b/solr/core/src/test/org/apache/solr/search/CurrencyRangeFacetCloudTest.java@@ -21,8 +21,8 @@ import java.util.Arrays;import java.util.Collections;import java.util.List;import org.apache.lucene.tests.util.TestUtil;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.request.CollectionAdminRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.client.solrj.response.RangeFacet;diff --git a/solr/core/src/test/org/apache/solr/search/TestCoordinatorRole.java b/solr/core/src/test/org/apache/solr/search/TestCoordinatorRole.javaindex 0d48114e045..914c409ceb6 100644--- a/solr/core/src/test/org/apache/solr/search/TestCoordinatorRole.java+++ b/solr/core/src/test/org/apache/solr/search/TestCoordinatorRole.java@@ -36,12 +36,12 @@ import java.util.stream.Collectors;import org.apache.http.HttpResponse;import org.apache.http.client.methods.HttpGet;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.apache.HttpSolrClient;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.jetty.HttpJettySolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.QueryRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.cloud.MiniSolrCloudCluster;diff --git a/solr/core/src/test/org/apache/solr/search/TestSmileRequest.java b/solr/core/src/test/org/apache/solr/search/TestSmileRequest.javaindex f30055062e7..79c9e0a35c3 100644--- a/solr/core/src/test/org/apache/solr/search/TestSmileRequest.java+++ b/solr/core/src/test/org/apache/solr/search/TestSmileRequest.java@@ -24,9 +24,9 @@ import java.util.Set;import org.apache.solr.JSONTestUtil;import org.apache.solr.SolrTestCaseHS;import org.apache.solr.SolrTestCaseJ4;-import org.apache.solr.client.solrj.ResponseParser;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.request.QueryRequest;+import org.apache.solr.client.solrj.response.ResponseParser;import org.apache.solr.common.params.SolrParams;import org.apache.solr.common.util.NamedList;import org.apache.solr.common.util.Utils;diff --git a/solr/core/src/test/org/apache/solr/search/facet/RangeFacetCloudTest.java b/solr/core/src/test/org/apache/solr/search/facet/RangeFacetCloudTest.javaindex ea909c57d5e..fbb9abb1b33 100644--- a/solr/core/src/test/org/apache/solr/search/facet/RangeFacetCloudTest.java+++ b/solr/core/src/test/org/apache/solr/search/facet/RangeFacetCloudTest.java@@ -28,9 +28,9 @@ import java.util.Map;import java.util.Map.Entry;import java.util.stream.Collectors;import org.apache.lucene.tests.util.TestUtil;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.cloud.SolrCloudTestCase;diff --git a/solr/core/src/test/org/apache/solr/search/join/TestCloudNestedDocsSort.java b/solr/core/src/test/org/apache/solr/search/join/TestCloudNestedDocsSort.javaindex 0098aafc35d..35fc3ffbfbd 100644--- a/solr/core/src/test/org/apache/solr/search/join/TestCloudNestedDocsSort.java+++ b/solr/core/src/test/org/apache/solr/search/join/TestCloudNestedDocsSort.java@@ -24,10 +24,10 @@ import java.util.Iterator;import java.util.LinkedHashSet;import java.util.List;import java.util.Set;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.cloud.AbstractFullDistribZkTestBase;import org.apache.solr.cloud.SolrCloudTestCase;diff --git a/solr/core/src/test/org/apache/solr/search/mlt/CloudMLTQContentParserTest.java b/solr/core/src/test/org/apache/solr/search/mlt/CloudMLTQContentParserTest.javaindex 326ca7aaff0..63d2c8f5380 100644--- a/solr/core/src/test/org/apache/solr/search/mlt/CloudMLTQContentParserTest.java+++ b/solr/core/src/test/org/apache/solr/search/mlt/CloudMLTQContentParserTest.java@@ -18,7 +18,7 @@ package org.apache.solr.search.mlt;import java.util.ArrayList;import java.util.Arrays;-import org.apache.solr.client.solrj.SolrQuery;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.cloud.SolrCloudTestCase;import org.apache.solr.common.SolrDocument;diff --git a/solr/core/src/test/org/apache/solr/search/mlt/CloudMLTQParserTest.java b/solr/core/src/test/org/apache/solr/search/mlt/CloudMLTQParserTest.javaindex aa413cd37eb..fa587fc93e2 100644--- a/solr/core/src/test/org/apache/solr/search/mlt/CloudMLTQParserTest.java+++ b/solr/core/src/test/org/apache/solr/search/mlt/CloudMLTQParserTest.java@@ -18,9 +18,9 @@ package org.apache.solr.search.mlt;import java.util.ArrayList;import java.util.Arrays;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.cloud.SolrCloudTestCase;diff --git a/solr/core/src/test/org/apache/solr/search/stats/TestDistribIDF.java b/solr/core/src/test/org/apache/solr/search/stats/TestDistribIDF.javaindex 8aced962b9d..2bcd27d87e4 100644--- a/solr/core/src/test/org/apache/solr/search/stats/TestDistribIDF.java+++ b/solr/core/src/test/org/apache/solr/search/stats/TestDistribIDF.java@@ -21,9 +21,9 @@ import java.lang.invoke.MethodHandles;import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.request.CollectionAdminRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.response.CollectionAdminResponse;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.cloud.MiniSolrCloudCluster;diff --git a/solr/core/src/test/org/apache/solr/servlet/TestRequestRateLimiter.java b/solr/core/src/test/org/apache/solr/servlet/TestRequestRateLimiter.javaindex f563de91ebd..c9caca31b2f 100644--- a/solr/core/src/test/org/apache/solr/servlet/TestRequestRateLimiter.java+++ b/solr/core/src/test/org/apache/solr/servlet/TestRequestRateLimiter.java@@ -40,10 +40,10 @@ import java.util.concurrent.atomic.AtomicInteger;import java.util.concurrent.atomic.LongAdder;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.cloud.SolrCloudTestCase;import org.apache.solr.common.SolrException;diff --git a/solr/core/src/test/org/apache/solr/update/AddBlockUpdateTest.java b/solr/core/src/test/org/apache/solr/update/AddBlockUpdateTest.javaindex 2a2a0e0aa63..5f9314f9838 100644--- a/solr/core/src/test/org/apache/solr/update/AddBlockUpdateTest.java+++ b/solr/core/src/test/org/apache/solr/update/AddBlockUpdateTest.java@@ -54,9 +54,9 @@ import org.apache.lucene.search.join.QueryBitSetProducer;import org.apache.lucene.search.join.ScoreMode;import org.apache.lucene.search.join.ToParentBlockJoinQuery;import org.apache.solr.SolrTestCaseJ4;-import org.apache.solr.client.solrj.impl.XMLRequestWriter;import org.apache.solr.client.solrj.request.RequestWriter;import org.apache.solr.client.solrj.request.UpdateRequest;+import org.apache.solr.client.solrj.request.XMLRequestWriter;import org.apache.solr.common.SolrException;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.common.params.ModifiableSolrParams;diff --git a/solr/core/src/test/org/apache/solr/update/RootFieldTest.java b/solr/core/src/test/org/apache/solr/update/RootFieldTest.javaindex 09c405ff1a3..c553e58322c 100644--- a/solr/core/src/test/org/apache/solr/update/RootFieldTest.java+++ b/solr/core/src/test/org/apache/solr/update/RootFieldTest.java@@ -22,7 +22,7 @@ import static org.hamcrest.CoreMatchers.is;import org.apache.solr.EmbeddedSolrServerTestBase;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.common.SolrDocument;import org.apache.solr.common.SolrDocumentList;import org.apache.solr.common.SolrException;diff --git a/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.java b/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.javaindex bbb6818ab14..bfacf1c78d3 100644--- a/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.java+++ b/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.java@@ -28,10 +28,10 @@ import java.util.concurrent.atomic.AtomicBoolean;import java.util.concurrent.atomic.AtomicInteger;import org.apache.solr.BaseDistributedSearchTestCase;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.apache.HttpSolrClient;import org.apache.solr.client.solrj.request.LukeRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.common.SolrDocumentList;import org.apache.solr.common.SolrException;diff --git a/solr/core/src/test/org/apache/solr/update/SolrIndexSplitterTest.java b/solr/core/src/test/org/apache/solr/update/SolrIndexSplitterTest.javaindex 678b115fa77..cc22a6120a1 100644--- a/solr/core/src/test/org/apache/solr/update/SolrIndexSplitterTest.java+++ b/solr/core/src/test/org/apache/solr/update/SolrIndexSplitterTest.java@@ -26,8 +26,8 @@ import org.apache.lucene.index.DirectoryReader;import org.apache.lucene.index.Term;import org.apache.lucene.store.Directory;import org.apache.solr.SolrTestCaseJ4;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.embedded.EmbeddedSolrServer;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.common.cloud.CompositeIdRouter;import org.apache.solr.common.cloud.DocRouter;diff --git a/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdateWithRouteField.java b/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdateWithRouteField.javaindex d59b6f898da..9cac434ff0a 100644--- a/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdateWithRouteField.java+++ b/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdateWithRouteField.java@@ -30,10 +30,10 @@ import java.util.List;import java.util.Map;import java.util.stream.Collectors;import org.apache.lucene.tests.util.TestUtil;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.CollectionAdminRequest.Create;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.cloud.SolrCloudTestCase;diff --git a/solr/core/src/test/org/apache/solr/update/processor/AbstractAtomicUpdatesMultivalueTestBase.java b/solr/core/src/test/org/apache/solr/update/processor/AbstractAtomicUpdatesMultivalueTestBase.javaindex 208ff853948..75cb9b69327 100644--- a/solr/core/src/test/org/apache/solr/update/processor/AbstractAtomicUpdatesMultivalueTestBase.java+++ b/solr/core/src/test/org/apache/solr/update/processor/AbstractAtomicUpdatesMultivalueTestBase.java@@ -33,9 +33,9 @@ import java.util.function.Function;import java.util.stream.Collectors;import org.apache.solr.EmbeddedSolrServerTestBase;import org.apache.solr.SolrTestCaseJ4;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.embedded.EmbeddedSolrServer.RequestWriterSupplier;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.common.util.ByteArrayUtf8CharSequence;import org.junit.Before;diff --git a/solr/core/src/test/org/apache/solr/update/processor/DimensionalRoutedAliasUpdateProcessorTest.java b/solr/core/src/test/org/apache/solr/update/processor/DimensionalRoutedAliasUpdateProcessorTest.javaindex 48455847501..e7166b15973 100644--- a/solr/core/src/test/org/apache/solr/update/processor/DimensionalRoutedAliasUpdateProcessorTest.java+++ b/solr/core/src/test/org/apache/solr/update/processor/DimensionalRoutedAliasUpdateProcessorTest.java@@ -27,12 +27,12 @@ import java.util.Collections;import java.util.Date;import java.util.List;import java.util.stream.Collectors;-import org.apache.solr.client.solrj.RoutedAliasTypes;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.CollectionAdminRequest.CreateCategoryRoutedAlias;import org.apache.solr.client.solrj.request.CollectionAdminRequest.CreateTimeRoutedAlias;+import org.apache.solr.client.solrj.request.RoutedAliasTypes;import org.apache.solr.client.solrj.response.FieldStatsInfo;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.client.solrj.response.UpdateResponse;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.javaindex 35ec90a7ffd..e7678b5f12b 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@@ -22,7 +22,7 @@ import java.util.HashMap;import java.util.Map;import org.apache.lucene.util.Constants;import org.apache.solr.SolrTestCaseJ4;-import org.apache.solr.client.solrj.impl.JavaBinRequestWriter;+import org.apache.solr.client.solrj.request.JavaBinRequestWriter;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.common.params.MultiMapSolrParams;diff --git a/solr/core/src/test/org/apache/solr/update/processor/TimeRoutedAliasUpdateProcessorTest.java b/solr/core/src/test/org/apache/solr/update/processor/TimeRoutedAliasUpdateProcessorTest.javaindex 9d7db830b20..36896af2a3d 100644--- a/solr/core/src/test/org/apache/solr/update/processor/TimeRoutedAliasUpdateProcessorTest.java+++ b/solr/core/src/test/org/apache/solr/update/processor/TimeRoutedAliasUpdateProcessorTest.java@@ -17,7 +17,7 @@package org.apache.solr.update.processor;-import static org.apache.solr.client.solrj.RoutedAliasTypes.TIME;+import static org.apache.solr.client.solrj.request.RoutedAliasTypes.TIME;import static org.apache.solr.cloud.api.collections.RoutedAlias.ROUTED_ALIAS_NAME_CORE_PROP;import static org.apache.solr.cloud.api.collections.TimeRoutedAlias.ROUTER_START;import static org.apache.solr.common.cloud.ZkStateReader.COLLECTIONS_ZKNODE;diff --git a/solr/core/src/test/org/apache/solr/util/TestCborDataFormat.java b/solr/core/src/test/org/apache/solr/util/TestCborDataFormat.javaindex c9f7a2df328..ae18ef88132 100644--- a/solr/core/src/test/org/apache/solr/util/TestCborDataFormat.java+++ b/solr/core/src/test/org/apache/solr/util/TestCborDataFormat.java@@ -32,15 +32,15 @@ import java.nio.file.Path;import java.util.List;import java.util.Map;import java.util.concurrent.atomic.LongAdder;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.impl.CloudSolrClient;-import org.apache.solr.client.solrj.impl.InputStreamResponseParser;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.GenericSolrRequest;import org.apache.solr.client.solrj.request.QueryRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.request.UpdateRequest;+import org.apache.solr.client.solrj.response.InputStreamResponseParser;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.client.solrj.util.ClientUtils;import org.apache.solr.cloud.MiniSolrCloudCluster;diff --git a/solr/core/src/test/org/apache/solr/util/tracing/TestSimplePropagatorDistributedTracing.java b/solr/core/src/test/org/apache/solr/util/tracing/TestSimplePropagatorDistributedTracing.javaindex 806040c755c..d66e8933e6d 100644--- a/solr/core/src/test/org/apache/solr/util/tracing/TestSimplePropagatorDistributedTracing.java+++ b/solr/core/src/test/org/apache/solr/util/tracing/TestSimplePropagatorDistributedTracing.java@@ -24,12 +24,12 @@ import java.io.IOException;import java.util.List;import java.util.Optional;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.apache.CloudLegacySolrClient;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.QueryRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.client.solrj.response.CollectionAdminResponse;import org.apache.solr.cloud.SolrCloudTestCase;diff --git a/solr/cross-dc-manager/src/test/org/apache/solr/crossdc/manager/DeleteByQueryToIdTest.java b/solr/cross-dc-manager/src/test/org/apache/solr/crossdc/manager/DeleteByQueryToIdTest.javaindex 95a9f491ab4..421f7b1c0c1 100644--- a/solr/cross-dc-manager/src/test/org/apache/solr/crossdc/manager/DeleteByQueryToIdTest.java+++ b/solr/cross-dc-manager/src/test/org/apache/solr/crossdc/manager/DeleteByQueryToIdTest.java@@ -29,9 +29,9 @@ import java.util.concurrent.CountDownLatch;import org.apache.kafka.streams.integration.utils.EmbeddedKafkaCluster;import org.apache.lucene.tests.util.QuickPatchThreadsFilter;import org.apache.solr.SolrIgnoredThreadsFilter;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.cloud.MiniSolrCloudCluster;diff --git a/solr/cross-dc-manager/src/test/org/apache/solr/crossdc/manager/RetryQueueIntegrationTest.java b/solr/cross-dc-manager/src/test/org/apache/solr/crossdc/manager/RetryQueueIntegrationTest.javaindex c654fc99187..1e06264c965 100644--- a/solr/cross-dc-manager/src/test/org/apache/solr/crossdc/manager/RetryQueueIntegrationTest.java+++ b/solr/cross-dc-manager/src/test/org/apache/solr/crossdc/manager/RetryQueueIntegrationTest.java@@ -28,9 +28,9 @@ import org.apache.lucene.tests.util.LuceneTestCase;import org.apache.lucene.tests.util.QuickPatchThreadsFilter;import org.apache.solr.SolrIgnoredThreadsFilter;import org.apache.solr.SolrTestCaseJ4;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.cloud.MiniSolrCloudCluster;import org.apache.solr.cloud.ZkTestServer;diff --git a/solr/cross-dc-manager/src/test/org/apache/solr/crossdc/manager/SolrAndKafkaIntegrationTest.java b/solr/cross-dc-manager/src/test/org/apache/solr/crossdc/manager/SolrAndKafkaIntegrationTest.javaindex 65fe1aeb55b..3770884b372 100644--- a/solr/cross-dc-manager/src/test/org/apache/solr/crossdc/manager/SolrAndKafkaIntegrationTest.java+++ b/solr/cross-dc-manager/src/test/org/apache/solr/crossdc/manager/SolrAndKafkaIntegrationTest.java@@ -40,9 +40,9 @@ import org.apache.kafka.streams.integration.utils.EmbeddedKafkaCluster;import org.apache.lucene.tests.util.QuickPatchThreadsFilter;import org.apache.solr.SolrIgnoredThreadsFilter;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.cloud.MiniSolrCloudCluster;diff --git a/solr/cross-dc-manager/src/test/org/apache/solr/crossdc/manager/SolrAndKafkaMultiCollectionIntegrationTest.java b/solr/cross-dc-manager/src/test/org/apache/solr/crossdc/manager/SolrAndKafkaMultiCollectionIntegrationTest.javaindex de942eb980e..e859e80f4b8 100644--- a/solr/cross-dc-manager/src/test/org/apache/solr/crossdc/manager/SolrAndKafkaMultiCollectionIntegrationTest.java+++ b/solr/cross-dc-manager/src/test/org/apache/solr/crossdc/manager/SolrAndKafkaMultiCollectionIntegrationTest.java@@ -34,9 +34,9 @@ import org.apache.kafka.streams.integration.utils.EmbeddedKafkaCluster;import org.apache.lucene.tests.util.QuickPatchThreadsFilter;import org.apache.solr.SolrIgnoredThreadsFilter;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.cloud.MiniSolrCloudCluster;import org.apache.solr.cloud.SolrCloudTestCase;diff --git a/solr/cross-dc-manager/src/test/org/apache/solr/crossdc/manager/SolrAndKafkaReindexTest.java b/solr/cross-dc-manager/src/test/org/apache/solr/crossdc/manager/SolrAndKafkaReindexTest.javaindex 7a955fb6519..4c64a6a491f 100644--- a/solr/cross-dc-manager/src/test/org/apache/solr/crossdc/manager/SolrAndKafkaReindexTest.java+++ b/solr/cross-dc-manager/src/test/org/apache/solr/crossdc/manager/SolrAndKafkaReindexTest.java@@ -28,10 +28,10 @@ import java.util.Properties;import org.apache.kafka.streams.integration.utils.EmbeddedKafkaCluster;import org.apache.lucene.tests.util.QuickPatchThreadsFilter;import org.apache.solr.SolrIgnoredThreadsFilter;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.cloud.MiniSolrCloudCluster;import org.apache.solr.cloud.SolrCloudTestCase;diff --git a/solr/cross-dc-manager/src/test/org/apache/solr/crossdc/manager/ZkConfigIntegrationTest.java b/solr/cross-dc-manager/src/test/org/apache/solr/crossdc/manager/ZkConfigIntegrationTest.javaindex a3c0f2b9626..e0af7eaeb61 100644--- a/solr/cross-dc-manager/src/test/org/apache/solr/crossdc/manager/ZkConfigIntegrationTest.java+++ b/solr/cross-dc-manager/src/test/org/apache/solr/crossdc/manager/ZkConfigIntegrationTest.java@@ -26,9 +26,9 @@ import java.util.Properties;import org.apache.kafka.streams.integration.utils.EmbeddedKafkaCluster;import org.apache.lucene.tests.util.QuickPatchThreadsFilter;import org.apache.solr.SolrIgnoredThreadsFilter;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.cloud.MiniSolrCloudCluster;import org.apache.solr.cloud.SolrCloudTestCase;diff --git a/solr/modules/cross-dc/src/java/org/apache/solr/crossdc/update/processor/MirroringUpdateProcessor.java b/solr/modules/cross-dc/src/java/org/apache/solr/crossdc/update/processor/MirroringUpdateProcessor.javaindex 346bf19d81b..05ec9217c10 100644--- a/solr/modules/cross-dc/src/java/org/apache/solr/crossdc/update/processor/MirroringUpdateProcessor.java+++ b/solr/modules/cross-dc/src/java/org/apache/solr/crossdc/update/processor/MirroringUpdateProcessor.java@@ -27,8 +27,8 @@ import java.util.List;import java.util.Map;import java.util.TreeMap;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.cloud.CloudDescriptor;diff --git a/solr/modules/cross-dc/src/test/org/apache/solr/crossdc/update/processor/MirroringUpdateProcessorTest.java b/solr/modules/cross-dc/src/test/org/apache/solr/crossdc/update/processor/MirroringUpdateProcessorTest.javaindex 1c30f956dbb..82cab81992b 100644--- a/solr/modules/cross-dc/src/test/org/apache/solr/crossdc/update/processor/MirroringUpdateProcessorTest.java+++ b/solr/modules/cross-dc/src/test/org/apache/solr/crossdc/update/processor/MirroringUpdateProcessorTest.java@@ -27,7 +27,7 @@ import io.opentelemetry.api.common.Attributes;import java.io.IOException;import java.util.Map;import org.apache.solr.SolrTestCaseJ4;-import org.apache.solr.client.solrj.SolrQuery;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.cloud.CloudDescriptor;import org.apache.solr.cloud.ZkController;diff --git a/solr/modules/llm/src/test/org/apache/solr/llm/textvectorisation/search/TextToVectorQParserTest.java b/solr/modules/llm/src/test/org/apache/solr/llm/textvectorisation/search/TextToVectorQParserTest.javaindex 6c23ae21d1c..4789093d601 100644--- a/solr/modules/llm/src/test/org/apache/solr/llm/textvectorisation/search/TextToVectorQParserTest.java+++ b/solr/modules/llm/src/test/org/apache/solr/llm/textvectorisation/search/TextToVectorQParserTest.java@@ -18,7 +18,7 @@ package org.apache.solr.llm.textvectorisation.search;import java.util.Arrays;import java.util.Locale;-import org.apache.solr.client.solrj.SolrQuery;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.llm.TestLlmBase;import org.junit.AfterClass;import org.junit.BeforeClass;diff --git a/solr/modules/llm/src/test/org/apache/solr/llm/textvectorisation/update/processor/TextToVectorUpdateProcessorTest.java b/solr/modules/llm/src/test/org/apache/solr/llm/textvectorisation/update/processor/TextToVectorUpdateProcessorTest.javaindex 55cf735f9d4..602659b276c 100644--- a/solr/modules/llm/src/test/org/apache/solr/llm/textvectorisation/update/processor/TextToVectorUpdateProcessorTest.java+++ b/solr/modules/llm/src/test/org/apache/solr/llm/textvectorisation/update/processor/TextToVectorUpdateProcessorTest.java@@ -18,8 +18,8 @@ package org.apache.solr.llm.textvectorisation.update.processor;import java.io.IOException;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.llm.TestLlmBase;diff --git a/solr/modules/ltr/src/test/org/apache/solr/ltr/TestFeatureVectorCache.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/TestFeatureVectorCache.javaindex 2674f567edd..832944ba9a5 100644--- a/solr/modules/ltr/src/test/org/apache/solr/ltr/TestFeatureVectorCache.java+++ b/solr/modules/ltr/src/test/org/apache/solr/ltr/TestFeatureVectorCache.java@@ -19,7 +19,7 @@ package org.apache.solr.ltr;import io.prometheus.metrics.model.snapshots.CounterSnapshot;import java.util.ArrayList;import java.util.List;-import org.apache.solr.client.solrj.SolrQuery;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.core.SolrCore;import org.apache.solr.util.SolrMetricTestUtils;import org.junit.After;diff --git a/solr/modules/ltr/src/test/org/apache/solr/ltr/TestLTROnSolrCloud.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/TestLTROnSolrCloud.javaindex f509ea1185c..7a26562adae 100644--- a/solr/modules/ltr/src/test/org/apache/solr/ltr/TestLTROnSolrCloud.java+++ b/solr/modules/ltr/src/test/org/apache/solr/ltr/TestLTROnSolrCloud.java@@ -23,8 +23,8 @@ import java.util.Collections;import java.util.List;import java.util.stream.IntStream;import org.apache.commons.io.file.PathUtils;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.request.CollectionAdminRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.response.CollectionAdminResponse;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.cloud.MiniSolrCloudCluster;diff --git a/solr/modules/ltr/src/test/org/apache/solr/ltr/TestLTRQParserExplain.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/TestLTRQParserExplain.javaindex fd944460218..235378500f3 100644--- a/solr/modules/ltr/src/test/org/apache/solr/ltr/TestLTRQParserExplain.java+++ b/solr/modules/ltr/src/test/org/apache/solr/ltr/TestLTRQParserExplain.java@@ -17,7 +17,7 @@package org.apache.solr.ltr;import java.util.Random;-import org.apache.solr.client.solrj.SolrQuery;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.ltr.feature.SolrFeature;import org.apache.solr.ltr.interleaving.algorithms.TeamDraftInterleaving;import org.apache.solr.ltr.model.LinearModel;diff --git a/solr/modules/ltr/src/test/org/apache/solr/ltr/TestLTRQParserPlugin.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/TestLTRQParserPlugin.javaindex cb91ac8af19..8f793845e3a 100644--- a/solr/modules/ltr/src/test/org/apache/solr/ltr/TestLTRQParserPlugin.java+++ b/solr/modules/ltr/src/test/org/apache/solr/ltr/TestLTRQParserPlugin.java@@ -16,7 +16,7 @@*/package org.apache.solr.ltr;-import org.apache.solr.client.solrj.SolrQuery;+import org.apache.solr.client.solrj.request.SolrQuery;import org.junit.AfterClass;import org.junit.BeforeClass;import org.junit.Ignore;diff --git a/solr/modules/ltr/src/test/org/apache/solr/ltr/TestLTRWithFacet.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/TestLTRWithFacet.javaindex 61b64600d47..24648a22f80 100644--- a/solr/modules/ltr/src/test/org/apache/solr/ltr/TestLTRWithFacet.java+++ b/solr/modules/ltr/src/test/org/apache/solr/ltr/TestLTRWithFacet.java@@ -17,7 +17,7 @@package org.apache.solr.ltr;-import org.apache.solr.client.solrj.SolrQuery;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.ltr.feature.SolrFeature;import org.apache.solr.ltr.model.LinearModel;import org.junit.After;diff --git a/solr/modules/ltr/src/test/org/apache/solr/ltr/TestLTRWithSort.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/TestLTRWithSort.javaindex 10df43922ec..af8664aff24 100644--- a/solr/modules/ltr/src/test/org/apache/solr/ltr/TestLTRWithSort.java+++ b/solr/modules/ltr/src/test/org/apache/solr/ltr/TestLTRWithSort.java@@ -18,7 +18,7 @@package org.apache.solr.ltr;import java.util.Random;-import org.apache.solr.client.solrj.SolrQuery;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.ltr.feature.SolrFeature;import org.apache.solr.ltr.interleaving.algorithms.TeamDraftInterleaving;import org.apache.solr.ltr.model.LinearModel;diff --git a/solr/modules/ltr/src/test/org/apache/solr/ltr/TestParallelWeightCreation.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/TestParallelWeightCreation.javaindex 04fa1583a38..0127cd80e37 100644--- a/solr/modules/ltr/src/test/org/apache/solr/ltr/TestParallelWeightCreation.java+++ b/solr/modules/ltr/src/test/org/apache/solr/ltr/TestParallelWeightCreation.java@@ -16,7 +16,7 @@*/package org.apache.solr.ltr;-import org.apache.solr.client.solrj.SolrQuery;+import org.apache.solr.client.solrj.request.SolrQuery;import org.junit.Test;public class TestParallelWeightCreation extends TestRerankBase {diff --git a/solr/modules/ltr/src/test/org/apache/solr/ltr/TestSelectiveWeightCreation.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/TestSelectiveWeightCreation.javaindex b5148f66b80..ce720776013 100644--- a/solr/modules/ltr/src/test/org/apache/solr/ltr/TestSelectiveWeightCreation.java+++ b/solr/modules/ltr/src/test/org/apache/solr/ltr/TestSelectiveWeightCreation.java@@ -38,7 +38,7 @@ import org.apache.lucene.search.TopDocs;import org.apache.lucene.search.Weight;import org.apache.lucene.store.Directory;import org.apache.lucene.tests.index.RandomIndexWriter;-import org.apache.solr.client.solrj.SolrQuery;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.ltr.feature.Feature;import org.apache.solr.ltr.feature.ValueFeature;import org.apache.solr.ltr.model.LTRScoringModel;diff --git a/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestEdisMaxSolrFeature.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestEdisMaxSolrFeature.javaindex f01f329c9ae..9dd7b2dc5bc 100644--- a/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestEdisMaxSolrFeature.java+++ b/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestEdisMaxSolrFeature.java@@ -16,7 +16,7 @@*/package org.apache.solr.ltr.feature;-import org.apache.solr.client.solrj.SolrQuery;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.ltr.TestRerankBase;import org.apache.solr.ltr.model.LinearModel;import org.junit.After;diff --git a/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestExternalFeatures.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestExternalFeatures.javaindex 2bf4a706c58..72b37ac2577 100644--- a/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestExternalFeatures.java+++ b/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestExternalFeatures.java@@ -16,7 +16,7 @@*/package org.apache.solr.ltr.feature;-import org.apache.solr.client.solrj.SolrQuery;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.ltr.FeatureLoggerTestUtils;import org.apache.solr.ltr.TestRerankBase;import org.junit.AfterClass;diff --git a/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestExternalValueFeatures.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestExternalValueFeatures.javaindex ead1a6c6a89..407a68b38d4 100644--- a/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestExternalValueFeatures.java+++ b/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestExternalValueFeatures.java@@ -16,7 +16,7 @@*/package org.apache.solr.ltr.feature;-import org.apache.solr.client.solrj.SolrQuery;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.ltr.FeatureLoggerTestUtils;import org.apache.solr.ltr.TestRerankBase;import org.junit.AfterClass;diff --git a/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestFeatureExtractionFromMultipleSegments.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestFeatureExtractionFromMultipleSegments.javaindex f9fb8099cf3..6141395a60c 100644--- a/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestFeatureExtractionFromMultipleSegments.java+++ b/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestFeatureExtractionFromMultipleSegments.java@@ -18,7 +18,7 @@ package org.apache.solr.ltr.feature;import java.util.List;import java.util.Map;-import org.apache.solr.client.solrj.SolrQuery;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.common.util.Utils;import org.apache.solr.ltr.TestRerankBase;import org.junit.AfterClass;diff --git a/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestFeatureLogging.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestFeatureLogging.javaindex 6c859d987cf..38acf5d6c81 100644--- a/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestFeatureLogging.java+++ b/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestFeatureLogging.java@@ -16,7 +16,7 @@*/package org.apache.solr.ltr.feature;-import org.apache.solr.client.solrj.SolrQuery;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.ltr.FeatureLoggerTestUtils;import org.apache.solr.ltr.TestRerankBase;import org.apache.solr.ltr.model.LinearModel;diff --git a/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestFieldLengthFeature.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestFieldLengthFeature.javaindex 9237beb4cf8..8cc66f79af1 100644--- a/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestFieldLengthFeature.java+++ b/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestFieldLengthFeature.java@@ -17,7 +17,7 @@package org.apache.solr.ltr.feature;import java.util.LinkedHashMap;-import org.apache.solr.client.solrj.SolrQuery;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.ltr.TestRerankBase;import org.apache.solr.ltr.model.LinearModel;import org.junit.After;diff --git a/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestFieldValueFeature.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestFieldValueFeature.javaindex 8afc7aeed2e..9e79c2ae8d8 100644--- a/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestFieldValueFeature.java+++ b/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestFieldValueFeature.java@@ -24,7 +24,7 @@ import java.util.concurrent.TimeUnit;import org.apache.lucene.index.LeafReaderContext;import org.apache.lucene.search.IndexSearcher;import org.apache.lucene.search.Query;-import org.apache.solr.client.solrj.SolrQuery;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.ltr.FeatureLoggerTestUtils;import org.apache.solr.ltr.TestRerankBase;import org.apache.solr.ltr.feature.FieldValueFeature.FieldValueFeatureWeight.DefaultValueFieldValueFeatureScorer;diff --git a/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestFilterSolrFeature.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestFilterSolrFeature.javaindex dad9dbcd3c3..0feed2722be 100644--- a/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestFilterSolrFeature.java+++ b/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestFilterSolrFeature.java@@ -16,7 +16,7 @@*/package org.apache.solr.ltr.feature;-import org.apache.solr.client.solrj.SolrQuery;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.ltr.FeatureLoggerTestUtils;import org.apache.solr.ltr.TestRerankBase;import org.apache.solr.ltr.model.LinearModel;diff --git a/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestNoMatchSolrFeature.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestNoMatchSolrFeature.javaindex f73add37788..f95e85360cf 100644--- a/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestNoMatchSolrFeature.java+++ b/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestNoMatchSolrFeature.java@@ -18,7 +18,7 @@ package org.apache.solr.ltr.feature;import java.util.ArrayList;import java.util.Map;-import org.apache.solr.client.solrj.SolrQuery;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.common.util.Utils;import org.apache.solr.ltr.FeatureLoggerTestUtils;import org.apache.solr.ltr.TestRerankBase;diff --git a/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestOriginalScoreFeature.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestOriginalScoreFeature.javaindex 5de7b1f3ad6..0fd58268d3c 100644--- a/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestOriginalScoreFeature.java+++ b/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestOriginalScoreFeature.java@@ -19,7 +19,7 @@ package org.apache.solr.ltr.feature;import java.util.ArrayList;import java.util.LinkedHashMap;import java.util.Map;-import org.apache.solr.client.solrj.SolrQuery;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.common.params.CommonParams;import org.apache.solr.common.util.Utils;import org.apache.solr.ltr.FeatureLoggerTestUtils;diff --git a/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestRankingFeature.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestRankingFeature.javaindex 69e610ddf57..204e9e80386 100644--- a/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestRankingFeature.java+++ b/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestRankingFeature.java@@ -17,7 +17,7 @@package org.apache.solr.ltr.feature;import java.util.LinkedHashMap;-import org.apache.solr.client.solrj.SolrQuery;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.ltr.TestRerankBase;import org.apache.solr.ltr.model.LinearModel;import org.junit.After;diff --git a/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestUserTermScoreWithQ.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestUserTermScoreWithQ.javaindex 4a4b4c4105c..5ebf3eee770 100644--- a/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestUserTermScoreWithQ.java+++ b/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestUserTermScoreWithQ.java@@ -16,7 +16,7 @@*/package org.apache.solr.ltr.feature;-import org.apache.solr.client.solrj.SolrQuery;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.ltr.TestRerankBase;import org.apache.solr.ltr.model.LinearModel;import org.junit.After;diff --git a/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestUserTermScorerQuery.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestUserTermScorerQuery.javaindex e6034fd683d..60d954607dd 100644--- a/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestUserTermScorerQuery.java+++ b/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestUserTermScorerQuery.java@@ -16,7 +16,7 @@*/package org.apache.solr.ltr.feature;-import org.apache.solr.client.solrj.SolrQuery;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.ltr.TestRerankBase;import org.apache.solr.ltr.model.LinearModel;import org.junit.After;diff --git a/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestUserTermScorereQDF.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestUserTermScorereQDF.javaindex 08783690ff2..ec5b3587743 100644--- a/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestUserTermScorereQDF.java+++ b/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestUserTermScorereQDF.java@@ -16,7 +16,7 @@*/package org.apache.solr.ltr.feature;-import org.apache.solr.client.solrj.SolrQuery;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.ltr.TestRerankBase;import org.apache.solr.ltr.model.LinearModel;import org.junit.After;diff --git a/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestValueFeature.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestValueFeature.javaindex 101c09fa862..82058982514 100644--- a/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestValueFeature.java+++ b/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestValueFeature.java@@ -17,7 +17,7 @@package org.apache.solr.ltr.feature;import java.util.LinkedHashMap;-import org.apache.solr.client.solrj.SolrQuery;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.ltr.TestRerankBase;import org.apache.solr.ltr.model.LinearModel;import org.junit.After;diff --git a/solr/modules/ltr/src/test/org/apache/solr/ltr/interleaving/TestLTRQParserInterleaving.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/interleaving/TestLTRQParserInterleaving.javaindex 0f76655ff18..4d264d1069b 100644--- a/solr/modules/ltr/src/test/org/apache/solr/ltr/interleaving/TestLTRQParserInterleaving.java+++ b/solr/modules/ltr/src/test/org/apache/solr/ltr/interleaving/TestLTRQParserInterleaving.java@@ -17,7 +17,7 @@package org.apache.solr.ltr.interleaving;import java.util.Random;-import org.apache.solr.client.solrj.SolrQuery;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.ltr.TestRerankBase;import org.apache.solr.ltr.feature.SolrFeature;import org.apache.solr.ltr.interleaving.algorithms.TeamDraftInterleaving;diff --git a/solr/modules/ltr/src/test/org/apache/solr/ltr/model/TestAdapterModel.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/model/TestAdapterModel.javaindex 606555d03ac..f6c32f080e8 100644--- a/solr/modules/ltr/src/test/org/apache/solr/ltr/model/TestAdapterModel.java+++ b/solr/modules/ltr/src/test/org/apache/solr/ltr/model/TestAdapterModel.java@@ -30,7 +30,7 @@ import java.util.List;import java.util.Map;import org.apache.lucene.index.LeafReaderContext;import org.apache.lucene.search.Explanation;-import org.apache.solr.client.solrj.SolrQuery;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.core.SolrResourceLoader;import org.apache.solr.ltr.TestRerankBase;import org.apache.solr.ltr.feature.Feature;diff --git a/solr/modules/ltr/src/test/org/apache/solr/ltr/model/TestDefaultWrapperModel.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/model/TestDefaultWrapperModel.javaindex 2fbad290212..6b96e575dca 100644--- a/solr/modules/ltr/src/test/org/apache/solr/ltr/model/TestDefaultWrapperModel.java+++ b/solr/modules/ltr/src/test/org/apache/solr/ltr/model/TestDefaultWrapperModel.java@@ -24,7 +24,7 @@ import java.nio.file.Files;import java.nio.file.Path;import java.util.ArrayList;import java.util.List;-import org.apache.solr.client.solrj.SolrQuery;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.ltr.TestRerankBase;import org.apache.solr.ltr.feature.Feature;import org.apache.solr.ltr.feature.FieldValueFeature;diff --git a/solr/modules/ltr/src/test/org/apache/solr/ltr/model/TestMultipleAdditiveTreesModel.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/model/TestMultipleAdditiveTreesModel.javaindex 8b91d68011b..606a380dca9 100644--- a/solr/modules/ltr/src/test/org/apache/solr/ltr/model/TestMultipleAdditiveTreesModel.java+++ b/solr/modules/ltr/src/test/org/apache/solr/ltr/model/TestMultipleAdditiveTreesModel.java@@ -18,7 +18,7 @@ package org.apache.solr.ltr.model;import static org.hamcrest.core.StringContains.containsString;-import org.apache.solr.client.solrj.SolrQuery;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.ltr.TestRerankBase;import org.junit.After;import org.junit.Before;diff --git a/solr/modules/ltr/src/test/org/apache/solr/ltr/response/transform/TestFeatureLoggerTransformer.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/response/transform/TestFeatureLoggerTransformer.javaindex e68b433c2e0..4e7459425cc 100644--- a/solr/modules/ltr/src/test/org/apache/solr/ltr/response/transform/TestFeatureLoggerTransformer.java+++ b/solr/modules/ltr/src/test/org/apache/solr/ltr/response/transform/TestFeatureLoggerTransformer.java@@ -17,7 +17,7 @@package org.apache.solr.ltr.response.transform;import java.util.Random;-import org.apache.solr.client.solrj.SolrQuery;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.ltr.TestRerankBase;import org.apache.solr.ltr.feature.SolrFeature;import org.apache.solr.ltr.interleaving.algorithms.TeamDraftInterleaving;diff --git a/solr/modules/ltr/src/test/org/apache/solr/ltr/response/transform/TestInterleavingTransformer.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/response/transform/TestInterleavingTransformer.javaindex c07d29f0eab..0ede51f4dbd 100644--- a/solr/modules/ltr/src/test/org/apache/solr/ltr/response/transform/TestInterleavingTransformer.java+++ b/solr/modules/ltr/src/test/org/apache/solr/ltr/response/transform/TestInterleavingTransformer.java@@ -17,7 +17,7 @@package org.apache.solr.ltr.response.transform;import java.util.Random;-import org.apache.solr.client.solrj.SolrQuery;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.ltr.TestRerankBase;import org.apache.solr.ltr.feature.SolrFeature;import org.apache.solr.ltr.interleaving.algorithms.TeamDraftInterleaving;diff --git a/solr/modules/opentelemetry/src/test/org/apache/solr/opentelemetry/TestDistributedTracing.java b/solr/modules/opentelemetry/src/test/org/apache/solr/opentelemetry/TestDistributedTracing.javaindex 9e7c127f4f6..bc90908bc6d 100644--- a/solr/modules/opentelemetry/src/test/org/apache/solr/opentelemetry/TestDistributedTracing.java+++ b/solr/modules/opentelemetry/src/test/org/apache/solr/opentelemetry/TestDistributedTracing.java@@ -30,16 +30,16 @@ import java.util.Collections;import java.util.HashMap;import java.util.List;import java.util.Map;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrRequest.SolrRequestType;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.impl.CloudSolrClient;-import org.apache.solr.client.solrj.impl.InputStreamResponseParser;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.GenericSolrRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.request.V2Request;import org.apache.solr.client.solrj.response.CollectionAdminResponse;+import org.apache.solr.client.solrj.response.InputStreamResponseParser;import org.apache.solr.client.solrj.response.V2Response;import org.apache.solr.cloud.SolrCloudTestCase;import org.apache.solr.common.SolrDocumentList;diff --git a/solr/modules/opentelemetry/src/test/org/apache/solr/opentelemetry/TestMetricExemplars.java b/solr/modules/opentelemetry/src/test/org/apache/solr/opentelemetry/TestMetricExemplars.javaindex f564a452ebf..0a842d57915 100644--- a/solr/modules/opentelemetry/src/test/org/apache/solr/opentelemetry/TestMetricExemplars.java+++ b/solr/modules/opentelemetry/src/test/org/apache/solr/opentelemetry/TestMetricExemplars.java@@ -25,9 +25,9 @@ import java.io.InputStream;import java.nio.charset.StandardCharsets;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.impl.CloudSolrClient;-import org.apache.solr.client.solrj.impl.InputStreamResponseParser;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.GenericSolrRequest;+import org.apache.solr.client.solrj.response.InputStreamResponseParser;import org.apache.solr.cloud.SolrCloudTestCase;import org.apache.solr.common.params.ModifiableSolrParams;import org.apache.solr.common.util.NamedList;diff --git a/solr/modules/s3-repository/src/test/org/apache/solr/s3/AbstractS3ClientTest.java b/solr/modules/s3-repository/src/test/org/apache/solr/s3/AbstractS3ClientTest.javaindex 60ccd0fcace..b8d3173409d 100644--- a/solr/modules/s3-repository/src/test/org/apache/solr/s3/AbstractS3ClientTest.java+++ b/solr/modules/s3-repository/src/test/org/apache/solr/s3/AbstractS3ClientTest.java@@ -24,7 +24,7 @@ import java.net.URISyntaxException;import java.nio.charset.StandardCharsets;import java.nio.file.Path;import org.apache.solr.SolrTestCaseJ4;-import org.apache.solr.client.solrj.cloud.SocketProxy;+import org.apache.solr.util.SocketProxy;import org.junit.After;import org.junit.Before;import org.junit.ClassRule;diff --git a/solr/solr-ref-guide/modules/deployment-guide/examples/UsingSolrJRefGuideExamplesTest.java b/solr/solr-ref-guide/modules/deployment-guide/examples/UsingSolrJRefGuideExamplesTest.javaindex d1d08f1b6bc..f212c1179a4 100644--- a/solr/solr-ref-guide/modules/deployment-guide/examples/UsingSolrJRefGuideExamplesTest.java+++ b/solr/solr-ref-guide/modules/deployment-guide/examples/UsingSolrJRefGuideExamplesTest.java@@ -27,13 +27,13 @@ import java.util.Queue;import java.util.UUID;import java.util.concurrent.TimeUnit;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;-import org.apache.solr.client.solrj.SolrQuery.ORDER;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.beans.Field;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.jetty.HttpJettySolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;+import org.apache.solr.client.solrj.request.SolrQuery;+import org.apache.solr.client.solrj.request.SolrQuery.ORDER;import org.apache.solr.client.solrj.response.CollectionAdminResponse;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.client.solrj.response.UpdateResponse;diff --git a/solr/solr-ref-guide/modules/indexing-guide/examples/IndexingNestedDocuments.java b/solr/solr-ref-guide/modules/indexing-guide/examples/IndexingNestedDocuments.javaindex e6576f655b9..21bc9bb3f9e 100644--- a/solr/solr-ref-guide/modules/indexing-guide/examples/IndexingNestedDocuments.java+++ b/solr/solr-ref-guide/modules/indexing-guide/examples/IndexingNestedDocuments.java@@ -21,8 +21,8 @@ import java.util.ArrayList;import java.util.Arrays;import java.util.List;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.request.CollectionAdminRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.cloud.SolrCloudTestCase;import org.apache.solr.common.SolrDocument;import org.apache.solr.common.SolrDocumentList;diff --git a/solr/solr-ref-guide/modules/query-guide/examples/JsonRequestApiTest.java b/solr/solr-ref-guide/modules/query-guide/examples/JsonRequestApiTest.javaindex 2d488589a12..14aac24c4e7 100644--- a/solr/solr-ref-guide/modules/query-guide/examples/JsonRequestApiTest.java+++ b/solr/solr-ref-guide/modules/query-guide/examples/JsonRequestApiTest.java@@ -24,10 +24,10 @@ import java.util.HashMap;import java.util.List;import java.util.Map;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.request.AbstractUpdateRequest;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.ContentStreamUpdateRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.request.json.DomainMap;import org.apache.solr.client.solrj.request.json.JsonQueryRequest;import org.apache.solr.client.solrj.request.json.QueryFacetMap;diff --git a/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-10.adoc b/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-10.adocindex 8647a3d6400..b4fec165972 100644--- a/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-10.adoc+++ b/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-10.adoc@@ -92,6 +92,9 @@ This makes it clear that they pertain specifically to “JavaBin” rather than* The deprecated SolrClient implementations based on Apache HttpClient are removed from Solrj, thus the related dependencies are no longer present.The system property `solr.httpclient.builder.factory` now only configures SolrClients using a Jetty based HttpClient.+* A number of classes moved to different packages to be better organized:+ShardTerms, DelegatingClusterStateProvider, JavaBinRequestWriter, RoutedAliasTypes, SolrQuery, XMLRequestWriter, JacksonContentWriter, FastStreamingDocsCallback, InputStreamResponse, InputStreamResponseParser, JavaBinResponseParser, ResponseParser, StreamingJavaBinResponseParser, StreamingResponseCallback, XMLResponseParser, JacksonDataBindResponseParser, JsonMapResponseParser, SocketProxy+=== SolrCloud OverseerSolrCloud now supports disabling the "Overseer", which is an elected node responsible for processing all cluster administration requests and collection state updates.diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/sql/DatabaseMetaDataImpl.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/sql/DatabaseMetaDataImpl.javaindex 74f3fee7d4b..643b51b57b1 100644--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/sql/DatabaseMetaDataImpl.java+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/sql/DatabaseMetaDataImpl.java@@ -25,10 +25,10 @@ import java.sql.SQLException;import java.sql.Statement;import java.util.Set;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.jetty.HttpJettySolrClient;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.common.cloud.ClusterState;import org.apache.solr.common.util.SimpleOrderedMap;diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/JSONTupleStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/JSONTupleStream.javaindex f03ca147e75..e81f4e3709f 100644--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/JSONTupleStream.java+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/JSONTupleStream.java@@ -26,8 +26,8 @@ import java.util.Map;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrServerException;-import org.apache.solr.client.solrj.impl.InputStreamResponseParser;import org.apache.solr.client.solrj.request.QueryRequest;+import org.apache.solr.client.solrj.response.InputStreamResponseParser;import org.apache.solr.common.params.ModifiableSolrParams;import org.apache.solr.common.params.SolrParams;import org.apache.solr.common.util.NamedList;diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/SolrStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/SolrStream.javaindex 3ffc7d1daf6..1102f4518fb 100644--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/SolrStream.java+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/SolrStream.java@@ -26,7 +26,6 @@ import java.util.List;import java.util.Map;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrServerException;-import org.apache.solr.client.solrj.impl.InputStreamResponseParser;import org.apache.solr.client.solrj.io.SolrClientCache;import org.apache.solr.client.solrj.io.Tuple;import org.apache.solr.client.solrj.io.comp.StreamComparator;@@ -35,6 +34,7 @@ import org.apache.solr.client.solrj.io.stream.expr.Explanation.ExpressionType;import org.apache.solr.client.solrj.io.stream.expr.StreamExplanation;import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;import org.apache.solr.client.solrj.request.QueryRequest;+import org.apache.solr.client.solrj.response.InputStreamResponseParser;import org.apache.solr.common.params.CommonParams;import org.apache.solr.common.params.ModifiableSolrParams;import org.apache.solr.common.params.SolrParams;diff --git a/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/graph/GraphExpressionTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/graph/GraphExpressionTest.javaindex 15b5d31e669..9b190864c86 100644--- a/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/graph/GraphExpressionTest.java+++ b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/graph/GraphExpressionTest.java@@ -30,7 +30,6 @@ import java.util.Set;import org.apache.lucene.tests.util.LuceneTestCase;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrRequest;-import org.apache.solr.client.solrj.impl.InputStreamResponseParser;import org.apache.solr.client.solrj.io.SolrClientCache;import org.apache.solr.client.solrj.io.Tuple;import org.apache.solr.client.solrj.io.comp.ComparatorOrder;@@ -52,6 +51,7 @@ import org.apache.solr.client.solrj.io.stream.metrics.SumMetric;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.QueryRequest;import org.apache.solr.client.solrj.request.UpdateRequest;+import org.apache.solr.client.solrj.response.InputStreamResponseParser;import org.apache.solr.cloud.AbstractFullDistribZkTestBase;import org.apache.solr.cloud.SolrCloudTestCase;import org.apache.solr.common.params.ModifiableSolrParams;diff --git a/solr/solrj-zookeeper/src/java/org/apache/solr/client/solrj/impl/NodeValueFetcher.java b/solr/solrj-zookeeper/src/java/org/apache/solr/client/solrj/impl/NodeValueFetcher.javaindex 7972f8ab3e2..868cbfd2926 100644--- a/solr/solrj-zookeeper/src/java/org/apache/solr/client/solrj/impl/NodeValueFetcher.java+++ b/solr/solrj-zookeeper/src/java/org/apache/solr/client/solrj/impl/NodeValueFetcher.java@@ -17,7 +17,7 @@package org.apache.solr.client.solrj.impl;-import static org.apache.solr.client.solrj.impl.InputStreamResponseParser.STREAM_KEY;+import static org.apache.solr.client.solrj.response.InputStreamResponseParser.STREAM_KEY;import java.io.BufferedReader;import java.io.InputStream;@@ -33,6 +33,7 @@ import java.util.stream.Stream;import org.apache.solr.client.solrj.SolrRequest.METHOD;import org.apache.solr.client.solrj.SolrRequest.SolrRequestType;import org.apache.solr.client.solrj.request.GenericSolrRequest;+import org.apache.solr.client.solrj.response.InputStreamResponseParser;import org.apache.solr.client.solrj.response.SimpleSolrResponse;import org.apache.solr.common.SolrException;import org.apache.solr.common.params.ModifiableSolrParams;diff --git a/solr/solrj-zookeeper/src/java/org/apache/solr/client/solrj/impl/SolrClientNodeStateProvider.java b/solr/solrj-zookeeper/src/java/org/apache/solr/client/solrj/impl/SolrClientNodeStateProvider.javaindex bebb9456917..cc8365067ae 100644--- a/solr/solrj-zookeeper/src/java/org/apache/solr/client/solrj/impl/SolrClientNodeStateProvider.java+++ b/solr/solrj-zookeeper/src/java/org/apache/solr/client/solrj/impl/SolrClientNodeStateProvider.java@@ -17,7 +17,7 @@package org.apache.solr.client.solrj.impl;-import static org.apache.solr.client.solrj.impl.InputStreamResponseParser.STREAM_KEY;+import static org.apache.solr.client.solrj.response.InputStreamResponseParser.STREAM_KEY;import java.io.IOException;import java.io.InputStream;@@ -34,6 +34,8 @@ import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.cloud.NodeStateProvider;import org.apache.solr.client.solrj.request.GenericSolrRequest;+import org.apache.solr.client.solrj.response.InputStreamResponseParser;+import org.apache.solr.client.solrj.response.JavaBinResponseParser;import org.apache.solr.client.solrj.response.SimpleSolrResponse;import org.apache.solr.common.MapWriter;import org.apache.solr.common.SolrException;diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/SolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/SolrClient.javaindex 86220557c64..76f9888a712 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/SolrClient.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/SolrClient.java@@ -26,12 +26,15 @@ import java.util.Iterator;import java.util.List;import org.apache.solr.client.solrj.SolrRequest.METHOD;import org.apache.solr.client.solrj.beans.DocumentObjectBinder;-import org.apache.solr.client.solrj.impl.StreamingJavaBinResponseParser;import org.apache.solr.client.solrj.request.QueryRequest;import org.apache.solr.client.solrj.request.SolrPing;import org.apache.solr.client.solrj.request.UpdateRequest;+import org.apache.solr.client.solrj.response.FastStreamingDocsCallback;import org.apache.solr.client.solrj.response.QueryResponse;+import org.apache.solr.client.solrj.response.ResponseParser;import org.apache.solr.client.solrj.response.SolrPingResponse;+import org.apache.solr.client.solrj.response.StreamingJavaBinResponseParser;+import org.apache.solr.client.solrj.response.StreamingResponseCallback;import org.apache.solr.client.solrj.response.UpdateResponse;import org.apache.solr.common.SolrDocument;import org.apache.solr.common.SolrDocumentList;@@ -1226,4 +1229,10 @@ public abstract class SolrClient implements Serializable, Closeable {super(code, "Error from server at " + remoteHost + ": " + msg, th);}}++ /** A lambda intended for invoking SolrClient operations */+ @FunctionalInterface+ public interface SolrClientFunction<C extends SolrClient, R> {+ R apply(C c) throws IOException, SolrServerException;+ }}diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/SolrClientFunction.java b/solr/solrj/src/java/org/apache/solr/client/solrj/SolrClientFunction.javadeleted file mode 100644index 0adb49471dc..00000000000--- a/solr/solrj/src/java/org/apache/solr/client/solrj/SolrClientFunction.java+++ /dev/null@@ -1,25 +0,0 @@-/*- * 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.client.solrj;--import java.io.IOException;--/** A lambda intended for invoking SolrClient operations */-@FunctionalInterface-public interface SolrClientFunction<C extends SolrClient, R> {- R apply(C c) throws IOException, SolrServerException;-}diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/SolrRequest.java b/solr/solrj/src/java/org/apache/solr/client/solrj/SolrRequest.javaindex 22cd231552e..af83beb70fd 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/SolrRequest.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/SolrRequest.java@@ -29,6 +29,8 @@ import java.util.concurrent.TimeUnit;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.impl.HttpSolrClientBase;import org.apache.solr.client.solrj.request.RequestWriter;+import org.apache.solr.client.solrj.response.ResponseParser;+import org.apache.solr.client.solrj.response.StreamingResponseCallback;import org.apache.solr.common.params.SolrParams;import org.apache.solr.common.util.ContentStream;import org.apache.solr.common.util.NamedList;@@ -163,7 +165,7 @@ public abstract class SolrRequest<T> implements Serializable {}/**- * @return The {@link org.apache.solr.client.solrj.ResponseParser}+ * @return The {@link ResponseParser}*/public ResponseParser getResponseParser() {return responseParser;@@ -173,7 +175,7 @@ public abstract class SolrRequest<T> implements Serializable {* Optionally specify how the Response should be parsed. Not all server implementations require a* ResponseParser to be specified.*- * @param responseParser The {@link org.apache.solr.client.solrj.ResponseParser}+ * @param responseParser The {@link ResponseParser}*/public void setResponseParser(ResponseParser responseParser) {this.responseParser = responseParser;diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/package-info.java b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/package-info.javadeleted file mode 100644index 4f4add22625..00000000000--- a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/package-info.java+++ /dev/null@@ -1,19 +0,0 @@-/*- * 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.- */--/** Common classes for SolrCloud. */-package org.apache.solr.client.solrj.cloud;diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.javaindex bd504d2535d..6eabbf6ddb0 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java@@ -48,7 +48,6 @@ import java.util.concurrent.locks.Lock;import java.util.concurrent.locks.ReentrantLock;import java.util.function.Supplier;import java.util.stream.Collectors;-import org.apache.solr.client.solrj.ResponseParser;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrRequest.SolrRequestType;@@ -56,6 +55,7 @@ import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.request.RequestWriter;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.client.solrj.request.V2Request;+import org.apache.solr.client.solrj.response.ResponseParser;import org.apache.solr.client.solrj.routing.ReplicaListTransformer;import org.apache.solr.client.solrj.routing.RequestReplicaListTransformerGenerator;import org.apache.solr.client.solrj.util.ClientUtils;diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/DelegatingClusterStateProvider.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/DelegatingClusterStateProvider.javasimilarity index 97%rename from solr/solrj/src/java/org/apache/solr/client/solrj/cloud/DelegatingClusterStateProvider.javarename to solr/solrj/src/java/org/apache/solr/client/solrj/impl/DelegatingClusterStateProvider.javaindex 4177f0a017a..ae089aeef89 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/DelegatingClusterStateProvider.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/DelegatingClusterStateProvider.java@@ -14,14 +14,13 @@* See the License for the specific language governing permissions and* limitations under the License.*/-package org.apache.solr.client.solrj.cloud;+package org.apache.solr.client.solrj.impl;import java.io.IOException;import java.util.Collections;import java.util.List;import java.util.Map;import java.util.Set;-import org.apache.solr.client.solrj.impl.ClusterStateProvider;import org.apache.solr.common.cloud.ClusterState;import org.apache.solr.common.cloud.DocCollection;diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpJdkSolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpJdkSolrClient.javaindex d405dc989f2..2fa11c81b7e 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpJdkSolrClient.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpJdkSolrClient.java@@ -49,11 +49,11 @@ import java.util.regex.Pattern;import java.util.stream.Collectors;import javax.net.ssl.SSLContext;import org.apache.solr.client.api.util.SolrVersion;-import org.apache.solr.client.solrj.ResponseParser;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.request.QueryRequest;import org.apache.solr.client.solrj.request.RequestWriter;+import org.apache.solr.client.solrj.response.ResponseParser;import org.apache.solr.client.solrj.util.ClientUtils;import org.apache.solr.common.SolrException;import org.apache.solr.common.params.ModifiableSolrParams;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.javaindex 27df0a6ebd9..e6130255a1f 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@@ -35,11 +35,14 @@ import java.util.Set;import java.util.concurrent.CompletableFuture;import java.util.function.BiConsumer;import java.util.function.Function;-import org.apache.solr.client.solrj.ResponseParser;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrServerException;+import org.apache.solr.client.solrj.request.JavaBinRequestWriter;import org.apache.solr.client.solrj.request.RequestWriter;+import org.apache.solr.client.solrj.response.InputStreamResponseParser;+import org.apache.solr.client.solrj.response.JavaBinResponseParser;+import org.apache.solr.client.solrj.response.ResponseParser;import org.apache.solr.client.solrj.util.ClientUtils;import org.apache.solr.common.SolrException;import org.apache.solr.common.params.CommonParams;diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClientBuilderBase.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClientBuilderBase.javaindex e7ac05a2faa..50ab6f883d9 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClientBuilderBase.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClientBuilderBase.java@@ -20,8 +20,8 @@ package org.apache.solr.client.solrj.impl;import java.util.Set;import java.util.concurrent.ExecutorService;import java.util.concurrent.TimeUnit;-import org.apache.solr.client.solrj.ResponseParser;import org.apache.solr.client.solrj.request.RequestWriter;+import org.apache.solr.client.solrj.response.ResponseParser;public abstract class HttpSolrClientBuilderBase<B extends HttpSolrClientBuilderBase<?, ?>, C extends HttpSolrClientBase> {diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBSolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBSolrClient.javaindex 2bfa5ad5f00..48198b1400c 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBSolrClient.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBSolrClient.java@@ -40,15 +40,15 @@ import java.util.concurrent.ScheduledExecutorService;import java.util.concurrent.TimeUnit;import java.util.concurrent.atomic.AtomicInteger;import java.util.stream.Collectors;-import org.apache.solr.client.solrj.ResponseParser;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrRequest.SolrRequestType;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.request.QueryRequest;import org.apache.solr.client.solrj.request.RequestWriter;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.response.QueryResponse;+import org.apache.solr.client.solrj.response.ResponseParser;import org.apache.solr.client.solrj.util.ClientUtils;import org.apache.solr.common.SolrException;import org.apache.solr.common.params.CommonParams;diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/package-info.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/package-info.javaindex 712cc4cedb1..c29f0740449 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/package-info.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/package-info.java@@ -15,5 +15,5 @@* limitations under the License.*/-/** Concrete implementations of client API classes. */+/** Implementations of some client API classes, and their friends. */package org.apache.solr.client.solrj.impl;diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/jetty/HttpJettySolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/jetty/HttpJettySolrClient.javaindex b485d2ccf48..9369f476dec 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/jetty/HttpJettySolrClient.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/jetty/HttpJettySolrClient.java@@ -38,9 +38,7 @@ import java.util.concurrent.TimeUnit;import java.util.concurrent.TimeoutException;import java.util.stream.Collectors;import org.apache.solr.client.api.util.SolrVersion;-import org.apache.solr.client.solrj.ResponseParser;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrClientFunction;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.impl.HttpClientBuilderFactory;@@ -50,6 +48,7 @@ import org.apache.solr.client.solrj.impl.LBSolrClient;import org.apache.solr.client.solrj.impl.SolrHttpConstants;import org.apache.solr.client.solrj.jetty.HttpListenerFactory.RequestResponseListener;import org.apache.solr.client.solrj.request.RequestWriter;+import org.apache.solr.client.solrj.response.ResponseParser;import org.apache.solr.client.solrj.util.ClientUtils;import org.apache.solr.common.params.ModifiableSolrParams;import org.apache.solr.common.util.ContentStream;diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.java b/solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.javaindex 635a6a38a25..b67b665a551 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.java@@ -36,7 +36,6 @@ import java.util.Set;import java.util.TimeZone;import java.util.UUID;import java.util.concurrent.TimeUnit;-import org.apache.solr.client.solrj.RoutedAliasTypes;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrServerException;diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/request/DelegationTokenRequest.java b/solr/solrj/src/java/org/apache/solr/client/solrj/request/DelegationTokenRequest.javaindex 3d4693ae6c0..985ee7e2476 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/request/DelegationTokenRequest.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/request/DelegationTokenRequest.java@@ -20,9 +20,9 @@ package org.apache.solr.client.solrj.request;import java.util.Arrays;import java.util.TreeSet;import org.apache.solr.client.solrj.SolrRequest;-import org.apache.solr.client.solrj.impl.InputStreamResponseParser;-import org.apache.solr.client.solrj.impl.JsonMapResponseParser;import org.apache.solr.client.solrj.response.DelegationTokenResponse;+import org.apache.solr.client.solrj.response.InputStreamResponseParser;+import org.apache.solr.client.solrj.response.json.JsonMapResponseParser;import org.apache.solr.common.params.ModifiableSolrParams;import org.apache.solr.common.params.SolrParams;import org.apache.solr.common.util.NamedList;diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/JavaBinRequestWriter.java b/solr/solrj/src/java/org/apache/solr/client/solrj/request/JavaBinRequestWriter.javasimilarity index 91%rename from solr/solrj/src/java/org/apache/solr/client/solrj/impl/JavaBinRequestWriter.javarename to solr/solrj/src/java/org/apache/solr/client/solrj/request/JavaBinRequestWriter.javaindex 29b036dfced..0d3ada79b3d 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/JavaBinRequestWriter.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/request/JavaBinRequestWriter.java@@ -14,7 +14,7 @@* See the License for the specific language governing permissions and* limitations under the License.*/-package org.apache.solr.client.solrj.impl;+package org.apache.solr.client.solrj.request;import static org.apache.solr.common.params.CommonParams.JAVABIN_MIME;@@ -22,9 +22,6 @@ import java.io.IOException;import java.io.OutputStream;import java.util.Collection;import org.apache.solr.client.solrj.SolrRequest;-import org.apache.solr.client.solrj.request.JavaBinUpdateRequestCodec;-import org.apache.solr.client.solrj.request.RequestWriter;-import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.common.util.ContentStream;/**diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/RoutedAliasTypes.java b/solr/solrj/src/java/org/apache/solr/client/solrj/request/RoutedAliasTypes.javasimilarity index 96%rename from solr/solrj/src/java/org/apache/solr/client/solrj/RoutedAliasTypes.javarename to solr/solrj/src/java/org/apache/solr/client/solrj/request/RoutedAliasTypes.javaindex 547d0ca2603..35aca931ef4 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/RoutedAliasTypes.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/request/RoutedAliasTypes.java@@ -15,7 +15,7 @@* limitations under the License.*/-package org.apache.solr.client.solrj;+package org.apache.solr.client.solrj.request;/*** Types of Routed Alias supported.diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/SolrQuery.java b/solr/solrj/src/java/org/apache/solr/client/solrj/request/SolrQuery.javasimilarity index 99%rename from solr/solrj/src/java/org/apache/solr/client/solrj/SolrQuery.javarename to solr/solrj/src/java/org/apache/solr/client/solrj/request/SolrQuery.javaindex 797f220134e..ea8b2bb37e1 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/SolrQuery.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/request/SolrQuery.java@@ -14,7 +14,7 @@* See the License for the specific language governing permissions and* limitations under the License.*/-package org.apache.solr.client.solrj;+package org.apache.solr.client.solrj.request;import java.util.ArrayList;import java.util.Collections;@@ -22,6 +22,7 @@ import java.util.Date;import java.util.List;import java.util.Locale;import java.util.regex.Pattern;+import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.common.params.CommonParams;import org.apache.solr.common.params.FacetParams;import org.apache.solr.common.params.HighlightParams;diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/request/V2Request.java b/solr/solrj/src/java/org/apache/solr/client/solrj/request/V2Request.javaindex 13a804b6592..470d9ee057f 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/request/V2Request.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/request/V2Request.java@@ -27,8 +27,8 @@ import java.nio.ByteBuffer;import java.util.concurrent.atomic.AtomicLong;import java.util.regex.Matcher;import java.util.regex.Pattern;-import org.apache.solr.client.solrj.ResponseParser;import org.apache.solr.client.solrj.SolrRequest;+import org.apache.solr.client.solrj.response.ResponseParser;import org.apache.solr.client.solrj.response.V2Response;import org.apache.solr.common.MapWriter;import org.apache.solr.common.params.SolrParams;diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/XMLRequestWriter.java b/solr/solrj/src/java/org/apache/solr/client/solrj/request/XMLRequestWriter.javasimilarity index 97%rename from solr/solrj/src/java/org/apache/solr/client/solrj/impl/XMLRequestWriter.javarename to solr/solrj/src/java/org/apache/solr/client/solrj/request/XMLRequestWriter.javaindex 88429f34100..3620fb988ee 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/XMLRequestWriter.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/request/XMLRequestWriter.java@@ -14,7 +14,7 @@* See the License for the specific language governing permissions and* limitations under the License.*/-package org.apache.solr.client.solrj.impl;+package org.apache.solr.client.solrj.request;import java.io.BufferedWriter;import java.io.IOException;@@ -31,8 +31,6 @@ import java.util.Map;import java.util.Objects;import java.util.Set;import org.apache.solr.client.solrj.SolrRequest;-import org.apache.solr.client.solrj.request.RequestWriter;-import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.client.solrj.util.ClientUtils;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.common.params.ShardParams;diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/JacksonContentWriter.java b/solr/solrj/src/java/org/apache/solr/client/solrj/request/json/JacksonContentWriter.javasimilarity index 96%rename from solr/solrj/src/java/org/apache/solr/client/solrj/JacksonContentWriter.javarename to solr/solrj/src/java/org/apache/solr/client/solrj/request/json/JacksonContentWriter.javaindex 6ae00fb67e5..181cb487fa0 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/JacksonContentWriter.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/request/json/JacksonContentWriter.java@@ -15,7 +15,7 @@* limitations under the License.*/-package org.apache.solr.client.solrj;+package org.apache.solr.client.solrj.request.json;import com.fasterxml.jackson.databind.ObjectMapper;import java.io.IOException;diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/response/CoreAdminResponse.java b/solr/solrj/src/java/org/apache/solr/client/solrj/response/CoreAdminResponse.javaindex d7c4899a898..a14da4b331c 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/response/CoreAdminResponse.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/response/CoreAdminResponse.java@@ -20,7 +20,7 @@ import com.fasterxml.jackson.core.type.TypeReference;import java.util.Date;import java.util.Map;import org.apache.solr.client.api.model.CoreStatusResponse;-import org.apache.solr.client.solrj.JacksonContentWriter;+import org.apache.solr.client.solrj.request.json.JacksonContentWriter;/*** @since solr 1.3diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/FastStreamingDocsCallback.java b/solr/solrj/src/java/org/apache/solr/client/solrj/response/FastStreamingDocsCallback.javasimilarity index 97%rename from solr/solrj/src/java/org/apache/solr/client/solrj/FastStreamingDocsCallback.javarename to solr/solrj/src/java/org/apache/solr/client/solrj/response/FastStreamingDocsCallback.javaindex cb5a7967747..ae5256993e5 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/FastStreamingDocsCallback.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/response/FastStreamingDocsCallback.java@@ -15,7 +15,7 @@* limitations under the License.*/-package org.apache.solr.client.solrj;+package org.apache.solr.client.solrj.response;import org.apache.solr.common.util.DataEntry;diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/InputStreamResponse.java b/solr/solrj/src/java/org/apache/solr/client/solrj/response/InputStreamResponse.javasimilarity index 93%rename from solr/solrj/src/java/org/apache/solr/client/solrj/InputStreamResponse.javarename to solr/solrj/src/java/org/apache/solr/client/solrj/response/InputStreamResponse.javaindex 6770ce81c53..003a6ba162d 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/InputStreamResponse.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/response/InputStreamResponse.java@@ -14,10 +14,10 @@* See the License for the specific language governing permissions and* limitations under the License.*/-package org.apache.solr.client.solrj;+package org.apache.solr.client.solrj.response;-import static org.apache.solr.client.solrj.impl.InputStreamResponseParser.HTTP_STATUS_KEY;-import static org.apache.solr.client.solrj.impl.InputStreamResponseParser.STREAM_KEY;+import static org.apache.solr.client.solrj.response.InputStreamResponseParser.HTTP_STATUS_KEY;+import static org.apache.solr.client.solrj.response.InputStreamResponseParser.STREAM_KEY;import java.io.ByteArrayOutputStream;import java.io.IOException;@@ -25,8 +25,6 @@ import java.io.InputStream;import java.lang.invoke.MethodHandles;import java.nio.charset.Charset;import java.util.function.Function;-import org.apache.solr.client.solrj.impl.InputStreamResponseParser;-import org.apache.solr.client.solrj.response.SimpleSolrResponse;import org.apache.solr.common.SolrException;import org.apache.solr.common.util.IOUtils;import org.apache.solr.common.util.NamedList;diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/InputStreamResponseParser.java b/solr/solrj/src/java/org/apache/solr/client/solrj/response/InputStreamResponseParser.javasimilarity index 94%rename from solr/solrj/src/java/org/apache/solr/client/solrj/impl/InputStreamResponseParser.javarename to solr/solrj/src/java/org/apache/solr/client/solrj/response/InputStreamResponseParser.javaindex ecf121e49b0..77466ef1c26 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/InputStreamResponseParser.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/response/InputStreamResponseParser.java@@ -14,21 +14,20 @@* See the License for the specific language governing permissions and* limitations under the License.*/-package org.apache.solr.client.solrj.impl;+package org.apache.solr.client.solrj.response;import java.io.ByteArrayOutputStream;import java.io.IOException;import java.io.InputStream;import java.nio.charset.StandardCharsets;import java.util.Set;-import org.apache.solr.client.solrj.ResponseParser;import org.apache.solr.common.util.NamedList;import org.apache.solr.common.util.SimpleOrderedMap;/*** Simply puts the InputStream into an entry in a NamedList named "stream".*- * @see org.apache.solr.client.solrj.InputStreamResponse+ * @see InputStreamResponse*/public class InputStreamResponseParser extends ResponseParser {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/response/JavaBinResponseParser.javasimilarity index 95%rename from solr/solrj/src/java/org/apache/solr/client/solrj/impl/JavaBinResponseParser.javarename to solr/solrj/src/java/org/apache/solr/client/solrj/response/JavaBinResponseParser.javaindex 8962077a55b..0fd83fa1554 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/JavaBinResponseParser.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/response/JavaBinResponseParser.java@@ -14,13 +14,12 @@* See the License for the specific language governing permissions and* limitations under the License.*/-package org.apache.solr.client.solrj.impl;+package org.apache.solr.client.solrj.response;import java.io.IOException;import java.io.InputStream;import java.util.Collection;import java.util.Set;-import org.apache.solr.client.solrj.ResponseParser;import org.apache.solr.common.util.JavaBinCodec;import org.apache.solr.common.util.NamedList;diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/ResponseParser.java b/solr/solrj/src/java/org/apache/solr/client/solrj/response/ResponseParser.javasimilarity index 97%rename from solr/solrj/src/java/org/apache/solr/client/solrj/ResponseParser.javarename to solr/solrj/src/java/org/apache/solr/client/solrj/response/ResponseParser.javaindex dbca336e2e3..9d2fbc7a67e 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/ResponseParser.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/response/ResponseParser.java@@ -14,7 +14,7 @@* See the License for the specific language governing permissions and* limitations under the License.*/-package org.apache.solr.client.solrj;+package org.apache.solr.client.solrj.response;import java.io.IOException;import java.io.InputStream;diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/StreamingJavaBinResponseParser.java b/solr/solrj/src/java/org/apache/solr/client/solrj/response/StreamingJavaBinResponseParser.javasimilarity index 97%rename from solr/solrj/src/java/org/apache/solr/client/solrj/impl/StreamingJavaBinResponseParser.javarename to solr/solrj/src/java/org/apache/solr/client/solrj/response/StreamingJavaBinResponseParser.javaindex c669e38f9c7..3f8253209cc 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/StreamingJavaBinResponseParser.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/response/StreamingJavaBinResponseParser.java@@ -14,13 +14,11 @@* See the License for the specific language governing permissions and* limitations under the License.*/-package org.apache.solr.client.solrj.impl;+package org.apache.solr.client.solrj.response;import java.io.IOException;import java.io.InputStream;import java.util.List;-import org.apache.solr.client.solrj.FastStreamingDocsCallback;-import org.apache.solr.client.solrj.StreamingResponseCallback;import org.apache.solr.common.SolrDocument;import org.apache.solr.common.SolrDocumentList;import org.apache.solr.common.util.DataEntry;diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/StreamingResponseCallback.java b/solr/solrj/src/java/org/apache/solr/client/solrj/response/StreamingResponseCallback.javasimilarity index 96%rename from solr/solrj/src/java/org/apache/solr/client/solrj/StreamingResponseCallback.javarename to solr/solrj/src/java/org/apache/solr/client/solrj/response/StreamingResponseCallback.javaindex 3853e9c6214..8ccc9c46fed 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/StreamingResponseCallback.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/response/StreamingResponseCallback.java@@ -14,7 +14,7 @@* See the License for the specific language governing permissions and* limitations under the License.*/-package org.apache.solr.client.solrj;+package org.apache.solr.client.solrj.response;import org.apache.solr.common.SolrDocument;diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/XMLResponseParser.java b/solr/solrj/src/java/org/apache/solr/client/solrj/response/XMLResponseParser.javasimilarity index 99%rename from solr/solrj/src/java/org/apache/solr/client/solrj/impl/XMLResponseParser.javarename to solr/solrj/src/java/org/apache/solr/client/solrj/response/XMLResponseParser.javaindex adf8d94d09f..8e378989668 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/XMLResponseParser.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/response/XMLResponseParser.java@@ -14,7 +14,7 @@* See the License for the specific language governing permissions and* limitations under the License.*/-package org.apache.solr.client.solrj.impl;+package org.apache.solr.client.solrj.response;import java.io.InputStream;import java.io.Reader;@@ -31,7 +31,6 @@ import javax.xml.stream.XMLInputFactory;import javax.xml.stream.XMLStreamConstants;import javax.xml.stream.XMLStreamException;import javax.xml.stream.XMLStreamReader;-import org.apache.solr.client.solrj.ResponseParser;import org.apache.solr.common.EmptyEntityResolver;import org.apache.solr.common.SolrDocument;import org.apache.solr.common.SolrDocumentList;diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/JacksonDataBindResponseParser.java b/solr/solrj/src/java/org/apache/solr/client/solrj/response/json/JacksonDataBindResponseParser.javasimilarity index 92%rename from solr/solrj/src/java/org/apache/solr/client/solrj/JacksonDataBindResponseParser.javarename to solr/solrj/src/java/org/apache/solr/client/solrj/response/json/JacksonDataBindResponseParser.javaindex 5ea1ed2e287..58f60c50773 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/JacksonDataBindResponseParser.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/response/json/JacksonDataBindResponseParser.java@@ -15,13 +15,15 @@* limitations under the License.*/-package org.apache.solr.client.solrj;+package org.apache.solr.client.solrj.response.json;import java.io.IOException;import java.io.InputStream;import java.io.InputStreamReader;import java.util.Collection;import java.util.List;+import org.apache.solr.client.solrj.request.json.JacksonContentWriter;+import org.apache.solr.client.solrj.response.ResponseParser;import org.apache.solr.common.util.NamedList;import org.apache.solr.common.util.SimpleOrderedMap;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/response/json/JsonMapResponseParser.javasimilarity index 94%rename from solr/solrj/src/java/org/apache/solr/client/solrj/impl/JsonMapResponseParser.javarename to solr/solrj/src/java/org/apache/solr/client/solrj/response/json/JsonMapResponseParser.javaindex 45438944d6d..8410612e0a8 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/JsonMapResponseParser.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/response/json/JsonMapResponseParser.java@@ -15,7 +15,7 @@* limitations under the License.*/-package org.apache.solr.client.solrj.impl;+package org.apache.solr.client.solrj.response.json;import java.io.IOException;import java.io.InputStream;@@ -23,7 +23,7 @@ import java.io.InputStreamReader;import java.util.Collection;import java.util.Map;import java.util.Set;-import org.apache.solr.client.solrj.ResponseParser;+import org.apache.solr.client.solrj.response.ResponseParser;import org.apache.solr.common.SolrException;import org.apache.solr.common.util.NamedList;import org.noggit.JSONParser;diff --git a/solr/solrj/src/resources/java-template/api.mustache b/solr/solrj/src/resources/java-template/api.mustacheindex 4b3163ffd87..81cdff1b3a8 100644--- a/solr/solrj/src/resources/java-template/api.mustache+++ b/solr/solrj/src/resources/java-template/api.mustache@@ -28,17 +28,17 @@ import java.util.List;import java.util.Map;import java.util.Set;-import org.apache.solr.client.solrj.JacksonDataBindResponseParser;+import org.apache.solr.client.solrj.response.json.JacksonDataBindResponseParser;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.response.SimpleSolrResponse;import org.apache.solr.common.params.SolrParams;import org.apache.solr.common.params.ModifiableSolrParams;-import org.apache.solr.client.solrj.JacksonContentWriter;+import org.apache.solr.client.solrj.request.json.JacksonContentWriter;import org.apache.solr.client.solrj.request.RequestWriter.ContentWriter;-import org.apache.solr.client.solrj.impl.InputStreamResponseParser;-import org.apache.solr.client.solrj.InputStreamResponse;-import org.apache.solr.client.solrj.ResponseParser;+import org.apache.solr.client.solrj.response.InputStreamResponseParser;+import org.apache.solr.client.solrj.response.InputStreamResponse;+import org.apache.solr.client.solrj.response.ResponseParser;import org.apache.solr.common.util.NamedList;{{! Covers all top-level request/response model classes, but not necessarily any types nested in those classes }}diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/LargeVolumeTestBase.java b/solr/solrj/src/test/org/apache/solr/client/solrj/LargeVolumeTestBase.javaindex 93db65f586b..72ca4031404 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/LargeVolumeTestBase.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/LargeVolumeTestBase.java@@ -22,6 +22,7 @@ import java.util.ArrayList;import java.util.List;import org.apache.solr.EmbeddedSolrServerTestBase;import org.apache.solr.client.solrj.embedded.EmbeddedSolrServer;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.client.solrj.response.UpdateResponse;import org.apache.solr.common.SolrInputDocument;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/MergeIndexesExampleTestBase.java b/solr/solrj/src/test/org/apache/solr/client/solrj/MergeIndexesExampleTestBase.javaindex 5187bf5ffec..e7ff5e40891 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/MergeIndexesExampleTestBase.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/MergeIndexesExampleTestBase.java@@ -25,6 +25,7 @@ import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.request.AbstractUpdateRequest;import org.apache.solr.client.solrj.request.CoreAdminRequest;import org.apache.solr.client.solrj.request.QueryRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.common.params.CoreAdminParams;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleBinaryHttp2Test.java b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleBinaryHttp2Test.javaindex 991bbdedf71..b01faa27437 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleBinaryHttp2Test.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleBinaryHttp2Test.java@@ -19,9 +19,9 @@ package org.apache.solr.client.solrj;import java.util.concurrent.TimeUnit;import org.apache.solr.SolrTestCaseJ4;-import org.apache.solr.client.solrj.impl.JavaBinRequestWriter;-import org.apache.solr.client.solrj.impl.JavaBinResponseParser;import org.apache.solr.client.solrj.jetty.HttpJettySolrClient;+import org.apache.solr.client.solrj.request.JavaBinRequestWriter;+import org.apache.solr.client.solrj.response.JavaBinResponseParser;import org.junit.BeforeClass;/**diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleBinaryTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleBinaryTest.javaindex 133ed764db6..affddd7776c 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleBinaryTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleBinaryTest.java@@ -18,8 +18,8 @@ package org.apache.solr.client.solrj;import org.apache.solr.SolrTestCaseJ4.SuppressSSL;import org.apache.solr.client.solrj.apache.HttpSolrClient;-import org.apache.solr.client.solrj.impl.JavaBinRequestWriter;-import org.apache.solr.client.solrj.impl.JavaBinResponseParser;+import org.apache.solr.client.solrj.request.JavaBinRequestWriter;+import org.apache.solr.client.solrj.response.JavaBinResponseParser;import org.junit.BeforeClass;/**diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleCborTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleCborTest.javaindex 898a9628f74..7b043c48e3f 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleCborTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleCborTest.java@@ -28,9 +28,10 @@ import java.util.List;import java.util.Map;import java.util.Set;import org.apache.solr.client.solrj.apache.HttpSolrClient;-import org.apache.solr.client.solrj.impl.JavaBinRequestWriter;+import org.apache.solr.client.solrj.request.JavaBinRequestWriter;import org.apache.solr.client.solrj.request.RequestWriter;import org.apache.solr.client.solrj.request.UpdateRequest;+import org.apache.solr.client.solrj.response.ResponseParser;import org.apache.solr.common.SolrDocument;import org.apache.solr.common.SolrDocumentList;import org.apache.solr.common.SolrInputDocument;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.javaindex 0756e132585..b1b659cb993 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java@@ -45,25 +45,26 @@ import org.apache.solr.client.solrj.apache.HttpSolrClient;import org.apache.solr.client.solrj.embedded.EmbeddedSolrServer;import org.apache.solr.client.solrj.embedded.SolrExampleStreamingHttp2Test;import org.apache.solr.client.solrj.embedded.SolrExampleStreamingTest.ErrorTrackingConcurrentUpdateSolrClient;-import org.apache.solr.client.solrj.impl.InputStreamResponseParser;-import org.apache.solr.client.solrj.impl.JavaBinResponseParser;-import org.apache.solr.client.solrj.impl.XMLResponseParser;import org.apache.solr.client.solrj.request.AbstractUpdateRequest;import org.apache.solr.client.solrj.request.AbstractUpdateRequest.ACTION;import org.apache.solr.client.solrj.request.ContentStreamUpdateRequest;import org.apache.solr.client.solrj.request.LukeRequest;import org.apache.solr.client.solrj.request.MultiContentWriterRequest;import org.apache.solr.client.solrj.request.QueryRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.request.StreamingUpdateRequest;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.client.solrj.response.FacetField;import org.apache.solr.client.solrj.response.FieldStatsInfo;+import org.apache.solr.client.solrj.response.InputStreamResponseParser;+import org.apache.solr.client.solrj.response.JavaBinResponseParser;import org.apache.solr.client.solrj.response.LukeResponse;import org.apache.solr.client.solrj.response.PivotField;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.client.solrj.response.RangeFacet;import org.apache.solr.client.solrj.response.RangeFacet.Count;import org.apache.solr.client.solrj.response.UpdateResponse;+import org.apache.solr.client.solrj.response.XMLResponseParser;import org.apache.solr.common.SolrDocument;import org.apache.solr.common.SolrDocumentList;import org.apache.solr.common.SolrException;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTestsBase.java b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTestsBase.javaindex 4f0fc0ed374..b8e5b2752bf 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTestsBase.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTestsBase.java@@ -23,8 +23,10 @@ import java.util.concurrent.TimeUnit;import java.util.concurrent.atomic.AtomicInteger;import org.apache.solr.SolrJettyTestBase;import org.apache.solr.client.solrj.request.AbstractUpdateRequest.ACTION;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.client.solrj.response.QueryResponse;+import org.apache.solr.client.solrj.response.StreamingResponseCallback;import org.apache.solr.client.solrj.util.ClientUtils;import org.apache.solr.common.SolrDocument;import org.apache.solr.common.SolrInputDocument;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleXMLTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleXMLTest.javaindex df45f977791..5d88eb1f331 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleXMLTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleXMLTest.java@@ -18,8 +18,8 @@ package org.apache.solr.client.solrj;import org.apache.solr.SolrTestCaseJ4.SuppressSSL;import org.apache.solr.client.solrj.apache.HttpSolrClient;-import org.apache.solr.client.solrj.impl.XMLRequestWriter;-import org.apache.solr.client.solrj.impl.XMLResponseParser;+import org.apache.solr.client.solrj.request.XMLRequestWriter;+import org.apache.solr.client.solrj.response.XMLResponseParser;import org.junit.BeforeClass;/**diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExceptionTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExceptionTest.javaindex 4c3a7d3c5dc..5189fdb8577 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExceptionTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExceptionTest.java@@ -22,6 +22,7 @@ import org.apache.solr.SolrTestCase;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.apache.HttpClientUtil;import org.apache.solr.client.solrj.apache.HttpSolrClient;+import org.apache.solr.client.solrj.request.SolrQuery;import org.junit.Test;/**diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrSchemalessExampleTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrSchemalessExampleTest.javaindex 42d2e78048a..9dbdf2b4991 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrSchemalessExampleTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrSchemalessExampleTest.java@@ -32,8 +32,8 @@ import org.apache.http.client.methods.HttpPost;import org.apache.http.entity.InputStreamEntity;import org.apache.solr.client.solrj.apache.HttpClientUtil;import org.apache.solr.client.solrj.apache.HttpSolrClient;-import org.apache.solr.client.solrj.impl.JavaBinRequestWriter;-import org.apache.solr.client.solrj.impl.JavaBinResponseParser;+import org.apache.solr.client.solrj.request.JavaBinRequestWriter;+import org.apache.solr.client.solrj.response.JavaBinResponseParser;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.common.SolrDocument;import org.apache.solr.util.ExternalPaths;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/TestBatchUpdate.java b/solr/solrj/src/test/org/apache/solr/client/solrj/TestBatchUpdate.javaindex 078d2e5c50b..a6bb47eda3e 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/TestBatchUpdate.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/TestBatchUpdate.java@@ -22,8 +22,9 @@ import org.apache.solr.SolrJettyTestBase;import org.apache.solr.SolrTestCaseJ4.SuppressSSL;import org.apache.solr.client.solrj.apache.HttpSolrClient;import org.apache.solr.client.solrj.beans.Field;-import org.apache.solr.client.solrj.impl.JavaBinRequestWriter;-import org.apache.solr.client.solrj.impl.XMLRequestWriter;+import org.apache.solr.client.solrj.request.JavaBinRequestWriter;+import org.apache.solr.client.solrj.request.SolrQuery;+import org.apache.solr.client.solrj.request.XMLRequestWriter;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.common.SolrInputDocument;import org.junit.BeforeClass;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrClient.java b/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrClient.javaindex 596840c0d3e..2ad79dc68c0 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrClient.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrClient.java@@ -32,6 +32,7 @@ import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.apache.HttpClientUtil;import org.apache.solr.client.solrj.apache.HttpSolrClient;import org.apache.solr.client.solrj.apache.LBHttpSolrClient;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.client.solrj.response.SolrResponseBase;import org.apache.solr.common.SolrInputDocument;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/TestSolrJErrorHandling.java b/solr/solrj/src/test/org/apache/solr/client/solrj/TestSolrJErrorHandling.javaindex 5c6f4ad6113..8c2d5752807 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/TestSolrJErrorHandling.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/TestSolrJErrorHandling.java@@ -38,8 +38,8 @@ import java.util.concurrent.atomic.AtomicInteger;import org.apache.solr.SolrJettyTestBase;import org.apache.solr.SolrTestCaseJ4.SuppressSSL;import org.apache.solr.client.solrj.apache.HttpSolrClient;-import org.apache.solr.client.solrj.impl.JavaBinRequestWriter;-import org.apache.solr.client.solrj.impl.XMLRequestWriter;+import org.apache.solr.client.solrj.request.JavaBinRequestWriter;+import org.apache.solr.client.solrj.request.XMLRequestWriter;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.common.SolrInputDocument;import org.junit.BeforeClass;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/beans/TestDocumentObjectBinder.java b/solr/solrj/src/test/org/apache/solr/client/solrj/beans/TestDocumentObjectBinder.javaindex 0c746012825..caf88a4c00d 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/beans/TestDocumentObjectBinder.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/beans/TestDocumentObjectBinder.java@@ -22,8 +22,8 @@ import java.util.Date;import java.util.List;import java.util.Map;import org.apache.solr.SolrTestCase;-import org.apache.solr.client.solrj.impl.XMLResponseParser;import org.apache.solr.client.solrj.response.QueryResponse;+import org.apache.solr.client.solrj.response.XMLResponseParser;import org.apache.solr.common.SolrDocument;import org.apache.solr.common.SolrDocumentList;import org.apache.solr.common.SolrInputDocument;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/LargeVolumeBinaryJettyTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/LargeVolumeBinaryJettyTest.javaindex cf5e9b915f5..41f99eb7810 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/LargeVolumeBinaryJettyTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/LargeVolumeBinaryJettyTest.java@@ -17,11 +17,12 @@package org.apache.solr.client.solrj.embedded;import org.apache.solr.client.solrj.LargeVolumeTestBase;+import org.apache.solr.client.solrj.request.JavaBinRequestWriter;import org.apache.solr.util.ExternalPaths;import org.junit.BeforeClass;/**- * @see org.apache.solr.client.solrj.impl.JavaBinRequestWriter+ * @see JavaBinRequestWriter* @see org.apache.solr.client.solrj.request.JavaBinUpdateRequestCodec*/public class LargeVolumeBinaryJettyTest extends LargeVolumeTestBase {diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleJettyTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleJettyTest.javaindex 338aea55400..145f4b6c027 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleJettyTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleJettyTest.java@@ -32,10 +32,10 @@ import org.apache.http.entity.InputStreamEntity;import org.apache.solr.SolrTestCaseJ4.SuppressSSL;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrExampleTests;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.apache.HttpClientUtil;import org.apache.solr.client.solrj.apache.HttpSolrClient;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.common.SolrDocument;import org.apache.solr.common.SolrInputDocument;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingBinaryHttp2Test.java b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingBinaryHttp2Test.javaindex 1e9ee584448..b564e131a3c 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingBinaryHttp2Test.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingBinaryHttp2Test.java@@ -21,12 +21,12 @@ import java.util.ArrayList;import java.util.List;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;-import org.apache.solr.client.solrj.StreamingResponseCallback;-import org.apache.solr.client.solrj.impl.JavaBinRequestWriter;-import org.apache.solr.client.solrj.impl.JavaBinResponseParser;import org.apache.solr.client.solrj.jetty.HttpJettySolrClient;+import org.apache.solr.client.solrj.request.JavaBinRequestWriter;+import org.apache.solr.client.solrj.request.SolrQuery;+import org.apache.solr.client.solrj.response.JavaBinResponseParser;import org.apache.solr.client.solrj.response.QueryResponse;+import org.apache.solr.client.solrj.response.StreamingResponseCallback;import org.apache.solr.common.SolrDocument;import org.apache.solr.common.SolrInputDocument;import org.junit.Test;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingBinaryTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingBinaryTest.javaindex e52fff60023..d4027739331 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingBinaryTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingBinaryTest.java@@ -20,11 +20,11 @@ import java.util.ArrayList;import java.util.List;import org.apache.solr.SolrTestCaseJ4.SuppressSSL;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;-import org.apache.solr.client.solrj.StreamingResponseCallback;-import org.apache.solr.client.solrj.impl.JavaBinRequestWriter;-import org.apache.solr.client.solrj.impl.JavaBinResponseParser;+import org.apache.solr.client.solrj.request.JavaBinRequestWriter;+import org.apache.solr.client.solrj.request.SolrQuery;+import org.apache.solr.client.solrj.response.JavaBinResponseParser;import org.apache.solr.client.solrj.response.QueryResponse;+import org.apache.solr.client.solrj.response.StreamingResponseCallback;import org.apache.solr.common.SolrDocument;import org.apache.solr.common.SolrInputDocument;import org.junit.Test;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingHttp2Test.java b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingHttp2Test.javaindex 99027d7c0ff..7e7abe54be2 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingHttp2Test.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingHttp2Test.java@@ -23,12 +23,12 @@ import java.util.EnumSet;import java.util.List;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrExampleTests;-import org.apache.solr.client.solrj.impl.XMLRequestWriter;-import org.apache.solr.client.solrj.impl.XMLResponseParser;import org.apache.solr.client.solrj.jetty.ConcurrentUpdateJettySolrClient;import org.apache.solr.client.solrj.jetty.HttpJettySolrClient;import org.apache.solr.client.solrj.request.AbstractUpdateRequest;import org.apache.solr.client.solrj.request.UpdateRequest;+import org.apache.solr.client.solrj.request.XMLRequestWriter;+import org.apache.solr.client.solrj.response.XMLResponseParser;import org.apache.solr.common.SolrInputDocument;import org.junit.BeforeClass;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingTest.javaindex 7946d9d19f6..34f4460cb0f 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingTest.java@@ -23,10 +23,10 @@ import java.util.List;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrExampleTests;import org.apache.solr.client.solrj.apache.ConcurrentUpdateSolrClient;-import org.apache.solr.client.solrj.impl.XMLRequestWriter;-import org.apache.solr.client.solrj.impl.XMLResponseParser;import org.apache.solr.client.solrj.request.AbstractUpdateRequest;import org.apache.solr.client.solrj.request.UpdateRequest;+import org.apache.solr.client.solrj.request.XMLRequestWriter;+import org.apache.solr.client.solrj.response.XMLResponseParser;import org.apache.solr.common.SolrInputDocument;import org.junit.BeforeClass;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleXMLHttp2Test.java b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleXMLHttp2Test.javaindex 113e9f1c213..ae0f2c64bc6 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleXMLHttp2Test.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleXMLHttp2Test.java@@ -20,9 +20,9 @@ package org.apache.solr.client.solrj.embedded;import java.util.concurrent.TimeUnit;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrExampleTests;-import org.apache.solr.client.solrj.impl.XMLRequestWriter;-import org.apache.solr.client.solrj.impl.XMLResponseParser;import org.apache.solr.client.solrj.jetty.HttpJettySolrClient;+import org.apache.solr.client.solrj.request.XMLRequestWriter;+import org.apache.solr.client.solrj.response.XMLResponseParser;import org.junit.BeforeClass;/**diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestSolrProperties.java b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestSolrProperties.javaindex b11458efe85..ba713f3e9bc 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestSolrProperties.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestSolrProperties.java@@ -18,10 +18,10 @@ package org.apache.solr.client.solrj.embedded;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.request.AbstractUpdateRequest.ACTION;import org.apache.solr.client.solrj.request.CoreAdminRequest;import org.apache.solr.client.solrj.request.QueryRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.client.solrj.response.CoreAdminResponse;import org.apache.solr.common.SolrInputDocument;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudHttp2SolrClientTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudHttp2SolrClientTest.javaindex d09f2ea9ba0..c6481018de1 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudHttp2SolrClientTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudHttp2SolrClientTest.java@@ -39,7 +39,6 @@ import java.util.concurrent.TimeoutException;import org.apache.http.impl.client.CloseableHttpClient;import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.apache.CloudLegacySolrClient;@@ -49,6 +48,7 @@ import org.apache.solr.client.solrj.request.AbstractUpdateRequest;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.GenericSolrRequest;import org.apache.solr.client.solrj.request.QueryRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.client.solrj.request.V2Request;import org.apache.solr.client.solrj.response.QueryResponse;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientCacheTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientCacheTest.javaindex b2041bba2b8..dca6757b809 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientCacheTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientCacheTest.java@@ -36,7 +36,6 @@ import java.util.function.Function;import org.apache.http.NoHttpResponseException;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.apache.LBHttpSolrClient;-import org.apache.solr.client.solrj.cloud.DelegatingClusterStateProvider;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.common.cloud.ClusterState;import org.apache.solr.common.cloud.DocCollection;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientRoutingTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientRoutingTest.javaindex 00774305dcc..242bfd4261e 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientRoutingTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientRoutingTest.java@@ -20,9 +20,9 @@ import java.io.IOException;import java.util.ArrayList;import java.util.List;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.request.CollectionAdminRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.cloud.SolrCloudTestCase;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.common.params.CommonParams;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.javaindex 875c5f39031..7f5ef6d63fe 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@@ -32,13 +32,17 @@ import java.util.concurrent.TimeUnit;import java.util.stream.Collectors;import org.apache.lucene.util.NamedThreadFactory;import org.apache.solr.client.api.util.SolrVersion;-import org.apache.solr.client.solrj.ResponseParser;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrServerException;+import org.apache.solr.client.solrj.request.JavaBinRequestWriter;import org.apache.solr.client.solrj.request.QueryRequest;+import org.apache.solr.client.solrj.request.SolrQuery;+import org.apache.solr.client.solrj.request.XMLRequestWriter;+import org.apache.solr.client.solrj.response.JavaBinResponseParser;+import org.apache.solr.client.solrj.response.ResponseParser;import org.apache.solr.client.solrj.response.SolrPingResponse;+import org.apache.solr.client.solrj.response.XMLResponseParser;import org.apache.solr.common.params.CommonParams;import org.apache.solr.common.params.MapSolrParams;import org.apache.solr.common.util.ExecutorUtil;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.javaindex b4432d56612..e90632b02bd 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@@ -36,15 +36,17 @@ import java.util.concurrent.CountDownLatch;import java.util.concurrent.ExecutionException;import java.util.concurrent.TimeUnit;import org.apache.solr.SolrJettyTestBase;-import org.apache.solr.client.solrj.ResponseParser;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.apache.HttpClientUtil;import org.apache.solr.client.solrj.request.QueryRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.request.UpdateRequest;+import org.apache.solr.client.solrj.response.InputStreamResponseParser;import org.apache.solr.client.solrj.response.QueryResponse;+import org.apache.solr.client.solrj.response.ResponseParser;+import org.apache.solr.client.solrj.response.XMLResponseParser;import org.apache.solr.common.SolrDocumentList;import org.apache.solr.common.SolrException;import org.apache.solr.common.SolrInputDocument;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/LB2SolrClientTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/LB2SolrClientTest.javaindex f8d388b239d..cca66045de5 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/LB2SolrClientTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/LB2SolrClientTest.java@@ -29,9 +29,9 @@ import java.util.concurrent.TimeUnit;import org.apache.lucene.util.IOUtils;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.jetty.HttpJettySolrClient;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.client.solrj.response.SolrResponseBase;import org.apache.solr.common.SolrInputDocument;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/LBAsyncSolrClientTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/LBAsyncSolrClientTest.javaindex fafe1557819..9388b9aa86c 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/LBAsyncSolrClientTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/LBAsyncSolrClientTest.java@@ -26,7 +26,6 @@ import java.util.concurrent.ExecutionException;import java.util.concurrent.TimeUnit;import java.util.concurrent.TimeoutException;import org.apache.solr.SolrTestCase;-import org.apache.solr.client.solrj.SolrClientFunction;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.jetty.HttpJettySolrClient;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/jetty/ConcurrentUpdateJettySolrClientMultiCollectionTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/jetty/ConcurrentUpdateJettySolrClientMultiCollectionTest.javaindex c8f23aaf673..23975bd8332 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/jetty/ConcurrentUpdateJettySolrClientMultiCollectionTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/jetty/ConcurrentUpdateJettySolrClientMultiCollectionTest.java@@ -19,9 +19,9 @@ package org.apache.solr.client.solrj.jetty;import java.io.IOException;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.request.CollectionAdminRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.cloud.SolrCloudTestCase;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.util.ExternalPaths;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/jetty/ConcurrentUpdateJettySolrClientTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/jetty/ConcurrentUpdateJettySolrClientTest.javaindex 3850d8f45da..e0c078f1eec 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/jetty/ConcurrentUpdateJettySolrClientTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/jetty/ConcurrentUpdateJettySolrClientTest.java@@ -37,9 +37,9 @@ import java.util.concurrent.TimeoutException;import java.util.concurrent.atomic.AtomicInteger;import org.apache.solr.SolrJettyTestBase;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.request.JavaBinUpdateRequestCodec;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.common.util.ExecutorUtil;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/jetty/HttpJettySolrClientCompatibilityTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/jetty/HttpJettySolrClientCompatibilityTest.javaindex 68f1b663a9f..6ce0f910aa9 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/jetty/HttpJettySolrClientCompatibilityTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/jetty/HttpJettySolrClientCompatibilityTest.java@@ -20,9 +20,9 @@ package org.apache.solr.client.solrj.jetty;import org.apache.solr.SolrJettyTestBase;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrServerException;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.embedded.JettyConfig;import org.apache.solr.util.LogLevel;import org.apache.solr.util.ServletFixtures.DebugServlet;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/jetty/HttpJettySolrClientProxyTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/jetty/HttpJettySolrClientProxyTest.javaindex 221e1517f33..ec887fe4f26 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/jetty/HttpJettySolrClientProxyTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/jetty/HttpJettySolrClientProxyTest.java@@ -23,13 +23,13 @@ import java.util.Properties;import java.util.Set;import java.util.stream.Collectors;import org.apache.solr.SolrTestCaseJ4;-import org.apache.solr.client.solrj.SolrQuery;-import org.apache.solr.client.solrj.cloud.SocketProxy;import org.apache.solr.client.solrj.impl.HttpJdkSolrClient;import org.apache.solr.client.solrj.impl.HttpSolrClientBase;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.embedded.JettyConfig;import org.apache.solr.util.ExternalPaths;+import org.apache.solr.util.SocketProxy;import org.apache.solr.util.SolrJettyTestRule;import org.junit.Before;import org.junit.BeforeClass;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/jetty/HttpJettySolrClientTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/jetty/HttpJettySolrClientTest.javaindex 62d1cea2d76..5606e7838c8 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/jetty/HttpJettySolrClientTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/jetty/HttpJettySolrClientTest.java@@ -30,21 +30,21 @@ import java.util.stream.Collectors;import java.util.stream.IntStream;import org.apache.lucene.tests.util.LuceneTestCase;import org.apache.solr.client.api.util.SolrVersion;-import org.apache.solr.client.solrj.ResponseParser;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.impl.HttpSolrClientBuilderBase;import org.apache.solr.client.solrj.impl.HttpSolrClientTestBase;-import org.apache.solr.client.solrj.impl.InputStreamResponseParser;-import org.apache.solr.client.solrj.impl.JavaBinRequestWriter;-import org.apache.solr.client.solrj.impl.JavaBinResponseParser;import org.apache.solr.client.solrj.impl.SolrHttpConstants;-import org.apache.solr.client.solrj.impl.XMLRequestWriter;-import org.apache.solr.client.solrj.impl.XMLResponseParser;+import org.apache.solr.client.solrj.request.JavaBinRequestWriter;import org.apache.solr.client.solrj.request.QueryRequest;import org.apache.solr.client.solrj.request.SolrPing;+import org.apache.solr.client.solrj.request.SolrQuery;+import org.apache.solr.client.solrj.request.XMLRequestWriter;+import org.apache.solr.client.solrj.response.InputStreamResponseParser;+import org.apache.solr.client.solrj.response.JavaBinResponseParser;+import org.apache.solr.client.solrj.response.ResponseParser;+import org.apache.solr.client.solrj.response.XMLResponseParser;import org.apache.solr.common.SolrException;import org.apache.solr.common.params.CommonParams;import org.apache.solr.common.params.MapSolrParams;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrQueryTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/request/SolrQueryTest.javasimilarity index 99%rename from solr/solrj/src/test/org/apache/solr/client/solrj/SolrQueryTest.javarename to solr/solrj/src/test/org/apache/solr/client/solrj/request/SolrQueryTest.javaindex 2786fd64385..3621b697d7d 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrQueryTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/request/SolrQueryTest.java@@ -14,7 +14,7 @@* See the License for the specific language governing permissions and* limitations under the License.*/-package org.apache.solr.client.solrj;+package org.apache.solr.client.solrj.request;import java.io.ByteArrayOutputStream;import java.io.IOException;@@ -26,7 +26,7 @@ import java.util.Locale;import java.util.TimeZone;import org.apache.lucene.util.SuppressForbidden;import org.apache.solr.SolrTestCase;-import org.apache.solr.client.solrj.SolrQuery.SortClause;+import org.apache.solr.client.solrj.request.SolrQuery.SortClause;import org.apache.solr.common.params.CommonParams;import org.apache.solr.common.params.FacetParams;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestCoreAdmin.java b/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestCoreAdmin.javaindex 16f96052826..ed0f2c1109e 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestCoreAdmin.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestCoreAdmin.java@@ -27,7 +27,6 @@ import java.util.Collection;import org.apache.commons.io.file.PathUtils;import org.apache.lucene.tests.util.LuceneTestCase;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.embedded.AbstractEmbeddedSolrServerTestCase;import org.apache.solr.client.solrj.request.CoreAdminRequest.Create;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/response/InputStreamResponseParserTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/response/InputStreamResponseParserTest.javaindex f3e8433b85f..a75f22a7d6c 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/response/InputStreamResponseParserTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/response/InputStreamResponseParserTest.java@@ -22,14 +22,11 @@ import java.io.InputStream;import java.nio.charset.StandardCharsets;import java.util.List;import org.apache.solr.SolrJettyTestBase;-import org.apache.solr.client.solrj.ResponseParser;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.apache.HttpSolrClient;-import org.apache.solr.client.solrj.impl.InputStreamResponseParser;-import org.apache.solr.client.solrj.impl.XMLResponseParser;import org.apache.solr.client.solrj.request.QueryRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.common.SolrDocument;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.common.util.NamedList;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/InputStreamResponseTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/response/InputStreamResponseTest.javasimilarity index 96%rename from solr/solrj/src/test/org/apache/solr/client/solrj/InputStreamResponseTest.javarename to solr/solrj/src/test/org/apache/solr/client/solrj/response/InputStreamResponseTest.javaindex 6737c310832..50372ac93b6 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/InputStreamResponseTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/response/InputStreamResponseTest.java@@ -14,7 +14,7 @@* See the License for the specific language governing permissions and* limitations under the License.*/-package org.apache.solr.client.solrj;+package org.apache.solr.client.solrj.response;import static org.hamcrest.Matchers.containsString;@@ -22,7 +22,6 @@ import java.io.ByteArrayInputStream;import java.io.IOException;import java.nio.charset.StandardCharsets;import org.apache.solr.SolrTestCase;-import org.apache.solr.client.solrj.impl.InputStreamResponseParser;import org.apache.solr.common.SolrException;import org.apache.solr.common.util.NamedList;import org.junit.Test;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/response/QueryResponseTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/response/QueryResponseTest.javaindex 3ead4328b3e..0fb8a7c1cfc 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/response/QueryResponseTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/response/QueryResponseTest.java@@ -28,7 +28,6 @@ import java.util.List;import java.util.Map;import org.apache.lucene.tests.util.TestRuleLimitSysouts.Limit;import org.apache.solr.SolrTestCase;-import org.apache.solr.client.solrj.impl.XMLResponseParser;import org.apache.solr.common.SolrDocumentList;import org.apache.solr.common.util.NamedList;import org.apache.solr.common.util.SimpleOrderedMap;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/response/TermsResponseTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/response/TermsResponseTest.javaindex da9c569ef1f..dc73163bf54 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/response/TermsResponseTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/response/TermsResponseTest.java@@ -18,8 +18,8 @@ package org.apache.solr.client.solrj.response;import java.util.List;import org.apache.solr.EmbeddedSolrServerTestBase;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.request.QueryRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.response.TermsResponse.Term;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.util.ExternalPaths;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/response/TestClusteringResponse.java b/solr/solrj/src/test/org/apache/solr/client/solrj/response/TestClusteringResponse.javaindex f89aef42c38..56081f20d8a 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/response/TestClusteringResponse.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/response/TestClusteringResponse.java@@ -24,7 +24,6 @@ import java.nio.file.Path;import java.util.Arrays;import java.util.List;import org.apache.solr.SolrJettyTestBase;-import org.apache.solr.client.solrj.impl.XMLResponseParser;import org.apache.solr.common.util.NamedList;import org.apache.solr.core.SolrResourceLoader;import org.junit.Test;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/response/TestDelegationTokenResponse.java b/solr/solrj/src/test/org/apache/solr/client/solrj/response/TestDelegationTokenResponse.javaindex cd6c717a333..66c08437448 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/response/TestDelegationTokenResponse.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/response/TestDelegationTokenResponse.java@@ -22,8 +22,6 @@ import java.nio.charset.StandardCharsets;import java.util.HashMap;import java.util.Map;import org.apache.solr.SolrTestCase;-import org.apache.solr.client.solrj.ResponseParser;-import org.apache.solr.client.solrj.impl.InputStreamResponseParser;import org.apache.solr.client.solrj.request.DelegationTokenRequest;import org.apache.solr.common.SolrException;import org.apache.solr.common.util.NamedList;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/response/TestSpellCheckResponse.java b/solr/solrj/src/test/org/apache/solr/client/solrj/response/TestSpellCheckResponse.javaindex 23fb77492d4..eace417d4b9 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/response/TestSpellCheckResponse.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/response/TestSpellCheckResponse.java@@ -19,8 +19,8 @@ package org.apache.solr.client.solrj.response;import java.util.List;import org.apache.solr.EmbeddedSolrServerTestBase;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.request.QueryRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.response.SpellCheckResponse.Collation;import org.apache.solr.client.solrj.response.SpellCheckResponse.Correction;import org.apache.solr.common.SolrInputDocument;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/response/TestSuggesterResponse.java b/solr/solrj/src/test/org/apache/solr/client/solrj/response/TestSuggesterResponse.javaindex f16ba45d6e9..cf729e329a9 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/response/TestSuggesterResponse.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/response/TestSuggesterResponse.java@@ -20,14 +20,11 @@ import java.io.IOException;import java.util.List;import java.util.Map;import org.apache.solr.SolrJettyTestBase;-import org.apache.solr.client.solrj.ResponseParser;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.apache.HttpSolrClient;-import org.apache.solr.client.solrj.impl.JavaBinResponseParser;-import org.apache.solr.client.solrj.impl.XMLResponseParser;import org.apache.solr.client.solrj.request.QueryRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.common.params.CommonParams;import org.junit.Before;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/util/ClientUtilsTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/util/ClientUtilsTest.javaindex e3fb435eca5..2b17ed41386 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/util/ClientUtilsTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/util/ClientUtilsTest.java@@ -17,11 +17,11 @@package org.apache.solr.client.solrj.util;import org.apache.solr.SolrTestCase;-import org.apache.solr.client.solrj.impl.XMLRequestWriter;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.HealthCheckRequest;import org.apache.solr.client.solrj.request.QueryRequest;import org.apache.solr.client.solrj.request.UpdateRequest;+import org.apache.solr.client.solrj.request.XMLRequestWriter;import org.junit.Test;/**diff --git a/solr/solrj/src/test/org/apache/solr/common/util/TestFastJavabinDecoder.java b/solr/solrj/src/test/org/apache/solr/common/util/TestFastJavabinDecoder.javaindex 6c572f91fcd..43146351656 100644--- a/solr/solrj/src/test/org/apache/solr/common/util/TestFastJavabinDecoder.java+++ b/solr/solrj/src/test/org/apache/solr/common/util/TestFastJavabinDecoder.java@@ -28,8 +28,8 @@ import java.util.List;import java.util.Map;import java.util.Objects;import org.apache.solr.SolrTestCaseJ4;-import org.apache.solr.client.solrj.FastStreamingDocsCallback;-import org.apache.solr.client.solrj.impl.StreamingJavaBinResponseParser;+import org.apache.solr.client.solrj.response.FastStreamingDocsCallback;+import org.apache.solr.client.solrj.response.StreamingJavaBinResponseParser;import org.apache.solr.common.SolrDocument;import org.apache.solr.common.SolrDocumentList;import org.apache.solr.common.util.FastJavaBinDecoder.Tag;diff --git a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseHS.java b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseHS.javaindex 91dc38932a6..421e3e0fa87 100644--- a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseHS.java+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseHS.java@@ -34,11 +34,11 @@ import javax.xml.xpath.XPathExpressionException;import org.apache.lucene.util.IOUtils;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrServerException;-import org.apache.solr.client.solrj.impl.InputStreamResponseParser;-import org.apache.solr.client.solrj.impl.JsonMapResponseParser;import org.apache.solr.client.solrj.request.QueryRequest;import org.apache.solr.client.solrj.request.UpdateRequest;+import org.apache.solr.client.solrj.response.InputStreamResponseParser;import org.apache.solr.client.solrj.response.UpdateResponse;+import org.apache.solr.client.solrj.response.json.JsonMapResponseParser;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.common.params.ModifiableSolrParams;import org.apache.solr.common.params.SolrParams;diff --git a/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/CloudLegacySolrClient.java b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/CloudLegacySolrClient.javaindex 1be96a11d46..d6bd7302409 100644--- a/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/CloudLegacySolrClient.java+++ b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/CloudLegacySolrClient.java@@ -27,12 +27,12 @@ import org.apache.http.client.HttpClient;import org.apache.http.conn.ConnectTimeoutException;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.impl.ClusterStateProvider;-import org.apache.solr.client.solrj.impl.JavaBinRequestWriter;-import org.apache.solr.client.solrj.impl.JavaBinResponseParser;import org.apache.solr.client.solrj.impl.LBSolrClient;import org.apache.solr.client.solrj.impl.SolrZkClientTimeout;import org.apache.solr.client.solrj.impl.SolrZkClientTimeout.SolrZkClientTimeoutAware;+import org.apache.solr.client.solrj.request.JavaBinRequestWriter;import org.apache.solr.client.solrj.request.UpdateRequest;+import org.apache.solr.client.solrj.response.JavaBinResponseParser;import org.apache.solr.common.SolrException;import org.apache.solr.common.cloud.DocCollection;import org.apache.solr.common.cloud.DocRouter;diff --git a/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/HttpSolrClient.java b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/HttpSolrClient.javaindex 58d4fa63a74..3d11423f440 100644--- a/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/HttpSolrClient.java+++ b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/HttpSolrClient.java@@ -72,17 +72,17 @@ import org.apache.http.entity.mime.content.StringBody;import org.apache.http.message.BasicHeader;import org.apache.http.message.BasicNameValuePair;import org.apache.solr.client.api.util.SolrVersion;-import org.apache.solr.client.solrj.ResponseParser;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.impl.HttpJdkSolrClient;-import org.apache.solr.client.solrj.impl.InputStreamResponseParser;-import org.apache.solr.client.solrj.impl.JavaBinRequestWriter;-import org.apache.solr.client.solrj.impl.JavaBinResponseParser;import org.apache.solr.client.solrj.impl.RemoteExecutionException;import org.apache.solr.client.solrj.jetty.HttpJettySolrClient;+import org.apache.solr.client.solrj.request.JavaBinRequestWriter;import org.apache.solr.client.solrj.request.RequestWriter;+import org.apache.solr.client.solrj.response.InputStreamResponseParser;+import org.apache.solr.client.solrj.response.JavaBinResponseParser;+import org.apache.solr.client.solrj.response.ResponseParser;import org.apache.solr.client.solrj.util.ClientUtils;import org.apache.solr.common.SolrException;import org.apache.solr.common.params.CommonParams;@@ -130,7 +130,7 @@ public class HttpSolrClient extends SolrClient {* <p>This parser represents the default Response Parser chosen to parse the response if the* parser were not specified as part of the request.*- * @see org.apache.solr.client.solrj.impl.JavaBinResponseParser+ * @see JavaBinResponseParser*/protected volatile ResponseParser parser;@@ -224,7 +224,7 @@ public class HttpSolrClient extends SolrClient {* @return The {@link org.apache.solr.common.util.NamedList} result* @throws IOException If there is a low-level I/O error.* @see #request(org.apache.solr.client.solrj.SolrRequest,- * org.apache.solr.client.solrj.ResponseParser)+ * org.apache.solr.client.solrj.response.ResponseParser)*/@Overridepublic NamedList<Object> request(final SolrRequest<?> request, String collection)diff --git a/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/LBHttpSolrClient.java b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/LBHttpSolrClient.javaindex bac755dc692..7a9670722e3 100644--- a/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/LBHttpSolrClient.java+++ b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/LBHttpSolrClient.java@@ -25,8 +25,8 @@ import java.util.concurrent.TimeUnit;import org.apache.http.client.HttpClient;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.impl.CloudSolrClient;-import org.apache.solr.client.solrj.impl.JavaBinResponseParser;import org.apache.solr.client.solrj.impl.LBSolrClient;+import org.apache.solr.client.solrj.response.JavaBinResponseParser;import org.apache.solr.common.params.ModifiableSolrParams;/**diff --git a/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/SolrClientBuilder.java b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/SolrClientBuilder.javaindex 8e3ccc37311..c12bafd88e3 100644--- a/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/SolrClientBuilder.java+++ b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/SolrClientBuilder.java@@ -21,9 +21,9 @@ import java.util.concurrent.TimeUnit;import org.apache.http.client.HttpClient;import org.apache.http.client.config.RequestConfig;import org.apache.http.client.methods.Configurable;-import org.apache.solr.client.solrj.ResponseParser;import org.apache.solr.client.solrj.apache.HttpSolrClient.Builder;import org.apache.solr.client.solrj.request.RequestWriter;+import org.apache.solr.client.solrj.response.ResponseParser;/*** @deprecated Please look into using Solr's new Http2 clientsdiff --git a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractBasicDistributedZk2TestBase.java b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractBasicDistributedZk2TestBase.javaindex 1ac793e852d..e758dbf26a7 100644--- a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractBasicDistributedZk2TestBase.java+++ b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractBasicDistributedZk2TestBase.java@@ -24,10 +24,10 @@ import java.util.concurrent.TimeUnit;import org.apache.lucene.tests.mockfile.FilterPath;import org.apache.lucene.tests.util.LuceneTestCase;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.QueryRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.common.SolrException;diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractBasicDistributedZkTestBase.java b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractBasicDistributedZkTestBase.javaindex 1dae465d515..24d0689c5a6 100644--- a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractBasicDistributedZkTestBase.java+++ b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractBasicDistributedZkTestBase.java@@ -42,17 +42,16 @@ import java.util.concurrent.atomic.AtomicReference;import org.apache.lucene.util.IOUtils;import org.apache.solr.JSONTestUtil;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.apache.HttpSolrClient;-import org.apache.solr.client.solrj.impl.InputStreamResponseParser;import org.apache.solr.client.solrj.request.AbstractUpdateRequest;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.CoreAdminRequest.Create;import org.apache.solr.client.solrj.request.CoreAdminRequest.Unload;import org.apache.solr.client.solrj.request.GenericSolrRequest;import org.apache.solr.client.solrj.request.QueryRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.request.StreamingUpdateRequest;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.client.solrj.response.CollectionAdminResponse;@@ -60,6 +59,7 @@ import org.apache.solr.client.solrj.response.FacetField;import org.apache.solr.client.solrj.response.Group;import org.apache.solr.client.solrj.response.GroupCommand;import org.apache.solr.client.solrj.response.GroupResponse;+import org.apache.solr.client.solrj.response.InputStreamResponseParser;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.client.solrj.response.UpdateResponse;import org.apache.solr.cloud.api.collections.CollectionHandlingUtils;diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractChaosMonkeyNothingIsSafeTestBase.java b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractChaosMonkeyNothingIsSafeTestBase.javaindex fba15eb5416..6d55d1f560b 100644--- a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractChaosMonkeyNothingIsSafeTestBase.java+++ b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractChaosMonkeyNothingIsSafeTestBase.java@@ -22,9 +22,9 @@ import java.util.List;import java.util.Set;import java.util.concurrent.TimeUnit;import org.apache.lucene.tests.util.LuceneTestCase;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.apache.CloudLegacySolrClient;import org.apache.solr.client.solrj.impl.CloudSolrClient;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.common.cloud.ZkStateReader;import org.junit.AfterClass;diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractChaosMonkeySafeLeaderTestBase.java b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractChaosMonkeySafeLeaderTestBase.javaindex ef371efcad4..5d94eae05e3 100644--- a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractChaosMonkeySafeLeaderTestBase.java+++ b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractChaosMonkeySafeLeaderTestBase.java@@ -22,9 +22,9 @@ import java.util.ArrayList;import java.util.List;import java.util.concurrent.TimeUnit;import org.apache.lucene.tests.util.LuceneTestCase;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.impl.CloudSolrClient;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.common.SolrInputDocument;import org.junit.AfterClass;import org.junit.BeforeClass;diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.javaindex d468dce102a..e123fa6d53f 100644--- a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java+++ b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java@@ -53,17 +53,16 @@ import org.apache.solr.cli.DefaultToolRuntime;import org.apache.solr.cli.SolrCLI;import org.apache.solr.cli.ToolRuntime;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrRequest.METHOD;import org.apache.solr.client.solrj.SolrRequest.SolrRequestType;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.apache.HttpSolrClient;-import org.apache.solr.client.solrj.cloud.SocketProxy;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.CoreAdminRequest;import org.apache.solr.client.solrj.request.GenericSolrRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.client.solrj.response.CollectionAdminResponse;import org.apache.solr.client.solrj.response.CoreAdminResponse;@@ -109,6 +108,7 @@ import org.apache.solr.update.SolrIndexWriter;import org.apache.solr.util.RTimer;import org.apache.solr.util.RefCounted;import org.apache.solr.util.RestTestHarness;+import org.apache.solr.util.SocketProxy;import org.apache.solr.util.TimeOut;import org.apache.zookeeper.CreateMode;import org.apache.zookeeper.KeeperException;diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractMoveReplicaTestBase.java b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractMoveReplicaTestBase.javaindex 2ca97dbbbe4..da9ed3da1fe 100644--- a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractMoveReplicaTestBase.java+++ b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractMoveReplicaTestBase.java@@ -27,11 +27,11 @@ import java.util.Map;import java.util.Set;import org.apache.solr.client.api.model.CoreStatusResponse;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.CoreAdminRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.response.CoreAdminResponse;import org.apache.solr.client.solrj.response.RequestStatusState;import org.apache.solr.common.SolrInputDocument;diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractRecoveryZkTestBase.java b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractRecoveryZkTestBase.javaindex 1e7aa064edd..545a9486c41 100644--- a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractRecoveryZkTestBase.java+++ b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractRecoveryZkTestBase.java@@ -21,10 +21,10 @@ import java.util.ArrayList;import java.util.List;import java.util.concurrent.TimeUnit;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.apache.CloudLegacySolrClient;import org.apache.solr.client.solrj.apache.HttpSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.common.cloud.DocCollection;import org.apache.solr.common.cloud.Replica;diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractSyncSliceTestBase.java b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractSyncSliceTestBase.javaindex b3f254bbedc..c0c41f2eb22 100644--- a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractSyncSliceTestBase.java+++ b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractSyncSliceTestBase.java@@ -27,11 +27,11 @@ import java.util.concurrent.TimeUnit;import java.util.concurrent.TimeoutException;import java.util.stream.Collectors;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.apache.HttpSolrClient;import org.apache.solr.client.solrj.request.GenericSolrRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.common.cloud.Replica;diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractUnloadDistributedZkTestBase.java b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractUnloadDistributedZkTestBase.javaindex 2ad56bdd2c6..6477af7aac6 100644--- a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractUnloadDistributedZkTestBase.java+++ b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractUnloadDistributedZkTestBase.java@@ -28,11 +28,11 @@ import java.util.concurrent.ThreadPoolExecutor;import java.util.concurrent.TimeUnit;import java.util.concurrent.TimeoutException;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.apache.HttpSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.CoreAdminRequest.Unload;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.common.cloud.Replica;import org.apache.solr.common.cloud.Slice;diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/StoppableSearchThread.java b/solr/test-framework/src/java/org/apache/solr/cloud/StoppableSearchThread.javaindex 972b56085f9..6007b2f95bc 100644--- a/solr/test-framework/src/java/org/apache/solr/cloud/StoppableSearchThread.java+++ b/solr/test-framework/src/java/org/apache/solr/cloud/StoppableSearchThread.java@@ -20,9 +20,9 @@ import java.lang.invoke.MethodHandles;import java.util.Random;import java.util.concurrent.atomic.AtomicInteger;import org.apache.lucene.tests.util.LuceneTestCase;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.impl.CloudSolrClient;+import org.apache.solr.client.solrj.request.SolrQuery;import org.slf4j.Logger;import org.slf4j.LoggerFactory;diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractCloudBackupRestoreTestCase.java b/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractCloudBackupRestoreTestCase.javaindex 8d516472ea8..79dc6bde071 100644--- a/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractCloudBackupRestoreTestCase.java+++ b/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractCloudBackupRestoreTestCase.java@@ -29,13 +29,13 @@ import java.util.Properties;import java.util.Random;import java.util.TreeMap;import org.apache.lucene.tests.util.TestUtil;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.apache.CloudLegacySolrClient;import org.apache.solr.client.solrj.apache.HttpSolrClient;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.CollectionAdminRequest.ClusterProp;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.response.RequestStatusState;import org.apache.solr.cloud.AbstractFullDistribZkTestBase;import org.apache.solr.cloud.SolrCloudTestCase;diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractCollectionsAPIDistributedZkTestBase.java b/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractCollectionsAPIDistributedZkTestBase.javaindex 98edf7f3e87..e773a941e7d 100644--- a/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractCollectionsAPIDistributedZkTestBase.java+++ b/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractCollectionsAPIDistributedZkTestBase.java@@ -37,13 +37,13 @@ import java.util.concurrent.TimeUnit;import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.client.api.model.CoreStatusResponse;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrRequest.METHOD;import org.apache.solr.client.solrj.SolrRequest.SolrRequestType;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.CoreAdminRequest;import org.apache.solr.client.solrj.request.GenericSolrRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.client.solrj.response.CollectionAdminResponse;import org.apache.solr.client.solrj.response.CoreAdminResponse;diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractIncrementalBackupTest.java b/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractIncrementalBackupTest.javaindex 7a59d490beb..e5d501b8528 100644--- a/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractIncrementalBackupTest.java+++ b/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractIncrementalBackupTest.java@@ -46,11 +46,11 @@ import org.apache.lucene.index.IndexCommit;import org.apache.lucene.store.Directory;import org.apache.lucene.store.IOContext;import org.apache.lucene.store.IndexInput;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.QueryRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.client.solrj.response.CollectionAdminResponse;import org.apache.solr.client.solrj.response.RequestStatusState;diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractInstallShardTest.java b/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractInstallShardTest.javaindex f31b20eb737..a1aa541959f 100644--- a/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractInstallShardTest.java+++ b/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractInstallShardTest.java@@ -36,9 +36,9 @@ import java.util.concurrent.Future;import java.util.concurrent.TimeUnit;import org.apache.lucene.store.Directory;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.response.RequestStatusState;import org.apache.solr.cloud.SolrCloudTestCase;import org.apache.solr.common.SolrInputDocument;diff --git a/solr/test-framework/src/java/org/apache/solr/embedded/JettySolrRunner.java b/solr/test-framework/src/java/org/apache/solr/embedded/JettySolrRunner.javaindex 2e7e0f4ae07..86a379e248e 100644--- a/solr/test-framework/src/java/org/apache/solr/embedded/JettySolrRunner.java+++ b/solr/test-framework/src/java/org/apache/solr/embedded/JettySolrRunner.java@@ -54,7 +54,6 @@ import java.util.concurrent.atomic.AtomicLong;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.apache.HttpSolrClient;-import org.apache.solr.client.solrj.cloud.SocketProxy;import org.apache.solr.client.solrj.jetty.SSLConfig;import org.apache.solr.client.solrj.request.CoresApi;import org.apache.solr.common.util.TimeSource;@@ -63,6 +62,7 @@ import org.apache.solr.core.CoreContainer;import org.apache.solr.metrics.SolrMetricManager;import org.apache.solr.servlet.CoreContainerProvider;import org.apache.solr.servlet.SolrDispatchFilter;+import org.apache.solr.util.SocketProxy;import org.apache.solr.util.TimeOut;import org.apache.solr.util.configuration.SSLConfigurationsFactory;import org.eclipse.jetty.alpn.server.ALPNServerConnectionFactory;diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/SocketProxy.java b/solr/test-framework/src/java/org/apache/solr/util/SocketProxy.javasimilarity index 99%rename from solr/solrj/src/java/org/apache/solr/client/solrj/cloud/SocketProxy.javarename to solr/test-framework/src/java/org/apache/solr/util/SocketProxy.javaindex 154ff7d1336..fed9355847f 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/SocketProxy.java+++ b/solr/test-framework/src/java/org/apache/solr/util/SocketProxy.java@@ -14,7 +14,7 @@* See the License for the specific language governing permissions and* limitations under the License.*/-package org.apache.solr.client.solrj.cloud;+package org.apache.solr.util;import java.io.IOException;import java.io.InputStream;diff --git a/solr/test-framework/src/java/org/apache/solr/util/SolrJMetricTestUtils.java b/solr/test-framework/src/java/org/apache/solr/util/SolrJMetricTestUtils.javaindex 5e8f7a9d7a8..556aee93650 100644--- a/solr/test-framework/src/java/org/apache/solr/util/SolrJMetricTestUtils.java+++ b/solr/test-framework/src/java/org/apache/solr/util/SolrJMetricTestUtils.java@@ -23,9 +23,9 @@ import java.nio.charset.StandardCharsets;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrServerException;-import org.apache.solr.client.solrj.impl.InputStreamResponseParser;import org.apache.solr.client.solrj.jetty.HttpJettySolrClient;import org.apache.solr.client.solrj.request.GenericSolrRequest;+import org.apache.solr.client.solrj.response.InputStreamResponseParser;import org.apache.solr.common.params.SolrParams;import org.apache.solr.common.util.NamedList;diff --git a/solr/test-framework/src/test/org/apache/solr/client/solrj/apache/BasicHttpSolrClientTest.java b/solr/test-framework/src/test/org/apache/solr/client/solrj/apache/BasicHttpSolrClientTest.javaindex f1f90a1a817..e5c987df4cc 100644--- a/solr/test-framework/src/test/org/apache/solr/client/solrj/apache/BasicHttpSolrClientTest.java+++ b/solr/test-framework/src/test/org/apache/solr/client/solrj/apache/BasicHttpSolrClientTest.java@@ -48,17 +48,17 @@ import org.apache.solr.SolrJettyTestBase;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.api.util.SolrVersion;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrRequest.METHOD;import org.apache.solr.client.solrj.SolrServerException;-import org.apache.solr.client.solrj.impl.JavaBinRequestWriter;-import org.apache.solr.client.solrj.impl.JavaBinResponseParser;-import org.apache.solr.client.solrj.impl.XMLRequestWriter;-import org.apache.solr.client.solrj.impl.XMLResponseParser;+import org.apache.solr.client.solrj.request.JavaBinRequestWriter;import org.apache.solr.client.solrj.request.QueryRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.request.UpdateRequest;+import org.apache.solr.client.solrj.request.XMLRequestWriter;+import org.apache.solr.client.solrj.response.JavaBinResponseParser;import org.apache.solr.client.solrj.response.QueryResponse;+import org.apache.solr.client.solrj.response.XMLResponseParser;import org.apache.solr.common.SolrException;import org.apache.solr.common.SolrException.ErrorCode;import org.apache.solr.common.SolrInputDocument;diff --git a/solr/test-framework/src/test/org/apache/solr/client/solrj/apache/CloudSolrClientTest.java b/solr/test-framework/src/test/org/apache/solr/client/solrj/apache/CloudSolrClientTest.javaindex 896b00ae6aa..8802719304c 100644--- a/solr/test-framework/src/test/org/apache/solr/client/solrj/apache/CloudSolrClientTest.java+++ b/solr/test-framework/src/test/org/apache/solr/client/solrj/apache/CloudSolrClientTest.java@@ -37,7 +37,6 @@ import java.util.concurrent.TimeoutException;import org.apache.http.impl.client.CloseableHttpClient;import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrRequest.METHOD;import org.apache.solr.client.solrj.SolrRequest.SolrRequestType;import org.apache.solr.client.solrj.SolrServerException;@@ -48,6 +47,7 @@ import org.apache.solr.client.solrj.request.AbstractUpdateRequest;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.GenericSolrRequest;import org.apache.solr.client.solrj.request.QueryRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.client.solrj.request.V2Request;import org.apache.solr.client.solrj.response.QueryResponse;diff --git a/solr/test-framework/src/test/org/apache/solr/client/solrj/apache/ConcurrentUpdateSolrClientMultiCollectionTest.java b/solr/test-framework/src/test/org/apache/solr/client/solrj/apache/ConcurrentUpdateSolrClientMultiCollectionTest.javaindex 4110949c9a5..c164e548b09 100644--- a/solr/test-framework/src/test/org/apache/solr/client/solrj/apache/ConcurrentUpdateSolrClientMultiCollectionTest.java+++ b/solr/test-framework/src/test/org/apache/solr/client/solrj/apache/ConcurrentUpdateSolrClientMultiCollectionTest.java@@ -19,9 +19,9 @@ package org.apache.solr.client.solrj.apache;import java.io.IOException;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.request.CollectionAdminRequest;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.cloud.SolrCloudTestCase;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.util.ExternalPaths;diff --git a/solr/test-framework/src/test/org/apache/solr/client/solrj/apache/ConcurrentUpdateSolrClientTest.java b/solr/test-framework/src/test/org/apache/solr/client/solrj/apache/ConcurrentUpdateSolrClientTest.javaindex 99f80e892e5..8eb35f15039 100644--- a/solr/test-framework/src/test/org/apache/solr/client/solrj/apache/ConcurrentUpdateSolrClientTest.java+++ b/solr/test-framework/src/test/org/apache/solr/client/solrj/apache/ConcurrentUpdateSolrClientTest.java@@ -33,9 +33,9 @@ import java.util.concurrent.atomic.AtomicInteger;import org.apache.http.HttpResponse;import org.apache.solr.SolrJettyTestBase;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.request.JavaBinUpdateRequestCodec;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.common.util.ExecutorUtil;diff --git a/solr/test-framework/src/test/org/apache/solr/client/solrj/apache/HttpSolrClientBuilderTest.java b/solr/test-framework/src/test/org/apache/solr/client/solrj/apache/HttpSolrClientBuilderTest.javaindex fea60566e42..a363141f669 100644--- a/solr/test-framework/src/test/org/apache/solr/client/solrj/apache/HttpSolrClientBuilderTest.java+++ b/solr/test-framework/src/test/org/apache/solr/client/solrj/apache/HttpSolrClientBuilderTest.java@@ -21,11 +21,11 @@ import java.io.IOException;import org.apache.http.client.HttpClient;import org.apache.http.impl.client.HttpClientBuilder;import org.apache.solr.SolrTestCase;-import org.apache.solr.client.solrj.ResponseParser;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.apache.HttpSolrClient.Builder;-import org.apache.solr.client.solrj.impl.InputStreamResponseParser;-import org.apache.solr.client.solrj.impl.JavaBinResponseParser;+import org.apache.solr.client.solrj.response.InputStreamResponseParser;+import org.apache.solr.client.solrj.response.JavaBinResponseParser;+import org.apache.solr.client.solrj.response.ResponseParser;import org.apache.solr.common.params.ModifiableSolrParams;import org.junit.Test;diff --git a/solr/test-framework/src/test/org/apache/solr/client/solrj/apache/HttpSolrClientConPoolTest.java b/solr/test-framework/src/test/org/apache/solr/client/solrj/apache/HttpSolrClientConPoolTest.javaindex 6022040eb3c..3104e264c91 100644--- a/solr/test-framework/src/test/org/apache/solr/client/solrj/apache/HttpSolrClientConPoolTest.java+++ b/solr/test-framework/src/test/org/apache/solr/client/solrj/apache/HttpSolrClientConPoolTest.java@@ -27,9 +27,9 @@ import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;import org.apache.http.pool.PoolStats;import org.apache.solr.SolrJettyTestBase;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.impl.LBSolrClient;+import org.apache.solr.client.solrj.request.SolrQuery;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.common.params.ModifiableSolrParams;diff --git a/solr/test-framework/src/test/org/apache/solr/client/solrj/apache/LBHttpSolrClientBuilderTest.java b/solr/test-framework/src/test/org/apache/solr/client/solrj/apache/LBHttpSolrClientBuilderTest.javaindex a0c2ec676f0..777d3921307 100644--- a/solr/test-framework/src/test/org/apache/solr/client/solrj/apache/LBHttpSolrClientBuilderTest.java+++ b/solr/test-framework/src/test/org/apache/solr/client/solrj/apache/LBHttpSolrClientBuilderTest.java@@ -21,10 +21,10 @@ import java.io.IOException;import org.apache.http.client.HttpClient;import org.apache.http.impl.client.HttpClientBuilder;import org.apache.solr.SolrTestCase;-import org.apache.solr.client.solrj.ResponseParser;import org.apache.solr.client.solrj.apache.LBHttpSolrClient.Builder;-import org.apache.solr.client.solrj.impl.InputStreamResponseParser;-import org.apache.solr.client.solrj.impl.JavaBinResponseParser;+import org.apache.solr.client.solrj.response.InputStreamResponseParser;+import org.apache.solr.client.solrj.response.JavaBinResponseParser;+import org.apache.solr.client.solrj.response.ResponseParser;import org.apache.solr.common.params.ModifiableSolrParams;import org.junit.Test;diff --git a/solr/test-framework/src/test/org/apache/solr/client/solrj/apache/LBHttpSolrClientTest.java b/solr/test-framework/src/test/org/apache/solr/client/solrj/apache/LBHttpSolrClientTest.javaindex ba97c548bb2..c5797ed877e 100644--- a/solr/test-framework/src/test/org/apache/solr/client/solrj/apache/LBHttpSolrClientTest.java+++ b/solr/test-framework/src/test/org/apache/solr/client/solrj/apache/LBHttpSolrClientTest.java@@ -19,9 +19,9 @@ package org.apache.solr.client.solrj.apache;import java.io.IOException;import org.apache.http.impl.client.CloseableHttpClient;import org.apache.solr.SolrTestCase;-import org.apache.solr.client.solrj.ResponseParser;-import org.apache.solr.client.solrj.impl.JavaBinResponseParser;import org.apache.solr.client.solrj.impl.LBSolrClient;+import org.apache.solr.client.solrj.response.JavaBinResponseParser;+import org.apache.solr.client.solrj.response.ResponseParser;import org.apache.solr.common.params.ModifiableSolrParams;import org.junit.Test;