Apache Solr open-source search software
SOLR-15385 RawTypes Part VI (#207)
Mike Drob09986130545f
diff --git a/solr/core/src/java/org/apache/solr/cloud/ZkController.java b/solr/core/src/java/org/apache/solr/cloud/ZkController.javaindex fe8c1dd14c7..caff9cc78eb 100644--- a/solr/core/src/java/org/apache/solr/cloud/ZkController.java+++ b/solr/core/src/java/org/apache/solr/cloud/ZkController.java@@ -19,6 +19,7 @@ package org.apache.solr.cloud;import java.io.Closeable;import java.io.IOException;import java.lang.invoke.MethodHandles;+import java.lang.reflect.Array;import java.net.InetAddress;import java.net.NetworkInterface;import java.net.URLEncoder;@@ -2191,8 +2192,7 @@ public class ZkController implements Closeable {try {byte[] data = zkClient.getData(ZkStateReader.ROLES, null, new Stat(), true);if (data == null) return;- @SuppressWarnings({"rawtypes"})- Map roles = (Map) Utils.fromJSON(data);+ Map<?,?> roles = (Map<?,?>) Utils.fromJSON(data);if (roles == null) return;List<?> nodeList = (List<?>) roles.get("overseer");if (nodeList == null) return;@@ -2627,8 +2627,8 @@ public class ZkController implements Closeable {}registeredSearcher.decref();} else {- @SuppressWarnings({"rawtypes"})- Future[] waitSearcher = new Future[1];+ @SuppressWarnings("unchecked")+ Future<Void>[] waitSearcher = (Future<Void>[]) Array.newInstance(Future.class, 1);if (log.isInfoEnabled()) {log.info("No registered searcher found for core: {}, waiting until a searcher is registered before publishing as active", core.getName());}diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/AddReplicaCmd.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/AddReplicaCmd.javaindex 427d51a39f1..64c10a498dc 100644--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/AddReplicaCmd.java+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/AddReplicaCmd.java@@ -77,12 +77,11 @@ public class AddReplicaCmd implements CollApiCmds.CollectionApiCommand {}@Override- public void call(ClusterState state, ZkNodeProps message, @SuppressWarnings({"rawtypes"})NamedList results) throws Exception {+ public void call(ClusterState state, ZkNodeProps message, NamedList<Object> results) throws Exception {addReplica(state, message, results, null);}- @SuppressWarnings({"unchecked"})- List<ZkNodeProps> addReplica(ClusterState clusterState, ZkNodeProps message, @SuppressWarnings({"rawtypes"})NamedList results, Runnable onComplete)+ List<ZkNodeProps> addReplica(ClusterState clusterState, ZkNodeProps message, NamedList<Object> results, Runnable onComplete)throws IOException, InterruptedException, KeeperException {if (log.isDebugEnabled()) {log.debug("addReplica() : {}", Utils.toJSONString(message));@@ -154,7 +153,7 @@ public class AddReplicaCmd implements CollApiCmds.CollectionApiCommand {final ShardRequestTracker shardRequestTracker = CollectionHandlingUtils.asyncRequestTracker(asyncId, ccc);for (CreateReplica createReplica : createReplicas) {assert createReplica.coreName != null;- ModifiableSolrParams params = getReplicaParams(clusterState, message, results, collectionName, coll, skipCreateReplicaInClusterState, asyncId, shardHandler, createReplica);+ ModifiableSolrParams params = getReplicaParams(message, collectionName, coll, skipCreateReplicaInClusterState, createReplica);shardRequestTracker.sendShardRequest(createReplica.node, params, shardHandler);}@@ -197,7 +196,7 @@ public class AddReplicaCmd implements CollApiCmds.CollectionApiCommand {.collect(Collectors.toList());}- private ModifiableSolrParams getReplicaParams(ClusterState clusterState, ZkNodeProps message, @SuppressWarnings({"rawtypes"})NamedList results, String collectionName, DocCollection coll, boolean skipCreateReplicaInClusterState, String asyncId, ShardHandler shardHandler, CreateReplica createReplica) throws IOException, InterruptedException, KeeperException {+ private ModifiableSolrParams getReplicaParams(ZkNodeProps message, String collectionName, DocCollection coll, boolean skipCreateReplicaInClusterState, CreateReplica createReplica) throws InterruptedException, KeeperException {ZkStateReader zkStateReader = ccc.getZkStateReader();if (!skipCreateReplicaInClusterState) {ZkNodeProps props = new ZkNodeProps(diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/CreateShardCmd.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/CreateShardCmd.javaindex 14bcaec8873..25c4cb5dab2 100644--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/CreateShardCmd.java+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/CreateShardCmd.java@@ -52,8 +52,7 @@ public class CreateShardCmd implements CollApiCmds.CollectionApiCommand {}@Override- @SuppressWarnings({"unchecked", "rawtypes"})- public void call(ClusterState clusterState, ZkNodeProps message, NamedList results) throws Exception {+ public void call(ClusterState clusterState, ZkNodeProps message, NamedList<Object> results) throws Exception {String extCollectionName = message.getStr(COLLECTION_PROP);String sliceName = message.getStr(SHARD_ID_PROP);boolean waitForFinalState = message.getBool(CommonAdminParams.WAIT_FOR_FINAL_STATE, false);@@ -107,24 +106,29 @@ public class CreateShardCmd implements CollApiCmds.CollectionApiCommand {CollectionHandlingUtils.addPropertyParams(message, propertyParams);addReplicasProps = addReplicasProps.plus(propertyParams);if (async != null) addReplicasProps.getProperties().put(ASYNC, async);- final NamedList addResult = new NamedList();+ final NamedList<Object> addResult = new NamedList<>();try {new AddReplicaCmd(ccc).addReplica(clusterState, addReplicasProps, addResult, () -> {- Object addResultFailure = addResult.get("failure");+ @SuppressWarnings("unchecked")+ NamedList<Object> addResultFailure = (NamedList<Object>) addResult.get("failure");if (addResultFailure != null) {- SimpleOrderedMap failure = (SimpleOrderedMap) results.get("failure");+ @SuppressWarnings("unchecked")+ SimpleOrderedMap<Object> failure = (SimpleOrderedMap<Object>) results.get("failure");if (failure == null) {- failure = new SimpleOrderedMap();+ failure = new SimpleOrderedMap<>();results.add("failure", failure);}- failure.addAll((NamedList) addResultFailure);+ failure.addAll(addResultFailure);} else {- SimpleOrderedMap success = (SimpleOrderedMap) results.get("success");+ @SuppressWarnings("unchecked")+ SimpleOrderedMap<Object> success = (SimpleOrderedMap<Object>) results.get("success");if (success == null) {- success = new SimpleOrderedMap();+ success = new SimpleOrderedMap<>();results.add("success", success);}- success.addAll((NamedList) addResult.get("success"));+ @SuppressWarnings("unchecked")+ NamedList<Object> addResultSuccess = (NamedList<Object>) addResult.get("success");+ success.addAll(addResultSuccess);}});} catch (Assign.AssignmentException e) {diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/DeleteBackupCmd.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/DeleteBackupCmd.javaindex 815effcda4f..2bd29185697 100644--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/DeleteBackupCmd.java+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/DeleteBackupCmd.java@@ -70,7 +70,7 @@ public class DeleteBackupCmd implements CollApiCmds.CollectionApiCommand {}@Override- public void call(ClusterState state, ZkNodeProps message, @SuppressWarnings({"rawtypes"}) NamedList results) throws Exception {+ public void call(ClusterState state, ZkNodeProps message, NamedList<Object> results) throws Exception {String backupLocation = message.getStr(CoreAdminParams.BACKUP_LOCATION);String backupName = message.getStr(NAME);String repo = message.getStr(CoreAdminParams.BACKUP_REPOSITORY);@@ -101,12 +101,11 @@ public class DeleteBackupCmd implements CollApiCmds.CollectionApiCommand {}}- @SuppressWarnings({"unchecked"})/*** Clean up {@code backupPath} by removing all index files, shard-metadata files, and backup property files that are* unreachable, uncompleted or corrupted.*/- void purge(BackupRepository repository, URI backupPath, @SuppressWarnings({"rawtypes"}) NamedList result) throws IOException {+ void purge(BackupRepository repository, URI backupPath, NamedList<Object> result) throws IOException {PurgeGraph purgeGraph = new PurgeGraph();purgeGraph.build(repository, backupPath);@@ -115,8 +114,7 @@ public class DeleteBackupCmd implements CollApiCmds.CollectionApiCommand {repository.delete(backupPaths.getShardBackupMetadataDir(), purgeGraph.shardBackupMetadataDeletes, true);repository.delete(backupPath, purgeGraph.backupIdDeletes, true);- @SuppressWarnings({"rawtypes"})- NamedList details = new NamedList();+ NamedList<Integer> details = new NamedList<>();details.add("numBackupIds", purgeGraph.backupIdDeletes.size());details.add("numShardBackupIds", purgeGraph.shardBackupMetadataDeletes.size());details.add("numIndexFiles", purgeGraph.indexFileDeletes.size());@@ -128,7 +126,7 @@ public class DeleteBackupCmd implements CollApiCmds.CollectionApiCommand {*/void keepNumberOfBackup(BackupRepository repository, URI backupPath,int maxNumBackup,- @SuppressWarnings({"rawtypes"}) NamedList results) throws Exception {+ NamedList<Object> results) throws Exception {List<BackupId> backupIds = BackupFilePaths.findAllBackupIdsFromFileListing(repository.listAllOrEmpty(backupPath));if (backupIds.size() <= maxNumBackup) {return;@@ -141,7 +139,7 @@ public class DeleteBackupCmd implements CollApiCmds.CollectionApiCommand {void deleteBackupIds(URI backupUri, BackupRepository repository,Set<BackupId> backupIdsDeletes,- @SuppressWarnings({"rawtypes"}) NamedList results) throws IOException {+ NamedList<Object> results) throws IOException {BackupFilePaths incBackupFiles = new BackupFilePaths(repository, backupUri);URI shardBackupMetadataDir = incBackupFiles.getShardBackupMetadataDir();@@ -200,15 +198,13 @@ public class DeleteBackupCmd implements CollApiCmds.CollectionApiCommand {repository.delete(backupUri, backupIdsDeletes.stream().map(id -> BackupFilePaths.getBackupPropsName(id)).collect(Collectors.toList()), true);}- @SuppressWarnings("unchecked")private void addResult(URI backupPath, BackupRepository repository,Set<BackupId> backupIdDeletes,Map<BackupId, AggregateBackupStats> backupIdToCollectionBackupPoint,- @SuppressWarnings({"rawtypes"}) NamedList results) {+ NamedList<Object> results) {String collectionName = null;- @SuppressWarnings({"rawtypes"})- List<NamedList> shardBackupIdDetails = new ArrayList<>();+ List<NamedList<Object>> shardBackupIdDetails = new ArrayList<>();results.add("deleted", shardBackupIdDetails);for (BackupId backupId : backupIdDeletes) {NamedList<Object> backupIdResult = new NamedList<>();@@ -233,7 +229,7 @@ public class DeleteBackupCmd implements CollApiCmds.CollectionApiCommand {}private void deleteBackupId(BackupRepository repository, URI backupPath,- int bid, @SuppressWarnings({"rawtypes"}) NamedList results) throws Exception {+ int bid, NamedList<Object> results) throws Exception {BackupId backupId = new BackupId(bid);if (!repository.exists(repository.resolve(backupPath, BackupFilePaths.getBackupPropsName(backupId)))) {throw new SolrException(SolrException.ErrorCode.BAD_REQUEST, "Backup ID [" + bid + "] not found; cannot be deleted");diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/DeleteReplicaCmd.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/DeleteReplicaCmd.javaindex 244882722aa..7c020c94091 100644--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/DeleteReplicaCmd.java+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/DeleteReplicaCmd.java@@ -63,12 +63,12 @@ public class DeleteReplicaCmd implements CollectionApiCommand {}@Override- public void call(ClusterState clusterState, ZkNodeProps message, @SuppressWarnings({"rawtypes"})NamedList results) throws Exception {+ public void call(ClusterState clusterState, ZkNodeProps message, NamedList<Object> results) throws Exception {deleteReplica(clusterState, message, results,null);}- void deleteReplica(ClusterState clusterState, ZkNodeProps message, @SuppressWarnings({"rawtypes"})NamedList results, Runnable onComplete)+ void deleteReplica(ClusterState clusterState, ZkNodeProps message, NamedList<Object> results, Runnable onComplete)throws KeeperException, IOException, InterruptedException {if (log.isDebugEnabled()) {log.debug("deleteReplica() : {}", Utils.toJSONString(message));@@ -109,10 +109,9 @@ public class DeleteReplicaCmd implements CollectionApiCommand {* Delete replicas based on count for a given collection. If a shard is passed, uses that* else deletes given num replicas across all shards for the given collection.*/- @SuppressWarnings({"unchecked"})void deleteReplicaBasedOnCount(ClusterState clusterState,ZkNodeProps message,- @SuppressWarnings({"rawtypes"})NamedList results,+ NamedList<Object> results,Runnable onComplete,boolean parallel)throws KeeperException, IOException, InterruptedException {@@ -131,7 +130,7 @@ public class DeleteReplicaCmd implements CollectionApiCommand {}}- Map<Slice, Set<String>> shardToReplicasMapping = new HashMap<Slice, Set<String>>();+ Map<Slice, Set<String>> shardToReplicasMapping = new HashMap<>();if (slice != null) {Set<String> replicasToBeDeleted = pickReplicasTobeDeleted(slice, shard, collectionName, count);shardToReplicasMapping.put(slice,replicasToBeDeleted);@@ -221,12 +220,11 @@ public class DeleteReplicaCmd implements CollectionApiCommand {}}- @SuppressWarnings({"unchecked"})void deleteCore(ClusterState clusterState, DocCollection coll,String shardId,String replicaName,ZkNodeProps message,- @SuppressWarnings({"rawtypes"})NamedList results,+ NamedList<Object> results,Runnable onComplete,boolean parallel,boolean verifyPlacement) throws KeeperException, IOException, InterruptedException {diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/DeleteShardCmd.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/DeleteShardCmd.javaindex 1212fa8cb01..c94574b9130 100644--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/DeleteShardCmd.java+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/DeleteShardCmd.java@@ -60,8 +60,7 @@ public class DeleteShardCmd implements CollApiCmds.CollectionApiCommand {}@Override- @SuppressWarnings({"unchecked"})- public void call(ClusterState clusterState, ZkNodeProps message, @SuppressWarnings({"rawtypes"})NamedList results) throws Exception {+ public void call(ClusterState clusterState, ZkNodeProps message, NamedList<Object> results) throws Exception {String extCollectionName = message.getStr(ZkStateReader.COLLECTION_PROP);String sliceId = message.getStr(ZkStateReader.SHARD_ID_PROP);@@ -120,8 +119,7 @@ public class DeleteShardCmd implements CollApiCmds.CollectionApiCommand {if (log.isInfoEnabled()) {log.info("Deleting replica for collection={} shard={} on node={}", replica.getStr(COLLECTION_PROP), replica.getStr(SHARD_ID_PROP), replica.getStr(CoreAdminParams.NODE));}- @SuppressWarnings({"rawtypes"})- NamedList deleteResult = new NamedList();+ NamedList<Object> deleteResult = new NamedList<>();try {new DeleteReplicaCmd(ccc).deleteReplica(clusterState, replica, deleteResult, () -> {cleanupLatch.countDown();@@ -131,8 +129,8 @@ public class DeleteShardCmd implements CollApiCmds.CollectionApiCommand {" on node=%s", replica.getStr(COLLECTION_PROP), replica.getStr(SHARD_ID_PROP), replica.getStr(NODE_NAME_PROP)));}}- @SuppressWarnings({"rawtypes"})- SimpleOrderedMap success = (SimpleOrderedMap) deleteResult.get("success");+ @SuppressWarnings("unchecked")+ SimpleOrderedMap<Object> success = (SimpleOrderedMap<Object>) deleteResult.get("success");if (success != null) {synchronized (results) {results.add("success", success);diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/MoveReplicaCmd.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/MoveReplicaCmd.javaindex fbd8df48678..136d2b574e6 100644--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/MoveReplicaCmd.java+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/MoveReplicaCmd.java@@ -62,11 +62,11 @@ public class MoveReplicaCmd implements CollApiCmds.CollectionApiCommand {}@Override- public void call(ClusterState state, ZkNodeProps message, @SuppressWarnings({"rawtypes"})NamedList results) throws Exception {+ public void call(ClusterState state, ZkNodeProps message, NamedList<Object> results) throws Exception {moveReplica(ccc.getZkStateReader().getClusterState(), message, results);}- private void moveReplica(ClusterState clusterState, ZkNodeProps message, @SuppressWarnings({"rawtypes"})NamedList results) throws Exception {+ private void moveReplica(ClusterState clusterState, ZkNodeProps message, NamedList<Object> results) throws Exception {if (log.isDebugEnabled()) {log.debug("moveReplica() : {}", Utils.toJSONString(message));}@@ -142,8 +142,7 @@ public class MoveReplicaCmd implements CollApiCmds.CollectionApiCommand {}}- @SuppressWarnings({"unchecked"})- private void moveHdfsReplica(ClusterState clusterState, @SuppressWarnings({"rawtypes"})NamedList results, String dataDir, String targetNode, String async,+ private void moveHdfsReplica(ClusterState clusterState, NamedList<Object> results, String dataDir, String targetNode, String async,DocCollection coll, Replica replica, Slice slice, int timeout, boolean waitForFinalState) throws Exception {String skipCreateReplicaInClusterState = "true";if (clusterState.getLiveNodes().contains(replica.getNodeName())) {@@ -156,8 +155,7 @@ public class MoveReplicaCmd implements CollApiCmds.CollectionApiCommand {removeReplicasProps.getProperties().put(CoreAdminParams.DELETE_DATA_DIR, false);removeReplicasProps.getProperties().put(CoreAdminParams.DELETE_INDEX, false);if (async != null) removeReplicasProps.getProperties().put(ASYNC, async);- @SuppressWarnings({"rawtypes"})- NamedList deleteResult = new NamedList();+ NamedList<Object> deleteResult = new NamedList<>();try {new DeleteReplicaCmd(ccc).deleteReplica(clusterState, removeReplicasProps, deleteResult, null);} catch (SolrException e) {@@ -202,8 +200,7 @@ public class MoveReplicaCmd implements CollApiCmds.CollectionApiCommand {ZkStateReader.REPLICA_TYPE, replica.getType().name());if(async!=null) addReplicasProps.getProperties().put(ASYNC, async);- @SuppressWarnings({"rawtypes"})- NamedList addResult = new NamedList();+ NamedList<Object> addResult = new NamedList<>();try {new AddReplicaCmd(ccc).addReplica(ccc.getZkStateReader().getClusterState(), addReplicasProps, addResult, null);} catch (Exception e) {@@ -213,8 +210,7 @@ public class MoveReplicaCmd implements CollApiCmds.CollectionApiCommand {results.add("failure", errorString);log.warn("Error adding replica {} - trying to roll back...", addReplicasProps, e);addReplicasProps = addReplicasProps.plus(CoreAdminParams.NODE, replica.getNodeName());- @SuppressWarnings({"rawtypes"})- NamedList rollback = new NamedList();+ NamedList<Object> rollback = new NamedList<>();new AddReplicaCmd(ccc).addReplica(ccc.getZkStateReader().getClusterState(), addReplicasProps, rollback, null);if (rollback.get("failure") != null) {throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, "Fatal error during MOVEREPLICA of " + replica@@ -230,8 +226,7 @@ public class MoveReplicaCmd implements CollApiCmds.CollectionApiCommand {log.debug("--- trying to roll back...");// try to roll backaddReplicasProps = addReplicasProps.plus(CoreAdminParams.NODE, replica.getNodeName());- @SuppressWarnings({"rawtypes"})- NamedList rollback = new NamedList();+ NamedList<Object> rollback = new NamedList<>();try {new AddReplicaCmd(ccc).addReplica(ccc.getZkStateReader().getClusterState(), addReplicasProps, rollback, null);} catch (Exception e) {@@ -242,7 +237,6 @@ public class MoveReplicaCmd implements CollApiCmds.CollectionApiCommand {throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, "Fatal error during MOVEREPLICA of " + replica+ ", collection may be inconsistent! Failure: " + rollback.get("failure"));}- return;} else {String successString = String.format(Locale.ROOT, "MOVEREPLICA action completed successfully, moved replica=%s at node=%s " +"to replica=%s at node=%s", replica.getCoreName(), replica.getNodeName(), replica.getCoreName(), targetNode);@@ -250,8 +244,7 @@ public class MoveReplicaCmd implements CollApiCmds.CollectionApiCommand {}}- @SuppressWarnings({"unchecked"})- private void moveNormalReplica(ClusterState clusterState, @SuppressWarnings({"rawtypes"})NamedList results, String targetNode, String async,+ private void moveNormalReplica(ClusterState clusterState, NamedList<Object> results, String targetNode, String async,DocCollection coll, Replica replica, Slice slice, int timeout, boolean waitForFinalState) throws Exception {String newCoreName = Assign.buildSolrCoreName(ccc.getSolrCloudManager().getDistribStateManager(), coll, slice.getName(), replica.getType());ZkNodeProps addReplicasProps = new ZkNodeProps(@@ -262,8 +255,7 @@ public class MoveReplicaCmd implements CollApiCmds.CollectionApiCommand {ZkStateReader.REPLICA_TYPE, replica.getType().name());if (async != null) addReplicasProps.getProperties().put(ASYNC, async);- @SuppressWarnings({"rawtypes"})- NamedList addResult = new NamedList();+ NamedList<Object> addResult = new NamedList<>();SolrCloseableLatch countDownLatch = new SolrCloseableLatch(1, ccc.getCloseableToLatchOn());ActiveReplicaWatcher watcher = null;ZkNodeProps props = new AddReplicaCmd(ccc).addReplica(clusterState, addReplicasProps, addResult, null).get(0);@@ -308,8 +300,7 @@ public class MoveReplicaCmd implements CollApiCmds.CollectionApiCommand {SHARD_ID_PROP, slice.getName(),REPLICA_PROP, replica.getName());if (async != null) removeReplicasProps.getProperties().put(ASYNC, async);- @SuppressWarnings({"rawtypes"})- NamedList deleteResult = new NamedList();+ NamedList<Object> deleteResult = new NamedList<>();try {new DeleteReplicaCmd(ccc).deleteReplica(clusterState, removeReplicasProps, deleteResult, null);} catch (SolrException e) {diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/OverseerRoleCmd.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/OverseerRoleCmd.javaindex c8bb3e45b0b..e0766e6e386 100644--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/OverseerRoleCmd.java+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/OverseerRoleCmd.java@@ -54,8 +54,7 @@ public class OverseerRoleCmd implements CollApiCmds.CollectionApiCommand {}@Override- @SuppressWarnings({"unchecked", "rawtypes"})- public void call(ClusterState state, ZkNodeProps message, NamedList results) throws Exception {+ public void call(ClusterState state, ZkNodeProps message, NamedList<Object> results) throws Exception {if (ccc.isDistributedCollectionAPI()) {// No Overseer (not accessible from Collection API command execution in any case) so this command can't be run...log.error("Cluster is running with distributed Collection API execution. Ignoring Collection API operation " + operation); // nowarn@@ -63,19 +62,20 @@ public class OverseerRoleCmd implements CollApiCmds.CollectionApiCommand {}ZkStateReader zkStateReader = ccc.getZkStateReader();SolrZkClient zkClient = zkStateReader.getZkClient();- Map roles = null;+ Map<String, List<String>> roles = null;String node = message.getStr("node");String roleName = message.getStr("role");boolean nodeExists = false;if (nodeExists = zkClient.exists(ZkStateReader.ROLES, true)) {- roles = (Map) Utils.fromJSON(zkClient.getData(ZkStateReader.ROLES, null, new Stat(), true));+ @SuppressWarnings("unchecked")+ Map<String, List<String>> tmp = (Map<String, List<String>>) Utils.fromJSON(zkClient.getData(ZkStateReader.ROLES, null, new Stat(), true));+ roles = tmp;} else {roles = new LinkedHashMap<>(1);}- List nodeList = (List) roles.get(roleName);- if (nodeList == null) roles.put(roleName, nodeList = new ArrayList<>());+ List<String> nodeList = roles.computeIfAbsent(roleName, k -> new ArrayList<>());if (ADDROLE == operation) {log.info("Overseer role added to {}", node);if (!nodeList.contains(node)) nodeList.add(node);diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/ReplaceNodeCmd.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/ReplaceNodeCmd.javaindex 428e165f4a2..9ea6f6ad0ce 100644--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/ReplaceNodeCmd.java+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/ReplaceNodeCmd.java@@ -59,8 +59,7 @@ public class ReplaceNodeCmd implements CollApiCmds.CollectionApiCommand {}@Override- @SuppressWarnings({"unchecked"})- public void call(ClusterState state, ZkNodeProps message, @SuppressWarnings({"rawtypes"})NamedList results) throws Exception {+ public void call(ClusterState state, ZkNodeProps message, NamedList<Object> results) throws Exception {ZkStateReader zkStateReader = ccc.getZkStateReader();String source = message.getStr(CollectionParams.SOURCE_NODE, message.getStr("source"));String target = message.getStr(CollectionParams.TARGET_NODE, message.getStr("target"));@@ -100,8 +99,6 @@ public class ReplaceNodeCmd implements CollApiCmds.CollectionApiCommand {SolrCloseableLatch replicasToRecover = new SolrCloseableLatch(numLeaders, ccc.getCloseableToLatchOn());try {for (ZkNodeProps sourceReplica : sourceReplicas) {- @SuppressWarnings({"rawtypes"})- NamedList nl = new NamedList();String sourceCollection = sourceReplica.getStr(COLLECTION_PROP);if (log.isInfoEnabled()) {log.info("Going to create replica for collection={} shard={} on node={}", sourceCollection, sourceReplica.getStr(SHARD_ID_PROP), target);@@ -127,6 +124,7 @@ public class ReplaceNodeCmd implements CollApiCmds.CollectionApiCommand {}ZkNodeProps msg = sourceReplica.plus("parallel", String.valueOf(parallel)).plus(CoreAdminParams.NODE, targetNode);if (async != null) msg.getProperties().put(ASYNC, async);+ NamedList<Object> nl = new NamedList<>();final ZkNodeProps addedReplica = new AddReplicaCmd(ccc).addReplica(clusterState,msg, nl, () -> {countDownLatch.countDown();@@ -200,8 +198,7 @@ public class ReplaceNodeCmd implements CollApiCmds.CollectionApiCommand {log.info("Failed to create some replicas. Cleaning up all replicas on target node");SolrCloseableLatch cleanupLatch = new SolrCloseableLatch(createdReplicas.size(), ccc.getCloseableToLatchOn());for (ZkNodeProps createdReplica : createdReplicas) {- @SuppressWarnings({"rawtypes"})- NamedList deleteResult = new NamedList();+ NamedList<Object> deleteResult = new NamedList<>();try {new DeleteReplicaCmd(ccc).deleteReplica(zkStateReader.getClusterState(), createdReplica.plus("parallel", "true"), deleteResult, () -> {cleanupLatch.countDown();diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/RestoreCmd.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/RestoreCmd.javaindex fb76bfc5e38..b1fda48de5e 100644--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/RestoreCmd.java+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/RestoreCmd.java@@ -86,8 +86,7 @@ public class RestoreCmd implements CollApiCmds.CollectionApiCommand {}@Override- @SuppressWarnings({"rawtypes"})- public void call(ClusterState state, ZkNodeProps message, NamedList results) throws Exception {+ public void call(ClusterState state, ZkNodeProps message, NamedList<Object> results) throws Exception {try (RestoreContext restoreContext = new RestoreContext(message, ccc)) {if (state.hasCollection(restoreContext.restoreCollectionName)) {RestoreOnExistingCollection restoreOnExistingCollection = new RestoreOnExistingCollection(restoreContext);@@ -100,7 +99,7 @@ public class RestoreCmd implements CollApiCmds.CollectionApiCommand {}}- private void requestReplicasToRestore(@SuppressWarnings({"rawtypes"}) NamedList results, DocCollection restoreCollection,+ private void requestReplicasToRestore(NamedList<Object> results, DocCollection restoreCollection,ClusterState clusterState,BackupProperties backupProperties,URI backupPath,@@ -221,7 +220,7 @@ public class RestoreCmd implements CollApiCmds.CollectionApiCommand {this.numPullReplicas = getInt(message, PULL_REPLICAS, backupCollectionState.getNumPullReplicas(), 0);}- public void process(@SuppressWarnings("rawtypes") NamedList results, RestoreContext rc) throws Exception {+ public void process(NamedList<Object> results, RestoreContext rc) throws Exception {// Avoiding passing RestoreContext arounduploadConfig(rc.backupProperties.getConfigName(),rc.restoreConfigName,@@ -251,7 +250,7 @@ public class RestoreCmd implements CollApiCmds.CollectionApiCommand {createSingleReplicaPerShard(results, restoreCollection, rc.asyncId, clusterState, replicaPositions);Object failures = results.get("failure");- if (failures != null && ((SimpleOrderedMap) failures).size() > 0) {+ if (failures != null && ((SimpleOrderedMap<?>) failures).size() > 0) {log.error("Restore failed to create initial replicas.");CollectionHandlingUtils.cleanupCollection(rc.restoreCollectionName, new NamedList<>(), ccc);return;@@ -286,7 +285,6 @@ public class RestoreCmd implements CollApiCmds.CollectionApiCommand {}}- @SuppressWarnings({"unchecked", "rawtypes"})private void createCoreLessCollection(String restoreCollectionName,String restoreConfigName,DocCollection backupCollectionState,@@ -312,6 +310,7 @@ public class RestoreCmd implements CollApiCmds.CollectionApiCommand {propMap.put(CollectionAdminParams.COLL_CONF, restoreConfigName);// router.*+ @SuppressWarnings({"unchecked"})Map<String, Object> routerProps = (Map<String, Object>) backupCollectionState.getProperties().get(DocCollection.DOC_ROUTER);for (Map.Entry<String, Object> pair : routerProps.entrySet()) {propMap.put(DocCollection.DOC_ROUTER + "." + pair.getKey(), pair.getValue());@@ -333,7 +332,7 @@ public class RestoreCmd implements CollApiCmds.CollectionApiCommand {propMap.put(CollectionHandlingUtils.SHARDS_PROP, newSlices);}- new CreateCollectionCmd(ccc).call(clusterState, new ZkNodeProps(propMap), new NamedList());+ new CreateCollectionCmd(ccc).call(clusterState, new ZkNodeProps(propMap), new NamedList<>());// note: when createCollection() returns, the collection exists (no race)}@@ -369,8 +368,7 @@ public class RestoreCmd implements CollApiCmds.CollectionApiCommand {return assignStrategy.assign(ccc.getSolrCloudManager(), assignRequest);}- @SuppressWarnings({"unchecked", "rawtypes"})- private void createSingleReplicaPerShard(NamedList results,+ private void createSingleReplicaPerShard(NamedList<Object> results,DocCollection restoreCollection,String asyncId,ClusterState clusterState, List<ReplicaPosition> replicaPositions) throws Exception {@@ -410,23 +408,28 @@ public class RestoreCmd implements CollApiCmds.CollectionApiCommand {propMap.put(ASYNC, asyncId);}CollectionHandlingUtils.addPropertyParams(message, propMap);- final NamedList addReplicaResult = new NamedList();+ final NamedList<Object> addReplicaResult = new NamedList<>();new AddReplicaCmd(ccc).addReplica(clusterState, new ZkNodeProps(propMap), addReplicaResult, () -> {- Object addResultFailure = addReplicaResult.get("failure");+ @SuppressWarnings("unchecked")+ NamedList<Object> addResultFailure = (NamedList<Object>) addReplicaResult.get("failure");if (addResultFailure != null) {- SimpleOrderedMap failure = (SimpleOrderedMap) results.get("failure");+ @SuppressWarnings("unchecked")+ SimpleOrderedMap<Object> failure = (SimpleOrderedMap<Object>) results.get("failure");if (failure == null) {- failure = new SimpleOrderedMap();+ failure = new SimpleOrderedMap<>();results.add("failure", failure);}- failure.addAll((NamedList) addResultFailure);+ failure.addAll(addResultFailure);} else {- SimpleOrderedMap success = (SimpleOrderedMap) results.get("success");+ @SuppressWarnings("unchecked")+ SimpleOrderedMap<Object> success = (SimpleOrderedMap<Object>) results.get("success");if (success == null) {- success = new SimpleOrderedMap();+ success = new SimpleOrderedMap<>();results.add("success", success);}- success.addAll((NamedList) addReplicaResult.get("success"));+ @SuppressWarnings("unchecked")+ NamedList<Object> addReplicaSuccess = (NamedList<Object>) addReplicaResult.get("success");+ success.addAll(addReplicaSuccess);}countDownLatch.countDown();});@@ -477,7 +480,7 @@ public class RestoreCmd implements CollApiCmds.CollectionApiCommand {}}- private void addReplicasToShards(@SuppressWarnings({"rawtypes"}) NamedList results,+ private void addReplicasToShards(NamedList<Object> results,ClusterState clusterState,DocCollection restoreCollection,List<ReplicaPosition> replicaPositions,@@ -573,7 +576,7 @@ public class RestoreCmd implements CollApiCmds.CollectionApiCommand {}}- public void process(RestoreContext rc, @SuppressWarnings({"rawtypes"}) NamedList results) throws Exception {+ public void process(RestoreContext rc, NamedList<Object> results) throws Exception {ClusterState clusterState = rc.zkStateReader.getClusterState();DocCollection restoreCollection = clusterState.getCollection(rc.restoreCollectionName);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 dcdb5ec9e5e..602167a4c6a 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@@ -75,13 +75,11 @@ public class SplitShardCmd implements CollApiCmds.CollectionApiCommand {this.ccc = ccc;}- @SuppressWarnings("unchecked")@Override- public void call(ClusterState state, ZkNodeProps message, @SuppressWarnings({"rawtypes"})NamedList results) throws Exception {- split(state, message,(NamedList<Object>) results);+ public void call(ClusterState state, ZkNodeProps message, NamedList<Object> results) throws Exception {+ split(state, message, results);}- @SuppressWarnings({"rawtypes"})public boolean split(ClusterState clusterState, ZkNodeProps message, NamedList<Object> results) throws Exception {final String asyncId = message.getStr(ASYNC);@@ -188,7 +186,6 @@ public class SplitShardCmd implements CollApiCmds.CollectionApiCommand {List<Map<String, Object>> replicas = new ArrayList<>((repFactor - 1) * 2);- @SuppressWarnings("deprecation")ShardHandler shardHandler = ccc.newShardHandler();@@ -213,9 +210,9 @@ public class SplitShardCmd implements CollApiCmds.CollectionApiCommand {// Extract the recommended splits from the shard response (if it exists)// example response: getRangesResults={success={127.0.0.1:62086_solr={responseHeader={status=0,QTime=1},ranges=10-20,3a-3f}}}- NamedList successes = (NamedList)getRangesResults.get("success");+ NamedList<?> successes = (NamedList<?>)getRangesResults.get("success");if (successes != null && successes.size() > 0) {- NamedList shardRsp = (NamedList)successes.getVal(0);+ NamedList<?> shardRsp = (NamedList<?>)successes.getVal(0);String splits = (String)shardRsp.get(CoreAdminParams.RANGES);if (splits != null) {log.info("Resulting split ranges to be used: {} slice={} leader={}", splits, slice, parentShardLeader);@@ -251,7 +248,7 @@ public class SplitShardCmd implements CollApiCmds.CollectionApiCommand {propMap.put(SHARD_ID_PROP, subSlice);ZkNodeProps m = new ZkNodeProps(propMap);try {- new DeleteShardCmd(ccc).call(clusterState, m, new NamedList());+ new DeleteShardCmd(ccc).call(clusterState, m, new NamedList<>());} catch (Exception e) {throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, "Unable to delete already existing sub shard: " + subSlice,e);@@ -640,7 +637,7 @@ public class SplitShardCmd implements CollApiCmds.CollectionApiCommand {* In case of async requests, the ShardRequestTracker's processResponses() does not* abort on failure (as it should). Handling this here temporarily for now.*/- private void handleFailureOnAsyncRequest(@SuppressWarnings({"rawtypes"})NamedList results, String msgOnError) {+ private void handleFailureOnAsyncRequest(NamedList<?> results, String msgOnError) {Object splitResultFailure = results.get("failure");if (splitResultFailure != null) {throw new SolrException(ErrorCode.SERVER_ERROR, msgOnError);diff --git a/solr/core/src/java/org/apache/solr/core/BlobRepository.java b/solr/core/src/java/org/apache/solr/core/BlobRepository.javaindex ba0917ca4a2..e7a7e15e46f 100644--- a/solr/core/src/java/org/apache/solr/core/BlobRepository.java+++ b/solr/core/src/java/org/apache/solr/core/BlobRepository.java@@ -115,12 +115,11 @@ public class BlobRepository {* @param decoder a decoder that knows how to interpret the bytes from the blob* @return The reference of a blob*/- BlobContentRef<Object> getBlobIncRef(String key, Decoder<Object> decoder) {+ <T> BlobContentRef<T> getBlobIncRef(String key, Decoder<T> decoder) {return getBlobIncRef(key.concat(decoder.getName()), () -> addBlob(key, decoder));}- @SuppressWarnings({"unchecked", "rawtypes"})- BlobContentRef getBlobIncRef(String key, Decoder decoder, String url, String sha512) {+ <T> BlobContentRef<T> getBlobIncRef(String key, Decoder<T> decoder, String url, String sha512) {StringBuilder keyBuilder = new StringBuilder(key);if (decoder != null) keyBuilder.append(decoder.getName());keyBuilder.append("/").append(sha512);@@ -163,10 +162,10 @@ public class BlobRepository {}// for use cases sharing java objects- private BlobContent<Object> addBlob(String key, Decoder<Object> decoder) {+ private <T> BlobContent<T> addBlob(String key, Decoder<T> decoder) {ByteBuffer b = fetchBlob(key);String keyPlusName = key + decoder.getName();- BlobContent<Object> aBlob = new BlobContent<>(keyPlusName, b, decoder);+ BlobContent<T> aBlob = new BlobContent<>(keyPlusName, b, decoder);blobs.put(keyPlusName, aBlob);return aBlob;}@@ -288,13 +287,13 @@ public class BlobRepository {}}- @SuppressWarnings({"unchecked", "rawtypes"})public static class BlobContent<T> {public final String key;private final T content; // holds byte buffer or cached object, holding both is a waste of memory// ref counting mechanism- private final Set<BlobContentRef> references = new HashSet<>();+ private final Set<BlobContentRef<T>> references = new HashSet<>();+ @SuppressWarnings("unchecked")public BlobContent(String key, ByteBuffer buffer, Decoder<T> decoder) {this.key = key;this.content = decoder == null ? (T) buffer : decoder.decode(new ByteBufferInputStream(buffer));diff --git a/solr/core/src/java/org/apache/solr/core/ConfigOverlay.java b/solr/core/src/java/org/apache/solr/core/ConfigOverlay.javaindex 8ffefcef1b8..42db6a7dbd4 100644--- a/solr/core/src/java/org/apache/solr/core/ConfigOverlay.java+++ b/solr/core/src/java/org/apache/solr/core/ConfigOverlay.java@@ -174,8 +174,7 @@ public class ConfigOverlay implements MapSerializable {//The path maps to the xml xpath and value of 1 means it is a tag with a string value and value// of 0 means it is an attribute with string value- @SuppressWarnings({"rawtypes"})- private static Map editable_prop_map = (Map) Utils.fromJSONResource("EditableSolrConfigAttributes.json");+ private static Map<?, ?> editable_prop_map = (Map<?, ?>) Utils.fromJSONResource("EditableSolrConfigAttributes.json");public static boolean isEditableProp(String path, boolean isXpath, List<String> hierarchy) {return !(checkEditable(path, isXpath, hierarchy) == null);diff --git a/solr/core/src/java/org/apache/solr/core/RequestParams.java b/solr/core/src/java/org/apache/solr/core/RequestParams.javaindex 7dbaf733287..ed20c588987 100644--- a/solr/core/src/java/org/apache/solr/core/RequestParams.java+++ b/solr/core/src/java/org/apache/solr/core/RequestParams.java@@ -69,7 +69,8 @@ public class RequestParams implements MapSerializable {@SuppressWarnings({"rawtypes"})public static ParamSet createParamSet(Map map, Long version) {Map copy = getDeepCopy(map, 3);- Map<?,?> meta = (Map<?,?>) copy.remove("");+ @SuppressWarnings("unchecked")+ Map<String, Long> meta = (Map<String, Long>) copy.remove("");if (meta == null && version != null) {meta = Collections.singletonMap("v", version);}@@ -137,7 +138,7 @@ public class RequestParams implements MapSerializable {public RequestParams setParams(String name, ParamSet paramSet) {Map deepCopy = getDeepCopy(data, 3);Map p = (Map) deepCopy.get(NAME);- if (p == null) deepCopy.put(NAME, p = new LinkedHashMap());+ if (p == null) deepCopy.put(NAME, p = new LinkedHashMap<>());if (paramSet == null) p.remove(name);else p.put(name, paramSet.toMap(new LinkedHashMap<>()));return new RequestParams(deepCopy, znodeVersion);@@ -187,8 +188,7 @@ public class RequestParams implements MapSerializable {log.info("conf resource {} loaded . version : {} ", name, version);}try {- @SuppressWarnings({"rawtypes"})- Map m = (Map) fromJSON (in);+ Map<?, ?> m = (Map<?, ?>) fromJSON (in);return new Object[]{m, version};} catch (Exception e) {throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, "Error parsing conf resource " + name, e);@@ -213,14 +213,12 @@ public class RequestParams implements MapSerializable {@SuppressWarnings({"unchecked"})public static class ParamSet implements MapSerializable {- @SuppressWarnings({"rawtypes"})- private final Map defaults, appends, invariants;+ private final Map<String, Object> defaults, appends, invariants;Map<String, VersionedParams> paramsMap;- @SuppressWarnings({"rawtypes"})- public final Map meta;+ public final Map<String, Long> meta;@SuppressWarnings({"rawtypes"})- ParamSet(Map defaults, Map invariants, Map appends, Map meta) {+ ParamSet(Map defaults, Map invariants, Map appends, Map<String, Long> meta) {this.defaults = defaults;this.invariants = invariants;this.appends = appends;@@ -233,11 +231,10 @@ public class RequestParams implements MapSerializable {}public Long getVersion() {- return meta == null ? Long.valueOf(0l) : (Long) meta.get("v");+ return meta == null ? 0L : meta.get("v");}@Override- @SuppressWarnings({"unchecked"})public Map<String, Object> toMap(Map<String, Object> result) {result.putAll(defaults);if (appends != null) result.put(APPENDS, appends);@@ -258,8 +255,7 @@ public class RequestParams implements MapSerializable {);}- @SuppressWarnings({"unchecked", "rawtypes"})- private static Map mergeMaps(Map m1, Map m2) {+ private static <K, V> Map<K, V> mergeMaps(Map<K, V> m1, Map<K, V> m2) {if (m1 == null && m2 == null) return null;if (m1 == null) return m2;if (m2 == null) return m1;@@ -276,7 +272,6 @@ public class RequestParams implements MapSerializable {/**get the raw map*/- @SuppressWarnings({"unchecked"})public Map<String, Object> get() {return defaults;}diff --git a/solr/core/src/java/org/apache/solr/core/SolrCore.java b/solr/core/src/java/org/apache/solr/core/SolrCore.javaindex b93bf2dc299..84181873182 100644--- a/solr/core/src/java/org/apache/solr/core/SolrCore.java+++ b/solr/core/src/java/org/apache/solr/core/SolrCore.java@@ -2036,7 +2036,7 @@ public final class SolrCore implements SolrInfoBean, Closeable {}- public RefCounted<SolrIndexSearcher> getSearcher(boolean forceNew, boolean returnSearcher, @SuppressWarnings({"rawtypes"})final Future[] waitSearcher) {+ public RefCounted<SolrIndexSearcher> getSearcher(boolean forceNew, boolean returnSearcher, final Future<Void>[] waitSearcher) {return getSearcher(forceNew, returnSearcher, waitSearcher, false);}@@ -2232,7 +2232,7 @@ public final class SolrCore implements SolrInfoBean, Closeable {* @param updateHandlerReopens if true, the UpdateHandler will be used when reopening a {@link SolrIndexSearcher}.*/// TODO waitSearcher should be an AtomicReference or something that is a more clear API- public RefCounted<SolrIndexSearcher> getSearcher(boolean forceNew, boolean returnSearcher, @SuppressWarnings({"rawtypes"})final Future[] waitSearcher, boolean updateHandlerReopens) {+ public RefCounted<SolrIndexSearcher> getSearcher(boolean forceNew, boolean returnSearcher, final Future<Void>[] waitSearcher, boolean updateHandlerReopens) {// it may take some time to open an index.... we may need to make// sure that two threads aren't trying to open one at the same time// if it isn't necessary.@@ -2339,8 +2339,7 @@ public final class SolrCore implements SolrInfoBean, Closeable {final SolrIndexSearcher currSearcher = currSearcherHolder == null ? null : currSearcherHolder.get();- @SuppressWarnings({"rawtypes"})- Future future = null;+ Future<Void> future = null;// if the underlying searcher has not changed, no warming is neededif (newSearcher != currSearcher) {@@ -3223,14 +3222,13 @@ public final class SolrCore implements SolrInfoBean, Closeable {* @param decoder a decoder with which to convert the blob into a Java Object representation (first time only)* @return a reference to the blob that has already cached the decoded version.*/- @SuppressWarnings({"rawtypes"})- public BlobRepository.BlobContentRef loadDecodeAndCacheBlob(String key, BlobRepository.Decoder<Object> decoder) {+ public <T> BlobRepository.BlobContentRef<T> loadDecodeAndCacheBlob(String key, BlobRepository.Decoder<T> decoder) {// make sure component authors don't give us oddball keys with no version...if (!BlobRepository.BLOB_KEY_PATTERN_CHECKER.matcher(key).matches()) {throw new IllegalArgumentException("invalid key format, must end in /N where N is the version number");}// define the blob- BlobRepository.BlobContentRef<Object> blobRef = coreContainer.getBlobRepository().getBlobIncRef(key, decoder);+ BlobRepository.BlobContentRef<T> blobRef = coreContainer.getBlobRepository().getBlobIncRef(key, decoder);addCloseHook(new CloseHook() {@Overridepublic void preClose(SolrCore core) {diff --git a/solr/core/src/java/org/apache/solr/core/TracerConfigurator.java b/solr/core/src/java/org/apache/solr/core/TracerConfigurator.javaindex 5db59b387e7..30ab138b3f6 100644--- a/solr/core/src/java/org/apache/solr/core/TracerConfigurator.java+++ b/solr/core/src/java/org/apache/solr/core/TracerConfigurator.java@@ -72,16 +72,14 @@ public abstract class TracerConfigurator implements NamedListInitializedPlugin {implements ExecutorUtil.InheritableThreadLocalProvider {private final Tracer tracer = GlobalTracer.get();- @SuppressWarnings({"rawtypes", "unchecked"})@Override- public void store(AtomicReference ctx) {+ public void store(AtomicReference<Object> ctx) {assert tracer == GlobalTracer.get() : "Tracer changed; not supported!";ctx.set(tracer.scopeManager().activeSpan());}- @SuppressWarnings({"rawtypes", "unchecked"})@Override- public void set(AtomicReference ctx) {+ public void set(AtomicReference<Object> ctx) {final Span span = (Span) ctx.get();if (span != null) {log.trace("Thread received span to do async work: {}", span);@@ -90,9 +88,8 @@ public abstract class TracerConfigurator implements NamedListInitializedPlugin {}}- @SuppressWarnings({"rawtypes"})@Override- public void clean(AtomicReference ctx) {+ public void clean(AtomicReference<Object> ctx) {Scope scope = (Scope) ctx.get();if (scope != null) {scope.close();diff --git a/solr/core/src/java/org/apache/solr/filestore/DistribPackageStore.java b/solr/core/src/java/org/apache/solr/filestore/DistribPackageStore.javaindex 903f2f0ad8e..0df05381479 100644--- a/solr/core/src/java/org/apache/solr/filestore/DistribPackageStore.java+++ b/solr/core/src/java/org/apache/solr/filestore/DistribPackageStore.java@@ -181,13 +181,12 @@ public class DistribPackageStore implements PackageStore {String baseUrl = url.replace("/solr", "/api");ByteBuffer metadata = null;- @SuppressWarnings({"rawtypes"})- Map m = null;+ Map<?, ?> m = null;try {metadata = Utils.executeGET(coreContainer.getUpdateShardHandler().getDefaultHttpClient(),baseUrl + "/node/files" + getMetaPath(),Utils.newBytesConsumer((int) MAX_PKG_SIZE));- m = (Map) Utils.fromJSON(metadata.array(), metadata.arrayOffset(), metadata.limit());+ m = (Map<?, ?>) Utils.fromJSON(metadata.array(), metadata.arrayOffset(), metadata.limit());} catch (SolrException e) {throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, "Error fetching metadata", e);}@@ -250,11 +249,12 @@ public class DistribPackageStore implements PackageStore {return getRealpath(path);}+ @SuppressWarnings("unchecked")MetaData readMetaData() throws IOException {File file = getRealpath(getMetaPath()).toFile();if (file.exists()) {try (InputStream fis = new FileInputStream(file)) {- return new MetaData((Map) Utils.fromJSON(fis));+ return new MetaData((Map<String,Object>) Utils.fromJSON(fis));}}return null;@@ -586,8 +586,7 @@ public class DistribPackageStore implements PackageStore {public static void _persistToFile(Path solrHome, String path, ByteBuffer data, ByteBuffer meta) throws IOException {Path realpath = _getRealPath(path, solrHome);Files.createDirectories(realpath.getParent());- @SuppressWarnings({"rawtypes"})- Map m = (Map) Utils.fromJSON(meta.array(), meta.arrayOffset(), meta.limit());+ Map<?, ?> m = (Map<?, ?>) Utils.fromJSON(meta.array(), meta.arrayOffset(), meta.limit());if (m == null || m.isEmpty()) {throw new SolrException(SERVER_ERROR, "invalid metadata , discarding : " + path);}diff --git a/solr/core/src/java/org/apache/solr/filestore/PackageStoreAPI.java b/solr/core/src/java/org/apache/solr/filestore/PackageStoreAPI.javaindex f0b1bfbf3c7..8cb414eccda 100644--- a/solr/core/src/java/org/apache/solr/filestore/PackageStoreAPI.java+++ b/solr/core/src/java/org/apache/solr/filestore/PackageStoreAPI.java@@ -354,9 +354,9 @@ public class PackageStoreAPI {List<String> signatures;Map<String, Object> otherAttribs;- @SuppressWarnings({"unchecked"})- public MetaData(@SuppressWarnings({"rawtypes"})Map m) {- m = Utils.getDeepCopy(m, 3);+ @SuppressWarnings("unchecked")+ public MetaData(Map<String,Object> m) {+ m = (Map<String, Object>) Utils.getDeepCopy(m, 3);this.sha512 = (String) m.remove(SHA512);this.signatures = (List<String>) m.remove("sig");this.otherAttribs = m;diff --git a/solr/core/src/java/org/apache/solr/handler/ClusterAPI.java b/solr/core/src/java/org/apache/solr/handler/ClusterAPI.javaindex 3f64032cea8..aa50f69e2e6 100644--- a/solr/core/src/java/org/apache/solr/handler/ClusterAPI.java+++ b/solr/core/src/java/org/apache/solr/handler/ClusterAPI.java@@ -216,28 +216,25 @@ public class ClusterAPI {permission = COLL_EDIT_PERM)public class Commands {@Command(name = "add-role")- @SuppressWarnings({"rawtypes", "unchecked"})public void addRole(PayloadObj<RoleInfo> obj) throws Exception {RoleInfo info = obj.get();- Map m = info.toMap(new HashMap<>());+ Map<String,Object> m = info.toMap(new HashMap<>());m.put("action", ADDROLE.toString());collectionsHandler.handleRequestBody(wrapParams(obj.getRequest(), m), obj.getResponse());}@Command(name = "remove-role")- @SuppressWarnings({"rawtypes", "unchecked"})public void removeRole(PayloadObj<RoleInfo> obj) throws Exception {RoleInfo info = obj.get();- Map m = info.toMap(new HashMap<>());+ Map<String,Object> m = info.toMap(new HashMap<>());m.put("action", REMOVEROLE.toString());collectionsHandler.handleRequestBody(wrapParams(obj.getRequest(), m), obj.getResponse());}@Command(name = "set-obj-property")- @SuppressWarnings({"rawtypes", "unchecked"})public void setObjProperty(PayloadObj<ClusterPropPayload> obj) {//Not using the object directly here because the API differentiate between {name:null} and {}- Map m = obj.getDataMap();+ Map<String,Object> m = obj.getDataMap();ClusterProperties clusterProperties = new ClusterProperties(getCoreContainer().getZkController().getZkClient());try {clusterProperties.setClusterProperties(m);@@ -259,10 +256,7 @@ public class ClusterAPI {ClusterProperties clusterProperties = new ClusterProperties(getCoreContainer().getZkController().getZkClient());try {- clusterProperties.update(rateLimiterConfig == null?- null:- rateLimiterConfig,- RL_CONFIG_KEY);+ clusterProperties.update(rateLimiterConfig, RL_CONFIG_KEY);} catch (Exception e) {throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, "Error in API", e);}diff --git a/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java b/solr/core/src/java/org/apache/solr/handler/IndexFetcher.javaindex fa89f7d42be..e39fd9cd286 100644--- a/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java+++ b/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java@@ -24,6 +24,7 @@ import java.io.InputStream;import java.io.OutputStreamWriter;import java.io.Writer;import java.lang.invoke.MethodHandles;+import java.lang.reflect.Array;import java.net.MalformedURLException;import java.nio.ByteBuffer;import java.nio.channels.FileChannel;@@ -903,8 +904,8 @@ public class IndexFetcher {// todo stop keeping solrCore aroundSolrCore core = solrCore.getCoreContainer().getCore(solrCore.getName());try {- @SuppressWarnings({"rawtypes"})- Future[] waitSearcher = new Future[1];+ @SuppressWarnings("unchecked")+ Future<Void>[] waitSearcher = (Future<Void>[]) Array.newInstance(Future.class, 1);searcher = core.getSearcher(true, true, waitSearcher, true);if (waitSearcher[0] != null) {try {diff --git a/solr/core/src/java/org/apache/solr/handler/RestoreCore.java b/solr/core/src/java/org/apache/solr/handler/RestoreCore.javaindex 25b559eb5da..d4d47da7a32 100644--- a/solr/core/src/java/org/apache/solr/handler/RestoreCore.java+++ b/solr/core/src/java/org/apache/solr/handler/RestoreCore.java@@ -18,6 +18,7 @@ package org.apache.solr.handler;import java.io.IOException;import java.lang.invoke.MethodHandles;+import java.lang.reflect.Array;import java.net.URI;import java.text.SimpleDateFormat;import java.util.Arrays;@@ -172,8 +173,8 @@ public class RestoreCore implements Callable<Boolean> {}private void openNewSearcher() throws Exception {- @SuppressWarnings({"rawtypes"})- Future[] waitSearcher = new Future[1];+ @SuppressWarnings("unchecked")+ Future<Void>[] waitSearcher = (Future<Void>[]) Array.newInstance(Future.class, 1);core.getSearcher(true, false, waitSearcher, true);if (waitSearcher[0] != null) {waitSearcher[0].get();diff --git a/solr/core/src/java/org/apache/solr/handler/SchemaHandler.java b/solr/core/src/java/org/apache/solr/handler/SchemaHandler.javaindex ffaeb2deb25..f85254b25fc 100644--- a/solr/core/src/java/org/apache/solr/handler/SchemaHandler.java+++ b/solr/core/src/java/org/apache/solr/handler/SchemaHandler.java@@ -24,7 +24,6 @@ import java.util.HashSet;import java.util.List;import java.util.Map;import java.util.Set;-import java.util.function.BiConsumer;import org.apache.solr.api.Api;import org.apache.solr.api.ApiBag;@@ -89,8 +88,7 @@ public class SchemaHandler extends RequestHandlerBase implements SolrCoreAware,}try {- @SuppressWarnings({"rawtypes"})- List errs = new SchemaManager(req).performOperations();+ List<Map<String,Object>> errs = new SchemaManager(req).performOperations();if (!errs.isEmpty())throw new ApiBag.ExceptionWithErrObject(SolrException.ErrorCode.BAD_REQUEST,"error processing commands", errs);} catch (IOException e) {@@ -169,18 +167,15 @@ public class SchemaHandler extends RequestHandlerBase implements SolrCoreAware,if (parts.size() > 2) {req.setParams(SolrParams.wrapDefaults(new MapSolrParams(singletonMap(pathParam, parts.get(2))), req.getParams()));}- @SuppressWarnings({"rawtypes"})- Map propertyValues = req.getSchema().getNamedPropertyValues(realName, req.getParams());+ Map<String,Object> propertyValues = req.getSchema().getNamedPropertyValues(realName, req.getParams());Object o = propertyValues.get(fieldName);if(parts.size()> 2) {String name = parts.get(2);if (o instanceof List) {- @SuppressWarnings({"rawtypes"})- List list = (List) o;+ List<?> list = (List<?>) o;for (Object obj : list) {if (obj instanceof SimpleOrderedMap) {- @SuppressWarnings({"rawtypes"})- SimpleOrderedMap simpleOrderedMap = (SimpleOrderedMap) obj;+ SimpleOrderedMap<?> simpleOrderedMap = (SimpleOrderedMap<?>) obj;if(name.equals(simpleOrderedMap.get("name"))) {rsp.add(fieldName.substring(0, realName.length() - 1), simpleOrderedMap);insertPackageInfo(rsp.getValues(), req);@@ -210,18 +205,18 @@ public class SchemaHandler extends RequestHandlerBase implements SolrCoreAware,* If a plugin is loaded from a package, the version of the package being used should be added* to the response*/- @SuppressWarnings("rawtypes")private void insertPackageInfo(Object o, SolrQueryRequest req) {if (!req.getParams().getBool("meta", false)) return;if (o instanceof List) {- List l = (List) o;+ List<?> l = (List<?>) o;for (Object o1 : l) {if (o1 instanceof NamedList || o1 instanceof List) insertPackageInfo(o1, req);}} else if (o instanceof NamedList) {- NamedList nl = (NamedList) o;- nl.forEach((BiConsumer) (n, v) -> {+ @SuppressWarnings("unchecked")+ NamedList<Object> nl = (NamedList<Object>) o;+ nl.forEach((n, v) -> {if (v instanceof NamedList || v instanceof List) insertPackageInfo(v, req);});Object v = nl.get("class");diff --git a/solr/core/src/java/org/apache/solr/handler/SolrConfigHandler.java b/solr/core/src/java/org/apache/solr/handler/SolrConfigHandler.javaindex 44b4d602023..02b56e133c9 100644--- a/solr/core/src/java/org/apache/solr/handler/SolrConfigHandler.java+++ b/solr/core/src/java/org/apache/solr/handler/SolrConfigHandler.java@@ -37,8 +37,6 @@ import java.util.concurrent.TimeUnit;import java.util.concurrent.locks.Lock;import java.util.concurrent.locks.ReentrantLock;-import com.google.common.collect.ImmutableMap;-import com.google.common.collect.ImmutableSet;import org.apache.solr.api.Api;import org.apache.solr.api.ApiBag;import org.apache.solr.client.solrj.SolrClient;@@ -255,8 +253,7 @@ public class SolrConfigHandler extends RequestHandlerBase implements SolrCoreAwaObject o = pluginNameVsPluginInfo instanceof MapSerializable ?pluginNameVsPluginInfo:pluginNameVsPluginInfo.get(componentName);- @SuppressWarnings({"rawtypes"})- Map pluginInfo = o instanceof MapSerializable? ((MapSerializable) o).toMap(new LinkedHashMap<>()): (Map) o;+ Map<String, Object> pluginInfo = o instanceof MapSerializable ? ((MapSerializable) o).toMap(new LinkedHashMap<>()) : (Map<String, Object>) o;val.put(parts.get(1), pluginNameVsPluginInfo instanceof PluginInfo? pluginInfo : Map.of(componentName, pluginInfo));if (req.getParams().getBool("meta", false)) {// meta=true is asking for the package info of the plugin@@ -281,15 +278,14 @@ public class SolrConfigHandler extends RequestHandlerBase implements SolrCoreAwa}}- @SuppressWarnings({"unchecked"})private Map<String, Object> getConfigDetails(String componentType, SolrQueryRequest req) {String componentName = componentType == null ? null : req.getParams().get("componentName");boolean showParams = req.getParams().getBool("expandParams", false);Map<String, Object> map = this.req.getCore().getSolrConfig().toMap(new LinkedHashMap<>());if (componentType != null && !SolrRequestHandler.TYPE.equals(componentType)) return map;- @SuppressWarnings({"rawtypes"})- Map reqHandlers = (Map) map.get(SolrRequestHandler.TYPE);- if (reqHandlers == null) map.put(SolrRequestHandler.TYPE, reqHandlers = new LinkedHashMap<>());+ @SuppressWarnings({"unchecked"})+ Map<String, Object> reqHandlers = (Map<String, Object>) map.computeIfAbsent(SolrRequestHandler.TYPE,+ k -> new LinkedHashMap<>());List<PluginInfo> plugins = this.req.getCore().getImplicitHandlers();for (PluginInfo plugin : plugins) {if (SolrRequestHandler.TYPE.equals(plugin.type)) {@@ -299,9 +295,7 @@ public class SolrConfigHandler extends RequestHandlerBase implements SolrCoreAwa}}if (!showParams) return map;- for (Object o : reqHandlers.entrySet()) {- @SuppressWarnings({"rawtypes"})- Map.Entry e = (Map.Entry) o;+ for (Map.Entry<String, Object> e : reqHandlers.entrySet()) {if (componentName == null || e.getKey().equals(componentName)) {Map<String, Object> m = expandUseParams(req, e.getValue());e.setValue(m);@@ -324,8 +318,7 @@ public class SolrConfigHandler extends RequestHandlerBase implements SolrCoreAwaString useParams = (String) pluginInfo.get(USEPARAM);String useParamsInReq = req.getOriginalParams().get(USEPARAM);if (useParams != null || useParamsInReq != null) {- @SuppressWarnings({"rawtypes"})- Map m = new LinkedHashMap<>();+ Map<String, Object> m = new LinkedHashMap<>();pluginInfo.put("_useParamsExpanded_", m);List<String> params = new ArrayList<>();if (useParams != null) params.addAll(StrUtils.splitSmart(useParams, ','));@@ -349,10 +342,7 @@ public class SolrConfigHandler extends RequestHandlerBase implements SolrCoreAwagetSolrParamsFromNamedList(nl, INVARIANTS));//SolrParams.wrapDefaults(maskUseParams, req.getParams())- MapSolrParams mask = new MapSolrParams(ImmutableMap.<String, String>builder()- .put("componentName", "")- .put("expandParams", "")- .build());+ MapSolrParams mask = new MapSolrParams(Map.of("componentName", "", "expandParams", ""));pluginInfo.put("_effectiveParams_",SolrParams.wrapDefaults(mask, r.getParams()));}@@ -760,7 +750,7 @@ public class SolrConfigHandler extends RequestHandlerBase implements SolrCoreAwapublic static final String SET = "set";public static final String UPDATE = "update";public static final String CREATE = "create";- private static Set<String> cmdPrefixes = ImmutableSet.of(CREATE, UPDATE, "delete", "add");+ private static final Set<String> cmdPrefixes = Set.of(CREATE, UPDATE, "delete", "add");/*** Block up to a specified maximum time until we see agreement on the schema@@ -872,8 +862,7 @@ public class SolrConfigHandler extends RequestHandlerBase implements SolrCoreAwa}}- @SuppressWarnings({"rawtypes"})- private static class PerReplicaCallable extends SolrRequest implements Callable<Boolean> {+ private static class PerReplicaCallable extends SolrRequest<SolrResponse> implements Callable<Boolean> {String coreUrl;String prop;int expectedZkVersion;diff --git a/solr/core/src/java/org/apache/solr/handler/admin/BaseHandlerApiSupport.java b/solr/core/src/java/org/apache/solr/handler/admin/BaseHandlerApiSupport.javaindex cf1bd699760..9d65f814d60 100644--- a/solr/core/src/java/org/apache/solr/handler/admin/BaseHandlerApiSupport.java+++ b/solr/core/src/java/org/apache/solr/handler/admin/BaseHandlerApiSupport.java@@ -132,7 +132,6 @@ public abstract class BaseHandlerApiSupport implements ApiSupport {/*** Wrapper for SolrParams that wraps V2 params and exposes them as V1 params.*/- @SuppressWarnings({"unchecked"})private static void wrapParams(final SolrQueryRequest req, final CommandOperation co, final ApiCommand cmd, final boolean useRequestParams) {final Map<String, String> pathValues = req.getPathTemplateValues();final Map<String, Object> map = co == null || !(co.getCommandData() instanceof Map) ?@@ -159,8 +158,8 @@ public abstract class BaseHandlerApiSupport implements ApiSupport {if (o == null) o = pathValues.get(param);if (o == null && useRequestParams) o = origParams.getParams(param);if (o instanceof List) {- @SuppressWarnings({"rawtypes"})- List l = (List) o;+ @SuppressWarnings("unchecked")+ List<String> l = (List<String>) o;return l.toArray(new String[l.size()]);}diff --git a/solr/core/src/java/org/apache/solr/handler/admin/ContainerPluginsApi.java b/solr/core/src/java/org/apache/solr/handler/admin/ContainerPluginsApi.javaindex 324cdfa01dd..0adae3ca723 100644--- a/solr/core/src/java/org/apache/solr/handler/admin/ContainerPluginsApi.java+++ b/solr/core/src/java/org/apache/solr/handler/admin/ContainerPluginsApi.java@@ -176,13 +176,14 @@ public class ContainerPluginsApi {}}- @SuppressWarnings({"rawtypes", "unchecked"})private void persistPlugins(Function<Map<String,Object>, Map<String,Object>> modifier) throws IOException {try {zkClientSupplier.get().atomicUpdate(ZkStateReader.CLUSTER_PROPS, bytes -> {- Map rawJson = bytes == null ? new LinkedHashMap<>() :- (Map) Utils.fromJSON(bytes);- Map pluginsModified = modifier.apply((Map) rawJson.computeIfAbsent(PLUGIN, o -> new LinkedHashMap<>()));+ @SuppressWarnings("unchecked")+ Map<String, Object> rawJson = bytes == null ? new LinkedHashMap<>() :+ (Map<String, Object>) Utils.fromJSON(bytes);+ @SuppressWarnings("unchecked")+ Map<String, Object> pluginsModified = modifier.apply((Map<String, Object>) rawJson.computeIfAbsent(PLUGIN, o -> new LinkedHashMap<>()));if (pluginsModified == null) return null;rawJson.put(PLUGIN, pluginsModified);return Utils.toJSON(rawJson);diff --git a/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminOperation.java b/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminOperation.javaindex 6396024dc29..1a966a8a656 100644--- a/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminOperation.java+++ b/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminOperation.java@@ -235,8 +235,7 @@ enum CoreAdminOperation implements CoreAdminOp {}SolrSnapshotMetaDataManager mgr = core.getSnapshotMetaDataManager();- @SuppressWarnings({"rawtypes"})- NamedList result = new NamedList();+ NamedList<Object> result = new NamedList<>();for (String name : mgr.listSnapshots()) {Optional<SnapshotMetaData> metadata = mgr.getSnapshotMetaData(name);if ( metadata.isPresent() ) {@@ -275,7 +274,6 @@ enum CoreAdminOperation implements CoreAdminOp {* @return - a named list of key/value pairs from the core.* @throws IOException - LukeRequestHandler can throw an I/O exception*/- @SuppressWarnings({"unchecked", "rawtypes"})static NamedList<Object> getCoreStatus(CoreContainer cores, String cname, boolean isIndexInfoNeeded) throws IOException {NamedList<Object> info = new SimpleOrderedMap<>();@@ -312,7 +310,7 @@ enum CoreAdminOperation implements CoreAdminOp {if (cores.isZooKeeperAware()) {info.add("lastPublished", core.getCoreDescriptor().getCloudDescriptor().getLastPublished().toString().toLowerCase(Locale.ROOT));info.add("configVersion", core.getSolrConfig().getZnodeVersion());- SimpleOrderedMap cloudInfo = new SimpleOrderedMap<>();+ SimpleOrderedMap<String> cloudInfo = new SimpleOrderedMap<>();cloudInfo.add(COLLECTION, core.getCoreDescriptor().getCloudDescriptor().getCollectionName());cloudInfo.add(SHARD, core.getCoreDescriptor().getCloudDescriptor().getShardId());cloudInfo.add(REPLICA, core.getCoreDescriptor().getCloudDescriptor().getCoreNodeName());diff --git a/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.javaindex a28ce1c8dae..6c8a170df82 100644--- a/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java+++ b/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java@@ -629,7 +629,6 @@ public class LukeRequestHandler extends RequestHandlerBase// Get terribly detailed information about a particular field. This is a very expensive call, use it with caution// especially on large indexes!- @SuppressWarnings("unchecked")private static void getDetailedFieldInfo(SolrQueryRequest req, String field, SimpleOrderedMap<Object> fieldMap)throws IOException {@@ -727,8 +726,7 @@ public class LukeRequestHandler extends RequestHandlerBase/*** Private internal class that counts up frequent terms*/- @SuppressWarnings("rawtypes")- private static class TopTermQueue extends PriorityQueue+ private static class TopTermQueue extends PriorityQueue<TopTermQueue.TermInfo>{static class TermInfo {TermInfo(Term t, int df) {@@ -750,10 +748,8 @@ public class LukeRequestHandler extends RequestHandlerBase}@Override- protected final boolean lessThan(Object a, Object b) {- TermInfo termInfoA = (TermInfo)a;- TermInfo termInfoB = (TermInfo)b;- return termInfoA.docFreq < termInfoB.docFreq;+ protected final boolean lessThan(TermInfo a, TermInfo b) {+ return a.docFreq < b.docFreq;}/**@@ -764,7 +760,7 @@ public class LukeRequestHandler extends RequestHandlerBase// reverse the list..List<TermInfo> aslist = new LinkedList<>();while( size() > 0 ) {- aslist.add( 0, (TermInfo)pop() );+ aslist.add( 0, pop());}NamedList<Integer> list = new NamedList<>();@@ -779,7 +775,7 @@ public class LukeRequestHandler extends RequestHandlerBasereturn list;}public TermInfo getTopTermInfo() {- return (TermInfo)top();+ return top();}}}diff --git a/solr/core/src/java/org/apache/solr/handler/admin/MetricsHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/MetricsHandler.javaindex 90e8fc0d973..0aa917a95bd 100644--- a/solr/core/src/java/org/apache/solr/handler/admin/MetricsHandler.java+++ b/solr/core/src/java/org/apache/solr/handler/admin/MetricsHandler.java@@ -139,8 +139,7 @@ public class MetricsHandler extends RequestHandlerBase implements PermissionNameconsumer.accept("metrics", response);}- @SuppressWarnings({"unchecked", "rawtypes"})- public void handleKeyRequest(String[] keys, BiConsumer<String, Object> consumer) throws Exception {+ public void handleKeyRequest(String[] keys, BiConsumer<String, Object> consumer) {SimpleOrderedMap<Object> result = new SimpleOrderedMap<>();SimpleOrderedMap<Object> errors = new SimpleOrderedMap<>();for (String key : keys) {@@ -179,7 +178,7 @@ public class MetricsHandler extends RequestHandlerBase implements PermissionName}MetricUtils.convertMetric(key, m, propertyFilter, false, true, true, false, ":", (k, v) -> {if ((v instanceof Map) && propertyName != null) {- ((Map)v).forEach((k1, v1) -> result.add(k + ":" + k1, v1));+ ((Map<?, ?>)v).forEach((k1, v1) -> result.add(k + ":" + k1, v1));} else if ((v instanceof MapWriter) && propertyName != null) {((MapWriter) v)._forEachEntry((k1, v1) -> result.add(k + ":" + k1, v1));} else {diff --git a/solr/core/src/java/org/apache/solr/handler/admin/RebalanceLeaders.java b/solr/core/src/java/org/apache/solr/handler/admin/RebalanceLeaders.javaindex 45cba5907e6..94ad0d6fa27 100644--- a/solr/core/src/java/org/apache/solr/handler/admin/RebalanceLeaders.java+++ b/solr/core/src/java/org/apache/solr/handler/admin/RebalanceLeaders.java@@ -111,8 +111,7 @@ class RebalanceLeaders {final static String INACTIVE_PREFERREDS = "inactivePreferreds";final static String ALREADY_LEADERS = "alreadyLeaders";final static String SUMMARY = "Summary";- @SuppressWarnings({"rawtypes"})- final SimpleOrderedMap results = new SimpleOrderedMap();+ final SimpleOrderedMap<SimpleOrderedMap<SimpleOrderedMap<String>>> results = new SimpleOrderedMap<>();final Map<String, String> pendingOps = new HashMap<>();private String collectionName;@@ -124,7 +123,6 @@ class RebalanceLeaders {coreContainer = collectionsHandler.getCoreContainer();}- @SuppressWarnings({"unchecked", "rawtypes"})void execute() throws KeeperException, InterruptedException {DocCollection dc = checkParams();@@ -157,7 +155,7 @@ class RebalanceLeaders {}checkLeaderStatus();- SimpleOrderedMap summary = new SimpleOrderedMap();+ SimpleOrderedMap<String> summary = new SimpleOrderedMap<>();if (pendingOps.size() == 0) {summary.add("Success", "All active replicas with the preferredLeader property set are leaders");} else {@@ -289,14 +287,13 @@ class RebalanceLeaders {// Provide some feedback to the user about what actually happened, or in this case where no action was// possible- @SuppressWarnings({"unchecked", "rawtypes"})private void addInactiveToResults(Slice slice, Replica replica) {- SimpleOrderedMap inactives = (SimpleOrderedMap) results.get(INACTIVE_PREFERREDS);+ SimpleOrderedMap<SimpleOrderedMap<String>> inactives = results.get(INACTIVE_PREFERREDS);if (inactives == null) {- inactives = new SimpleOrderedMap();+ inactives = new SimpleOrderedMap<>();results.add(INACTIVE_PREFERREDS, inactives);}- SimpleOrderedMap res = new SimpleOrderedMap();+ SimpleOrderedMap<String> res = new SimpleOrderedMap<>();res.add("status", "skipped");res.add("msg", "Replica " + replica.getName() + " is a referredLeader for shard " + slice.getName() + ", but is inactive. No change necessary");inactives.add(replica.getName(), res);@@ -304,14 +301,13 @@ class RebalanceLeaders {// Provide some feedback to the user about what actually happened, or in this case where no action was// necesary since this preferred replica was already the leader- @SuppressWarnings({"unchecked", "rawtypes"})private void addAlreadyLeaderToResults(Slice slice, Replica replica) {- SimpleOrderedMap alreadyLeaders = (SimpleOrderedMap) results.get(ALREADY_LEADERS);+ SimpleOrderedMap<SimpleOrderedMap<String>> alreadyLeaders = results.get(ALREADY_LEADERS);if (alreadyLeaders == null) {- alreadyLeaders = new SimpleOrderedMap();+ alreadyLeaders = new SimpleOrderedMap<>();results.add(ALREADY_LEADERS, alreadyLeaders);}- SimpleOrderedMap res = new SimpleOrderedMap();+ SimpleOrderedMap<String> res = new SimpleOrderedMap<>();res.add("status", "skipped");res.add("msg", "Replica " + replica.getName() + " is already the leader for shard " + slice.getName() + ". No change necessary");alreadyLeaders.add(replica.getName(), res);@@ -464,17 +460,16 @@ class RebalanceLeaders {}// If we actually changed the leader, we should send that fact back in the response.- @SuppressWarnings({"unchecked", "rawtypes"})private void addToSuccesses(Slice slice, Replica replica) {- SimpleOrderedMap successes = (SimpleOrderedMap) results.get("successes");+ SimpleOrderedMap<SimpleOrderedMap<String>> successes = results.get("successes");if (successes == null) {- successes = new SimpleOrderedMap();+ successes = new SimpleOrderedMap<>();results.add("successes", successes);}if (log.isInfoEnabled()) {log.info("Successfully changed leader of shard {} to replica {}", slice.getName(), replica.getName());}- SimpleOrderedMap res = new SimpleOrderedMap();+ SimpleOrderedMap<String> res = new SimpleOrderedMap<>();res.add("status", "success");res.add("msg", "Successfully changed leader of slice " + slice.getName() + " to " + replica.getName());successes.add(slice.getName(), res);@@ -483,19 +478,18 @@ class RebalanceLeaders {// If for any reason we were supposed to change leadership, that should be recorded in changingLeaders. Any// time we verified that the change actually occurred, that entry should have been removed. So report anything// left over as a failure.- @SuppressWarnings({"unchecked", "rawtypes"})private void addAnyFailures() {if (pendingOps.size() == 0) {return;}- SimpleOrderedMap fails = new SimpleOrderedMap();+ SimpleOrderedMap<SimpleOrderedMap<String>> fails = new SimpleOrderedMap<>();results.add("failures", fails);for (Map.Entry<String, String> ent : pendingOps.entrySet()) {if (log.isInfoEnabled()) {log.info("Failed to change leader of shard {} to replica {}", ent.getKey(), ent.getValue());}- SimpleOrderedMap res = new SimpleOrderedMap();+ SimpleOrderedMap<String> res = new SimpleOrderedMap<>();res.add("status", "failed");res.add("msg", String.format(Locale.ROOT, "Could not change leder for slice %s to %s", ent.getKey(), ent.getValue()));fails.add(ent.getKey(), res);diff --git a/solr/core/src/java/org/apache/solr/handler/admin/SolrInfoMBeanHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/SolrInfoMBeanHandler.javaindex 80f2881a911..bbf3c302d39 100644--- a/solr/core/src/java/org/apache/solr/handler/admin/SolrInfoMBeanHandler.java+++ b/solr/core/src/java/org/apache/solr/handler/admin/SolrInfoMBeanHandler.java@@ -40,7 +40,6 @@ import java.util.HashSet;* A request handler that provides info about all* registered SolrInfoMBeans.*/-@SuppressWarnings("unchecked")public class SolrInfoMBeanHandler extends RequestHandlerBase {/**@@ -57,6 +56,7 @@ public class SolrInfoMBeanHandler extends RequestHandlerBase {}@Override+ @SuppressWarnings("unchecked")public void handleRequestBody(SolrQueryRequest req, SolrQueryResponse rsp) throws Exception {NamedList<NamedList<NamedList<Object>>> cats = getMBeanInfo(req);if(req.getParams().getBool("diff", false)) {@@ -79,8 +79,8 @@ public class SolrInfoMBeanHandler extends RequestHandlerBase {BinaryResponseWriter.getParsedResponse(req, wrap).get("solr-mbeans");// Get rid of irrelevant things- ref = normalize(ref);- cats = normalize(cats);+ normalize(ref);+ normalize(cats);// Only the changesboolean showAll = req.getParams().getBool("all", false);@@ -91,7 +91,8 @@ public class SolrInfoMBeanHandler extends RequestHandlerBase {}rsp.setHttpCaching(false); // never cache, no matter what init config looks like}-++ @SuppressWarnings("unchecked")static NamedList<NamedList<NamedList<Object>>> fromXML(String content) {int idx = content.indexOf("<response>");if(idx<0) {@@ -115,11 +116,11 @@ public class SolrInfoMBeanHandler extends RequestHandlerBase {String[] requestedCats = req.getParams().getParams("cat");if (null == requestedCats || 0 == requestedCats.length) {for (SolrInfoBean.Category cat : SolrInfoBean.Category.values()) {- cats.add(cat.name(), new SimpleOrderedMap<NamedList<Object>>());+ cats.add(cat.name(), new SimpleOrderedMap<>());}} else {for (String catName : requestedCats) {- cats.add(catName,new SimpleOrderedMap<NamedList<Object>>());+ cats.add(catName,new SimpleOrderedMap<>());}}@@ -184,8 +185,7 @@ public class SolrInfoMBeanHandler extends RequestHandlerBase {// System.out.println( "NOW: " + now_txt );// Calculate the differences- @SuppressWarnings({"rawtypes"})- NamedList diff = diffNamedList(ref_bean,now_bean);+ NamedList<Object> diff = diffNamedList(ref_bean,now_bean);diff.add( "_changed_", true ); // flag the changed thingcat.add(name, diff);}@@ -205,9 +205,8 @@ public class SolrInfoMBeanHandler extends RequestHandlerBase {return changed;}- @SuppressWarnings({"rawtypes"})- public NamedList diffNamedList(NamedList ref, NamedList now) {- NamedList out = new SimpleOrderedMap();+ public NamedList<Object> diffNamedList(NamedList<?> ref, NamedList<?> now) {+ NamedList<Object> out = new SimpleOrderedMap<>();for(int i=0; i<ref.size(); i++) {String name = ref.getName(i);Object r = ref.getVal(i);@@ -233,14 +232,14 @@ public class SolrInfoMBeanHandler extends RequestHandlerBase {}return out;}-- @SuppressWarnings({"rawtypes"})++ @SuppressWarnings("unchecked")public Object diffObject(Object ref, Object now) {if (now instanceof Map) {- now = new NamedList((Map)now);+ now = new NamedList<>((Map<String, ?>)now);}if(ref instanceof NamedList) {- return diffNamedList((NamedList)ref, (NamedList)now);+ return diffNamedList((NamedList<?>)ref, (NamedList<?>)now);}if(ref.equals(now)) {return ref;@@ -275,16 +274,15 @@ public class SolrInfoMBeanHandler extends RequestHandlerBase {/*** The 'avgRequestsPerSecond' field will make everything look like it changed*/- @SuppressWarnings({"rawtypes"})- public NamedList normalize(NamedList input) {+ public void normalize(NamedList<?> input) {input.remove("avgRequestsPerSecond");for(int i=0; i<input.size(); i++) {Object v = input.getVal(i);if(v instanceof NamedList) {- input.setVal(i, normalize((NamedList)v));+ // edit in place so we don't need to return it+ normalize((NamedList<?>)v);}}- return input;}diff --git a/solr/core/src/java/org/apache/solr/handler/component/CloudReplicaSource.java b/solr/core/src/java/org/apache/solr/handler/component/CloudReplicaSource.javaindex 41104833d51..2386e4feb4d 100644--- a/solr/core/src/java/org/apache/solr/handler/component/CloudReplicaSource.java+++ b/solr/core/src/java/org/apache/solr/handler/component/CloudReplicaSource.java@@ -18,6 +18,7 @@package org.apache.solr.handler.component;import java.lang.invoke.MethodHandles;+import java.lang.reflect.Array;import java.net.MalformedURLException;import java.util.Arrays;import java.util.Collection;@@ -61,7 +62,6 @@ class CloudReplicaSource implements ReplicaSource {}}- @SuppressWarnings({"unchecked", "rawtypes"})private void withClusterState(Builder builder, SolrParams params) {ClusterState clusterState = builder.zkStateReader.getClusterState();String shardKeys = params.get(ShardParams._ROUTE_);@@ -94,18 +94,17 @@ class CloudReplicaSource implements ReplicaSource {}this.slices = sliceMap.keySet().toArray(new String[sliceMap.size()]);- this.replicas = new List[slices.length];+ this.replicas = newReplicasArray(slices.length);for (int i = 0; i < slices.length; i++) {String sliceName = slices[i];replicas[i] = findReplicas(builder, null, clusterState, sliceMap.get(sliceName));}}- @SuppressWarnings({"unchecked", "rawtypes"})private void withShardsParam(Builder builder, String shardsParam) {List<String> sliceOrUrls = StrUtils.splitSmart(shardsParam, ",", true);this.slices = new String[sliceOrUrls.size()];- this.replicas = new List[sliceOrUrls.size()];+ this.replicas = newReplicasArray(sliceOrUrls.size());ClusterState clusterState = builder.zkStateReader.getClusterState();@@ -124,6 +123,11 @@ class CloudReplicaSource implements ReplicaSource {}}+ @SuppressWarnings("unchecked")+ private static List<String>[] newReplicasArray(int size) {+ return (List<String>[]) Array.newInstance(List.class, size);+ }+static void checkUrlsAllowList(AllowListUrlChecker urlChecker, ClusterState clusterState, String shardsParam, List<String> urls) {try {urlChecker.checkAllowList(urls, clusterState);@@ -165,7 +169,8 @@ class CloudReplicaSource implements ReplicaSource {@Overridepublic List<String> getSliceNames() {- return Collections.unmodifiableList(Arrays.asList(slices));+ // This is maybe a bug?+ return Collections.unmodifiableList(Arrays.asList(slices)); // Do not use List.of because slices could have null}@Overridediff --git a/solr/core/src/java/org/apache/solr/handler/component/DebugComponent.java b/solr/core/src/java/org/apache/solr/handler/component/DebugComponent.javaindex 6aaeebf2fb8..d0da8af1f17 100644--- a/solr/core/src/java/org/apache/solr/handler/component/DebugComponent.java+++ b/solr/core/src/java/org/apache/solr/handler/component/DebugComponent.java@@ -17,6 +17,7 @@package org.apache.solr.handler.component;import java.io.IOException;+import java.lang.reflect.Array;import java.util.ArrayList;import java.util.Collection;import java.util.Collections;@@ -202,8 +203,7 @@ public class DebugComponent extends SearchComponentNamedList<Object> info = rb.getDebugInfo();NamedList<Object> explain = new SimpleOrderedMap<>();- @SuppressWarnings({"rawtypes"})- Map.Entry<String, Object>[] arr = new NamedList.NamedListEntry[rb.resultIds.size()];+ Map.Entry<String, Object>[] arr = (Map.Entry<String, Object>[]) Array.newInstance(NamedList.NamedListEntry.class, rb.resultIds.size());// Will be set to true if there is at least one response with PURPOSE_GET_DEBUGboolean hasGetDebugResponses = false;@@ -279,7 +279,7 @@ public class DebugComponent extends SearchComponentreturn namedList;}- @SuppressWarnings({"unchecked", "rawtypes"})+ @SuppressWarnings("unchecked")protected Object merge(Object source, Object dest, Set<String> exclude) {if (source == null) return dest;if (dest == null) {@@ -296,9 +296,9 @@ public class DebugComponent extends SearchComponentdest = new LinkedHashSet<>((Collection<?>) dest);}if (source instanceof Collection) {- ((Collection)dest).addAll((Collection<?>)source);+ ((Collection<Object>) dest).addAll((Collection<?>)source);} else {- ((Collection)dest).add(source);+ ((Collection<Object>) dest).add(source);}return dest;} else if (source instanceof Number) {diff --git a/solr/core/src/java/org/apache/solr/handler/component/FacetComponent.java b/solr/core/src/java/org/apache/solr/handler/component/FacetComponent.javaindex ecce09f0803..405735a40e0 100644--- a/solr/core/src/java/org/apache/solr/handler/component/FacetComponent.java+++ b/solr/core/src/java/org/apache/solr/handler/component/FacetComponent.java@@ -18,6 +18,7 @@ package org.apache.solr.handler.component;import java.io.IOException;import java.lang.invoke.MethodHandles;+import java.lang.reflect.Array;import java.util.ArrayList;import java.util.Arrays;import java.util.Collections;@@ -63,7 +64,6 @@ import org.slf4j.LoggerFactory;** @since solr 1.3*/-@SuppressWarnings("rawtypes")public class FacetComponent extends SearchComponent {private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());@@ -709,9 +709,9 @@ public class FacetComponent extends SearchComponent {for (ShardResponse srsp : sreq.responses) {int shardNum = rb.getShardNum(srsp.getShard());- NamedList facet_counts = null;+ NamedList<?> facet_counts = null;try {- facet_counts = (NamedList) srsp.getSolrResponse().getResponse().get("facet_counts");+ facet_counts = (NamedList<?>) srsp.getSolrResponse().getResponse().get("facet_counts");if (facet_counts==null) {NamedList<?> responseHeader = (NamedList<?>)srsp.getSolrResponse().getResponse().get("responseHeader");if (Boolean.TRUE.equals(responseHeader.getBooleanArg(SolrQueryResponse.RESPONSE_HEADER_PARTIAL_RESULTS_KEY))) {@@ -732,7 +732,7 @@ public class FacetComponent extends SearchComponent {}// handle facet queries- NamedList facet_queries = (NamedList) facet_counts.get("facet_queries");+ NamedList<?> facet_queries = (NamedList<?>) facet_counts.get("facet_queries");if (facet_queries != null) {for (int i = 0; i < facet_queries.size(); i++) {String returnedKey = facet_queries.getName(i);@@ -743,11 +743,11 @@ public class FacetComponent extends SearchComponent {}// step through each facet.field, adding results from this shard- NamedList facet_fields = (NamedList) facet_counts.get("facet_fields");+ NamedList<?> facet_fields = (NamedList<?>) facet_counts.get("facet_fields");if (facet_fields != null) {for (DistribFieldFacet dff : fi.facets.values()) {- dff.add(shardNum, (NamedList) facet_fields.get(dff.getKey()), dff.initialLimit);+ dff.add(shardNum, (NamedList<?>) facet_fields.get(dff.getKey()), dff.initialLimit);}}@@ -789,7 +789,7 @@ public class FacetComponent extends SearchComponent {if (dff.minCount <= 1 && dff.sort.equals(FacetParams.FACET_SORT_INDEX)) continue;@SuppressWarnings("unchecked") // generic array's are annoying- List<String>[] tmp = (List<String>[]) new List[rb.shards.length];+ List<String>[] tmp = (List<String>[]) Array.newInstance(List.class, rb.shards.length);dff._toRefine = tmp;ShardFacetCount[] counts = dff.getCountSorted();@@ -921,7 +921,7 @@ public class FacetComponent extends SearchComponent {// The implementation below uses the first encountered shard's// facet_intervals as the basis for subsequent shards' data to be merged.- private void doDistribIntervals(FacetInfo fi, NamedList facet_counts) {+ private void doDistribIntervals(FacetInfo fi, NamedList<?> facet_counts) {@SuppressWarnings("unchecked")SimpleOrderedMap<SimpleOrderedMap<Integer>> facet_intervals =(SimpleOrderedMap<SimpleOrderedMap<Integer>>)@@ -966,9 +966,9 @@ public class FacetComponent extends SearchComponent {}}- private void doDistribPivots(ResponseBuilder rb, int shardNum, NamedList facet_counts) {+ private void doDistribPivots(ResponseBuilder rb, int shardNum, NamedList<?> facet_counts) {@SuppressWarnings("unchecked")- SimpleOrderedMap<List<NamedList<Object>>> facet_pivot+ SimpleOrderedMap<List<NamedList<Object>>> facet_pivot= (SimpleOrderedMap<List<NamedList<Object>>>) facet_counts.get(PIVOT_KEY);if (facet_pivot != null) {@@ -986,8 +986,8 @@ public class FacetComponent extends SearchComponent {for (ShardResponse srsp : sreq.responses) {// int shardNum = rb.getShardNum(srsp.shard);- NamedList facet_counts = (NamedList) srsp.getSolrResponse().getResponse().get("facet_counts");- NamedList facet_fields = (NamedList) facet_counts.get("facet_fields");+ NamedList<?> facet_counts = (NamedList<?>) srsp.getSolrResponse().getResponse().get("facet_counts");+ NamedList<?> facet_fields = (NamedList<?>) facet_counts.get("facet_fields");if (facet_fields == null) continue; // this can happen when there's an exception@@ -996,7 +996,7 @@ public class FacetComponent extends SearchComponent {DistribFieldFacet dff = fi.facets.get(key);if (dff == null) continue;- NamedList shardCounts = (NamedList) facet_fields.getVal(i);+ NamedList<?> shardCounts = (NamedList<?>) facet_fields.getVal(i);for (int j = 0; j < shardCounts.size(); j++) {String name = shardCounts.getName(j);@@ -1021,7 +1021,7 @@ public class FacetComponent extends SearchComponent {int shardNumber = rb.getShardNum(srsp.getShard());- NamedList facetCounts = (NamedList) srsp.getSolrResponse().getResponse().get("facet_counts");+ NamedList<?> facetCounts = (NamedList<?>) srsp.getSolrResponse().getResponse().get("facet_counts");@SuppressWarnings("unchecked")NamedList<List<NamedList<Object>>> pivotFacetResponsesFromShard@@ -1414,7 +1414,6 @@ public class FacetComponent extends SearchComponent {/*** <b>This API is experimental and subject to change</b>*/- @SuppressWarnings("rawtypes")public static class DistribFieldFacet extends FieldFacet {public List<String>[] _toRefine; // a List<String> of refinements needed,// one for each shard.@@ -1453,7 +1452,7 @@ public class FacetComponent extends SearchComponent {= params.getFieldInt(field, FacetParams.FACET_OVERREQUEST_COUNT, 10);}- void add(int shardNum, NamedList shardCounts, int numRequested) {+ void add(int shardNum, NamedList<?> shardCounts, int numRequested) {// shardCounts could be null if there was an exceptionint sz = shardCounts == null ? 0 : shardCounts.size();int numReceived = sz;diff --git a/solr/core/src/java/org/apache/solr/handler/component/HighlightComponent.java b/solr/core/src/java/org/apache/solr/handler/component/HighlightComponent.javaindex 4a70709ddca..4f258841a54 100644--- a/solr/core/src/java/org/apache/solr/handler/component/HighlightComponent.java+++ b/solr/core/src/java/org/apache/solr/handler/component/HighlightComponent.java@@ -17,6 +17,7 @@package org.apache.solr.handler.component;import java.io.IOException;+import java.lang.reflect.Array;import java.util.Collections;import java.util.List;import java.util.Map;@@ -280,9 +281,9 @@ public class HighlightComponent extends SearchComponent implements PluginInfoInireturn hl;}- @SuppressWarnings({"rawtypes"})protected Object[] newHighlightsArray(int size) {- return new NamedList.NamedListEntry[size];+ // Curious why this doesn't trigger an unchecked cast, but maybe the compiler is smart enough to know+ return (Object[]) Array.newInstance(NamedList.NamedListEntry.class, size);}protected void addHighlights(Object[] objArr, Object obj, Map<Object, ShardDoc> resultIds) {diff --git a/solr/core/src/java/org/apache/solr/handler/component/MergeStrategy.java b/solr/core/src/java/org/apache/solr/handler/component/MergeStrategy.javaindex d449ac322bc..91d2c826dd8 100644--- a/solr/core/src/java/org/apache/solr/handler/component/MergeStrategy.java+++ b/solr/core/src/java/org/apache/solr/handler/component/MergeStrategy.java@@ -66,11 +66,5 @@ public interface MergeStrategy {* */public int getCost();- @SuppressWarnings({"rawtypes"})- final Comparator MERGE_COMP = (o1, o2) -> {- MergeStrategy m1 = (MergeStrategy) o1;- MergeStrategy m2 = (MergeStrategy) o2;- return m1.getCost() - m2.getCost();- };-+ Comparator<MergeStrategy> MERGE_COMP = Comparator.comparingInt(MergeStrategy::getCost);}\ No newline at end of filediff --git a/solr/core/src/java/org/apache/solr/handler/component/PhrasesIdentificationComponent.java b/solr/core/src/java/org/apache/solr/handler/component/PhrasesIdentificationComponent.javaindex ca182708ae8..8da45cb8863 100644--- a/solr/core/src/java/org/apache/solr/handler/component/PhrasesIdentificationComponent.java+++ b/solr/core/src/java/org/apache/solr/handler/component/PhrasesIdentificationComponent.java@@ -803,9 +803,8 @@ public class PhrasesIdentificationComponent extends SearchComponent {+ "[" + position_start + ":" + position_end + "]";}- @SuppressWarnings({"rawtypes"})- public NamedList getDetails() {- SimpleOrderedMap<Object> out = new SimpleOrderedMap<Object>();+ public NamedList<Object> getDetails() {+ SimpleOrderedMap<Object> out = new SimpleOrderedMap<>();out.add("text", subSequence);out.add("offset_start", getOffsetStart());out.add("offset_end", getOffsetEnd());diff --git a/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java b/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.javaindex 2f5f8cf6791..5b851430f7d 100644--- a/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java+++ b/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java@@ -20,10 +20,10 @@ import java.io.IOException;import java.io.PrintWriter;import java.io.StringWriter;import java.lang.invoke.MethodHandles;+import java.lang.reflect.Array;import java.util.ArrayList;import java.util.Arrays;import java.util.Collection;-import java.util.Collections;import java.util.HashMap;import java.util.Iterator;import java.util.LinkedHashMap;@@ -673,13 +673,14 @@ public class QueryComponent extends SearchComponentprotected static final EndResultTransformer MAIN_END_RESULT_TRANSFORMER = new MainEndResultTransformer();protected static final EndResultTransformer SIMPLE_END_RESULT_TRANSFORMER = new SimpleEndResultTransformer();- @SuppressWarnings({"unchecked", "rawtypes"})protected void groupedFinishStage(final ResponseBuilder rb) {// To have same response as non-distributed request.GroupingSpecification groupSpec = rb.getGroupingSpec();if (rb.mergedTopGroups.isEmpty()) {for (String field : groupSpec.getFields()) {- rb.mergedTopGroups.put(field, new TopGroups(null, null, 0, 0, new GroupDocs[]{}, Float.NaN));+ @SuppressWarnings("unchecked")+ GroupDocs<BytesRef>[] groupDocs = (GroupDocs<BytesRef>[]) Array.newInstance(GroupDocs.class, 0);+ rb.mergedTopGroups.put(field, new TopGroups<>(null, null, 0, 0, groupDocs, Float.NaN));}rb.resultIds = new HashMap<>();}@@ -829,11 +830,10 @@ public class QueryComponent extends SearchComponentreturn true;}- @SuppressWarnings({"unchecked"})protected void mergeIds(ResponseBuilder rb, ShardRequest sreq) {List<MergeStrategy> mergeStrategies = rb.getMergeStrategies();if(mergeStrategies != null) {- Collections.sort(mergeStrategies, MergeStrategy.MERGE_COMP);+ mergeStrategies.sort(MergeStrategy.MERGE_COMP);boolean idsMerged = false;for(MergeStrategy mergeStrategy : mergeStrategies) {mergeStrategy.merge(rb, sreq);@@ -953,14 +953,13 @@ public class QueryComponent extends SearchComponenthitCountIsExact = false;}- @SuppressWarnings({"rawtypes"})- NamedList sortFieldValues = (NamedList)(srsp.getSolrResponse().getResponse().get("sort_values"));+ @SuppressWarnings("unchecked")+ NamedList<List<Object>> sortFieldValues = (NamedList<List<Object>>)(srsp.getSolrResponse().getResponse().get("sort_values"));if (sortFieldValues.size()==0 && // we bypass merging this response only if it's partial itselfthisResponseIsPartial) { // but not the previous one!!continue; //fsv timeout yields empty sort_vlaues}- @SuppressWarnings({"rawtypes"})- NamedList unmarshalledSortFieldValues = unmarshalSortValues(ss, sortFieldValues, schema);+ NamedList<List<Object>> unmarshalledSortFieldValues = unmarshalSortValues(ss, sortFieldValues, schema);// go through every doc in this response, construct a ShardDoc, and// put it in the priority queue so it can be ordered.@@ -1095,8 +1094,7 @@ public class QueryComponent extends SearchComponentnextCursorMarkValues.add(lastDoc.score);} else {assert null != sf.getField() : "SortField has null field";- @SuppressWarnings({"unchecked"})- List<Object> fieldVals = (List<Object>) lastDoc.sortFieldValues.get(sf.getField());+ List<Object> fieldVals = lastDoc.sortFieldValues.get(sf.getField());nextCursorMarkValues.add(fieldVals.get(lastDoc.orderInShard));}}@@ -1105,11 +1103,10 @@ public class QueryComponent extends SearchComponentrb.setNextCursorMark(nextCursorMark);}- @SuppressWarnings({"unchecked", "rawtypes"})- protected NamedList unmarshalSortValues(SortSpec sortSpec,- NamedList sortFieldValues,+ protected NamedList<List<Object>> unmarshalSortValues(SortSpec sortSpec,+ NamedList<List<Object>> sortFieldValues,IndexSchema schema) {- NamedList unmarshalledSortValsPerField = new NamedList();+ NamedList<List<Object>> unmarshalledSortValsPerField = new NamedList<>();if (0 == sortFieldValues.size()) return unmarshalledSortValsPerField;@@ -1129,14 +1126,14 @@ public class QueryComponent extends SearchComponentassert sortFieldName.equals(valueFieldName): "sortFieldValues name key does not match expected SortField.getField";- List sortVals = (List)sortFieldValues.getVal(marshalledFieldNum);+ List<Object> sortVals = sortFieldValues.getVal(marshalledFieldNum);final SchemaField schemaField = schemaFields.get(sortFieldNum);if (null == schemaField) {unmarshalledSortValsPerField.add(sortField.getField(), sortVals);} else {FieldType fieldType = schemaField.getType();- List unmarshalledSortVals = new ArrayList();+ List<Object> unmarshalledSortVals = new ArrayList<>();for (Object sortVal : sortVals) {unmarshalledSortVals.add(fieldType.unmarshalSortValue(sortVal));}diff --git a/solr/core/src/java/org/apache/solr/handler/component/RangeFacetProcessor.java b/solr/core/src/java/org/apache/solr/handler/component/RangeFacetProcessor.javaindex 9dad2f611fa..94fbd845efd 100644--- a/solr/core/src/java/org/apache/solr/handler/component/RangeFacetProcessor.java+++ b/solr/core/src/java/org/apache/solr/handler/component/RangeFacetProcessor.java@@ -98,8 +98,7 @@ public class RangeFacetProcessor extends SimpleFacets {}}- @SuppressWarnings({"rawtypes"})- private <T extends Comparable<T>> NamedList getFacetRangeCounts(final RangeFacetRequest rfr)+ private NamedList<Object> getFacetRangeCounts(final RangeFacetRequest rfr)throws IOException, SyntaxError {final NamedList<Object> res = new SimpleOrderedMap<>();@@ -133,7 +132,7 @@ public class RangeFacetProcessor extends SimpleFacets {return res;}- private <T extends Comparable<T>> NamedList<Object> getFacetRangeCountsDocValues(RangeFacetRequest rfr)+ private NamedList<Object> getFacetRangeCountsDocValues(RangeFacetRequest rfr)throws IOException, SyntaxError {SchemaField sf = rfr.getSchemaField();diff --git a/solr/core/src/java/org/apache/solr/handler/component/ShardDoc.java b/solr/core/src/java/org/apache/solr/handler/component/ShardDoc.javaindex baca0fc6665..ae4f060d0d8 100644--- a/solr/core/src/java/org/apache/solr/handler/component/ShardDoc.java+++ b/solr/core/src/java/org/apache/solr/handler/component/ShardDoc.java@@ -19,6 +19,8 @@ package org.apache.solr.handler.component;import org.apache.lucene.search.FieldDoc;import org.apache.solr.common.util.NamedList;+import java.util.List;+public class ShardDoc extends FieldDoc {public String shard;public String shardAddress; // TODO@@ -32,8 +34,7 @@ public class ShardDoc extends FieldDoc {// this is currently the uniqueKeyField but// may be replaced with internal docid in a future release.- @SuppressWarnings({"rawtypes"})- public NamedList sortFieldValues;+ public NamedList<List<Object>> sortFieldValues;// sort field values for *all* docs in a particular shard.// this doc's values are in position orderInSharddiff --git a/solr/core/src/java/org/apache/solr/handler/component/ShardFieldSortedHitQueue.java b/solr/core/src/java/org/apache/solr/handler/component/ShardFieldSortedHitQueue.javaindex 5d296ebb618..d63143d91f6 100644--- a/solr/core/src/java/org/apache/solr/handler/component/ShardFieldSortedHitQueue.java+++ b/solr/core/src/java/org/apache/solr/handler/component/ShardFieldSortedHitQueue.java@@ -17,6 +17,7 @@package org.apache.solr.handler.component;import java.io.IOException;+import java.lang.reflect.Array;import java.util.ArrayList;import java.util.Comparator;import java.util.List;@@ -41,11 +42,15 @@ public class ShardFieldSortedHitQueue extends PriorityQueue<ShardDoc> {/** The order of these fieldNames should correspond to the order of sort field values retrieved from the shard */protected List<String> fieldNames = new ArrayList<>();- @SuppressWarnings({"unchecked", "rawtypes"})+ @SuppressWarnings("unchecked")+ private static Comparator<ShardDoc>[] newArray(int sz) {+ return (Comparator<ShardDoc>[]) Array.newInstance(Comparator.class, sz);+ }+public ShardFieldSortedHitQueue(SortField[] fields, int size, IndexSearcher searcher) {super(size);final int n = fields.length;- comparators = new Comparator[n];+ comparators = newArray(n);this.fields = new SortField[n];for (int i = 0; i < n; ++i) {@@ -143,8 +148,7 @@ public class ShardFieldSortedHitQueue extends PriorityQueue<ShardDoc> {Object sortVal(ShardDoc shardDoc) {assert(shardDoc.sortFieldValues.getName(fieldNum).equals(fieldName));- @SuppressWarnings({"rawtypes"})- List lst = (List)shardDoc.sortFieldValues.getVal(fieldNum);+ List<Object> lst = shardDoc.sortFieldValues.getVal(fieldNum);return lst.get(shardDoc.orderInShard);}}diff --git a/solr/core/src/java/org/apache/solr/handler/component/SpatialHeatmapFacets.java b/solr/core/src/java/org/apache/solr/handler/component/SpatialHeatmapFacets.javaindex f11f0d0d447..0adcd91fcc2 100644--- a/solr/core/src/java/org/apache/solr/handler/component/SpatialHeatmapFacets.java+++ b/solr/core/src/java/org/apache/solr/handler/component/SpatialHeatmapFacets.java@@ -45,10 +45,10 @@ public class SpatialHeatmapFacets {public static final String RESPONSE_KEY = "facet_heatmaps";/** Called by {@link org.apache.solr.request.SimpleFacets} to compute heatmap facets. */- @SuppressWarnings({"unchecked", "rawtypes"})+ @SuppressWarnings("unchecked")public static NamedList<Object> getHeatmapForField(String fieldKey, String fieldName, ResponseBuilder rb, SolrParams params, DocSet docSet) throws IOException {final FacetRequest facetRequest = createHeatmapRequest(fieldKey, fieldName, rb, params);- return (NamedList) facetRequest.process(rb.req, docSet);+ return (NamedList<Object>) facetRequest.process(rb.req, docSet);}private static FacetRequest createHeatmapRequest(String fieldKey, String fieldName, ResponseBuilder rb, SolrParams params) {@@ -107,7 +107,7 @@ public class SpatialHeatmapFacets {/** Called by FacetComponent.countFacets which is in turn called by FC's impl of* {@link org.apache.solr.handler.component.SearchComponent#handleResponses(ResponseBuilder, ShardRequest)}. */@SuppressWarnings("unchecked")- public static void distribHandleResponse(LinkedHashMap<String, HeatmapFacet> heatmapFacets, @SuppressWarnings({"rawtypes"})NamedList srsp_facet_counts) {+ public static void distribHandleResponse(LinkedHashMap<String, HeatmapFacet> heatmapFacets, NamedList<?> srsp_facet_counts) {NamedList<NamedList<Object>> facet_heatmaps = (NamedList<NamedList<Object>>) srsp_facet_counts.get(RESPONSE_KEY);if (facet_heatmaps == null) {return;@@ -128,8 +128,8 @@ public class SpatialHeatmapFacets {/** Called by FacetComponent's impl of* {@link org.apache.solr.handler.component.SearchComponent#finishStage(ResponseBuilder)}. */- @SuppressWarnings({"unchecked", "rawtypes"})- public static NamedList distribFinish(LinkedHashMap<String, HeatmapFacet> heatmapInfos, ResponseBuilder rb) {+ @SuppressWarnings("unchecked")+ public static NamedList<NamedList<Object>> distribFinish(LinkedHashMap<String, HeatmapFacet> heatmapInfos, ResponseBuilder rb) {NamedList<NamedList<Object>> result = new SimpleOrderedMap<>();for (Map.Entry<String, HeatmapFacet> entry : heatmapInfos.entrySet()) {final HeatmapFacet facet = entry.getValue();diff --git a/solr/core/src/java/org/apache/solr/handler/component/SpellCheckComponent.java b/solr/core/src/java/org/apache/solr/handler/component/SpellCheckComponent.javaindex 03bbd2c6180..55cb7f0204f 100644--- a/solr/core/src/java/org/apache/solr/handler/component/SpellCheckComponent.java+++ b/solr/core/src/java/org/apache/solr/handler/component/SpellCheckComponent.java@@ -131,7 +131,6 @@ public class SpellCheckComponent extends SearchComponent implements SolrCoreAwar}@Override- @SuppressWarnings("unchecked")public void process(ResponseBuilder rb) throws IOException {SolrParams params = rb.req.getParams();if (!params.getBool(COMPONENT_NAME, false) || spellCheckers.isEmpty()) {@@ -195,10 +194,8 @@ public class SpellCheckComponent extends SearchComponent implements SolrCoreAwar}boolean isCorrectlySpelled = hits > (maxResultsForSuggest==null ? 0 : maxResultsForSuggest);- @SuppressWarnings({"rawtypes"})- NamedList response = new SimpleOrderedMap();- @SuppressWarnings({"rawtypes"})- NamedList suggestions = toNamedList(shardRequest, spellingResult, q, extendedResults);+ NamedList<Object> response = new SimpleOrderedMap<>();+ NamedList<?> suggestions = toNamedList(shardRequest, spellingResult, q, extendedResults);response.add("suggestions", suggestions);if (extendedResults) {@@ -273,9 +270,8 @@ public class SpellCheckComponent extends SearchComponent implements SolrCoreAwarreturn maxResultsForSuggest;}- @SuppressWarnings("unchecked")protected void addCollationsToResponse(SolrParams params, SpellingResult spellingResult, ResponseBuilder rb, String q,- @SuppressWarnings({"rawtypes"})NamedList response, boolean suggestionsMayOverlap) {+ NamedList<Object> response, boolean suggestionsMayOverlap) {int maxCollations = params.getInt(SPELLCHECK_MAX_COLLATIONS, 1);int maxCollationTries = params.getInt(SPELLCHECK_MAX_COLLATION_TRIES, 0);int maxCollationEvaluations = params.getInt(SPELLCHECK_MAX_COLLATION_EVALUATIONS, 10000);@@ -299,12 +295,10 @@ public class SpellCheckComponent extends SearchComponent implements SolrCoreAwar//even in cases when the internal rank is the same.Collections.sort(collations);- @SuppressWarnings({"rawtypes"})- NamedList collationList = new NamedList();+ NamedList<Object> collationList = new NamedList<>();for (SpellCheckCollation collation : collations) {if (collationExtendedResults) {- @SuppressWarnings({"rawtypes"})- NamedList extendedResult = new SimpleOrderedMap();+ NamedList<Object> extendedResult = new SimpleOrderedMap<>();extendedResult.add("collationQuery", collation.getCollationQuery());extendedResult.add("hits", collation.getHits());extendedResult.add("misspellingsAndCorrections", collation.getMisspellingsAndCorrections());@@ -323,8 +317,7 @@ public class SpellCheckComponent extends SearchComponent implements SolrCoreAwarresponse.add("collations", collationList);}- @SuppressWarnings({"unchecked"})- private void addOriginalTermsToResponse(@SuppressWarnings({"rawtypes"})NamedList response, Collection<Token> originalTerms) {+ private void addOriginalTermsToResponse(NamedList<Object> response, Collection<Token> originalTerms) {List<String> originalTermStr = new ArrayList<String>();for(Token t : originalTerms) {originalTermStr.add(t.toString());@@ -369,7 +362,6 @@ public class SpellCheckComponent extends SearchComponent implements SolrCoreAwar}@Override- @SuppressWarnings({"unchecked", "deprecation"})public void finishStage(ResponseBuilder rb) {SolrParams params = rb.req.getParams();if (!params.getBool(COMPONENT_NAME, false) || rb.stage != ResponseBuilder.STAGE_GET_FIELDS)@@ -399,10 +391,9 @@ public class SpellCheckComponent extends SearchComponent implements SolrCoreAwarif (maxResultsForSuggest==null || !isCorrectlySpelled) {for (ShardRequest sreq : rb.finished) {for (ShardResponse srsp : sreq.responses) {- @SuppressWarnings({"rawtypes"})- NamedList nl = null;+ NamedList<?> nl = null;try {- nl = (NamedList) srsp.getSolrResponse().getResponse().get("spellcheck");+ nl = (NamedList<?>) srsp.getSolrResponse().getResponse().get("spellcheck");} catch (Exception e) {if (ShardParams.getShardsTolerantAsBool(rb.req.getParams())) {continue; // looks like a shard did not return anything@@ -427,11 +418,9 @@ public class SpellCheckComponent extends SearchComponent implements SolrCoreAwarSolrSpellChecker checker = getSpellChecker(rb.req.getParams());SpellingResult result = checker.mergeSuggestions(mergeData, numSug, count, extendedResults);- @SuppressWarnings({"rawtypes"})- NamedList response = new SimpleOrderedMap();+ NamedList<Object> response = new SimpleOrderedMap<>();- @SuppressWarnings({"rawtypes"})- NamedList suggestions = toNamedList(false, result, origQuery, extendedResults);+ NamedList<?> suggestions = toNamedList(false, result, origQuery, extendedResults);response.add("suggestions", suggestions);if (extendedResults) {@@ -443,15 +432,13 @@ public class SpellCheckComponent extends SearchComponent implements SolrCoreAwar.toArray(new SpellCheckCollation[mergeData.collations.size()]);Arrays.sort(sortedCollations);- @SuppressWarnings({"rawtypes"})- NamedList collations = new NamedList();+ NamedList<Object> collations = new NamedList<>();int i = 0;while (i < maxCollations && i < sortedCollations.length) {SpellCheckCollation collation = sortedCollations[i];i++;if (collationExtendedResults) {- @SuppressWarnings({"rawtypes"})- SimpleOrderedMap extendedResult = new SimpleOrderedMap();+ SimpleOrderedMap<Object> extendedResult = new SimpleOrderedMap<>();extendedResult.add("collationQuery", collation.getCollationQuery());extendedResult.add("hits", collation.getHits());extendedResult.add("misspellingsAndCorrections", collation@@ -469,7 +456,7 @@ public class SpellCheckComponent extends SearchComponent implements SolrCoreAwar}@SuppressWarnings("unchecked")- private void collectShardSuggestions(@SuppressWarnings({"rawtypes"})NamedList nl, SpellCheckMergeData mergeData) {+ private void collectShardSuggestions(NamedList<?> nl, SpellCheckMergeData mergeData) {SpellCheckResponse spellCheckResp = new SpellCheckResponse(nl);Iterable<Object> originalTermStrings = (Iterable<Object>) nl.get("originalTerms");if(originalTermStrings!=null) {@@ -521,14 +508,12 @@ public class SpellCheckComponent extends SearchComponent implements SolrCoreAwar}}- @SuppressWarnings("unchecked")- private void collectShardCollations(SpellCheckMergeData mergeData, @SuppressWarnings({"rawtypes"})NamedList spellCheckResponse, int maxCollationTries) {+ private void collectShardCollations(SpellCheckMergeData mergeData, NamedList<?> spellCheckResponse, int maxCollationTries) {Map<String, SpellCheckCollation> collations = mergeData.collations;- @SuppressWarnings({"rawtypes"})- NamedList collationHolder = (NamedList) spellCheckResponse.get("collations");+ NamedList<?> collationHolder = (NamedList<?>) spellCheckResponse.get("collations");if(collationHolder != null) {- List<Object> collationList = collationHolder.getAll("collation");- List<Object> collationRankList = collationHolder.getAll("collationInternalRank");+ List<?> collationList = collationHolder.getAll("collation");+ List<?> collationRankList = collationHolder.getAll("collationInternalRank");int i=0;if(collationList != null) {for(Object o : collationList)@@ -548,10 +533,8 @@ public class SpellCheckComponent extends SearchComponent implements SolrCoreAwarcoll.setInternalRank(Math.max(coll.getInternalRank(),priorColl.getInternalRank()));}collations.put(coll.getCollationQuery(), coll);- } else- {- @SuppressWarnings({"rawtypes"})- NamedList expandedCollation = (NamedList) o;+ } else {+ NamedList<?> expandedCollation = (NamedList<?>) o;SpellCheckCollation coll = new SpellCheckCollation();coll.setCollationQuery((String) expandedCollation.get("collationQuery"));coll.setHits(((Number) expandedCollation.get("hits")).longValue());@@ -559,7 +542,9 @@ public class SpellCheckComponent extends SearchComponent implements SolrCoreAwar{coll.setInternalRank((Integer) expandedCollation.get("collationInternalRank"));}- coll.setMisspellingsAndCorrections((NamedList) expandedCollation.get("misspellingsAndCorrections"));+ @SuppressWarnings("unchecked")+ NamedList<String> misspellings = (NamedList<String>) expandedCollation.get("misspellingsAndCorrections");+ coll.setMisspellingsAndCorrections(misspellings);SpellCheckCollation priorColl = collations.get(coll.getCollationQuery());if(priorColl != null){@@ -645,10 +630,9 @@ public class SpellCheckComponent extends SearchComponent implements SolrCoreAwarreturn spellCheckers.get(name);}- @SuppressWarnings({"unchecked", "rawtypes"})- protected NamedList toNamedList(boolean shardRequest,+ protected NamedList<Object> toNamedList(boolean shardRequest,SpellingResult spellingResult, String origQuery, boolean extendedResults) {- NamedList result = new NamedList();+ NamedList<Object> result = new NamedList<>();Map<Token,LinkedHashMap<String,Integer>> suggestions = spellingResult.getSuggestions();boolean hasFreqInfo = spellingResult.hasTokenFrequencyInfo();@@ -661,18 +645,12 @@ public class SpellCheckComponent extends SearchComponent implements SolrCoreAwar.length());Map<String,Integer> theSuggestions = new LinkedHashMap<>(entry.getValue());- Iterator<String> sugIter = theSuggestions.keySet().iterator();- while (sugIter.hasNext()) {- String sug = sugIter.next();- if (sug.equals(tokenString)) {- sugIter.remove();- }- }+ theSuggestions.keySet().removeIf(sug -> sug.equals(tokenString));if (theSuggestions.size() > 0) {hasSuggestions = true;}if (theSuggestions != null && (theSuggestions.size() > 0 || shardRequest)) {- SimpleOrderedMap suggestionList = new SimpleOrderedMap();+ SimpleOrderedMap<Object> suggestionList = new SimpleOrderedMap<>();suggestionList.add("numFound", theSuggestions.size());suggestionList.add("startOffset", inputToken.startOffset());suggestionList.add("endOffset", inputToken.endOffset());@@ -689,10 +667,10 @@ public class SpellCheckComponent extends SearchComponent implements SolrCoreAwarsuggestionList.add("origFreq", spellingResult.getTokenFrequency(inputToken));- ArrayList<SimpleOrderedMap> sugs = new ArrayList<>();+ ArrayList<SimpleOrderedMap<Object>> sugs = new ArrayList<>();suggestionList.add("suggestion", sugs);for (Map.Entry<String,Integer> suggEntry : theSuggestions.entrySet()) {- SimpleOrderedMap sugEntry = new SimpleOrderedMap();+ SimpleOrderedMap<Object> sugEntry = new SimpleOrderedMap<>();sugEntry.add("word", suggEntry.getKey());sugEntry.add("freq", suggEntry.getValue());sugs.add(sugEntry);diff --git a/solr/core/src/java/org/apache/solr/handler/component/StandaloneReplicaSource.java b/solr/core/src/java/org/apache/solr/handler/component/StandaloneReplicaSource.javaindex b3bcfa24267..08fd8e05e84 100644--- a/solr/core/src/java/org/apache/solr/handler/component/StandaloneReplicaSource.java+++ b/solr/core/src/java/org/apache/solr/handler/component/StandaloneReplicaSource.java@@ -17,6 +17,7 @@package org.apache.solr.handler.component;+import java.lang.reflect.Array;import java.util.Collections;import java.util.List;@@ -27,12 +28,12 @@ import org.apache.solr.security.AllowListUrlChecker;* A replica source for solr stand alone mode*/class StandaloneReplicaSource implements ReplicaSource {- private List<String>[] replicas;+ private final List<String>[] replicas;- @SuppressWarnings({"unchecked", "rawtypes"})+ @SuppressWarnings("unchecked")public StandaloneReplicaSource(Builder builder) {List<String> list = StrUtils.splitSmart(builder.shardsParam, ",", true);- replicas = new List[list.size()];+ replicas = (List<String>[]) Array.newInstance(List.class, list.size());for (int i = 0; i < list.size(); i++) {replicas[i] = StrUtils.splitSmart(list.get(i), "|", true);// todo do we really not need to transform in non-cloud mode?!diff --git a/solr/core/src/java/org/apache/solr/handler/component/StatsComponent.java b/solr/core/src/java/org/apache/solr/handler/component/StatsComponent.javaindex 4ba2069c715..127b1e9cd3c 100644--- a/solr/core/src/java/org/apache/solr/handler/component/StatsComponent.java+++ b/solr/core/src/java/org/apache/solr/handler/component/StatsComponent.java@@ -84,14 +84,14 @@ public class StatsComponent extends SearchComponent {}@Override- @SuppressWarnings({"unchecked", "rawtypes"})+ @SuppressWarnings("unchecked")public void handleResponses(ResponseBuilder rb, ShardRequest sreq) {if (!rb.doStats || (sreq.purpose & ShardRequest.PURPOSE_GET_STATS) == 0) return;Map<String, StatsValues> allStatsValues = rb._statsInfo.getAggregateStatsValues();for (ShardResponse srsp : sreq.responses) {- NamedList stats = null;+ NamedList<NamedList<NamedList<?>>> stats = null;try {stats = (NamedList<NamedList<NamedList<?>>>)srsp.getSolrResponse().getResponse().get("stats");@@ -103,13 +103,12 @@ public class StatsComponent extends SearchComponent {"Unable to read stats info for shard: " + srsp.getShard(), e);}- NamedList stats_fields = unwrapStats(stats);+ NamedList<NamedList<?>> stats_fields = unwrapStats(stats);if (stats_fields != null) {for (int i = 0; i < stats_fields.size(); i++) {String key = stats_fields.getName(i);StatsValues stv = allStatsValues.get(key);- @SuppressWarnings({"rawtypes"})- NamedList shardStv = (NamedList) stats_fields.get(key);+ NamedList<?> shardStv = stats_fields.get(key);stv.accumulate(shardStv);}}@@ -151,8 +150,7 @@ public class StatsComponent extends SearchComponent {for (Map.Entry<String, StatsValues> entry : statsValues.entrySet()) {String key = entry.getKey();- @SuppressWarnings({"rawtypes"})- NamedList stv = entry.getValue().getStatsValues();+ NamedList<?> stv = entry.getValue().getStatsValues();stats_fields.add(key, stv);}return stats;diff --git a/solr/core/src/java/org/apache/solr/handler/component/TermVectorComponent.java b/solr/core/src/java/org/apache/solr/handler/component/TermVectorComponent.javaindex bd1a4e6456f..d25f5da790d 100644--- a/solr/core/src/java/org/apache/solr/handler/component/TermVectorComponent.java+++ b/solr/core/src/java/org/apache/solr/handler/component/TermVectorComponent.java@@ -17,6 +17,7 @@package org.apache.solr.handler.component;import java.io.IOException;+import java.lang.reflect.Array;import java.util.ArrayList;import java.util.Arrays;import java.util.Collections;@@ -411,8 +412,8 @@ public class TermVectorComponent extends SearchComponent {NamedList<Object> termVectorsNL = new NamedList<>();- @SuppressWarnings({"unchecked", "rawtypes"})- Map.Entry<String, Object>[] arr = new NamedList.NamedListEntry[rb.resultIds.size()];+ @SuppressWarnings("unchecked")+ Map.Entry<String, Object>[] arr = (NamedList.NamedListEntry<Object>[]) Array.newInstance(NamedList.NamedListEntry.class, rb.resultIds.size());for (ShardRequest sreq : rb.finished) {if ((sreq.purpose & ShardRequest.PURPOSE_GET_FIELDS) == 0 || !sreq.params.getBool(COMPONENT_NAME, false)) {diff --git a/solr/core/src/java/org/apache/solr/handler/designer/DefaultSampleDocumentsLoader.java b/solr/core/src/java/org/apache/solr/handler/designer/DefaultSampleDocumentsLoader.javaindex c79e4ab231a..948e69a328b 100644--- a/solr/core/src/java/org/apache/solr/handler/designer/DefaultSampleDocumentsLoader.java+++ b/solr/core/src/java/org/apache/solr/handler/designer/DefaultSampleDocumentsLoader.java@@ -44,7 +44,6 @@ import org.apache.solr.common.params.ModifiableSolrParams;import org.apache.solr.common.params.SolrParams;import org.apache.solr.common.util.ContentStream;import org.apache.solr.common.util.ContentStreamBase;-import org.apache.solr.common.util.NamedList;import org.apache.solr.handler.loader.CSVLoaderBase;import org.apache.solr.handler.loader.JsonLoader;import org.apache.solr.handler.loader.XMLLoader;@@ -321,12 +320,6 @@ public class DefaultSampleDocumentsLoader implements SampleDocumentsLoader {return sep;}- @Override- @SuppressWarnings({"rawtypes"})- public void init(NamedList args) {-- }-private static class NoOpUpdateRequestProcessor extends UpdateRequestProcessor {NoOpUpdateRequestProcessor() {super(null);diff --git a/solr/core/src/java/org/apache/solr/handler/designer/DefaultSchemaSuggester.java b/solr/core/src/java/org/apache/solr/handler/designer/DefaultSchemaSuggester.javaindex 704556ea744..f63ab99f47f 100644--- a/solr/core/src/java/org/apache/solr/handler/designer/DefaultSchemaSuggester.java+++ b/solr/core/src/java/org/apache/solr/handler/designer/DefaultSchemaSuggester.java@@ -379,15 +379,12 @@ public class DefaultSchemaSuggester implements SchemaSuggester {}@Override- @SuppressWarnings({"rawtypes"})- public void init(NamedList args) {+ public void init(NamedList<?> args) {initDateTimeFormatters(args);initBooleanParsing(args);}- @SuppressWarnings({"unchecked", "rawtypes"})- protected void initDateTimeFormatters(NamedList args) {-+ protected void initDateTimeFormatters(NamedList<?> args) {Locale locale = Locale.US;String localeParam = (String) args.remove(LOCALE_PARAM);if (null != localeParam) {@@ -413,8 +410,7 @@ public class DefaultSchemaSuggester implements SchemaSuggester {}}- @SuppressWarnings({"unchecked", "rawtypes"})- protected void initBooleanParsing(NamedList args) {+ protected void initBooleanParsing(NamedList<?> args) {Object caseSensitiveParam = args.remove(CASE_SENSITIVE_PARAM);if (null != caseSensitiveParam) {if (caseSensitiveParam instanceof Boolean) {diff --git a/solr/core/src/java/org/apache/solr/handler/loader/JsonLoader.java b/solr/core/src/java/org/apache/solr/handler/loader/JsonLoader.javaindex cdb92b4c21b..0295ad0fc87 100644--- a/solr/core/src/java/org/apache/solr/handler/loader/JsonLoader.java+++ b/solr/core/src/java/org/apache/solr/handler/loader/JsonLoader.java@@ -84,24 +84,24 @@ public class JsonLoader extends ContentStreamLoader {new SingleThreadedJsonLoader(req, rsp, processor).load(req, rsp, stream, processor);}- @SuppressWarnings({"unchecked", "rawtypes"})+ @SuppressWarnings("unchecked")public static SolrInputDocument buildDoc(Map<String, Object> m) {SolrInputDocument result = new SolrInputDocument();for (Map.Entry<String, Object> e : m.entrySet()) {if (mapEntryIsChildDoc(e.getValue())) { // parse child documentsif (e.getValue() instanceof List) {- List value = (List) e.getValue();+ List<?> value = (List<?>) e.getValue();for (Object o : value) {if (o instanceof Map) {// retain the value as a list, even if the list contains a single value.if(!result.containsKey(e.getKey())) {result.setField(e.getKey(), new ArrayList<>(1));}- result.addField(e.getKey(), buildDoc((Map) o));+ result.addField(e.getKey(), buildDoc((Map<String, Object>) o));}}} else if (e.getValue() instanceof Map) {- result.addField(e.getKey(), buildDoc((Map) e.getValue()));+ result.addField(e.getKey(), buildDoc((Map<String, Object>) e.getValue()));}} else {result.setField(e.getKey(), e.getValue());@@ -112,8 +112,7 @@ public class JsonLoader extends ContentStreamLoader {private static boolean mapEntryIsChildDoc(Object val) {if(val instanceof List) {- @SuppressWarnings({"rawtypes"})- List listVal = (List) val;+ List<?> listVal = (List<?>) val;if (listVal.size() == 0) return false;return listVal.get(0) instanceof Map;}@@ -282,12 +281,11 @@ public class JsonLoader extends ContentStreamLoader {});}- @SuppressWarnings({"unchecked", "rawtypes"})private Map<String, Object> getDocMap(Map<String, Object> record, JSONParser parser, String srcField, boolean mapUniqueKeyOnly) {- Map result = record;+ Map<String, Object> result = record;if (srcField != null && parser instanceof RecordingJSONParser) {//if srcFIeld specified extract it out first- result = new LinkedHashMap(record);+ result = new LinkedHashMap<>(record);RecordingJSONParser rjp = (RecordingJSONParser) parser;result.put(srcField, rjp.getBuf());rjp.resetBuf();@@ -298,7 +296,7 @@ public class JsonLoader extends ContentStreamLoader {throw new SolrException(SolrException.ErrorCode.BAD_REQUEST, "No uniqueKey specified in schema");String df = req.getParams().get(CommonParams.DF);if (df == null) throw new SolrException(SolrException.ErrorCode.BAD_REQUEST, "No 'df' specified in request");- Map copy = new LinkedHashMap();+ Map<String, Object> copy = new LinkedHashMap<>();String uniqueField = (String) record.get(sf.getName());if (uniqueField == null) uniqueField = UUID.randomUUID().toString().toLowerCase(Locale.ROOT);copy.put(sf.getName(), uniqueField);@@ -430,7 +428,7 @@ public class JsonLoader extends ContentStreamLoader {void parseCommitOptions(CommitUpdateCommand cmd) throws IOException {assertNextEvent(JSONParser.OBJECT_START);@SuppressWarnings({"unchecked"})- final Map<String, Object> map = (Map) ObjectBuilder.getVal(parser);+ final Map<String, Object> map = (Map<String,Object>) ObjectBuilder.getVal(parser);// SolrParams currently expects string values...SolrParams p = new SolrParams() {@@ -595,12 +593,10 @@ public class JsonLoader extends ContentStreamLoader {}}- @SuppressWarnings({"unchecked"})private List<Object> parseArrayFieldValue(int ev, String fieldName) throws IOException {assert ev == JSONParser.ARRAY_START;- @SuppressWarnings({"rawtypes"})- ArrayList lst = new ArrayList(2);+ ArrayList<Object> lst = new ArrayList<>(2);for (; ; ) {ev = parser.nextEvent();if (ev == JSONParser.ARRAY_END) {@@ -641,15 +637,15 @@ public class JsonLoader extends ContentStreamLoader {}- @SuppressWarnings({"unchecked", "rawtypes"})private static Object changeChildDoc(Object o) {if (o instanceof List) {- return ((List) o)+ return ((List<?>) o).stream().map(JsonLoader::changeChildDoc).collect(toList());}- Map m = (Map) o;+ @SuppressWarnings("unchecked")+ Map<Object, Object> m = (Map<Object, Object>) o;if (m.containsKey(null)) m.put(CHILD_DOC_KEY, changeChildDoc(m.remove(null)));return m;}diff --git a/solr/core/src/java/org/apache/solr/handler/loader/XMLLoader.java b/solr/core/src/java/org/apache/solr/handler/loader/XMLLoader.javaindex f63f86d5c37..551959c9bab 100644--- a/solr/core/src/java/org/apache/solr/handler/loader/XMLLoader.java+++ b/solr/core/src/java/org/apache/solr/handler/loader/XMLLoader.java@@ -361,8 +361,8 @@ public class XMLLoader extends ContentStreamLoader {} else {// multiple val are presentif (val instanceof List) {- @SuppressWarnings({"rawtypes"})- List list = (List) val;+ @SuppressWarnings("unchecked")+ List<Object> list = (List<Object>) val;list.add(v);} else {List<Object> values = new ArrayList<>();diff --git a/solr/core/src/java/org/apache/solr/handler/tagger/TaggerRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/tagger/TaggerRequestHandler.javaindex c53fb7a1090..903f0aea1b0 100644--- a/solr/core/src/java/org/apache/solr/handler/tagger/TaggerRequestHandler.java+++ b/solr/core/src/java/org/apache/solr/handler/tagger/TaggerRequestHandler.java@@ -160,8 +160,7 @@ public class TaggerRequestHandler extends RequestHandlerBase {final SolrIndexSearcher searcher = req.getSearcher();final FixedBitSet matchDocIdsBS = new FixedBitSet(searcher.maxDoc());- @SuppressWarnings({"rawtypes"})- final List tags = new ArrayList(2000);+ final List<NamedList<?>> tags = new ArrayList<>(2000);try {Analyzer analyzer = req.getSchema().getField(indexedField).getType().getQueryAnalyzer();@@ -170,7 +169,6 @@ public class TaggerRequestHandler extends RequestHandlerBase {if (terms != null) {Tagger tagger = new Tagger(terms, computeDocCorpus(req), tokenStream, tagClusterReducer,skipAltTokens, ignoreStopWords) {- @SuppressWarnings("unchecked")@Overrideprotected void tagCallback(int startOffset, int endOffset, Object docIdsKey) {if (tags.size() >= tagsLimit)@@ -186,8 +184,7 @@ public class TaggerRequestHandler extends RequestHandlerBase {endOffset = offsetPair[1];}- @SuppressWarnings({"rawtypes"})- NamedList tag = new NamedList();+ NamedList<Object> tag = new NamedList<>();tag.add("startOffset", startOffset);tag.add("endOffset", endOffset);if (addMatchText)@@ -197,15 +194,13 @@ public class TaggerRequestHandler extends RequestHandlerBase {tags.add(tag);}- @SuppressWarnings({"rawtypes"})- Map<Object, List> docIdsListCache = new HashMap<>(2000);+ Map<Object, List<Object>> docIdsListCache = new HashMap<>(2000);ValueSourceAccessor uniqueKeyCache = new ValueSourceAccessor(searcher,idSchemaField.getType().getValueSource(idSchemaField, null));- @SuppressWarnings({"unchecked", "rawtypes"})- private List lookupSchemaDocIds(Object docIdsKey) {- List schemaDocIds = docIdsListCache.get(docIdsKey);+ private List<Object> lookupSchemaDocIds(Object docIdsKey) {+ List<Object> schemaDocIds = docIdsListCache.get(docIdsKey);if (schemaDocIds != null)return schemaDocIds;IntsRef docIds = lookupDocIds(docIdsKey);@@ -352,8 +347,7 @@ public class TaggerRequestHandler extends RequestHandlerBase {static class ValueSourceAccessor {private final List<LeafReaderContext> readerContexts;private final ValueSource valueSource;- @SuppressWarnings({"rawtypes"})- private final Map fContext;+ private final Map<Object,Object> fContext;private final FunctionValues[] functionValuesPerSeg;private final int[] functionValuesDocIdPerSeg;@@ -365,7 +359,6 @@ public class TaggerRequestHandler extends RequestHandlerBase {functionValuesDocIdPerSeg = new int[readerContexts.size()];}- @SuppressWarnings({"unchecked"})Object objectVal(int topDocId) throws IOException {// lookup segment level stuff:int segIdx = ReaderUtil.subIndex(topDocId, readerContexts);diff --git a/solr/core/src/java/org/apache/solr/internal/csv/CSVParser.java b/solr/core/src/java/org/apache/solr/internal/csv/CSVParser.javaindex 27c507975c3..5bcbf23a21c 100644--- a/solr/core/src/java/org/apache/solr/internal/csv/CSVParser.java+++ b/solr/core/src/java/org/apache/solr/internal/csv/CSVParser.java@@ -72,8 +72,7 @@ public class CSVParser {// the following objects are shared to reduce garbage/** A record buffer for getLine(). Grows as necessary and is reused. */- @SuppressWarnings({"rawtypes"})- private final ArrayList record = new ArrayList();+ private final ArrayList<String> record = new ArrayList<>();private final Token reusableToken = new Token();private final CharBuffer wsBuf = new CharBuffer();private final CharBuffer code = new CharBuffer(4);@@ -139,10 +138,8 @@ public class CSVParser {* @return matrix of records x values ('null' when end of file)* @throws IOException on parse error or input read-failure*/- @SuppressWarnings({"unchecked"})public String[][] getAllValues() throws IOException {- @SuppressWarnings({"rawtypes"})- ArrayList records = new ArrayList();+ ArrayList<String[]> records = new ArrayList<>();String[] values;String[][] ret = null;while ((values = getLine()) != null) {@@ -224,7 +221,7 @@ public class CSVParser {}}if (!record.isEmpty()) {- ret = (String[]) record.toArray(new String[record.size()]);+ ret = record.toArray(new String[record.size()]);}return ret;}diff --git a/solr/core/src/java/org/apache/solr/metrics/reporters/SolrSlf4jReporter.java b/solr/core/src/java/org/apache/solr/metrics/reporters/SolrSlf4jReporter.javaindex 18a43bbf67d..28fd0a6fb4c 100644--- a/solr/core/src/java/org/apache/solr/metrics/reporters/SolrSlf4jReporter.java+++ b/solr/core/src/java/org/apache/solr/metrics/reporters/SolrSlf4jReporter.java@@ -85,7 +85,7 @@ public class SolrSlf4jReporter extends FilteringSolrMetricReporter {}@Override- @SuppressWarnings({"rawtypes"})+ @SuppressWarnings("rawtypes") // super uses raw Gauge, so we're stuck with it until DropWizard 5.0public void report(SortedMap<String, Gauge> gauges, SortedMap<String, Counter> counters, SortedMap<String, Histogram> histograms, SortedMap<String, Meter> meters, SortedMap<String, Timer> timers) {throw new UnsupportedOperationException("this method should never be called here!");}diff --git a/solr/core/src/java/org/apache/solr/metrics/reporters/solr/SolrReporter.java b/solr/core/src/java/org/apache/solr/metrics/reporters/solr/SolrReporter.javaindex 9606ef5a340..f1b93654f2a 100644--- a/solr/core/src/java/org/apache/solr/metrics/reporters/solr/SolrReporter.java+++ b/solr/core/src/java/org/apache/solr/metrics/reporters/solr/SolrReporter.java@@ -480,7 +480,7 @@ public class SolrReporter extends ScheduledReporter {}@Override- @SuppressWarnings({"rawtypes"})+ @SuppressWarnings("rawtypes") // super uses raw Gauge, so we're stuck with itpublic void report(SortedMap<String, Gauge> gauges, SortedMap<String, Counter> counters, SortedMap<String, Histogram> histograms, SortedMap<String, Meter> meters, SortedMap<String, Timer> timers) {// no-op - we do all the work in report()}diff --git a/solr/core/src/java/org/apache/solr/packagemanager/PackageManager.java b/solr/core/src/java/org/apache/solr/packagemanager/PackageManager.javaindex 971a2f6968d..4a2a9b7cead 100644--- a/solr/core/src/java/org/apache/solr/packagemanager/PackageManager.java+++ b/solr/core/src/java/org/apache/solr/packagemanager/PackageManager.java@@ -155,30 +155,29 @@ public class PackageManager implements Closeable {PackageUtils.printGreen("Package uninstalled: " + packageName + ":" + version + ":-)");}- @SuppressWarnings({"unchecked", "rawtypes"})public List<SolrPackageInstance> fetchInstalledPackageInstances() throws SolrException {log.info("Getting packages from packages.json...");- List<SolrPackageInstance> ret = new ArrayList<SolrPackageInstance>();- packages = new HashMap<String, List<SolrPackageInstance>>();+ List<SolrPackageInstance> ret = new ArrayList<>();+ packages = new HashMap<>();try {- Map packagesZnodeMap = null;-if (zkClient.exists(ZkStateReader.SOLR_PKGS_PATH, true) == true) {- packagesZnodeMap = (Map)getMapper().readValue(- new String(zkClient.getData(ZkStateReader.SOLR_PKGS_PATH, null, null, true), "UTF-8"), Map.class).get("packages");- for (Object packageName: packagesZnodeMap.keySet()) {- List pkg = (List)packagesZnodeMap.get(packageName);- for (Map pkgVersion: (List<Map>)pkg) {+ @SuppressWarnings("unchecked")+ Map<String, List<Map<?,?>>> packagesZnodeMap = (Map<String, List<Map<?,?>>>)+ getMapper().readValue(new String(zkClient.getData(ZkStateReader.SOLR_PKGS_PATH, null, null, true), "UTF-8"), Map.class).get("packages");+ for (String packageName: packagesZnodeMap.keySet()) {+ List<Map<?,?>> pkg = packagesZnodeMap.get(packageName);+ for (Map<?,?> pkgVersion: pkg) {Manifest manifest = PackageUtils.fetchManifest(solrClient, solrBaseUrl, pkgVersion.get("manifest").toString(), pkgVersion.get("manifestSHA512").toString());List<Plugin> solrPlugins = manifest.plugins;- SolrPackageInstance pkgInstance = new SolrPackageInstance(packageName.toString(), null,+ SolrPackageInstance pkgInstance = new SolrPackageInstance(packageName, null,pkgVersion.get("version").toString(), manifest, solrPlugins, manifest.parameterDefaults);- if (pkgVersion.containsKey("files")) {- pkgInstance.files = (List) pkgVersion.get("files");+ @SuppressWarnings("unchecked")+ List<String> files = (List<String>) pkgVersion.get("files");+ if (files != null) {+ pkgInstance.files = files;}- List<SolrPackageInstance> list = packages.containsKey(packageName) ? packages.get(packageName) : new ArrayList<SolrPackageInstance>();+ List<SolrPackageInstance> list = packages.computeIfAbsent(packageName, k -> new ArrayList<>());list.add(pkgInstance);- packages.put(packageName.toString(), list);ret.add(pkgInstance);}}diff --git a/solr/core/src/java/org/apache/solr/pkg/PackageLoader.java b/solr/core/src/java/org/apache/solr/pkg/PackageLoader.javaindex 2cd6e9c77b3..2d7d22faa8b 100644--- a/solr/core/src/java/org/apache/solr/pkg/PackageLoader.java+++ b/solr/core/src/java/org/apache/solr/pkg/PackageLoader.java@@ -302,8 +302,7 @@ public class PackageLoader implements Closeable {return version.copy();}- @SuppressWarnings({"rawtypes"})- public Collection getFiles() {+ public Collection<String> getFiles() {return Collections.unmodifiableList(version.files);}diff --git a/solr/core/src/java/org/apache/solr/request/LocalSolrQueryRequest.java b/solr/core/src/java/org/apache/solr/request/LocalSolrQueryRequest.javaindex 7a8d093f7a9..f684e4ed7e1 100644--- a/solr/core/src/java/org/apache/solr/request/LocalSolrQueryRequest.java+++ b/solr/core/src/java/org/apache/solr/request/LocalSolrQueryRequest.java@@ -35,17 +35,13 @@ import org.apache.solr.core.SolrCore;**/public class LocalSolrQueryRequest extends SolrQueryRequestBase {- @SuppressWarnings({"rawtypes"})- public final static Map emptyArgs = new HashMap(0,1);-public String userPrincipalName = null;protected static SolrParams makeParams(String query, String qtype, int start, int limit,- @SuppressWarnings({"rawtypes"})Map args) {+ Map<?,?> args) {Map<String,String[]> map = new HashMap<>();- for (@SuppressWarnings({"rawtypes"})Iterator iter = args.entrySet().iterator(); iter.hasNext();) {- @SuppressWarnings({"rawtypes"})- Map.Entry e = (Map.Entry)iter.next();+ for (Iterator<? extends Map.Entry<?, ?>> iter = args.entrySet().iterator(); iter.hasNext();) {+ Map.Entry<?,?> e = iter.next();String k = e.getKey().toString();Object v = e.getValue();if (v instanceof String[]) map.put(k,(String[])v);@@ -59,11 +55,11 @@ public class LocalSolrQueryRequest extends SolrQueryRequestBase {}public LocalSolrQueryRequest(SolrCore core, String query, String qtype, int start, int limit,- @SuppressWarnings({"rawtypes"})Map args) {+ Map<?,?> args) {super(core,makeParams(query,qtype,start,limit,args));}- public LocalSolrQueryRequest(SolrCore core, @SuppressWarnings({"rawtypes"})NamedList args) {+ public LocalSolrQueryRequest(SolrCore core, NamedList<?> args) {super(core, args.toSolrParams());}diff --git a/solr/core/src/java/org/apache/solr/request/SolrRequestInfo.java b/solr/core/src/java/org/apache/solr/request/SolrRequestInfo.javaindex 3771a653c81..e64a6d01cff 100644--- a/solr/core/src/java/org/apache/solr/request/SolrRequestInfo.java+++ b/solr/core/src/java/org/apache/solr/request/SolrRequestInfo.java@@ -216,14 +216,13 @@ public class SolrRequestInfo {public static ExecutorUtil.InheritableThreadLocalProvider getInheritableThreadLocalProvider() {return new ExecutorUtil.InheritableThreadLocalProvider() {@Override- @SuppressWarnings({"unchecked"})- public void store(@SuppressWarnings({"rawtypes"})AtomicReference ctx) {+ public void store(AtomicReference<Object> ctx) {SolrRequestInfo me = SolrRequestInfo.getRequestInfo();if (me != null) ctx.set(me);}@Override- public void set(@SuppressWarnings({"rawtypes"})AtomicReference ctx) {+ public void set(AtomicReference<Object> ctx) {SolrRequestInfo me = (SolrRequestInfo) ctx.get();if (me != null) {SolrRequestInfo.setRequestInfo(me);@@ -231,7 +230,7 @@ public class SolrRequestInfo {}@Override- public void clean(@SuppressWarnings({"rawtypes"})AtomicReference ctx) {+ public void clean(AtomicReference<Object> ctx) {if (ctx.get() != null) {SolrRequestInfo.clearRequestInfo();}diff --git a/solr/core/src/java/org/apache/solr/request/json/ObjectUtil.java b/solr/core/src/java/org/apache/solr/request/json/ObjectUtil.javaindex a0837a20e00..aab40b746ce 100644--- a/solr/core/src/java/org/apache/solr/request/json/ObjectUtil.java+++ b/solr/core/src/java/org/apache/solr/request/json/ObjectUtil.java@@ -71,18 +71,16 @@ public class ObjectUtil {}}- protected Object makeList(Object current, Object previous) {- @SuppressWarnings({"rawtypes"})- ArrayList lst = new ArrayList();+ protected List<Object> makeList(Object current, Object previous) {+ ArrayList<Object> lst = new ArrayList<>();append(lst, previous); // make the original value(s) come firstappend(lst, current);return lst;}- @SuppressWarnings({"unchecked"})- protected void append(@SuppressWarnings({"rawtypes"})List lst, Object current) {+ protected void append(List<Object> lst, Object current) {if (current instanceof Collection) {- lst.addAll((Collection)current);+ lst.addAll((Collection<?>)current);} else {lst.add(current);}diff --git a/solr/core/src/java/org/apache/solr/response/DocsStreamer.java b/solr/core/src/java/org/apache/solr/response/DocsStreamer.javaindex 995685fdfb0..067e98fa4ca 100644--- a/solr/core/src/java/org/apache/solr/response/DocsStreamer.java+++ b/solr/core/src/java/org/apache/solr/response/DocsStreamer.java@@ -57,8 +57,7 @@ import org.apache.solr.search.SolrReturnFields;* This streams SolrDocuments from a DocList and applies transformer*/public class DocsStreamer implements Iterator<SolrDocument> {- @SuppressWarnings({"rawtypes"})- public static final Set<Class> KNOWN_TYPES = new HashSet<>();+ public static final Set<Class<? extends FieldType>> KNOWN_TYPES = new HashSet<>();private final org.apache.solr.response.ResultContext rctx;private final SolrDocumentFetcher docFetcher; // a collaborator of SolrIndexSearcherdiff --git a/solr/core/src/java/org/apache/solr/schema/IndexSchema.java b/solr/core/src/java/org/apache/solr/schema/IndexSchema.javaindex c57b96ac646..e6053598dce 100644--- a/solr/core/src/java/org/apache/solr/schema/IndexSchema.java+++ b/solr/core/src/java/org/apache/solr/schema/IndexSchema.java@@ -1407,9 +1407,8 @@ public class IndexSchema {.map(it -> it.getNamedPropertyValues(sp.showDefaults)).collect(Collectors.toList())),- @SuppressWarnings({"unchecked", "rawtypes"})FIELDS(IndexSchema.FIELDS, sp -> {- List<SimpleOrderedMap> result = (sp.requestedFields != null ? sp.requestedFields : new TreeSet<>(sp.schema.fields.keySet()))+ List<SimpleOrderedMap<Object>> result = (sp.requestedFields != null ? sp.requestedFields : new TreeSet<>(sp.schema.fields.keySet())).stream().map(sp.schema::getFieldOrNull).filter(it -> it != null)@@ -1460,9 +1459,9 @@ public class IndexSchema {requestedFields = readMultiVals(CommonParams.FL);}- @SuppressWarnings({"rawtypes"})- public Collection applyDynamic(){- return (Collection) Handler.DYNAMIC_FIELDS.fun.apply(this);+ @SuppressWarnings("unchecked")+ public Collection<SimpleOrderedMap<Object>> applyDynamic() {+ return (List<SimpleOrderedMap<Object>>) Handler.DYNAMIC_FIELDS.fun.apply(this);}private Set<String> readMultiVals(String name) {@@ -1480,8 +1479,7 @@ public class IndexSchema {}- @SuppressWarnings({"rawtypes"})- SimpleOrderedMap getProperties(SchemaField sf) {+ SimpleOrderedMap<Object> getProperties(SchemaField sf) {SimpleOrderedMap<Object> result = sf.getNamedPropertyValues(showDefaults);if (schema.isDynamicField(sf.name)) {String dynamicBase = schema.getDynamicPattern(sf.getName());diff --git a/solr/core/src/java/org/apache/solr/schema/LatLonPointSpatialField.java b/solr/core/src/java/org/apache/solr/schema/LatLonPointSpatialField.javaindex d2d1212c273..df3f38abf8e 100644--- a/solr/core/src/java/org/apache/solr/schema/LatLonPointSpatialField.java+++ b/solr/core/src/java/org/apache/solr/schema/LatLonPointSpatialField.java@@ -58,8 +58,7 @@ import static java.math.RoundingMode.CEILING;* coordinates in lat/lon decimal degrees. The accuracy is about a centimeter (1.042cm).*/// TODO once LLP & LLDVF are out of Lucene Sandbox, we should be able to javadoc reference them.-@SuppressWarnings({"rawtypes"})-public class LatLonPointSpatialField extends AbstractSpatialFieldType implements SchemaAware {+public class LatLonPointSpatialField extends AbstractSpatialFieldType<LatLonPointSpatialField.LatLonPointSpatialStrategy> implements SchemaAware {private IndexSchema schema;// TODO handle polygons@@ -74,7 +73,7 @@ public class LatLonPointSpatialField extends AbstractSpatialFieldType implements}@Override- protected SpatialStrategy newSpatialStrategy(String fieldName) {+ protected LatLonPointSpatialStrategy newSpatialStrategy(String fieldName) {SchemaField schemaField = schema.getField(fieldName); // TODO change AbstractSpatialFieldType so we get schemaField?return new LatLonPointSpatialStrategy(ctx, fieldName, schemaField.indexed(), schemaField.hasDocValues());}diff --git a/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchema.java b/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchema.javaindex d1387adc841..5ff5e336f62 100644--- a/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchema.java+++ b/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchema.java@@ -316,8 +316,7 @@ public final class ManagedIndexSchema extends IndexSchema {return activeReplicaCoreUrls;}- @SuppressWarnings({"rawtypes"})- private static class GetZkSchemaVersionCallable extends SolrRequest implements Callable<Integer> {+ private static class GetZkSchemaVersionCallable extends SolrRequest<SolrResponse> implements Callable<Integer> {private String coreUrl;private int expectedZkVersion;diff --git a/solr/core/src/java/org/apache/solr/schema/SchemaManager.java b/solr/core/src/java/org/apache/solr/schema/SchemaManager.javaindex 80d2cc2fbec..cc9e1503a85 100644--- a/solr/core/src/java/org/apache/solr/schema/SchemaManager.java+++ b/solr/core/src/java/org/apache/solr/schema/SchemaManager.java@@ -81,10 +81,9 @@ public class SchemaManager {* as possible instead of failing at the first error it encounters* @return List of errors. If the List is empty then the operation was successful.*/- @SuppressWarnings({"rawtypes"})- public List performOperations() throws Exception {+ public List<Map<String, Object>> performOperations() throws Exception {List<CommandOperation> ops = req.getCommands(false);- List errs = CommandOperation.captureErrors(ops);+ List<Map<String, Object>> errs = CommandOperation.captureErrors(ops);if (!errs.isEmpty()) return errs;IndexSchema schema = req.getCore().getLatestSchema();@@ -95,12 +94,11 @@ public class SchemaManager {}}- @SuppressWarnings({"rawtypes"})- private List doOperations(List<CommandOperation> operations) throws InterruptedException, IOException, KeeperException {+ private List<Map<String, Object>> doOperations(List<CommandOperation> operations) throws InterruptedException, IOException, KeeperException {TimeOut timeOut = new TimeOut(timeout, TimeUnit.SECONDS, TimeSource.NANO_TIME);SolrCore core = req.getCore();String errorMsg = "Unable to persist managed schema. ";- List errors = Collections.emptyList();+ List<Map<String,Object>> errors = Collections.emptyList();int latestVersion = -1;synchronized (req.getSchema().getSchemaUpdateLock()) {@@ -144,7 +142,7 @@ public class SchemaManager {core.getCoreContainer().reload(core.getName(), core.uniqueId);} catch (SolrException e) {log.warn(errorMsg);- errors = singletonList(errorMsg + e.getMessage());+ errors = singletonList(singletonMap(CommandOperation.ERR_MSGS, errorMsg + e.getMessage()));}break;}@@ -157,7 +155,7 @@ public class SchemaManager {}if (errors.isEmpty() && timeOut.hasTimedOut()) {log.warn("{} Timed out", errorMsg);- errors = singletonList(errorMsg + "Timed out.");+ errors = singletonList(singletonMap(CommandOperation.ERR_MSGS, errorMsg + "Timed out."));}return errors;}diff --git a/solr/core/src/java/org/apache/solr/search/AbstractReRankQuery.java b/solr/core/src/java/org/apache/solr/search/AbstractReRankQuery.javaindex f0e67025886..6c6dedf8bc4 100644--- a/solr/core/src/java/org/apache/solr/search/AbstractReRankQuery.java+++ b/solr/core/src/java/org/apache/solr/search/AbstractReRankQuery.java@@ -25,6 +25,7 @@ import org.apache.lucene.search.IndexSearcher;import org.apache.lucene.search.Query;import org.apache.lucene.search.QueryVisitor;import org.apache.lucene.search.Rescorer;+import org.apache.lucene.search.ScoreDoc;import org.apache.lucene.search.ScoreMode;import org.apache.lucene.search.TopDocsCollector;import org.apache.lucene.search.Weight;@@ -56,12 +57,12 @@ public abstract class AbstractReRankQuery extends RankQuery {return null;}- @SuppressWarnings({"unchecked", "rawtypes"})- public TopDocsCollector getTopDocsCollector(int len, QueryCommand cmd, IndexSearcher searcher) throws IOException {+ @SuppressWarnings({"unchecked"})+ public TopDocsCollector<ScoreDoc> getTopDocsCollector(int len, QueryCommand cmd, IndexSearcher searcher) throws IOException {if(this.boostedPriority == null) {SolrRequestInfo info = SolrRequestInfo.getRequestInfo();if(info != null) {- Map context = info.getReq().getContext();+ Map<Object,Object> context = info.getReq().getContext();this.boostedPriority = (Set<BytesRef>)context.get(QueryElevationComponent.BOOSTED);}}diff --git a/solr/core/src/java/org/apache/solr/search/CacheConfig.java b/solr/core/src/java/org/apache/solr/search/CacheConfig.javaindex 37b509e63e4..1335d2dfd88 100644--- a/solr/core/src/java/org/apache/solr/search/CacheConfig.java+++ b/solr/core/src/java/org/apache/solr/search/CacheConfig.java@@ -116,12 +116,10 @@ public class CacheConfig implements MapSerializable{}- @SuppressWarnings({"unchecked"})public static CacheConfig getConfig(SolrConfig solrConfig, String nodeName, Map<String,String> attrs, String xpath) {CacheConfig config = new CacheConfig();config.nodeName = nodeName;- @SuppressWarnings({"rawtypes"})- Map attrsCopy = new LinkedHashMap<>(attrs.size());+ Map<String,String> attrsCopy = new LinkedHashMap<>(attrs.size());for (Map.Entry<String, String> e : attrs.entrySet()) {attrsCopy.put(e.getKey(), String.valueOf(e.getValue()));}@@ -146,13 +144,13 @@ public class CacheConfig implements MapSerializable{if (config.cacheImpl == null) config.cacheImpl = "solr.CaffeineCache";config.clazz = new Supplier<>() {@SuppressWarnings("rawtypes")- Class<SolrCache> loadedClass;+ Class<? extends SolrCache> loadedClass;@Override@SuppressWarnings("rawtypes")public Class<? extends SolrCache> get() {if (loadedClass != null) return loadedClass;- return loadedClass = (Class<SolrCache>) loader.findClass(+ return loadedClass = loader.findClass(new PluginInfo("cache", Collections.singletonMap("class", config.cacheImpl)),SolrCache.class, true);}@@ -168,7 +166,7 @@ public class CacheConfig implements MapSerializable{@SuppressWarnings({"rawtypes"})public SolrCache newInstance() {try {- SolrCache cache = clazz.get().getConstructor().newInstance();+ SolrCache<?,?> cache = clazz.get().getConstructor().newInstance();persistence[0] = cache.init(args, persistence[0], regenerator);return cache;} catch (Exception e) {diff --git a/solr/core/src/java/org/apache/solr/search/CacheRegenerator.java b/solr/core/src/java/org/apache/solr/search/CacheRegenerator.javaindex f958bf2f491..2876eb4ee8a 100644--- a/solr/core/src/java/org/apache/solr/search/CacheRegenerator.java+++ b/solr/core/src/java/org/apache/solr/search/CacheRegenerator.java@@ -38,7 +38,7 @@ public interface CacheRegenerator {* @param oldVal the old value of the cache item* @return true to continue with autowarming, false to stop*/- public boolean regenerateItem(SolrIndexSearcher newSearcher,- @SuppressWarnings({"rawtypes"})SolrCache newCache,- @SuppressWarnings({"rawtypes"})SolrCache oldCache, Object oldKey, Object oldVal) throws IOException;+ public <K,V> boolean regenerateItem(SolrIndexSearcher newSearcher,+ SolrCache<K,V> newCache,+ SolrCache<K,V> oldCache, K oldKey, V oldVal) throws IOException;}diff --git a/solr/core/src/java/org/apache/solr/search/CaffeineCache.java b/solr/core/src/java/org/apache/solr/search/CaffeineCache.javaindex 756718c6175..f12a3a0c207 100644--- a/solr/core/src/java/org/apache/solr/search/CaffeineCache.java+++ b/solr/core/src/java/org/apache/solr/search/CaffeineCache.java@@ -99,23 +99,22 @@ public class CaffeineCache<K, V> extends SolrCacheBase implements SolrCache<K, V}@Override- @SuppressWarnings({"unchecked", "rawtypes"})- public Object init(Map args, Object persistence, CacheRegenerator regenerator) {+ public Object init(Map<String, String> args, Object persistence, CacheRegenerator regenerator) {super.init(args, regenerator);- String str = (String) args.get(SIZE_PARAM);+ String str = args.get(SIZE_PARAM);maxSize = (str == null) ? 1024 : Integer.parseInt(str);- str = (String) args.get("initialSize");+ str = args.get("initialSize");initialSize = Math.min((str == null) ? 1024 : Integer.parseInt(str), maxSize);- str = (String) args.get(MAX_IDLE_TIME_PARAM);+ str = args.get(MAX_IDLE_TIME_PARAM);if (str == null) {maxIdleTimeSec = -1;} else {maxIdleTimeSec = Integer.parseInt(str);}- str = (String) args.get(MAX_RAM_MB_PARAM);+ str = args.get(MAX_RAM_MB_PARAM);int maxRamMB = str == null ? -1 : Double.valueOf(str).intValue();maxRamBytes = maxRamMB < 0 ? Long.MAX_VALUE : maxRamMB * 1024L * 1024L;- str = (String) args.get(CLEANUP_THREAD_PARAM);+ str = args.get(CLEANUP_THREAD_PARAM);cleanupThread = str != null && Boolean.parseBoolean(str);if (cleanupThread) {executor = ForkJoinPool.commonPool();@@ -136,10 +135,8 @@ public class CaffeineCache<K, V> extends SolrCacheBase implements SolrCache<K, Vreturn persistence;}- @SuppressWarnings({"unchecked"})private Cache<K, V> buildCache(Cache<K, V> prev) {- @SuppressWarnings({"rawtypes"})- Caffeine builder = Caffeine.newBuilder()+ Caffeine<K, V> builder = Caffeine.newBuilder().initialCapacity(initialSize).executor(executor).removalListener(this)diff --git a/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.javaindex e1a64b030a4..a88919d022a 100644--- a/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java+++ b/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java@@ -439,8 +439,7 @@ public class CollapsingQParserPlugin extends QParserPlugin {//because the QueryElevationComponent runs after the Queries are constructed.IntIntHashMap boostDocsMap = null;- @SuppressWarnings({"rawtypes"})- Map context = null;+ Map<Object,Object> context = null;SolrRequestInfo info = SolrRequestInfo.getRequestInfo();if(info != null) {context = info.getReq().getContext();@@ -2004,9 +2003,8 @@ public class CollapsingQParserPlugin extends QParserPlugin {* If it is, then "this" will be added to the readerContext* using the "CSCORE" key, and true will be returned. If not returns false.*/- @SuppressWarnings({"unchecked"})public boolean setupIfNeeded(final GroupHeadSelector groupHeadSelector,- @SuppressWarnings({"rawtypes"})final Map readerContext) {+ final Map<? super String, ? super CollapseScore> readerContext) {// HACK, but not really any better options until/unless we can recursively// ask value sources if they depend on scoreif (wantsCScore(groupHeadSelector.selectorText)) {@@ -2340,8 +2338,7 @@ public class CollapsingQParserPlugin extends QParserPlugin {private ValueSource valueSource;private FunctionValues functionValues;private IntFloatDynamicMap ordVals;- @SuppressWarnings({"rawtypes"})- private Map rcontext;+ private Map<Object, Object> rcontext;private final CollapseScore collapseScore = new CollapseScore();private boolean needsScores4Collapsing;@@ -2374,7 +2371,6 @@ public class CollapsingQParserPlugin extends QParserPlugin {collapseScore.setupIfNeeded(groupHeadSelector, rcontext);}- @SuppressWarnings({"unchecked"})public void setNextReader(LeafReaderContext context) throws IOException {functionValues = this.valueSource.getValues(rcontext, context);}@@ -2812,8 +2808,7 @@ public class CollapsingQParserPlugin extends QParserPlugin {private ValueSource valueSource;private FunctionValues functionValues;- @SuppressWarnings({"rawtypes"})- private Map rcontext;+ private Map<Object, Object> rcontext;private final CollapseScore collapseScore = new CollapseScore();private int index=-1;private boolean needsScores4Collapsing;diff --git a/solr/core/src/java/org/apache/solr/search/ExportQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/ExportQParserPlugin.javaindex 097f1fcf078..dcf1ce0db9e 100644--- a/solr/core/src/java/org/apache/solr/search/ExportQParserPlugin.java+++ b/solr/core/src/java/org/apache/solr/search/ExportQParserPlugin.java@@ -95,8 +95,7 @@ public class ExportQParserPlugin extends QParserPlugin {}}- @SuppressWarnings({"rawtypes"})- public TopDocsCollector getTopDocsCollector(int len,+ public TopDocsCollector<ScoreDoc> getTopDocsCollector(int len,QueryCommand cmd,IndexSearcher searcher) throws IOException {int leafCount = searcher.getTopReaderContext().leaves().size();@@ -138,12 +137,10 @@ public class ExportQParserPlugin extends QParserPlugin {}}- @SuppressWarnings({"rawtypes"})- private static class ExportCollector extends TopDocsCollector {+ private static class ExportCollector extends TopDocsCollector<ScoreDoc> {private FixedBitSet[] sets;- @SuppressWarnings({"unchecked"})public ExportCollector(FixedBitSet[] sets) {super(null);this.sets = sets;@@ -175,7 +172,6 @@ public class ExportQParserPlugin extends QParserPlugin {return docs;}- @SuppressWarnings({"unchecked"})public TopDocs topDocs(int start, int howMany) {assert(sets != null);@@ -184,8 +180,7 @@ public class ExportQParserPlugin extends QParserPlugin {SolrQueryRequest req = null;if(info != null && ((req = info.getReq()) != null)) {- @SuppressWarnings({"rawtypes"})- Map context = req.getContext();+ Map<Object,Object> context = req.getContext();context.put("export", sets);context.put("totalHits", totalHits);}diff --git a/solr/core/src/java/org/apache/solr/search/Grouping.java b/solr/core/src/java/org/apache/solr/search/Grouping.javaindex 8bbaf4d49d1..f59c68f8a11 100644--- a/solr/core/src/java/org/apache/solr/search/Grouping.java+++ b/solr/core/src/java/org/apache/solr/search/Grouping.java@@ -18,6 +18,7 @@ package org.apache.solr.search;import java.io.IOException;import java.lang.invoke.MethodHandles;+import java.lang.reflect.Array;import java.util.ArrayList;import java.util.Collection;import java.util.LinkedHashSet;@@ -82,8 +83,7 @@ public class Grouping {private final SolrIndexSearcher searcher;private final QueryResult qr;private final QueryCommand cmd;- @SuppressWarnings({"rawtypes"})- private final List<Command> commands = new ArrayList<>();+ private final List<Command<?>> commands = new ArrayList<>();private final boolean main;private final boolean cacheSecondPassSearch;private final int maxDocsPercentageToCache;@@ -133,7 +133,7 @@ public class Grouping {this.main = main;}- public void add(@SuppressWarnings({"rawtypes"})Grouping.Command groupingCommand) {+ public void add(Grouping.Command<?> groupingCommand) {commands.add(groupingCommand);}@@ -179,8 +179,7 @@ public class Grouping {public void addFunctionCommand(String groupByStr, SolrQueryRequest request) throws SyntaxError {QParser parser = QParser.getParser(groupByStr, FunctionQParserPlugin.NAME, request);Query q = parser.getQuery();- @SuppressWarnings({"rawtypes"})- final Grouping.Command gc;+ final Grouping.Command<?> gc;if (q instanceof FunctionQuery) {ValueSource valueSource = ((FunctionQuery) q).getValueSource();if (valueSource instanceof StrFieldSource) {@@ -288,8 +287,7 @@ public class Grouping {return this;}- @SuppressWarnings({"rawtypes"})- public List<Command> getCommands() {+ public List<Command<?>> getCommands() {return commands;}@@ -318,13 +316,13 @@ public class Grouping {getDocList = (cmd.getFlags() & SolrIndexSearcher.GET_DOCLIST) != 0;query = QueryUtils.makeQueryable(cmd.getQuery());- for (@SuppressWarnings({"rawtypes"})Command cmd : commands) {+ for (Command<?> cmd : commands) {cmd.prepare();}AllGroupHeadsCollector<?> allGroupHeadsCollector = null;List<Collector> collectors = new ArrayList<>(commands.size());- for (@SuppressWarnings({"rawtypes"})Command cmd : commands) {+ for (Command<?> cmd : commands) {Collector collector = cmd.createFirstPassCollector();if (collector != null) {collectors.add(collector);@@ -371,7 +369,7 @@ public class Grouping {}collectors.clear();- for (@SuppressWarnings({"rawtypes"})Command cmd : commands) {+ for (Command<?> cmd : commands) {Collector collector = cmd.createSecondPassCollector();if (collector != null)collectors.add(collector);@@ -402,7 +400,7 @@ public class Grouping {}}- for (@SuppressWarnings({"rawtypes"})Command cmd : commands) {+ for (Command<?> cmd : commands) {cmd.finish();}@@ -593,9 +591,8 @@ public class Grouping {}}- @SuppressWarnings({"unchecked", "rawtypes"})- protected NamedList commonResponse() {- NamedList groupResult = new SimpleOrderedMap();+ protected NamedList<Object> commonResponse() {+ NamedList<Object> groupResult = new SimpleOrderedMap<>();grouped.add(key, groupResult); // grouped={ key={int matches = getMatches();@@ -608,7 +605,7 @@ public class Grouping {return groupResult;}- protected DocList getDocList(@SuppressWarnings({"rawtypes"})GroupDocs groups) {+ protected DocList getDocList(GroupDocs<?> groups) {assert groups.totalHits.relation == TotalHits.Relation.EQUAL_TO;int max = Math.toIntExact(groups.totalHits.value);int off = groupOffset;@@ -642,16 +639,14 @@ public class Grouping {return docs;}- @SuppressWarnings({"unchecked"})- protected void addDocList(@SuppressWarnings({"rawtypes"})NamedList rsp- , @SuppressWarnings({"rawtypes"})GroupDocs groups) {+ protected void addDocList(NamedList<? super DocList> rsp, GroupDocs<?> groups) {rsp.add("doclist", getDocList(groups));}// Flatten the groups and get up offset + rows documentsprotected DocList createSimpleResponse() {- @SuppressWarnings({"rawtypes"})- GroupDocs[] groups = result != null ? result.groups : new GroupDocs[0];+ @SuppressWarnings("unchecked")+ GroupDocs<T>[] groups = result != null ? result.groups : (GroupDocs<T>[]) Array.newInstance(GroupDocs.class, 0);List<Integer> ids = new ArrayList<>();List<Float> scores = new ArrayList<>();@@ -660,7 +655,7 @@ public class Grouping {float maxScore = Float.NaN;outer:- for (@SuppressWarnings({"rawtypes"})GroupDocs group : groups) {+ for (GroupDocs<T> group : groups) {maxScore = maxAvoidNaN(maxScore, group.maxScore);for (ScoreDoc scoreDoc : group.scoreDocs) {@@ -784,16 +779,14 @@ public class Grouping {return;}- @SuppressWarnings({"rawtypes"})- NamedList groupResult = commonResponse();+ NamedList<Object> groupResult = commonResponse();if (format == Format.simple) {groupResult.add("doclist", createSimpleResponse());return;}- @SuppressWarnings({"rawtypes"})- List groupList = new ArrayList();+ List<NamedList<Object>> groupList = new ArrayList<>();groupResult.add("groups", groupList); // grouped={ key={ groups=[if (result == null) {@@ -804,8 +797,7 @@ public class Grouping {if (numGroups == 0) return;for (GroupDocs<BytesRef> group : result.groups) {- @SuppressWarnings({"rawtypes"})- NamedList nl = new SimpleOrderedMap();+ NamedList<Object> nl = new SimpleOrderedMap<>();groupList.add(nl); // grouped={ key={ groups=[ {@@ -853,11 +845,10 @@ public class Grouping {* A group command for grouping on a query.*///NOTE: doesn't need to be generic. Maybe Command interface --> First / Second pass abstract impl.- @SuppressWarnings({"rawtypes"})- public class CommandQuery extends Command {+ public class CommandQuery extends Command<Object> {public Query query;- TopDocsCollector topCollector;+ TopDocsCollector<? extends ScoreDoc> topCollector;MaxScoreCollector maxScoreCollector;FilterCollector collector;@@ -904,7 +895,7 @@ public class Grouping {if (main) {mainResult = getDocList(groupDocs);} else {- NamedList rsp = commonResponse();+ NamedList<Object> rsp = commonResponse();addDocList(rsp, groupDocs);}}@@ -921,10 +912,8 @@ public class Grouping {public class CommandFunc extends Command<MutableValue> {public ValueSource groupBy;- @SuppressWarnings({"rawtypes"})- Map context;+ Map<Object,Object> context;- @SuppressWarnings({"unchecked"})private ValueSourceGroupSelector newSelector() {return new ValueSourceGroupSelector(groupBy, context);}@@ -998,7 +987,6 @@ public class Grouping {}@Override- @SuppressWarnings({"unchecked"})protected void finish() throws IOException {if (secondPass != null) {result = secondPass.getTopGroups(0);@@ -1009,16 +997,14 @@ public class Grouping {return;}- @SuppressWarnings({"rawtypes"})- NamedList groupResult = commonResponse();+ NamedList<Object> groupResult = commonResponse();if (format == Format.simple) {groupResult.add("doclist", createSimpleResponse());return;}- @SuppressWarnings({"rawtypes"})- List groupList = new ArrayList();+ List<NamedList<Object>> groupList = new ArrayList<>();groupResult.add("groups", groupList); // grouped={ key={ groups=[if (result == null) {@@ -1029,8 +1015,7 @@ public class Grouping {if (numGroups == 0) return;for (GroupDocs<MutableValue> group : result.groups) {- @SuppressWarnings({"rawtypes"})- NamedList nl = new SimpleOrderedMap();+ NamedList<Object> nl = new SimpleOrderedMap<>();groupList.add(nl); // grouped={ key={ groups=[ {nl.add("groupValue", group.groupValue.toObject());addDocList(nl, group);diff --git a/solr/core/src/java/org/apache/solr/search/IGainTermsQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/IGainTermsQParserPlugin.javaindex 5364b1ba22a..230671cb133 100644--- a/solr/core/src/java/org/apache/solr/search/IGainTermsQParserPlugin.java+++ b/solr/core/src/java/org/apache/solr/search/IGainTermsQParserPlugin.java@@ -142,12 +142,9 @@ public class IGainTermsQParserPlugin extends QParserPlugin {@Overridepublic void finish() throws IOException {- NamedList<Double> analytics = new NamedList<Double>();- @SuppressWarnings({"unchecked", "rawtypes"})- NamedList<Integer> topFreq = new NamedList();-- @SuppressWarnings({"unchecked", "rawtypes"})- NamedList<Integer> allFreq = new NamedList();+ NamedList<Double> analytics = new NamedList<>();+ NamedList<Integer> topFreq = new NamedList<>();+ NamedList<Integer> allFreq = new NamedList<>();rb.rsp.add("featuredTerms", analytics);rb.rsp.add("docFreq", topFreq);diff --git a/solr/core/src/java/org/apache/solr/search/NoOpRegenerator.java b/solr/core/src/java/org/apache/solr/search/NoOpRegenerator.javaindex 5ad587cd9da..0cb15ea3cdf 100644--- a/solr/core/src/java/org/apache/solr/search/NoOpRegenerator.java+++ b/solr/core/src/java/org/apache/solr/search/NoOpRegenerator.java@@ -27,9 +27,8 @@ import java.io.IOException;*/public class NoOpRegenerator implements CacheRegenerator {- @SuppressWarnings({"unchecked", "rawtypes"})@Override- public boolean regenerateItem(SolrIndexSearcher newSearcher, SolrCache newCache, SolrCache oldCache, Object oldKey, Object oldVal) throws IOException {+ public <K,V> boolean regenerateItem(SolrIndexSearcher newSearcher, SolrCache<K,V> newCache, SolrCache<K,V> oldCache, K oldKey, V oldVal) throws IOException {newCache.put(oldKey, oldVal);return true;}diff --git a/solr/core/src/java/org/apache/solr/search/RankQuery.java b/solr/core/src/java/org/apache/solr/search/RankQuery.javaindex 2aa991af802..a72667e863f 100644--- a/solr/core/src/java/org/apache/solr/search/RankQuery.java+++ b/solr/core/src/java/org/apache/solr/search/RankQuery.java@@ -17,6 +17,7 @@package org.apache.solr.search;import org.apache.lucene.search.IndexSearcher;+import org.apache.lucene.search.ScoreDoc;import org.apache.lucene.search.TopDocsCollector;import org.apache.lucene.search.Query;import org.apache.solr.handler.component.MergeStrategy;@@ -29,8 +30,7 @@ import java.io.IOException;public abstract class RankQuery extends ExtendedQueryBase {- @SuppressWarnings({"rawtypes"})- public abstract TopDocsCollector getTopDocsCollector(int len, QueryCommand cmd, IndexSearcher searcher) throws IOException;+ public abstract TopDocsCollector<ScoreDoc> getTopDocsCollector(int len, QueryCommand cmd, IndexSearcher searcher) throws IOException;public abstract MergeStrategy getMergeStrategy();public abstract RankQuery wrap(Query mainQuery);diff --git a/solr/core/src/java/org/apache/solr/search/ReRankCollector.java b/solr/core/src/java/org/apache/solr/search/ReRankCollector.javaindex 427ac8f0517..11108e74e50 100644--- a/solr/core/src/java/org/apache/solr/search/ReRankCollector.java+++ b/solr/core/src/java/org/apache/solr/search/ReRankCollector.java@@ -42,10 +42,9 @@ import org.apache.solr.handler.component.QueryElevationComponent;import org.apache.solr.request.SolrRequestInfo;/* A TopDocsCollector used by reranking queries. */-@SuppressWarnings({"rawtypes"})-public class ReRankCollector extends TopDocsCollector {+public class ReRankCollector extends TopDocsCollector<ScoreDoc> {- final private TopDocsCollector<?> mainCollector;+ final private TopDocsCollector<? extends ScoreDoc> mainCollector;final private IndexSearcher searcher;final private int reRankDocs;final private int length;@@ -55,7 +54,6 @@ public class ReRankCollector extends TopDocsCollector {final private Query query;- @SuppressWarnings({"unchecked"})public ReRankCollector(int reRankDocs,int length,Rescorer reRankQueryRescorer,@@ -94,7 +92,6 @@ public class ReRankCollector extends TopDocsCollector {return this.mainCollector.scoreMode();}- @SuppressWarnings({"unchecked"})public TopDocs topDocs(int start, int howMany) {try {@@ -123,7 +120,7 @@ public class ReRankCollector extends TopDocsCollector {if(boostedPriority != null) {SolrRequestInfo info = SolrRequestInfo.getRequestInfo();- Map requestContext = null;+ Map<Object,Object> requestContext = null;if(info != null) {requestContext = info.getReq().getContext();}@@ -155,8 +152,7 @@ public class ReRankCollector extends TopDocsCollector {}}- @SuppressWarnings({"rawtypes"})- public static class BoostedComp implements Comparator {+ public static class BoostedComp implements Comparator<ScoreDoc> {IntFloatHashMap boostedMap;public BoostedComp(IntIntHashMap boostedDocs, ScoreDoc[] scoreDocs, float maxScore) {@@ -172,9 +168,7 @@ public class ReRankCollector extends TopDocsCollector {}}- public int compare(Object o1, Object o2) {- ScoreDoc doc1 = (ScoreDoc) o1;- ScoreDoc doc2 = (ScoreDoc) o2;+ public int compare(ScoreDoc doc1, ScoreDoc doc2) {float score1 = doc1.score;float score2 = doc2.score;int idx;diff --git a/solr/core/src/java/org/apache/solr/search/SolrCache.java b/solr/core/src/java/org/apache/solr/search/SolrCache.javaindex 47a45e389df..459a927513e 100644--- a/solr/core/src/java/org/apache/solr/search/SolrCache.java+++ b/solr/core/src/java/org/apache/solr/search/SolrCache.java@@ -64,7 +64,7 @@ public interface SolrCache<K,V> extends SolrInfoBean {* regenerate an item in the new cache from an entry in the old cache.**/- public Object init(@SuppressWarnings({"rawtypes"})Map args, Object persistence, CacheRegenerator regenerator);+ public Object init(Map<String,String> args, Object persistence, CacheRegenerator regenerator);// I don't think we need a factory for faster creation given that these// will be associated with slow-to-create SolrIndexSearchers.// change to NamedList when other plugins do?diff --git a/solr/core/src/java/org/apache/solr/search/SolrFilter.java b/solr/core/src/java/org/apache/solr/search/SolrFilter.javaindex 0dc255a6043..eb3f0efc598 100644--- a/solr/core/src/java/org/apache/solr/search/SolrFilter.java+++ b/solr/core/src/java/org/apache/solr/search/SolrFilter.java@@ -34,10 +34,9 @@ public abstract class SolrFilter extends Filter {/** Implementations should propagate createWeight to sub-ValueSources which can store weight info in the context.* The context object will be passed to getDocIdSet() where this info can be retrieved. */- public abstract void createWeight(@SuppressWarnings({"rawtypes"})Map context- , IndexSearcher searcher) throws IOException;+ public abstract void createWeight(Map<Object, Object> context, IndexSearcher searcher) throws IOException;- public abstract DocIdSet getDocIdSet(@SuppressWarnings({"rawtypes"})Map context+ public abstract DocIdSet getDocIdSet(Map<Object, Object> context, LeafReaderContext readerContext, Bits acceptDocs) throws IOException;@Overridediff --git a/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java b/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.javaindex b7fc3bcb3e4..1bd4b95198d 100644--- a/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java+++ b/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java@@ -98,10 +98,8 @@ public class SolrIndexSearcher extends IndexSearcher implements Closeable, SolrI// These should *only* be used for debugging or monitoring purposespublic static final AtomicLong numOpens = new AtomicLong();public static final AtomicLong numCloses = new AtomicLong();- @SuppressWarnings({"rawtypes"})- private static final Map<String,SolrCache> NO_GENERIC_CACHES = Collections.emptyMap();- @SuppressWarnings({"rawtypes"})- private static final SolrCache[] NO_CACHES = new SolrCache[0];+ private static final Map<String,SolrCache<?, ?>> NO_GENERIC_CACHES = Collections.emptyMap();+ private static final SolrCache<?, ?>[] NO_CACHES = new SolrCache<?, ?>[0];private final SolrCore core;private final IndexSchema schema;@@ -125,8 +123,7 @@ public class SolrIndexSearcher extends IndexSearcher implements Closeable, SolrIprivate final SolrCache<String,UnInvertedField> fieldValueCache;// map of generic caches - not synchronized since it's read-only after the constructor.- @SuppressWarnings({"rawtypes"})- private final Map<String,SolrCache> cacheMap;+ private final Map<String,SolrCache<?, ?>> cacheMap;// list of all caches associated with this searcher.@SuppressWarnings({"rawtypes"})@@ -307,7 +304,7 @@ public class SolrIndexSearcher extends IndexSearcher implements Closeable, SolrI} else {cacheMap = new HashMap<>(solrConfig.userCacheConfigs.size());for (Map.Entry<String,CacheConfig> e : solrConfig.userCacheConfigs.entrySet()) {- SolrCache cache = e.getValue().newInstance();+ SolrCache<?, ?> cache = e.getValue().newInstance();if (cache != null) {cacheMap.put(cache.name(), cache);clist.add(cache);@@ -447,12 +444,12 @@ public class SolrIndexSearcher extends IndexSearcher implements Closeable, SolrI// register selfinfoRegistry.put(STATISTICS_KEY, this);infoRegistry.put(name, this);- for (@SuppressWarnings({"rawtypes"})SolrCache cache : cacheList) {+ for (SolrCache<?,?> cache : cacheList) {cache.setState(SolrCache.State.LIVE);infoRegistry.put(cache.name(), cache);}this.solrMetricsContext = core.getSolrMetricsContext().getChildContext(this);- for (@SuppressWarnings({"rawtypes"})SolrCache cache : cacheList) {+ for (SolrCache<?,?> cache : cacheList) {cache.initializeMetrics(solrMetricsContext, SolrMetricManager.mkName(cache.name(), STATISTICS_KEY));}initializeMetrics(solrMetricsContext, STATISTICS_KEY);@@ -470,7 +467,7 @@ public class SolrIndexSearcher extends IndexSearcher implements Closeable, SolrIif (cachingEnabled) {final StringBuilder sb = new StringBuilder();sb.append("Closing ").append(name);- for (@SuppressWarnings({"rawtypes"})SolrCache cache : cacheList) {+ for (SolrCache<?,?> cache : cacheList) {sb.append("\n\t");sb.append(cache);}@@ -497,7 +494,7 @@ public class SolrIndexSearcher extends IndexSearcher implements Closeable, SolrIcore.getDeletionPolicy().releaseCommitPoint(cpg);}- for (@SuppressWarnings({"rawtypes"})SolrCache cache : cacheList) {+ for (SolrCache<?,?> cache : cacheList) {try {cache.close();} catch (Exception e) {@@ -543,10 +540,10 @@ public class SolrIndexSearcher extends IndexSearcher implements Closeable, SolrIif (solrConfig.fieldValueCacheConfig != null && solrConfig.fieldValueCacheConfig.getRegenerator() == null) {solrConfig.fieldValueCacheConfig.setRegenerator(new CacheRegenerator() {@Override- public boolean regenerateItem(SolrIndexSearcher newSearcher,- @SuppressWarnings({"rawtypes"})SolrCache newCache,- @SuppressWarnings({"rawtypes"})SolrCache oldCache,- Object oldKey, Object oldVal) throws IOException {+ public <K,V> boolean regenerateItem(SolrIndexSearcher newSearcher,+ SolrCache<K,V> newCache,+ SolrCache<K,V> oldCache,+ K oldKey, V oldVal) throws IOException {if (oldVal instanceof UnInvertedField) {UnInvertedField.getUnInvertedField((String) oldKey, newSearcher);}@@ -558,10 +555,10 @@ public class SolrIndexSearcher extends IndexSearcher implements Closeable, SolrIif (solrConfig.filterCacheConfig != null && solrConfig.filterCacheConfig.getRegenerator() == null) {solrConfig.filterCacheConfig.setRegenerator(new CacheRegenerator() {@Override- @SuppressWarnings({"rawtypes"})public boolean regenerateItem(SolrIndexSearcher newSearcher- , @SuppressWarnings({"rawtypes"})SolrCache newCache- , @SuppressWarnings({"rawtypes"})SolrCache oldCache,- Object oldKey, Object oldVal) throws IOException {+ public <K,V> boolean regenerateItem(SolrIndexSearcher newSearcher+ , SolrCache<K,V> newCache+ , SolrCache<K,V> oldCache,+ K oldKey, V oldVal) throws IOException {newSearcher.cacheDocSet((Query) oldKey, null, false);return true;}@@ -572,9 +569,8 @@ public class SolrIndexSearcher extends IndexSearcher implements Closeable, SolrIfinal int queryResultWindowSize = solrConfig.queryResultWindowSize;solrConfig.queryResultCacheConfig.setRegenerator(new CacheRegenerator() {@Override- @SuppressWarnings({"rawtypes"})- public boolean regenerateItem(SolrIndexSearcher newSearcher, SolrCache newCache, SolrCache oldCache,- Object oldKey, Object oldVal) throws IOException {+ public <K,V> boolean regenerateItem(SolrIndexSearcher newSearcher, SolrCache<K,V> newCache, SolrCache<K,V> oldCache,+ K oldKey, V oldVal) throws IOException {QueryResultKey key = (QueryResultKey) oldKey;int nDocs = 1;// request 1 doc and let caching round up to the next window size...@@ -1482,8 +1478,7 @@ public class SolrIndexSearcher extends IndexSearcher implements Closeable, SolrI* @param cmd* The Command whose properties should determine the type of TopDocsCollector to use.*/- @SuppressWarnings({"rawtypes"})- private TopDocsCollector buildTopDocsCollector(int len, QueryCommand cmd) throws IOException {+ private TopDocsCollector<? extends ScoreDoc> buildTopDocsCollector(int len, QueryCommand cmd) throws IOException {int minNumFound = cmd.getMinExactCount();Query q = cmd.getQuery();if (q instanceof RankQuery) {@@ -1678,8 +1673,7 @@ public class SolrIndexSearcher extends IndexSearcher implements Closeable, SolrI// no docs on this page, so cursor doesn't changeqr.setNextCursorMark(cmd.getCursorMark());} else {- @SuppressWarnings({"rawtypes"})- final TopDocsCollector topCollector = buildTopDocsCollector(len, cmd);+ final TopDocsCollector<? extends ScoreDoc> topCollector = buildTopDocsCollector(len, cmd);DocSetCollector setCollector = new DocSetCollector(maxDoc);MaxScoreCollector maxScoreCollector = null;List<Collector> collectors = new ArrayList<>(Arrays.asList(topCollector, setCollector));@@ -1999,8 +1993,7 @@ public class SolrIndexSearcher extends IndexSearcher implements Closeable, SolrI// bit of a hack to tell if a set is sorted - do it better in the future.boolean inOrder = set instanceof BitDocSet || set instanceof SortedIntDocSet;- @SuppressWarnings({"rawtypes"})- TopDocsCollector topCollector = buildTopDocsCollector(nDocs, cmd);+ TopDocsCollector<? extends ScoreDoc> topCollector = buildTopDocsCollector(nDocs, cmd);DocIterator iter = set.iterator();int base = 0;diff --git a/solr/core/src/java/org/apache/solr/search/facet/AvgAgg.java b/solr/core/src/java/org/apache/solr/search/facet/AvgAgg.javaindex 7036c302771..61617a99e9e 100644--- a/solr/core/src/java/org/apache/solr/search/facet/AvgAgg.java+++ b/solr/core/src/java/org/apache/solr/search/facet/AvgAgg.java@@ -115,10 +115,9 @@ public class AvgAgg extends SimpleAggValueSource {}@Override- @SuppressWarnings({"unchecked", "rawtypes"})public Object getValue(int slot) {if (fcontext.isShard()) {- ArrayList lst = new ArrayList(2);+ ArrayList<Number> lst = new ArrayList<>(2);lst.add(counts[slot]);lst.add(result[slot]);return lst;@@ -170,10 +169,9 @@ public class AvgAgg extends SimpleAggValueSource {}@Override- @SuppressWarnings({"unchecked", "rawtypes"})public Object getValue(int slot) {if (fcontext.isShard()) {- ArrayList lst = new ArrayList(2);+ ArrayList<Number> lst = new ArrayList<>(2);lst.add(counts[slot]);lst.add(result[slot]);return lst;@@ -227,10 +225,9 @@ public class AvgAgg extends SimpleAggValueSource {}@Override- @SuppressWarnings({"unchecked", "rawtypes"})public Object getValue(int slot) {if (fcontext.isShard()) {- ArrayList lst = new ArrayList(2);+ ArrayList<Number> lst = new ArrayList<>(2);lst.add(counts[slot]);lst.add(result[slot]);return lst;diff --git a/solr/core/src/java/org/apache/solr/search/facet/DocValuesAcc.java b/solr/core/src/java/org/apache/solr/search/facet/DocValuesAcc.javaindex 547040e0112..389157a6111 100644--- a/solr/core/src/java/org/apache/solr/search/facet/DocValuesAcc.java+++ b/solr/core/src/java/org/apache/solr/search/facet/DocValuesAcc.java@@ -224,10 +224,9 @@ public abstract class DocValuesAcc extends SlotAcc {}@Override- @SuppressWarnings({"unchecked", "rawtypes"})public Object getValue(int slot) {if (fcontext.isShard()) {- ArrayList lst = new ArrayList(3);+ ArrayList<Number> lst = new ArrayList<>(3);lst.add(counts[slot]);lst.add(result[slot]);lst.add(sum[slot]);@@ -398,10 +397,9 @@ public abstract class DocValuesAcc extends SlotAcc {}@Override- @SuppressWarnings({"unchecked", "rawtypes"})public Object getValue(int slot) {if (fcontext.isShard()) {- ArrayList lst = new ArrayList(3);+ ArrayList<Number> lst = new ArrayList<>(3);lst.add(counts[slot]);lst.add(result[slot]);lst.add(sum[slot]);diff --git a/solr/core/src/java/org/apache/solr/search/facet/FacetField.java b/solr/core/src/java/org/apache/solr/search/facet/FacetField.javaindex fa1c085dc04..b27c212edde 100644--- a/solr/core/src/java/org/apache/solr/search/facet/FacetField.java+++ b/solr/core/src/java/org/apache/solr/search/facet/FacetField.java@@ -70,8 +70,7 @@ public class FacetField extends FacetRequestSorted {}@Override- @SuppressWarnings("rawtypes")- public FacetProcessor createFacetProcessor(FacetContext fcontext) {+ public FacetProcessor<FacetField> createFacetProcessor(FacetContext fcontext) {SchemaField sf = fcontext.searcher.getSchema().getField(field);FieldType ft = sf.getType();boolean multiToken = sf.multiValued() || ft.multiValuedFieldCache();diff --git a/solr/core/src/java/org/apache/solr/search/facet/FacetHeatmap.java b/solr/core/src/java/org/apache/solr/search/facet/FacetHeatmap.javaindex 4d17df528ad..20cb042f528 100644--- a/solr/core/src/java/org/apache/solr/search/facet/FacetHeatmap.java+++ b/solr/core/src/java/org/apache/solr/search/facet/FacetHeatmap.java@@ -94,8 +94,7 @@ public class FacetHeatmap extends FacetRequest {private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());static class Parser extends FacetParser<FacetHeatmap> {- @SuppressWarnings({"rawtypes"})- Parser(FacetParser parent, String key) {+ Parser(FacetParser<?> parent, String key) {super(parent, key);}@@ -118,9 +117,8 @@ public class FacetHeatmap extends FacetRequest {final DistanceUnits distanceUnits;// note: the two instanceof conditions is not ideal, versus one. If we start needing to add more then refactor.if ((type instanceof AbstractSpatialPrefixTreeFieldType)) {- @SuppressWarnings({"rawtypes"})- AbstractSpatialPrefixTreeFieldType rptType = (AbstractSpatialPrefixTreeFieldType) type;- strategy = (PrefixTreeStrategy) rptType.getStrategy(fieldName);+ AbstractSpatialPrefixTreeFieldType<?> rptType = (AbstractSpatialPrefixTreeFieldType<?>) type;+ strategy = rptType.getStrategy(fieldName);distanceUnits = rptType.getDistanceUnits();} else if (type instanceof RptWithGeometrySpatialField) {RptWithGeometrySpatialField rptSdvType = (RptWithGeometrySpatialField) type;@@ -206,21 +204,17 @@ public class FacetHeatmap extends FacetRequest {}@Override- @SuppressWarnings({"rawtypes"})- public FacetProcessor createFacetProcessor(FacetContext fcontext) {+ public FacetProcessor<FacetHeatmap> createFacetProcessor(FacetContext fcontext) {return new FacetHeatmapProcessor(fcontext);}// don't use an anonymous class since the getSimpleName() isn't friendly in debug output- @SuppressWarnings({"rawtypes"})- private class FacetHeatmapProcessor extends FacetProcessor {- @SuppressWarnings({"unchecked"})+ private class FacetHeatmapProcessor extends FacetProcessor<FacetHeatmap> {public FacetHeatmapProcessor(FacetContext fcontext) {super(fcontext, FacetHeatmap.this);}@Override- @SuppressWarnings({"unchecked"})public void process() throws IOException {super.process(); // handles domain changesdiff --git a/solr/core/src/java/org/apache/solr/search/facet/FacetParser.java b/solr/core/src/java/org/apache/solr/search/facet/FacetParser.javaindex 393dc59791a..d6cdd057b99 100644--- a/solr/core/src/java/org/apache/solr/search/facet/FacetParser.java+++ b/solr/core/src/java/org/apache/solr/search/facet/FacetParser.java@@ -34,8 +34,8 @@ import org.apache.solr.search.SyntaxError;import static org.apache.solr.common.params.CommonParams.SORT;-abstract class FacetParser<FacetRequestT extends FacetRequest> {- protected FacetRequestT facet;+abstract class FacetParser<T extends FacetRequest> {+ protected T facet;protected FacetParser<?> parent;protected String key;@@ -448,7 +448,7 @@ abstract class FacetParser<FacetRequestT extends FacetRequest> {}static class FacetQueryParser extends FacetParser<FacetQuery> {- public FacetQueryParser(@SuppressWarnings("rawtypes") FacetParser parent, String key) {+ public FacetQueryParser(FacetParser<?> parent, String key) {super(parent, key);facet = new FacetQuery();}@@ -518,8 +518,7 @@ abstract class FacetParser<FacetRequestT extends FacetRequest> {***/static class FacetFieldParser extends FacetParser<FacetField> {- @SuppressWarnings({"rawtypes"})- public FacetFieldParser(FacetParser parent, String key) {+ public FacetFieldParser(FacetParser<?> parent, String key) {super(parent, key);facet = new FacetField();}diff --git a/solr/core/src/java/org/apache/solr/search/facet/FacetProcessor.java b/solr/core/src/java/org/apache/solr/search/facet/FacetProcessor.javaindex 9170e2488f5..c7e8616c386 100644--- a/solr/core/src/java/org/apache/solr/search/facet/FacetProcessor.java+++ b/solr/core/src/java/org/apache/solr/search/facet/FacetProcessor.java@@ -45,17 +45,18 @@ import org.apache.solr.search.SyntaxError;import org.apache.solr.search.facet.SlotAcc.SlotContext;/** Base abstraction for a class that computes facets. This is fairly internal to the module. */-public abstract class FacetProcessor<FacetRequestT extends FacetRequest> {+public abstract class FacetProcessor<T extends FacetRequest> {SimpleOrderedMap<Object> response;FacetContext fcontext;- FacetRequestT freq;+ // TODO : I'm not sure this needs to be generic but come back to this later+ T freq;DocSet filter; // additional filters specified by "filter" // TODO: do these need to be on the context to support recomputing during multi-select?LinkedHashMap<String,SlotAcc> accMap;SlotAcc[] accs;SlotAcc.CountSlotAcc countAcc;- FacetProcessor(FacetContext fcontext, FacetRequestT freq) {+ FacetProcessor(FacetContext fcontext, T freq) {this.fcontext = fcontext;this.freq = freq;fcontext.processor = this;@@ -182,8 +183,7 @@ public abstract class FacetProcessor<FacetRequestT extends FacetRequest> {return;}- @SuppressWarnings({"rawtypes"})- Map tagMap = (Map) fcontext.req.getContext().get("tags");+ Map<?,?> tagMap = (Map<?,?>) fcontext.req.getContext().get("tags");if (tagMap == null) {// no filters were taggedreturn;diff --git a/solr/core/src/java/org/apache/solr/search/facet/FacetQuery.java b/solr/core/src/java/org/apache/solr/search/facet/FacetQuery.javaindex 43657762b0b..4d38dafd22a 100644--- a/solr/core/src/java/org/apache/solr/search/facet/FacetQuery.java+++ b/solr/core/src/java/org/apache/solr/search/facet/FacetQuery.java@@ -27,9 +27,8 @@ public class FacetQuery extends FacetRequest {// query string or query?Query q;- @SuppressWarnings("rawtypes")@Override- public FacetProcessor createFacetProcessor(FacetContext fcontext) {+ public FacetProcessor<FacetQuery> createFacetProcessor(FacetContext fcontext) {return new FacetQueryProcessor(fcontext, this);}diff --git a/solr/core/src/java/org/apache/solr/search/facet/FacetRange.java b/solr/core/src/java/org/apache/solr/search/facet/FacetRange.javaindex a3b894915b8..31b4ec8e465 100644--- a/solr/core/src/java/org/apache/solr/search/facet/FacetRange.java+++ b/solr/core/src/java/org/apache/solr/search/facet/FacetRange.java@@ -41,8 +41,7 @@ public class FacetRange extends FacetRequestSorted {}@Override- @SuppressWarnings({"rawtypes"})- public FacetProcessor createFacetProcessor(FacetContext fcontext) {+ public FacetProcessor<FacetRange> createFacetProcessor(FacetContext fcontext) {return new FacetRangeProcessor(fcontext, this);}diff --git a/solr/core/src/java/org/apache/solr/search/facet/FacetRequest.java b/solr/core/src/java/org/apache/solr/search/facet/FacetRequest.javaindex 8aeb95949b9..b67f536921b 100644--- a/solr/core/src/java/org/apache/solr/search/facet/FacetRequest.java+++ b/solr/core/src/java/org/apache/solr/search/facet/FacetRequest.java@@ -314,8 +314,7 @@ public abstract class FacetRequest {* @param params a typed parameter structure (unlike SolrParams which are all string values).*/public static FacetRequest parse(SolrQueryRequest req, Map<String, Object> params) {- @SuppressWarnings({"rawtypes"})- FacetParser parser = new FacetParser.FacetTopParser(req);+ FacetParser<?> parser = new FacetParser.FacetTopParser(req);try {return parser.parse(params);} catch (SyntaxError syntaxError) {@@ -419,8 +418,7 @@ public abstract class FacetRequest {/** Process the request with the facet context settings, a parameter-object. */final Object process(FacetContext fcontext) throws IOException {- @SuppressWarnings("rawtypes")- FacetProcessor facetProcessor = createFacetProcessor(fcontext);+ FacetProcessor<?> facetProcessor = createFacetProcessor(fcontext);FacetDebugInfo debugInfo = fcontext.getDebugInfo();if (debugInfo == null) {@@ -443,8 +441,7 @@ public abstract class FacetRequest {return facetProcessor.getResponse();}- @SuppressWarnings("rawtypes")- public abstract FacetProcessor createFacetProcessor(FacetContext fcontext);+ public abstract FacetProcessor<? extends FacetRequest> createFacetProcessor(FacetContext fcontext);public abstract FacetMerger createFacetMerger(Object prototype);diff --git a/solr/core/src/java/org/apache/solr/search/facet/HLLAgg.java b/solr/core/src/java/org/apache/solr/search/facet/HLLAgg.javaindex 665bdd95604..5d627d19244 100644--- a/solr/core/src/java/org/apache/solr/search/facet/HLLAgg.java+++ b/solr/core/src/java/org/apache/solr/search/facet/HLLAgg.java@@ -86,10 +86,7 @@ public class HLLAgg extends StrAggValueSource {return;}--- @SuppressWarnings({"rawtypes"})- SimpleOrderedMap map = (SimpleOrderedMap)facetResult;+ SimpleOrderedMap<?> map = (SimpleOrderedMap<?>)facetResult;byte[] serialized = ((byte[])map.get("hll"));HLL subHLL = HLL.fromBytes(serialized);if (aggregate == null) {@@ -163,11 +160,10 @@ public class HLLAgg extends StrAggValueSource {return set == null ? 0 : set.cardinality();}- @SuppressWarnings({"unchecked", "rawtypes"})public Object getShardValue(int slot) throws IOException {HLL hll = sets[slot];if (hll == null) return NO_VALUES;- SimpleOrderedMap map = new SimpleOrderedMap();+ SimpleOrderedMap<Object> map = new SimpleOrderedMap<>();map.add("hll", hll.toBytes());// optionally use explicit valuesreturn map;diff --git a/solr/core/src/java/org/apache/solr/search/facet/RelatednessAgg.java b/solr/core/src/java/org/apache/solr/search/facet/RelatednessAgg.javaindex 1cf0c325557..c1c8bccf148 100644--- a/solr/core/src/java/org/apache/solr/search/facet/RelatednessAgg.java+++ b/solr/core/src/java/org/apache/solr/search/facet/RelatednessAgg.java@@ -419,9 +419,7 @@ public class RelatednessAgg extends AggValueSource {slotVal.incSizes(fgSize, bgSize);}- @SuppressWarnings({"rawtypes"})- SimpleOrderedMap res = slotVal.externalize(fcontext.isShard());- return res;+ return slotVal.externalize(fcontext.isShard());}@Override@@ -594,9 +592,8 @@ public class RelatednessAgg extends AggValueSource {* @see Merger#getMergedResult*/- @SuppressWarnings({"unchecked", "rawtypes"})- public SimpleOrderedMap externalize(final boolean isShardRequest) {- SimpleOrderedMap result = new SimpleOrderedMap<Number>();+ public SimpleOrderedMap<Object> externalize(final boolean isShardRequest) {+ SimpleOrderedMap<Object> result = new SimpleOrderedMap<>();// if counts are non-zero, then this bucket must not be impliedassert 0 == fg_count || ! implied : "Implied bucket has non-zero fg_count";diff --git a/solr/core/src/java/org/apache/solr/search/facet/UnInvertedField.java b/solr/core/src/java/org/apache/solr/search/facet/UnInvertedField.javaindex ad83c8a7560..a044c8fad15 100644--- a/solr/core/src/java/org/apache/solr/search/facet/UnInvertedField.java+++ b/solr/core/src/java/org/apache/solr/search/facet/UnInvertedField.java@@ -682,15 +682,16 @@ public class UnInvertedField extends DocTermOrds {}// Returns null if not already populated- @SuppressWarnings({"rawtypes", "unchecked"})public static UnInvertedField checkUnInvertedField(String field, SolrIndexSearcher searcher) throws IOException {- SolrCache cache = searcher.getFieldValueCache();+ SolrCache<String, UnInvertedField> cache = searcher.getFieldValueCache();if (cache == null) {return null;}Object uif = cache.get(field); // cache is already synchronized, so no extra sync needed// placeholder is an implementation detail, keep it hidden and return null if that is what we gotreturn uif==uifPlaceholder || !(uif instanceof UnInvertedField)? null : (UnInvertedField) uif;+ // TODO: SolrCache is not used safely in other places, but this might be simpligfied to:+ // return uif==uifPlaceholder ? null : uif;}}diff --git a/solr/core/src/java/org/apache/solr/search/facet/UnInvertedFieldAcc.java b/solr/core/src/java/org/apache/solr/search/facet/UnInvertedFieldAcc.javaindex 209677340b2..c681c0fad66 100644--- a/solr/core/src/java/org/apache/solr/search/facet/UnInvertedFieldAcc.java+++ b/solr/core/src/java/org/apache/solr/search/facet/UnInvertedFieldAcc.java@@ -131,10 +131,9 @@ public abstract class UnInvertedFieldAcc extends SlotAcc implements UnInvertedFi}@Override- @SuppressWarnings({"unchecked", "rawtypes"})public Object getValue(int slot) {if (fcontext.isShard()) {- ArrayList lst = new ArrayList(3);+ ArrayList<Number> lst = new ArrayList<>(3);lst.add(counts[slot]);lst.add(result[slot]);lst.add(sum[slot]);diff --git a/solr/core/src/java/org/apache/solr/search/facet/UniqueAgg.java b/solr/core/src/java/org/apache/solr/search/facet/UniqueAgg.javaindex 7f476d6ef8b..4d21baed3f3 100644--- a/solr/core/src/java/org/apache/solr/search/facet/UniqueAgg.java+++ b/solr/core/src/java/org/apache/solr/search/facet/UniqueAgg.java@@ -75,14 +75,14 @@ public class UniqueAgg extends StrAggValueSource {long shardsMissingMax;@Override- @SuppressWarnings({"unchecked", "rawtypes"})public void merge(Object facetResult, Context mcontext) {- SimpleOrderedMap map = (SimpleOrderedMap)facetResult;+ SimpleOrderedMap<?> map = (SimpleOrderedMap<?>)facetResult;long unique = ((Number)map.get(UNIQUE)).longValue();sumUnique += unique;int valsListed = 0;- List vals = (List) map.get(VALS);+ @SuppressWarnings("unchecked")+ List<?> vals = (List<?>) map.get(VALS);if (vals != null) {if (values == null) {values = new HashSet<>(vals.size()*4);@@ -178,19 +178,18 @@ public class UniqueAgg extends StrAggValueSource {return set == null ? 0 : set.cardinality();}- @SuppressWarnings({"unchecked", "rawtypes"})public Object getShardValue(int slot) throws IOException {LongSet set = sets[slot];int unique = getCardinality(slot);- SimpleOrderedMap map = new SimpleOrderedMap();+ SimpleOrderedMap<Object> map = new SimpleOrderedMap<>();map.add(UNIQUE, unique);int maxExplicit=100;// TODO: make configurable// TODO: share values across bucketsif (unique <= maxExplicit) {- List lst = new ArrayList( Math.min(unique, maxExplicit) );+ List<Long> lst = new ArrayList<>( Math.min(unique, maxExplicit) );if (set != null) {LongIterator iter = set.iterator();while (iter.hasNext()) {diff --git a/solr/core/src/java/org/apache/solr/search/function/FileFloatSource.java b/solr/core/src/java/org/apache/solr/search/function/FileFloatSource.javaindex 8ce7401a970..19ae494828e 100644--- a/solr/core/src/java/org/apache/solr/search/function/FileFloatSource.java+++ b/solr/core/src/java/org/apache/solr/search/function/FileFloatSource.java@@ -165,32 +165,23 @@ public class FileFloatSource extends ValueSource {/** Internal cache. (from lucene FieldCache) */abstract static class Cache {- @SuppressWarnings({"rawtypes"})- private final Map readerCache = new WeakHashMap();+ private final Map<IndexReader, Map<Object, Object>> readerCache = new WeakHashMap<>();protected abstract Object createValue(IndexReader reader, Object key);- @SuppressWarnings({"unchecked"})public void refresh(IndexReader reader, Object key) {Object refreshedValues = createValue(reader, key);synchronized (readerCache) {- @SuppressWarnings({"rawtypes"})- Map innerCache = (Map) readerCache.get(reader);- if (innerCache == null) {- innerCache = new HashMap<>();- readerCache.put(reader, innerCache);- }+ Map<Object, Object> innerCache = readerCache.computeIfAbsent(reader, k -> new HashMap<>());innerCache.put(key, refreshedValues);}}- @SuppressWarnings({"unchecked"})public Object get(IndexReader reader, Object key) {- @SuppressWarnings({"rawtypes"})- Map innerCache;+ Map<Object, Object> innerCache;Object value;synchronized (readerCache) {- innerCache = (Map) readerCache.get(reader);+ innerCache = readerCache.get(reader);if (innerCache == null) {innerCache = new HashMap<>();readerCache.put(reader, innerCache);diff --git a/solr/core/src/java/org/apache/solr/search/function/ValueSourceRangeFilter.java b/solr/core/src/java/org/apache/solr/search/function/ValueSourceRangeFilter.javaindex 2354dc63867..67cbd23fd81 100644--- a/solr/core/src/java/org/apache/solr/search/function/ValueSourceRangeFilter.java+++ b/solr/core/src/java/org/apache/solr/search/function/ValueSourceRangeFilter.java@@ -78,15 +78,13 @@ public class ValueSourceRangeFilter extends SolrFilter {@Override- @SuppressWarnings({"rawtypes"})- public DocIdSet getDocIdSet(final Map context, final LeafReaderContext readerContext, Bits acceptDocs) throws IOException {+ public DocIdSet getDocIdSet(final Map<Object, Object> context, final LeafReaderContext readerContext, Bits acceptDocs) throws IOException {// NB the IndexSearcher parameter here can be null because Filter Weights don't// actually use it.Weight weight = createWeight(null, ScoreMode.COMPLETE, 1);return BitsFilteredDocIdSet.wrap(new DocIdSet() {@Overridepublic DocIdSetIterator iterator() throws IOException {- @SuppressWarnings({"unchecked"})Scorer scorer = valueSource.getValues(context, readerContext).getRangeScorer(weight, readerContext, lowerVal, upperVal, includeLower, includeUpper);return scorer == null ? null : scorer.iterator();}@@ -103,8 +101,7 @@ public class ValueSourceRangeFilter extends SolrFilter {}@Override- @SuppressWarnings({"unchecked"})- public void createWeight(@SuppressWarnings({"rawtypes"})Map context, IndexSearcher searcher) throws IOException {+ public void createWeight(Map<Object, Object> context, IndexSearcher searcher) throws IOException {valueSource.createWeight(context, searcher);}diff --git a/solr/core/src/java/org/apache/solr/search/grouping/CommandHandler.java b/solr/core/src/java/org/apache/solr/search/grouping/CommandHandler.javaindex f2694e7217d..7517db1c523 100644--- a/solr/core/src/java/org/apache/solr/search/grouping/CommandHandler.java+++ b/solr/core/src/java/org/apache/solr/search/grouping/CommandHandler.java@@ -59,8 +59,7 @@ public class CommandHandler {public static class Builder {private QueryCommand queryCommand;- @SuppressWarnings({"rawtypes"})- private List<Command> commands = new ArrayList<>();+ private List<Command<?>> commands = new ArrayList<>();private SolrIndexSearcher searcher;private boolean needDocSet = false;private boolean truncateGroups = false;@@ -72,7 +71,7 @@ public class CommandHandler {return this;}- public Builder addCommandField(@SuppressWarnings({"rawtypes"})Command commandField) {+ public Builder addCommandField(Command<?> commandField) {commands.add(commandField);return this;}@@ -117,8 +116,7 @@ public class CommandHandler {private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());private final QueryCommand queryCommand;- @SuppressWarnings({"rawtypes"})- private final List<Command> commands;+ private final List<Command<?>> commands;private final SolrIndexSearcher searcher;private final boolean needDocset;private final boolean truncateGroups;@@ -129,7 +127,7 @@ public class CommandHandler {private DocSet docSet;private CommandHandler(QueryCommand queryCommand,- @SuppressWarnings({"rawtypes"})List<Command> commands,+ List<Command<?>> commands,SolrIndexSearcher searcher,boolean needDocset,boolean truncateGroups,@@ -142,11 +140,10 @@ public class CommandHandler {this.includeHitCount = includeHitCount;}- @SuppressWarnings("unchecked")public void execute() throws IOException {final int nrOfCommands = commands.size();List<Collector> collectors = new ArrayList<>(nrOfCommands);- for (@SuppressWarnings({"rawtypes"})Command command : commands) {+ for (Command<?> command : commands) {collectors.addAll(command.create());}@@ -164,20 +161,18 @@ public class CommandHandler {searchWithTimeLimiter(query, filter, null);}- for (@SuppressWarnings({"rawtypes"})Command command : commands) {+ for (Command<?> command : commands) {command.postCollect(searcher);}}private DocSet computeGroupedDocSet(Query query, ProcessedFilter filter, List<Collector> collectors) throws IOException {- @SuppressWarnings({"rawtypes"})- Command firstCommand = commands.get(0);+ Command<?> firstCommand = commands.get(0);String field = firstCommand.getKey();SchemaField sf = searcher.getSchema().getField(field);FieldType fieldType = sf.getType();- @SuppressWarnings({"rawtypes"})- final AllGroupHeadsCollector allGroupHeadsCollector;+ final AllGroupHeadsCollector<?> allGroupHeadsCollector;if (fieldType.getNumberType() != null) {ValueSource vs = fieldType.getValueSource(sf, null);allGroupHeadsCollector = AllGroupHeadsCollector.newCollector(new ValueSourceGroupSelector(vs, new HashMap<>()),@@ -205,8 +200,7 @@ public class CommandHandler {return DocSetUtil.getDocSet( docSetCollector, searcher );}- @SuppressWarnings({"unchecked", "rawtypes"})- public NamedList processResult(QueryResult queryResult, ShardResultTransformer transformer) throws IOException {+ public NamedList<NamedList<Object>> processResult(QueryResult queryResult, ShardResultTransformer<List<Command<?>>, ?> transformer) throws IOException {if (docSet != null) {queryResult.setDocSet(docSet);}diff --git a/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/GroupConverter.java b/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/GroupConverter.javaindex f02a42dd282..ba262a66d89 100644--- a/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/GroupConverter.java+++ b/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/GroupConverter.java@@ -16,6 +16,7 @@*/package org.apache.solr.search.grouping.distributed.command;+import java.lang.reflect.Array;import java.util.ArrayList;import java.util.Collection;import java.util.Date;@@ -133,7 +134,6 @@ class GroupConverter {return result;}- @SuppressWarnings({"unchecked", "rawtypes"})static TopGroups<BytesRef> fromMutable(SchemaField field, TopGroups<MutableValue> values) {if (values == null) {return null;@@ -141,7 +141,8 @@ class GroupConverter {FieldType fieldType = field.getType();- GroupDocs<BytesRef> groupDocs[] = new GroupDocs[values.groups.length];+ @SuppressWarnings("unchecked")+ GroupDocs<BytesRef>[] groupDocs = (GroupDocs<BytesRef>[]) Array.newInstance(GroupDocs.class, values.groups.length);for (int i = 0; i < values.groups.length; i++) {GroupDocs<MutableValue> original = values.groups[i];diff --git a/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/QueryCommand.java b/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/QueryCommand.javaindex 7c7362b69d7..9bcb2f73394 100644--- a/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/QueryCommand.java+++ b/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/QueryCommand.java@@ -138,8 +138,7 @@ public class QueryCommand implements Command<QueryCommandResult> {private final String queryString;private final Query mainQuery;- @SuppressWarnings({"rawtypes"})- private TopDocsCollector topDocsCollector;+ private TopDocsCollector<?> topDocsCollector;private FilterCollector filterCollector;private MaxScoreCollector maxScoreCollector;private TopDocs topDocs;@@ -175,7 +174,7 @@ public class QueryCommand implements Command<QueryCommandResult> {}}filterCollector = new FilterCollector(docSet, subCollector);- return Arrays.asList((Collector) filterCollector);+ return Arrays.asList(filterCollector);}@Overridediff --git a/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/SearchGroupsFieldCommand.java b/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/SearchGroupsFieldCommand.javaindex 1dad199e46c..db59aed58a2 100644--- a/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/SearchGroupsFieldCommand.java+++ b/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/SearchGroupsFieldCommand.java@@ -85,8 +85,7 @@ public class SearchGroupsFieldCommand implements Command<SearchGroupsFieldComman@SuppressWarnings({"rawtypes"})private FirstPassGroupingCollector firstPassGroupingCollector;- @SuppressWarnings({"rawtypes"})- private AllGroupsCollector allGroupsCollector;+ private AllGroupsCollector<?> allGroupsCollector;private SearchGroupsFieldCommand(SchemaField field, Sort groupSort, int topNGroups, boolean includeGroupCount) {this.field = field;@@ -102,6 +101,7 @@ public class SearchGroupsFieldCommand implements Command<SearchGroupsFieldCommanif (topNGroups > 0) {if (fieldType.getNumberType() != null) {ValueSource vs = fieldType.getValueSource(field, null);+ // TODO: Maybe create a GroupSelector implementation that takes a value source and a field but produces a BytesReffirstPassGroupingCollector= new FirstPassGroupingCollector<>(new ValueSourceGroupSelector(vs, new HashMap<>()), groupSort, topNGroups);} else {diff --git a/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/SearchGroupShardResponseProcessor.java b/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/SearchGroupShardResponseProcessor.javaindex c3ced664173..94942637481 100644--- a/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/SearchGroupShardResponseProcessor.java+++ b/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/SearchGroupShardResponseProcessor.java@@ -105,8 +105,7 @@ public class SearchGroupShardResponseProcessor implements ShardResponseProcessorcontinue; // continue if there was an error and we're tolerant.}maxElapsedTime = (int) Math.max(maxElapsedTime, srsp.getSolrResponse().getElapsedTime());- @SuppressWarnings({"rawtypes"})- NamedList<NamedList> firstPhaseResult = (NamedList<NamedList>) srsp.getSolrResponse().getResponse().get("firstPhase");+ NamedList<NamedList<?>> firstPhaseResult = (NamedList<NamedList<?>>) srsp.getSolrResponse().getResponse().get("firstPhase");final Map<String, SearchGroupsFieldCommandResult> result = serializer.transformToNative(firstPhaseResult, groupSort, withinGroupSort, srsp.getShard());for (Map.Entry<String, List<Collection<SearchGroup<BytesRef>>>> entry : commandSearchGroups.entrySet()) {String field = entry.getKey();diff --git a/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/TopGroupsShardResponseProcessor.java b/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/TopGroupsShardResponseProcessor.javaindex 5e84980d60d..03d8bc013f0 100644--- a/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/TopGroupsShardResponseProcessor.java+++ b/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/TopGroupsShardResponseProcessor.java@@ -119,8 +119,7 @@ public class TopGroupsShardResponseProcessor implements ShardResponseProcessor {rb.rsp.getResponseHeader().asShallowMap().put(SolrQueryResponse.RESPONSE_HEADER_PARTIAL_RESULTS_KEY, Boolean.TRUE);continue; // continue if there was an error and we're tolerant.}- @SuppressWarnings({"rawtypes"})- NamedList<NamedList> secondPhaseResult = (NamedList<NamedList>) srsp.getSolrResponse().getResponse().get("secondPhase");+ NamedList<NamedList<?>> secondPhaseResult = (NamedList<NamedList<?>>) srsp.getSolrResponse().getResponse().get("secondPhase");if(secondPhaseResult == null)continue;Map<String, ?> result = serializer.transformToNative(secondPhaseResult, groupSort, withinGroupSort, srsp.getShard());diff --git a/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/SearchGroupsResultTransformer.java b/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/SearchGroupsResultTransformer.javaindex 0ecc3c4df0b..960f3f77da7 100644--- a/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/SearchGroupsResultTransformer.java+++ b/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/SearchGroupsResultTransformer.java@@ -35,8 +35,7 @@ import java.util.*;/*** Implementation for transforming {@link SearchGroup} into a {@link NamedList} structure and visa versa.*/-@SuppressWarnings({"rawtypes"})-public class SearchGroupsResultTransformer implements ShardResultTransformer<List<Command>, Map<String, SearchGroupsFieldCommandResult>> {+public class SearchGroupsResultTransformer implements ShardResultTransformer<List<Command<?>>, Map<String, SearchGroupsFieldCommandResult>> {private static final String TOP_GROUPS = "topGroups";private static final String GROUP_COUNT = "groupCount";@@ -48,12 +47,11 @@ public class SearchGroupsResultTransformer implements ShardResultTransformer<Lis}@Override- @SuppressWarnings({"rawtypes"})- public NamedList transform(List<Command> data) throws IOException {- final NamedList<NamedList> result = new NamedList<>(data.size());- for (Command command : data) {+ public NamedList<NamedList<Object>> transform(List<Command<?>> data) throws IOException {+ final NamedList<NamedList<Object>> result = new NamedList<>(data.size());+ for (Command<?> command : data) {final NamedList<Object> commandResult = new NamedList<>(2);- if (SearchGroupsFieldCommand.class.isInstance(command)) {+ if (command instanceof SearchGroupsFieldCommand) {SearchGroupsFieldCommand fieldCommand = (SearchGroupsFieldCommand) command;final SearchGroupsFieldCommandResult fieldCommandResult = fieldCommand.result();final Collection<SearchGroup<BytesRef>> searchGroups = fieldCommandResult.getSearchGroups();@@ -97,11 +95,11 @@ public class SearchGroupsResultTransformer implements ShardResultTransformer<Lis@Override@SuppressWarnings({"rawtypes"})- public Map<String, SearchGroupsFieldCommandResult> transformToNative(NamedList<NamedList> shardResponse, Sort groupSort, Sort withinGroupSort, String shard) {+ public Map<String, SearchGroupsFieldCommandResult> transformToNative(NamedList<NamedList<?>> shardResponse, Sort groupSort, Sort withinGroupSort, String shard) {final Map<String, SearchGroupsFieldCommandResult> result = new HashMap<>(shardResponse.size());- for (Map.Entry<String, NamedList> command : shardResponse) {+ for (Map.Entry<String, NamedList<?>> command : shardResponse) {List<SearchGroup<BytesRef>> searchGroups = new ArrayList<>();- NamedList topGroupsAndGroupCount = command.getValue();+ NamedList<?> topGroupsAndGroupCount = command.getValue();@SuppressWarnings({"unchecked"})final NamedList<List<Comparable>> rawSearchGroups = (NamedList<List<Comparable>>) topGroupsAndGroupCount.get(TOP_GROUPS);if (rawSearchGroups != null) {@@ -132,8 +130,7 @@ public class SearchGroupsResultTransformer implements ShardResultTransformer<Lisreturn convertedSortValues;}- @SuppressWarnings({"rawtypes"})- private NamedList serializeSearchGroup(Collection<SearchGroup<BytesRef>> data, SearchGroupsFieldCommand command) {+ private NamedList<Object[]> serializeSearchGroup(Collection<SearchGroup<BytesRef>> data, SearchGroupsFieldCommand command) {final NamedList<Object[]> result = new NamedList<>(data.size());SortField[] groupSortField = command.getGroupSort().getSort();diff --git a/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/ShardResultTransformer.java b/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/ShardResultTransformer.javaindex e604b1f51ca..7b00faea214 100644--- a/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/ShardResultTransformer.java+++ b/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/ShardResultTransformer.java@@ -37,8 +37,7 @@ public interface ShardResultTransformer<T, R> {* @return {@link NamedList} structure* @throws IOException If I/O related errors occur during transforming*/- @SuppressWarnings({"rawtypes"})- NamedList transform(T data) throws IOException;+ NamedList<NamedList<Object>> transform(T data) throws IOException;/*** Transforms the specified shard response into native structures.@@ -49,7 +48,6 @@ public interface ShardResultTransformer<T, R> {* @param shard The shard address where the response originated from* @return native structure of the data*/- @SuppressWarnings({"rawtypes"})- R transformToNative(NamedList<NamedList> shardResponse, Sort groupSort, Sort withinGroupSort, String shard);+ R transformToNative(NamedList<NamedList<?>> shardResponse, Sort groupSort, Sort withinGroupSort, String shard);}diff --git a/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/TopGroupsResultTransformer.java b/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/TopGroupsResultTransformer.javaindex 047c31ed3d7..27c18b00ab1 100644--- a/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/TopGroupsResultTransformer.java+++ b/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/TopGroupsResultTransformer.java@@ -18,6 +18,7 @@ package org.apache.solr.search.grouping.distributed.shardresultserializer;import java.io.IOException;import java.lang.invoke.MethodHandles;+import java.lang.reflect.Array;import java.util.ArrayList;import java.util.Collections;import java.util.HashMap;@@ -54,8 +55,7 @@ import static org.apache.solr.common.params.CommonParams.ID;* Implementation for transforming {@link TopGroups} and {@link TopDocs} into a {@link NamedList} structure and* vice versa.*/-@SuppressWarnings({"rawtypes"})-public class TopGroupsResultTransformer implements ShardResultTransformer<List<Command>, Map<String, ?>> {+public class TopGroupsResultTransformer implements ShardResultTransformer<List<Command<?>>, Map<String, ?>> {private final ResponseBuilder rb;@@ -66,16 +66,16 @@ public class TopGroupsResultTransformer implements ShardResultTransformer<List<C}@Override- public NamedList transform(List<Command> data) throws IOException {- NamedList<NamedList> result = new NamedList<>();+ public NamedList<NamedList<Object>> transform(List<Command<?>> data) throws IOException {+ NamedList<NamedList<Object>> result = new NamedList<>();final IndexSchema schema = rb.req.getSearcher().getSchema();- for (Command command : data) {- NamedList commandResult;- if (TopGroupsFieldCommand.class.isInstance(command)) {+ for (Command<?> command : data) {+ NamedList<Object> commandResult;+ if (command instanceof TopGroupsFieldCommand) {TopGroupsFieldCommand fieldCommand = (TopGroupsFieldCommand) command;SchemaField groupField = schema.getField(fieldCommand.getKey());commandResult = serializeTopGroups(fieldCommand.result(), groupField);- } else if (QueryCommand.class.isInstance(command)) {+ } else if (command instanceof QueryCommand) {QueryCommand queryCommand = (QueryCommand) command;commandResult = serializeTopDocs(queryCommand.result());} else {@@ -88,14 +88,14 @@ public class TopGroupsResultTransformer implements ShardResultTransformer<List<C}@Override- public Map<String, ?> transformToNative(NamedList<NamedList> shardResponse, Sort groupSort, Sort withinGroupSort, String shard) {+ public Map<String, ?> transformToNative(NamedList<NamedList<?>> shardResponse, Sort groupSort, Sort withinGroupSort, String shard) {Map<String, Object> result = new HashMap<>();final IndexSchema schema = rb.req.getSearcher().getSchema();- for (Map.Entry<String, NamedList> entry : shardResponse) {+ for (Map.Entry<String, NamedList<?>> entry : shardResponse) {String key = entry.getKey();- NamedList commandResult = entry.getValue();+ NamedList<?> commandResult = entry.getValue();Integer totalGroupedHitCount = (Integer) commandResult.get("totalGroupedHitCount");Number totalHits = (Number) commandResult.get("totalHits"); // previously Integer now Longif (totalHits != null) {@@ -139,8 +139,7 @@ public class TopGroupsResultTransformer implements ShardResultTransformer<List<CgroupDocs.add(new GroupDocs<>(Float.NaN, maxScore, new TotalHits(totalGroupHits.longValue(), TotalHits.Relation.EQUAL_TO), scoreDocs, groupValueRef, null));}- @SuppressWarnings({"unchecked"})- GroupDocs<BytesRef>[] groupDocsArr = groupDocs.toArray(new GroupDocs[groupDocs.size()]);+ GroupDocs<BytesRef>[] groupDocsArr = groupDocs.toArray(newGroupDocsArray(groupDocs.size()));TopGroups<BytesRef> topGroups = new TopGroups<>(groupSort.getSort(), withinGroupSort.getSort(), totalHitCount, totalGroupedHitCount, groupDocsArr, Float.NaN);@@ -151,6 +150,11 @@ public class TopGroupsResultTransformer implements ShardResultTransformer<List<Creturn result;}+ @SuppressWarnings("unchecked")+ private static GroupDocs<BytesRef>[] newGroupDocsArray(int size) {+ return (GroupDocs<BytesRef>[]) Array.newInstance(GroupDocs.class, size);+ }+protected ScoreDoc[] transformToNativeShardDoc(List<NamedList<Object>> documents, Sort groupSort, String shard,IndexSchema schema) {ScoreDoc[] scoreDocs = new ScoreDoc[documents.size()];@@ -169,7 +173,7 @@ public class TopGroupsResultTransformer implements ShardResultTransformer<List<CObject[] sortValues = null;Object sortValuesVal = document.get("sortValues");if (sortValuesVal != null) {- sortValues = ((List) sortValuesVal).toArray();+ sortValues = ((List<?>) sortValuesVal).toArray();for (int k = 0; k < sortValues.length; k++) {SchemaField field = groupSort.getSort()[k].getField() != null? schema.getFieldOrNull(groupSort.getSort()[k].getField()) : null;@@ -183,7 +187,7 @@ public class TopGroupsResultTransformer implements ShardResultTransformer<List<Creturn scoreDocs;}- protected NamedList serializeTopGroups(TopGroups<BytesRef> data, SchemaField groupField) throws IOException {+ protected NamedList<Object> serializeTopGroups(TopGroups<BytesRef> data, SchemaField groupField) throws IOException {NamedList<Object> result = new NamedList<>();result.add("totalGroupedHitCount", data.totalGroupedHitCount);result.add("totalHitCount", data.totalHitCount);@@ -240,7 +244,7 @@ public class TopGroupsResultTransformer implements ShardResultTransformer<List<Creturn result;}- protected NamedList serializeTopDocs(QueryCommandResult result) throws IOException {+ protected NamedList<Object> serializeTopDocs(QueryCommandResult result) throws IOException {NamedList<Object> queryResult = new NamedList<>();queryResult.add("matches", result.getMatches());TopDocs topDocs = result.getTopDocs();@@ -250,7 +254,7 @@ public class TopGroupsResultTransformer implements ShardResultTransformer<List<Cif (!Float.isNaN(result.getMaxScore())) {queryResult.add("maxScore", result.getMaxScore());}- List<NamedList> documents = new ArrayList<>();+ List<NamedList<?>> documents = new ArrayList<>();queryResult.add("documents", documents);final IndexSchema schema = rb.req.getSearcher().getSchema();@@ -264,7 +268,7 @@ public class TopGroupsResultTransformer implements ShardResultTransformer<List<Cif (!Float.isNaN(scoreDoc.score)) {document.add("score", scoreDoc.score);}- if (!FieldDoc.class.isInstance(scoreDoc)) {+ if (!(scoreDoc instanceof FieldDoc)) {continue; // thus don't add sortValues below}diff --git a/solr/core/src/java/org/apache/solr/search/join/FiltersQParser.java b/solr/core/src/java/org/apache/solr/search/join/FiltersQParser.javaindex 851f48b8034..c7d9befaeaa 100644--- a/solr/core/src/java/org/apache/solr/search/join/FiltersQParser.java+++ b/solr/core/src/java/org/apache/solr/search/join/FiltersQParser.java@@ -78,8 +78,7 @@ public class FiltersQParser extends QParser {if (excludeTags != null) {tagsToExclude.addAll(StrUtils.splitSmart(excludeTags, ','));}- @SuppressWarnings("rawtypes")- Map tagMap = (Map) req.getContext().get("tags");+ Map<?, ?> tagMap = (Map<?, ?>) req.getContext().get("tags");final Collection<QParser> excludeSet;if (tagMap != null && !tagMap.isEmpty() && !tagsToExclude.isEmpty()) {excludeSet = excludeSet(tagMap, tagsToExclude);@@ -114,8 +113,7 @@ public class FiltersQParser extends QParser {return clauses;}- private Collection<QParser> excludeSet(@SuppressWarnings("rawtypes")- Map tagMap, Set<String> tagsToExclude) {+ private Collection<QParser> excludeSet(Map<?, ?> tagMap, Set<String> tagsToExclude) {IdentityHashMap<QParser,Boolean> excludeSet = new IdentityHashMap<>();for (String excludeTag : tagsToExclude) {diff --git a/solr/core/src/java/org/apache/solr/search/stats/LRUStatsCache.java b/solr/core/src/java/org/apache/solr/search/stats/LRUStatsCache.javaindex 54780f08e35..4927677d9e8 100644--- a/solr/core/src/java/org/apache/solr/search/stats/LRUStatsCache.java+++ b/solr/core/src/java/org/apache/solr/search/stats/LRUStatsCache.java@@ -185,10 +185,8 @@ public class LRUStatsCache extends ExactStatsCache {protected void addToPerShardTermStats(SolrQueryRequest req, String shard, String termStatsString) {Map<String,TermStats> termStats = StatsUtil.termStatsMapFromString(termStatsString);if (termStats != null) {- @SuppressWarnings({"unchecked"})SolrCache<String,TermStats> cache = perShardTermStats.computeIfAbsent(shard, s -> {- @SuppressWarnings({"rawtypes"})- CaffeineCache c = new CaffeineCache<>();+ CaffeineCache<String, TermStats> c = new CaffeineCache<>();Map<String, String> map = new HashMap<>(lruCacheInitArgs);map.put(CommonParams.NAME, s);c.init(map, null, null);diff --git a/solr/core/src/java/org/apache/solr/security/AutorizationEditOperation.java b/solr/core/src/java/org/apache/solr/security/AutorizationEditOperation.javaindex a080d724b3d..5baa1d1c362 100644--- a/solr/core/src/java/org/apache/solr/security/AutorizationEditOperation.java+++ b/solr/core/src/java/org/apache/solr/security/AutorizationEditOperation.java@@ -30,6 +30,7 @@ import static org.apache.solr.common.util.Utils.getDeepCopy;import static org.apache.solr.handler.admin.SecurityConfHandler.getListValue;import static org.apache.solr.handler.admin.SecurityConfHandler.getMapValue;+// TODO is this a typo - should be Authorization?enum AutorizationEditOperation {SET_USER_ROLE("set-user-role") {@Overridediff --git a/solr/core/src/java/org/apache/solr/security/Permission.java b/solr/core/src/java/org/apache/solr/security/Permission.javaindex 5c47902c6af..d569826e743 100644--- a/solr/core/src/java/org/apache/solr/security/Permission.java+++ b/solr/core/src/java/org/apache/solr/security/Permission.java@@ -41,14 +41,12 @@ class Permission {Set<String> path, role, collections, method;Map<String, Function<String[], Boolean>> params;PermissionNameProvider.Name wellknownName;- @SuppressWarnings({"rawtypes"})- Map originalConfig;+ Map<?, ?> originalConfig;private Permission() {}- @SuppressWarnings({"unchecked", "rawtypes"})- static Permission load(@SuppressWarnings({"rawtypes"})Map m) {+ static Permission load(Map<?, ?> m) {Permission p = new Permission();p.originalConfig = new LinkedHashMap<>(m);String name = (String) m.get(NAME);@@ -71,6 +69,7 @@ class Permission {p.path = readSetSmart(name, m, "path");p.collections = readSetSmart(name, m, "collection");p.method = readSetSmart(name, m, "method");+ @SuppressWarnings("unchecked")Map<String, Object> paramRules = (Map<String, Object>) m.get("params");if (paramRules != null) {p.params = new LinkedHashMap<>();@@ -78,13 +77,12 @@ class Permission {if (e.getValue() == null) {p.params.put(e.getKey(), (String[] val) -> val == null);} else {+ @SuppressWarnings("unchecked")List<String> patternStrs = e.getValue() instanceof List ?(List) e.getValue() :singletonList(e.getValue().toString());- List patterns = patternStrs.stream()- .map(it -> it.startsWith("REGEX:") ?- Pattern.compile(String.valueOf(it.substring("REGEX:".length())))- : it)+ List<?> patterns = patternStrs.stream()+ .map(it -> it.startsWith("REGEX:") ? Pattern.compile(it.substring("REGEX:".length())) : it).collect(Collectors.toList());p.params.put(e.getKey(), val -> {if (val == null) return false;@@ -108,7 +106,7 @@ class Permission {/*** This checks for the defaults available other rules for the keys*/- private static Set<String> readSetSmart(String permissionName, @SuppressWarnings({"rawtypes"})Map m, String key) {+ private static Set<String> readSetSmart(String permissionName, Map<?, ?> m, String key) {if(PermissionNameProvider.values.containsKey(permissionName) && !m.containsKey(key) && "collection".equals(key)) {return PermissionNameProvider.Name.get(permissionName).collName;}@@ -128,7 +126,7 @@ class Permission {* @param m the map from which to lookup* @param key the key with which to do lookup*/- static Set<String> readValueAsSet(@SuppressWarnings({"rawtypes"})Map m, String key) {+ static Set<String> readValueAsSet(Map<?, ?> m, String key) {Set<String> result = new HashSet<>();Object val = m.get(key);if (val == null) {@@ -140,8 +138,7 @@ class Permission {return null;}if (val instanceof Collection) {- @SuppressWarnings({"rawtypes"})- Collection list = (Collection) val;+ Collection<?> list = (Collection<?>) val;for (Object o : list) result.add(String.valueOf(o));} else if (val instanceof String) {result.add((String) val);diff --git a/solr/core/src/java/org/apache/solr/security/Sha256AuthenticationProvider.java b/solr/core/src/java/org/apache/solr/security/Sha256AuthenticationProvider.javaindex a7b194eda31..4677f20be44 100644--- a/solr/core/src/java/org/apache/solr/security/Sha256AuthenticationProvider.java+++ b/solr/core/src/java/org/apache/solr/security/Sha256AuthenticationProvider.java@@ -49,8 +49,7 @@ public class Sha256AuthenticationProvider implements ConfigEditablePlugin, Basiprivate static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());- @SuppressWarnings({"unchecked"})- static void putUser(String user, String pwd, @SuppressWarnings({"rawtypes"})Map credentials) {+ static void putUser(String user, String pwd, Map<? super String, ? super String> credentials) {if (user == null || pwd == null) return;String val = getSaltedHashedValue(pwd);credentials.put(user, val);@@ -131,7 +130,6 @@ public class Sha256AuthenticationProvider implements ConfigEditablePlugin, Basi}@Override- @SuppressWarnings({"unchecked"})public Map<String, Object> edit(Map<String, Object> latestConf, List<CommandOperation> commands) {for (CommandOperation cmd : commands) {if (!supported_ops.contains(cmd.name)) {@@ -141,8 +139,7 @@ public class Sha256AuthenticationProvider implements ConfigEditablePlugin, Basiif (cmd.hasError()) return null;if ("delete-user".equals(cmd.name)) {List<String> names = cmd.getStrs("");- @SuppressWarnings({"rawtypes"})- Map map = (Map) latestConf.get("credentials");+ Map<?, ?> map = (Map<?, ?>) latestConf.get("credentials");if (map == null || !map.keySet().containsAll(names)) {cmd.addError("No such user(s) " +names );return null;@@ -159,18 +156,14 @@ public class Sha256AuthenticationProvider implements ConfigEditablePlugin, Basireturn latestConf;}if ("set-user".equals(cmd.name) ) {- @SuppressWarnings({"rawtypes"})- Map map = getMapValue(latestConf, "credentials");- @SuppressWarnings({"rawtypes"})- Map kv = cmd.getDataMap();- for (Object o : kv.entrySet()) {- @SuppressWarnings({"rawtypes"})- Map.Entry e = (Map.Entry) o;+ Map<String, Object> map = getMapValue(latestConf, "credentials");+ Map<String, Object> kv = cmd.getDataMap();+ for (Map.Entry<String, Object> e : kv.entrySet()) {if(e.getKey() == null || e.getValue() == null){cmd.addError("name and password must be non-null");return null;}- putUser(String.valueOf(e.getKey()), String.valueOf(e.getValue()), map);+ putUser(e.getKey(), String.valueOf(e.getValue()), map);}}diff --git a/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java b/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.javaindex 37ef43307ef..db8ecbf9343 100644--- a/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java+++ b/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java@@ -18,6 +18,7 @@ package org.apache.solr.update;import java.io.IOException;import java.lang.invoke.MethodHandles;+import java.lang.reflect.Array;import java.util.ArrayList;import java.util.List;import java.util.Locale;@@ -604,7 +605,6 @@ public class DirectUpdateHandler2 extends UpdateHandler implements SolrCoreState}@Override- @SuppressWarnings({"rawtypes"})public void commit(CommitUpdateCommand cmd) throws IOException {TestInjection.injectDirectUpdateLatch();if (cmd.prepareCommit) {@@ -619,10 +619,8 @@ public class DirectUpdateHandler2 extends UpdateHandler implements SolrCoreStateif (cmd.expungeDeletes) expungeDeleteCommands.mark();}- Future[] waitSearcher = null;- if (cmd.waitSearcher) {- waitSearcher = new Future[1];- }+ @SuppressWarnings("unchecked")+ Future<Void>[] waitSearcher = cmd.waitSearcher ? (Future<Void>[]) Array.newInstance(Future.class, 1) : null;boolean error=true;try {@@ -684,7 +682,6 @@ public class DirectUpdateHandler2 extends UpdateHandler implements SolrCoreStatecallPostOptimizeCallbacks();}-if (cmd.softCommit) {// ulog.preSoftCommit();synchronized (solrCoreState.getUpdateLock()) {@@ -737,7 +734,7 @@ public class DirectUpdateHandler2 extends UpdateHandler implements SolrCoreState// if we are supposed to wait for the searcher to be registered, then we should do it// outside any synchronized block so that other update operations can proceed.- if (waitSearcher!=null && waitSearcher[0] != null) {+ if (waitSearcher != null && waitSearcher[0] != null) {try {waitSearcher[0].get();} catch (InterruptedException | ExecutionException e) {diff --git a/solr/core/src/java/org/apache/solr/update/SolrIndexSplitter.java b/solr/core/src/java/org/apache/solr/update/SolrIndexSplitter.javaindex 559a7329054..ea8bc1ce34c 100644--- a/solr/core/src/java/org/apache/solr/update/SolrIndexSplitter.java+++ b/solr/core/src/java/org/apache/solr/update/SolrIndexSplitter.java@@ -18,6 +18,7 @@ package org.apache.solr.update;import java.io.IOException;import java.lang.invoke.MethodHandles;+import java.lang.reflect.Array;import java.text.SimpleDateFormat;import java.util.ArrayList;import java.util.Date;@@ -430,8 +431,8 @@ public class SolrIndexSplitter {}private void openNewSearcher(SolrCore core) throws Exception {- @SuppressWarnings({"rawtypes"})- Future[] waitSearcher = new Future[1];+ @SuppressWarnings("unchecked")+ Future<Void>[] waitSearcher = (Future<Void>[]) Array.newInstance(Future.class, 1);core.getSearcher(true, false, waitSearcher, true);if (waitSearcher[0] != null) {waitSearcher[0].get();diff --git a/solr/core/src/java/org/apache/solr/update/TransactionLog.java b/solr/core/src/java/org/apache/solr/update/TransactionLog.javaindex 555f0eafd0b..651a0fb0482 100644--- a/solr/core/src/java/org/apache/solr/update/TransactionLog.java+++ b/solr/core/src/java/org/apache/solr/update/TransactionLog.java@@ -271,8 +271,7 @@ public class TransactionLog implements Closeable {// read existing headerfis = fis != null ? fis : new ChannelFastInputStream(channel, 0);@SuppressWarnings("resource") final LogCodec codec = new LogCodec(resolver);- @SuppressWarnings({"rawtypes"})- Map header = (Map) codec.unmarshal(fis);+ Map<?, ?> header = (Map<?, ?>) codec.unmarshal(fis);fis.readInt(); // skip size@@ -308,13 +307,11 @@ public class TransactionLog implements Closeable {}}- @SuppressWarnings({"unchecked"})protected void writeLogHeader(LogCodec codec) throws IOException {long pos = fos.size();assert pos == 0;- @SuppressWarnings({"rawtypes"})- Map header = new LinkedHashMap<String, Object>();+ Map<String, Object> header = new LinkedHashMap<>();header.put("SOLR_TLOG", 1); // a magic string + version numberheader.put("strings", globalStringList);codec.marshal(header, fos);@@ -751,8 +748,7 @@ public class TransactionLog implements Closeable {long lastVersion = Long.MIN_VALUE;while ((o = super.next()) != null) {- @SuppressWarnings({"rawtypes"})- List entry = (List) o;+ List<?> entry = (List<?>) o;long version = (Long) entry.get(UpdateLog.VERSION_IDX);version = Math.abs(version);versionToPos.put(version, pos);diff --git a/solr/core/src/java/org/apache/solr/update/UpdateLog.java b/solr/core/src/java/org/apache/solr/update/UpdateLog.javaindex 46dcc13ba31..08b1f63a0ab 100644--- a/solr/core/src/java/org/apache/solr/update/UpdateLog.java+++ b/solr/core/src/java/org/apache/solr/update/UpdateLog.java@@ -916,8 +916,7 @@ public class UpdateLog implements PluginInfoInitialized, SolrMetricProducer {List<TransactionLog> lookupLogs = Arrays.asList(tlog, prevMapLog, prevMapLog2);while (prevPointer >= 0) {//go through each partial update and apply it on the incoming doc one after another- @SuppressWarnings({"rawtypes"})- List entry;+ List<?> entry;entry = getEntryFromTLog(prevPointer, prevVersion, lookupLogs);if (entry == null) {return prevPointer; // a previous update was supposed to be found, but wasn't found (due to log rotation)@@ -974,8 +973,7 @@ public class UpdateLog implements PluginInfoInitialized, SolrMetricProducer {** @return The entry if found, otherwise null*/- @SuppressWarnings({"rawtypes"})- private synchronized List getEntryFromTLog(long lookupPointer, long lookupVersion, List<TransactionLog> lookupLogs) {+ private synchronized List<?> getEntryFromTLog(long lookupPointer, long lookupVersion, List<TransactionLog> lookupLogs) {for (TransactionLog lookupLog : lookupLogs) {if (lookupLog != null && lookupLog.getLogSize() > lookupPointer) {lookupLog.incref();@@ -993,8 +991,9 @@ public class UpdateLog implements PluginInfoInitialized, SolrMetricProducer {}if (obj != null && obj instanceof List) {- List tmpEntry = (List) obj;- if (tmpEntry.size() >= 2 &&+ List<?> tmpEntry = (List<?>) obj;+ if (tmpEntry.size() >= 2 &&+ // why not Objects.equals(lookupVersion, tmpEntry.get())?(tmpEntry.get(UpdateLog.VERSION_IDX) instanceof Long) &&((Long) tmpEntry.get(UpdateLog.VERSION_IDX)).equals(lookupVersion)) {return tmpEntry;@@ -1271,8 +1270,7 @@ public class UpdateLog implements PluginInfoInitialized, SolrMetricProducer {try {while ( (o = logReader.next()) != null ) {try {- @SuppressWarnings({"rawtypes"})- List entry = (List)o;+ List<?> entry = (List<?>) o;int operationAndFlags = (Integer) entry.get(0);int oper = operationAndFlags & OPERATION_MASK;long version = (Long) entry.get(1);@@ -1508,8 +1506,7 @@ public class UpdateLog implements PluginInfoInitialized, SolrMetricProducer {if (o==null) break;// should currently be a List<Oper,Ver,Doc/Id>- @SuppressWarnings({"rawtypes"})- List entry = (List)o;+ List<?> entry = (List<?>)o;// TODO: refactor this out so we get common error handlingint opAndFlags = (Integer)entry.get(UpdateLog.FLAGS_IDX);@@ -1892,8 +1889,7 @@ public class UpdateLog implements PluginInfoInitialized, SolrMetricProducer {try {// should currently be a List<Oper,Ver,Doc/Id>- @SuppressWarnings({"rawtypes"})- List entry = (List) o;+ List<?> entry = (List<?>) o;operationAndFlags = (Integer) entry.get(UpdateLog.FLAGS_IDX);int oper = operationAndFlags & OPERATION_MASK;long version = (Long) entry.get(UpdateLog.VERSION_IDX);@@ -2101,7 +2097,7 @@ public class UpdateLog implements PluginInfoInitialized, SolrMetricProducer {* @param version Version already obtained from the entry.*/public static AddUpdateCommand convertTlogEntryToAddUpdateCommand(SolrQueryRequest req,- @SuppressWarnings({"rawtypes"})List entry,+ List<?> entry,int operation, long version) {assert operation == UpdateLog.ADD || operation == UpdateLog.UPDATE_INPLACE;SolrInputDocument sdoc = (SolrInputDocument) entry.get(entry.size()-1);diff --git a/solr/core/src/java/org/apache/solr/update/processor/DocBasedVersionConstraintsProcessor.java b/solr/core/src/java/org/apache/solr/update/processor/DocBasedVersionConstraintsProcessor.javaindex 6fdb8e05f67..6b4bb3b2872 100644--- a/solr/core/src/java/org/apache/solr/update/processor/DocBasedVersionConstraintsProcessor.java+++ b/solr/core/src/java/org/apache/solr/update/processor/DocBasedVersionConstraintsProcessor.java@@ -294,7 +294,9 @@ public class DocBasedVersionConstraintsProcessor extends UpdateRequestProcessoroldUserVersion.getClass() + " vs " + newUserVersion.getClass());}try {- if (newUpdateComparePasses((Comparable) newUserVersion, (Comparable) oldUserVersion, versionFieldNames[i])) {+ @SuppressWarnings({"unchecked", "rawtypes"})+ boolean passes = newUpdateComparePasses((Comparable) newUserVersion, (Comparable) oldUserVersion, versionFieldNames[i]);+ if (passes) {return true;}} catch (ClassCastException e) {@@ -325,9 +327,8 @@ public class DocBasedVersionConstraintsProcessor extends UpdateRequestProcessor* @param userVersionFieldName Field name of the user versions being compared* @return True if acceptable, false if not.*/- @SuppressWarnings({"unchecked"})- protected boolean newUpdateComparePasses(@SuppressWarnings({"rawtypes"})Comparable newUserVersion,- @SuppressWarnings({"rawtypes"})Comparable oldUserVersion, String userVersionFieldName) {+ protected <T extends Comparable<? super T>> boolean newUpdateComparePasses(T newUserVersion,+ T oldUserVersion, String userVersionFieldName) {return oldUserVersion.compareTo(newUserVersion) < 0;}diff --git a/solr/core/src/java/org/apache/solr/update/processor/FieldMutatingUpdateProcessor.java b/solr/core/src/java/org/apache/solr/update/processor/FieldMutatingUpdateProcessor.javaindex bea1fb534d5..e8016cc46a0 100644--- a/solr/core/src/java/org/apache/solr/update/processor/FieldMutatingUpdateProcessor.java+++ b/solr/core/src/java/org/apache/solr/update/processor/FieldMutatingUpdateProcessor.java@@ -139,7 +139,7 @@ public abstract class FieldMutatingUpdateProcessor* @param excludes a selector identifying field names that should be* <i>not</i> be selected, even if they are matched by the 'includes'* selector- * @return Either a new FieldNameSelector or one of the input selecors+ * @return Either a new FieldNameSelector or one of the input selectors* if the combination lends itself to optimization.*/public static FieldNameSelector wrap(final FieldNameSelector includes,diff --git a/solr/core/src/java/org/apache/solr/update/processor/FieldValueSubsetUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/FieldValueSubsetUpdateProcessorFactory.javaindex f6676c9ccf7..2fe65af5f83 100644--- a/solr/core/src/java/org/apache/solr/update/processor/FieldValueSubsetUpdateProcessorFactory.java+++ b/solr/core/src/java/org/apache/solr/update/processor/FieldValueSubsetUpdateProcessorFactory.java@@ -50,7 +50,7 @@ public abstract class FieldValueSubsetUpdateProcessorFactory extends FieldMutati* This method will not be called unless the collection contains more then* one value.*/- protected abstract Collection<Object> pickSubset(Collection<Object> values);+ protected abstract <T> Collection<T> pickSubset(Collection<T> values);}diff --git a/solr/core/src/java/org/apache/solr/update/processor/FirstFieldValueUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/FirstFieldValueUpdateProcessorFactory.javaindex df345573cf2..2411197e550 100644--- a/solr/core/src/java/org/apache/solr/update/processor/FirstFieldValueUpdateProcessorFactory.java+++ b/solr/core/src/java/org/apache/solr/update/processor/FirstFieldValueUpdateProcessorFactory.java@@ -51,7 +51,7 @@ import static org.apache.solr.update.processor.FieldMutatingUpdateProcessor.SELEpublic final class FirstFieldValueUpdateProcessorFactory extends FieldValueSubsetUpdateProcessorFactory {@Override- public Collection<Object> pickSubset(Collection<Object> values) {+ public <T> Collection<T> pickSubset(Collection<T> values) {// trust the iteratorreturn Collections.singletonList(values.iterator().next());}diff --git a/solr/core/src/java/org/apache/solr/update/processor/IgnoreLargeDocumentProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/IgnoreLargeDocumentProcessorFactory.javaindex e2a67133052..93e2388da73 100644--- a/solr/core/src/java/org/apache/solr/update/processor/IgnoreLargeDocumentProcessorFactory.java+++ b/solr/core/src/java/org/apache/solr/update/processor/IgnoreLargeDocumentProcessorFactory.java@@ -125,18 +125,17 @@ public class IgnoreLargeDocumentProcessorFactory extends UpdateRequestProcessorFreturn size;}- @SuppressWarnings({"unchecked", "rawtypes"})static long estimate(Object obj) {if (obj instanceof SolrInputDocument) {return estimate((SolrInputDocument) obj);}if (obj instanceof Map) {- return estimate((Map) obj);+ return estimate((Map<?, ?>) obj);}if (obj instanceof Collection) {- return estimate((Collection) obj);+ return estimate((Collection<?>) obj);}return primitiveEstimate(obj, 0L);@@ -153,17 +152,17 @@ public class IgnoreLargeDocumentProcessorFactory extends UpdateRequestProcessorFreturn def;}- private static long estimate(Map<Object, Object> map) {+ private static long estimate(Map<?, ?> map) {if (map.isEmpty()) return 0;long size = 0;- for (Map.Entry<Object, Object> entry : map.entrySet()) {+ for (Map.Entry<?, ?> entry : map.entrySet()) {size += primitiveEstimate(entry.getKey(), 0L);size += estimate(entry.getValue());}return size;}- private static long estimate(@SuppressWarnings({"rawtypes"})Collection collection) {+ private static long estimate(Collection<?> collection) {if (collection.isEmpty()) return 0;long size = 0;for (Object obj : collection) {diff --git a/solr/core/src/java/org/apache/solr/update/processor/LastFieldValueUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/LastFieldValueUpdateProcessorFactory.javaindex a1ebe3f4e23..fea4dfb78c7 100644--- a/solr/core/src/java/org/apache/solr/update/processor/LastFieldValueUpdateProcessorFactory.java+++ b/solr/core/src/java/org/apache/solr/update/processor/LastFieldValueUpdateProcessorFactory.java@@ -53,21 +53,20 @@ import static org.apache.solr.update.processor.FieldMutatingUpdateProcessor.SELEpublic final class LastFieldValueUpdateProcessorFactory extends FieldValueSubsetUpdateProcessorFactory {@Override- public Collection<Object> pickSubset(Collection<Object> values) {+ public <T> Collection<T> pickSubset(Collection<T> values) {- Object result = null;+ T result = null;if (values instanceof List) {// optimize index lookup- @SuppressWarnings({"rawtypes"})- List l = (List)values;+ List<T> l = (List<T>)values;result = l.get(l.size()-1);} else if (values instanceof SortedSet) {// optimize tail lookup- result = ((SortedSet)values).last();+ result = ((SortedSet<T>)values).last();} else {// trust the iterator- for (Object o : values) { result = o; }+ for (T o : values) { result = o; }}return Collections.singletonList(result);diff --git a/solr/core/src/java/org/apache/solr/update/processor/MaxFieldValueUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/MaxFieldValueUpdateProcessorFactory.javaindex b5691520d6d..991eaa8c889 100644--- a/solr/core/src/java/org/apache/solr/update/processor/MaxFieldValueUpdateProcessorFactory.java+++ b/solr/core/src/java/org/apache/solr/update/processor/MaxFieldValueUpdateProcessorFactory.java@@ -55,20 +55,15 @@ import static org.apache.solr.update.processor.FieldMutatingUpdateProcessor.SELEpublic final class MaxFieldValueUpdateProcessorFactory extends FieldValueSubsetUpdateProcessorFactory {@Override- @SuppressWarnings({"unchecked"})- public Collection<Object> pickSubset(@SuppressWarnings({"rawtypes"})Collection values) {- @SuppressWarnings({"rawtypes"})- Collection result = values;+ public <T> Collection<T> pickSubset(Collection<T> values) {try {- // NOTE: the extra cast to Object is needed to prevent compile- // errors on Eclipse Compiler (ecj) used for javadoc lint- result = Collections.singletonList((Object) Collections.max(values));+ // Use the signature with null comparator to let the JDK deal with unsafe casts, and catch CCE if needed+ return Collections.singletonList(Collections.max(values, null));} catch (ClassCastException e) {throw new SolrException(BAD_REQUEST,"Field values are not mutually comparable: " + e.getMessage(), e);}- return result;}@Overridediff --git a/solr/core/src/java/org/apache/solr/update/processor/MinFieldValueUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/MinFieldValueUpdateProcessorFactory.javaindex b81ea50160a..533de85bca2 100644--- a/solr/core/src/java/org/apache/solr/update/processor/MinFieldValueUpdateProcessorFactory.java+++ b/solr/core/src/java/org/apache/solr/update/processor/MinFieldValueUpdateProcessorFactory.java@@ -55,20 +55,15 @@ import static org.apache.solr.update.processor.FieldMutatingUpdateProcessor.SELEpublic final class MinFieldValueUpdateProcessorFactory extends FieldValueSubsetUpdateProcessorFactory {@Override- @SuppressWarnings({"unchecked"})- public Collection<Object> pickSubset(@SuppressWarnings({"rawtypes"})Collection values) {- @SuppressWarnings({"rawtypes"})- Collection result = values;+ public <T> Collection<T> pickSubset(Collection<T> values) {try {- // NOTE: the extra cast to Object is needed to prevent compile- // errors on Eclipse Compiler (ecj) used for javadoc lint- result = Collections.singletonList((Object) Collections.min(values));+ // Use the signature with null comparator to let the JDK deal with unsafe casts, and catch CCE if needed+ return Collections.singletonList(Collections.min(values, null));} catch (ClassCastException e) {throw new SolrException(BAD_REQUEST,"Field values are not mutually comparable: " + e.getMessage(), e);}- return result;}@Overridediff --git a/solr/core/src/java/org/apache/solr/update/processor/UniqFieldsUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/UniqFieldsUpdateProcessorFactory.javaindex d315aa44c16..64213b3843b 100644--- a/solr/core/src/java/org/apache/solr/update/processor/UniqFieldsUpdateProcessorFactory.java+++ b/solr/core/src/java/org/apache/solr/update/processor/UniqFieldsUpdateProcessorFactory.java@@ -55,13 +55,14 @@ public class UniqFieldsUpdateProcessorFactory extends FieldValueSubsetUpdateProc}@Override- public Collection<Object> pickSubset(@SuppressWarnings({"rawtypes"})Collection values) {- Set<Object> uniqs = new HashSet<>();- List<Object> result = new ArrayList<>(values.size());- for (Object o : values) {- if (!uniqs.contains(o)) {- uniqs.add(o);- result.add(o);+ public <T> Collection<T> pickSubset(Collection<T> values) {+ // The trivial implementation return new HashSet<>(values) would not preserve order+ // So we use a secondary set to track which values are new+ Set<T> uniqs = new HashSet<>();+ List<T> result = new ArrayList<>(values.size());+ for (T t : values) {+ if (uniqs.add(t)) {+ result.add(t);}}return result;diff --git a/solr/core/src/java/org/apache/solr/update/processor/UpdateRequestProcessorChain.java b/solr/core/src/java/org/apache/solr/update/processor/UpdateRequestProcessorChain.javaindex 0be79b521fe..e68205f8f41 100644--- a/solr/core/src/java/org/apache/solr/update/processor/UpdateRequestProcessorChain.java+++ b/solr/core/src/java/org/apache/solr/update/processor/UpdateRequestProcessorChain.java@@ -171,7 +171,6 @@ public final class UpdateRequestProcessorChain implements PluginInfoInitialized}- @SuppressWarnings({"rawtypes"})private List<UpdateRequestProcessorFactory> createProcessors(PluginInfo info) {List<PluginInfo> processors = info.getChildren("processor");return processors.stream().map(it -> {@@ -180,7 +179,7 @@ public final class UpdateRequestProcessorChain implements PluginInfoInitializedUpdateRequestProcessorFactory.class.getSimpleName(), null);} else {- return new LazyUpdateRequestProcessorFactory(new PackagePluginHolder(+ return new LazyUpdateRequestProcessorFactory(new PackagePluginHolder<>(it,solrCore,SolrConfig.classVsSolrPluginInfo.get(UpdateRequestProcessorFactory.class.getName())));@@ -356,7 +355,7 @@ public final class UpdateRequestProcessorChain implements PluginInfoInitializedpublic static class LazyUpdateProcessorFactoryHolder extends PluginBag.PluginHolder<UpdateRequestProcessorFactory> {private volatile UpdateRequestProcessorFactory lazyFactory;- public LazyUpdateProcessorFactoryHolder(@SuppressWarnings({"rawtypes"})final PluginBag.PluginHolder holder) {+ public LazyUpdateProcessorFactoryHolder(final PluginBag.PluginHolder<UpdateRequestProcessorFactory> holder) {super(holder.getPluginInfo());lazyFactory = new LazyUpdateRequestProcessorFactory(holder);}@@ -370,8 +369,7 @@ public final class UpdateRequestProcessorChain implements PluginInfoInitializedpublic static class LazyUpdateRequestProcessorFactory extends UpdateRequestProcessorFactory {private final PluginBag.PluginHolder<UpdateRequestProcessorFactory> holder;- @SuppressWarnings({"unchecked", "rawtypes"})- public LazyUpdateRequestProcessorFactory(PluginBag.PluginHolder holder) {+ public LazyUpdateRequestProcessorFactory(PluginBag.PluginHolder<UpdateRequestProcessorFactory> holder) {this.holder = holder;}diff --git a/solr/core/src/java/org/apache/solr/util/ConcurrentLRUCache.java b/solr/core/src/java/org/apache/solr/util/ConcurrentLRUCache.javaindex 93395d4f76f..ab2f04608a6 100644--- a/solr/core/src/java/org/apache/solr/util/ConcurrentLRUCache.java+++ b/solr/core/src/java/org/apache/solr/util/ConcurrentLRUCache.java@@ -21,6 +21,7 @@ import org.apache.lucene.util.RamUsageEstimator;import org.apache.solr.common.util.Cache;import org.apache.solr.common.util.TimeSource;+import java.lang.reflect.Array;import java.util.ArrayList;import java.util.Arrays;import java.util.Collection;@@ -417,8 +418,8 @@ public class ConcurrentLRUCache<K,V> implements Cache<K,V>, Accountable {int wantToKeep = lowerWaterMark;int wantToRemove = sz - lowerWaterMark;- @SuppressWarnings({"unchecked", "rawtypes"})- CacheEntry<K,V>[] eset = new CacheEntry[sz];+ @SuppressWarnings("unchecked")+ CacheEntry<K,V>[] eset = (CacheEntry<K, V>[]) Array.newInstance(CacheEntry.class, sz);int eSize = 0;// System.out.println("newestEntry="+newestEntry + " oldestEntry="+oldestEntry);@@ -552,15 +553,14 @@ public class ConcurrentLRUCache<K,V> implements Cache<K,V>, Accountable {// this loop so far.queue.myMaxSize = sz - lowerWaterMark - numRemoved;while (queue.size() > queue.myMaxSize && queue.size() > 0) {- @SuppressWarnings({"rawtypes"})- CacheEntry otherEntry = queue.pop();+ CacheEntry<K, V> otherEntry = queue.pop();newOldestEntry = Math.min(otherEntry.lastAccessedCopy, newOldestEntry);}if (queue.myMaxSize <= 0) break;- Object o = queue.myInsertWithOverflow(ce);+ CacheEntry<K, V> o = queue.myInsertWithOverflow(ce);if (o != null) {- newOldestEntry = Math.min(((CacheEntry)o).lastAccessedCopy, newOldestEntry);+ newOldestEntry = Math.min(o.lastAccessedCopy, newOldestEntry);}}}diff --git a/solr/core/src/java/org/apache/solr/util/ExportTool.java b/solr/core/src/java/org/apache/solr/util/ExportTool.javaindex 17b128662de..9767a92f093 100644--- a/solr/core/src/java/org/apache/solr/util/ExportTool.java+++ b/solr/core/src/java/org/apache/solr/util/ExportTool.java@@ -273,20 +273,19 @@ public class ExportTool extends SolrCLI.ToolBase {}@Override- @SuppressWarnings({"unchecked", "rawtypes"})public synchronized void accept(SolrDocument doc) throws IOException {charArr.reset();- Map m = new LinkedHashMap(doc.size());+ Map<String, Object> m = new LinkedHashMap<>(doc.size());doc.forEach((s, field) -> {if (s.equals("_version_") || s.equals("_roor_")) return;if (field instanceof List) {- if (((List) field).size() == 1) {- field = ((List) field).get(0);+ if (((List<?>) field).size() == 1) {+ field = ((List<?>) field).get(0);}}field = constructDateStr(field);if (field instanceof List) {- List list = (List) field;+ List<?> list = (List<?>) field;if (hasdate(list)) {ArrayList<Object> listCopy = new ArrayList<>(list.size());for (Object o : list) listCopy.add(constructDateStr(o));@@ -301,7 +300,7 @@ public class ExportTool extends SolrCLI.ToolBase {super.accept(doc);}- private boolean hasdate(@SuppressWarnings({"rawtypes"})List list) {+ private boolean hasdate(List<?> list) {boolean hasDate = false;for (Object o : list) {if(o instanceof Date){diff --git a/solr/core/src/java/org/apache/solr/util/PivotListEntry.java b/solr/core/src/java/org/apache/solr/util/PivotListEntry.javaindex 58684aa803f..3371a7c0060 100644--- a/solr/core/src/java/org/apache/solr/util/PivotListEntry.java+++ b/solr/core/src/java/org/apache/solr/util/PivotListEntry.java@@ -69,9 +69,9 @@ public enum PivotListEntry {/*** Given a {@link NamedList} representing a Pivot Value, extracts the Object- * which corrisponds to this {@link PivotListEntry}, or returns null if not found.+ * which corresponds to this {@link PivotListEntry}, or returns null if not found.*/- public Object extract(NamedList<Object> pivotList) {+ public <T> T extract(NamedList<T> pivotList) {if (this.minIndex < MIN_INDEX_OF_OPTIONAL) {// a mandatory entry at an exact index.assert this.getName().equals(pivotList.getName(this.minIndex));diff --git a/solr/core/src/java/org/apache/solr/util/SolrCLI.java b/solr/core/src/java/org/apache/solr/util/SolrCLI.javaindex e297e217315..5f3082515bd 100755--- a/solr/core/src/java/org/apache/solr/util/SolrCLI.java+++ b/solr/core/src/java/org/apache/solr/util/SolrCLI.java@@ -401,7 +401,7 @@ public class SolrCLI implements CLIO {// If you add a built-in tool to this class, add it here to avoid// classpath scanning- for (Class<Tool> next : findToolClassesInPackage("org.apache.solr.util")) {+ for (Class<? extends Tool> next : findToolClassesInPackage("org.apache.solr.util")) {Tool tool = next.getConstructor().newInstance();if (toolType.equals(tool.getName()))return tool;@@ -430,8 +430,8 @@ public class SolrCLI implements CLIO {formatter.printHelp("export", getToolOptions(new ExportTool()));formatter.printHelp("package", getToolOptions(new PackageTool()));- List<Class<Tool>> toolClasses = findToolClassesInPackage("org.apache.solr.util");- for (Class<Tool> next : toolClasses) {+ List<Class<? extends Tool>> toolClasses = findToolClassesInPackage("org.apache.solr.util");+ for (Class<? extends Tool> next : toolClasses) {Tool tool = next.getConstructor().newInstance();formatter.printHelp(tool.getName(), getToolOptions(tool));}@@ -515,9 +515,8 @@ public class SolrCLI implements CLIO {/*** Scans Jar files on the classpath for Tool implementations to activate.*/- @SuppressWarnings("unchecked")- private static List<Class<Tool>> findToolClassesInPackage(String packageName) {- List<Class<Tool>> toolClasses = new ArrayList<Class<Tool>>();+ private static List<Class<? extends Tool>> findToolClassesInPackage(String packageName) {+ List<Class<? extends Tool>> toolClasses = new ArrayList<>();try {ClassLoader classLoader = SolrCLI.class.getClassLoader();String path = packageName.replace('.', '/');@@ -531,7 +530,7 @@ public class SolrCLI implements CLIO {for (String classInPackage : classes) {Class<?> theClass = Class.forName(classInPackage);if (Tool.class.isAssignableFrom(theClass))- toolClasses.add((Class<Tool>) theClass);+ toolClasses.add(theClass.asSubclass(Tool.class));}} catch (Exception e) {// safe to squelch this as it's just looking for tools to run@@ -798,7 +797,7 @@ public class SolrCLI implements CLIO {* you must escape the slash. For instance /config/requestHandler/\/query/defaults/echoParams* would get the echoParams value for the "/query" request handler.*/- @SuppressWarnings({"rawtypes", "unchecked"})+ @SuppressWarnings("unchecked")public static Object atPath(String jsonPath, Map<String,Object> json) {if ("/".equals(jsonPath))return json;@@ -827,7 +826,7 @@ public class SolrCLI implements CLIO {} else {if (child instanceof Map) {// keep walking the path down to the desired node- parent = (Map)child;+ parent = (Map<String, Object>) child;} else {// early termination - hit a leaf before the requested nodebreak;diff --git a/solr/core/src/java/org/apache/solr/util/configuration/SSLCredentialProviderFactory.java b/solr/core/src/java/org/apache/solr/util/configuration/SSLCredentialProviderFactory.javaindex f36068b1715..55c2f449edc 100644--- a/solr/core/src/java/org/apache/solr/util/configuration/SSLCredentialProviderFactory.java+++ b/solr/core/src/java/org/apache/solr/util/configuration/SSLCredentialProviderFactory.java@@ -25,7 +25,6 @@ import java.util.Locale;import java.util.Map;import com.google.common.collect.ImmutableMap;-import org.apache.solr.util.configuration.providers.AbstractSSLCredentialProvider;import org.apache.solr.util.configuration.providers.EnvSSLCredentialProvider;import org.apache.solr.util.configuration.providers.HadoopSSLCredentialProvider;import org.apache.solr.util.configuration.providers.SysPropSSLCredentialProvider;@@ -40,7 +39,7 @@ public class SSLCredentialProviderFactory {public static final String DEFAULT_PROVIDER_CHAIN = "env;sysprop";public static final String PROVIDER_CHAIN_KEY = "solr.ssl.credential.provider.chain";- private static final Map<String, Class<? extends AbstractSSLCredentialProvider>> defaultProviders = ImmutableMap.of(+ private static final Map<String, Class<? extends SSLCredentialProvider>> defaultProviders = ImmutableMap.of("env", EnvSSLCredentialProvider.class,"sysprop", SysPropSSLCredentialProvider.class,"hadoop", HadoopSSLCredentialProvider.class@@ -76,7 +75,7 @@ public class SSLCredentialProviderFactory {private SSLCredentialProvider getProviderByClassName(String clazzName) {try {- return (SSLCredentialProvider) Class.forName(clazzName).getConstructor().newInstance();+ return Class.forName(clazzName).asSubclass(SSLCredentialProvider.class).getConstructor().newInstance();} catch (InstantiationException | ClassNotFoundException | IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {String msg = String.format(Locale.ROOT, "Could not instantiate %s credential provider", clazzName);log.error(msg);@@ -84,10 +83,9 @@ public class SSLCredentialProviderFactory {}}- @SuppressWarnings({"unchecked"})- private SSLCredentialProvider getDefaultProvider(@SuppressWarnings({"rawtypes"})Class aClass) {+ private SSLCredentialProvider getDefaultProvider(Class<? extends SSLCredentialProvider> aClass) {try {- return (SSLCredentialProvider) aClass.getConstructor().newInstance();+ return aClass.getConstructor().newInstance();} catch (InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {String msg = String.format(Locale.ROOT, "Could not instantiate %s credential provider", aClass.getName());log.error(msg);diff --git a/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java b/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.javaindex 0207e13cef2..9b9cdc5d563 100644--- a/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java+++ b/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java@@ -541,10 +541,8 @@ public class BasicFunctionalityTest extends SolrTestCaseJ4 {}@Test- @SuppressWarnings({"unchecked"})public void testLocalSolrQueryRequestParams() {- @SuppressWarnings({"rawtypes"})- HashMap args = new HashMap();+ HashMap<String, Object> args = new HashMap<>();args.put("string", "string value");args.put("array", new String[] {"array", "value"});SolrQueryRequest req = new LocalSolrQueryRequest(null, null, null, 0, 20, args);@@ -618,10 +616,8 @@ public class BasicFunctionalityTest extends SolrTestCaseJ4 {}@Test- @SuppressWarnings({"unchecked"})public void testSolrParams() throws Exception {- @SuppressWarnings({"rawtypes"})- NamedList nl = new NamedList();+ NamedList<Object> nl = new NamedList<>();nl.add("i",555);nl.add("s","bbb");nl.add("bt","true");@@ -658,8 +654,7 @@ public class BasicFunctionalityTest extends SolrTestCaseJ4 {assertEquals(p.getBool("foo",false), false);assertEquals(!!p.getBool("bt"), !p.getBool("bf"));- @SuppressWarnings({"rawtypes"})- NamedList more = new NamedList();+ NamedList<String> more = new NamedList<>();more.add("s", "aaa");more.add("s", "ccc");more.add("ss","YYY");diff --git a/solr/core/src/test/org/apache/solr/CursorPagingTest.java b/solr/core/src/test/org/apache/solr/CursorPagingTest.javaindex 3375b8e9500..378574c5282 100644--- a/solr/core/src/test/org/apache/solr/CursorPagingTest.java+++ b/solr/core/src/test/org/apache/solr/CursorPagingTest.java@@ -859,14 +859,13 @@ public class CursorPagingTest extends SolrTestCaseJ4 {while (0 < docsOnThisPage) {String json = assertJQ(req(params,CURSOR_MARK_PARAM, cursorMark));- @SuppressWarnings({"rawtypes"})- Map rsp = (Map) fromJSONString(json);+ Map<?, ?> rsp = (Map<?, ?>) fromJSONString(json);assertTrue("response doesn't contain " + CURSOR_MARK_NEXT + ": " + json,rsp.containsKey(CURSOR_MARK_NEXT));String nextCursorMark = (String)rsp.get(CURSOR_MARK_NEXT);assertNotNull(CURSOR_MARK_NEXT + " is null", nextCursorMark);- @SuppressWarnings({"unchecked"})- List<Map<Object,Object>> docs = (List) (((Map)rsp.get("response")).get("docs"));+ @SuppressWarnings("unchecked")+ List<Map<Object,Object>> docs = (List<Map<Object, Object>>) (((Map<?, ?>)rsp.get("response")).get("docs"));docsOnThisPage = docs.size();if (null != params.getInt(CommonParams.ROWS)) {int rows = params.getInt(CommonParams.ROWS);@@ -931,7 +930,6 @@ public class CursorPagingTest extends SolrTestCaseJ4 {** Also checks that facets are the same with each page, and that they are correct.*/- @SuppressWarnings({"unchecked"})public SentinelIntSet assertFullWalkNoDupsWithFacets(int maxSize, SolrParams params)throws Exception {@@ -943,17 +941,16 @@ public class CursorPagingTest extends SolrTestCaseJ4 {SentinelIntSet ids = new SentinelIntSet(maxSize, -1);String cursorMark = CURSOR_MARK_START;int docsOnThisPage = Integer.MAX_VALUE;- @SuppressWarnings({"rawtypes"})- List previousFacets = null;+ List<?> previousFacets = null;while (0 < docsOnThisPage) {String json = assertJQ(req(params, CURSOR_MARK_PARAM, cursorMark));- @SuppressWarnings({"rawtypes"})- Map rsp = (Map) fromJSONString(json);+ Map<?, ?> rsp = (Map<?, ?>) fromJSONString(json);assertTrue("response doesn't contain " + CURSOR_MARK_NEXT + ": " + json,rsp.containsKey(CURSOR_MARK_NEXT));String nextCursorMark = (String)rsp.get(CURSOR_MARK_NEXT);assertNotNull(CURSOR_MARK_NEXT + " is null", nextCursorMark);- List<Map<Object,Object>> docs = (List)(((Map)rsp.get("response")).get("docs"));+ @SuppressWarnings({"unchecked"})+ List<Map<Object,Object>> docs = (List<Map<Object, Object>>)(((Map<?, ?>)rsp.get("response")).get("docs"));docsOnThisPage = docs.size();if (null != params.getInt(CommonParams.ROWS)) {int rows = params.getInt(CommonParams.ROWS);@@ -981,10 +978,8 @@ public class CursorPagingTest extends SolrTestCaseJ4 {}cursorMark = nextCursorMark;- @SuppressWarnings({"rawtypes"})- Map facetFields = (Map)((Map)rsp.get("facet_counts")).get("facet_fields");- @SuppressWarnings({"rawtypes"})- List facets = (List)facetFields.get(facetField);+ Map<?, ?> facetFields = (Map<?, ?>)((Map<?, ?>)rsp.get("facet_counts")).get("facet_fields");+ List<?> facets = (List<?>)facetFields.get(facetField);if (null != previousFacets) {assertEquals("Facets not the same as on previous page:\nprevious page facets: "+ Arrays.toString(facets.toArray(new Object[facets.size()]))@@ -1018,8 +1013,7 @@ public class CursorPagingTest extends SolrTestCaseJ4 {*/public String assertCursor(SolrQueryRequest req, String... tests) throws Exception {String json = assertJQ(req, tests);- @SuppressWarnings({"rawtypes"})- Map rsp = (Map) fromJSONString(json);+ Map<?, ?> rsp = (Map<?, ?>) fromJSONString(json);assertTrue("response doesn't contain "+CURSOR_MARK_NEXT + ": " + json,rsp.containsKey(CURSOR_MARK_NEXT));String next = (String)rsp.get(CURSOR_MARK_NEXT);diff --git a/solr/core/src/test/org/apache/solr/SolrInfoBeanTest.java b/solr/core/src/test/org/apache/solr/SolrInfoBeanTest.javaindex 3c56d5ac97e..c0a219919da 100644--- a/solr/core/src/test/org/apache/solr/SolrInfoBeanTest.java+++ b/solr/core/src/test/org/apache/solr/SolrInfoBeanTest.java@@ -23,7 +23,6 @@ import org.apache.solr.handler.component.SearchComponent;import org.apache.solr.handler.component.SearchHandler;import org.apache.solr.highlight.DefaultSolrHighlighter;import org.apache.solr.metrics.SolrMetricManager;-import org.apache.solr.metrics.SolrMetricProducer;import org.apache.solr.metrics.SolrMetricsContext;import org.apache.solr.search.CaffeineCache;import org.junit.BeforeClass;@@ -48,10 +47,8 @@ public class SolrInfoBeanTest extends SolrTestCaseJ4* Gets a list of everything we can find in the classpath and makes sure it has* a name, description, etc...*/- @SuppressWarnings({"unchecked"})public void testCallMBeanInfo() throws Exception {- @SuppressWarnings({"rawtypes"})- List<Class> classes = new ArrayList<>();+ List<Class<?>> classes = new ArrayList<>();classes.addAll(getClassesForPackage(SearchHandler.class.getPackage().getName()));classes.addAll(getClassesForPackage(SearchComponent.class.getPackage().getName()));classes.addAll(getClassesForPackage(LukeRequestHandler.class.getPackage().getName()));@@ -64,14 +61,12 @@ public class SolrInfoBeanTest extends SolrTestCaseJ4String registry = h.getCore().getCoreMetricManager().getRegistryName();SolrMetricsContext solrMetricsContext = new SolrMetricsContext(metricManager, registry, "foo");String scope = TestUtil.randomSimpleString(random(), 2, 10);- for(@SuppressWarnings({"rawtypes"})Class clazz : classes ) {+ for(Class<?> clazz : classes ) {if( SolrInfoBean.class.isAssignableFrom( clazz ) ) {try {- SolrInfoBean info = (SolrInfoBean)clazz.getConstructor().newInstance();- if (info instanceof SolrMetricProducer) {- ((SolrMetricProducer)info).initializeMetrics(solrMetricsContext, scope);- }-+ SolrInfoBean info = clazz.asSubclass(SolrInfoBean.class).getConstructor().newInstance();+ info.initializeMetrics(solrMetricsContext, scope);+//System.out.println( info.getClass() );assertNotNull( info.getClass().getCanonicalName(), info.getName() );assertNotNull( info.getClass().getCanonicalName(), info.getDescription() );@@ -93,8 +88,7 @@ public class SolrInfoBeanTest extends SolrTestCaseJ4assertTrue( "there are at least 10 SolrInfoBean that should be found in the classpath, found " + checked, checked > 10 );}- @SuppressWarnings({"rawtypes"})- private static List<Class> getClassesForPackage(String pckgname) throws Exception {+ private static List<Class<?>> getClassesForPackage(String pckgname) throws Exception {ArrayList<File> directories = new ArrayList<>();ClassLoader cld = h.getCore().getResourceLoader().getClassLoader();String path = pckgname.replace('.', '/');@@ -107,8 +101,7 @@ public class SolrInfoBeanTest extends SolrTestCaseJ4directories.add(f);}- @SuppressWarnings({"rawtypes"})- ArrayList<Class> classes = new ArrayList<>();+ ArrayList<Class<?>> classes = new ArrayList<>();for (File directory : directories) {if (directory.exists()) {String[] files = directory.list();diff --git a/solr/core/src/test/org/apache/solr/TestDistributedGrouping.java b/solr/core/src/test/org/apache/solr/TestDistributedGrouping.javaindex c9e61cce88b..8726e4fe5e1 100644--- a/solr/core/src/test/org/apache/solr/TestDistributedGrouping.java+++ b/solr/core/src/test/org/apache/solr/TestDistributedGrouping.java@@ -313,8 +313,7 @@ public class TestDistributedGrouping extends BaseDistributedSearchTestCase {int which = r.nextInt(clients.size());SolrClient client = clients.get(which);QueryResponse rsp = client.query(params);- @SuppressWarnings({"rawtypes"})- NamedList nl = (NamedList<?>) rsp.getResponse().get("grouped");+ NamedList<?> nl = (NamedList<?>) rsp.getResponse().get("grouped");nl = (NamedList<?>) nl.getVal(0);int matches = (Integer) nl.getVal(0);int groupCount = (Integer) nl.get("ngroups");diff --git a/solr/core/src/test/org/apache/solr/TestDistributedSearch.java b/solr/core/src/test/org/apache/solr/TestDistributedSearch.javaindex aebc772f02f..07cf1f03aff 100644--- a/solr/core/src/test/org/apache/solr/TestDistributedSearch.java+++ b/solr/core/src/test/org/apache/solr/TestDistributedSearch.java@@ -18,6 +18,7 @@ package org.apache.solr;import java.io.IOException;import java.lang.invoke.MethodHandles;+import java.lang.reflect.Array;import java.util.ArrayList;import java.util.Arrays;import java.util.Collections;@@ -1155,7 +1156,6 @@ public class TestDistributedSearch extends BaseDistributedSearchTestCase {}}- @SuppressWarnings({"unchecked", "rawtypes"})protected void queryPartialResults(final List<String> upShards,final List<SolrClient> upClients,Object... q) throws Exception {@@ -1187,9 +1187,10 @@ public class TestDistributedSearch extends BaseDistributedSearchTestCase {log.info("starting stress...");Set<Future<Object>> pending = new HashSet<>();;ExecutorCompletionService<Object> cs = new ExecutorCompletionService<>(executor);- Callable[] threads = new Callable[nThreads];+ @SuppressWarnings("unchecked")+ Callable<Object>[] threads = (Callable<Object>[]) Array.newInstance(Callable.class, nThreads);for (int i = 0; i < threads.length; i++) {- threads[i] = new Callable() {+ threads[i] = new Callable<>() {@Overridepublic Object call() {for (int j = 0; j < stress; j++) {diff --git a/solr/core/src/test/org/apache/solr/TestJoin.java b/solr/core/src/test/org/apache/solr/TestJoin.javaindex 3cd8fc2404e..057eeaa4d61 100644--- a/solr/core/src/test/org/apache/solr/TestJoin.java+++ b/solr/core/src/test/org/apache/solr/TestJoin.java@@ -244,8 +244,7 @@ public class TestJoin extends SolrTestCaseJ4 {List<Doc> docList = new ArrayList<>(docs.size());for (@SuppressWarnings({"rawtypes"})Comparable id : docs) docList.add(model.get(id));Collections.sort(docList, createComparator("_docid_",true,false,false,false));- @SuppressWarnings({"rawtypes"})- List sortedDocs = new ArrayList();+ List<Object> sortedDocs = new ArrayList<>();for (Doc doc : docList) {if (sortedDocs.size() >= 10) break;sortedDocs.add(doc.toObject(h.getCore().getLatestSchema()));diff --git a/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java b/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.javaindex c22a5ab3134..718610b0da4 100644--- a/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java@@ -45,7 +45,6 @@ import org.apache.solr.JSONTestUtil;import org.apache.solr.SolrTestCaseJ4.SuppressSSL;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrQuery;-import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.HttpSolrClient;@@ -794,8 +793,7 @@ public class BasicDistributedZkTest extends AbstractFullDistribZkTestBase {}params.set("name", collectionName);params.set("collection.configName", configSetName);- @SuppressWarnings({"rawtypes"})- SolrRequest request = new QueryRequest(params);+ QueryRequest request = new QueryRequest(params);request.setPath("/admin/collections");CollectionAdminResponse res = new CollectionAdminResponse();@@ -902,8 +900,7 @@ public class BasicDistributedZkTest extends AbstractFullDistribZkTestBase {QueryRequest qr = new QueryRequest(params("qt", "/get", "id","1000"));for (SolrClient client : clients) {val += 10;- @SuppressWarnings({"rawtypes"})- NamedList rsp = client.request(qr);+ NamedList<?> rsp = client.request(qr);String match = JSONTestUtil.matchObj("/val_i", rsp.get("doc"), expected);if (match != null) throw new RuntimeException(match);}@@ -944,10 +941,8 @@ public class BasicDistributedZkTest extends AbstractFullDistribZkTestBase {// use generic request to avoid extra processing of queriesQueryRequest req = new QueryRequest(params);NamedList<Object> resp = client.request(req);- @SuppressWarnings({"rawtypes"})- NamedList metrics = (NamedList) resp.get("metrics");- @SuppressWarnings({"rawtypes"})- NamedList uhandlerCat = (NamedList) metrics.getVal(0);+ NamedList<?> metrics = (NamedList<?>) resp.get("metrics");+ NamedList<?> uhandlerCat = (NamedList<?>) metrics.getVal(0);@SuppressWarnings({"unchecked"})Map<String,Object> commits = (Map<String,Object>) uhandlerCat.get("UPDATE.updateHandler.commits");return (Long) commits.get("count");@@ -1152,12 +1147,10 @@ public class BasicDistributedZkTest extends AbstractFullDistribZkTestBase {createSolrCore(collection, collectionClients, baseUrl, num, null);}- @SuppressWarnings({"unchecked"})private void createSolrCore(final String collection,List<SolrClient> collectionClients, final String baseUrl, final int num,final String shardId) {- @SuppressWarnings({"rawtypes"})- Callable call = () -> {+ Callable<Object> call = () -> {try (HttpSolrClient client = getHttpSolrClient(baseUrl)) {// client.setConnectionTimeout(15000);Create createCmd = new Create();@@ -1284,8 +1277,7 @@ public class BasicDistributedZkTest extends AbstractFullDistribZkTestBase {for (final JettySolrRunner runner : jettys) {unique++;final int frozeUnique = unique;- @SuppressWarnings({"rawtypes"})- Callable call = () -> {+ Callable<Object> call = () -> {try {assertTrue(CollectionAdminRequestdiff --git a/solr/core/src/test/org/apache/solr/cloud/CollectionPropsTest.java b/solr/core/src/test/org/apache/solr/cloud/CollectionPropsTest.javaindex 1a6d54e3bc9..25c86e0e2a1 100644--- a/solr/core/src/test/org/apache/solr/cloud/CollectionPropsTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/CollectionPropsTest.java@@ -284,15 +284,14 @@ public class CollectionPropsTest extends SolrCloudTestCase {}@Override- @SuppressWarnings({"unchecked", "rawtypes"})public boolean onStateChanged(Map<String, String> collectionProperties) {log.info("{}: state changed...", name);if (forceReadPropsFromZk) {final ZkStateReader zkStateReader = cluster.getSolrClient().getZkStateReader();- props = Collections.unmodifiableMap(new HashMap(zkStateReader.getCollectionProperties(collectionName)));+ props = Map.copyOf(zkStateReader.getCollectionProperties(collectionName));log.info("{}: Setting props from zk={}", name, props);} else {- props = Collections.unmodifiableMap(new HashMap(collectionProperties));+ props = Map.copyOf(collectionProperties);log.info("{}: Setting props from caller={}", name, props);}diff --git a/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudDistribCmdsTest.java b/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudDistribCmdsTest.javaindex 0b15fe018eb..381cce8842e 100644--- a/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudDistribCmdsTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudDistribCmdsTest.java@@ -418,10 +418,10 @@ public class FullSolrCloudDistribCmdsTest extends SolrCloudTestCase {final int totalDocsExpected = numThreads * numBatchesPerThread * numDocsPerBatch;ExecutorUtil.shutdownAndAwaitTermination(executor);- for (@SuppressWarnings({"rawtypes"})Future result : futures) {+ for (Future<?> result : futures) {assertFalse(result.isCancelled());assertTrue(result.isDone());- // all we care about is propogating any possibile execution exception...+ // all we care about is propagating any possible execution exception...final Object ignored = result.get();}diff --git a/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java b/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.javaindex 081ed521381..c5dd82da2c8 100644--- a/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java@@ -315,7 +315,7 @@ public class HttpPartitionTest extends AbstractFullDistribZkTestBase {Replica.State replicaState = Replica.State.ACTIVE;while (!timeOut.hasTimedOut()) {ZkStateReader zkr = cloudClient.getZkStateReader();- zkr.forceUpdateCollection(collection);; // force the state to be fresh+ zkr.forceUpdateCollection(collection); // force the state to be freshClusterState cs = zkr.getClusterState();Collection<Slice> slices = cs.getCollection(collection).getActiveSlices();Slice slice = slices.iterator().next();@@ -552,24 +552,21 @@ 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.*/- @SuppressWarnings("rawtypes")protected void assertDocExists(HttpSolrClient solr, String coll, String docId) throws Exception {- NamedList rsp = realTimeGetDocId(solr, docId);+ NamedList<?> rsp = realTimeGetDocId(solr, docId);String match = JSONTestUtil.matchObj("/id", rsp.get("doc"), docId);assertTrue("Doc with id=" + docId + " not found in " + solr.getBaseURL()+ " due to: " + match + "; rsp="+rsp, match == null);}protected void assertDocNotExists(HttpSolrClient solr, String coll, String docId) throws Exception {- @SuppressWarnings({"rawtypes"})- NamedList rsp = realTimeGetDocId(solr, docId);+ 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);}- @SuppressWarnings({"rawtypes"})- private NamedList realTimeGetDocId(HttpSolrClient solr, String docId) throws SolrServerException, IOException {+ private NamedList<Object> realTimeGetDocId(HttpSolrClient solr, String docId) throws SolrServerException, IOException {QueryRequest qr = new QueryRequest(params("qt", "/get", "id", docId, "distrib", "false"));return solr.request(qr);}diff --git a/solr/core/src/test/org/apache/solr/cloud/MultiThreadedOCPTest.java b/solr/core/src/test/org/apache/solr/cloud/MultiThreadedOCPTest.javaindex 270010ee7ec..13a57612f9b 100644--- a/solr/core/src/test/org/apache/solr/cloud/MultiThreadedOCPTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/MultiThreadedOCPTest.java@@ -21,7 +21,6 @@ import java.lang.invoke.MethodHandles;import java.util.Random;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;@@ -275,8 +274,7 @@ public class MultiThreadedOCPTest extends AbstractFullDistribZkTestBase {ModifiableSolrParams params = new ModifiableSolrParams();params.set("action", CollectionParams.CollectionAction.CLUSTERSTATUS.toString());params.set("collection", "collection1");- @SuppressWarnings({"rawtypes"})- SolrRequest request = new QueryRequest(params);+ QueryRequest request = new QueryRequest(params);request.setPath("/admin/collections");client.request(request);diff --git a/solr/core/src/test/org/apache/solr/cloud/OverseerCollectionConfigSetProcessorTest.java b/solr/core/src/test/org/apache/solr/cloud/OverseerCollectionConfigSetProcessorTest.javaindex eca25e29446..4ca02bd7582 100644--- a/solr/core/src/test/org/apache/solr/cloud/OverseerCollectionConfigSetProcessorTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/OverseerCollectionConfigSetProcessorTest.java@@ -283,13 +283,12 @@ public class OverseerCollectionConfigSetProcessorTest extends SolrTestCaseJ4 {});when(workQueueMock.getTailId()).thenAnswer(invocation -> {- Object result = null;- @SuppressWarnings({"rawtypes"})- Iterator iter = queue.iterator();+ QueueEvent result = null;+ Iterator<QueueEvent> iter = queue.iterator();while(iter.hasNext()) {result = iter.next();}- return result==null ? null : ((QueueEvent)result).getId();+ return result==null ? null : result.getId();});when(workQueueMock.peek(true)).thenAnswer(invocation -> {diff --git a/solr/core/src/test/org/apache/solr/cloud/SyncSliceTest.java b/solr/core/src/test/org/apache/solr/cloud/SyncSliceTest.javaindex c5a249f58c6..a9832446505 100644--- a/solr/core/src/test/org/apache/solr/cloud/SyncSliceTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/SyncSliceTest.java@@ -18,7 +18,6 @@ package org.apache.solr.cloud;import org.apache.lucene.util.LuceneTestCase.Slow;import org.apache.solr.client.solrj.SolrQuery;-import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.request.QueryRequest;@@ -102,8 +101,7 @@ public class SyncSliceTest extends AbstractFullDistribZkTestBase {params.set("action", CollectionAction.SYNCSHARD.toString());params.set("collection", "collection1");params.set("shard", "shard1");- @SuppressWarnings({"rawtypes"})- SolrRequest request = new QueryRequest(params);+ QueryRequest request = new QueryRequest(params);request.setPath("/admin/collections");String baseUrl = ((HttpSolrClient) shardToJetty.get("shard1").get(2).client.solrClient)diff --git a/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPIExclusivity.java b/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPIExclusivity.javaindex bb75e7b4dbe..9887a83ab9b 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPIExclusivity.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPIExclusivity.java@@ -115,14 +115,12 @@ public class TestConfigSetsAPIExclusivity extends SolrTestCaseJ4 {this.trials = trials;}- @SuppressWarnings({"rawtypes"})- public abstract ConfigSetAdminRequest createRequest();+ public abstract ConfigSetAdminRequest<?, ?> createRequest();public void run() {final String baseUrl = solrCluster.getJettySolrRunners().get(0).getBaseUrl().toString();final SolrClient solrClient = getHttpSolrClient(baseUrl);- @SuppressWarnings({"rawtypes"})- ConfigSetAdminRequest request = createRequest();+ ConfigSetAdminRequest<?, ?> request = createRequest();for (int i = 0; i < trials; ++i) {try {@@ -164,8 +162,7 @@ public class TestConfigSetsAPIExclusivity extends SolrTestCaseJ4 {}@Override- @SuppressWarnings({"rawtypes"})- public ConfigSetAdminRequest createRequest() {+ public Create createRequest() {Create create = new Create();create.setBaseConfigSetName(baseConfigSet).setConfigSetName(configSet);return create;@@ -181,8 +178,7 @@ public class TestConfigSetsAPIExclusivity extends SolrTestCaseJ4 {}@Override- @SuppressWarnings({"rawtypes"})- public ConfigSetAdminRequest createRequest() {+ public Delete createRequest() {Delete delete = new Delete();delete.setConfigSetName(configSet);return delete;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestQueryingOnDownCollection.java b/solr/core/src/test/org/apache/solr/cloud/TestQueryingOnDownCollection.javaindex 1ed2341e1fa..df1d2dd6d27 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestQueryingOnDownCollection.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestQueryingOnDownCollection.java@@ -27,6 +27,7 @@ import org.apache.solr.client.solrj.impl.Http2SolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.QueryRequest;import org.apache.solr.client.solrj.request.UpdateRequest;+import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.common.SolrException;import org.apache.solr.common.cloud.Replica;import org.apache.solr.common.util.Utils;@@ -84,8 +85,7 @@ public class TestQueryingOnDownCollection extends SolrCloudTestCase {SolrClient client = cluster.getJettySolrRunner(0).newClient();- @SuppressWarnings({"rawtypes"})- SolrRequest req = new QueryRequest(new SolrQuery("*:*").setRows(0)).setBasicAuthCredentials(USERNAME, PASSWORD);+ SolrRequest<QueryResponse> req = new QueryRequest(new SolrQuery("*:*").setRows(0)).setBasicAuthCredentials(USERNAME, PASSWORD);// Without the SOLR-13793 fix, this causes requests to "down collection" to pile up (until the nodes run out// of serviceable threads and they crash, even for other collections hosted on the nodes).diff --git a/solr/core/src/test/org/apache/solr/cloud/TestRebalanceLeaders.java b/solr/core/src/test/org/apache/solr/cloud/TestRebalanceLeaders.javaindex 8a0a874adf6..3e9956fbe7a 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestRebalanceLeaders.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestRebalanceLeaders.java@@ -22,7 +22,6 @@ import java.util.*;import java.util.concurrent.TimeUnit;import org.apache.lucene.util.LuceneTestCase;-import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.request.CollectionAdminRequest;@@ -446,8 +445,7 @@ public class TestRebalanceLeaders extends SolrCloudTestCase {params.set("shardUnique", "true");}- @SuppressWarnings({"rawtypes"})- SolrRequest request = new QueryRequest(params);+ QueryRequest request = new QueryRequest(params);request.setPath("/admin/collections");cluster.getSolrClient().request(request);String propLC = prop.toLowerCase(Locale.ROOT);diff --git a/solr/core/src/test/org/apache/solr/cloud/TestSolrCloudWithDelegationTokens.java b/solr/core/src/test/org/apache/solr/cloud/TestSolrCloudWithDelegationTokens.javaindex d28fad77a67..e75f1b85e42 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestSolrCloudWithDelegationTokens.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestSolrCloudWithDelegationTokens.java@@ -37,7 +37,9 @@ import org.apache.solr.client.solrj.request.AbstractUpdateRequest.ACTION;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.DelegationTokenRequest;import org.apache.solr.client.solrj.request.UpdateRequest;+import org.apache.solr.client.solrj.response.CollectionAdminResponse;import org.apache.solr.client.solrj.response.DelegationTokenResponse;+import org.apache.solr.client.solrj.response.UpdateResponse;import org.apache.solr.common.SolrException.ErrorCode;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.common.cloud.SolrZkClient;@@ -169,8 +171,7 @@ public class TestSolrCloudWithDelegationTokens extends SolrTestCaseJ4 {assertEquals("Did not receive expected status code", expectedStatusCode, lastStatusCode);}- @SuppressWarnings({"rawtypes"})- private SolrRequest getAdminRequest(final SolrParams params) {+ private SolrRequest<CollectionAdminResponse> getAdminRequest(final SolrParams params) {return new CollectionAdminRequest.List() {@Overridepublic SolrParams getParams() {@@ -180,8 +181,7 @@ public class TestSolrCloudWithDelegationTokens extends SolrTestCaseJ4 {}};}- @SuppressWarnings({"rawtypes"})- private SolrRequest getUpdateRequest(boolean commit) {+ private SolrRequest<UpdateResponse> getUpdateRequest(boolean commit) {UpdateRequest request = new UpdateRequest();if (commit) {request.setAction(ACTION.COMMIT, false, false);@@ -192,7 +192,6 @@ public class TestSolrCloudWithDelegationTokens extends SolrTestCaseJ4 {return request;}- @SuppressWarnings({"unchecked"})private int getStatusCode(String token, final String user, final String op, HttpSolrClient client)throws Exception {SolrClient delegationTokenClient;@@ -213,8 +212,7 @@ public class TestSolrCloudWithDelegationTokens extends SolrTestCaseJ4 {ModifiableSolrParams p = new ModifiableSolrParams();if (user != null) p.set(USER_PARAM, user);if (op != null) p.set("op", op);- @SuppressWarnings({"rawtypes"})- SolrRequest req = getAdminRequest(p);+ SolrRequest<?> req = getAdminRequest(p);if (user != null || op != null) {Set<String> queryParams = new HashSet<>();if (user != null) queryParams.add(USER_PARAM);@@ -233,7 +231,7 @@ public class TestSolrCloudWithDelegationTokens extends SolrTestCaseJ4 {}private void doSolrRequest(HttpSolrClient client,- @SuppressWarnings({"rawtypes"})SolrRequest request,+ SolrRequest<?> request,int expectedStatusCode) throws Exception {try {client.request(request);@@ -244,7 +242,7 @@ public class TestSolrCloudWithDelegationTokens extends SolrTestCaseJ4 {}private void doSolrRequest(HttpSolrClient client,- @SuppressWarnings({"rawtypes"})SolrRequest request, String collectionName,+ SolrRequest<?> request, String collectionName,int expectedStatusCode) throws Exception {try {client.request(request, collectionName);@@ -414,8 +412,7 @@ public class TestSolrCloudWithDelegationTokens extends SolrTestCaseJ4 {String token = getDelegationToken(null, "bar", solrClientPrimary);assertNotNull(token);- @SuppressWarnings({"rawtypes"})- SolrRequest request = getAdminRequest(new ModifiableSolrParams());+ SolrRequest<?> request = getAdminRequest(new ModifiableSolrParams());// test without tokenfinal HttpSolrClient ssWoToken =@@ -472,8 +469,7 @@ public class TestSolrCloudWithDelegationTokens extends SolrTestCaseJ4 {try {// test update request with token via property and commit=true- @SuppressWarnings({"rawtypes"})- SolrRequest request = getUpdateRequest(true);+ SolrRequest<?> request = getUpdateRequest(true);doSolrRequest(scUpdateWToken, request, collectionName, HttpStatus.SC_OK);// test update request with token via property and commit=falsediff --git a/solr/core/src/test/org/apache/solr/cloud/api/collections/CollectionsAPIDistributedZkTest.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/CollectionsAPIDistributedZkTest.javaindex 12f0c832310..5ec3c357a0b 100644--- a/solr/core/src/test/org/apache/solr/cloud/api/collections/CollectionsAPIDistributedZkTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/CollectionsAPIDistributedZkTest.java@@ -42,7 +42,6 @@ import com.google.common.collect.ImmutableList;import org.apache.lucene.util.LuceneTestCase.Slow;import org.apache.lucene.util.TestUtil;import org.apache.solr.client.solrj.SolrQuery;-import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.BaseHttpSolrClient;@@ -213,8 +212,7 @@ public class CollectionsAPIDistributedZkTest extends SolrCloudTestCase {params.set("action", CollectionAction.CREATE.toString());params.set("numShards", 2);// missing required collection parameter- @SuppressWarnings({"rawtypes"})- final SolrRequest request = new QueryRequest(params);+ final QueryRequest request = new QueryRequest(params);request.setPath("/admin/collections");expectThrows(Exception.class, () -> {@@ -231,8 +229,7 @@ public class CollectionsAPIDistributedZkTest extends SolrCloudTestCase {params.set(REPLICATION_FACTOR, 10);params.set("collection.configName", "conf");- @SuppressWarnings({"rawtypes"})- final SolrRequest request = new QueryRequest(params);+ final QueryRequest request = new QueryRequest(params);request.setPath("/admin/collections");expectThrows(Exception.class, () -> {@@ -249,8 +246,7 @@ public class CollectionsAPIDistributedZkTest extends SolrCloudTestCase {params.set("numShards", 0);params.set("collection.configName", "conf");- @SuppressWarnings({"rawtypes"})- final SolrRequest request = new QueryRequest(params);+ final QueryRequest request = new QueryRequest(params);request.setPath("/admin/collections");expectThrows(Exception.class, () -> {cluster.getSolrClient().request(request);diff --git a/solr/core/src/test/org/apache/solr/cloud/api/collections/ShardSplitTest.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/ShardSplitTest.javaindex 52cf66113e4..7fbdc97a18c 100644--- a/solr/core/src/test/org/apache/solr/cloud/api/collections/ShardSplitTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/ShardSplitTest.java@@ -35,7 +35,6 @@ import java.util.concurrent.atomic.AtomicReference;import org.apache.lucene.util.LuceneTestCase.Slow;import org.apache.solr.client.solrj.SolrQuery;-import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.BaseHttpSolrClient;@@ -1035,8 +1034,7 @@ public class ShardSplitTest extends BasicDistributedZkTest {if (splitKey != null) {params.set("split.key", splitKey);}- @SuppressWarnings({"rawtypes"})- SolrRequest request = new QueryRequest(params);+ QueryRequest request = new QueryRequest(params);request.setPath("/admin/collections");String baseUrl = ((HttpSolrClient) shardToJetty.get(SHARD1).get(0).client.getSolrClient()).getBaseURL();diff --git a/solr/core/src/test/org/apache/solr/cloud/api/collections/TestCollectionAPI.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/TestCollectionAPI.javaindex d9834e416ab..cd0a091ff80 100644--- a/solr/core/src/test/org/apache/solr/cloud/api/collections/TestCollectionAPI.java+++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/TestCollectionAPI.java@@ -27,6 +27,7 @@ import java.util.concurrent.atomic.AtomicLong;import com.google.common.collect.Lists;import org.apache.solr.client.solrj.SolrRequest;+import org.apache.solr.client.solrj.SolrResponse;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.cloud.SolrCloudManager;import org.apache.solr.client.solrj.embedded.JettySolrRunner;@@ -494,8 +495,7 @@ public class TestCollectionAPI extends ReplicaPropertiesBase {private static long totalexpectedV2Calls;- @SuppressWarnings({"rawtypes"})- public static SolrRequest setV2(SolrRequest req) {+ public static <T extends SolrResponse> SolrRequest<T> setV2(SolrRequest<T> req) {if (V2Request.v2Calls.get() == null) V2Request.v2Calls.set(new AtomicLong());totalexpectedV2Calls = V2Request.v2Calls.get().get();if (random().nextBoolean()) {@@ -704,8 +704,7 @@ public class TestCollectionAPI extends ReplicaPropertiesBase {missingParamsError(client, params);params.set("property.value", "true");- @SuppressWarnings({"rawtypes"})- SolrRequest request = new QueryRequest(params);+ QueryRequest request = new QueryRequest(params);request.setPath("/admin/collections");client.request(request);@@ -952,8 +951,7 @@ public class TestCollectionAPI extends ReplicaPropertiesBase {ModifiableSolrParams params = new ModifiableSolrParams();params.set("action", CollectionParams.CollectionAction.CREATE.toString());params.set("name", "invalid@name#with$weird%characters");- @SuppressWarnings({"rawtypes"})- SolrRequest request = new QueryRequest(params);+ QueryRequest request = new QueryRequest(params);request.setPath("/admin/collections");try {@@ -976,8 +974,7 @@ public class TestCollectionAPI extends ReplicaPropertiesBase {params.set("router.name", "implicit");params.set("numShards", "1");params.set("shards", "invalid@name#with$weird%characters");- @SuppressWarnings({"rawtypes"})- SolrRequest request = new QueryRequest(params);+ QueryRequest request = new QueryRequest(params);request.setPath("/admin/collections");try {@@ -998,8 +995,7 @@ public class TestCollectionAPI extends ReplicaPropertiesBase {params.set("action", CollectionParams.CollectionAction.CREATEALIAS.toString());params.set("name", "invalid@name#with$weird%characters");params.set("collections", COLLECTION_NAME);- @SuppressWarnings({"rawtypes"})- SolrRequest request = new QueryRequest(params);+ QueryRequest request = new QueryRequest(params);request.setPath("/admin/collections");try {@@ -1023,8 +1019,7 @@ public class TestCollectionAPI extends ReplicaPropertiesBase {params.set("name", "valid_collection_name");params.set("shards", "a");params.set("router.name", "implicit");- @SuppressWarnings({"rawtypes"})- SolrRequest request = new QueryRequest(params);+ QueryRequest request = new QueryRequest(params);request.setPath("/admin/collections");client.request(request);@@ -1068,8 +1063,7 @@ public class TestCollectionAPI extends ReplicaPropertiesBase {private void missingParamsError(CloudSolrClient client, ModifiableSolrParams origParams)throws IOException, SolrServerException {- @SuppressWarnings({"rawtypes"})- SolrRequest request;+ QueryRequest request;try {request = new QueryRequest(origParams);request.setPath("/admin/collections");diff --git a/solr/core/src/test/org/apache/solr/cloud/api/collections/TestReplicaProperties.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/TestReplicaProperties.javaindex 016892997da..945446f21cd 100644--- a/solr/core/src/test/org/apache/solr/cloud/api/collections/TestReplicaProperties.java+++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/TestReplicaProperties.java@@ -22,7 +22,6 @@ import java.util.List;import java.util.Map;import org.apache.lucene.util.LuceneTestCase.Slow;-import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.QueryRequest;@@ -73,8 +72,7 @@ public class TestReplicaProperties extends ReplicaPropertiesBase {try (CloudSolrClient client = createCloudClient(null)) {ModifiableSolrParams params = new ModifiableSolrParams();params.set("action", CollectionParams.CollectionAction.LIST.toString());- @SuppressWarnings({"rawtypes"})- SolrRequest request = new QueryRequest(params);+ QueryRequest request = new QueryRequest(params);request.setPath("/admin/collections");NamedList<Object> rsp = client.request(request);diff --git a/solr/core/src/test/org/apache/solr/core/BlobRepositoryMockingTest.java b/solr/core/src/test/org/apache/solr/core/BlobRepositoryMockingTest.javaindex 7e064153390..05ad8e1b735 100644--- a/solr/core/src/test/org/apache/solr/core/BlobRepositoryMockingTest.java+++ b/solr/core/src/test/org/apache/solr/core/BlobRepositoryMockingTest.java@@ -104,8 +104,7 @@ public class BlobRepositoryMockingTest {public void testCloudOnly() {when(mockContainer.isZooKeeperAware()).thenReturn(false);try {- @SuppressWarnings({"rawtypes"})- BlobRepository.BlobContentRef ref = repository.getBlobIncRef("foo!");+ BlobRepository.BlobContentRef<ByteBuffer> ref = repository.getBlobIncRef("foo!");} catch (SolrException e) {verify(mockContainer).isZooKeeperAware();throw e;@@ -115,9 +114,8 @@ public class BlobRepositoryMockingTest {@Testpublic void testGetBlobIncrRefString() {when(mockContainer.isZooKeeperAware()).thenReturn(true);- @SuppressWarnings({"rawtypes"})- BlobRepository.BlobContentRef ref = repository.getBlobIncRef("foo!");- assertTrue("foo!".equals(blobKey));+ BlobRepository.BlobContentRef<ByteBuffer> ref = repository.getBlobIncRef("foo!");+ assertEquals("foo!", blobKey);assertTrue(blobFetched);assertNotNull(ref.blob);assertEquals(blobData, ref.blob.get());@@ -131,10 +129,9 @@ public class BlobRepositoryMockingTest {when(mockContainer.isZooKeeperAware()).thenReturn(true);filecontent = TestSolrConfigHandler.getFileContent("runtimecode/runtimelibs_v2.jar.bin");url = "http://localhost:8080/myjar/location.jar";- @SuppressWarnings({"rawtypes"})- BlobRepository.BlobContentRef ref = repository.getBlobIncRef( "filefoo",null,url,+ BlobRepository.BlobContentRef<?> ref = repository.getBlobIncRef( "filefoo",null,url,"bc5ce45ad281b6a08fb7e529b1eb475040076834816570902acb6ebdd809410e31006efdeaa7f78a6c35574f3504963f5f7e4d92247d0eb4db3fc9abdda5d417");- assertTrue("filefoo".equals(blobKey));+ assertEquals("filefoo", blobKey);assertTrue(blobFetched);assertNotNull(ref.blob);assertEquals(filecontent, ref.blob.get());@@ -155,8 +152,7 @@ public class BlobRepositoryMockingTest {public void testCachedAlready() {when(mockContainer.isZooKeeperAware()).thenReturn(true);when(mapMock.get("foo!")).thenReturn(new BlobRepository.BlobContent<BlobRepository>("foo!", blobData));- @SuppressWarnings({"rawtypes"})- BlobRepository.BlobContentRef ref = repository.getBlobIncRef("foo!");+ BlobRepository.BlobContentRef<ByteBuffer> ref = repository.getBlobIncRef("foo!");assertEquals("",blobKey);assertFalse(blobFetched);assertNotNull(ref.blob);@@ -168,10 +164,9 @@ public class BlobRepositoryMockingTest {@Testpublic void testGetBlobIncrRefStringDecoder() {when(mockContainer.isZooKeeperAware()).thenReturn(true);- @SuppressWarnings({"rawtypes"})- BlobRepository.BlobContentRef ref = repository.getBlobIncRef("foo!", new BlobRepository.Decoder<Object>() {+ BlobRepository.BlobContentRef<Object> ref = repository.getBlobIncRef("foo!", new BlobRepository.Decoder<>() {@Override- public Object decode(InputStream inputStream) {+ public String[][] decode(InputStream inputStream) {StringWriter writer = new StringWriter();try {IOUtils.copy(inputStream, writer, UTF8);diff --git a/solr/core/src/test/org/apache/solr/core/DirectoryFactoryTest.java b/solr/core/src/test/org/apache/solr/core/DirectoryFactoryTest.javaindex 402816bc379..f614bc7ae3c 100755--- a/solr/core/src/test/org/apache/solr/core/DirectoryFactoryTest.java+++ b/solr/core/src/test/org/apache/solr/core/DirectoryFactoryTest.java@@ -77,20 +77,19 @@ public class DirectoryFactoryTest extends SolrTestCase {doTestGetDataHome(ByteBuffersDirectoryFactory.class);}- @SuppressWarnings({"unchecked", "rawtypes"})private void doTestGetDataHome(Class<? extends DirectoryFactory> directoryFactoryClass) 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());+ df.init(new NamedList<>());// No solr.data.home property set. Absolute instanceDirassertDataHome("/tmp/inst1/data", "/tmp/inst1", df, cc);// Simulate solr.data.home set in solrconfig.xml <directoryFactory> tag- NamedList args = new NamedList();+ NamedList<String> args = new NamedList<>();args.add("solr.data.home", "/solrdata/");df.init(args);assertDataHome("/solrdata/inst_dir/data", "inst_dir", df, cc);@@ -101,7 +100,7 @@ public class DirectoryFactoryTest extends SolrTestCase {cc = new CoreContainer(config);df = directoryFactoryClass.getConstructor().newInstance();df.initCoreContainer(cc);- df.init(new NamedList());+ df.init(new NamedList<>());assertDataHome(solrHome.resolve("solrdata/inst_dir/data").toAbsolutePath().toString(), "inst_dir", df, cc);// Test parsing last component of instanceDir, and using custom dataDirassertDataHome(solrHome.resolve("solrdata/myinst/mydata").toAbsolutePath().toString(), "/path/to/myinst", df, cc, "dataDir", "mydata");@@ -111,7 +110,7 @@ public class DirectoryFactoryTest extends SolrTestCase {cc = new CoreContainer(config);df = directoryFactoryClass.getConstructor().newInstance();df.initCoreContainer(cc);- df.init(new NamedList());+ df.init(new NamedList<>());assertDataHome("/foo/inst_dir/data", "inst_dir", df, cc);}diff --git a/solr/core/src/test/org/apache/solr/core/TestConfigSetProperties.java b/solr/core/src/test/org/apache/solr/core/TestConfigSetProperties.javaindex 8fe953e3649..767bdff4f00 100644--- a/solr/core/src/test/org/apache/solr/core/TestConfigSetProperties.java+++ b/solr/core/src/test/org/apache/solr/core/TestConfigSetProperties.java@@ -19,10 +19,10 @@ package org.apache.solr.core;import java.nio.charset.StandardCharsets;import java.nio.file.Files;import java.nio.file.Path;+import java.util.Collections;import java.util.Map;import com.carrotsearch.randomizedtesting.rules.SystemPropertiesRestoreRule;-import com.google.common.collect.ImmutableMap;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.common.SolrException;import org.apache.solr.common.SolrException.ErrorCode;@@ -62,8 +62,7 @@ public class TestConfigSetProperties extends SolrTestCaseJ4 {@Testpublic void testEmptyMap() throws Exception {- @SuppressWarnings({"rawtypes"})- NamedList list = createConfigSetProps(Utils.toJSONString(ImmutableMap.of()));+ NamedList<?> list = createConfigSetProps(Utils.toJSONString(Collections.emptyMap()));assertEquals(0, list.size());}diff --git a/solr/core/src/test/org/apache/solr/core/TestLazyCores.java b/solr/core/src/test/org/apache/solr/core/TestLazyCores.javaindex 30bfdc0b7cf..11aa24694bc 100644--- a/solr/core/src/test/org/apache/solr/core/TestLazyCores.java+++ b/solr/core/src/test/org/apache/solr/core/TestLazyCores.java@@ -18,6 +18,7 @@ package org.apache.solr.core;import java.io.File;import java.io.IOException;+import java.lang.reflect.Array;import java.nio.charset.StandardCharsets;import java.util.ArrayList;import java.util.Arrays;@@ -252,12 +253,10 @@ public class TestLazyCores extends SolrTestCaseJ4 {SolrQueryResponse resp = new SolrQueryResponse();handler.handleRequest(makeReq(core1, CommonParams.QT, "/admin/metrics"), resp);- @SuppressWarnings({"rawtypes"})- NamedList values = resp.getValues();+ NamedList<?> values = resp.getValues();assertNotNull(values.get("metrics"));- values = (NamedList) values.get("metrics");- @SuppressWarnings({"rawtypes"})- NamedList nl = (NamedList) values.get("solr.core.collection2");+ values = (NamedList<?>) values.get("metrics");+ NamedList<?> nl = (NamedList<?>) values.get("solr.core.collection2");assertNotNull(nl);Object o = nl.get("REPLICATION./replication.indexPath");assertNotNull(o);@@ -750,7 +749,6 @@ public class TestLazyCores extends SolrTestCaseJ4 {updater.addDoc(cmd);}- @SuppressWarnings({"unchecked", "rawtypes"})private LocalSolrQueryRequest makeReq(SolrCore core, String... q) {if (q.length == 1) {return new LocalSolrQueryRequest(core,@@ -759,7 +757,9 @@ public class TestLazyCores extends SolrTestCaseJ4 {if (q.length % 2 != 0) {throw new RuntimeException("The length of the string array (query arguments) needs to be even");}- NamedList.NamedListEntry[] entries = new NamedList.NamedListEntry[q.length / 2];+ @SuppressWarnings("unchecked")+ NamedList.NamedListEntry<String>[] entries = (NamedList.NamedListEntry<String>[])+ Array.newInstance(NamedList.NamedListEntry.class, q.length / 2);for (int i = 0; i < q.length; i += 2) {entries[i / 2] = new NamedList.NamedListEntry<>(q[i], q[i + 1]);}diff --git a/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java b/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.javaindex 2244c21fb2b..728b9f31f28 100644--- a/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java+++ b/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java@@ -83,14 +83,14 @@ public class TestSolrConfigHandler extends RestTestBase {File file = loadFromClassPath ? getFile(f): new File(f);try (FileInputStream fis = new FileInputStream(file)) {byte[] buf = new byte[fis.available()];+ // TODO: This should check that we read the entire streamfis.read(buf);jar = ByteBuffer.wrap(buf);}return jar;}- public static ByteBuffer persistZip(String loc,- @SuppressWarnings({"rawtypes"})Class... classes) throws IOException {+ public static ByteBuffer persistZip(String loc, Class<?>... classes) throws IOException {ByteBuffer jar = generateZip(classes);try (FileOutputStream fos = new FileOutputStream(loc)){fos.write(jar.array(), 0, jar.limit());@@ -99,11 +99,11 @@ public class TestSolrConfigHandler extends RestTestBase {return jar;}- public static ByteBuffer generateZip(@SuppressWarnings({"rawtypes"})Class... classes) throws IOException {+ public static ByteBuffer generateZip(Class<?>... classes) throws IOException {SimplePostTool.BAOS bos = new SimplePostTool.BAOS();try (ZipOutputStream zipOut = new ZipOutputStream(bos)) {zipOut.setLevel(ZipOutputStream.DEFLATED);- for (@SuppressWarnings({"rawtypes"})Class c : classes) {+ for (Class<?> c : classes) {String path = c.getName().replace('.', '/').concat(".class");ZipEntry entry = new ZipEntry(path);ByteBuffer b = SimplePostTool.inputStreamToByteArray(c.getClassLoader().getResourceAsStream(path));@@ -216,30 +216,25 @@ public class TestSolrConfigHandler extends RestTestBase {reqhandlertests(restTestHarness, null, null);}- @SuppressWarnings({"rawtypes"})- public static Map runConfigCommand(RestTestHarness harness, String uri, String payload) throws IOException {+ public static void runConfigCommand(RestTestHarness harness, String uri, String payload) throws IOException {String json = SolrTestCaseJ4.json(payload);log.info("going to send config command. path {} , payload: {}", uri, payload);String response = harness.post(uri, json);- Map map = (Map) Utils.fromJSONString(response);+ Map<?, ?> map = (Map<?, ?>) Utils.fromJSONString(response);assertNull(response, map.get("errorMessages"));assertNull(response, map.get("errors")); // Will this ever be returned?- return map;}public static void runConfigCommandExpectFailure(RestTestHarness harness, String uri, String payload, String expectedErrorMessage) throws Exception {String json = SolrTestCaseJ4.json(payload);log.info("going to send config command. path {} , payload: {}", uri, payload);String response = harness.post(uri, json);- @SuppressWarnings({"rawtypes"})- Map map = (Map)Utils.fromJSONString(response);+ Map<?, ?> map = (Map<?, ?>)Utils.fromJSONString(response);assertNotNull(response, map.get("errorMessages"));assertNotNull(response, map.get("error"));- assertTrue("Expected status != 0: " + response, 0L != (Long)((Map)map.get("responseHeader")).get("status"));- @SuppressWarnings({"rawtypes"})- List errorDetails = (List)((Map)map.get("error")).get("details");- @SuppressWarnings({"rawtypes"})- List errorMessages = (List)((Map)errorDetails.get(0)).get("errorMessages");+ assertTrue("Expected status != 0: " + response, 0L != (Long)((Map<?, ?>)map.get("responseHeader")).get("status"));+ List<?> errorDetails = (List<?>)((Map<?, ?>)map.get("error")).get("details");+ List<?> errorMessages = (List<?>)((Map<?, ?>)errorDetails.get(0)).get("errorMessages");assertTrue("Expected '" + expectedErrorMessage + "': " + response,errorMessages.get(0).toString().contains(expectedErrorMessage));}@@ -313,8 +308,7 @@ public class TestSolrConfigHandler extends RestTestBase {int maxTimeoutSeconds = 10;while (TimeUnit.SECONDS.convert(System.nanoTime() - startTime, TimeUnit.NANOSECONDS) < maxTimeoutSeconds) {String uri = "/config/overlay";- @SuppressWarnings({"rawtypes"})- Map m = testServerBaseUrl == null ? getRespMap(uri, writeHarness) : TestSolrConfigHandlerConcurrent.getAsMap(testServerBaseUrl + uri, cloudSolrClient);+ Map<?, ?> m = testServerBaseUrl == null ? getRespMap(uri, writeHarness) : TestSolrConfigHandlerConcurrent.getAsMap(testServerBaseUrl + uri, cloudSolrClient);if (null == Utils.getObjectByPath(m, true, asList("overlay", "requestHandler", "/x", "a"))) {success = true;break;@@ -463,8 +457,7 @@ public class TestSolrConfigHandler extends RestTestBase {"'create-initparams' : { 'name' : 'hello', 'key':'val'}\n" +"}";runConfigCommand(writeHarness, "/config", payload);- @SuppressWarnings({"rawtypes"})- Map map = testForResponseElement(writeHarness,+ Map<?, ?> map = testForResponseElement(writeHarness,testServerBaseUrl,"/config",cloudSolrClient,@@ -472,8 +465,7 @@ public class TestSolrConfigHandler extends RestTestBase {null,TIMEOUT_S);- @SuppressWarnings({"rawtypes"})- List l = (List) Utils.getObjectByPath(map, false, asList("config", "initParams"));+ List<?> l = (List<?>) Utils.getObjectByPath(map, false, asList("config", "initParams"));assertNotNull("no object /config/initParams : "+ map , l);assertEquals( 2, l.size());assertEquals( "val", ((Map)l.get(1)).get("key") );@@ -519,8 +511,7 @@ public class TestSolrConfigHandler extends RestTestBase {TIMEOUT_S);map = getRespMap("/dump100?json.nl=arrmap&initArgs=true", writeHarness);- @SuppressWarnings({"rawtypes"})- List initArgs = (List) map.get("initArgs");+ List<?> initArgs = (List<?>) map.get("initArgs");assertNotNull(initArgs);assertTrue(initArgs.size() >= 2);assertTrue(((Map)initArgs.get(2)).containsKey("suggester"));@@ -589,17 +580,14 @@ public class TestSolrConfigHandler extends RestTestBase {public static class CacheTest extends DumpRequestHandler {@Override- @SuppressWarnings({"unchecked"})public void handleRequestBody(SolrQueryRequest req, SolrQueryResponse rsp) throws IOException {super.handleRequestBody(req, rsp);String[] caches = req.getParams().getParams("cacheNames");if(caches != null && caches.length>0){- @SuppressWarnings({"rawtypes"})- HashMap m = new HashMap();+ HashMap<String, String> m = new HashMap<>();rsp.add("caches", m);for (String c : caches) {- @SuppressWarnings({"rawtypes"})- SolrCache cache = req.getSearcher().getCache(c);+ SolrCache<?, ?> cache = req.getSearcher().getCache(c);if(cache != null) m.put(c, cache.getClass().getName());}}@@ -887,18 +875,17 @@ public class TestSolrConfigHandler extends RestTestBase {RESTfulServerProvider oldProvider = restTestHarness.getServerProvider();restTestHarness.setServerProvider(() -> jetty.getBaseUrl().toString() + "/____v2/cores/" + DEFAULT_TEST_CORENAME);- @SuppressWarnings({"rawtypes"})- Map rsp = TestSolrConfigHandler.testForResponseElement(+ Map<?, ?> rsp = TestSolrConfigHandler.testForResponseElement(harness,null,"/something/part1_Value/fixed/part2_Value?urlTemplateValues=part1&urlTemplateValues=part2",null,asList("urlTemplateValues"),- new ValidatingJsonMap.PredicateWithErrMsg() {+ new ValidatingJsonMap.PredicateWithErrMsg<>() {@Overridepublic String test(Object o) {if (o instanceof Map) {- Map m = (Map) o;+ Map<?, ?> m = (Map<?, ?>) o;if ("part1_Value".equals(m.get("part1")) && "part2_Value".equals(m.get("part2"))) return null;}@@ -923,7 +910,7 @@ public class TestSolrConfigHandler extends RestTestBase {return (LinkedHashMapWriter) Utils.MAPWRITEROBJBUILDER.apply(Utils.getJSONParser(new StringReader(response))).getVal();} catch (JSONParser.ParseException e) {log.error(response);- return new LinkedHashMapWriter();+ return new LinkedHashMapWriter<>();}}}diff --git a/solr/core/src/test/org/apache/solr/filestore/TestDistribPackageStore.java b/solr/core/src/test/org/apache/solr/filestore/TestDistribPackageStore.javaindex 6fd4f7be90a..e25be647f98 100644--- a/solr/core/src/test/org/apache/solr/filestore/TestDistribPackageStore.java+++ b/solr/core/src/test/org/apache/solr/filestore/TestDistribPackageStore.java@@ -17,7 +17,6 @@package org.apache.solr.filestore;-import com.google.common.collect.ImmutableSet;import org.apache.commons.codec.digest.DigestUtils;import org.apache.http.client.methods.HttpDelete;import org.apache.solr.client.solrj.SolrClient;@@ -139,11 +138,9 @@ public class TestDistribPackageStore extends SolrCloudTestCase {checkAllNodesForFile(cluster,"/package/mypkg/v1.0/runtimelibs_v2.jar", expected, false);expected = Map.of(":files:/package/mypkg/v1.0", (Predicate<Object>) o -> {- @SuppressWarnings({"rawtypes"})- List l = (List) o;+ List<?> l = (List<?>) o;assertEquals(2, l.size());- @SuppressWarnings({"rawtypes"})- Set expectedKeys = ImmutableSet.of("runtimelibs_v2.jar", "runtimelibs.jar");+ Set<String> expectedKeys = Set.of("runtimelibs_v2.jar", "runtimelibs.jar");for (Object file : l) {if(! expectedKeys.contains(Utils.getObjectByPath(file, true, "name"))) return false;}@@ -170,8 +167,7 @@ public class TestDistribPackageStore extends SolrCloudTestCase {}}- @SuppressWarnings({"unchecked", "rawtypes"})- public static void checkAllNodesForFile(MiniSolrCloudCluster cluster, String path, Map expected , boolean verifyContent) throws Exception {+ public static void checkAllNodesForFile(MiniSolrCloudCluster cluster, String path, Map<String, Object> expected , boolean verifyContent) throws Exception {for (JettySolrRunner jettySolrRunner : cluster.getJettySolrRunners()) {String baseUrl = jettySolrRunner.getBaseUrl().toString().replace("/solr", "/api");String url = baseUrl + "/node/files" + path + "?wt=javabin&meta=true";@@ -215,7 +211,7 @@ public class TestDistribPackageStore extends SolrCloudTestCase {}public static NavigableObject assertResponseValues(int repeats, SolrClient client,- @SuppressWarnings({"rawtypes"})SolrRequest req,+ SolrRequest<?> req,Map<String, Object> vals) throws Exception {Callable<NavigableObject> callable = () -> req.process(client);diff --git a/solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerConcurrent.java b/solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerConcurrent.javaindex c7c3598b5c0..968db782e8d 100644--- a/solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerConcurrent.java+++ b/solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerConcurrent.java@@ -55,24 +55,18 @@ public class TestSolrConfigHandlerConcurrent extends AbstractFullDistribZkTestBa@Testpublic void test() throws Exception {- @SuppressWarnings({"rawtypes"})- Map editable_prop_map = (Map) Utils.fromJSONResource("EditableSolrConfigAttributes.json");- @SuppressWarnings({"rawtypes"})- Map caches = (Map) editable_prop_map.get("query");+ Map<?, ?> editable_prop_map = (Map<?, ?>) Utils.fromJSONResource("EditableSolrConfigAttributes.json");+ Map<?, ?> caches = (Map<?, ?>) editable_prop_map.get("query");setupRestTestHarnesses();List<Thread> threads = new ArrayList<>(caches.size());- @SuppressWarnings({"rawtypes"})- final List<List> collectErrors = new ArrayList<>();+ final List<List<String>> collectErrors = new ArrayList<>();- for (Object o : caches.entrySet()) {- @SuppressWarnings({"rawtypes"})- final Map.Entry e = (Map.Entry) o;+ for (Map.Entry<?, ?> e : caches.entrySet()) {if (e.getValue() instanceof Map) {List<String> errs = new ArrayList<>();collectErrors.add(errs);- @SuppressWarnings({"rawtypes"})- Map value = (Map) e.getValue();+ Map<?, ?> value = (Map<?, ?>) e.getValue();Thread t = new Thread(() -> {try {invokeBulkCall((String)e.getKey() , errs, value);@@ -90,7 +84,7 @@ public class TestSolrConfigHandlerConcurrent extends AbstractFullDistribZkTestBaboolean success = true;- for (@SuppressWarnings({"rawtypes"})List e : collectErrors) {+ for (List<?> e : collectErrors) {if(!e.isEmpty()){success = false;log.error("{}", e);@@ -105,7 +99,8 @@ public class TestSolrConfigHandlerConcurrent extends AbstractFullDistribZkTestBaprivate void invokeBulkCall(String cacheName, List<String> errs,- @SuppressWarnings({"rawtypes"})Map val) throws Exception {+ // TODO this is unused - is that a bug?+ Map<?, ?> val) throws Exception {String payload = "{" +"'set-property' : {'query.CACHENAME.size':'CACHEVAL1'," +@@ -134,8 +129,7 @@ public class TestSolrConfigHandlerConcurrent extends AbstractFullDistribZkTestBapublisher.close();}- @SuppressWarnings({"rawtypes"})- Map map = (Map) Utils.fromJSONString(response);+ Map<?, ?> map = (Map<?, ?>) Utils.fromJSONString(response);Object errors = map.get("errors");if(errors!= null){errs.add(new String(Utils.toJSON(errors), StandardCharsets.UTF_8));diff --git a/solr/core/src/test/org/apache/solr/handler/admin/HealthCheckHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/HealthCheckHandlerTest.javaindex 25b66939f2f..5e8f16635d4 100644--- a/solr/core/src/test/org/apache/solr/handler/admin/HealthCheckHandlerTest.java+++ b/solr/core/src/test/org/apache/solr/handler/admin/HealthCheckHandlerTest.java@@ -60,8 +60,7 @@ public class HealthCheckHandlerTest extends SolrCloudTestCase {@Testpublic void testHealthCheckHandler() throws Exception {- @SuppressWarnings({"rawtypes"})- SolrRequest req = new GenericSolrRequest(SolrRequest.METHOD.GET, HEALTH_CHECK_HANDLER_PATH, new ModifiableSolrParams());+ GenericSolrRequest req = new GenericSolrRequest(SolrRequest.METHOD.GET, HEALTH_CHECK_HANDLER_PATH, new ModifiableSolrParams());// positive check that our only existing "healthy" node works with cloud client// NOTE: this is using GenericSolrRequest, not HealthCheckRequest which is why it passesdiff --git a/solr/core/src/test/org/apache/solr/handler/admin/TestApiFramework.java b/solr/core/src/test/org/apache/solr/handler/admin/TestApiFramework.javaindex 8f5a62daa39..a192f1b9bf3 100644--- a/solr/core/src/test/org/apache/solr/handler/admin/TestApiFramework.java+++ b/solr/core/src/test/org/apache/solr/handler/admin/TestApiFramework.java@@ -371,23 +371,18 @@ public class TestApiFramework extends SolrTestCaseJ4 {}- public static void assertConditions(@SuppressWarnings({"rawtypes"})Map root,- @SuppressWarnings({"rawtypes"})Map conditions) {- for (Object o : conditions.entrySet()) {- @SuppressWarnings({"rawtypes"})- Map.Entry e = (Map.Entry) o;- String path = (String) e.getKey();+ public static void assertConditions(Map<?, ?> root, Map<String, Object> conditions) {+ for (Map.Entry<String, Object> e : conditions.entrySet()) {+ String path = e.getKey();List<String> parts = StrUtils.splitSmart(path, path.charAt(0) == '/' ? '/' : ' ', true);Object val = Utils.getObjectByPath(root, false, parts);if (e.getValue() instanceof ValidatingJsonMap.PredicateWithErrMsg) {- @SuppressWarnings({"rawtypes"})- ValidatingJsonMap.PredicateWithErrMsg value = (ValidatingJsonMap.PredicateWithErrMsg) e.getValue();- @SuppressWarnings({"unchecked"})+ @SuppressWarnings("unchecked")+ ValidatingJsonMap.PredicateWithErrMsg<Object> value = (ValidatingJsonMap.PredicateWithErrMsg<Object>) e.getValue();String err = value.test(val);if (err != null) {assertEquals(err + " for " + e.getKey() + " in :" + Utils.toJSONString(root), e.getValue(), val);}-} else {assertEquals("incorrect value for path " + e.getKey() + " in :" + Utils.toJSONString(root), e.getValue(), val);}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.javaindex a076d94ad43..fa6e96e93e8 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@@ -208,8 +208,8 @@ public class TestCollectionAPIs extends SolrTestCaseJ4 {final String payload, final CoreContainer cc, String expectedOutputMapJson) throws Exception {Pair<SolrQueryRequest, SolrQueryResponse> ctx = makeCall(apiBag, path, method, payload, cc);ZkNodeProps output = (ZkNodeProps) ctx.second().getValues().get(ZkNodeProps.class.getName());- @SuppressWarnings({"rawtypes"})- Map expected = (Map) fromJSONString(expectedOutputMapJson);+ @SuppressWarnings("unchecked")+ Map<String, ?> expected = (Map<String, ?>) fromJSONString(expectedOutputMapJson);assertMapEqual(expected, output);return output;}@@ -260,12 +260,10 @@ public class TestCollectionAPIs extends SolrTestCaseJ4 {return new Pair<>(req, rsp);}- private static void assertMapEqual(@SuppressWarnings({"rawtypes"})Map expected, ZkNodeProps actual) {+ private static void assertMapEqual(Map<String, ?> expected, ZkNodeProps actual) {assertEquals(errorMessage(expected, actual), expected.size(), actual.getProperties().size());- for (Object o : expected.entrySet()) {- @SuppressWarnings({"rawtypes"})- Map.Entry e = (Map.Entry) o;- Object actualVal = actual.get((String) e.getKey());+ for (Map.Entry<String, ?> e : expected.entrySet()) {+ Object actualVal = actual.get(e.getKey());if (actualVal instanceof String[]) {actualVal = Arrays.asList((String[]) actualVal);}@@ -273,7 +271,7 @@ public class TestCollectionAPIs extends SolrTestCaseJ4 {}}- private static String errorMessage(@SuppressWarnings({"rawtypes"})Map expected, ZkNodeProps actual) {+ private static String errorMessage(Map<?, ?> expected, ZkNodeProps actual) {return "expected: " + Utils.toJSONString(expected) + "\nactual: " + Utils.toJSONString(actual);}diff --git a/solr/core/src/test/org/apache/solr/handler/component/CustomHighlightComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/CustomHighlightComponentTest.javaindex 8bc537b60a1..016df2fb105 100644--- a/solr/core/src/test/org/apache/solr/handler/component/CustomHighlightComponentTest.java+++ b/solr/core/src/test/org/apache/solr/handler/component/CustomHighlightComponentTest.java@@ -16,6 +16,7 @@*/package org.apache.solr.handler.component;+import java.lang.reflect.Array;import java.util.ArrayList;import java.util.HashSet;import java.util.List;@@ -49,7 +50,6 @@ public class CustomHighlightComponentTest extends SolrCloudTestCase {}@Override- @SuppressWarnings({"unchecked"})protected Object convertHighlights(NamedList<Object> hl) {final ArrayList<SimpleOrderedMap<Object>> hlMaps = new ArrayList<>();for (int i=0; i<hl.size(); ++i) {@@ -62,18 +62,16 @@ public class CustomHighlightComponentTest extends SolrCloudTestCase {}@Override- @SuppressWarnings({"rawtypes"})protected Object[] newHighlightsArray(int size) {- return new SimpleOrderedMap[size];+ return (SimpleOrderedMap<?>[]) Array.newInstance(SimpleOrderedMap.class, size);}@Overrideprotected void addHighlights(Object[] objArr, Object obj, Map<Object, ShardDoc> resultIds) {- @SuppressWarnings({"rawtypes"})- SimpleOrderedMap[] mapArr = (SimpleOrderedMap[])objArr;- @SuppressWarnings({"unchecked", "rawtypes"})- final ArrayList<SimpleOrderedMap> hlMaps = (ArrayList<SimpleOrderedMap>)obj;- for (@SuppressWarnings({"rawtypes"})SimpleOrderedMap hlMap : hlMaps) {+ SimpleOrderedMap<?>[] mapArr = (SimpleOrderedMap<?>[])objArr;+ @SuppressWarnings("unchecked")+ final ArrayList<SimpleOrderedMap<?>> hlMaps = (ArrayList<SimpleOrderedMap<?>>)obj;+ for (SimpleOrderedMap<?> hlMap : hlMaps) {String id = (String)hlMap.get(id_key);ShardDoc sdoc = resultIds.get(id);int idx = sdoc.positionInResponse;@@ -83,12 +81,10 @@ public class CustomHighlightComponentTest extends SolrCloudTestCase {@Overrideprotected Object getAllHighlights(Object[] objArr) {- @SuppressWarnings({"rawtypes"})- final SimpleOrderedMap[] mapArr = (SimpleOrderedMap[])objArr;+ final SimpleOrderedMap<?>[] mapArr = (SimpleOrderedMap<?>[])objArr;// remove nulls in case not all docs were able to be retrieved- @SuppressWarnings({"rawtypes"})- ArrayList<SimpleOrderedMap> mapList = new ArrayList<>();- for (@SuppressWarnings({"rawtypes"})SimpleOrderedMap map : mapArr) {+ ArrayList<SimpleOrderedMap<?>> mapList = new ArrayList<>();+ for (SimpleOrderedMap<?> map : mapArr) {if (map != null) {mapList.add(map);}diff --git a/solr/core/src/test/org/apache/solr/handler/component/DistributedDebugComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/DistributedDebugComponentTest.javaindex 46df2ed8bc1..506219a0b49 100644--- a/solr/core/src/test/org/apache/solr/handler/component/DistributedDebugComponentTest.java+++ b/solr/core/src/test/org/apache/solr/handler/component/DistributedDebugComponentTest.java@@ -420,16 +420,15 @@ public class DistributedDebugComponentTest extends SolrJettyTestBase {assertEquals(section + " debug should be equal", distrib.getDebugMap().get(section), nonDistrib.getDebugMap().get(section));}- @SuppressWarnings({"unchecked", "rawtypes"})- private void assertSameKeys(NamedList object, NamedList object2) {- Iterator<Map.Entry<String,Object>> iteratorObj2 = (object2).iterator();- for (Map.Entry<String,Object> entry:(NamedList<Object>)object) {+ private void assertSameKeys(NamedList<?> object, NamedList<?> object2) {+ Iterator<? extends Map.Entry<String, ?>> iteratorObj2 = object2.iterator();+ for (Map.Entry<String, ?> entry: object) {assertTrue(iteratorObj2.hasNext());- Map.Entry<String,Object> entry2 = iteratorObj2.next();+ Map.Entry<String, ?> entry2 = iteratorObj2.next();assertEquals(entry.getKey(), entry2.getKey());if (entry.getValue() instanceof NamedList) {assertTrue(entry2.getValue() instanceof NamedList);- assertSameKeys((NamedList)entry.getValue(), (NamedList)entry2.getValue());+ assertSameKeys((NamedList<?>)entry.getValue(), (NamedList<?>)entry2.getValue());}}assertFalse(iteratorObj2.hasNext());diff --git a/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotLargeTest.java b/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotLargeTest.javaindex 8276f943b0c..e4f10db76b1 100644--- a/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotLargeTest.java+++ b/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotLargeTest.java@@ -972,8 +972,7 @@ public class DistributedFacetPivotLargeTest extends BaseDistributedSearchTestCas/*** asserts that the actual RangeFacet matches the expected criteria*/- private void assertRange(String name, Object start, Object gap, Object end, int numCount,- @SuppressWarnings({"rawtypes"})RangeFacet actual) {+ private <B, G> void assertRange(String name, B start, G gap, B end, int numCount, RangeFacet<B, G> actual) {assertEquals("NAME: " + actual.toString(), name, actual.getName());assertEquals("START: " + actual.toString(), start, actual.getStart());assertEquals("GAP: " + actual.toString(), gap, actual.getGap());diff --git a/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotLongTailTest.java b/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotLongTailTest.javaindex 4f94082a94f..2c230c70a08 100644--- a/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotLongTailTest.java+++ b/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotLongTailTest.java@@ -16,6 +16,7 @@*/package org.apache.solr.handler.component;+import java.util.ArrayList;import java.util.List;import org.apache.solr.BaseDistributedSearchTestCase;@@ -81,41 +82,40 @@ public class DistributedFacetPivotLongTailTest extends BaseDistributedSearchTestPivotField pivot = null;List<PivotField> pivots = null;- @SuppressWarnings({"unchecked", "rawtypes"})- List<PivotField>[] shardPivots = new List[clients.size()];+ List<List<PivotField>> shardPivots = new ArrayList<>(clients.size());for (int i = 0; i < clients.size(); i++) {- shardPivots[i] = clients.get(i).query( req ).getFacetPivot().get("foo_s,bar_s");+ shardPivots.add(clients.get(i).query( req ).getFacetPivot().get("foo_s,bar_s"));}// top 5 same on all shardsfor (int i = 0; i < 3; i++) {- assertEquals(10, shardPivots[i].size());+ assertEquals(10, shardPivots.get(i).size());for (int j = 0; j < 5; j++) {- pivot = shardPivots[i].get(j);+ pivot = shardPivots.get(i).get(j);assertEquals(pivot.toString(), "aaa"+j, pivot.getValue());assertEquals(pivot.toString(), 100, pivot.getCount());}}- // top 6-10 same on shard0 & shard11+ // top 6-10 same on shard0 & shard1for (int i = 0; i < 2; i++) {for (int j = 5; j < 10; j++) {- pivot = shardPivots[i].get(j);+ pivot = shardPivots.get(i).get(j);assertTrue(pivot.toString(), pivot.getValue().toString().startsWith("bbb"));assertEquals(pivot.toString(), 50, pivot.getCount());}}// 6-10 on shard2- assertEquals("junkA", shardPivots[2].get(5).getValue());- assertEquals(50, shardPivots[2].get(5).getCount());- assertEquals("tail", shardPivots[2].get(6).getValue());- assertEquals(45, shardPivots[2].get(6).getCount());+ assertEquals("junkA", shardPivots.get(2).get(5).getValue());+ assertEquals(50, shardPivots.get(2).get(5).getCount());+ assertEquals("tail", shardPivots.get(2).get(6).getValue());+ assertEquals(45, shardPivots.get(2).get(6).getCount());for (int j = 7; j < 10; j++) {- pivot = shardPivots[2].get(j);+ pivot = shardPivots.get(2).get(j);assertTrue(pivot.toString(), pivot.getValue().toString().startsWith("ZZZ"));assertEquals(pivot.toString(), 1, pivot.getCount());}// check sub-shardPivots on "tail" from shard2- pivots = shardPivots[2].get(6).getPivot();+ pivots = shardPivots.get(2).get(6).getPivot();assertEquals(6, pivots.size());for (int j = 0; j < 5; j++) {pivot = pivots.get(j);diff --git a/solr/core/src/test/org/apache/solr/handler/component/InfixSuggestersTest.java b/solr/core/src/test/org/apache/solr/handler/component/InfixSuggestersTest.javaindex 5d315a550a2..17d65c0bb20 100644--- a/solr/core/src/test/org/apache/solr/handler/component/InfixSuggestersTest.java+++ b/solr/core/src/test/org/apache/solr/handler/component/InfixSuggestersTest.java@@ -101,8 +101,7 @@ public class InfixSuggestersTest extends SolrTestCaseJ4 {ExecutorService executor = ExecutorUtil.newMDCAwareCachedThreadPool("InfixSuggesterTest");try {// Build the suggester in the background with a long dictionary- @SuppressWarnings({"rawtypes"})- Future job = executor.submit(() ->+ Future<?> job = executor.submit(() ->expectThrows(RuntimeException.class, SolrCoreState.CoreIsClosedException.class,() -> assertQ(req("qt", rh_analyzing_long,SuggesterParams.SUGGEST_BUILD_ALL, "true"),@@ -111,7 +110,7 @@ public class InfixSuggestersTest extends SolrTestCaseJ4 {// Stop the dictionary's input iteratorSystem.clearProperty(RandomTestDictionaryFactory.RandomTestDictionary.getEnabledSysProp("longRandomAnalyzingInfixSuggester"));- job.get();+ assertNotNull("Should have thrown exception", job.get());} finally {ExecutorUtil.shutdownAndAwaitTermination(executor);}@@ -126,8 +125,7 @@ public class InfixSuggestersTest extends SolrTestCaseJ4 {(SolrCoreState.CoreIsClosedException.class, SolrException.class, IllegalStateException.class, NullPointerException.class));final Throwable[] outerException = new Throwable[1];// Build the suggester in the background with a long dictionary- @SuppressWarnings({"rawtypes"})- Future job = executor.submit(() -> outerException[0] = expectThrowsAnyOf(expected,+ Future<?> job = executor.submit(() -> outerException[0] = expectThrowsAnyOf(expected,() -> assertQ(req("qt", rh_analyzing_long, SuggesterParams.SUGGEST_BUILD_ALL, "true"),"//str[@name='command'][.='buildAll']")));Thread.sleep(100); // TODO: is there a better way to ensure that the build has begun?diff --git a/solr/core/src/test/org/apache/solr/handler/component/PhrasesIdentificationComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/PhrasesIdentificationComponentTest.javaindex 9acf8274589..d2d9a47419b 100644--- a/solr/core/src/test/org/apache/solr/handler/component/PhrasesIdentificationComponentTest.java+++ b/solr/core/src/test/org/apache/solr/handler/component/PhrasesIdentificationComponentTest.java@@ -38,9 +38,9 @@ import org.apache.solr.schema.SchemaField;import org.junit.After;import org.junit.BeforeClass;import org.junit.Before;-import org.hamcrest.Description;-import org.hamcrest.Matcher;-import org.hamcrest.BaseMatcher;++import static org.hamcrest.Matchers.greaterThan;+import static org.hamcrest.Matchers.lessThan;public class PhrasesIdentificationComponentTest extends SolrTestCaseJ4 {@@ -381,7 +381,6 @@ public class PhrasesIdentificationComponentTest extends SolrTestCaseJ4 {}- @SuppressWarnings({"unchecked"})public void testWhiteboxScores() throws Exception {final SchemaField analysisField = h.getCore().getLatestSchema().getField("multigrams_body");assertNotNull(analysisField);@@ -428,6 +427,7 @@ public class PhrasesIdentificationComponentTest extends SolrTestCaseJ4 {final Phrase we_lazy = phrases.get(phrases.size()-2);assertEquals("we lAzY", we_lazy.getSubSequence());assertEquals(we_lazy.toString(), -1.0D, we_lazy.getFieldScore("multigrams_body"), 0.0D);+assertThat(we_lazy.toString(), we_lazy.getFieldScore("multigrams_title"), lessThan(0.0D));assertThat(we_lazy.toString(), we_lazy.getTotalScore(), lessThan(0.0D));assertEquals(we_lazy.toString(), we_lazy.getFieldScore("multigrams_title"), we_lazy.getTotalScore(),@@ -453,7 +453,6 @@ public class PhrasesIdentificationComponentTest extends SolrTestCaseJ4 {}- @SuppressWarnings({"unchecked"})public void testWhiteboxScorcesStopwords() throws Exception {final String input = "why the lazy dog brown fox";final Map<String,Double> fieldWeights = new TreeMap<>();@@ -771,29 +770,4 @@ public class PhrasesIdentificationComponentTest extends SolrTestCaseJ4 {Collections.emptyList(),stream.collect(Collectors.toList()));}-- /** helper, docs for future junit/hamcrest seems to have something similar */- @SuppressWarnings({"rawtypes"})- public static Matcher lessThan(double expected) {- return new BaseMatcher() {- @Override public boolean matches(Object actual) {- return ((Double)actual).compareTo(expected) < 0;- }- @Override public void describeTo(Description d) {- d.appendText("should be less than " + expected);- }- };- }- /** helper, docs for future junit/hamcrest seems to have something similar */- @SuppressWarnings({"rawtypes"})- public static Matcher greaterThan(double expected) {- return new BaseMatcher() {- @Override public boolean matches(Object actual) {- return 0 < ((Double)actual).compareTo(expected);- }- @Override public void describeTo(Description d) {- d.appendText("should be greater than " + expected);- }- };- }}diff --git a/solr/core/src/test/org/apache/solr/handler/component/ResourceSharingTestComponent.java b/solr/core/src/test/org/apache/solr/handler/component/ResourceSharingTestComponent.javaindex c8360fc840b..8558991083c 100644--- a/solr/core/src/test/org/apache/solr/handler/component/ResourceSharingTestComponent.java+++ b/solr/core/src/test/org/apache/solr/handler/component/ResourceSharingTestComponent.java@@ -88,7 +88,7 @@ public class ResourceSharingTestComponent extends SearchComponent implements Solreturn "1";}- class DumbCsvDecoder implements BlobRepository.Decoder<Object> {+ class DumbCsvDecoder implements BlobRepository.Decoder<TestObject> {private final Map<String, String> dict = new HashMap<>();public DumbCsvDecoder() {}diff --git a/solr/core/src/test/org/apache/solr/pkg/TestPackages.java b/solr/core/src/test/org/apache/solr/pkg/TestPackages.javaindex 651ebfe171e..8fc209530ed 100644--- a/solr/core/src/test/org/apache/solr/pkg/TestPackages.java+++ b/solr/core/src/test/org/apache/solr/pkg/TestPackages.java@@ -501,15 +501,15 @@ public class TestPackages extends SolrCloudTestCase {Map.of(":files:" + FILE3 + ":name", "runtimelibs_v3.jar"),false);}- @SuppressWarnings({"unchecked","rawtypes"})- private void executeReq(String uri, JettySolrRunner jetty, Utils.InputStreamConsumer parser, Map expected) throws Exception {+ @SuppressWarnings("unchecked")+ private void executeReq(String uri, JettySolrRunner jetty, Utils.InputStreamConsumer<?> parser, Map<String, Object> expected) throws Exception {try(HttpSolrClient client = (HttpSolrClient) jetty.newClient()){TestDistribPackageStore.assertResponseValues(10,() -> {Object o = Utils.executeGET(client.getHttpClient(),jetty.getBaseUrl() + uri, parser);if(o instanceof NavigableObject) return (NavigableObject) o;- if(o instanceof Map) return new MapWriterMap((Map) o);+ if(o instanceof Map) return new MapWriterMap((Map<String, Object>) o);throw new RuntimeException("Unknown response");}, expected);@@ -816,8 +816,7 @@ public class TestPackages extends SolrCloudTestCase {}*/- public static ByteBuffer persistZip(String loc,- @SuppressWarnings({"rawtypes"}) Class... classes) throws IOException {+ public static ByteBuffer persistZip(String loc, Class<?>... classes) throws IOException {ByteBuffer jar = generateZip(classes);try (FileOutputStream fos = new FileOutputStream(loc)) {fos.write(jar.array(), 0, jar.limit());@@ -826,11 +825,11 @@ public class TestPackages extends SolrCloudTestCase {return jar;}- public static ByteBuffer generateZip(@SuppressWarnings({"rawtypes"}) Class... classes) throws IOException {+ public static ByteBuffer generateZip(Class<?>... classes) throws IOException {SimplePostTool.BAOS bos = new SimplePostTool.BAOS();try (ZipOutputStream zipOut = new ZipOutputStream(bos)) {zipOut.setLevel(ZipOutputStream.DEFLATED);- for (@SuppressWarnings({"rawtypes"}) Class c : classes) {+ for (Class<?> c : classes) {String path = c.getName().replace('.', '/').concat(".class");ZipEntry entry = new ZipEntry(path);ByteBuffer b = SimplePostTool.inputStreamToByteArray(c.getClassLoader().getResourceAsStream(path));diff --git a/solr/core/src/test/org/apache/solr/response/TestBinaryResponseWriter.java b/solr/core/src/test/org/apache/solr/response/TestBinaryResponseWriter.javaindex 27f1a747cd8..a14939c98bd 100644--- a/solr/core/src/test/org/apache/solr/response/TestBinaryResponseWriter.java+++ b/solr/core/src/test/org/apache/solr/response/TestBinaryResponseWriter.java@@ -63,7 +63,6 @@ public class TestBinaryResponseWriter extends SolrTestCaseJ4 {compareStringFormat("LIVE: सबरीमाला मंदिर के पास पहुंची दो महिलाएं, जमकर हो रहा विरोध-प्रदर्शन");}- @SuppressWarnings({"unchecked", "rawtypes"})public void testJavabinCodecWithCharSeq() throws IOException {SolrDocument document = new SolrDocument();document.put("id", "1");@@ -71,13 +70,13 @@ public class TestBinaryResponseWriter extends SolrTestCaseJ4 {document.put("desc", new StoredField("desc", new ByteArrayUtf8CharSequence(text) {}, TextField.TYPE_STORED));- NamedList nl = new NamedList();+ NamedList<Object> nl = new NamedList<>();nl.add("doc1", document);SimplePostTool.BAOS baos = new SimplePostTool.BAOS();new JavaBinCodec(new BinaryResponseWriter.Resolver(null, null)).marshal(nl, baos);ByteBuffer byteBuffer = baos.getByteBuffer();- nl = (NamedList) new JavaBinCodec().unmarshal(new ByteArrayInputStream(byteBuffer.array(), 0, byteBuffer.limit()));- assertEquals(text, nl._get("doc1/desc", null));+ NamedList<?> result = (NamedList<?>) new JavaBinCodec().unmarshal(new ByteArrayInputStream(byteBuffer.array(), 0, byteBuffer.limit()));+ assertEquals(text, result._get("doc1/desc", null));}@@ -105,10 +104,9 @@ public class TestBinaryResponseWriter extends SolrTestCaseJ4 {BinaryQueryResponseWriter writer = (BinaryQueryResponseWriter) h.getCore().getQueryResponseWriter("javabin");ByteArrayOutputStream baos = new ByteArrayOutputStream();writer.write(baos, req, rsp);- @SuppressWarnings({"rawtypes"})- NamedList res;+ NamedList<?> res;try (JavaBinCodec jbc = new JavaBinCodec()) {- res = (NamedList) jbc.unmarshal(new ByteArrayInputStream(baos.toByteArray()));+ res = (NamedList<?>) jbc.unmarshal(new ByteArrayInputStream(baos.toByteArray()));}SolrDocumentList docs = (SolrDocumentList) res.get("response");for (Object doc : docs) {diff --git a/solr/core/src/test/org/apache/solr/schema/TestPointFields.java b/solr/core/src/test/org/apache/solr/schema/TestPointFields.javaindex b185a13291e..3710e2cb91c 100644--- a/solr/core/src/test/org/apache/solr/schema/TestPointFields.java+++ b/solr/core/src/test/org/apache/solr/schema/TestPointFields.java@@ -3859,8 +3859,7 @@ public class TestPointFields extends SolrTestCaseJ4 {public void testWhiteboxCreateFields() throws Exception {String[] typeNames = new String[]{"i", "l", "f", "d", "dt"};- @SuppressWarnings({"rawtypes"})- Class<?>[] expectedClasses = new Class[]{IntPoint.class, LongPoint.class, FloatPoint.class, DoublePoint.class, LongPoint.class};+ Class<?>[] expectedClasses = new Class<?>[]{IntPoint.class, LongPoint.class, FloatPoint.class, DoublePoint.class, LongPoint.class};Date dateToTest = new Date();Object[][] values = new Object[][] {diff --git a/solr/core/src/test/org/apache/solr/search/MergeStrategyTest.java b/solr/core/src/test/org/apache/solr/search/MergeStrategyTest.javaindex d7bb4d899d7..ff73925b31c 100644--- a/solr/core/src/test/org/apache/solr/search/MergeStrategyTest.java+++ b/solr/core/src/test/org/apache/solr/search/MergeStrategyTest.java@@ -47,7 +47,6 @@ public class MergeStrategyTest extends BaseDistributedSearchTestCase {@Test@ShardsFixed(num = 3)- @SuppressWarnings({"unchecked"})public void test() throws Exception {del("*:*");diff --git a/solr/core/src/test/org/apache/solr/search/RankQueryTestPlugin.java b/solr/core/src/test/org/apache/solr/search/RankQueryTestPlugin.javaindex 69d825588e2..1aeaf91eaaa 100644--- a/solr/core/src/test/org/apache/solr/search/RankQueryTestPlugin.java+++ b/solr/core/src/test/org/apache/solr/search/RankQueryTestPlugin.java@@ -132,8 +132,7 @@ public class RankQueryTestPlugin extends QParserPlugin {this.mergeStrategy = mergeStrategy;}- @SuppressWarnings({"rawtypes"})- public TopDocsCollector getTopDocsCollector(int len, QueryCommand cmd, IndexSearcher searcher) {+ public TopDocsCollector<ScoreDoc> getTopDocsCollector(int len, QueryCommand cmd, IndexSearcher searcher) {if(collector == 0)return new TestCollector(null);else@@ -624,7 +623,7 @@ public class RankQueryTestPlugin extends QParserPlugin {private NamedList unmarshalSortValues(SortSpec sortSpec,NamedList sortFieldValues,IndexSchema schema) {- NamedList unmarshalledSortValsPerField = new NamedList();+ NamedList unmarshalledSortValsPerField = new NamedList<>();if (0 == sortFieldValues.size()) return unmarshalledSortValsPerField;@@ -664,13 +663,11 @@ public class RankQueryTestPlugin extends QParserPlugin {}- @SuppressWarnings({"rawtypes"})- static class TestCollector extends TopDocsCollector {+ static class TestCollector extends TopDocsCollector<ScoreDoc> {private List<ScoreDoc> list = new ArrayList<>();- @SuppressWarnings({"unchecked"})- public TestCollector(PriorityQueue pq) {+ public TestCollector(PriorityQueue<ScoreDoc> pq) {super(pq);}@@ -699,12 +696,9 @@ public class RankQueryTestPlugin extends QParserPlugin {return list.size();}- @SuppressWarnings({"unchecked", "rawtypes"})public TopDocs topDocs() {- Collections.sort(list, new Comparator() {- public int compare(Object o1, Object o2) {- ScoreDoc s1 = (ScoreDoc) o1;- ScoreDoc s2 = (ScoreDoc) o2;+ Collections.sort(list, new Comparator<>() {+ public int compare(ScoreDoc s1, ScoreDoc s2) {if (s1.score == s2.score) {return 0;} else if (s1.score < s2.score) {@@ -732,13 +726,11 @@ public class RankQueryTestPlugin extends QParserPlugin {}}- @SuppressWarnings({"rawtypes"})- static class TestCollector1 extends TopDocsCollector {+ static class TestCollector1 extends TopDocsCollector<ScoreDoc> {private List<ScoreDoc> list = new ArrayList<>();- @SuppressWarnings({"unchecked"})- public TestCollector1(PriorityQueue pq) {+ public TestCollector1(PriorityQueue<ScoreDoc> pq) {super(pq);}@@ -764,12 +756,9 @@ public class RankQueryTestPlugin extends QParserPlugin {return list.size();}- @SuppressWarnings({"unchecked", "rawtypes"})public TopDocs topDocs() {- Collections.sort(list, new Comparator() {- public int compare(Object o1, Object o2) {- ScoreDoc s1 = (ScoreDoc) o1;- ScoreDoc s2 = (ScoreDoc) o2;+ Collections.sort(list, new Comparator<>() {+ public int compare(ScoreDoc s1, ScoreDoc s2) {if (s1.score == s2.score) {return 0;} else if (s1.score > s2.score) {diff --git a/solr/core/src/test/org/apache/solr/search/SolrIndexSearcherTest.java b/solr/core/src/test/org/apache/solr/search/SolrIndexSearcherTest.javaindex 735a14f71d3..330acfc3138 100644--- a/solr/core/src/test/org/apache/solr/search/SolrIndexSearcherTest.java+++ b/solr/core/src/test/org/apache/solr/search/SolrIndexSearcherTest.java@@ -281,8 +281,7 @@ public class SolrIndexSearcherTest extends SolrTestCaseJ4 {}@Override- @SuppressWarnings({"rawtypes"})- public TopDocsCollector getTopDocsCollector(int len, QueryCommand cmd, IndexSearcher searcher) throws IOException {+ public TopDocsCollector<ScoreDoc> getTopDocsCollector(int len, QueryCommand cmd, IndexSearcher searcher) throws IOException {return new ReRankCollector(len, len, new Rescorer() {@Overridepublic TopDocs rescore(IndexSearcher searcher, TopDocs firstPassTopDocs, int topN) {diff --git a/solr/core/src/test/org/apache/solr/search/TestIndexSearcher.java b/solr/core/src/test/org/apache/solr/search/TestIndexSearcher.javaindex 420f861171f..37c3c9657c1 100644--- a/solr/core/src/test/org/apache/solr/search/TestIndexSearcher.java+++ b/solr/core/src/test/org/apache/solr/search/TestIndexSearcher.java@@ -17,6 +17,7 @@package org.apache.solr.search;import java.io.IOException;+import java.lang.reflect.Array;import java.util.Date;import java.util.List;import java.util.Map;@@ -249,8 +250,8 @@ public class TestIndexSearcher extends SolrTestCaseJ4 {addDummyDoc(newCore);// Open a new searcher, this should call the newSearcherListeners- @SuppressWarnings({"rawtypes"})- Future<?>[] future = new Future[1];+ @SuppressWarnings("unchecked")+ Future<Void>[] future = (Future<Void>[]) Array.newInstance(Future.class, 1);newCore.getSearcher(true, false, future);future[0].get();diff --git a/solr/core/src/test/org/apache/solr/search/facet/RangeFacetCloudTest.java b/solr/core/src/test/org/apache/solr/search/facet/RangeFacetCloudTest.javaindex bfc3a483aa0..4971b40ade4 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@@ -17,6 +17,7 @@package org.apache.solr.search.facet;import java.lang.invoke.MethodHandles;+import java.lang.reflect.Array;import java.nio.file.Paths;import java.util.Arrays;import java.util.ArrayList;@@ -78,8 +79,8 @@ public class RangeFacetCloudTest extends SolrCloudTestCase {* the array indexes represent values in our numeric field, while the array values* track the mapping from string field terms to facet counts for docs that have that numeric value*/- @SuppressWarnings({"unchecked", "rawtypes"})- private static final Map<String,Integer>[] TERM_MODEL = new Map[NUM_RANGE_VALUES];+ @SuppressWarnings({"unchecked"})+ private static final Map<String,Integer>[] TERM_MODEL = (Map<String, Integer>[]) Array.newInstance(Map.class, NUM_RANGE_VALUES);@BeforeClasspublic static void setupCluster() throws Exception {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.javaindex 92094175c7a..cbc4d3ffb2e 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@@ -118,15 +118,14 @@ public class TestJsonFacetRefinement extends SolrTestCaseHS {JSONParser parser = new JSONParser(json);ObjectBuilder ob = new ObjectBuilder(parser) {@Override- @SuppressWarnings({"rawtypes"})public Object newObject() throws IOException {- return new SimpleOrderedMap();+ return new SimpleOrderedMap<>();}@Override- @SuppressWarnings({"unchecked", "rawtypes"})+ @SuppressWarnings("unchecked")public void addKeyVal(Object map, Object key, Object val) throws IOException {- ((SimpleOrderedMap) map).add(key.toString(), val);+ ((SimpleOrderedMap<Object>) map).add(key.toString(), val);}};@@ -138,8 +137,7 @@ public class TestJsonFacetRefinement extends SolrTestCaseHS {try {int nShards = responsesAndTests.length / 2;Object jsonFacet = Utils.fromJSONString(facet);- @SuppressWarnings({"rawtypes"})- FacetParser parser = new FacetParser.FacetTopParser(req);+ FacetParser<FacetQuery> parser = new FacetParser.FacetTopParser(req);FacetRequest facetRequest = parser.parse(jsonFacet);FacetMerger merger = null;diff --git a/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java b/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.javaindex dacc8420d24..0168a1c6026 100644--- a/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java+++ b/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java@@ -139,13 +139,13 @@ public class BasicAuthIntegrationTest extends SolrCloudAuthTestCase {"'set-user': {'harry':'HarryIsCool'}\n" +"}";- @SuppressWarnings({"rawtypes"})- final SolrRequest genericReq;+ final SolrRequest<?> genericReq;if (isUseV2Api) {genericReq = new V2Request.Builder("/cluster/security/authentication").withMethod(SolrRequest.METHOD.POST).build();} else {- genericReq = new GenericSolrRequest(SolrRequest.METHOD.POST, authcPrefix, new ModifiableSolrParams());- ((GenericSolrRequest)genericReq).setContentWriter(new StringPayloadContentWriter(command, CommonParams.JSON_MIME));+ GenericSolrRequest genericSolrRequest = new GenericSolrRequest(SolrRequest.METHOD.POST, authcPrefix, new ModifiableSolrParams());+ genericSolrRequest.setContentWriter(new StringPayloadContentWriter(command, CommonParams.JSON_MIME));+ genericReq = genericSolrRequest;}// avoid bad connection races due to shutdown@@ -257,8 +257,7 @@ public class BasicAuthIntegrationTest extends SolrCloudAuthTestCase {try {System.setProperty("basicauth", "harry:HarryIsUberCool");tool.runTool(SolrCLI.processCommandLineArgs(SolrCLI.joinCommonAndToolOptions(tool.getOptions()), toolArgs));- @SuppressWarnings({"rawtypes"})- Map obj = (Map) Utils.fromJSON(new ByteArrayInputStream(baos.toByteArray()));+ Map<?, ?> obj = (Map<?, ?>) Utils.fromJSON(new ByteArrayInputStream(baos.toByteArray()));assertTrue(obj.containsKey("version"));assertTrue(obj.containsKey("startTime"));assertTrue(obj.containsKey("uptime"));@@ -322,10 +321,9 @@ public class BasicAuthIntegrationTest extends SolrCloudAuthTestCase {}private QueryResponse executeQuery(ModifiableSolrParams params, String user, String pass) throws IOException, SolrServerException {- @SuppressWarnings({"rawtypes"})- SolrRequest req = new QueryRequest(params);+ QueryRequest req = new QueryRequest(params);req.setBasicAuthCredentials(user, pass);- QueryResponse resp = (QueryResponse) req.process(cluster.getSolrClient(), COLLECTION);+ QueryResponse resp = req.process(cluster.getSolrClient(), COLLECTION);assertNull(resp.getException());assertEquals(0, resp.getStatus());return resp;diff --git a/solr/core/src/test/org/apache/solr/security/JWTVerificationkeyResolverTest.java b/solr/core/src/test/org/apache/solr/security/JWTVerificationkeyResolverTest.javaindex af87d59ac97..8ee5bcdf022 100644--- a/solr/core/src/test/org/apache/solr/security/JWTVerificationkeyResolverTest.java+++ b/solr/core/src/test/org/apache/solr/security/JWTVerificationkeyResolverTest.java@@ -65,11 +65,9 @@ public class JWTVerificationkeyResolverTest extends SolrTestCaseJ4 {private KeyHolder k4;private KeyHolder k5;private List<JsonWebKey> keysToReturnFromSecondJwk;- @SuppressWarnings({"rawtypes"})- private Iterator refreshSequenceForSecondJwk;+ private Iterator<List<JsonWebKey>> refreshSequenceForSecondJwk;@Before- @SuppressWarnings({"unchecked"})public void setUp() throws Exception {super.setUp();k1 = new KeyHolder("k1");@@ -80,13 +78,13 @@ public class JWTVerificationkeyResolverTest extends SolrTestCaseJ4 {when(firstJwkList.getJsonWebKeys()).thenReturn(asList(k1.getJwk(), k2.getJwk()));doAnswer(invocation -> {- keysToReturnFromSecondJwk = (List<JsonWebKey>) refreshSequenceForSecondJwk.next();+ keysToReturnFromSecondJwk = refreshSequenceForSecondJwk.next();System.out.println("Refresh called, next to return is " + keysToReturnFromSecondJwk);return null;}).when(secondJwkList).refresh();when(secondJwkList.getJsonWebKeys()).then(inv -> {if (keysToReturnFromSecondJwk == null)- keysToReturnFromSecondJwk = (List<JsonWebKey>) refreshSequenceForSecondJwk.next();+ keysToReturnFromSecondJwk = refreshSequenceForSecondJwk.next();return keysToReturnFromSecondJwk;});when(httpsJwksFactory.createList(anyList())).thenReturn(asList(firstJwkList, secondJwkList));@@ -121,7 +119,7 @@ public class JWTVerificationkeyResolverTest extends SolrTestCaseJ4 {resolver.resolveKey(k5.getJws(), null);}- public class KeyHolder {+ public static class KeyHolder {private final RsaJsonWebKey key;private final String kid;diff --git a/solr/core/src/test/org/apache/solr/security/TestSha256AuthenticationProvider.java b/solr/core/src/test/org/apache/solr/security/TestSha256AuthenticationProvider.javaindex 2d1752bd381..5acd6db93f6 100644--- a/solr/core/src/test/org/apache/solr/security/TestSha256AuthenticationProvider.java+++ b/solr/core/src/test/org/apache/solr/security/TestSha256AuthenticationProvider.java@@ -35,10 +35,8 @@ public class TestSha256AuthenticationProvider extends SolrTestCaseJ4 {String pwd = "Friendly";String user = "marcus";- @SuppressWarnings({"rawtypes"})- Map latestConf = createConfigMap(user, pwd);+ Map<String, Object> latestConf = createConfigMap(user, pwd);Map<String, Object> params = singletonMap(user, pwd);- @SuppressWarnings({"unchecked"})Map<String, Object> result = zkAuthenticationProvider.edit(latestConf,Collections.singletonList(new CommandOperation("set-user",params )));zkAuthenticationProvider = new Sha256AuthenticationProvider();@@ -50,13 +48,11 @@ public class TestSha256AuthenticationProvider extends SolrTestCaseJ4 {}- @SuppressWarnings({"unchecked"})public void testBasicAuthCommands() throws IOException {try (BasicAuthPlugin basicAuthPlugin = new BasicAuthPlugin()) {basicAuthPlugin.init(createConfigMap("ignore", "me"));- @SuppressWarnings({"rawtypes"})- Map latestConf = createConfigMap("solr", "SolrRocks");+ Map<String, Object> latestConf = createConfigMap("solr", "SolrRocks");CommandOperation blockUnknown = new CommandOperation("set-property", singletonMap("blockUnknown", true));basicAuthPlugin.edit(latestConf, Collections.singletonList(blockUnknown));diff --git a/solr/core/src/test/org/apache/solr/security/hadoop/ImpersonationUtil.java b/solr/core/src/test/org/apache/solr/security/hadoop/ImpersonationUtil.javaindex f1ffe1d2b36..b1d3957f5d4 100644--- a/solr/core/src/test/org/apache/solr/security/hadoop/ImpersonationUtil.java+++ b/solr/core/src/test/org/apache/solr/security/hadoop/ImpersonationUtil.java@@ -23,6 +23,7 @@ import org.apache.hadoop.security.authentication.client.PseudoAuthenticator;import org.apache.lucene.util.Constants;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.request.CollectionAdminRequest;+import org.apache.solr.client.solrj.response.CollectionAdminResponse;import org.apache.solr.common.params.ModifiableSolrParams;import org.apache.solr.common.params.SolrParams;import org.apache.solr.security.HadoopAuthPlugin;@@ -50,8 +51,7 @@ public class ImpersonationUtil {return group;}- @SuppressWarnings({"rawtypes"})- static SolrRequest getProxyRequest(String user, String doAs) {+ static SolrRequest<CollectionAdminResponse> getProxyRequest(String user, String doAs) {return new CollectionAdminRequest.List() {@Overridepublic SolrParams getParams() {diff --git a/solr/core/src/test/org/apache/solr/security/hadoop/TestDelegationWithHadoopAuth.java b/solr/core/src/test/org/apache/solr/security/hadoop/TestDelegationWithHadoopAuth.javaindex 401bcd97f21..c685a7b2bc3 100644--- a/solr/core/src/test/org/apache/solr/security/hadoop/TestDelegationWithHadoopAuth.java+++ b/solr/core/src/test/org/apache/solr/security/hadoop/TestDelegationWithHadoopAuth.java@@ -33,6 +33,7 @@ import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.impl.LBHttpSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.DelegationTokenRequest;+import org.apache.solr.client.solrj.response.CollectionAdminResponse;import org.apache.solr.client.solrj.response.DelegationTokenResponse;import org.apache.solr.cloud.SolrCloudTestCase;import org.apache.solr.cloud.hdfs.HdfsTestUtil;@@ -151,8 +152,7 @@ public class TestDelegationWithHadoopAuth extends SolrCloudTestCase {assertEquals("Did not receieve excepted status code", expectedStatusCode, lastStatusCode);}- @SuppressWarnings({"rawtypes"})- private SolrRequest getAdminRequest(final SolrParams params) {+ private SolrRequest<CollectionAdminResponse> getAdminRequest(final SolrParams params) {return new CollectionAdminRequest.List() {@Overridepublic SolrParams getParams() {@@ -163,7 +163,6 @@ public class TestDelegationWithHadoopAuth extends SolrCloudTestCase {};}- @SuppressWarnings({"unchecked"})private int getStatusCode(String token, final String user, final String op, HttpSolrClient client)throws Exception {SolrClient delegationTokenClient;@@ -184,8 +183,7 @@ public class TestDelegationWithHadoopAuth extends SolrCloudTestCase {ModifiableSolrParams p = new ModifiableSolrParams();if (user != null) p.set(PseudoAuthenticator.USER_NAME, user);if (op != null) p.set("op", op);- @SuppressWarnings({"rawtypes"})- SolrRequest req = getAdminRequest(p);+ SolrRequest<CollectionAdminResponse> req = getAdminRequest(p);if (user != null || op != null) {Set<String> queryParams = new HashSet<>();if (user != null) queryParams.add(PseudoAuthenticator.USER_NAME);@@ -204,7 +202,7 @@ public class TestDelegationWithHadoopAuth extends SolrCloudTestCase {}private void doSolrRequest(SolrClient client,- @SuppressWarnings({"rawtypes"})SolrRequest request,+ SolrRequest<?> request,int expectedStatusCode) throws Exception {try {client.request(request);@@ -372,8 +370,7 @@ public class TestDelegationWithHadoopAuth extends SolrCloudTestCase {String token = getDelegationToken(null, USER_1, primarySolrClient);assertNotNull(token);- @SuppressWarnings({"rawtypes"})- SolrRequest request = getAdminRequest(new ModifiableSolrParams());+ SolrRequest<?> request = getAdminRequest(new ModifiableSolrParams());// test without tokenHttpSolrClient ss =diff --git a/solr/core/src/test/org/apache/solr/update/PeerSyncWithBufferUpdatesTest.java b/solr/core/src/test/org/apache/solr/update/PeerSyncWithBufferUpdatesTest.javaindex f836816c141..544685acafd 100644--- a/solr/core/src/test/org/apache/solr/update/PeerSyncWithBufferUpdatesTest.java+++ b/solr/core/src/test/org/apache/solr/update/PeerSyncWithBufferUpdatesTest.java@@ -216,9 +216,8 @@ public class PeerSyncWithBufferUpdatesTest extends BaseDistributedSearchTestCasvoid assertSync(SolrClient client, int numVersions, boolean expectedResult, String syncWith) throws IOException, SolrServerException {QueryRequest qr = new QueryRequest(params("qt","/get", "getVersions",Integer.toString(numVersions), "syncWithLeader", syncWith));- @SuppressWarnings({"rawtypes"})- NamedList rsp = client.request(qr);- assertEquals(expectedResult, (Boolean) rsp.get("syncWithLeader"));+ NamedList<?> rsp = client.request(qr);+ assertEquals(expectedResult, rsp.get("syncWithLeader"));}}diff --git a/solr/core/src/test/org/apache/solr/update/PeerSyncWithIndexFingerprintCachingTest.java b/solr/core/src/test/org/apache/solr/update/PeerSyncWithIndexFingerprintCachingTest.javaindex 9bece149d3e..b4abc4c6741 100644--- a/solr/core/src/test/org/apache/solr/update/PeerSyncWithIndexFingerprintCachingTest.java+++ b/solr/core/src/test/org/apache/solr/update/PeerSyncWithIndexFingerprintCachingTest.java@@ -95,16 +95,14 @@ public class PeerSyncWithIndexFingerprintCachingTest extends BaseDistributedSearIndexFingerprint getFingerprint(SolrClient client, long maxVersion) throws IOException, SolrServerException {QueryRequest qr = new QueryRequest(params("qt","/get", "getFingerprint",Long.toString(maxVersion)));- @SuppressWarnings({"rawtypes"})- NamedList rsp = client.request(qr);+ NamedList<?> rsp = client.request(qr);return IndexFingerprint.fromObject(rsp.get("fingerprint"));}void assertSync(SolrClient client, int numVersions, boolean expectedResult, String... syncWith) throws IOException, SolrServerException {QueryRequest qr = new QueryRequest(params("qt","/get", "getVersions",Integer.toString(numVersions), "sync", StrUtils.join(Arrays.asList(syncWith), ',')));- @SuppressWarnings({"rawtypes"})- NamedList rsp = client.request(qr);- assertEquals(expectedResult, (Boolean) rsp.get("sync"));+ NamedList<?> rsp = client.request(qr);+ assertEquals(expectedResult, rsp.get("sync"));}}diff --git a/solr/core/src/test/org/apache/solr/update/PeerSyncWithLeaderTest.java b/solr/core/src/test/org/apache/solr/update/PeerSyncWithLeaderTest.javaindex 414d0437da4..1a2748e6879 100644--- a/solr/core/src/test/org/apache/solr/update/PeerSyncWithLeaderTest.java+++ b/solr/core/src/test/org/apache/solr/update/PeerSyncWithLeaderTest.java@@ -51,8 +51,7 @@ public class PeerSyncWithLeaderTest extends PeerSyncTest {@Overridevoid assertSync(SolrClient client, int numVersions, boolean expectedResult, String... syncWith) throws IOException, SolrServerException {QueryRequest qr = new QueryRequest(params("qt","/get", "getVersions",Integer.toString(numVersions), "syncWithLeader", StrUtils.join(Arrays.asList(syncWith), ',')));- @SuppressWarnings({"rawtypes"})- NamedList rsp = client.request(qr);- assertEquals(expectedResult, (Boolean) rsp.get("syncWithLeader"));+ NamedList<?> rsp = client.request(qr);+ assertEquals(expectedResult, rsp.get("syncWithLeader"));}}diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/response/SpellCheckResponse.java b/solr/solrj/src/java/org/apache/solr/client/solrj/response/SpellCheckResponse.javaindex 778dda8dab5..3db10f5c084 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/response/SpellCheckResponse.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/response/SpellCheckResponse.java@@ -34,7 +34,7 @@ public class SpellCheckResponse {private List<Suggestion> suggestions = new ArrayList<>();Map<String, Suggestion> suggestionMap = new LinkedHashMap<>();- public SpellCheckResponse(NamedList<Object> spellInfo) {+ public SpellCheckResponse(NamedList<?> spellInfo) {@SuppressWarnings("unchecked")NamedList<Object> sugg = (NamedList<Object>) spellInfo.get("suggestions");if (sugg == null) {diff --git a/solr/solrj/src/java/org/apache/solr/common/SolrInputField.java b/solr/solrj/src/java/org/apache/solr/common/SolrInputField.javaindex b88212fe461..0874ea98316 100644--- a/solr/solrj/src/java/org/apache/solr/common/SolrInputField.java+++ b/solr/solrj/src/java/org/apache/solr/common/SolrInputField.java@@ -19,6 +19,7 @@ package org.apache.solr.common;import java.io.Serializable;import java.util.ArrayList;import java.util.Collection;+import java.util.Collections;import java.util.Iterator;/**@@ -28,8 +29,8 @@ import java.util.Iterator;public class SolrInputField implements Iterable<Object>, Serializable{String name;- Object value = null;-+ Object value = null; // TODO SOLR-15532 investigate if this can be a Collection+public SolrInputField( String n ){this.name = n;@@ -147,7 +148,7 @@ public class SolrInputField implements Iterable<Object>, Serializable*/public int getValueCount() {if( value instanceof Collection ) {- return ((Collection)value).size();+ return ((Collection<?>)value).size();}return (value == null) ? 0 : 1;}@@ -165,29 +166,13 @@ public class SolrInputField implements Iterable<Object>, Serializable@Override@SuppressWarnings("unchecked")- public Iterator<Object> iterator(){- if( value instanceof Collection ) {- return ((Collection)value).iterator();+ public Iterator<Object> iterator() {+ if (value == null) {+ return Collections.emptyIterator();+ } else if (value instanceof Collection) {+ return ((Collection<Object>)value).iterator();}- return new Iterator<Object>() {- boolean nxt = (value!=null);-- @Override- public boolean hasNext() {- return nxt;- }-- @Override- public Object next() {- nxt = false;- return value;- }-- @Override- public void remove() {- throw new UnsupportedOperationException();- }- };+ return Collections.singleton(value).iterator();}@Overridediff --git a/solr/solrj/src/java/org/apache/solr/common/util/ExecutorUtil.java b/solr/solrj/src/java/org/apache/solr/common/util/ExecutorUtil.javaindex f2d874f866d..dadb6909336 100644--- a/solr/solrj/src/java/org/apache/solr/common/util/ExecutorUtil.java+++ b/solr/solrj/src/java/org/apache/solr/common/util/ExecutorUtil.java@@ -67,16 +67,16 @@ public class ExecutorUtil {* copy the necessary Objects to the ctx. The object that is passed is same* across all three methods*/- public void store(AtomicReference<?> ctx);+ void store(AtomicReference<Object> ctx);/**This is invoked in the Threadpool thread. set the appropriate values in the threadlocal* of this thread. */- public void set(AtomicReference<?> ctx);+ void set(AtomicReference<Object> ctx);/**This method is invoked in the threadpool thread after the execution* clean all the variables set in the set method*/- public void clean(AtomicReference<?> ctx);+ void clean(AtomicReference<Object> ctx);}public static void shutdownAndAwaitTermination(ExecutorService pool) {@@ -198,10 +198,10 @@ public class ExecutorUtil {final String submitterContextStr = ctxStr.length() <= MAX_THREAD_NAME_LEN ? ctxStr : ctxStr.substring(0, MAX_THREAD_NAME_LEN);final Exception submitterStackTrace = enableSubmitterStackTrace ? new Exception("Submitter stack trace") : null;final List<InheritableThreadLocalProvider> providersCopy = providers;- final ArrayList<AtomicReference<?>> ctx = providersCopy.isEmpty() ? null : new ArrayList<>(providersCopy.size());+ final ArrayList<AtomicReference<Object>> ctx = providersCopy.isEmpty() ? null : new ArrayList<>(providersCopy.size());if (ctx != null) {for (int i = 0; i < providers.size(); i++) {- AtomicReference<?> reference = new AtomicReference<>();+ AtomicReference<Object> reference = new AtomicReference<>();ctx.add(reference);providersCopy.get(i).store(reference);}diff --git a/solr/solrj/src/java/org/apache/solr/common/util/ValidatingJsonMap.java b/solr/solrj/src/java/org/apache/solr/common/util/ValidatingJsonMap.javaindex fbdc01508bb..d99b8afcd4c 100644--- a/solr/solrj/src/java/org/apache/solr/common/util/ValidatingJsonMap.java+++ b/solr/solrj/src/java/org/apache/solr/common/util/ValidatingJsonMap.java@@ -52,9 +52,9 @@ public class ValidatingJsonMap implements Map<String, Object>, NavigableObject {@SuppressWarnings({"rawtypes"})public static final PredicateWithErrMsg<Pair> ENUM_OF = pair -> {if (pair.second() instanceof Set) {- Set set = (Set) pair.second();+ Set<?> set = (Set<?>) pair.second();if (pair.first() instanceof Collection) {- for (Object o : (Collection) pair.first()) {+ for (Object o : (Collection<?>) pair.first()) {if (!set.contains(o)) {return " Must be one of " + pair.second();}@@ -352,8 +352,7 @@ public class ValidatingJsonMap implements Map<String, Object>, NavigableObject {return Objects.hash(delegate);}- @SuppressWarnings({"unchecked"})- public static final ValidatingJsonMap EMPTY = new ValidatingJsonMap(Collections.EMPTY_MAP);+ public static final ValidatingJsonMap EMPTY = new ValidatingJsonMap(Collections.emptyMap());public interface PredicateWithErrMsg<T> {