You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ep...@apache.org on 2022/07/11 13:29:10 UTC
[solr] branch main updated: SOLR-16278: remove unused declarations (#927)
This is an automated email from the ASF dual-hosted git repository.
epugh pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/main by this push:
new 42fc88b3ff0 SOLR-16278: remove unused declarations (#927)
42fc88b3ff0 is described below
commit 42fc88b3ff0bcd655d080748dfc454eb5110616d
Author: Eric Pugh <ep...@opensourceconnections.com>
AuthorDate: Mon Jul 11 09:29:01 2022 -0400
SOLR-16278: remove unused declarations (#927)
Co-authored-by: Christine Poerschke <cp...@apache.org>
---
.../apache/solr/AnalysisAfterCoreReloadTest.java | 3 --
.../org/apache/solr/TestDistributedSearch.java | 14 ++--------
.../test/org/apache/solr/TestRandomDVFaceting.java | 1 -
.../test/org/apache/solr/TestRandomFaceting.java | 14 ++--------
.../solr/TestSimpleTrackingShardHandler.java | 3 +-
.../test/org/apache/solr/cloud/AddReplicaTest.java | 4 ---
...aosMonkeyNothingIsSafeWithPullReplicasTest.java | 2 --
.../ChaosMonkeySafeLeaderWithPullReplicasTest.java | 2 --
.../apache/solr/cloud/ClusterStateUpdateTest.java | 4 ---
.../cloud/ConcurrentCreateRoutedAliasTest.java | 8 ++----
.../test/org/apache/solr/cloud/DeleteNodeTest.java | 4 ---
.../org/apache/solr/cloud/DeleteShardTest.java | 3 --
.../apache/solr/cloud/DistribCursorPagingTest.java | 5 ----
.../solr/cloud/DistributedVersionInfoTest.java | 10 +++----
.../apache/solr/cloud/DocValuesNotIndexedTest.java | 12 ++------
.../org/apache/solr/cloud/ForceLeaderTest.java | 7 ++---
.../solr/cloud/HttpPartitionOnCommitTest.java | 2 --
.../org/apache/solr/cloud/HttpPartitionTest.java | 25 +++--------------
.../org/apache/solr/cloud/LeaderElectionTest.java | 4 ---
.../cloud/LeaderFailoverAfterPartitionTest.java | 4 +--
.../solr/cloud/LeaderVoteWaitTimeoutTest.java | 6 ++--
.../apache/solr/cloud/MockSimpleZkController.java | 4 +--
.../test/org/apache/solr/cloud/NodeRolesTest.java | 4 ---
.../OverseerCollectionConfigSetProcessorTest.java | 9 ++----
.../test/org/apache/solr/cloud/OverseerTest.java | 15 ++--------
.../solr/cloud/ParallelCommitExecutionTest.java | 2 +-
.../solr/cloud/RecoveryAfterSoftCommitTest.java | 1 -
.../apache/solr/cloud/ReindexCollectionTest.java | 14 ----------
.../org/apache/solr/cloud/ReplaceNodeTest.java | 4 ---
.../apache/solr/cloud/ReplicationFactorTest.java | 7 ++---
.../org/apache/solr/cloud/SolrXmlInZkTest.java | 6 ----
.../apache/solr/cloud/TestBaseStatsCacheCloud.java | 4 ---
.../apache/solr/cloud/TestCloudConsistency.java | 6 ++--
.../apache/solr/cloud/TestCloudDeleteByQuery.java | 9 ++----
.../org/apache/solr/cloud/TestCloudRecovery2.java | 4 ---
.../solr/cloud/TestDistribDocBasedVersion.java | 18 +-----------
.../solr/cloud/TestDownShardTolerantSearch.java | 5 ----
.../solr/cloud/TestLeaderElectionZkExpiry.java | 2 --
.../solr/cloud/TestMiniSolrCloudClusterSSL.java | 7 +----
.../solr/cloud/TestQueryingOnDownCollection.java | 4 ---
.../apache/solr/cloud/TestRandomFlRTGCloud.java | 11 ++++----
.../apache/solr/cloud/TestSSLRandomization.java | 5 ----
.../org/apache/solr/cloud/TestSegmentSorting.java | 3 --
.../solr/cloud/TestStressInPlaceUpdates.java | 1 -
.../cloud/TestTolerantUpdateProcessorCloud.java | 5 ----
.../src/test/org/apache/solr/cloud/ZkCLITest.java | 6 ----
.../org/apache/solr/cloud/ZkControllerTest.java | 2 --
.../org/apache/solr/cloud/ZkShardTermsTest.java | 5 ----
.../org/apache/solr/cloud/ZkSolrClientTest.java | 6 +---
.../BackupRestoreApiErrorConditionsTest.java | 5 ----
.../api/collections/CustomCollectionTest.java | 2 --
.../TestCollectionsAPIViaSolrCloudCluster.java | 5 ----
.../overseer/ZkCollectionPropsCachingTest.java | 4 ---
.../cluster/events/ClusterEventProducerTest.java | 2 --
.../impl/CollectionsRepairEventListenerTest.java | 1 -
.../placement/ClusterAbstractionsForTest.java | 6 ----
.../plugins/AffinityPlacementFactoryTest.java | 5 ++--
.../apache/solr/core/AlternateDirectoryTest.java | 3 +-
.../apache/solr/core/BlobRepositoryCloudTest.java | 2 --
.../org/apache/solr/core/DirectoryFactoryTest.java | 1 -
.../apache/solr/core/DummyValueSourceParser.java | 5 +---
.../solr/core/SolrCoreCheckLockOnStartupTest.java | 1 -
.../test/org/apache/solr/core/SolrCoreTest.java | 1 -
.../org/apache/solr/core/TestJmxIntegration.java | 1 -
.../apache/solr/core/TestQuerySenderNoQuery.java | 2 --
.../apache/solr/core/TestSolrConfigHandler.java | 2 --
.../solr/core/snapshots/TestSolrCoreSnapshots.java | 4 ---
.../apache/solr/handler/ReplicationTestHelper.java | 32 ----------------------
.../apache/solr/handler/RequestLoggingTest.java | 1 -
.../solr/handler/TestReplicationHandler.java | 4 ---
.../TestReplicationHandlerDiskOverFlow.java | 2 --
.../org/apache/solr/handler/TestRequestId.java | 5 ----
.../handler/TestSolrConfigHandlerConcurrent.java | 10 ++-----
.../solr/handler/TestStressThreadBackup.java | 2 --
.../apache/solr/handler/V2ApiIntegrationTest.java | 9 ------
.../solr/handler/V2UpdateAPIMappingTest.java | 7 -----
.../solr/handler/XmlUpdateRequestHandlerTest.java | 3 --
.../handler/admin/SecurityConfHandlerTest.java | 4 ---
.../solr/handler/admin/TestCollectionAPIs.java | 20 --------------
.../component/DistributedFacetExistsSmallTest.java | 3 +-
.../solr/handler/component/StatsComponentTest.java | 3 --
.../handler/component/SuggestComponentTest.java | 6 ----
.../solr/handler/component/TermsComponentTest.java | 5 +---
.../TestDistributedStatsComponentCardinality.java | 1 -
.../org/apache/solr/handler/tagger/TaggerTest.java | 8 ------
.../handler/tagger/WordLengthTaggingFilter.java | 8 ------
.../apache/solr/internal/csv/CSVParserTest.java | 31 ---------------------
.../org/apache/solr/metrics/MetricsConfigTest.java | 16 -----------
.../solr/metrics/MetricsDisabledCloudTest.java | 3 +-
.../solr/metrics/SolrCoreMetricManagerTest.java | 6 ++--
.../apache/solr/metrics/SolrMetricTestUtils.java | 5 +---
.../metrics/reporters/SolrJmxReporterTest.java | 9 ++----
.../org/apache/solr/request/TestStreamBody.java | 1 -
.../org/apache/solr/request/TestWriterPerf.java | 4 +--
.../transform/TestSubQueryTransformer.java | 29 --------------------
.../analysis/TestManagedStopFilterFactory.java | 1 -
.../org/apache/solr/schema/TestPointFields.java | 16 ++++-------
.../solr/search/CurrencyRangeFacetCloudTest.java | 4 ---
.../apache/solr/search/RankQueryTestPlugin.java | 6 ++--
.../test/org/apache/solr/search/TestDocSet.java | 9 ------
.../test/org/apache/solr/search/TestFiltering.java | 8 +++---
...estOverriddenPrefixQueryForCustomFieldType.java | 1 -
.../org/apache/solr/search/TestSearchPerf.java | 2 --
.../apache/solr/search/TestSolrFieldCacheBean.java | 5 ----
.../src/test/org/apache/solr/search/TestSort.java | 1 -
.../org/apache/solr/search/TestStressRecovery.java | 2 --
.../org/apache/solr/search/TestStressVersions.java | 6 +---
.../solr/search/facet/RangeFacetCloudTest.java | 4 ---
.../solr/search/facet/TestCloudJSONFacetSKG.java | 9 +++---
.../search/facet/TestCloudJSONFacetSKGEquiv.java | 14 ++++------
.../solr/search/facet/TestJsonFacetRefinement.java | 4 ---
.../solr/search/function/TestFunctionQuery.java | 2 --
.../apache/solr/search/function/TestOrdValues.java | 10 -------
.../solr/search/join/TestScoreJoinQPScore.java | 7 -----
.../solr/security/AuditLoggerIntegrationTest.java | 2 --
.../solr/security/BasicAuthOnSingleNodeTest.java | 4 ---
.../solr/security/BasicAuthStandaloneTest.java | 4 ---
.../solr/servlet/TestRequestRateLimiter.java | 11 +++-----
.../uninverting/TestFieldCacheVsDocValues.java | 11 ++++----
.../apache/solr/update/MaxSizeAutoCommitTest.java | 2 --
.../apache/solr/update/MockingHttp2SolrClient.java | 21 +++-----------
.../test/org/apache/solr/update/PeerSyncTest.java | 1 -
.../solr/update/PeerSyncWithBufferUpdatesTest.java | 32 ++--------------------
.../org/apache/solr/update/SoftAutoCommitTest.java | 6 ----
.../solr/update/TestInPlaceUpdatesDistrib.java | 1 -
.../test/org/apache/solr/update/TestUpdate.java | 1 -
.../AddSchemaFieldsUpdateProcessorFactoryTest.java | 3 --
...assificationUpdateProcessorIntegrationTest.java | 3 --
.../ClassificationUpdateProcessorTest.java | 1 -
.../processor/RoutedAliasUpdateProcessorTest.java | 1 -
.../SignatureUpdateProcessorFactoryTest.java | 1 -
.../processor/TemplateUpdateProcessorTest.java | 4 ---
.../UniqFieldsUpdateProcessorFactoryTest.java | 3 +-
.../solr/util/MultipleManagedSchemasTest.java | 4 ---
.../apache/solr/util/TestMaxTokenLenTokenizer.java | 2 --
135 files changed, 109 insertions(+), 715 deletions(-)
diff --git a/solr/core/src/test/org/apache/solr/AnalysisAfterCoreReloadTest.java b/solr/core/src/test/org/apache/solr/AnalysisAfterCoreReloadTest.java
index 6f22fd68725..6fcdecc17e7 100644
--- a/solr/core/src/test/org/apache/solr/AnalysisAfterCoreReloadTest.java
+++ b/solr/core/src/test/org/apache/solr/AnalysisAfterCoreReloadTest.java
@@ -37,9 +37,6 @@ import org.junit.BeforeClass;
public class AnalysisAfterCoreReloadTest extends SolrTestCaseJ4 {
- int port = 0;
- static final String context = "/solr";
-
static final String collection = "collection1";
@BeforeClass
diff --git a/solr/core/src/test/org/apache/solr/TestDistributedSearch.java b/solr/core/src/test/org/apache/solr/TestDistributedSearch.java
index 10f497d5e19..e77714f7abb 100644
--- a/solr/core/src/test/org/apache/solr/TestDistributedSearch.java
+++ b/solr/core/src/test/org/apache/solr/TestDistributedSearch.java
@@ -544,13 +544,6 @@ public class TestDistributedSearch extends BaseDistributedSearchTestCase {
setDistributedParams(minParams);
QueryResponse minResp = queryServer(minParams);
- ModifiableSolrParams eParams = new ModifiableSolrParams();
- eParams.set("q", tdate_b + ":[* TO *]");
- eParams.set("rows", 1000);
- eParams.set("fl", tdate_b);
- setDistributedParams(eParams);
- QueryResponse eResp = queryServer(eParams);
-
// Check that exactly the right numbers of counts came through
assertEquals(
"Should be exactly 2 range facets returned after minCounts taken into account ",
@@ -1935,7 +1928,7 @@ public class TestDistributedSearch extends BaseDistributedSearchTestCase {
}
QueryResponse rsp = queryRandomUpServer(params, upClients);
- comparePartialResponses(rsp, controlRsp, upShards);
+ comparePartialResponses(rsp, upShards);
if (stress > 0) {
log.info("starting stress...");
@@ -1955,7 +1948,7 @@ public class TestDistributedSearch extends BaseDistributedSearchTestCase {
try {
QueryResponse rsp = client.query(new ModifiableSolrParams(params));
if (verifyStress) {
- comparePartialResponses(rsp, controlRsp, upShards);
+ comparePartialResponses(rsp, upShards);
}
} catch (SolrServerException | IOException e) {
throw new RuntimeException(e);
@@ -1990,8 +1983,7 @@ public class TestDistributedSearch extends BaseDistributedSearchTestCase {
return client.query(params);
}
- protected void comparePartialResponses(
- QueryResponse rsp, QueryResponse controlRsp, List<String> upShards) {
+ protected void comparePartialResponses(QueryResponse rsp, List<String> upShards) {
NamedList<?> sinfo = (NamedList<?>) rsp.getResponse().get(ShardParams.SHARDS_INFO);
assertNotNull("missing shard info", sinfo);
diff --git a/solr/core/src/test/org/apache/solr/TestRandomDVFaceting.java b/solr/core/src/test/org/apache/solr/TestRandomDVFaceting.java
index adc7956d6b4..6f6eb41b91c 100644
--- a/solr/core/src/test/org/apache/solr/TestRandomDVFaceting.java
+++ b/solr/core/src/test/org/apache/solr/TestRandomDVFaceting.java
@@ -206,7 +206,6 @@ public class TestRandomDVFaceting extends SolrTestCaseJ4 {
SchemaField sf = req.getSchema().getField(ftype.fname);
boolean multiValued = sf.getType().multiValuedFieldCache();
- boolean indexed = sf.indexed();
boolean numeric = sf.getType().getNumberType() != null;
int offset = 0;
diff --git a/solr/core/src/test/org/apache/solr/TestRandomFaceting.java b/solr/core/src/test/org/apache/solr/TestRandomFaceting.java
index edaa4d3f38c..3a1fbe70279 100644
--- a/solr/core/src/test/org/apache/solr/TestRandomFaceting.java
+++ b/solr/core/src/test/org/apache/solr/TestRandomFaceting.java
@@ -48,10 +48,6 @@ public class TestRandomFaceting extends SolrTestCaseJ4 {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
- public static final String FOO_STRING_FIELD = "foo_s1";
- public static final String SMALL_STRING_FIELD = "small_s1";
- public static final String SMALL_INT_FIELD = "small_i";
-
@BeforeClass
public static void beforeTests() throws Exception {
// we need DVs on point fields to compute stats & facets
@@ -69,8 +65,6 @@ public class TestRandomFaceting extends SolrTestCaseJ4 {
@SuppressWarnings({"rawtypes"})
Map<Comparable, Doc> model = null;
- boolean validateResponses = true;
-
void init() {
Random rand = random();
clearIndex();
@@ -313,7 +307,7 @@ public class TestRandomFaceting extends SolrTestCaseJ4 {
responses.add(strResponse);
if (responses.size() > 1) {
- validateResponse(responses.get(0), strResponse, params, method, methods);
+ validateResponse(responses.get(0), strResponse, params, methods);
}
}
}
@@ -328,11 +322,7 @@ public class TestRandomFaceting extends SolrTestCaseJ4 {
}
private void validateResponse(
- String expected,
- String actual,
- ModifiableSolrParams params,
- String method,
- List<String> methods)
+ String expected, String actual, ModifiableSolrParams params, List<String> methods)
throws Exception {
if (params.getBool("facet.exists", false)) {
if (isSortByCount(params)) { // it's challenged with facet.sort=count
diff --git a/solr/core/src/test/org/apache/solr/TestSimpleTrackingShardHandler.java b/solr/core/src/test/org/apache/solr/TestSimpleTrackingShardHandler.java
index 0bd03927df4..15bf978d4a5 100644
--- a/solr/core/src/test/org/apache/solr/TestSimpleTrackingShardHandler.java
+++ b/solr/core/src/test/org/apache/solr/TestSimpleTrackingShardHandler.java
@@ -18,7 +18,6 @@ package org.apache.solr;
import java.util.Collections;
import java.util.List;
-import org.apache.solr.client.solrj.response.QueryResponse;
import org.apache.solr.handler.component.TrackingShardHandlerFactory;
import org.apache.solr.handler.component.TrackingShardHandlerFactory.RequestTrackingQueue;
import org.apache.solr.handler.component.TrackingShardHandlerFactory.ShardRequestAndParams;
@@ -42,7 +41,7 @@ public class TestSimpleTrackingShardHandler extends BaseDistributedSearchTestCas
TrackingShardHandlerFactory.setTrackingQueue(
Collections.singletonList(controlJetty), trackingQueue);
- QueryResponse ignored = query("q", "*:*", "fl", "id", "sort", "id asc");
+ query("q", "*:*", "fl", "id", "sort", "id asc");
int numShardRequests = 0;
for (List<ShardRequestAndParams> shard : trackingQueue.getAllRequests().values()) {
diff --git a/solr/core/src/test/org/apache/solr/cloud/AddReplicaTest.java b/solr/core/src/test/org/apache/solr/cloud/AddReplicaTest.java
index a5ab5ec024b..d6bd16bf06a 100644
--- a/solr/core/src/test/org/apache/solr/cloud/AddReplicaTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/AddReplicaTest.java
@@ -18,7 +18,6 @@ package org.apache.solr.cloud;
import static org.apache.solr.client.solrj.response.RequestStatusState.COMPLETED;
-import java.lang.invoke.MethodHandles;
import java.util.Collection;
import java.util.EnumSet;
import java.util.LinkedHashSet;
@@ -31,12 +30,9 @@ import org.apache.solr.common.cloud.Replica;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/** */
public class AddReplicaTest extends SolrCloudTestCase {
- private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@BeforeClass
public static void setupCluster() throws Exception {
diff --git a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeWithPullReplicasTest.java b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeWithPullReplicasTest.java
index 36417ae137b..fcf450605d3 100644
--- a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeWithPullReplicasTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeWithPullReplicasTest.java
@@ -52,8 +52,6 @@ public class ChaosMonkeyNothingIsSafeWithPullReplicasTest extends AbstractFullDi
private static final Integer RUN_LENGTH =
Integer.parseInt(System.getProperty("solr.tests.cloud.cm.runlength", "-1"));
- private final boolean useTlogReplicas = random().nextBoolean();
-
private final int numPullReplicas;
private final int numRealtimeOrTlogReplicas;
diff --git a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderWithPullReplicasTest.java b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderWithPullReplicasTest.java
index 0a124932373..e5b2b90ffef 100644
--- a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderWithPullReplicasTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderWithPullReplicasTest.java
@@ -47,8 +47,6 @@ public class ChaosMonkeySafeLeaderWithPullReplicasTest extends AbstractFullDistr
private static final Integer RUN_LENGTH =
Integer.parseInt(System.getProperty("solr.tests.cloud.cm.runlength", "-1"));
- private final boolean useTlogReplicas = random().nextBoolean();
-
private final int numPullReplicas;
private final int numRealtimeOrTlogReplicas;
diff --git a/solr/core/src/test/org/apache/solr/cloud/ClusterStateUpdateTest.java b/solr/core/src/test/org/apache/solr/cloud/ClusterStateUpdateTest.java
index 4692f5fd4ac..5dc7bc234a7 100644
--- a/solr/core/src/test/org/apache/solr/cloud/ClusterStateUpdateTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/ClusterStateUpdateTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.solr.cloud;
-import java.lang.invoke.MethodHandles;
import java.util.Map;
import java.util.Set;
import org.apache.lucene.tests.util.LuceneTestCase.Slow;
@@ -30,12 +29,9 @@ import org.apache.solr.common.cloud.ZkStateReader;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
@Slow
public class ClusterStateUpdateTest extends SolrCloudTestCase {
- private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@Override
public void setUp() throws Exception {
diff --git a/solr/core/src/test/org/apache/solr/cloud/ConcurrentCreateRoutedAliasTest.java b/solr/core/src/test/org/apache/solr/cloud/ConcurrentCreateRoutedAliasTest.java
index 4fc74cb81bb..d7a452f7225 100644
--- a/solr/core/src/test/org/apache/solr/cloud/ConcurrentCreateRoutedAliasTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/ConcurrentCreateRoutedAliasTest.java
@@ -101,7 +101,7 @@ public class ConcurrentCreateRoutedAliasTest extends SolrTestCaseJ4 {
int i = num - numStart;
threads[i] =
new CreateRoutedAliasThread(
- "create-delete-search-" + i, aliasName, "NOW/HOUR", solrClient, failure, false);
+ "create-delete-search-" + i, aliasName, "NOW/HOUR", solrClient, failure);
}
startAll(threads);
@@ -129,8 +129,7 @@ public class ConcurrentCreateRoutedAliasTest extends SolrTestCaseJ4 {
aliasName,
"2017-12-25T23:24:25Z",
solrClient,
- failure,
- true);
+ failure);
}
startAll(threads);
@@ -167,8 +166,7 @@ public class ConcurrentCreateRoutedAliasTest extends SolrTestCaseJ4 {
String aliasName,
String start,
SolrClient solrClient,
- AtomicReference<Exception> failure,
- boolean v2) {
+ AtomicReference<Exception> failure) {
super(name);
this.aliasName = aliasName;
this.start = start;
diff --git a/solr/core/src/test/org/apache/solr/cloud/DeleteNodeTest.java b/solr/core/src/test/org/apache/solr/cloud/DeleteNodeTest.java
index e110c523af1..a4f6c35be5a 100644
--- a/solr/core/src/test/org/apache/solr/cloud/DeleteNodeTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/DeleteNodeTest.java
@@ -47,10 +47,6 @@ public class DeleteNodeTest extends SolrCloudTestCase {
.configure();
}
- protected String getSolrXml() {
- return "solr.xml";
- }
-
@Test
public void test() throws Exception {
CloudSolrClient cloudClient = cluster.getSolrClient();
diff --git a/solr/core/src/test/org/apache/solr/cloud/DeleteShardTest.java b/solr/core/src/test/org/apache/solr/cloud/DeleteShardTest.java
index 1813576b141..b763b58bad6 100644
--- a/solr/core/src/test/org/apache/solr/cloud/DeleteShardTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/DeleteShardTest.java
@@ -21,7 +21,6 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.client.solrj.cloud.DistributedQueue;
-import org.apache.solr.client.solrj.impl.CloudSolrClient;
import org.apache.solr.client.solrj.request.CollectionAdminRequest;
import org.apache.solr.client.solrj.request.CoreStatus;
import org.apache.solr.cloud.overseer.OverseerAction;
@@ -95,8 +94,6 @@ public class DeleteShardTest extends SolrCloudTestCase {
protected void setSliceState(String collection, String slice, State state) throws Exception {
- CloudSolrClient client = cluster.getSolrClient();
-
// TODO can this be encapsulated better somewhere?
Map<String, Object> propMap = new HashMap<>();
propMap.put(Overseer.QUEUE_OPERATION, OverseerAction.UPDATESHARDSTATE.toLower());
diff --git a/solr/core/src/test/org/apache/solr/cloud/DistribCursorPagingTest.java b/solr/core/src/test/org/apache/solr/cloud/DistribCursorPagingTest.java
index bf79164ad7b..593bce0271a 100644
--- a/solr/core/src/test/org/apache/solr/cloud/DistribCursorPagingTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/DistribCursorPagingTest.java
@@ -22,7 +22,6 @@ import static org.apache.solr.common.params.CursorMarkParams.CURSOR_MARK_START;
import static org.apache.solr.common.params.SolrParams.wrapDefaults;
import java.io.IOException;
-import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@ -49,8 +48,6 @@ import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.search.CursorMark;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* Distributed tests of deep paging using {@link CursorMark} and {@link
@@ -65,8 +62,6 @@ import org.slf4j.LoggerFactory;
@SuppressSSL(bugUrl = "https://issues.apache.org/jira/browse/SOLR-9182 - causes OOM")
public class DistribCursorPagingTest extends AbstractFullDistribZkTestBase {
- private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
-
public DistribCursorPagingTest() {
System.setProperty(
"solr.test.useFilterForSortedQuery", Boolean.toString(random().nextBoolean()));
diff --git a/solr/core/src/test/org/apache/solr/cloud/DistributedVersionInfoTest.java b/solr/core/src/test/org/apache/solr/cloud/DistributedVersionInfoTest.java
index a467a8ab584..37fb9b31d5d 100644
--- a/solr/core/src/test/org/apache/solr/cloud/DistributedVersionInfoTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/DistributedVersionInfoTest.java
@@ -330,9 +330,10 @@ public class DistributedVersionInfoTest extends SolrCloudTestCase {
if (deletedDocs != null && deletedDocs.contains(d)) continue;
String docId = String.valueOf(d);
- Long leaderVers = assertDocExists(leaderSolr, testCollectionName, docId, null);
- for (HttpSolrClient replicaSolr : replicas)
- assertDocExists(replicaSolr, testCollectionName, docId, leaderVers);
+ Long leaderVers = assertDocExists(leaderSolr, docId, null);
+ for (HttpSolrClient replicaSolr : replicas) {
+ assertDocExists(replicaSolr, docId, leaderVers);
+ }
}
} finally {
if (leaderSolr != null) {
@@ -360,8 +361,7 @@ public class DistributedVersionInfoTest extends SolrCloudTestCase {
* Query the real-time get handler for a specific doc by ID to verify it exists in the provided
* server, using distrib=false, so it doesn't route to another replica.
*/
- protected Long assertDocExists(HttpSolrClient solr, String coll, String docId, Long expVers)
- throws Exception {
+ protected Long assertDocExists(HttpSolrClient solr, String docId, Long expVers) throws Exception {
QueryRequest qr =
new QueryRequest(
params("qt", "/get", "id", docId, "distrib", "false", "fl", "id,_version_"));
diff --git a/solr/core/src/test/org/apache/solr/cloud/DocValuesNotIndexedTest.java b/solr/core/src/test/org/apache/solr/cloud/DocValuesNotIndexedTest.java
index 74165b6ff74..7259eb2f707 100644
--- a/solr/core/src/test/org/apache/solr/cloud/DocValuesNotIndexedTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/DocValuesNotIndexedTest.java
@@ -21,7 +21,6 @@ import static org.apache.lucene.tests.util.LuceneTestCase.random;
import com.carrotsearch.randomizedtesting.rules.SystemPropertiesRestoreRule;
import java.io.IOException;
-import java.lang.invoke.MethodHandles;
import java.time.Instant;
import java.util.ArrayList;
import java.util.Arrays;
@@ -57,13 +56,9 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.RuleChain;
import org.junit.rules.TestRule;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class DocValuesNotIndexedTest extends SolrCloudTestCase {
- private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
-
@Rule public TestRule solrTestRules = RuleChain.outerRule(new SystemPropertiesRestoreRule());
static final String COLLECTION = "dv_coll";
@@ -158,8 +153,8 @@ public class DocValuesNotIndexedTest extends SolrCloudTestCase {
defineFields(updateList, fieldsToTestSingle, false);
defineFields(updateList, fieldsToTestMulti, true);
- defineFields(updateList, fieldsToTestGroupSortFirst, false, "sorMissingFirst", "true");
- defineFields(updateList, fieldsToTestGroupSortLast, false, "sorMissingLast", "true");
+ defineFields(updateList, fieldsToTestGroupSortFirst, false);
+ defineFields(updateList, fieldsToTestGroupSortLast, false);
MultiUpdate multiUpdateRequest = new MultiUpdate(updateList);
SchemaResponse.UpdateResponse multipleUpdatesResponse =
@@ -484,8 +479,7 @@ public class DocValuesNotIndexedTest extends SolrCloudTestCase {
return doc;
}
- private static void defineFields(
- List<Update> updateList, List<FieldProps> props, boolean multi, String... extras) {
+ private static void defineFields(List<Update> updateList, List<FieldProps> props, boolean multi) {
for (FieldProps prop : props) {
Map<String, Object> fieldAttributes = new LinkedHashMap<>();
fieldAttributes.put("name", prop.getName());
diff --git a/solr/core/src/test/org/apache/solr/cloud/ForceLeaderTest.java b/solr/core/src/test/org/apache/solr/cloud/ForceLeaderTest.java
index 5bd3afdd539..e4f9ddbacd2 100644
--- a/solr/core/src/test/org/apache/solr/cloud/ForceLeaderTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/ForceLeaderTest.java
@@ -22,7 +22,6 @@ import java.lang.invoke.MethodHandles;
import java.util.Collections;
import java.util.List;
import java.util.concurrent.TimeUnit;
-import org.apache.solr.client.solrj.SolrClient;
import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.client.solrj.cloud.SocketProxy;
import org.apache.solr.client.solrj.embedded.JettySolrRunner;
@@ -95,8 +94,7 @@ public class ForceLeaderTest extends HttpPartitionTest {
if (log.isInfoEnabled()) {
log.info("Before put non leaders into lower term: {}", printClusterStateInfo());
}
- putNonLeadersIntoLowerTerm(
- testCollectionName, SHARD1, zkController, leader, notLeaders, cloudClient);
+ putNonLeadersIntoLowerTerm(testCollectionName, SHARD1, zkController, leader, notLeaders);
for (Replica replica : notLeaders) {
waitForState(testCollectionName, replica.getName(), State.DOWN, 60000);
@@ -201,8 +199,7 @@ public class ForceLeaderTest extends HttpPartitionTest {
String shard,
ZkController zkController,
Replica leader,
- List<Replica> notLeaders,
- SolrClient solrClient)
+ List<Replica> notLeaders)
throws Exception {
SocketProxy[] nonLeaderProxies = new SocketProxy[notLeaders.size()];
for (int i = 0; i < notLeaders.size(); i++)
diff --git a/solr/core/src/test/org/apache/solr/cloud/HttpPartitionOnCommitTest.java b/solr/core/src/test/org/apache/solr/cloud/HttpPartitionOnCommitTest.java
index f9da7c5159c..3b7eecb7094 100644
--- a/solr/core/src/test/org/apache/solr/cloud/HttpPartitionOnCommitTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/HttpPartitionOnCommitTest.java
@@ -38,8 +38,6 @@ public class HttpPartitionOnCommitTest extends BasicDistributedZkTest {
private static final long sleepMsBeforeHealPartition = 2000L;
- private final boolean onlyLeaderIndexes = random().nextBoolean();
-
@BeforeClass
public static void setupSysProps() {
System.setProperty("socketTimeout", "5000");
diff --git a/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java b/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java
index 9ab08ffab5f..9cd5192259a 100644
--- a/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java
@@ -435,7 +435,6 @@ public class HttpPartitionTest extends AbstractFullDistribZkTestBase {
notLeaders.size() == 1);
Replica leader = ZkStateReader.from(cloudClient).getLeaderRetry(testCollectionName, "shard1");
- String leaderNode = leader.getNodeName();
assertNotNull(
"Could not find leader for shard1 of "
+ testCollectionName
@@ -484,7 +483,7 @@ public class HttpPartitionTest extends AbstractFullDistribZkTestBase {
// if the add worked, then the doc must exist on the new leader
try (HttpSolrClient newLeaderSolr = getHttpSolrClient(currentLeader, testCollectionName)) {
- assertDocExists(newLeaderSolr, testCollectionName, "2");
+ assertDocExists(newLeaderSolr, "2");
}
} catch (SolrException exc) {
@@ -547,9 +546,9 @@ public class HttpPartitionTest extends AbstractFullDistribZkTestBase {
try {
for (int d = firstDocId; d <= lastDocId; d++) {
String docId = String.valueOf(d);
- assertDocExists(leaderSolr, testCollectionName, docId);
+ assertDocExists(leaderSolr, docId);
for (HttpSolrClient replicaSolr : replicas) {
- assertDocExists(replicaSolr, testCollectionName, docId);
+ assertDocExists(replicaSolr, docId);
}
}
} finally {
@@ -597,7 +596,7 @@ public class HttpPartitionTest extends AbstractFullDistribZkTestBase {
* Query the real-time get handler for a specific doc by ID to verify it exists in the provided
* server, using distrib=false, so it doesn't route to another replica.
*/
- protected void assertDocExists(HttpSolrClient solr, String coll, String docId) throws Exception {
+ protected void assertDocExists(HttpSolrClient solr, String docId) throws Exception {
NamedList<?> rsp = realTimeGetDocId(solr, docId);
String match = JSONTestUtil.matchObj("/id", rsp.get("doc"), docId);
assertTrue(
@@ -612,22 +611,6 @@ public class HttpPartitionTest extends AbstractFullDistribZkTestBase {
match == null);
}
- protected void assertDocNotExists(HttpSolrClient solr, String coll, String docId)
- throws Exception {
- NamedList<?> rsp = realTimeGetDocId(solr, docId);
- String match = JSONTestUtil.matchObj("/id", rsp.get("doc"), Integer.valueOf(docId));
- assertTrue(
- "Doc with id="
- + docId
- + " is found in "
- + solr.getBaseURL()
- + " due to: "
- + match
- + "; rsp="
- + rsp,
- match != null);
- }
-
private NamedList<Object> realTimeGetDocId(HttpSolrClient solr, String docId)
throws SolrServerException, IOException {
QueryRequest qr = new QueryRequest(params("qt", "/get", "id", docId, "distrib", "false"));
diff --git a/solr/core/src/test/org/apache/solr/cloud/LeaderElectionTest.java b/solr/core/src/test/org/apache/solr/cloud/LeaderElectionTest.java
index 09939b398de..76c721ff427 100644
--- a/solr/core/src/test/org/apache/solr/cloud/LeaderElectionTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/LeaderElectionTest.java
@@ -596,8 +596,4 @@ public class LeaderElectionTest extends SolrTestCaseJ4 {
server.shutdown();
super.tearDown();
}
-
- private void printLayout() throws Exception {
- zkClient.printLayoutToStream(System.out);
- }
}
diff --git a/solr/core/src/test/org/apache/solr/cloud/LeaderFailoverAfterPartitionTest.java b/solr/core/src/test/org/apache/solr/cloud/LeaderFailoverAfterPartitionTest.java
index f8864efaa79..8ae28882c9f 100644
--- a/solr/core/src/test/org/apache/solr/cloud/LeaderFailoverAfterPartitionTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/LeaderFailoverAfterPartitionTest.java
@@ -128,11 +128,11 @@ public class LeaderFailoverAfterPartitionTest extends HttpPartitionTest {
sendDoc(5);
try (HttpSolrClient server = getHttpSolrClient(leader, testCollectionName)) {
- assertDocExists(server, testCollectionName, "5");
+ assertDocExists(server, "5");
}
try (HttpSolrClient server = getHttpSolrClient(notLeaders.get(1), testCollectionName)) {
- assertDocExists(server, testCollectionName, "5");
+ assertDocExists(server, "5");
}
Thread.sleep(sleepMsBeforeHealPartition);
diff --git a/solr/core/src/test/org/apache/solr/cloud/LeaderVoteWaitTimeoutTest.java b/solr/core/src/test/org/apache/solr/cloud/LeaderVoteWaitTimeoutTest.java
index 658591a84df..899ae3eddfb 100644
--- a/solr/core/src/test/org/apache/solr/cloud/LeaderVoteWaitTimeoutTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/LeaderVoteWaitTimeoutTest.java
@@ -311,9 +311,9 @@ public class LeaderVoteWaitTimeoutTest extends SolrCloudTestCase {
try {
for (int d = firstDocId; d <= lastDocId; d++) {
String docId = String.valueOf(d);
- assertDocExists(leaderSolr, testCollectionName, docId);
+ assertDocExists(leaderSolr, docId);
for (HttpSolrClient replicaSolr : replicas) {
- assertDocExists(replicaSolr, testCollectionName, docId);
+ assertDocExists(replicaSolr, docId);
}
}
} finally {
@@ -326,7 +326,7 @@ public class LeaderVoteWaitTimeoutTest extends SolrCloudTestCase {
}
}
- private void assertDocExists(HttpSolrClient solr, String coll, String docId) throws Exception {
+ private void assertDocExists(HttpSolrClient solr, String docId) throws Exception {
NamedList<?> rsp = realTimeGetDocId(solr, docId);
String match = JSONTestUtil.matchObj("/id", rsp.get("doc"), docId);
assertTrue(
diff --git a/solr/core/src/test/org/apache/solr/cloud/MockSimpleZkController.java b/solr/core/src/test/org/apache/solr/cloud/MockSimpleZkController.java
index c6eb033603d..a553e1064b0 100644
--- a/solr/core/src/test/org/apache/solr/cloud/MockSimpleZkController.java
+++ b/solr/core/src/test/org/apache/solr/cloud/MockSimpleZkController.java
@@ -31,9 +31,9 @@ public class MockSimpleZkController extends ZkController {
String zkServerAddress,
int zkClientConnectTimeout,
CloudConfig cloudConfig,
- Supplier<List<CoreDescriptor>> registerOnReconnect)
+ Supplier<List<CoreDescriptor>> descriptorsSupplier)
throws InterruptedException, TimeoutException, IOException {
- super(cc, zkServerAddress, zkClientConnectTimeout, cloudConfig, registerOnReconnect);
+ super(cc, zkServerAddress, zkClientConnectTimeout, cloudConfig, descriptorsSupplier);
}
@Override
diff --git a/solr/core/src/test/org/apache/solr/cloud/NodeRolesTest.java b/solr/core/src/test/org/apache/solr/cloud/NodeRolesTest.java
index 4b3e0e7abe3..56556d6a517 100644
--- a/solr/core/src/test/org/apache/solr/cloud/NodeRolesTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/NodeRolesTest.java
@@ -17,7 +17,6 @@
package org.apache.solr.cloud;
-import java.lang.invoke.MethodHandles;
import java.util.Collection;
import java.util.Collections;
import java.util.Map;
@@ -28,11 +27,8 @@ import org.apache.solr.client.solrj.response.V2Response;
import org.apache.solr.core.NodeRoles;
import org.junit.After;
import org.junit.Before;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class NodeRolesTest extends SolrCloudTestCase {
- private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@Before
public void setupCluster() throws Exception {
diff --git a/solr/core/src/test/org/apache/solr/cloud/OverseerCollectionConfigSetProcessorTest.java b/solr/core/src/test/org/apache/solr/cloud/OverseerCollectionConfigSetProcessorTest.java
index 004e86a8be2..c59f1195b66 100644
--- a/solr/core/src/test/org/apache/solr/cloud/OverseerCollectionConfigSetProcessorTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/OverseerCollectionConfigSetProcessorTest.java
@@ -738,10 +738,7 @@ public class OverseerCollectionConfigSetProcessorTest extends SolrTestCaseJ4 {
}
protected void verifySubmitCaptures(
- Integer numberOfSlices,
- Integer numberOfReplica,
- Collection<String> createNodes,
- boolean dontShuffleCreateNodeSet) {
+ Integer numberOfSlices, Integer numberOfReplica, Collection<String> createNodes) {
List<String> coreNames = new ArrayList<>();
Map<String, Map<String, Integer>>
sliceToNodeUrlsWithoutProtocolPartToNumberOfShardsRunningMapMap = new HashMap<>();
@@ -771,7 +768,6 @@ public class OverseerCollectionConfigSetProcessorTest extends SolrTestCaseJ4 {
ShardRequest shardRequest = shardRequestCaptor.getAllValues().get(i);
String nodeUrlsWithoutProtocolPartCapture =
nodeUrlsWithoutProtocolPartCaptor.getAllValues().get(i);
- ModifiableSolrParams params = paramsCaptor.getAllValues().get(i);
assertEquals(
CoreAdminAction.CREATE.toString(), shardRequest.params.get(CoreAdminParams.ACTION));
// assertEquals(shardRequest.params, submitCapture.params);
@@ -979,8 +975,7 @@ public class OverseerCollectionConfigSetProcessorTest extends SolrTestCaseJ4 {
}
if (collectionExceptedToBeCreated) {
- verifySubmitCaptures(
- numberOfSlices, replicationFactor, createNodeList, dontShuffleCreateNodeSet);
+ verifySubmitCaptures(numberOfSlices, replicationFactor, createNodeList);
}
}
diff --git a/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java b/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java
index 73bc3d64902..616ee01c8d4 100644
--- a/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java
@@ -341,10 +341,6 @@ public class OverseerTest extends SolrTestCaseJ4 {
}
return null;
}
-
- public ZkStateReader getZkReader() {
- return zkStateReader;
- }
}
@BeforeClass
@@ -914,8 +910,6 @@ public class OverseerTest extends SolrTestCaseJ4 {
mockController.createCollection(COLLECTION, 1);
- ZkController zkController = createMockZkController(server.getZkAddress(), zkClient, reader);
-
mockController.publishState(
COLLECTION,
core,
@@ -1384,8 +1378,6 @@ public class OverseerTest extends SolrTestCaseJ4 {
mockController.createCollection(COLLECTION, 1);
- ZkController zkController = createMockZkController(server.getZkAddress(), zkClient, reader);
-
mockController.publishState(
COLLECTION,
"core1",
@@ -1935,14 +1927,11 @@ public class OverseerTest extends SolrTestCaseJ4 {
when(zkController.getLeaderProps(anyString(), anyString(), anyInt())).thenCallRealMethod();
when(zkController.getLeaderProps(anyString(), anyString(), anyInt(), anyBoolean()))
.thenCallRealMethod();
- doReturn(getCloudDataProvider(zkAddress, zkClient, reader))
- .when(zkController)
- .getSolrCloudManager();
+ doReturn(getCloudDataProvider(zkAddress, zkClient)).when(zkController).getSolrCloudManager();
return zkController;
}
- private SolrCloudManager getCloudDataProvider(
- String zkAddress, SolrZkClient zkClient, ZkStateReader reader) {
+ private SolrCloudManager getCloudDataProvider(String zkAddress, SolrZkClient zkClient) {
var client =
new CloudLegacySolrClient.Builder(Collections.singletonList(zkAddress), Optional.empty())
.withSocketTimeout(30000)
diff --git a/solr/core/src/test/org/apache/solr/cloud/ParallelCommitExecutionTest.java b/solr/core/src/test/org/apache/solr/cloud/ParallelCommitExecutionTest.java
index 09a32368a9d..ef74e192583 100644
--- a/solr/core/src/test/org/apache/solr/cloud/ParallelCommitExecutionTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/ParallelCommitExecutionTest.java
@@ -79,7 +79,7 @@ public class ParallelCommitExecutionTest extends SolrCloudTestCase {
}
@AfterClass
- private static void afterClass() throws Exception {
+ public static void afterClass() throws Exception {
if (null != CLOUD_CLIENT) {
CLOUD_CLIENT.close();
CLOUD_CLIENT = null;
diff --git a/solr/core/src/test/org/apache/solr/cloud/RecoveryAfterSoftCommitTest.java b/solr/core/src/test/org/apache/solr/cloud/RecoveryAfterSoftCommitTest.java
index e305721d713..342fcb502d0 100644
--- a/solr/core/src/test/org/apache/solr/cloud/RecoveryAfterSoftCommitTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/RecoveryAfterSoftCommitTest.java
@@ -34,7 +34,6 @@ import org.junit.Test;
@SolrTestCaseJ4.SuppressSSL
public class RecoveryAfterSoftCommitTest extends AbstractFullDistribZkTestBase {
private static final int MAX_BUFFERED_DOCS = 2, ULOG_NUM_RECORDS_TO_KEEP = 2;
- private final boolean onlyLeaderIndexes = random().nextBoolean();
public RecoveryAfterSoftCommitTest() {
sliceCount = 1;
diff --git a/solr/core/src/test/org/apache/solr/cloud/ReindexCollectionTest.java b/solr/core/src/test/org/apache/solr/cloud/ReindexCollectionTest.java
index 3fcdd2efd2f..b06d535bba3 100644
--- a/solr/core/src/test/org/apache/solr/cloud/ReindexCollectionTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/ReindexCollectionTest.java
@@ -89,20 +89,6 @@ public class ReindexCollectionTest extends SolrCloudTestCase {
}
}
- private void waitForState(String collection, ReindexCollectionCmd.State expected)
- throws Exception {
- TimeOut timeOut = new TimeOut(30, TimeUnit.SECONDS, cloudManager.getTimeSource());
- ReindexCollectionCmd.State current = null;
- while (!timeOut.hasTimedOut()) {
- current = getState(collection);
- if (expected == current) {
- return;
- }
- timeOut.sleep(500);
- }
- throw new Exception("timeout waiting for state, current=" + current + ", expected=" + expected);
- }
-
@After
public void doAfter() throws Exception {
cluster.deleteAllCollections(); // deletes aliases too
diff --git a/solr/core/src/test/org/apache/solr/cloud/ReplaceNodeTest.java b/solr/core/src/test/org/apache/solr/cloud/ReplaceNodeTest.java
index 3ebaa937ddc..8c5faa71272 100644
--- a/solr/core/src/test/org/apache/solr/cloud/ReplaceNodeTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/ReplaceNodeTest.java
@@ -64,10 +64,6 @@ public class ReplaceNodeTest extends SolrCloudTestCase {
shutdownCluster();
}
- protected String getSolrXml() {
- return "solr.xml";
- }
-
@Test
public void test() throws Exception {
configureCluster(6)
diff --git a/solr/core/src/test/org/apache/solr/cloud/ReplicationFactorTest.java b/solr/core/src/test/org/apache/solr/cloud/ReplicationFactorTest.java
index 35e74a2da87..85da4a37950 100644
--- a/solr/core/src/test/org/apache/solr/cloud/ReplicationFactorTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/ReplicationFactorTest.java
@@ -110,7 +110,7 @@ public class ReplicationFactorTest extends AbstractFullDistribZkTestBase {
String testCollectionName = "repfacttest_c8n_2x2";
String shardId = "shard1";
- createCollectionWithRetry(testCollectionName, "conf1", numShards, replicationFactor);
+ createCollectionWithRetry(testCollectionName, numShards, replicationFactor);
cloudClient.setDefaultCollection(testCollectionName);
@@ -297,7 +297,7 @@ public class ReplicationFactorTest extends AbstractFullDistribZkTestBase {
final String shardId = "shard1";
final int minRf = 2;
- createCollectionWithRetry(testCollectionName, "conf1", numShards, replicationFactor);
+ createCollectionWithRetry(testCollectionName, numShards, replicationFactor);
cloudClient.setDefaultCollection(testCollectionName);
List<Replica> replicas =
@@ -502,8 +502,7 @@ public class ReplicationFactorTest extends AbstractFullDistribZkTestBase {
}
}
- void createCollectionWithRetry(
- String testCollectionName, String config, int numShards, int replicationFactor)
+ void createCollectionWithRetry(String testCollectionName, int numShards, int replicationFactor)
throws IOException, SolrServerException, InterruptedException, TimeoutException {
CollectionAdminResponse resp =
createCollection(testCollectionName, "conf1", numShards, replicationFactor);
diff --git a/solr/core/src/test/org/apache/solr/cloud/SolrXmlInZkTest.java b/solr/core/src/test/org/apache/solr/cloud/SolrXmlInZkTest.java
index 126e82cb604..8f9c27e4915 100644
--- a/solr/core/src/test/org/apache/solr/cloud/SolrXmlInZkTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/SolrXmlInZkTest.java
@@ -26,7 +26,6 @@ import org.apache.commons.io.FileUtils;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.cloud.SolrZkClient;
-import org.apache.solr.common.cloud.ZkStateReader;
import org.apache.solr.core.NodeConfig;
import org.junit.Rule;
import org.junit.Test;
@@ -47,8 +46,6 @@ public class SolrXmlInZkTest extends SolrTestCaseJ4 {
private SolrZkClient zkClient;
- private ZkStateReader reader;
-
private NodeConfig cfg;
private void setUpZkAndDiskXml(boolean toZk, boolean leaveOnLocal) throws Exception {
@@ -100,9 +97,6 @@ public class SolrXmlInZkTest extends SolrTestCaseJ4 {
zkClient.close();
}
- if (reader != null) {
- reader.close();
- }
zkServer.shutdown();
}
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestBaseStatsCacheCloud.java b/solr/core/src/test/org/apache/solr/cloud/TestBaseStatsCacheCloud.java
index 20e9d86267b..0fa0a28e285 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestBaseStatsCacheCloud.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestBaseStatsCacheCloud.java
@@ -16,7 +16,6 @@
*/
package org.apache.solr.cloud;
-import java.lang.invoke.MethodHandles;
import java.util.HashMap;
import java.util.Map;
import java.util.function.Function;
@@ -38,13 +37,10 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/** */
@Ignore("Abstract classes should not be executed as tests")
public abstract class TestBaseStatsCacheCloud extends SolrCloudTestCase {
- private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
protected int numNodes = 2;
protected String configset = "cloud-dynamic";
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestCloudConsistency.java b/solr/core/src/test/org/apache/solr/cloud/TestCloudConsistency.java
index 82b2b41753a..30558935015 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestCloudConsistency.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestCloudConsistency.java
@@ -320,9 +320,9 @@ public class TestCloudConsistency extends SolrCloudTestCase {
try {
for (int d = firstDocId; d <= lastDocId; d++) {
String docId = String.valueOf(d);
- assertDocExists(leaderSolr, testCollectionName, docId);
+ assertDocExists(leaderSolr, docId);
for (HttpSolrClient replicaSolr : replicas) {
- assertDocExists(replicaSolr, testCollectionName, docId);
+ assertDocExists(replicaSolr, docId);
}
}
} finally {
@@ -335,7 +335,7 @@ public class TestCloudConsistency extends SolrCloudTestCase {
}
}
- private void assertDocExists(HttpSolrClient solr, String coll, String docId) throws Exception {
+ private void assertDocExists(HttpSolrClient solr, String docId) throws Exception {
NamedList<?> rsp = realTimeGetDocId(solr, docId);
String match = JSONTestUtil.matchObj("/id", rsp.get("doc"), docId);
assertTrue(
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestCloudDeleteByQuery.java b/solr/core/src/test/org/apache/solr/cloud/TestCloudDeleteByQuery.java
index eda89b340b2..6c8d8c33c64 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestCloudDeleteByQuery.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestCloudDeleteByQuery.java
@@ -16,7 +16,6 @@
*/
package org.apache.solr.cloud;
-import java.lang.invoke.MethodHandles;
import java.net.URL;
import java.nio.file.Path;
import java.util.Arrays;
@@ -42,13 +41,9 @@ import org.apache.solr.common.params.SolrParams;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class TestCloudDeleteByQuery extends SolrCloudTestCase {
- private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
-
private static final int NUM_SHARDS = 2;
private static final int REPLICATION_FACTOR = 2;
private static final int NUM_SERVERS = 5;
@@ -80,7 +75,7 @@ public class TestCloudDeleteByQuery extends SolrCloudTestCase {
private static final String S_TWO_PRE = "XYZ!";
@AfterClass
- private static void afterClass() throws Exception {
+ public static void afterClass() throws Exception {
if (null != CLOUD_CLIENT) {
CLOUD_CLIENT.close();
CLOUD_CLIENT = null;
@@ -224,7 +219,7 @@ public class TestCloudDeleteByQuery extends SolrCloudTestCase {
}
@Before
- private void clearCloudCollection() throws Exception {
+ public void clearCloudCollection() throws Exception {
assertEquals(0, CLOUD_CLIENT.deleteByQuery("*:*").getStatus());
assertEquals(0, CLOUD_CLIENT.commit().getStatus());
}
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestCloudRecovery2.java b/solr/core/src/test/org/apache/solr/cloud/TestCloudRecovery2.java
index 32a11585e27..2fc601b52a9 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestCloudRecovery2.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestCloudRecovery2.java
@@ -17,7 +17,6 @@
package org.apache.solr.cloud;
-import java.lang.invoke.MethodHandles;
import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.client.solrj.embedded.JettySolrRunner;
import org.apache.solr.client.solrj.impl.HttpSolrClient;
@@ -26,11 +25,8 @@ import org.apache.solr.client.solrj.request.UpdateRequest;
import org.apache.solr.common.cloud.Replica;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class TestCloudRecovery2 extends SolrCloudTestCase {
- private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static final String COLLECTION = "collection1";
@BeforeClass
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestDistribDocBasedVersion.java b/solr/core/src/test/org/apache/solr/cloud/TestDistribDocBasedVersion.java
index b46da70e3b4..4708752bb28 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestDistribDocBasedVersion.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestDistribDocBasedVersion.java
@@ -18,10 +18,8 @@ package org.apache.solr.cloud;
import java.lang.invoke.MethodHandles;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import org.apache.solr.client.solrj.SolrClient;
import org.apache.solr.client.solrj.request.UpdateRequest;
import org.apache.solr.client.solrj.response.QueryResponse;
@@ -38,7 +36,7 @@ public class TestDistribDocBasedVersion extends AbstractFullDistribZkTestBase {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
String bucket1 = "shard1"; // shard1: top bits:10 80000000:ffffffff
- String bucket2 = "shard2"; // shard2: top bits:00 00000000:7fffffff
+ // String bucket2 = "shard2"; // shard2: top bits:00 00000000:7fffffff
private static String vfield = "my_version_l";
@@ -325,20 +323,6 @@ public class TestDistribDocBasedVersion extends AbstractFullDistribZkTestBase {
assertEquals(expectedIds, obtainedIds);
}
- void doRTG(String ids) throws Exception {
- solrClient.query(params("qt", "/get", "ids", ids));
-
- Set<String> expectedIds = new HashSet<>(StrUtils.splitSmart(ids, ",", true));
-
- QueryResponse rsp = cloudClient.query(params("qt", "/get", "ids", ids));
- Set<String> obtainedIds = new HashSet<>();
- for (SolrDocument doc : rsp.getResults()) {
- obtainedIds.add((String) doc.get("id"));
- }
-
- assertEquals(expectedIds, obtainedIds);
- }
-
// TODO: refactor some of this stuff into the SolrJ client... it should be easier to use
void doDBQ(String q, String... reqParams) throws Exception {
UpdateRequest req = new UpdateRequest();
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestDownShardTolerantSearch.java b/solr/core/src/test/org/apache/solr/cloud/TestDownShardTolerantSearch.java
index 95a73a1a493..75e8070e4fe 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestDownShardTolerantSearch.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestDownShardTolerantSearch.java
@@ -18,7 +18,6 @@ package org.apache.solr.cloud;
import static org.hamcrest.CoreMatchers.is;
-import java.lang.invoke.MethodHandles;
import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.client.solrj.embedded.JettySolrRunner;
@@ -28,8 +27,6 @@ import org.apache.solr.client.solrj.response.QueryResponse;
import org.apache.solr.common.params.ShardParams;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* Test which asserts that shards.tolerant=true works even if one shard is down and also asserts
@@ -37,8 +34,6 @@ import org.slf4j.LoggerFactory;
*/
public class TestDownShardTolerantSearch extends SolrCloudTestCase {
- private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
-
@BeforeClass
public static void setupCluster() throws Exception {
configureCluster(2).addConfig("conf", configset("cloud-minimal")).configure();
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestLeaderElectionZkExpiry.java b/solr/core/src/test/org/apache/solr/cloud/TestLeaderElectionZkExpiry.java
index f7019344d63..d609f9a9593 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestLeaderElectionZkExpiry.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestLeaderElectionZkExpiry.java
@@ -38,8 +38,6 @@ public class TestLeaderElectionZkExpiry extends SolrTestCaseJ4 {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public static final String SOLRXML = "<solr></solr>";
- private static final int MAX_NODES = 16;
- private static final int MIN_NODES = 4;
@Test
public void testLeaderElectionWithZkExpiry() throws Exception {
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudClusterSSL.java b/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudClusterSSL.java
index d71af0b3877..b25f58dfbe0 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudClusterSSL.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudClusterSSL.java
@@ -21,7 +21,6 @@ import java.lang.invoke.MethodHandles;
import java.util.List;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLException;
-import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpHead;
import org.apache.http.config.Registry;
import org.apache.http.config.RegistryBuilder;
@@ -37,7 +36,6 @@ import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.client.solrj.embedded.JettyConfig;
import org.apache.solr.client.solrj.embedded.JettySolrRunner;
-import org.apache.solr.client.solrj.impl.CloudLegacySolrClient;
import org.apache.solr.client.solrj.impl.CloudSolrClient;
import org.apache.solr.client.solrj.impl.Http2SolrClient;
import org.apache.solr.client.solrj.impl.HttpClientUtil;
@@ -319,10 +317,7 @@ public class TestMiniSolrCloudClusterSSL extends SolrTestCaseJ4 {
// sanity check the HttpClient used under the hood by our the cluster's CloudSolrClient
// ensure it has the necessary protocols/credentials for each jetty server
- //
- // NOTE: we're not responsible for closing the cloud client
- final HttpClient cloudClient =
- ((CloudLegacySolrClient) cluster.getSolrClient()).getHttpClient();
+
try (HttpSolrClient client = getRandomizedHttpSolrClient(baseURL)) {
assertEquals(0, CoreAdminRequest.getStatus(/* all */ null, client).getStatus());
}
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestQueryingOnDownCollection.java b/solr/core/src/test/org/apache/solr/cloud/TestQueryingOnDownCollection.java
index 8b583db50a8..745ac196a52 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestQueryingOnDownCollection.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestQueryingOnDownCollection.java
@@ -16,7 +16,6 @@
*/
package org.apache.solr.cloud;
-import java.lang.invoke.MethodHandles;
import java.util.List;
import java.util.Map;
import org.apache.solr.client.solrj.SolrClient;
@@ -32,12 +31,9 @@ import org.apache.solr.common.cloud.Replica;
import org.apache.solr.common.util.Utils;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class TestQueryingOnDownCollection extends SolrCloudTestCase {
- private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static final String COLLECTION_NAME = "infected";
private static final String USERNAME = "solr";
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestRandomFlRTGCloud.java b/solr/core/src/test/org/apache/solr/cloud/TestRandomFlRTGCloud.java
index 2144c4b807a..f76fc4af732 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestRandomFlRTGCloud.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestRandomFlRTGCloud.java
@@ -496,7 +496,7 @@ public class TestRandomFlRTGCloud extends SolrCloudTestCase {
}
} else {
// add one or more comma separated ids params
- params.add(buildCommaSepParams(random(), "ids", idsToRequest));
+ params.add(buildCommaSepParams("ids", idsToRequest));
}
}
} else {
@@ -662,7 +662,7 @@ public class TestRandomFlRTGCloud extends SolrCloudTestCase {
params.add(v.getExtraRequestParams());
fls.add(v.getFlParam());
}
- params.add(buildCommaSepParams(random(), "fl", fls));
+ params.add(buildCommaSepParams("fl", fls));
}
/**
@@ -1391,11 +1391,10 @@ public class TestRandomFlRTGCloud extends SolrCloudTestCase {
}
/**
- * Given an ordered list of values to include in a (key) param, randomly groups them (ie: comma
- * separated) into actual param key=values which are returned as a new SolrParams instance
+ * Given an ordered list of values to include in a (key) param, groups them (ie: comma separated)
+ * into actual param key=values which are returned as a new SolrParams instance
*/
- private static SolrParams buildCommaSepParams(
- final Random rand, final String key, Collection<String> values) {
+ private static SolrParams buildCommaSepParams(final String key, Collection<String> values) {
ModifiableSolrParams result = new ModifiableSolrParams();
List<String> copy = new ArrayList<>(values);
while (!copy.isEmpty()) {
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestSSLRandomization.java b/solr/core/src/test/org/apache/solr/cloud/TestSSLRandomization.java
index bd145d82192..05f6602755b 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestSSLRandomization.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestSSLRandomization.java
@@ -16,15 +16,12 @@
*/
package org.apache.solr.cloud;
-import java.lang.invoke.MethodHandles;
import java.util.Arrays;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.util.RandomizeSSL;
import org.apache.solr.util.RandomizeSSL.SSLRandomizer;
import org.apache.solr.util.SSLTestConfig;
import org.junit.BeforeClass;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* A "test the test" method that verifies the SSL options randomized by {@link SolrTestCaseJ4} are
@@ -36,8 +33,6 @@ import org.slf4j.LoggerFactory;
@RandomizeSSL(ssl = 0.5, reason = "frequent SSL usage to make test worth while")
public class TestSSLRandomization extends SolrCloudTestCase {
- private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
-
@BeforeClass
public static void createMiniSolrCloudCluster() throws Exception {
configureCluster(TestMiniSolrCloudClusterSSL.NUM_SERVERS).configure();
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestSegmentSorting.java b/solr/core/src/test/org/apache/solr/cloud/TestSegmentSorting.java
index 8392c6ed72c..8a8a361b1e0 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestSegmentSorting.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestSegmentSorting.java
@@ -33,12 +33,9 @@ import org.junit.BeforeClass;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TestName;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class TestSegmentSorting extends SolrCloudTestCase {
- private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static final int NUM_SERVERS = 5;
private static final int NUM_SHARDS = 2;
private static final int REPLICATION_FACTOR = 2;
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestStressInPlaceUpdates.java b/solr/core/src/test/org/apache/solr/cloud/TestStressInPlaceUpdates.java
index 2cd7202f3d1..1a95c6c178a 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestStressInPlaceUpdates.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestStressInPlaceUpdates.java
@@ -78,7 +78,6 @@ public class TestStressInPlaceUpdates extends AbstractFullDistribZkTestBase {
protected long committedModelClock;
protected int clientIndexUsedForCommit;
protected volatile int lastId;
- protected final String field = "val_l";
private void initModel(int ndocs) {
for (int i = 0; i < ndocs; i++) {
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorCloud.java b/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorCloud.java
index a03774adc01..47a2e3bb6b8 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorCloud.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorCloud.java
@@ -18,7 +18,6 @@ package org.apache.solr.cloud;
import java.io.File;
import java.io.IOException;
-import java.lang.invoke.MethodHandles;
import java.net.URL;
import java.util.ArrayList;
import java.util.Arrays;
@@ -51,8 +50,6 @@ import org.apache.solr.common.util.SimpleOrderedMap;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* Test of TolerantUpdateProcessor using a MiniSolrCloud. Updates (that include failures which
@@ -65,8 +62,6 @@ import org.slf4j.LoggerFactory;
*/
public class TestTolerantUpdateProcessorCloud extends SolrCloudTestCase {
- private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
-
private static final int NUM_SHARDS = 2;
private static final int REPLICATION_FACTOR = 2;
private static final int NUM_SERVERS = 5;
diff --git a/solr/core/src/test/org/apache/solr/cloud/ZkCLITest.java b/solr/core/src/test/org/apache/solr/cloud/ZkCLITest.java
index 46d73666004..e5e8399249c 100644
--- a/solr/core/src/test/org/apache/solr/cloud/ZkCLITest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/ZkCLITest.java
@@ -490,10 +490,4 @@ public class ZkCLITest extends SolrTestCaseJ4 {
}
super.tearDown();
}
-
- private void printLayout(String zkHost) throws Exception {
- SolrZkClient zkClient = new SolrZkClient(zkHost, AbstractZkTestCase.TIMEOUT);
- zkClient.printLayoutToStream(System.out);
- zkClient.close();
- }
}
diff --git a/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java b/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java
index 83fa35e60ff..ddaddaf9a10 100644
--- a/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java
@@ -54,8 +54,6 @@ import org.junit.Test;
@SolrTestCaseJ4.SuppressSSL
public class ZkControllerTest extends SolrTestCaseJ4 {
- private static final String COLLECTION_NAME = "collection1";
-
static final int TIMEOUT = 10000;
@BeforeClass
diff --git a/solr/core/src/test/org/apache/solr/cloud/ZkShardTermsTest.java b/solr/core/src/test/org/apache/solr/cloud/ZkShardTermsTest.java
index 5db31574fd7..6570a4a87bd 100644
--- a/solr/core/src/test/org/apache/solr/cloud/ZkShardTermsTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/ZkShardTermsTest.java
@@ -18,7 +18,6 @@
package org.apache.solr.cloud;
import java.io.IOException;
-import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -36,13 +35,9 @@ import org.apache.solr.common.util.TimeSource;
import org.apache.solr.util.TimeOut;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class ZkShardTermsTest extends SolrCloudTestCase {
- private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
-
@BeforeClass
public static void setupCluster() throws Exception {
configureCluster(1)
diff --git a/solr/core/src/test/org/apache/solr/cloud/ZkSolrClientTest.java b/solr/core/src/test/org/apache/solr/cloud/ZkSolrClientTest.java
index 61d3b71bce6..c3c9408292f 100644
--- a/solr/core/src/test/org/apache/solr/cloud/ZkSolrClientTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/ZkSolrClientTest.java
@@ -54,10 +54,6 @@ public class ZkSolrClientTest extends SolrTestCaseJ4 {
private SolrZkClient zkClient = null;
ZkConnection() throws Exception {
- this(true);
- }
-
- ZkConnection(boolean makeRoot) throws Exception {
Path zkDir = createTempDir("zkData");
server = new ZkTestServer(zkDir);
server.run();
@@ -82,7 +78,7 @@ public class ZkSolrClientTest extends SolrTestCaseJ4 {
@SuppressWarnings({"try"})
public void testConnect() throws Exception {
- try (ZkConnection conn = new ZkConnection(false)) {
+ try (ZkConnection conn = new ZkConnection()) {
// do nothing
}
}
diff --git a/solr/core/src/test/org/apache/solr/cloud/api/collections/BackupRestoreApiErrorConditionsTest.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/BackupRestoreApiErrorConditionsTest.java
index 942dd879f4d..31e1eb5ee52 100644
--- a/solr/core/src/test/org/apache/solr/cloud/api/collections/BackupRestoreApiErrorConditionsTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/BackupRestoreApiErrorConditionsTest.java
@@ -17,7 +17,6 @@
package org.apache.solr.cloud.api.collections;
import java.io.File;
-import java.lang.invoke.MethodHandles;
import org.apache.solr.client.solrj.request.CollectionAdminRequest;
import org.apache.solr.client.solrj.response.RequestStatusState;
import org.apache.solr.cloud.MiniSolrCloudCluster;
@@ -25,8 +24,6 @@ import org.apache.solr.cloud.SolrCloudTestCase;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* Integration test verifying particular errors are reported correctly by the Collection-level
@@ -35,8 +32,6 @@ import org.slf4j.LoggerFactory;
public class BackupRestoreApiErrorConditionsTest extends SolrCloudTestCase {
// TODO could these be unit tests somehow and still validate the response users see with certainty
- private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
-
private static final int NUM_SHARDS = 1;
private static final int NUM_REPLICAS = 1;
private static final String COLLECTION_NAME = "initial_collection";
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.java
index 35dc1247f48..ccab98767ed 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
@@ -54,7 +54,6 @@ public class CustomCollectionTest extends SolrCloudTestCase {
final String collection = "implicitcoll";
int replicationFactor = TestUtil.nextInt(random(), 0, 3) + 2;
- int numShards = 3;
CollectionAdminRequest.createCollectionWithImplicitRouter(
collection, "conf", "a,b,c", replicationFactor)
@@ -146,7 +145,6 @@ public class CustomCollectionTest extends SolrCloudTestCase {
@Test
public void testRouteFieldForImplicitRouter() throws Exception {
- int numShards = 4;
int replicationFactor = TestUtil.nextInt(random(), 0, 3) + 2;
String shard_fld = "shard_s";
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.java
index 7511b8dfe14..9136f649ade 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
@@ -16,7 +16,6 @@
*/
package org.apache.solr.cloud.api.collections;
-import java.lang.invoke.MethodHandles;
import java.net.URL;
import java.util.ArrayList;
import java.util.Collection;
@@ -42,15 +41,11 @@ import org.apache.solr.common.cloud.Replica;
import org.apache.solr.common.cloud.Slice;
import org.apache.solr.common.cloud.ZkStateReader;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/** Test of the Collections API with the MiniSolrCloudCluster. */
@LuceneTestCase.Slow
public class TestCollectionsAPIViaSolrCloudCluster extends SolrCloudTestCase {
- private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
-
private static final int numShards = 2;
private static final int numReplicas = 2;
private static final int nodeCount = 5;
diff --git a/solr/core/src/test/org/apache/solr/cloud/overseer/ZkCollectionPropsCachingTest.java b/solr/core/src/test/org/apache/solr/cloud/overseer/ZkCollectionPropsCachingTest.java
index 04f28e75672..8e50593e799 100644
--- a/solr/core/src/test/org/apache/solr/cloud/overseer/ZkCollectionPropsCachingTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/overseer/ZkCollectionPropsCachingTest.java
@@ -18,7 +18,6 @@
package org.apache.solr.cloud.overseer;
import java.io.IOException;
-import java.lang.invoke.MethodHandles;
import org.apache.lucene.tests.util.LuceneTestCase;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.client.solrj.request.CollectionAdminRequest;
@@ -29,8 +28,6 @@ import org.apache.solr.common.cloud.ZkStateReader;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
@LuceneTestCase.Slow
@SolrTestCaseJ4.SuppressSSL
@@ -42,7 +39,6 @@ public class ZkCollectionPropsCachingTest extends SolrCloudTestCase {
// don't add one! :)
//
private String collectionName;
- private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@BeforeClass
public static void setupClass() throws Exception {
diff --git a/solr/core/src/test/org/apache/solr/cluster/events/ClusterEventProducerTest.java b/solr/core/src/test/org/apache/solr/cluster/events/ClusterEventProducerTest.java
index 68d1246f6da..4f007b73708 100644
--- a/solr/core/src/test/org/apache/solr/cluster/events/ClusterEventProducerTest.java
+++ b/solr/core/src/test/org/apache/solr/cluster/events/ClusterEventProducerTest.java
@@ -25,7 +25,6 @@ import com.carrotsearch.randomizedtesting.annotations.ThreadLeakLingering;
import java.lang.invoke.MethodHandles;
import java.time.Instant;
import java.util.Collections;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.CountDownLatch;
@@ -227,7 +226,6 @@ public class ClusterEventProducerTest extends SolrCloudTestCase {
eventsListener.events.clear();
eventsListener.setExpectedType(ClusterEvent.EventType.CLUSTER_PROPERTIES_CHANGED);
ClusterProperties clusterProperties = new ClusterProperties(cluster.getZkClient());
- Map<String, Object> oldProps = new HashMap<>(clusterProperties.getClusterProperties());
clusterProperties.setClusterProperty("ext.foo", "bar");
eventsListener.waitForExpectedEvent(30);
assertNotNull(
diff --git a/solr/core/src/test/org/apache/solr/cluster/events/impl/CollectionsRepairEventListenerTest.java b/solr/core/src/test/org/apache/solr/cluster/events/impl/CollectionsRepairEventListenerTest.java
index 6645e0a0d76..20d19fdab41 100644
--- a/solr/core/src/test/org/apache/solr/cluster/events/impl/CollectionsRepairEventListenerTest.java
+++ b/solr/core/src/test/org/apache/solr/cluster/events/impl/CollectionsRepairEventListenerTest.java
@@ -151,7 +151,6 @@ public class CollectionsRepairEventListenerTest extends SolrCloudTestCase {
nonOverseerJetty = jetty;
break;
}
- String nodeName = nonOverseerJetty.getNodeName();
cluster.stopJettySolrRunner(nonOverseerJetty);
cluster.waitForJettyToStop(nonOverseerJetty);
eventsListener.waitForExpectedEvent(10);
diff --git a/solr/core/src/test/org/apache/solr/cluster/placement/ClusterAbstractionsForTest.java b/solr/core/src/test/org/apache/solr/cluster/placement/ClusterAbstractionsForTest.java
index 5ddd0b2efda..9d909bab461 100644
--- a/solr/core/src/test/org/apache/solr/cluster/placement/ClusterAbstractionsForTest.java
+++ b/solr/core/src/test/org/apache/solr/cluster/placement/ClusterAbstractionsForTest.java
@@ -18,7 +18,6 @@
package org.apache.solr.cluster.placement;
import java.util.*;
-import java.util.stream.Collectors;
import org.apache.solr.cluster.*;
/**
@@ -65,11 +64,6 @@ class ClusterAbstractionsForTest {
static class NodeImpl implements Node {
public final String nodeName;
- /** Transforms a collection of node names into a set of {@link Node} instances. */
- static Set<Node> getNodes(Collection<String> nodeNames) {
- return nodeNames.stream().map(NodeImpl::new).collect(Collectors.toSet());
- }
-
NodeImpl(String nodeName) {
this.nodeName = nodeName;
}
diff --git a/solr/core/src/test/org/apache/solr/cluster/placement/plugins/AffinityPlacementFactoryTest.java b/solr/core/src/test/org/apache/solr/cluster/placement/plugins/AffinityPlacementFactoryTest.java
index a096eb4939f..7f34ca53ed4 100644
--- a/solr/core/src/test/org/apache/solr/cluster/placement/plugins/AffinityPlacementFactoryTest.java
+++ b/solr/core/src/test/org/apache/solr/cluster/placement/plugins/AffinityPlacementFactoryTest.java
@@ -276,7 +276,7 @@ public class AffinityPlacementFactoryTest extends SolrTestCaseJ4 {
final int AZ2_TLOGPULL = 7;
final int AZ3_NRT_LOWCORES = 4;
- final int AZ3_NRT_HIGHCORES = 6;
+ // final int AZ3_NRT_HIGHCORES = 6;
final int AZ3_TLOGPULL = 8;
final String AZ1 = "AZ1";
@@ -953,7 +953,6 @@ public class AffinityPlacementFactoryTest extends SolrTestCaseJ4 {
PlacementContext placementContext = clusterBuilder.buildPlacementContext();
Map<String, Set<String>> nodeNamesByType = new HashMap<>();
- Cluster cluster = placementContext.getCluster();
AttributeValues attributeValues =
placementContext
.getAttributeFetcher()
@@ -980,7 +979,7 @@ public class AffinityPlacementFactoryTest extends SolrTestCaseJ4 {
assertEquals("expected 3 placements: " + pp, 3, pp.getReplicaPlacements().size());
Set<String> type0nodes = nodeNamesByType.get("type_0");
Set<String> type1nodes = nodeNamesByType.get("type_1");
- Set<String> type2nodes = nodeNamesByType.get("type_2");
+ // Set<String> type2nodes = nodeNamesByType.get("type_2");
for (ReplicaPlacement p : pp.getReplicaPlacements()) {
assertTrue(type0nodes.contains(p.getNode().getName()));
diff --git a/solr/core/src/test/org/apache/solr/core/AlternateDirectoryTest.java b/solr/core/src/test/org/apache/solr/core/AlternateDirectoryTest.java
index 673ac4821c3..4daaf5cdc10 100644
--- a/solr/core/src/test/org/apache/solr/core/AlternateDirectoryTest.java
+++ b/solr/core/src/test/org/apache/solr/core/AlternateDirectoryTest.java
@@ -49,13 +49,12 @@ public class AlternateDirectoryTest extends SolrTestCaseJ4 {
public static class TestFSDirectoryFactory extends StandardDirectoryFactory {
public static volatile boolean openCalled = false;
- public static volatile Directory dir;
@Override
public Directory create(String path, LockFactory lockFactory, DirContext dirContext) {
openCalled = true;
- return dir = newFSDirectory(Path.of(path), lockFactory);
+ return newFSDirectory(Path.of(path), lockFactory);
}
}
diff --git a/solr/core/src/test/org/apache/solr/core/BlobRepositoryCloudTest.java b/solr/core/src/test/org/apache/solr/core/BlobRepositoryCloudTest.java
index bc05f99488f..8fe8c34f79b 100644
--- a/solr/core/src/test/org/apache/solr/core/BlobRepositoryCloudTest.java
+++ b/solr/core/src/test/org/apache/solr/core/BlobRepositoryCloudTest.java
@@ -21,7 +21,6 @@ import java.io.IOException;
import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
import java.nio.file.Path;
-import java.util.HashMap;
import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.client.solrj.impl.CloudSolrClient;
@@ -46,7 +45,6 @@ public class BlobRepositoryCloudTest extends SolrCloudTestCase {
.addConfig("configname", TEST_PATH.resolve("resource-sharing"))
.configure();
// Thread.sleep(2000);
- HashMap<String, String> params = new HashMap<>();
CollectionAdminRequest.createCollection(CollectionAdminParams.SYSTEM_COLL, null, 1, 1)
.process(cluster.getSolrClient());
// test component will fail if it can't find a blob with this data by this name
diff --git a/solr/core/src/test/org/apache/solr/core/DirectoryFactoryTest.java b/solr/core/src/test/org/apache/solr/core/DirectoryFactoryTest.java
index ff696da512e..d5431868d42 100755
--- a/solr/core/src/test/org/apache/solr/core/DirectoryFactoryTest.java
+++ b/solr/core/src/test/org/apache/solr/core/DirectoryFactoryTest.java
@@ -79,7 +79,6 @@ public class DirectoryFactoryTest extends SolrTestCase {
throws Exception {
NodeConfig config = loadNodeConfig("/solr/solr-solrDataHome.xml");
CoreContainer cc = new CoreContainer(config);
- Properties cp = cc.getContainerProperties();
DirectoryFactory df = directoryFactoryClass.getConstructor().newInstance();
df.initCoreContainer(cc);
df.init(new NamedList<>());
diff --git a/solr/core/src/test/org/apache/solr/core/DummyValueSourceParser.java b/solr/core/src/test/org/apache/solr/core/DummyValueSourceParser.java
index 94955aaa12a..9d752a64b12 100644
--- a/solr/core/src/test/org/apache/solr/core/DummyValueSourceParser.java
+++ b/solr/core/src/test/org/apache/solr/core/DummyValueSourceParser.java
@@ -26,12 +26,9 @@ import org.apache.solr.search.ValueSourceParser;
/** Mock ValueSource parser that doesn't do much of anything */
public class DummyValueSourceParser extends ValueSourceParser {
- private NamedList<?> args;
@Override
- public void init(NamedList<?> args) {
- this.args = args;
- }
+ public void init(NamedList<?> args) {}
@Override
public ValueSource parse(FunctionQParser fp) throws SyntaxError {
diff --git a/solr/core/src/test/org/apache/solr/core/SolrCoreCheckLockOnStartupTest.java b/solr/core/src/test/org/apache/solr/core/SolrCoreCheckLockOnStartupTest.java
index a7df47640f0..b682236f0df 100644
--- a/solr/core/src/test/org/apache/solr/core/SolrCoreCheckLockOnStartupTest.java
+++ b/solr/core/src/test/org/apache/solr/core/SolrCoreCheckLockOnStartupTest.java
@@ -91,7 +91,6 @@ public class SolrCoreCheckLockOnStartupTest extends SolrTestCaseJ4 {
System.setProperty("solr.tests.lockType", DirectoryFactory.LOCK_TYPE_NATIVE);
// opening a new core on the same index
initCore("solrconfig-basic.xml", "schema.xml");
- CoreContainer cc = h.getCoreContainer();
if (checkForCoreInitException(LockObtainFailedException.class)) return;
fail("Expected " + LockObtainFailedException.class.getSimpleName());
} finally {
diff --git a/solr/core/src/test/org/apache/solr/core/SolrCoreTest.java b/solr/core/src/test/org/apache/solr/core/SolrCoreTest.java
index 21f8438c451..a84eec13a99 100644
--- a/solr/core/src/test/org/apache/solr/core/SolrCoreTest.java
+++ b/solr/core/src/test/org/apache/solr/core/SolrCoreTest.java
@@ -43,7 +43,6 @@ import org.apache.solr.util.plugin.SolrCoreAware;
import org.junit.Test;
public class SolrCoreTest extends SolrTestCaseJ4 {
- private static final String COLLECTION1 = "collection1";
@Override
public void setUp() throws Exception {
diff --git a/solr/core/src/test/org/apache/solr/core/TestJmxIntegration.java b/solr/core/src/test/org/apache/solr/core/TestJmxIntegration.java
index 885e5012e19..f162fe31dce 100644
--- a/solr/core/src/test/org/apache/solr/core/TestJmxIntegration.java
+++ b/solr/core/src/test/org/apache/solr/core/TestJmxIntegration.java
@@ -158,7 +158,6 @@ public class TestJmxIntegration extends SolrTestCaseJ4 {
log.info("Mbeans in server: {}", mbeanServer.queryNames(null, null));
}
- Set<ObjectInstance> objects = mbeanServer.queryMBeans(searcher, null);
assertFalse(
"No mbean found for SolrIndexSearcher", mbeanServer.queryMBeans(searcher, null).isEmpty());
diff --git a/solr/core/src/test/org/apache/solr/core/TestQuerySenderNoQuery.java b/solr/core/src/test/org/apache/solr/core/TestQuerySenderNoQuery.java
index abd00224cf0..7c14adc41e0 100644
--- a/solr/core/src/test/org/apache/solr/core/TestQuerySenderNoQuery.java
+++ b/solr/core/src/test/org/apache/solr/core/TestQuerySenderNoQuery.java
@@ -40,8 +40,6 @@ public class TestQuerySenderNoQuery extends SolrTestCaseJ4 {
}
public void testListenerCreationCounts() {
- SolrCore core = h.getCore();
-
assertEquals(
"Unexpected number of listeners created",
EXPECTED_MOCK_LISTENER_INSTANCES,
diff --git a/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java b/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java
index 879ee3a8ebf..7b1a40b55ed 100644
--- a/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java
+++ b/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java
@@ -115,7 +115,6 @@ public class TestSolrConfigHandler extends RestTestBase {
@Before
public void before() throws Exception {
File tmpSolrHome = createTempDir().toFile();
- File tmpConfDir = new File(tmpSolrHome, confDir);
FileUtils.copyDirectory(new File(TEST_HOME()), tmpSolrHome.getAbsoluteFile());
final SortedMap<ServletHolder, String> extraServlets = new TreeMap<>();
@@ -167,7 +166,6 @@ public class TestSolrConfigHandler extends RestTestBase {
runConfigCommand(harness, "/config", payload);
MapWriter m = getRespMap("/config/overlay", harness);
- MapWriter props = null;
assertEquals("100", m._getStr("overlay/props/updateHandler/autoCommit/maxDocs", null));
assertEquals("10", m._getStr("overlay/props/updateHandler/autoCommit/maxTime", null));
diff --git a/solr/core/src/test/org/apache/solr/core/snapshots/TestSolrCoreSnapshots.java b/solr/core/src/test/org/apache/solr/core/snapshots/TestSolrCoreSnapshots.java
index c40cc43804b..a7648e09945 100644
--- a/solr/core/src/test/org/apache/solr/core/snapshots/TestSolrCoreSnapshots.java
+++ b/solr/core/src/test/org/apache/solr/core/snapshots/TestSolrCoreSnapshots.java
@@ -16,7 +16,6 @@
*/
package org.apache.solr.core.snapshots;
-import java.lang.invoke.MethodHandles;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Collection;
@@ -53,8 +52,6 @@ import org.apache.solr.handler.BackupRestoreUtils;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* Tests for index backing up and restoring index snapshots.
@@ -68,7 +65,6 @@ import org.slf4j.LoggerFactory;
@SolrTestCaseJ4.SuppressSSL // Currently, unknown why SSL does not work with this test
@Slow
public class TestSolrCoreSnapshots extends SolrCloudTestCase {
- private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static long docsSeed; // see indexDocs()
@BeforeClass
diff --git a/solr/core/src/test/org/apache/solr/handler/ReplicationTestHelper.java b/solr/core/src/test/org/apache/solr/handler/ReplicationTestHelper.java
index 4a9bc1b2015..973a96ce22c 100644
--- a/solr/core/src/test/org/apache/solr/handler/ReplicationTestHelper.java
+++ b/solr/core/src/test/org/apache/solr/handler/ReplicationTestHelper.java
@@ -100,9 +100,6 @@ public final class ReplicationTestHelper {
}
public static void assertVersions(SolrClient client1, SolrClient client2) throws Exception {
- NamedList<Object> details = getDetails(client1);
- @SuppressWarnings({"unchecked"})
- ArrayList<NamedList<Object>> commits = (ArrayList<NamedList<Object>>) details.get("commits");
Long maxVersionClient1 = getVersion(client1);
Long maxVersionClient2 = getVersion(client2);
@@ -203,41 +200,12 @@ public final class ReplicationTestHelper {
return details;
}
- public static NamedList<Object> getIndexVersion(SolrClient s) throws Exception {
-
- ModifiableSolrParams params = new ModifiableSolrParams();
- params.set("command", "indexversion");
- params.set("_trace", "getIndexVersion");
- params.set("qt", ReplicationHandler.PATH);
- QueryRequest req = new QueryRequest(params);
-
- NamedList<Object> res = s.request(req);
- assertReplicationResponseSucceeded(res);
-
- return res;
- }
-
public static void assertReplicationResponseSucceeded(NamedList<?> response) {
assertNotNull("null response from server", response);
assertNotNull("Expected replication response to have 'status' field", response.get("status"));
assertEquals("OK", response.get("status"));
}
- public static NamedList<Object> reloadCore(SolrClient s, String core) throws Exception {
-
- ModifiableSolrParams params = new ModifiableSolrParams();
- params.set("action", "reload");
- params.set("core", core);
- params.set("qt", "/admin/cores");
- QueryRequest req = new QueryRequest(params);
-
- try (HttpSolrClient adminClient = adminClient(s)) {
- NamedList<Object> res = adminClient.request(req);
- assertNotNull("null response from server", res);
- return res;
- }
- }
-
public static HttpSolrClient adminClient(SolrClient client) {
String adminUrl = ((HttpSolrClient) client).getBaseURL().replace("/collection1", "");
return SolrTestCaseJ4.getHttpSolrClient(adminUrl);
diff --git a/solr/core/src/test/org/apache/solr/handler/RequestLoggingTest.java b/solr/core/src/test/org/apache/solr/handler/RequestLoggingTest.java
index 578145455f3..7ec8cb7385f 100644
--- a/solr/core/src/test/org/apache/solr/handler/RequestLoggingTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/RequestLoggingTest.java
@@ -49,7 +49,6 @@ public class RequestLoggingTest extends SolrTestCaseJ4 {
@Before
public void setupAppender() {
- LoggerContext ctx = (LoggerContext) LogManager.getContext(false);
writer = new StringWriter();
appender =
diff --git a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java
index 44e187bc503..68b6d10c245 100644
--- a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java
+++ b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java
@@ -939,10 +939,6 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
assertVersions(leaderClient, followerClient);
- NamedList<Object> details = getDetails(leaderClient);
-
- details = getDetails(followerClient);
-
checkForSingleIndex(leaderJetty);
checkForSingleIndex(followerJetty);
}
diff --git a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandlerDiskOverFlow.java b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandlerDiskOverFlow.java
index 4bf5ff1b2e5..f816cc3b2bf 100644
--- a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandlerDiskOverFlow.java
+++ b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandlerDiskOverFlow.java
@@ -61,8 +61,6 @@ public class TestReplicationHandlerDiskOverFlow extends SolrTestCaseJ4 {
SolrClient leaderClient, followerClient;
ReplicationTestHelper.SolrInstance leader = null, follower = null;
- static String context = "/solr";
-
@Before
public void setUp() throws Exception {
originalDiskSpaceprovider = IndexFetcher.usableDiskSpaceProvider;
diff --git a/solr/core/src/test/org/apache/solr/handler/TestRequestId.java b/solr/core/src/test/org/apache/solr/handler/TestRequestId.java
index c29a0c35d70..e8692ce1d38 100644
--- a/solr/core/src/test/org/apache/solr/handler/TestRequestId.java
+++ b/solr/core/src/test/org/apache/solr/handler/TestRequestId.java
@@ -19,7 +19,6 @@ package org.apache.solr.handler;
import static org.hamcrest.core.StringContains.containsString;
-import java.lang.invoke.MethodHandles;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.common.SolrException.ErrorCode;
import org.apache.solr.common.params.CommonParams;
@@ -27,15 +26,11 @@ import org.apache.solr.common.util.SuppressForbidden;
import org.apache.solr.core.SolrCore;
import org.apache.solr.util.LogListener;
import org.junit.BeforeClass;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.slf4j.MDC;
@SuppressForbidden(reason = "We need to use log4J2 classes directly to test MDC impacts")
public class TestRequestId extends SolrTestCaseJ4 {
- private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
-
@BeforeClass
public static void beforeTests() throws Exception {
initCore("solrconfig.xml", "schema.xml");
diff --git a/solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerConcurrent.java b/solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerConcurrent.java
index 1a43c8d1437..ff824632b31 100644
--- a/solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerConcurrent.java
+++ b/solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerConcurrent.java
@@ -68,12 +68,11 @@ public class TestSolrConfigHandlerConcurrent extends AbstractFullDistribZkTestBa
if (e.getValue() instanceof Map) {
List<String> errs = new ArrayList<>();
collectErrors.add(errs);
- Map<?, ?> value = (Map<?, ?>) e.getValue();
Thread t =
new Thread(
() -> {
try {
- invokeBulkCall((String) e.getKey(), errs, value);
+ invokeBulkCall((String) e.getKey(), errs);
} catch (Exception e1) {
e1.printStackTrace();
}
@@ -97,12 +96,7 @@ public class TestSolrConfigHandlerConcurrent extends AbstractFullDistribZkTestBa
assertTrue(collectErrors.toString(), success);
}
- private void invokeBulkCall(
- String cacheName,
- List<String> errs,
- // TODO this is unused - is that a bug?
- Map<?, ?> val)
- throws Exception {
+ private void invokeBulkCall(String cacheName, List<String> errs) throws Exception {
String payload =
"{"
diff --git a/solr/core/src/test/org/apache/solr/handler/TestStressThreadBackup.java b/solr/core/src/test/org/apache/solr/handler/TestStressThreadBackup.java
index f0282840a1d..b01e3ecec66 100644
--- a/solr/core/src/test/org/apache/solr/handler/TestStressThreadBackup.java
+++ b/solr/core/src/test/org/apache/solr/handler/TestStressThreadBackup.java
@@ -321,8 +321,6 @@ public class TestStressThreadBackup extends SolrCloudTestCase {
/**
* Validates a backup dir exists, passes check index, and contains a number of "real" documents
* that match its name
- *
- * @see #getNumRealDocsFromBackupName
*/
private void validateBackup(final File backup) throws IOException {
log.info("Checking Validity of {}", backup);
diff --git a/solr/core/src/test/org/apache/solr/handler/V2ApiIntegrationTest.java b/solr/core/src/test/org/apache/solr/handler/V2ApiIntegrationTest.java
index 8fc0d6637b9..baf59fe9f9c 100644
--- a/solr/core/src/test/org/apache/solr/handler/V2ApiIntegrationTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/V2ApiIntegrationTest.java
@@ -94,15 +94,6 @@ public class V2ApiIntegrationTest extends SolrCloudTestCase {
incorrectPayload);
}
- private long getStatus(V2Response response) {
- Object header = response.getResponse().get("responseHeader");
- if (header instanceof NamedList) {
- return (int) ((NamedList<?>) header).get("status");
- } else {
- return (long) ((Map<?, ?>) header).get("status");
- }
- }
-
@Test
public void testIntrospect() throws Exception {
ModifiableSolrParams params = new ModifiableSolrParams();
diff --git a/solr/core/src/test/org/apache/solr/handler/V2UpdateAPIMappingTest.java b/solr/core/src/test/org/apache/solr/handler/V2UpdateAPIMappingTest.java
index 39f6de7efcf..2c8d11fed48 100644
--- a/solr/core/src/test/org/apache/solr/handler/V2UpdateAPIMappingTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/V2UpdateAPIMappingTest.java
@@ -30,7 +30,6 @@ import java.util.Map;
import org.apache.solr.api.Api;
import org.apache.solr.api.ApiBag;
import org.apache.solr.common.util.CommandOperation;
-import org.apache.solr.handler.admin.ConfigSetsHandler;
import org.apache.solr.handler.admin.api.UpdateAPI;
import org.apache.solr.request.LocalSolrQueryRequest;
import org.apache.solr.request.SolrQueryRequest;
@@ -38,14 +37,11 @@ import org.apache.solr.response.SolrQueryResponse;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.mockito.ArgumentCaptor;
/** Unit tests for the v2 to v1 mapping logic in {@link UpdateAPI} */
public class V2UpdateAPIMappingTest {
private ApiBag apiBag;
- private ArgumentCaptor<SolrQueryRequest> queryRequestCaptor;
private UpdateRequestHandler mockUpdateHandler;
- private ConfigSetsHandler mockConfigSetHandler;
@BeforeClass
public static void ensureWorkingMockito() {
@@ -55,9 +51,6 @@ public class V2UpdateAPIMappingTest {
@Before
public void setupApiBag() {
mockUpdateHandler = mock(UpdateRequestHandler.class);
- mockConfigSetHandler = mock(ConfigSetsHandler.class);
- queryRequestCaptor = ArgumentCaptor.forClass(SolrQueryRequest.class);
-
apiBag = new ApiBag(false);
final UpdateAPI updateAPI = new UpdateAPI(mockUpdateHandler);
diff --git a/solr/core/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java
index 08d4d6c1f84..2297a3f6618 100644
--- a/solr/core/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java
@@ -40,19 +40,16 @@ import org.junit.Test;
/** Tests the UpdateRequestHandler support for XML updates. */
public class XmlUpdateRequestHandlerTest extends SolrTestCaseJ4 {
private static XMLInputFactory inputFactory;
- protected static UpdateRequestHandler handler;
@BeforeClass
public static void beforeTests() throws Exception {
initCore("solrconfig.xml", "schema.xml");
- handler = new UpdateRequestHandler();
inputFactory = XMLInputFactory.newInstance();
}
@AfterClass
public static void afterTests() {
inputFactory = null;
- handler = null;
}
@Test
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/SecurityConfHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/SecurityConfHandlerTest.java
index 64bd120e343..a35c8120953 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/SecurityConfHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/SecurityConfHandlerTest.java
@@ -201,10 +201,6 @@ public class SecurityConfHandlerTest extends SolrTestCaseJ4 {
rulesBasedAuthorizationPlugin.init(new HashMap<>());
}
- public Map<String, SecurityConfig> getM() {
- return m;
- }
-
@Override
Object getPlugin(String key) {
if (key.equals("authentication")) {
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/TestCollectionAPIs.java b/solr/core/src/test/org/apache/solr/handler/admin/TestCollectionAPIs.java
index 79ad7e42913..bee88cfda84 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/TestCollectionAPIs.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/TestCollectionAPIs.java
@@ -25,7 +25,6 @@ import static org.apache.solr.common.params.CollectionAdminParams.PROPERTY_VALUE
import static org.apache.solr.common.params.CommonParams.NAME;
import static org.apache.solr.common.util.Utils.fromJSONString;
-import java.lang.invoke.MethodHandles;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
@@ -54,11 +53,8 @@ import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.response.SolrQueryResponse;
import org.apache.solr.servlet.SolrRequestParsers;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class TestCollectionAPIs extends SolrTestCaseJ4 {
- private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@Test
public void testCopyParamsToMap() {
@@ -267,22 +263,6 @@ public class TestCollectionAPIs extends SolrTestCaseJ4 {
return output;
}
- static void assertErrorContains(
- final ApiBag apiBag,
- final String path,
- final SolrRequest.METHOD method,
- final String payload,
- String expectedErrorMsg) {
- RuntimeException e =
- expectThrows(RuntimeException.class, () -> makeCall(apiBag, path, method, payload));
- assertTrue(
- "Expected exception with error message '"
- + expectedErrorMsg
- + "' but got: "
- + e.getMessage(),
- e.getMessage().contains(expectedErrorMsg));
- }
-
public static Pair<SolrQueryRequest, SolrQueryResponse> makeCall(
final ApiBag apiBag, String path, final SolrRequest.METHOD method, final String payload) {
SolrParams queryParams = new MultiMapSolrParams(Collections.emptyMap());
diff --git a/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetExistsSmallTest.java b/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetExistsSmallTest.java
index 66fbab59198..5b7d2025687 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetExistsSmallTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetExistsSmallTest.java
@@ -21,7 +21,6 @@ import static org.hamcrest.CoreMatchers.is;
import java.util.List;
import java.util.Random;
import org.apache.solr.BaseDistributedSearchTestCase;
-import org.apache.solr.client.solrj.SolrClient;
import org.apache.solr.client.solrj.response.FacetField;
import org.apache.solr.client.solrj.response.QueryResponse;
import org.apache.solr.common.SolrException;
@@ -54,7 +53,7 @@ public class DistributedFacetExistsSmallTest extends BaseDistributedSearchTestCa
index(id, maxId += 1 + rnd.nextInt(5), FLD, "CCC");
index(id, maxId += 1 + rnd.nextInt(5), FLD, "CCC");
- final SolrClient shard0 = clients.get(0);
+ // final SolrClient shard0 = clients.get(0);
// expectedly fails test
// shard0.add(sdoc("id", 13, FLD, "DDD"));
commit();
diff --git a/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java
index b8d2df57e2c..a0a9f733a50 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java
@@ -465,7 +465,6 @@ public class StatsComponentTest extends SolrTestCaseJ4 {
public void testFieldStatisticsResultsStringField() {
String f = "active_s";
- SolrCore core = h.getCore();
assertU(adoc("id", "1", f, "string1"));
assertU(adoc("id", "2", f, "string2"));
assertU(adoc("id", "3", f, "string3"));
@@ -645,7 +644,6 @@ public class StatsComponentTest extends SolrTestCaseJ4 {
assertU(adoc("id", "4", f, "-40"));
assertU(commit());
- final String fpre = XPRE + "lst[@name='stats_fields']/lst[@name='" + f + "']/";
final String key = "key_key";
final String kpre = XPRE + "lst[@name='stats_fields']/lst[@name='" + key + "']/";
@@ -1601,7 +1599,6 @@ public class StatsComponentTest extends SolrTestCaseJ4 {
EnumSet<Stat> allStats = EnumSet.allOf(Stat.class);
- final List<ExpectedStat> expected = new ArrayList<ExpectedStat>(allStats.size());
ExpectedStat.createSimple(Stat.min, "true", "double", "0.0");
ExpectedStat.createSimple(Stat.max, "true", "double", "9.0");
ExpectedStat.createSimple(Stat.missing, "true", "long", "0");
diff --git a/solr/core/src/test/org/apache/solr/handler/component/SuggestComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/SuggestComponentTest.java
index 76c45d12142..e805c96b6ef 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/SuggestComponentTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/SuggestComponentTest.java
@@ -18,8 +18,6 @@ package org.apache.solr.handler.component;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.common.SolrException;
-import org.apache.solr.core.CoreContainer;
-import org.apache.solr.core.CoreDescriptor;
import org.apache.solr.core.SolrCore;
import org.apache.solr.spelling.suggest.SuggesterParams;
import org.junit.BeforeClass;
@@ -29,8 +27,6 @@ public class SuggestComponentTest extends SolrTestCaseJ4 {
private static final String rh = "/suggest";
- private static CoreContainer cc;
-
@BeforeClass
public static void beforeClass() throws Exception {
initCore("solrconfig-suggestercomponent.xml", "schema.xml");
@@ -821,10 +817,8 @@ public class SuggestComponentTest extends SolrTestCaseJ4 {
private void reloadCore(boolean createNewCore) throws Exception {
if (createNewCore) {
- CoreContainer cores = h.getCoreContainer();
SolrCore core = h.getCore();
String dataDir1 = core.getDataDir();
- CoreDescriptor cd = core.getCoreDescriptor();
h.close();
createCore();
SolrCore createdCore = h.getCore();
diff --git a/solr/core/src/test/org/apache/solr/handler/component/TermsComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/TermsComponentTest.java
index 62c60389e2f..ba041108157 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/TermsComponentTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/TermsComponentTest.java
@@ -27,7 +27,6 @@ import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.common.params.TermsParams;
import org.apache.solr.request.SolrQueryRequest;
-import org.apache.solr.schema.SchemaField;
import org.apache.solr.search.PointMerger;
import org.junit.Before;
import org.junit.BeforeClass;
@@ -695,9 +694,7 @@ public class TermsComponentTest extends SolrTestCaseJ4 {
"terms.fl", "foo_pi");
;
try {
- SchemaField sf = req.getSchema().getField("foo_pi");
-
- /*
+ /* SchemaField sf = req.getSchema().getField("foo_pi");
* LeafReader r = req.getSearcher().getIndexReader().leaves().get(0).reader(); PointValues pv
* = r.getPointValues("foo_pi"); System.out.println("pv=" + pv); if (pv instanceof
* AssertingLeafReader.AssertingPointValues) { pv =
diff --git a/solr/core/src/test/org/apache/solr/handler/component/TestDistributedStatsComponentCardinality.java b/solr/core/src/test/org/apache/solr/handler/component/TestDistributedStatsComponentCardinality.java
index c08508eedab..85bcf56d1b5 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/TestDistributedStatsComponentCardinality.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/TestDistributedStatsComponentCardinality.java
@@ -53,7 +53,6 @@ public class TestDistributedStatsComponentCardinality extends BaseDistributedSea
static final long BIG_PRIME = 982451653L;
static final int MIN_NUM_DOCS = 10000;
- static final int MAX_NUM_DOCS = MIN_NUM_DOCS * 2;
static final List<String> STAT_FIELDS =
Collections.unmodifiableList(Arrays.asList("int_i", "long_l", "string_s"));
diff --git a/solr/core/src/test/org/apache/solr/handler/tagger/TaggerTest.java b/solr/core/src/test/org/apache/solr/handler/tagger/TaggerTest.java
index ca67d4e22ed..106f96e87fa 100644
--- a/solr/core/src/test/org/apache/solr/handler/tagger/TaggerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/tagger/TaggerTest.java
@@ -61,14 +61,6 @@ public class TaggerTest extends TaggerTestCase {
String getName() {
return name().replace('_', ' ');
}
-
- static N lookupByName(String name) {
- return N.valueOf(name.replace(' ', '_'));
- }
-
- int getId() {
- return ordinal();
- }
}
public void testFormat() throws Exception {
diff --git a/solr/core/src/test/org/apache/solr/handler/tagger/WordLengthTaggingFilter.java b/solr/core/src/test/org/apache/solr/handler/tagger/WordLengthTaggingFilter.java
index 68b2f3671b9..33e09b55c0d 100644
--- a/solr/core/src/test/org/apache/solr/handler/tagger/WordLengthTaggingFilter.java
+++ b/solr/core/src/test/org/apache/solr/handler/tagger/WordLengthTaggingFilter.java
@@ -68,14 +68,6 @@ public class WordLengthTaggingFilter extends TokenFilter {
private final OffsetAttribute offsetAtt = addAttribute(OffsetAttribute.class);
private int minLength;
- /**
- * TokenFilter only marks tokens to be looked up with equals or more as {@link
- * #DEFAULT_MIN_LENGTH} characters
- */
- public WordLengthTaggingFilter(TokenStream input) {
- this(input, null);
- }
-
/**
* TokenFilter only marks tokens to be looked up with equals or more characters as the parsed
* minimum.
diff --git a/solr/core/src/test/org/apache/solr/internal/csv/CSVParserTest.java b/solr/core/src/test/org/apache/solr/internal/csv/CSVParserTest.java
index 361678fae89..0484b87170c 100644
--- a/solr/core/src/test/org/apache/solr/internal/csv/CSVParserTest.java
+++ b/solr/core/src/test/org/apache/solr/internal/csv/CSVParserTest.java
@@ -377,37 +377,6 @@ public class CSVParserTest extends TestCase {
}
}
- public void OLDtestBackslashEscaping() throws IOException {
- String code =
- "one,two,three\n"
- + "on\\\"e,two\n"
- + "on\"e,two\n"
- + "one,\"tw\\\"o\"\n"
- + "one,\"t\\,wo\"\n"
- + "one,two,\"th,ree\"\n"
- + "\"a\\\\\"\n"
- + "a\\,b\n"
- + "\"a\\\\,b\"";
- String[][] res = {
- {"one", "two", "three"},
- {"on\\\"e", "two"},
- {"on\"e", "two"},
- {"one", "tw\"o"},
- {"one", "t\\,wo"}, // backslash in quotes only escapes a delimiter (",")
- {"one", "two", "th,ree"},
- {"a\\\\"}, // backslash in quotes only escapes a delimiter (",")
- {"a\\", "b"}, // a backslash must be returned
- {"a\\\\,b"} // backslash in quotes only escapes a delimiter (",")
- };
- CSVParser parser = new CSVParser(new StringReader(code));
- String[][] tmp = parser.getAllValues();
- assertEquals(res.length, tmp.length);
- assertTrue(tmp.length > 0);
- for (int i = 0; i < res.length; i++) {
- assertTrue(Arrays.equals(res[i], tmp[i]));
- }
- }
-
public void testBackslashEscaping() throws IOException {
// To avoid confusion over the need for escaping chars in java code,
diff --git a/solr/core/src/test/org/apache/solr/metrics/MetricsConfigTest.java b/solr/core/src/test/org/apache/solr/metrics/MetricsConfigTest.java
index 4ca364dc8fd..2b0d4b69525 100644
--- a/solr/core/src/test/org/apache/solr/metrics/MetricsConfigTest.java
+++ b/solr/core/src/test/org/apache/solr/metrics/MetricsConfigTest.java
@@ -22,15 +22,12 @@ import com.codahale.metrics.ExponentiallyDecayingReservoir;
import com.codahale.metrics.Reservoir;
import com.codahale.metrics.SlidingTimeWindowReservoir;
import com.codahale.metrics.UniformReservoir;
-import java.io.File;
import java.io.InputStream;
import java.util.Map;
import java.util.Properties;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.core.NodeConfig;
import org.apache.solr.core.SolrXmlConfig;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.RuleChain;
@@ -40,19 +37,6 @@ import org.junit.rules.TestRule;
public class MetricsConfigTest extends SolrTestCaseJ4 {
@Rule public TestRule solrTestRules = RuleChain.outerRule(new SystemPropertiesRestoreRule());
- // tmp dir, cleaned up automatically.
- private static File solrHome = null;
-
- @BeforeClass
- public static void setupLoader() {
- solrHome = createTempDir().toFile();
- }
-
- @AfterClass
- public static void cleanupLoader() {
- solrHome = null;
- }
-
@Test
public void testDefaults() {
NodeConfig cfg = loadNodeConfig("solr-metricsconfig.xml");
diff --git a/solr/core/src/test/org/apache/solr/metrics/MetricsDisabledCloudTest.java b/solr/core/src/test/org/apache/solr/metrics/MetricsDisabledCloudTest.java
index 55cf95f3a74..2b3f50b0a4d 100644
--- a/solr/core/src/test/org/apache/solr/metrics/MetricsDisabledCloudTest.java
+++ b/solr/core/src/test/org/apache/solr/metrics/MetricsDisabledCloudTest.java
@@ -32,8 +32,7 @@ public class MetricsDisabledCloudTest extends SolrCloudTestCase {
public static void startCluster() throws Exception {
System.setProperty("metricsEnabled", "false");
configureCluster(2).configure();
- CollectionAdminRequest.Create create =
- CollectionAdminRequest.createCollection("test", "config", 1, 2);
+ CollectionAdminRequest.createCollection("test", "config", 1, 2);
}
@Test
diff --git a/solr/core/src/test/org/apache/solr/metrics/SolrCoreMetricManagerTest.java b/solr/core/src/test/org/apache/solr/metrics/SolrCoreMetricManagerTest.java
index a352b555744..3559a665f91 100644
--- a/solr/core/src/test/org/apache/solr/metrics/SolrCoreMetricManagerTest.java
+++ b/solr/core/src/test/org/apache/solr/metrics/SolrCoreMetricManagerTest.java
@@ -64,8 +64,7 @@ public class SolrCoreMetricManagerTest extends SolrTestCaseJ4 {
String scope = SolrMetricTestUtils.getRandomScope(random);
SolrInfoBean.Category category = SolrMetricTestUtils.getRandomCategory(random);
Map<String, Counter> metrics = SolrMetricTestUtils.getRandomMetrics(random);
- SolrMetricProducer producer =
- SolrMetricTestUtils.getProducerOf(metricManager, category, scope, metrics);
+ SolrMetricProducer producer = SolrMetricTestUtils.getProducerOf(category, scope, metrics);
try {
coreMetricManager.registerMetricProducer(scope, producer);
assertNotNull(scope);
@@ -94,8 +93,7 @@ public class SolrCoreMetricManagerTest extends SolrTestCaseJ4 {
if (metrics.isEmpty()) {
continue;
}
- SolrMetricProducer producer =
- SolrMetricTestUtils.getProducerOf(metricManager, category, scope, metrics);
+ SolrMetricProducer producer = SolrMetricTestUtils.getProducerOf(category, scope, metrics);
coreMetricManager.registerMetricProducer(scope, producer);
registered.putAll(metrics);
assertRegistered(scope, registered, coreMetricManager);
diff --git a/solr/core/src/test/org/apache/solr/metrics/SolrMetricTestUtils.java b/solr/core/src/test/org/apache/solr/metrics/SolrMetricTestUtils.java
index c0a80e2a843..e1cd960eb15 100644
--- a/solr/core/src/test/org/apache/solr/metrics/SolrMetricTestUtils.java
+++ b/solr/core/src/test/org/apache/solr/metrics/SolrMetricTestUtils.java
@@ -83,10 +83,7 @@ public final class SolrMetricTestUtils {
}
public static SolrMetricProducer getProducerOf(
- SolrMetricManager metricManager,
- SolrInfoBean.Category category,
- String scope,
- Map<String, Counter> metrics) {
+ SolrInfoBean.Category category, String scope, Map<String, Counter> metrics) {
return new SolrMetricProducer() {
SolrMetricsContext solrMetricsContext;
diff --git a/solr/core/src/test/org/apache/solr/metrics/reporters/SolrJmxReporterTest.java b/solr/core/src/test/org/apache/solr/metrics/reporters/SolrJmxReporterTest.java
index 6edd1cf13df..b3fc5a49055 100644
--- a/solr/core/src/test/org/apache/solr/metrics/reporters/SolrJmxReporterTest.java
+++ b/solr/core/src/test/org/apache/solr/metrics/reporters/SolrJmxReporterTest.java
@@ -168,8 +168,7 @@ public class SolrJmxReporterTest extends SolrTestCaseJ4 {
for (int i = 0; i < iterations; ++i) {
Map<String, Counter> metrics =
SolrMetricTestUtils.getRandomMetricsWithReplacements(random, registered);
- SolrMetricProducer producer =
- SolrMetricTestUtils.getProducerOf(metricManager, category, scope, metrics);
+ SolrMetricProducer producer = SolrMetricTestUtils.getProducerOf(category, scope, metrics);
coreMetricManager.registerMetricProducer(scope, producer);
registered.putAll(metrics);
// waitForListener();
@@ -192,8 +191,7 @@ public class SolrJmxReporterTest extends SolrTestCaseJ4 {
String scope = PREFIX + SolrMetricTestUtils.getRandomScope(random, true);
SolrInfoBean.Category category = SolrMetricTestUtils.getRandomCategory(random, true);
Map<String, Counter> metrics = SolrMetricTestUtils.getRandomMetrics(random, true);
- SolrMetricProducer producer =
- SolrMetricTestUtils.getProducerOf(metricManager, category, scope, metrics);
+ SolrMetricProducer producer = SolrMetricTestUtils.getProducerOf(category, scope, metrics);
coreMetricManager.registerMetricProducer(scope, producer);
Set<ObjectInstance> objects = TEST_MBEAN_SERVER.queryMBeans(null, null);
assertEquals(
@@ -290,8 +288,7 @@ public class SolrJmxReporterTest extends SolrTestCaseJ4 {
String scope = PREFIX + SolrMetricTestUtils.getRandomScope(random(), true);
SolrInfoBean.Category category = SolrMetricTestUtils.getRandomCategory(random(), true);
Map<String, Counter> metrics = SolrMetricTestUtils.getRandomMetrics(random(), true);
- SolrMetricProducer producer =
- SolrMetricTestUtils.getProducerOf(metricManager, category, scope, metrics);
+ SolrMetricProducer producer = SolrMetricTestUtils.getProducerOf(category, scope, metrics);
coreMetricManager.registerMetricProducer(scope, producer);
Set<ObjectInstance> objects = TEST_MBEAN_SERVER.queryMBeans(null, null);
assertEquals(
diff --git a/solr/core/src/test/org/apache/solr/request/TestStreamBody.java b/solr/core/src/test/org/apache/solr/request/TestStreamBody.java
index ffca1e89a03..6981d812bc1 100644
--- a/solr/core/src/test/org/apache/solr/request/TestStreamBody.java
+++ b/solr/core/src/test/org/apache/solr/request/TestStreamBody.java
@@ -40,7 +40,6 @@ public class TestStreamBody extends RestTestBase {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static final String collection = "collection1";
- private static final String confDir = collection + "/conf";
@Before
public void before() throws Exception {
diff --git a/solr/core/src/test/org/apache/solr/request/TestWriterPerf.java b/solr/core/src/test/org/apache/solr/request/TestWriterPerf.java
index 72323e1cb96..c8e7a05ce0b 100644
--- a/solr/core/src/test/org/apache/solr/request/TestWriterPerf.java
+++ b/solr/core/src/test/org/apache/solr/request/TestWriterPerf.java
@@ -270,8 +270,8 @@ public class TestWriterPerf extends SolrTestCaseJ4 {
doPerf("json", req, 2, 2);
doPerf("javabin", req, 2, 2);
- int encIter = 20000;
- int decIter = 50000;
+ // int encIter = 20000;
+ // int decIter = 50000;
// warm up hotspot
// doPerf("xml", req, 200,1000);
diff --git a/solr/core/src/test/org/apache/solr/response/transform/TestSubQueryTransformer.java b/solr/core/src/test/org/apache/solr/response/transform/TestSubQueryTransformer.java
index b2a13627df6..9fa02edf51f 100644
--- a/solr/core/src/test/org/apache/solr/response/transform/TestSubQueryTransformer.java
+++ b/solr/core/src/test/org/apache/solr/response/transform/TestSubQueryTransformer.java
@@ -920,33 +920,4 @@ public class TestSubQueryTransformer extends SolrTestCaseJ4 {
"" + (deptMultiplier * 2)),
noMatchAtSubQ);
}
-
- static String[] daveMultiValueSearchParams(Random random, int peopleMult, int deptMult) {
- return new String[] {
- "q",
- "name_s:dave",
- "indent",
- "true",
- "fl",
- (random().nextBoolean() ? "name_s_dv" : "*")
- + // "dept_ss_dv,
- ",subq1:[subquery "
- + ((random.nextBoolean() ? "" : "separator=,"))
- + "]",
- "rows",
- "" + peopleMult,
- "subq1.q",
- "{!terms f=dept_id_s v=$row.dept_ss_dv "
- + ((random.nextBoolean() ? "" : "separator=,"))
- + "}",
- "subq1.fl",
- "text_t",
- "subq1.indent",
- "true",
- "subq1.rows",
- "" + (deptMult * 2),
- "subq1.logParamsList",
- "q,fl,rows,row.dept_ss_dv"
- };
- }
}
diff --git a/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedStopFilterFactory.java b/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedStopFilterFactory.java
index 7f7a12cc216..f9861d69692 100644
--- a/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedStopFilterFactory.java
+++ b/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedStopFilterFactory.java
@@ -43,7 +43,6 @@ public class TestManagedStopFilterFactory extends RestTestBase {
@Before
public void before() throws Exception {
File tmpSolrHome = createTempDir().toFile();
- File tmpConfDir = new File(tmpSolrHome, confDir);
FileUtils.copyDirectory(new File(TEST_HOME()), tmpSolrHome.getAbsoluteFile());
final SortedMap<ServletHolder, String> extraServlets = new TreeMap<>();
diff --git a/solr/core/src/test/org/apache/solr/schema/TestPointFields.java b/solr/core/src/test/org/apache/solr/schema/TestPointFields.java
index 00185e33c0a..e930e00f8e9 100644
--- a/solr/core/src/test/org/apache/solr/schema/TestPointFields.java
+++ b/solr/core/src/test/org/apache/solr/schema/TestPointFields.java
@@ -632,11 +632,10 @@ public class TestPointFields extends SolrTestCaseJ4 {
@Test
public void testIntPointMultiValuedFunctionQuery() throws Exception {
doTestPointMultiValuedFunctionQuery(
- "number_p_i_mv", "number_p_i_mv_dv", "int", getSequentialStringArrayWithInts(20));
+ "number_p_i_mv", "number_p_i_mv_dv", getSequentialStringArrayWithInts(20));
doTestPointMultiValuedFunctionQuery(
"number_p_i_mv",
"number_p_i_mv_dv",
- "int",
toStringArray(getRandomInts(20, false).stream().sorted().collect(Collectors.toList())));
}
@@ -1272,11 +1271,10 @@ public class TestPointFields extends SolrTestCaseJ4 {
@Test
public void testDoublePointMultiValuedFunctionQuery() throws Exception {
doTestPointMultiValuedFunctionQuery(
- "number_p_d_mv", "number_p_d_mv_dv", "double", getSequentialStringArrayWithDoubles(20));
+ "number_p_d_mv", "number_p_d_mv_dv", getSequentialStringArrayWithDoubles(20));
doTestPointMultiValuedFunctionQuery(
"number_p_d_mv",
"number_p_d_mv_dv",
- "double",
toAscendingStringArray(getRandomFloats(20, false), true));
}
@@ -1887,11 +1885,10 @@ public class TestPointFields extends SolrTestCaseJ4 {
@Test
public void testFloatPointMultiValuedFunctionQuery() throws Exception {
doTestPointMultiValuedFunctionQuery(
- "number_p_f_mv", "number_p_f_mv_dv", "float", getSequentialStringArrayWithDoubles(20));
+ "number_p_f_mv", "number_p_f_mv_dv", getSequentialStringArrayWithDoubles(20));
doTestPointMultiValuedFunctionQuery(
"number_p_f_mv",
"number_p_f_mv_dv",
- "float",
toAscendingStringArray(getRandomFloats(20, false), true));
}
@@ -2449,11 +2446,10 @@ public class TestPointFields extends SolrTestCaseJ4 {
@Test
public void testLongPointMultiValuedFunctionQuery() throws Exception {
doTestPointMultiValuedFunctionQuery(
- "number_p_l_mv", "number_p_l_mv_dv", "long", getSequentialStringArrayWithInts(20));
+ "number_p_l_mv", "number_p_l_mv_dv", getSequentialStringArrayWithInts(20));
doTestPointMultiValuedFunctionQuery(
"number_p_l_mv",
"number_p_l_mv_dv",
- "long",
toStringArray(getRandomLongs(20, false).stream().sorted().collect(Collectors.toList())));
}
@@ -3085,7 +3081,7 @@ public class TestPointFields extends SolrTestCaseJ4 {
public void testDatePointMultiValuedFunctionQuery() throws Exception {
String[] dates =
toStringArray(getRandomInstants(20, false).stream().sorted().collect(Collectors.toList()));
- doTestPointMultiValuedFunctionQuery("number_p_dt_mv", "number_p_dt_mv_dv", "date", dates);
+ doTestPointMultiValuedFunctionQuery("number_p_dt_mv", "number_p_dt_mv_dv", dates);
}
@Test
@@ -4593,7 +4589,7 @@ public class TestPointFields extends SolrTestCaseJ4 {
}
private void doTestPointMultiValuedFunctionQuery(
- String nonDocValuesField, String docValuesField, String type, String[] numbers) {
+ String nonDocValuesField, String docValuesField, String[] numbers) {
assert numbers != null && numbers.length == 20;
for (int i = 0; i < 10; i++) {
assertU(
diff --git a/solr/core/src/test/org/apache/solr/search/CurrencyRangeFacetCloudTest.java b/solr/core/src/test/org/apache/solr/search/CurrencyRangeFacetCloudTest.java
index 8edfa603b86..0d8ac7a7c88 100644
--- a/solr/core/src/test/org/apache/solr/search/CurrencyRangeFacetCloudTest.java
+++ b/solr/core/src/test/org/apache/solr/search/CurrencyRangeFacetCloudTest.java
@@ -34,13 +34,9 @@ import org.apache.solr.common.util.NamedList;
import org.apache.solr.schema.CurrencyFieldTypeTest;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class CurrencyRangeFacetCloudTest extends SolrCloudTestCase {
- private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
-
private static final String COLLECTION = MethodHandles.lookup().lookupClass().getName();
private static final String CONF = COLLECTION + "_configSet";
diff --git a/solr/core/src/test/org/apache/solr/search/RankQueryTestPlugin.java b/solr/core/src/test/org/apache/solr/search/RankQueryTestPlugin.java
index ff3a8421892..fb37c243b95 100644
--- a/solr/core/src/test/org/apache/solr/search/RankQueryTestPlugin.java
+++ b/solr/core/src/test/org/apache/solr/search/RankQueryTestPlugin.java
@@ -535,13 +535,12 @@ public class RankQueryTestPlugin extends QParserPlugin {
numFound += docs.getNumFound();
SortSpec ss = rb.getSortSpec();
- Sort sort = ss.getSort();
@SuppressWarnings({"rawtypes"})
NamedList sortFieldValues =
(NamedList) (srsp.getSolrResponse().getResponse().get("merge_values"));
@SuppressWarnings({"rawtypes"})
- NamedList unmarshalledSortFieldValues = unmarshalSortValues(ss, sortFieldValues, schema);
+ NamedList unmarshalledSortFieldValues = unmarshalSortValues(ss, sortFieldValues);
@SuppressWarnings({"rawtypes"})
List lst = (List) unmarshalledSortFieldValues.getVal(0);
@@ -625,8 +624,7 @@ public class RankQueryTestPlugin extends QParserPlugin {
}
@SuppressWarnings({"unchecked", "rawtypes"})
- private NamedList unmarshalSortValues(
- SortSpec sortSpec, NamedList sortFieldValues, IndexSchema schema) {
+ private NamedList unmarshalSortValues(SortSpec sortSpec, NamedList sortFieldValues) {
NamedList unmarshalledSortValsPerField = new NamedList<>();
if (0 == sortFieldValues.size()) return unmarshalledSortValsPerField;
diff --git a/solr/core/src/test/org/apache/solr/search/TestDocSet.java b/solr/core/src/test/org/apache/solr/search/TestDocSet.java
index 3d844936f69..5dc68c09422 100644
--- a/solr/core/src/test/org/apache/solr/search/TestDocSet.java
+++ b/solr/core/src/test/org/apache/solr/search/TestDocSet.java
@@ -41,8 +41,6 @@ import org.apache.lucene.index.Terms;
import org.apache.lucene.index.VectorValues;
import org.apache.lucene.search.DocIdSet;
import org.apache.lucene.search.DocIdSetIterator;
-import org.apache.lucene.search.ScoreMode;
-import org.apache.lucene.search.Scorer;
import org.apache.lucene.search.TopDocs;
import org.apache.lucene.search.TotalHits;
import org.apache.lucene.util.BitSetIterator;
@@ -54,7 +52,6 @@ import org.apache.solr.SolrTestCase;
/** */
public class TestDocSet extends SolrTestCase {
Random rand;
- private Object IndexSearcher;
@Override
public void setUp() throws Exception {
@@ -610,12 +607,6 @@ public class TestDocSet extends SolrTestCase {
}
}
- private DocIdSetIterator getDocIdSetIteratorFromQuery(
- DocSetQuery dsq, LeafReaderContext readerContext) throws IOException {
- Scorer scorer = dsq.createWeight(null, ScoreMode.COMPLETE_NO_SCORES, 0).scorer(readerContext);
- return scorer != null ? scorer.iterator() : null;
- }
-
private static final int MAX_SRC_SIZE = 130; // push _just_ into 3 `long` "words"
public void testCopyBitsToRange() {
diff --git a/solr/core/src/test/org/apache/solr/search/TestFiltering.java b/solr/core/src/test/org/apache/solr/search/TestFiltering.java
index 7cb020957c9..d00097a27ee 100644
--- a/solr/core/src/test/org/apache/solr/search/TestFiltering.java
+++ b/solr/core/src/test/org/apache/solr/search/TestFiltering.java
@@ -358,7 +358,7 @@ public class TestFiltering extends SolrTestCaseJ4 {
return ret;
}
- String makeRandomQuery(Model model, boolean mainQuery, boolean facetQuery) {
+ String makeRandomQuery(Model model, boolean facetQuery) {
boolean cache = random().nextBoolean();
int cost = cache ? 0 : random().nextBoolean() ? random().nextInt(200) : 0;
@@ -499,12 +499,12 @@ public class TestFiltering extends SolrTestCaseJ4 {
model.clear();
List<String> params = new ArrayList<>();
params.add("q");
- params.add(makeRandomQuery(model, true, false));
+ params.add(makeRandomQuery(model, false));
int nFilters = random().nextInt(5);
for (int i = 0; i < nFilters; i++) {
params.add("fq");
- params.add(makeRandomQuery(model, false, false));
+ params.add(makeRandomQuery(model, false));
}
boolean facet = random().nextBoolean();
@@ -517,7 +517,7 @@ public class TestFiltering extends SolrTestCaseJ4 {
params.add("facet.query");
params.add("{!key=multiSelect ex=t}*:*");
- String facetQuery = makeRandomQuery(model, false, true);
+ String facetQuery = makeRandomQuery(model, true);
if (facetQuery.startsWith("{!")) {
facetQuery = "{!key=facetQuery " + facetQuery.substring(2);
} else {
diff --git a/solr/core/src/test/org/apache/solr/search/TestOverriddenPrefixQueryForCustomFieldType.java b/solr/core/src/test/org/apache/solr/search/TestOverriddenPrefixQueryForCustomFieldType.java
index 8d11b723a76..6f3db9c365f 100644
--- a/solr/core/src/test/org/apache/solr/search/TestOverriddenPrefixQueryForCustomFieldType.java
+++ b/solr/core/src/test/org/apache/solr/search/TestOverriddenPrefixQueryForCustomFieldType.java
@@ -31,7 +31,6 @@ public class TestOverriddenPrefixQueryForCustomFieldType extends SolrTestCaseJ4
private static int[] counts = new int[2];
private static int otherCounts;
- String[] otherTerms = {"this", "that", "those", "randomness"};
@BeforeClass
public static void beforeClass() throws Exception {
diff --git a/solr/core/src/test/org/apache/solr/search/TestSearchPerf.java b/solr/core/src/test/org/apache/solr/search/TestSearchPerf.java
index d04bcb7199d..e5fbcb4e81f 100644
--- a/solr/core/src/test/org/apache/solr/search/TestSearchPerf.java
+++ b/solr/core/src/test/org/apache/solr/search/TestSearchPerf.java
@@ -55,10 +55,8 @@ public class TestSearchPerf extends SolrTestCaseJ4 {
}
Random r = new Random(0); // specific seed for reproducible perf testing
- int nDocs;
void createIndex(int nDocs) {
- this.nDocs = nDocs;
assertU(delQ("*:*"));
for (int i = 0; i < nDocs; i++) {
assertU(
diff --git a/solr/core/src/test/org/apache/solr/search/TestSolrFieldCacheBean.java b/solr/core/src/test/org/apache/solr/search/TestSolrFieldCacheBean.java
index 2833902b831..3d99bca59c2 100644
--- a/solr/core/src/test/org/apache/solr/search/TestSolrFieldCacheBean.java
+++ b/solr/core/src/test/org/apache/solr/search/TestSolrFieldCacheBean.java
@@ -16,7 +16,6 @@
*/
package org.apache.solr.search;
-import java.lang.invoke.MethodHandles;
import java.util.Map;
import java.util.Random;
import org.apache.lucene.tests.util.TestUtil;
@@ -26,13 +25,9 @@ import org.apache.solr.metrics.SolrMetricManager;
import org.apache.solr.metrics.SolrMetricsContext;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class TestSolrFieldCacheBean extends SolrTestCaseJ4 {
- private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
-
@BeforeClass
public static void beforeClass() throws Exception {
initCore("solrconfig.xml", "schema-minimal.xml");
diff --git a/solr/core/src/test/org/apache/solr/search/TestSort.java b/solr/core/src/test/org/apache/solr/search/TestSort.java
index 80206648570..30402b1ce62 100644
--- a/solr/core/src/test/org/apache/solr/search/TestSort.java
+++ b/solr/core/src/test/org/apache/solr/search/TestSort.java
@@ -321,7 +321,6 @@ public class TestSort extends SolrTestCaseJ4 {
? ""
: "zzz";
- boolean scoreInOrder = r.nextBoolean();
final TopFieldCollector topCollector =
TopFieldCollector.create(sort, top, Integer.MAX_VALUE);
diff --git a/solr/core/src/test/org/apache/solr/search/TestStressRecovery.java b/solr/core/src/test/org/apache/solr/search/TestStressRecovery.java
index 0f0c9209128..1068f494893 100644
--- a/solr/core/src/test/org/apache/solr/search/TestStressRecovery.java
+++ b/solr/core/src/test/org/apache/solr/search/TestStressRecovery.java
@@ -37,7 +37,6 @@ import org.apache.solr.common.util.Utils;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.update.UpdateHandler;
import org.apache.solr.update.UpdateLog;
-import org.apache.solr.update.VersionInfo;
import org.apache.solr.util.TestHarness;
import org.junit.After;
import org.junit.Before;
@@ -95,7 +94,6 @@ public class TestStressRecovery extends TestRTGBase {
final UpdateHandler uHandler = h.getCore().getUpdateHandler();
final UpdateLog uLog = uHandler.getUpdateLog();
- final VersionInfo vInfo = uLog.getVersionInfo();
final Object stateChangeLock = new Object();
this.visibleModel = model;
final Semaphore[] writePermissions = new Semaphore[nWriteThreads];
diff --git a/solr/core/src/test/org/apache/solr/search/TestStressVersions.java b/solr/core/src/test/org/apache/solr/search/TestStressVersions.java
index cb2649fe73e..a01fbce0b64 100644
--- a/solr/core/src/test/org/apache/solr/search/TestStressVersions.java
+++ b/solr/core/src/test/org/apache/solr/search/TestStressVersions.java
@@ -48,10 +48,6 @@ public class TestStressVersions extends TestRTGBase {
final int softCommitPercent = 30 + random().nextInt(75); // what percent of the commits are soft
final int deletePercent = 4 + random().nextInt(25);
final int deleteByQueryPercent = 1 + random().nextInt(5);
- final int optimisticPercent =
- 1 + random().nextInt(50); // percent change that an update uses optimistic locking
- final int optimisticCorrectPercent =
- 25 + random().nextInt(70); // percent change that a version specified will be correct
final int ndocs = 5 + (random().nextBoolean() ? random().nextInt(25) : random().nextInt(200));
int nWriteThreads = 5 + random().nextInt(25);
@@ -116,7 +112,7 @@ public class TestStressVersions extends TestRTGBase {
}
int id = rand.nextInt(ndocs);
- Object sync = syncArr[id];
+ // Object sync = syncArr[id];
// set the lastId before we actually change it sometimes to try and
// uncover more race conditions between writing and reading
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.java
index 3b6e387d0fd..7a48d045ebb 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
@@ -39,8 +39,6 @@ import org.apache.solr.common.params.CoreAdminParams;
import org.apache.solr.common.params.FacetParams.FacetRangeOther;
import org.apache.solr.common.util.NamedList;
import org.junit.BeforeClass;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* Builds a random index of a few simple fields, maintaining an in-memory model of the expected doc
@@ -52,8 +50,6 @@ import org.slf4j.LoggerFactory;
*/
public class RangeFacetCloudTest extends SolrCloudTestCase {
- private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
-
private static final String COLLECTION = MethodHandles.lookup().lookupClass().getName();
private static final String CONF = COLLECTION + "_configSet";
diff --git a/solr/core/src/test/org/apache/solr/search/facet/TestCloudJSONFacetSKG.java b/solr/core/src/test/org/apache/solr/search/facet/TestCloudJSONFacetSKG.java
index 85f6d288bc8..96f9f47d4af 100644
--- a/solr/core/src/test/org/apache/solr/search/facet/TestCloudJSONFacetSKG.java
+++ b/solr/core/src/test/org/apache/solr/search/facet/TestCloudJSONFacetSKG.java
@@ -724,9 +724,8 @@ public class TestCloudJSONFacetSKG extends SolrCloudTestCase {
* picks a random value for the "prelim_sort" param, biased in favor of interesting test cases.
*
* @return a sort string (w/direction), or null to specify nothing (trigger default behavior)
- * @see #randomSortParam
*/
- public static String randomPrelimSortParam(final Random r, final String sort) {
+ public static String randomPrelimSortParam(final String sort) {
if (null != sort && sort.startsWith("skg") && 1 == TestUtil.nextInt(random(), 0, 3)) {
return "count desc";
@@ -825,7 +824,7 @@ public class TestCloudJSONFacetSKG extends SolrCloudTestCase {
*
* @return a Boolean, may be null
*/
- public static Boolean randomAllBucketsParam(final Random r, final String sort) {
+ public static Boolean randomAllBucketsParam(final Random r) {
switch (r.nextInt(4)) {
case 0:
return true;
@@ -862,11 +861,11 @@ public class TestCloudJSONFacetSKG extends SolrCloudTestCase {
facetField,
map(
"sort", sort,
- "prelim_sort", randomPrelimSortParam(random(), sort),
+ "prelim_sort", randomPrelimSortParam(sort),
"limit", randomLimitParam(random(), sort),
"overrequest", randomOverrequestParam(random()),
"prefix", randomPrefixParam(random(), facetField),
- "allBuckets", randomAllBucketsParam(random(), sort),
+ "allBuckets", randomAllBucketsParam(random()),
"perSeg", randomPerSegParam(random())));
results.put("facet_" + keyCounter.incrementAndGet(), facet);
diff --git a/solr/core/src/test/org/apache/solr/search/facet/TestCloudJSONFacetSKGEquiv.java b/solr/core/src/test/org/apache/solr/search/facet/TestCloudJSONFacetSKGEquiv.java
index ef7815256d1..45a5013fae9 100644
--- a/solr/core/src/test/org/apache/solr/search/facet/TestCloudJSONFacetSKGEquiv.java
+++ b/solr/core/src/test/org/apache/solr/search/facet/TestCloudJSONFacetSKGEquiv.java
@@ -78,7 +78,6 @@ public class TestCloudJSONFacetSKGEquiv extends SolrCloudTestCase {
private static final String DEBUG_LABEL = MethodHandles.lookup().lookupClass().getName();
private static final String COLLECTION_NAME = DEBUG_LABEL + "_collection";
- private static final int DEFAULT_LIMIT = FacetField.DEFAULT_FACET_LIMIT;
private static final int MAX_FIELD_NUM = 15;
private static final int UNIQUE_FIELD_VALS = 50;
@@ -1018,12 +1017,12 @@ public class TestCloudJSONFacetSKGEquiv extends SolrCloudTestCase {
facetField,
map(
"limit", randomLimitParam(random()),
- "overrequest", randomOverrequestParam(random(), sort),
+ "overrequest", randomOverrequestParam(random()),
"prefix", randomPrefixParam(random(), facetField),
"perSeg", randomPerSegParam(random()),
"sort", sort,
- "prelim_sort", randomPrelimSortParam(random(), sort),
- "allBuckets", randomAllBucketsParam(random(), sort),
+ "prelim_sort", randomPrelimSortParam(sort),
+ "allBuckets", randomAllBucketsParam(random()),
"refine", randomRefineParam(random())));
}
@@ -1073,7 +1072,7 @@ public class TestCloudJSONFacetSKGEquiv extends SolrCloudTestCase {
*
* @return a Boolean, may be null
*/
- public static Boolean randomAllBucketsParam(final Random r, final String sort) {
+ public static Boolean randomAllBucketsParam(final Random r) {
switch (r.nextInt(4)) {
case 0:
return true;
@@ -1182,9 +1181,8 @@ public class TestCloudJSONFacetSKGEquiv extends SolrCloudTestCase {
* picks a random value for the "prelim_sort" param, biased in favor of interesting test cases.
*
* @return a sort string (w/direction), or null to specify nothing (trigger default behavior)
- * @see #randomSortParam
*/
- public static String randomPrelimSortParam(final Random r, final String sort) {
+ public static String randomPrelimSortParam(final String sort) {
if (null != sort && sort.startsWith("skg") && 1 == TestUtil.nextInt(random(), 0, 3)) {
return "count desc";
@@ -1221,7 +1219,7 @@ public class TestCloudJSONFacetSKGEquiv extends SolrCloudTestCase {
* behavior)
* @see #UNIQUE_FIELD_VALS
*/
- public static Integer randomOverrequestParam(final Random r, final String sort) {
+ public static Integer randomOverrequestParam(final Random r) {
switch (r.nextInt(10)) {
case 0:
diff --git a/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacetRefinement.java b/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacetRefinement.java
index d696c923b00..5afaf62bfc2 100644
--- a/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacetRefinement.java
+++ b/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacetRefinement.java
@@ -1065,8 +1065,6 @@ public class TestJsonFacetRefinement extends SolrTestCaseHS {
assertTrue(
clients.size() >= 3); // we only use 2, but assert at least 3 to also test empty shard
- final SolrClient c0 = clients.get(0);
- final SolrClient c1 = clients.get(1);
// during the initial request...
// - shard1 should return "high" count pX & pY w/o any child buckets (no "more" child)
@@ -1122,8 +1120,6 @@ public class TestJsonFacetRefinement extends SolrTestCaseHS {
final int numClients = clients.size();
assertTrue(numClients >= 3); // we only use 2, but assert at least 3 to also test empty shard
- final SolrClient c0 = clients.get(0);
- final SolrClient c1 = clients.get(1);
// if we do the same request as testSortedSubFacetRefinementWhenParentOnlyReturnedByOneShard,
// but with processEmpty:true, then ideally we should get the same buckets & counts as before,
diff --git a/solr/core/src/test/org/apache/solr/search/function/TestFunctionQuery.java b/solr/core/src/test/org/apache/solr/search/function/TestFunctionQuery.java
index 7025bb63bd4..a059675089a 100644
--- a/solr/core/src/test/org/apache/solr/search/function/TestFunctionQuery.java
+++ b/solr/core/src/test/org/apache/solr/search/function/TestFunctionQuery.java
@@ -42,8 +42,6 @@ public class TestFunctionQuery extends SolrTestCaseJ4 {
initCore("solrconfig-functionquery.xml", "schema11.xml");
}
- String base = "external_foo_extf";
-
static long start = System.nanoTime();
void makeExternalFile(String field, String contents) {
diff --git a/solr/core/src/test/org/apache/solr/search/function/TestOrdValues.java b/solr/core/src/test/org/apache/solr/search/function/TestOrdValues.java
index 120aa336073..af2f00d4634 100644
--- a/solr/core/src/test/org/apache/solr/search/function/TestOrdValues.java
+++ b/solr/core/src/test/org/apache/solr/search/function/TestOrdValues.java
@@ -29,8 +29,6 @@ import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.queries.function.FunctionQuery;
import org.apache.lucene.queries.function.ValueSource;
-import org.apache.lucene.queries.function.valuesource.FloatFieldSource;
-import org.apache.lucene.queries.function.valuesource.IntFieldSource;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.ScoreDoc;
@@ -182,9 +180,6 @@ public class TestOrdValues extends SolrTestCase {
protected static final String INT_FIELD = "iii";
protected static final String FLOAT_FIELD = "fff";
- protected ValueSource INT_VALUESOURCE = new IntFieldSource(INT_FIELD);
- protected ValueSource FLOAT_VALUESOURCE = new FloatFieldSource(FLOAT_FIELD);
-
private static final String DOC_TEXT_LINES[] = {
"Well, this is just some plain text we use for creating the ",
"test documents. It used to be a text from an online collection ",
@@ -295,11 +290,6 @@ public class TestOrdValues extends SolrTestCase {
return DOC_TEXT_LINES[docNum % DOC_TEXT_LINES.length];
}
- // extract expected doc score from its ID Field: "ID7" --> 7.0
- protected static float expectedFieldScore(String docIDFieldVal) {
- return Float.parseFloat(docIDFieldVal.substring(2));
- }
-
// debug messages (change DBG to true for anything to print)
protected static void log(Object o) {
if (VERBOSE) {
diff --git a/solr/core/src/test/org/apache/solr/search/join/TestScoreJoinQPScore.java b/solr/core/src/test/org/apache/solr/search/join/TestScoreJoinQPScore.java
index fea1a151158..3928d001b16 100644
--- a/solr/core/src/test/org/apache/solr/search/join/TestScoreJoinQPScore.java
+++ b/solr/core/src/test/org/apache/solr/search/join/TestScoreJoinQPScore.java
@@ -19,7 +19,6 @@ package org.apache.solr.search.join;
import com.codahale.metrics.Metric;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Comparator;
import java.util.List;
import java.util.Locale;
import java.util.Map;
@@ -202,12 +201,6 @@ public class TestScoreJoinQPScore extends SolrTestCaseJ4 {
}
- static final Comparator<String> lessFloat =
- (o1, o2) -> {
- assertTrue(Float.parseFloat(o1) < Float.parseFloat(o2));
- return 0;
- };
-
@Ignore("SOLR-7814, also don't forget cover boost at testCacheHit()")
public void testBoost() throws Exception {
indexDataForScoring();
diff --git a/solr/core/src/test/org/apache/solr/security/AuditLoggerIntegrationTest.java b/solr/core/src/test/org/apache/solr/security/AuditLoggerIntegrationTest.java
index 23133730c70..517001546c3 100644
--- a/solr/core/src/test/org/apache/solr/security/AuditLoggerIntegrationTest.java
+++ b/solr/core/src/test/org/apache/solr/security/AuditLoggerIntegrationTest.java
@@ -80,8 +80,6 @@ public class AuditLoggerIntegrationTest extends SolrCloudAuthTestCase {
protected static final JSONAuditEventFormatter formatter = new JSONAuditEventFormatter();
protected static final int NUM_SERVERS = 1;
- protected static final int NUM_SHARDS = 1;
- protected static final int REPLICATION_FACTOR = 1;
// Use a harness per thread to be able to beast this test
private ThreadLocal<AuditTestHarness> testHarness = new ThreadLocal<>();
diff --git a/solr/core/src/test/org/apache/solr/security/BasicAuthOnSingleNodeTest.java b/solr/core/src/test/org/apache/solr/security/BasicAuthOnSingleNodeTest.java
index fde29f411cb..418be28ada6 100644
--- a/solr/core/src/test/org/apache/solr/security/BasicAuthOnSingleNodeTest.java
+++ b/solr/core/src/test/org/apache/solr/security/BasicAuthOnSingleNodeTest.java
@@ -17,7 +17,6 @@
package org.apache.solr.security;
-import java.lang.invoke.MethodHandles;
import org.apache.solr.client.solrj.impl.Http2SolrClient;
import org.apache.solr.client.solrj.request.CollectionAdminRequest;
import org.apache.solr.client.solrj.request.QueryRequest;
@@ -25,12 +24,9 @@ import org.apache.solr.cloud.SolrCloudAuthTestCase;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class BasicAuthOnSingleNodeTest extends SolrCloudAuthTestCase {
- private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static final String COLLECTION = "authCollection";
@Before
diff --git a/solr/core/src/test/org/apache/solr/security/BasicAuthStandaloneTest.java b/solr/core/src/test/org/apache/solr/security/BasicAuthStandaloneTest.java
index 6162a6885e7..e7f8427cafe 100644
--- a/solr/core/src/test/org/apache/solr/security/BasicAuthStandaloneTest.java
+++ b/solr/core/src/test/org/apache/solr/security/BasicAuthStandaloneTest.java
@@ -228,10 +228,6 @@ public class BasicAuthStandaloneTest extends SolrTestCaseJ4 {
return CONF_DIR.resolve("schema.xml");
}
- public Path getConfDir() {
- return confDir;
- }
-
public Path getDataDir() {
return dataDir;
}
diff --git a/solr/core/src/test/org/apache/solr/servlet/TestRequestRateLimiter.java b/solr/core/src/test/org/apache/solr/servlet/TestRequestRateLimiter.java
index 3784d861cbb..6db4d696073 100644
--- a/solr/core/src/test/org/apache/solr/servlet/TestRequestRateLimiter.java
+++ b/solr/core/src/test/org/apache/solr/servlet/TestRequestRateLimiter.java
@@ -70,7 +70,7 @@ public class TestRequestRateLimiter extends SolrCloudTestCase {
// parent here
RateLimitManager.Builder builder =
new MockBuilder(
- null /* dummy SolrZkClient */, new MockRequestRateLimiter(rateLimiterConfig, 5));
+ null /* dummy SolrZkClient */, new MockRequestRateLimiter(rateLimiterConfig));
RateLimitManager rateLimitManager = builder.build();
solrDispatchFilter.replaceRateLimitManager(rateLimitManager);
@@ -127,8 +127,8 @@ public class TestRequestRateLimiter extends SolrCloudTestCase {
RateLimitManager.Builder builder =
new MockBuilder(
null /*dummy SolrZkClient */,
- new MockRequestRateLimiter(queryRateLimiterConfig, 5),
- new MockRequestRateLimiter(indexRateLimiterConfig, 5));
+ new MockRequestRateLimiter(queryRateLimiterConfig),
+ new MockRequestRateLimiter(indexRateLimiterConfig));
RateLimitManager rateLimitManager = builder.build();
solrDispatchFilter.replaceRateLimitManager(rateLimitManager);
@@ -201,16 +201,13 @@ public class TestRequestRateLimiter extends SolrCloudTestCase {
final AtomicInteger rejectedRequestCount;
final AtomicInteger borrowedSlotCount;
- private final int maxCount;
-
- public MockRequestRateLimiter(RateLimiterConfig config, final int maxCount) {
+ public MockRequestRateLimiter(RateLimiterConfig config) {
super(config);
this.incomingRequestCount = new AtomicInteger(0);
this.acceptedNewRequestCount = new AtomicInteger(0);
this.rejectedRequestCount = new AtomicInteger(0);
this.borrowedSlotCount = new AtomicInteger(0);
- this.maxCount = maxCount;
}
@Override
diff --git a/solr/core/src/test/org/apache/solr/uninverting/TestFieldCacheVsDocValues.java b/solr/core/src/test/org/apache/solr/uninverting/TestFieldCacheVsDocValues.java
index 911030d70c0..e8aa4f34537 100644
--- a/solr/core/src/test/org/apache/solr/uninverting/TestFieldCacheVsDocValues.java
+++ b/solr/core/src/test/org/apache/solr/uninverting/TestFieldCacheVsDocValues.java
@@ -232,7 +232,7 @@ public class TestFieldCacheVsDocValues extends SolrTestCase {
LeafReader r = context.reader();
SortedDocValues expected = FieldCache.DEFAULT.getTermsIndex(r, "indexed");
SortedDocValues actual = r.getSortedDocValues("dv");
- assertEquals(r.maxDoc(), expected, actual);
+ assertEquals(expected, actual);
}
ir.close();
dir.close();
@@ -290,7 +290,7 @@ public class TestFieldCacheVsDocValues extends SolrTestCase {
LeafReader r = context.reader();
SortedSetDocValues expected = FieldCache.DEFAULT.getDocTermOrds(r, "indexed", null);
SortedSetDocValues actual = r.getSortedSetDocValues("dv");
- assertEquals(r.maxDoc(), expected, actual);
+ assertEquals(expected, actual);
}
ir.close();
@@ -301,7 +301,7 @@ public class TestFieldCacheVsDocValues extends SolrTestCase {
LeafReader ar = getOnlyLeafReader(ir);
SortedSetDocValues expected = FieldCache.DEFAULT.getDocTermOrds(ar, "indexed", null);
SortedSetDocValues actual = ar.getSortedSetDocValues("dv");
- assertEquals(ir.maxDoc(), expected, actual);
+ assertEquals(expected, actual);
ir.close();
writer.close();
@@ -386,8 +386,7 @@ public class TestFieldCacheVsDocValues extends SolrTestCase {
}
}
- private void assertEquals(int maxDoc, SortedDocValues expected, SortedDocValues actual)
- throws Exception {
+ private void assertEquals(SortedDocValues expected, SortedDocValues actual) throws Exception {
// can be null for the segment if no docs actually had any SortedDocValues
// in this case FC.getDocTermsOrds returns EMPTY
if (actual == null) {
@@ -419,7 +418,7 @@ public class TestFieldCacheVsDocValues extends SolrTestCase {
assertEquals(expected.getValueCount(), expected.termsEnum(), actual.termsEnum());
}
- private void assertEquals(int maxDoc, SortedSetDocValues expected, SortedSetDocValues actual)
+ private void assertEquals(SortedSetDocValues expected, SortedSetDocValues actual)
throws Exception {
// can be null for the segment if no docs actually had any SortedDocValues
// in this case FC.getDocTermsOrds returns EMPTY
diff --git a/solr/core/src/test/org/apache/solr/update/MaxSizeAutoCommitTest.java b/solr/core/src/test/org/apache/solr/update/MaxSizeAutoCommitTest.java
index 2a00acc7c17..1b1b12628cb 100644
--- a/solr/core/src/test/org/apache/solr/update/MaxSizeAutoCommitTest.java
+++ b/solr/core/src/test/org/apache/solr/update/MaxSizeAutoCommitTest.java
@@ -53,8 +53,6 @@ public class MaxSizeAutoCommitTest extends SolrTestCaseJ4 {
private static String delDoc(int id) {
return delI(Integer.toString(id));
}
- // How long to sleep while checking for commits
- private static final int COMMIT_CHECKING_SLEEP_TIME_MS = 50;
// max TLOG file size
private static final int MAX_FILE_SIZE = 1000;
diff --git a/solr/core/src/test/org/apache/solr/update/MockingHttp2SolrClient.java b/solr/core/src/test/org/apache/solr/update/MockingHttp2SolrClient.java
index f32ed3b51ef..d412c278e3b 100644
--- a/solr/core/src/test/org/apache/solr/update/MockingHttp2SolrClient.java
+++ b/solr/core/src/test/org/apache/solr/update/MockingHttp2SolrClient.java
@@ -20,7 +20,6 @@ package org.apache.solr.update;
import java.io.IOException;
import java.net.ConnectException;
import java.net.SocketException;
-import java.util.HashSet;
import java.util.Set;
import org.apache.lucene.tests.util.LuceneTestCase;
import org.apache.solr.client.solrj.SolrRequest;
@@ -34,6 +33,10 @@ import org.apache.solr.common.util.NamedList;
public class MockingHttp2SolrClient extends Http2SolrClient {
+ protected MockingHttp2SolrClient(String serverBaseUrl, Http2SolrClient.Builder builder) {
+ super(serverBaseUrl, builder);
+ }
+
public enum Exp {
CONNECT_EXCEPTION,
SOCKET_EXCEPTION,
@@ -46,12 +49,6 @@ public class MockingHttp2SolrClient extends Http2SolrClient {
@SuppressWarnings({"rawtypes"})
private Set<SolrRequest> reqGotException;
- public MockingHttp2SolrClient(String baseSolrUrl, Builder builder) {
- super(baseSolrUrl, builder);
- this.oneExpPerReq = builder.oneExpPerReq;
- this.reqGotException = new HashSet<>();
- }
-
public static class Builder extends Http2SolrClient.Builder {
private boolean oneExpPerReq = false;
@@ -64,16 +61,6 @@ public class MockingHttp2SolrClient extends Http2SolrClient {
public MockingHttp2SolrClient build() {
return new MockingHttp2SolrClient(null, this);
}
-
- // DBQ won't cause exception
- Builder oneExpPerReq() {
- oneExpPerReq = true;
- return this;
- }
- }
-
- public void setExp(Exp exp) {
- this.exp = exp;
}
private Exception exception() {
diff --git a/solr/core/src/test/org/apache/solr/update/PeerSyncTest.java b/solr/core/src/test/org/apache/solr/update/PeerSyncTest.java
index acf00d995cc..33cca6c994f 100644
--- a/solr/core/src/test/org/apache/solr/update/PeerSyncTest.java
+++ b/solr/core/src/test/org/apache/solr/update/PeerSyncTest.java
@@ -86,7 +86,6 @@ public class PeerSyncTest extends BaseDistributedSearchTestCase {
SolrClient client0 = clients.get(0);
SolrClient client1 = clients.get(1);
- SolrClient client2 = clients.get(2);
int v = 0;
add(client0, seenLeader, sdoc("id", "1", "_version_", ++v));
diff --git a/solr/core/src/test/org/apache/solr/update/PeerSyncWithBufferUpdatesTest.java b/solr/core/src/test/org/apache/solr/update/PeerSyncWithBufferUpdatesTest.java
index 7d66edfc96b..f1fa5587115 100644
--- a/solr/core/src/test/org/apache/solr/update/PeerSyncWithBufferUpdatesTest.java
+++ b/solr/core/src/test/org/apache/solr/update/PeerSyncWithBufferUpdatesTest.java
@@ -24,7 +24,6 @@ import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.LinkedHashSet;
-import java.util.List;
import java.util.Set;
import org.apache.solr.BaseDistributedSearchTestCase;
import org.apache.solr.SolrTestCaseJ4;
@@ -69,7 +68,6 @@ public class PeerSyncWithBufferUpdatesTest extends BaseDistributedSearchTestCase
SolrClient client0 = clients.get(0);
SolrClient client1 = clients.get(1);
- SolrClient client2 = clients.get(2);
long v = 0;
// add some context
@@ -124,7 +122,6 @@ public class PeerSyncWithBufferUpdatesTest extends BaseDistributedSearchTestCase
log.info("After buffer updates");
jetty1Core.getUpdateHandler().getUpdateLog().bufferUpdates();
- List<Object> onWireUpdates = new ArrayList<>();
Set<Integer> docIds = new HashSet<>();
for (int i = 0; i <= 50; i++) {
@@ -139,8 +136,9 @@ public class PeerSyncWithBufferUpdatesTest extends BaseDistributedSearchTestCase
SolrInputDocument doc = sdoc("id", docId, "val_i_dvo", val, "_version_", ++v);
add(client0, seenLeader, doc);
- if (random().nextBoolean()) add(client1, seenLeader, doc);
- else onWireUpdates.add(doc);
+ if (random().nextBoolean()) {
+ add(client1, seenLeader, doc);
+ }
} else if (kindOfUpdate <= 65) {
// delete by query
@@ -153,8 +151,6 @@ public class PeerSyncWithBufferUpdatesTest extends BaseDistributedSearchTestCase
delQ(client0, params(DISTRIB_UPDATE_PARAM, FROM_LEADER, "_version_", version), query);
if (random().nextBoolean()) {
delQ(client1, params(DISTRIB_UPDATE_PARAM, FROM_LEADER, "_version_", version), query);
- } else {
- onWireUpdates.add(new DeleteByQuery(query, version));
}
} else {
@@ -166,8 +162,6 @@ public class PeerSyncWithBufferUpdatesTest extends BaseDistributedSearchTestCase
del(client0, params(DISTRIB_UPDATE_PARAM, FROM_LEADER, "_version_", version), docId);
if (random().nextBoolean()) {
del(client1, params(DISTRIB_UPDATE_PARAM, FROM_LEADER, "_version_", version), docId);
- } else {
- onWireUpdates.add(new DeleteById(docId, version));
}
}
}
@@ -175,26 +169,6 @@ public class PeerSyncWithBufferUpdatesTest extends BaseDistributedSearchTestCase
assertSync(client1, numVersions, shardsArr[0]);
}
- private static class DeleteByQuery {
- String query;
- String version;
-
- public DeleteByQuery(String query, String version) {
- this.query = query;
- this.version = version;
- }
- }
-
- private static class DeleteById {
- String id;
- String version;
-
- public DeleteById(String id, String version) {
- this.id = id;
- this.version = version;
- }
- }
-
private void validateDocs(Set<Integer> docsAdded, SolrClient client0, SolrClient client1)
throws SolrServerException, IOException {
client0.commit();
diff --git a/solr/core/src/test/org/apache/solr/update/SoftAutoCommitTest.java b/solr/core/src/test/org/apache/solr/update/SoftAutoCommitTest.java
index 6bbcf29d3a7..589c67823d1 100644
--- a/solr/core/src/test/org/apache/solr/update/SoftAutoCommitTest.java
+++ b/solr/core/src/test/org/apache/solr/update/SoftAutoCommitTest.java
@@ -333,9 +333,6 @@ public class SoftAutoCommitTest extends SolrTestCaseJ4 {
CommitTracker softTracker = updater.softCommitTracker;
updater.setCommitWithinSoftCommit(commitWithinType.equals(CommitWithinType.SOFT));
- int startingHardCommits = hardTracker.getCommitCount();
- int startingSoftCommits = softTracker.getCommitCount();
-
softTracker.setTimeUpperBound(
commitWithinType.equals(CommitWithinType.SOFT) ? -1 : softCommitWaitMillis);
softTracker.setDocsUpperBound(-1);
@@ -523,9 +520,6 @@ public class SoftAutoCommitTest extends SolrTestCaseJ4 {
assert 0 < maxNumCommits;
- // do all our math/comparisons in Nanos...
- final long commitWaitNanos = NANOSECONDS.convert(commitWaitMillis, MILLISECONDS);
-
// these will be modified in each iteration of our assertion loop
long prevTimestampNanos = startTimestampNanos;
int count = 1;
diff --git a/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesDistrib.java b/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesDistrib.java
index 3ce90efe01d..8b80454b028 100644
--- a/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesDistrib.java
+++ b/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesDistrib.java
@@ -656,7 +656,6 @@ public class TestInPlaceUpdatesDistrib extends AbstractFullDistribZkTestBase {
assert luceneDocids.size() == valuesList.size();
final long numFoundExpected = luceneDocids.size();
- CLIENT:
for (SolrClient client : clients) {
final String clientDebug =
client.toString() + (LEADER.equals(client) ? " (leader)" : " (not leader)");
diff --git a/solr/core/src/test/org/apache/solr/update/TestUpdate.java b/solr/core/src/test/org/apache/solr/update/TestUpdate.java
index 4bb39ca0c4b..d64fda66ae7 100644
--- a/solr/core/src/test/org/apache/solr/update/TestUpdate.java
+++ b/solr/core/src/test/org/apache/solr/update/TestUpdate.java
@@ -81,7 +81,6 @@ public class TestUpdate extends SolrTestCaseJ4 {
req("q", "*:*", "fl", "id,*_i,*_is,copyfield_*"),
"/response/docs/[0]=={'id':'1', 'val_i':100, 'val_is':[10,5,-1], 'copyfield_source':['a','b'], 'copyfield_dest_ss':['a','b']}");
- long version2;
SolrException se =
expectThrows(
SolrException.class,
diff --git a/solr/core/src/test/org/apache/solr/update/processor/AddSchemaFieldsUpdateProcessorFactoryTest.java b/solr/core/src/test/org/apache/solr/update/processor/AddSchemaFieldsUpdateProcessorFactoryTest.java
index b40f65fc2e0..156615637ce 100644
--- a/solr/core/src/test/org/apache/solr/update/processor/AddSchemaFieldsUpdateProcessorFactoryTest.java
+++ b/solr/core/src/test/org/apache/solr/update/processor/AddSchemaFieldsUpdateProcessorFactoryTest.java
@@ -221,14 +221,11 @@ public class AddSchemaFieldsUpdateProcessorFactoryTest extends UpdateProcessorTe
String field2String2 = "1,234,567,890,123,456,789";
Long field2Value2 = 1234567890123456789L;
String field3String1 = "blah-blah";
- String field3Value1 = field3String1;
String field3String2 = "-5.28E-3";
- Double field3Value2 = -5.28E-3;
String field4String1 = "1999-04-17 17:42";
DateTimeFormatter dateTimeFormatter =
DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm", Locale.ROOT).withZone(ZoneOffset.UTC);
LocalDateTime dateTime = LocalDateTime.parse(field4String1, dateTimeFormatter);
- Date field4Value1 = Date.from(dateTime.atZone(ZoneOffset.UTC).toInstant());
DateTimeFormatter dateTimeFormatter2 =
DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss", Locale.ROOT).withZone(ZoneOffset.UTC);
String field4Value1String = dateTime.format(dateTimeFormatter2) + "Z";
diff --git a/solr/core/src/test/org/apache/solr/update/processor/ClassificationUpdateProcessorIntegrationTest.java b/solr/core/src/test/org/apache/solr/update/processor/ClassificationUpdateProcessorIntegrationTest.java
index 4fc42b34ad9..86dc4409ae2 100644
--- a/solr/core/src/test/org/apache/solr/update/processor/ClassificationUpdateProcessorIntegrationTest.java
+++ b/solr/core/src/test/org/apache/solr/update/processor/ClassificationUpdateProcessorIntegrationTest.java
@@ -46,9 +46,6 @@ public class ClassificationUpdateProcessorIntegrationTest extends SolrTestCaseJ4
private static final String CHAIN = "classification";
private static final String BROKEN_CHAIN_FILTER_QUERY = "classification-unsupported-filterQuery";
- private ClassificationUpdateProcessorFactory cFactoryToTest =
- new ClassificationUpdateProcessorFactory();
-
@BeforeClass
public static void beforeClass() throws Exception {
System.setProperty("enable.update.log", "false");
diff --git a/solr/core/src/test/org/apache/solr/update/processor/ClassificationUpdateProcessorTest.java b/solr/core/src/test/org/apache/solr/update/processor/ClassificationUpdateProcessorTest.java
index afbb5717285..3e4cbeee234 100644
--- a/solr/core/src/test/org/apache/solr/update/processor/ClassificationUpdateProcessorTest.java
+++ b/solr/core/src/test/org/apache/solr/update/processor/ClassificationUpdateProcessorTest.java
@@ -48,7 +48,6 @@ public class ClassificationUpdateProcessorTest extends SolrTestCaseJ4 {
private static final String AUTHOR = "author";
private static final String TRAINING_CLASS = "cat";
private static final String PREDICTED_CLASS = "predicted";
- public static final String KNN = "knn";
protected Directory directory;
protected IndexReader reader;
diff --git a/solr/core/src/test/org/apache/solr/update/processor/RoutedAliasUpdateProcessorTest.java b/solr/core/src/test/org/apache/solr/update/processor/RoutedAliasUpdateProcessorTest.java
index 1b13443f6aa..6f3f08efb48 100644
--- a/solr/core/src/test/org/apache/solr/update/processor/RoutedAliasUpdateProcessorTest.java
+++ b/solr/core/src/test/org/apache/solr/update/processor/RoutedAliasUpdateProcessorTest.java
@@ -90,7 +90,6 @@ public abstract class RoutedAliasUpdateProcessorTest extends SolrCloudTestCase {
private boolean haveCollection(String alias, String collection) {
// separated into separate lines to make it easier to track down an NPE that occurred once
// 3000 runs if it shows up again...
- CloudSolrClient solrClient = cluster.getSolrClient();
ZkStateReader zkStateReader = cluster.getZkStateReader();
Aliases aliases = zkStateReader.getAliases();
Map<String, List<String>> collectionAliasListMap = aliases.getCollectionAliasListMap();
diff --git a/solr/core/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java b/solr/core/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java
index fa75b9c7c47..0695facddba 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
@@ -194,7 +194,6 @@ public class SignatureUpdateProcessorFactoryTest extends SolrTestCaseJ4 {
for (Thread thread2 : threads2) {
thread2.join();
}
- SolrCore core = h.getCore();
assertU(commit());
diff --git a/solr/core/src/test/org/apache/solr/update/processor/TemplateUpdateProcessorTest.java b/solr/core/src/test/org/apache/solr/update/processor/TemplateUpdateProcessorTest.java
index 49891cae787..0f8cf1d20b9 100644
--- a/solr/core/src/test/org/apache/solr/update/processor/TemplateUpdateProcessorTest.java
+++ b/solr/core/src/test/org/apache/solr/update/processor/TemplateUpdateProcessorTest.java
@@ -17,7 +17,6 @@
package org.apache.solr.update.processor;
-import java.lang.invoke.MethodHandles;
import org.apache.solr.client.solrj.request.CollectionAdminRequest;
import org.apache.solr.client.solrj.request.UpdateRequest;
import org.apache.solr.client.solrj.response.QueryResponse;
@@ -33,11 +32,8 @@ import org.apache.solr.update.AddUpdateCommand;
import org.junit.After;
import org.junit.BeforeClass;
import org.junit.rules.ExpectedException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class TemplateUpdateProcessorTest extends SolrCloudTestCase {
- private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@BeforeClass
public static void setupCluster() throws Exception {
diff --git a/solr/core/src/test/org/apache/solr/update/processor/UniqFieldsUpdateProcessorFactoryTest.java b/solr/core/src/test/org/apache/solr/update/processor/UniqFieldsUpdateProcessorFactoryTest.java
index 30fbcd5f300..fe76fe0760d 100644
--- a/solr/core/src/test/org/apache/solr/update/processor/UniqFieldsUpdateProcessorFactoryTest.java
+++ b/solr/core/src/test/org/apache/solr/update/processor/UniqFieldsUpdateProcessorFactoryTest.java
@@ -54,9 +54,10 @@ public class UniqFieldsUpdateProcessorFactoryTest extends SolrTestCaseJ4 {
public void testUniqFields() throws Exception {
SolrCore core = h.getCore();
UpdateRequestProcessorChain chained = core.getUpdateProcessingChain("uniq-fields");
+ assertNotNull(chained);
UniqFieldsUpdateProcessorFactory factory =
((UniqFieldsUpdateProcessorFactory) chained.getProcessors().get(0));
- assertNotNull(chained);
+ assertNotNull(factory);
addDoc(
adoc(
diff --git a/solr/core/src/test/org/apache/solr/util/MultipleManagedSchemasTest.java b/solr/core/src/test/org/apache/solr/util/MultipleManagedSchemasTest.java
index 88a6630ab8b..37a2e71da6a 100644
--- a/solr/core/src/test/org/apache/solr/util/MultipleManagedSchemasTest.java
+++ b/solr/core/src/test/org/apache/solr/util/MultipleManagedSchemasTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.solr.util;
-import java.lang.invoke.MethodHandles;
import org.apache.solr.client.solrj.impl.CloudSolrClient;
import org.apache.solr.client.solrj.request.CollectionAdminRequest;
import org.apache.solr.client.solrj.request.ConfigSetAdminRequest;
@@ -25,11 +24,8 @@ import org.apache.solr.common.cloud.ZkMaintenanceUtils;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class MultipleManagedSchemasTest extends SolrCloudTestCase {
- private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@Before
public void setUp() throws Exception {
diff --git a/solr/core/src/test/org/apache/solr/util/TestMaxTokenLenTokenizer.java b/solr/core/src/test/org/apache/solr/util/TestMaxTokenLenTokenizer.java
index d23526a5aa3..421fb2f1813 100644
--- a/solr/core/src/test/org/apache/solr/util/TestMaxTokenLenTokenizer.java
+++ b/solr/core/src/test/org/apache/solr/util/TestMaxTokenLenTokenizer.java
@@ -26,8 +26,6 @@ import org.junit.BeforeClass;
* org.apache.lucene.analysis.core.WhitespaceTokenizerFactory}
*/
public class TestMaxTokenLenTokenizer extends SolrTestCaseJ4 {
- /* field names are used in accordance with the solrconfig and schema supplied */
- private static final String ID = "id";
@BeforeClass
public static void beforeClass() throws Exception {