Apache Solr open-source search software
SOLR-16427: Evaluate and fix errorprone rules - ModifiedButNotUsed
Kevin Risden24f181be2c4d
diff --git a/gradle/validation/error-prone.gradle b/gradle/validation/error-prone.gradleindex 24e830b51f6..649d6921f4b 100644--- a/gradle/validation/error-prone.gradle+++ b/gradle/validation/error-prone.gradle@@ -98,8 +98,7 @@ allprojects { prj ->'-Xep:LogicalAssignment:OFF','-Xep:MissingSummary:OFF','-Xep:MixedMutabilityReturnType:OFF',- '-Xep:ModifiedButNotUsed:OFF',- '-Xep:MutablePublicArray:OFF',+ '-Xep:MutablePublicArray:OFF', // this should be possible...'-Xep:NarrowingCompoundAssignment:OFF','-Xep:NegativeCharLiteral:OFF','-Xep:NonAtomicVolatileUpdate:OFF',diff --git a/solr/benchmark/src/test/org/apache/solr/bench/DockMakerTest.java b/solr/benchmark/src/test/org/apache/solr/bench/DockMakerTest.javaindex 5793c535f5f..4f106241db6 100644--- a/solr/benchmark/src/test/org/apache/solr/bench/DockMakerTest.java+++ b/solr/benchmark/src/test/org/apache/solr/bench/DockMakerTest.java@@ -191,17 +191,14 @@ public class DockMakerTest extends SolrTestCaseJ4 {}@Test- public void testWordListZipfian() throws Exception {+ public void testWordListZipfian() {Docs docs = docs();-docs.field("wordList", strings().wordList().withDistribution(Distribution.ZIPFIAN).multi(30));- Set<String> values = new HashSet<>();- for (int i = 0; i < 1; i++) {- SolrInputDocument doc = docs.inputDocument();- SolrInputField field = doc.getField("wordList");- values.add(field.getValue().toString());- }+ SolrInputDocument doc = docs.inputDocument();+ SolrInputField field = doc.getField("wordList");++ assertNotNull(field.getValue().toString());}@Testdiff --git a/solr/core/src/java/org/apache/solr/cloud/ZkDistributedQueue.java b/solr/core/src/java/org/apache/solr/cloud/ZkDistributedQueue.javaindex 5bb27867c62..1332661019b 100644--- a/solr/core/src/java/org/apache/solr/cloud/ZkDistributedQueue.java+++ b/solr/core/src/java/org/apache/solr/cloud/ZkDistributedQueue.java@@ -387,6 +387,7 @@ public class ZkDistributedQueue implements DistributedQueue {Map<String, Object> fo = new HashMap<>();fo.put("req", failedOp.req);fo.put("resp", failedOp.resp);+ failed.add(fo);});statsMap.put(op, statMap);});diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/DeleteSnapshotCmd.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/DeleteSnapshotCmd.javaindex a893bbf701e..b3970210cb6 100644--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/DeleteSnapshotCmd.java+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/DeleteSnapshotCmd.java@@ -134,7 +134,6 @@ public class DeleteSnapshotCmd implements CollApiCmds.CollectionApiCommand {shardRequestTracker.processResponses(shardRequestResults, shardHandler, false, null);@SuppressWarnings("unchecked")NamedList<Object> success = (NamedList<Object>) shardRequestResults.get("success");- List<CoreSnapshotMetaData> replicas = new ArrayList<>();if (success != null) {for (int i = 0; i < success.size(); i++) {NamedList<?> resp = (NamedList<?>) success.getVal(i);@@ -182,7 +181,7 @@ public class DeleteSnapshotCmd implements CollApiCmds.CollectionApiCommand {// level meta-data.SolrSnapshotManager.deleteCollectionLevelSnapshot(zkClient, collectionName, commitName);log.info(- "Deleted Zookeeper snapshot metdata for collection={} with commitName={}",+ "Deleted Zookeeper snapshot metadata for collection={} with commitName={}",collectionName,commitName);log.info(diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/SplitShardCmd.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/SplitShardCmd.javaindex a0bf85600d9..0193e0b1939 100644--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/SplitShardCmd.java+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/SplitShardCmd.java@@ -377,7 +377,6 @@ public class SplitShardCmd implements CollApiCmds.CollectionApiCommand {// refresh the locally cached cluster state// we know we have the latest because otherwise deleteshard would have failedclusterState = zkStateReader.getClusterState();- collection = clusterState.getCollection(collectionName);}// 4. create the child sub-shards in CONSTRUCTION state@@ -559,14 +558,6 @@ public class SplitShardCmd implements CollApiCmds.CollectionApiCommand {log.debug("Successfully applied buffered updates on : {}", subShardNames);- // 9. determine node placement for additional replicas- Set<String> nodes = clusterState.getLiveNodes();- List<String> nodeList = new ArrayList<>(nodes.size());- nodeList.addAll(nodes);-- // Remove the node that hosts the parent shard for replica creation.- nodeList.remove(nodeName);-// TODO: change this to handle sharding a slice into > 2 sub-shards.// we have already created one subReplica for each subShard on the parent node.@@ -1252,7 +1243,7 @@ public class SplitShardCmd implements CollApiCmds.CollectionApiCommand {String path = ZkStateReader.COLLECTIONS_ZKNODE + "/" + collection;try {List<String> names = cloudManager.getDistribStateManager().listData(path);- for (String name : cloudManager.getDistribStateManager().listData(path)) {+ for (String name : names) {if (name.endsWith("-splitting")) {try {cloudManager.getDistribStateManager().removeData(path + "/" + name, -1);diff --git a/solr/core/src/test/org/apache/solr/cloud/ReplicationFactorTest.java b/solr/core/src/test/org/apache/solr/cloud/ReplicationFactorTest.javaindex 37cd2f99328..c02e81ef575 100644--- a/solr/core/src/test/org/apache/solr/cloud/ReplicationFactorTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/ReplicationFactorTest.java@@ -253,7 +253,7 @@ public class ReplicationFactorTest extends AbstractFullDistribZkTestBase {// Delete the docs by query indicated.req = new UpdateRequest();- req.deleteByQuery("id:(" + StringUtils.join(byQueriesSet, " OR ") + ")");+ req.deleteByQuery("id:(" + StringUtils.join(byQueryList, " OR ") + ")");sendNonDirectUpdateRequestReplicaWithRetry(rep, req, expectedRfDBQ, coll);}diff --git a/solr/core/src/test/org/apache/solr/core/TestConfLoadPerf.java b/solr/core/src/test/org/apache/solr/core/TestConfLoadPerf.javaindex af67ea58b9b..f8c7bc84c41 100644--- a/solr/core/src/test/org/apache/solr/core/TestConfLoadPerf.java+++ b/solr/core/src/test/org/apache/solr/core/TestConfLoadPerf.java@@ -82,9 +82,11 @@ public class TestConfLoadPerf extends SolrTestCaseJ4 {long heapSize = Runtime.getRuntime().totalMemory();List<SolrConfig> allConfigs = new ArrayList<>();long startTime = System.currentTimeMillis();- for (int i = 0; i < 100; i++) {+ int numReads = 100;+ for (int i = 0; i < numReads; i++) {allConfigs.add(SolrConfig.readFromResourceLoader(srl, "solrconfig.xml", true, null));}+ assertEquals(numReads, allConfigs.size());System.gc();System.out.println("TIME_TAKEN : " + (System.currentTimeMillis() - startTime));System.out.println("HEAP_SIZE : " + ((Runtime.getRuntime().totalMemory() - heapSize) / (1024)));diff --git a/solr/core/src/test/org/apache/solr/handler/admin/ThreadDumpHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/ThreadDumpHandlerTest.javaindex 962092db5fc..703bb18bb65 100644--- a/solr/core/src/test/org/apache/solr/handler/admin/ThreadDumpHandlerTest.java+++ b/solr/core/src/test/org/apache/solr/handler/admin/ThreadDumpHandlerTest.java@@ -172,6 +172,7 @@ public class ThreadDumpHandlerTest extends SolrTestCaseJ4 {assertFalse("ownerT is still alive", ownerT.isAlive());blockedT.join(1000);assertFalse("blockedT is still alive", blockedT.isAlive());+ assertTrue(failures.isEmpty());}}@@ -298,6 +299,7 @@ public class ThreadDumpHandlerTest extends SolrTestCaseJ4 {assertFalse("ownerT is still alive", ownerT.isAlive());blockedT.join(1000);assertFalse("blockedT is still alive", blockedT.isAlive());+ assertTrue(failures.isEmpty());}}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.javaindex 381928669c6..31c2ba8d91e 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@@ -93,7 +93,7 @@ public class StatsComponentTest extends SolrTestCaseJ4 {SolrParams[] baseParamsSet =new SolrParams[] {// NOTE: doTestFieldStatisticsResult needs the full list of possible tags to exclude- params("stats.field", f, "stats", "true"),+ params(StatsParams.STATS_FIELD, f, StatsParams.STATS, "true"),params("stats.field","{!ex=fq1,fq2}" + f,@@ -471,16 +471,15 @@ public class StatsComponentTest extends SolrTestCaseJ4 {assertU(adoc("id", "4"));assertU(commit());- Map<String, String> args = new HashMap<>();- args.put(CommonParams.Q, "*:*");- args.put(StatsParams.STATS, "true");- args.put(StatsParams.STATS_FIELD, f);- args.put("f." + f + ".stats.calcdistinct", "true");- args.put("indent", "true");-for (SolrParams baseParams :new SolrParams[] {- params("stats.field", f, "stats", "true", "f." + f + ".stats.calcdistinct", "true"),+ params(+ StatsParams.STATS_FIELD,+ f,+ StatsParams.STATS,+ "true",+ "f." + f + ".stats.calcdistinct",+ "true"),params("json.facet", // note: no distinctValues support"{min:'min("@@ -511,7 +510,7 @@ public class StatsComponentTest extends SolrTestCaseJ4 {// string field cardinalityfor (SolrParams baseParams :new SolrParams[] {- params("stats.field", "{!cardinality=true}" + f, "stats", "true"),+ params(StatsParams.STATS_FIELD, "{!cardinality=true}" + f, StatsParams.STATS, "true"),params("json.facet", "{cardinality:'hll(" + f + ")'}")}) {assertQ(@@ -524,7 +523,7 @@ public class StatsComponentTest extends SolrTestCaseJ4 {// stats over a string functionfor (SolrParams baseParams :new SolrParams[] {- params("stats.field", "{!func}" + strFunc, "stats", "true"),+ params(StatsParams.STATS_FIELD, "{!func}" + strFunc, StatsParams.STATS, "true"),params("json.facet", // note: no function support for unique"{min:'min("diff --git a/solr/core/src/test/org/apache/solr/response/TestRetrieveFieldsOptimizer.java b/solr/core/src/test/org/apache/solr/response/TestRetrieveFieldsOptimizer.javaindex aa147068bd0..0c04a08b4ec 100644--- a/solr/core/src/test/org/apache/solr/response/TestRetrieveFieldsOptimizer.java+++ b/solr/core/src/test/org/apache/solr/response/TestRetrieveFieldsOptimizer.java@@ -500,11 +500,6 @@ class RetrieveField {final RetrieveFieldType testFieldType;RetrieveField(IndexSchema schema, String name, String type, Map<String, String> opts) {-- Map<String, String> fullOpts = new HashMap<>(opts);- fullOpts.put("name", name);- fullOpts.put("type", type);-this.name = name;this.type = type;this.schemaField = schema.newField(name, type, opts);diff --git a/solr/core/src/test/org/apache/solr/response/transform/TestSubQueryTransformerDistrib.java b/solr/core/src/test/org/apache/solr/response/transform/TestSubQueryTransformerDistrib.javaindex a9751e19b3b..40bc38fd1a3 100644--- a/solr/core/src/test/org/apache/solr/response/transform/TestSubQueryTransformerDistrib.java+++ b/solr/core/src/test/org/apache/solr/response/transform/TestSubQueryTransformerDistrib.java@@ -23,10 +23,8 @@ import java.net.URL;import java.nio.charset.StandardCharsets;import java.nio.file.Path;import java.util.ArrayList;-import java.util.HashMap;import java.util.Iterator;import java.util.List;-import java.util.Map;import java.util.Random;import org.apache.solr.JSONTestUtil;import org.apache.solr.client.solrj.SolrServerException;@@ -65,10 +63,6 @@ public class TestSubQueryTransformerDistrib extends SolrCloudTestCase {int nodeCount = 5;configureCluster(nodeCount).addConfig(configName, configDir).configure();- Map<String, String> collectionProperties = new HashMap<>();- collectionProperties.put("config", "solrconfig-doctransformers.xml");- collectionProperties.put("schema", "schema-docValuesJoin.xml");-int shards = 2;int replicas = 2;CollectionAdminRequest.createCollection(people, configName, shards, replicas)diff --git a/solr/core/src/test/org/apache/solr/update/AddBlockUpdateTest.java b/solr/core/src/test/org/apache/solr/update/AddBlockUpdateTest.javaindex 35ac7d6fe4d..056a7e70ad7 100644--- a/solr/core/src/test/org/apache/solr/update/AddBlockUpdateTest.java+++ b/solr/core/src/test/org/apache/solr/update/AddBlockUpdateTest.java@@ -29,10 +29,8 @@ import java.util.ArrayList;import java.util.Arrays;import java.util.Collection;import java.util.Collections;-import java.util.HashMap;import java.util.List;import java.util.Locale;-import java.util.Map;import java.util.concurrent.Callable;import java.util.concurrent.ExecutorService;import java.util.concurrent.Future;@@ -718,13 +716,11 @@ public class AddBlockUpdateTest extends SolrTestCaseJ4 {topDocument.addField("parent_f2", "v2");int childsNum = atLeast(10);- Map<String, SolrInputDocument> children = new HashMap<>(childsNum);for (int i = 0; i < childsNum; ++i) {SolrInputDocument child = new SolrInputDocument();child.addField("key", (i + 5) * atLeast(4));String childKey = String.format(Locale.ROOT, "child%d", i);topDocument.addField(childKey, child);- children.put(childKey, child);}ByteArrayOutputStream os = new ByteArrayOutputStream();diff --git a/solr/core/src/test/org/apache/solr/util/TestCircuitBreaker.java b/solr/core/src/test/org/apache/solr/util/TestCircuitBreaker.javaindex c89b92281f6..bb85b8d4cd6 100644--- a/solr/core/src/test/org/apache/solr/util/TestCircuitBreaker.java+++ b/solr/core/src/test/org/apache/solr/util/TestCircuitBreaker.java@@ -21,7 +21,6 @@ import static org.hamcrest.CoreMatchers.containsString;import java.lang.invoke.MethodHandles;import java.util.ArrayList;-import java.util.HashMap;import java.util.List;import java.util.concurrent.ExecutorService;import java.util.concurrent.Future;@@ -33,7 +32,6 @@ import org.apache.solr.common.params.CommonParams;import org.apache.solr.common.util.ExecutorUtil;import org.apache.solr.common.util.SolrNamedThreadFactory;import org.apache.solr.core.PluginInfo;-import org.apache.solr.search.QueryParsing;import org.apache.solr.util.circuitbreaker.CPUCircuitBreaker;import org.apache.solr.util.circuitbreaker.CircuitBreaker;import org.apache.solr.util.circuitbreaker.CircuitBreakerManager;@@ -79,11 +77,6 @@ public class TestCircuitBreaker extends SolrTestCaseJ4 {}public void testCBAlwaysTrips() {- HashMap<String, String> args = new HashMap<String, String>();-- args.put(QueryParsing.DEFTYPE, CircuitBreaker.NAME);- args.put(CommonParams.FL, "id");-removeAllExistingCircuitBreakers();PluginInfo pluginInfo =@@ -104,11 +97,6 @@ public class TestCircuitBreaker extends SolrTestCaseJ4 {}public void testCBFakeMemoryPressure() {- HashMap<String, String> args = new HashMap<String, String>();-- args.put(QueryParsing.DEFTYPE, CircuitBreaker.NAME);- args.put(CommonParams.FL, "id");-removeAllExistingCircuitBreakers();PluginInfo pluginInfo =@@ -130,10 +118,6 @@ public class TestCircuitBreaker extends SolrTestCaseJ4 {public void testBuildingMemoryPressure() {ExecutorService executor =ExecutorUtil.newMDCAwareCachedThreadPool(new SolrNamedThreadFactory("TestCircuitBreaker"));- HashMap<String, String> args = new HashMap<String, String>();-- args.put(QueryParsing.DEFTYPE, CircuitBreaker.NAME);- args.put(CommonParams.FL, "id");AtomicInteger failureCount = new AtomicInteger();diff --git a/solr/solr-ref-guide/modules/query-guide/examples/JsonRequestApiHeatmapFacetingTest.java b/solr/solr-ref-guide/modules/query-guide/examples/JsonRequestApiHeatmapFacetingTest.javaindex db749b94d05..245f1fc6e0d 100644--- a/solr/solr-ref-guide/modules/query-guide/examples/JsonRequestApiHeatmapFacetingTest.java+++ b/solr/solr-ref-guide/modules/query-guide/examples/JsonRequestApiHeatmapFacetingTest.java@@ -60,9 +60,6 @@ public class JsonRequestApiHeatmapFacetingTest extends SolrCloudTestCase {.toPath()).configure();- final List<String> solrUrls = new ArrayList<>();- solrUrls.add(cluster.getJettySolrRunner(0).getBaseUrl().toString());-CollectionAdminRequest.createCollection(COLLECTION_NAME, CONFIG_NAME, 1, 1).setPerReplicaState(SolrCloudTestCase.USE_PER_REPLICA_STATE).process(cluster.getSolrClient());diff --git a/solr/solr-ref-guide/modules/query-guide/examples/JsonRequestApiTest.java b/solr/solr-ref-guide/modules/query-guide/examples/JsonRequestApiTest.javaindex 3a95cf6de1d..ee338ffa2dd 100644--- a/solr/solr-ref-guide/modules/query-guide/examples/JsonRequestApiTest.java+++ b/solr/solr-ref-guide/modules/query-guide/examples/JsonRequestApiTest.java@@ -61,9 +61,6 @@ public class JsonRequestApiTest extends SolrCloudTestCase {.addConfig(CONFIG_NAME, new File(ExternalPaths.TECHPRODUCTS_CONFIGSET).toPath()).configure();- final List<String> solrUrls = new ArrayList<>();- solrUrls.add(cluster.getJettySolrRunner(0).getBaseUrl().toString());-CollectionAdminRequest.createCollection(COLLECTION_NAME, CONFIG_NAME, 1, 1).setPerReplicaState(SolrCloudTestCase.USE_PER_REPLICA_STATE).process(cluster.getSolrClient());@@ -348,8 +345,6 @@ public class JsonRequestApiTest extends SolrCloudTestCase {// tag::solrj-ipod-query-bool-condensed[]final Map<String, Object> queryTopLevel = new HashMap<>();final Map<String, Object> boolProperties = new HashMap<>();- final List<Object> mustClauses = new ArrayList<>();- final List<Object> mustNotClauses = new ArrayList<>();queryTopLevel.put("bool", boolProperties);boolProperties.put("must", "name:iPod");boolProperties.put("must_not", "{!frange l=0 u=5}popularity");diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/request/DelegationTokenRequest.java b/solr/solrj/src/java/org/apache/solr/client/solrj/request/DelegationTokenRequest.javaindex 0e61e028bdd..46773c2671f 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/request/DelegationTokenRequest.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/request/DelegationTokenRequest.java@@ -18,7 +18,6 @@package org.apache.solr.client.solrj.request;import java.util.Arrays;-import java.util.Set;import java.util.TreeSet;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrRequest;@@ -131,7 +130,6 @@ public abstract class DelegationTokenRequest<super(METHOD.PUT);this.token = token;setResponseParser(new NoOpResponseParser());- Set<String> queryParams = new TreeSet<>();setQueryParams(new TreeSet<>(Arrays.asList(OP_KEY, TOKEN_KEY)));}diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudHttp2SolrClientBadInputTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudHttp2SolrClientBadInputTest.javaindex e634cb2388b..20bd576ab9d 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudHttp2SolrClientBadInputTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudHttp2SolrClientBadInputTest.java@@ -34,8 +34,6 @@ public class CloudHttp2SolrClientBadInputTest extends SolrCloudTestCase {@BeforeClasspublic static void setupCluster() throws Exception {configureCluster(1).configure();-- final List<String> solrUrls = new ArrayList<>();}@Testdiff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientBadInputTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientBadInputTest.javaindex 3ec2d4d7497..4f498a0beb1 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientBadInputTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientBadInputTest.java@@ -34,8 +34,6 @@ public class CloudSolrClientBadInputTest extends SolrCloudTestCase {@BeforeClasspublic static void setupCluster() throws Exception {configureCluster(1).configure();-- final List<String> solrUrls = new ArrayList<>();}@Testdiff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/DirectJsonQueryRequestFacetingIntegrationTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/DirectJsonQueryRequestFacetingIntegrationTest.javaindex 33d7e2b9b70..9436185af51 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/DirectJsonQueryRequestFacetingIntegrationTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/DirectJsonQueryRequestFacetingIntegrationTest.java@@ -18,7 +18,6 @@package org.apache.solr.client.solrj.request.json;import java.io.File;-import java.util.ArrayList;import java.util.List;import org.apache.solr.client.solrj.request.AbstractUpdateRequest;import org.apache.solr.client.solrj.request.CollectionAdminRequest;@@ -52,9 +51,6 @@ public class DirectJsonQueryRequestFacetingIntegrationTest extends SolrCloudTest.addConfig(CONFIG_NAME, new File(ExternalPaths.TECHPRODUCTS_CONFIGSET).toPath()).configure();- final List<String> solrUrls = new ArrayList<>();- solrUrls.add(cluster.getJettySolrRunner(0).getBaseUrl().toString());-CollectionAdminRequest.createCollection(COLLECTION_NAME, CONFIG_NAME, 1, 1).setPerReplicaState(SolrCloudTestCase.USE_PER_REPLICA_STATE).process(cluster.getSolrClient());diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/JsonQueryRequestFacetingIntegrationTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/JsonQueryRequestFacetingIntegrationTest.javaindex 91592436530..6705f4bb30f 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/JsonQueryRequestFacetingIntegrationTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/JsonQueryRequestFacetingIntegrationTest.java@@ -20,7 +20,6 @@ package org.apache.solr.client.solrj.request.json;import java.io.File;import java.io.IOException;import java.time.Instant;-import java.util.ArrayList;import java.util.Date;import java.util.HashMap;import java.util.List;@@ -59,9 +58,6 @@ public class JsonQueryRequestFacetingIntegrationTest extends SolrCloudTestCase {.addConfig(CONFIG_NAME, new File(ExternalPaths.TECHPRODUCTS_CONFIGSET).toPath()).configure();- final List<String> solrUrls = new ArrayList<>();- solrUrls.add(cluster.getJettySolrRunner(0).getBaseUrl().toString());-CollectionAdminRequest.createCollection(COLLECTION_NAME, CONFIG_NAME, 1, 1).setPerReplicaState(SolrCloudTestCase.USE_PER_REPLICA_STATE).process(cluster.getSolrClient());diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/JsonQueryRequestHeatmapFacetingTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/JsonQueryRequestHeatmapFacetingTest.javaindex 5b632bbee17..59e85869e14 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/JsonQueryRequestHeatmapFacetingTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/JsonQueryRequestHeatmapFacetingTest.java@@ -47,9 +47,6 @@ public class JsonQueryRequestHeatmapFacetingTest extends SolrCloudTestCase {.toPath()).configure();- final List<String> solrUrls = new ArrayList<>();- solrUrls.add(cluster.getJettySolrRunner(0).getBaseUrl().toString());-CollectionAdminRequest.createCollection(COLLECTION_NAME, CONFIG_NAME, 1, 1).setPerReplicaState(SolrCloudTestCase.USE_PER_REPLICA_STATE).process(cluster.getSolrClient());diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/JsonQueryRequestIntegrationTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/JsonQueryRequestIntegrationTest.javaindex 662daa8c27a..203f69189ce 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/JsonQueryRequestIntegrationTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/JsonQueryRequestIntegrationTest.java@@ -19,10 +19,8 @@ package org.apache.solr.client.solrj.request.json;import java.io.File;import java.io.IOException;-import java.util.ArrayList;import java.util.Collection;import java.util.HashMap;-import java.util.List;import java.util.Map;import org.apache.solr.client.solrj.request.AbstractUpdateRequest;import org.apache.solr.client.solrj.request.CollectionAdminRequest;@@ -55,9 +53,6 @@ public class JsonQueryRequestIntegrationTest extends SolrCloudTestCase {.addConfig(CONFIG_NAME, new File(ExternalPaths.TECHPRODUCTS_CONFIGSET).toPath()).configure();- final List<String> solrUrls = new ArrayList<>();- solrUrls.add(cluster.getJettySolrRunner(0).getBaseUrl().toString());-CollectionAdminRequest.createCollection(COLLECTION_NAME, CONFIG_NAME, 1, 1).process(cluster.getSolrClient());diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/QueryFacetMapTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/QueryFacetMapTest.javaindex c86799b729a..bb69140accc 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/QueryFacetMapTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/QueryFacetMapTest.java@@ -33,11 +33,7 @@ public class QueryFacetMapTest extends SolrTestCaseJ4 {@Testpublic void testRejectsInvalidQueryString() {final Throwable thrown =- expectThrows(- IllegalArgumentException.class,- () -> {- final QueryFacetMap queryFacet = new QueryFacetMap(null);- });+ expectThrows(IllegalArgumentException.class, () -> new QueryFacetMap(null));MatcherAssert.assertThat(thrown.getMessage(), containsString("must be non-null"));}diff --git a/solr/test-framework/src/java/org/apache/solr/JSONTestUtil.java b/solr/test-framework/src/java/org/apache/solr/JSONTestUtil.javaindex 7091ac58ef9..649664829f9 100644--- a/solr/test-framework/src/java/org/apache/solr/JSONTestUtil.java+++ b/solr/test-framework/src/java/org/apache/solr/JSONTestUtil.java@@ -345,7 +345,6 @@ class CollectionTester {}Set<String> keys = match != null ? match : expectedMap.keySet();- Set<String> visited = new HashSet<>();Iterator<Map.Entry<String, Object>> iter = ordered ? v.entrySet().iterator() : null;