Apache Solr open-source search software
SOLR-16271: remove wildcard imports (#938)
Eric Pugh6e61811b0e9c
diff --git a/solr/core/src/java/org/apache/solr/api/ContainerPluginsRegistry.java b/solr/core/src/java/org/apache/solr/api/ContainerPluginsRegistry.javaindex f8d2e64bf72..c8e80fc8263 100644--- a/solr/core/src/java/org/apache/solr/api/ContainerPluginsRegistry.java+++ b/solr/core/src/java/org/apache/solr/api/ContainerPluginsRegistry.java@@ -30,7 +30,13 @@ import java.lang.reflect.Constructor;import java.lang.reflect.Modifier;import java.lang.reflect.ParameterizedType;import java.lang.reflect.Type;-import java.util.*;+import java.util.ArrayList;+import java.util.Collections;+import java.util.HashMap;+import java.util.List;+import java.util.Map;+import java.util.Objects;+import java.util.Optional;import java.util.concurrent.CopyOnWriteArrayList;import java.util.concurrent.Phaser;import java.util.function.Supplier;diff --git a/solr/core/src/java/org/apache/solr/api/V2HttpCall.java b/solr/core/src/java/org/apache/solr/api/V2HttpCall.javaindex 4d2776a5153..4b8b24a6ca0 100644--- a/solr/core/src/java/org/apache/solr/api/V2HttpCall.java+++ b/solr/core/src/java/org/apache/solr/api/V2HttpCall.java@@ -18,12 +18,22 @@package org.apache.solr.api;import static org.apache.solr.common.cloud.ZkStateReader.COLLECTION_PROP;-import static org.apache.solr.servlet.SolrDispatchFilter.Action.*;+import static org.apache.solr.servlet.SolrDispatchFilter.Action.ADMIN;+import static org.apache.solr.servlet.SolrDispatchFilter.Action.PROCESS;+import static org.apache.solr.servlet.SolrDispatchFilter.Action.REMOTEQUERY;import io.opentracing.Span;import io.opentracing.tag.Tags;import java.lang.invoke.MethodHandles;-import java.util.*;+import java.util.Collections;+import java.util.HashMap;+import java.util.HashSet;+import java.util.LinkedHashMap;+import java.util.LinkedList;+import java.util.List;+import java.util.Locale;+import java.util.Map;+import java.util.Set;import java.util.function.Supplier;import javax.servlet.http.HttpServletRequest;import javax.servlet.http.HttpServletResponse;diff --git a/solr/core/src/java/org/apache/solr/cloud/DistributedClusterStateUpdater.java b/solr/core/src/java/org/apache/solr/cloud/DistributedClusterStateUpdater.javaindex f76fb1fa474..b3209d21ddc 100644--- a/solr/core/src/java/org/apache/solr/cloud/DistributedClusterStateUpdater.java+++ b/solr/core/src/java/org/apache/solr/cloud/DistributedClusterStateUpdater.java@@ -31,12 +31,30 @@ import static org.apache.solr.common.params.CollectionParams.CollectionAction.DEimport static org.apache.solr.common.params.CollectionParams.CollectionAction.MODIFYCOLLECTION;import java.lang.invoke.MethodHandles;-import java.util.*;+import java.util.Collections;+import java.util.EnumMap;+import java.util.LinkedList;+import java.util.List;+import java.util.Optional;+import java.util.Set;import org.apache.solr.client.solrj.cloud.SolrCloudManager;import org.apache.solr.cloud.api.collections.CollectionHandlingUtils;-import org.apache.solr.cloud.overseer.*;+import org.apache.solr.cloud.overseer.ClusterStateMutator;+import org.apache.solr.cloud.overseer.CollectionMutator;+import org.apache.solr.cloud.overseer.NodeMutator;+import org.apache.solr.cloud.overseer.OverseerAction;+import org.apache.solr.cloud.overseer.ReplicaMutator;+import org.apache.solr.cloud.overseer.SliceMutator;+import org.apache.solr.cloud.overseer.ZkStateWriter;+import org.apache.solr.cloud.overseer.ZkWriteCommand;import org.apache.solr.common.SolrException;-import org.apache.solr.common.cloud.*;+import org.apache.solr.common.cloud.ClusterState;+import org.apache.solr.common.cloud.DocCollection;+import org.apache.solr.common.cloud.PerReplicaStates;+import org.apache.solr.common.cloud.PerReplicaStatesOps;+import org.apache.solr.common.cloud.SolrZkClient;+import org.apache.solr.common.cloud.ZkNodeProps;+import org.apache.solr.common.cloud.ZkStateReader;import org.apache.solr.common.params.CollectionParams;import org.apache.solr.common.params.CommonParams;import org.apache.solr.common.util.Pair;diff --git a/solr/core/src/java/org/apache/solr/cloud/ShardLeaderElectionContextBase.java b/solr/core/src/java/org/apache/solr/cloud/ShardLeaderElectionContextBase.javaindex e117ecb107d..210c576a425 100644--- a/solr/core/src/java/org/apache/solr/cloud/ShardLeaderElectionContextBase.java+++ b/solr/core/src/java/org/apache/solr/cloud/ShardLeaderElectionContextBase.java@@ -23,7 +23,15 @@ import java.util.List;import org.apache.solr.cloud.overseer.OverseerAction;import org.apache.solr.common.SolrException;import org.apache.solr.common.SolrException.ErrorCode;-import org.apache.solr.common.cloud.*;+import org.apache.solr.common.cloud.DocCollection;+import org.apache.solr.common.cloud.PerReplicaStates;+import org.apache.solr.common.cloud.PerReplicaStatesOps;+import org.apache.solr.common.cloud.Replica;+import org.apache.solr.common.cloud.SolrZkClient;+import org.apache.solr.common.cloud.ZkCmdExecutor;+import org.apache.solr.common.cloud.ZkMaintenanceUtils;+import org.apache.solr.common.cloud.ZkNodeProps;+import org.apache.solr.common.cloud.ZkStateReader;import org.apache.solr.common.util.RetryUtil;import org.apache.solr.common.util.Utils;import org.apache.zookeeper.CreateMode;diff --git a/solr/core/src/java/org/apache/solr/cloud/ZkController.java b/solr/core/src/java/org/apache/solr/cloud/ZkController.javaindex 6ff899356bd..7f0eeab34d3 100644--- a/solr/core/src/java/org/apache/solr/cloud/ZkController.java+++ b/solr/core/src/java/org/apache/solr/cloud/ZkController.java@@ -72,8 +72,31 @@ import org.apache.solr.cloud.overseer.SliceMutator;import org.apache.solr.common.AlreadyClosedException;import org.apache.solr.common.SolrException;import org.apache.solr.common.SolrException.ErrorCode;-import org.apache.solr.common.cloud.*;+import org.apache.solr.common.cloud.BeforeReconnect;+import org.apache.solr.common.cloud.ClusterState;+import org.apache.solr.common.cloud.DefaultConnectionStrategy;+import org.apache.solr.common.cloud.DefaultZkACLProvider;+import org.apache.solr.common.cloud.DefaultZkCredentialsProvider;+import org.apache.solr.common.cloud.DocCollection;+import org.apache.solr.common.cloud.DocCollectionWatcher;+import org.apache.solr.common.cloud.LiveNodesListener;+import org.apache.solr.common.cloud.NodesSysPropsCacher;+import org.apache.solr.common.cloud.OnReconnect;+import org.apache.solr.common.cloud.PerReplicaStates;+import org.apache.solr.common.cloud.PerReplicaStatesOps;+import org.apache.solr.common.cloud.Replica;import org.apache.solr.common.cloud.Replica.Type;+import org.apache.solr.common.cloud.SecurityAwareZkACLProvider;+import org.apache.solr.common.cloud.Slice;+import org.apache.solr.common.cloud.SolrZkClient;+import org.apache.solr.common.cloud.ZkACLProvider;+import org.apache.solr.common.cloud.ZkClientConnectionStrategy;+import org.apache.solr.common.cloud.ZkCmdExecutor;+import org.apache.solr.common.cloud.ZkCoreNodeProps;+import org.apache.solr.common.cloud.ZkCredentialsProvider;+import org.apache.solr.common.cloud.ZkNodeProps;+import org.apache.solr.common.cloud.ZkStateReader;+import org.apache.solr.common.cloud.ZooKeeperException;import org.apache.solr.common.params.CommonParams;import org.apache.solr.common.params.SolrParams;import org.apache.solr.common.util.ExecutorUtil;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 68f9473ed33..93477c8cd44 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@@ -19,7 +19,12 @@ package org.apache.solr.cloud.api.collections;import static org.apache.solr.cloud.api.collections.CollectionHandlingUtils.CREATE_NODE_SET;import static org.apache.solr.cloud.api.collections.CollectionHandlingUtils.SKIP_CREATE_REPLICA_IN_CLUSTER_STATE;-import static org.apache.solr.common.cloud.ZkStateReader.*;+import static org.apache.solr.common.cloud.ZkStateReader.COLLECTION_PROP;+import static org.apache.solr.common.cloud.ZkStateReader.CORE_NAME_PROP;+import static org.apache.solr.common.cloud.ZkStateReader.NRT_REPLICAS;+import static org.apache.solr.common.cloud.ZkStateReader.PULL_REPLICAS;+import static org.apache.solr.common.cloud.ZkStateReader.SHARD_ID_PROP;+import static org.apache.solr.common.cloud.ZkStateReader.TLOG_REPLICAS;import static org.apache.solr.common.params.CollectionAdminParams.COLL_CONF;import static org.apache.solr.common.params.CollectionAdminParams.FOLLOW_ALIASES;import static org.apache.solr.common.params.CollectionParams.CollectionAction.ADDREPLICA;diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/Assign.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/Assign.javaindex 7f4b848d12e..27300b1143d 100644--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/Assign.java+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/Assign.java@@ -21,7 +21,19 @@ import static org.apache.solr.common.cloud.ZkStateReader.CORE_NAME_PROP;import java.io.IOException;import java.lang.invoke.MethodHandles;-import java.util.*;+import java.util.ArrayList;+import java.util.Arrays;+import java.util.Collection;+import java.util.Collections;+import java.util.HashMap;+import java.util.HashSet;+import java.util.LinkedHashSet;+import java.util.List;+import java.util.Locale;+import java.util.Map;+import java.util.Objects;+import java.util.Random;+import java.util.Set;import org.apache.solr.client.solrj.cloud.AlreadyExistsException;import org.apache.solr.client.solrj.cloud.BadVersionException;import org.apache.solr.client.solrj.cloud.DistribStateManager;diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/CollApiCmds.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/CollApiCmds.javaindex b48c56be4c3..2ebe6b5909d 100644--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/CollApiCmds.java+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/CollApiCmds.java@@ -29,7 +29,40 @@ import static org.apache.solr.common.cloud.ZkStateReader.REJOIN_AT_HEAD_PROP;import static org.apache.solr.common.cloud.ZkStateReader.REPLICA_PROP;import static org.apache.solr.common.cloud.ZkStateReader.SHARD_ID_PROP;import static org.apache.solr.common.params.CollectionAdminParams.COLL_CONF;-import static org.apache.solr.common.params.CollectionParams.CollectionAction.*;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.ADDREPLICA;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.ADDREPLICAPROP;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.ADDROLE;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.ALIASPROP;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.BACKUP;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.BALANCESHARDUNIQUE;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.CREATE;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.CREATEALIAS;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.CREATESHARD;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.CREATESNAPSHOT;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.DELETE;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.DELETEALIAS;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.DELETEBACKUP;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.DELETENODE;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.DELETEREPLICA;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.DELETEREPLICAPROP;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.DELETESHARD;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.DELETESNAPSHOT;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.MAINTAINROUTEDALIAS;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.MIGRATE;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.MOCK_COLL_TASK;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.MOCK_REPLICA_TASK;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.MOCK_SHARD_TASK;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.MODIFYCOLLECTION;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.MOVEREPLICA;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.OVERSEERSTATUS;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.REBALANCELEADERS;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.REINDEXCOLLECTION;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.RELOAD;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.REMOVEROLE;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.RENAME;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.REPLACENODE;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.RESTORE;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.SPLITSHARD;import static org.apache.solr.common.params.CommonAdminParams.ASYNC;import static org.apache.solr.common.params.CommonParams.NAME;diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/CollectionHandlingUtils.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/CollectionHandlingUtils.javaindex c4a72b8bd8e..41a2a7e4f71 100644--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/CollectionHandlingUtils.java+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/CollectionHandlingUtils.java@@ -47,7 +47,15 @@ import org.apache.solr.cloud.Overseer;import org.apache.solr.cloud.overseer.ClusterStateMutator;import org.apache.solr.cloud.overseer.OverseerAction;import org.apache.solr.common.SolrException;-import org.apache.solr.common.cloud.*;+import org.apache.solr.common.cloud.ClusterState;+import org.apache.solr.common.cloud.DocCollection;+import org.apache.solr.common.cloud.DocRouter;+import org.apache.solr.common.cloud.Replica;+import org.apache.solr.common.cloud.Slice;+import org.apache.solr.common.cloud.SolrZkClient;+import org.apache.solr.common.cloud.ZkCoreNodeProps;+import org.apache.solr.common.cloud.ZkNodeProps;+import org.apache.solr.common.cloud.ZkStateReader;import org.apache.solr.common.params.CollectionAdminParams;import org.apache.solr.common.params.CoreAdminParams;import org.apache.solr.common.params.ModifiableSolrParams;diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/CreateCollectionCmd.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/CreateCollectionCmd.javaindex fb0f1c65c3d..6663cd3876b 100644--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/CreateCollectionCmd.java+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/CreateCollectionCmd.java@@ -59,7 +59,17 @@ import org.apache.solr.cloud.overseer.SliceMutator;import org.apache.solr.cloud.overseer.ZkWriteCommand;import org.apache.solr.common.SolrException;import org.apache.solr.common.SolrException.ErrorCode;-import org.apache.solr.common.cloud.*;+import org.apache.solr.common.cloud.Aliases;+import org.apache.solr.common.cloud.ClusterState;+import org.apache.solr.common.cloud.DocCollection;+import org.apache.solr.common.cloud.DocRouter;+import org.apache.solr.common.cloud.ImplicitDocRouter;+import org.apache.solr.common.cloud.PerReplicaStates;+import org.apache.solr.common.cloud.Replica;+import org.apache.solr.common.cloud.ReplicaPosition;+import org.apache.solr.common.cloud.ZkNodeProps;+import org.apache.solr.common.cloud.ZkStateReader;+import org.apache.solr.common.cloud.ZooKeeperException;import org.apache.solr.common.params.CollectionAdminParams;import org.apache.solr.common.params.CommonAdminParams;import org.apache.solr.common.params.CoreAdminParams;diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/OverseerCollectionMessageHandler.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/OverseerCollectionMessageHandler.javaindex de1f96ef225..b27798fe0a2 100644--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/OverseerCollectionMessageHandler.java+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/OverseerCollectionMessageHandler.java@@ -16,7 +16,9 @@*/package org.apache.solr.cloud.api.collections;-import static org.apache.solr.common.cloud.ZkStateReader.*;+import static org.apache.solr.common.cloud.ZkStateReader.COLLECTION_PROP;+import static org.apache.solr.common.cloud.ZkStateReader.REPLICA_PROP;+import static org.apache.solr.common.cloud.ZkStateReader.SHARD_ID_PROP;import static org.apache.solr.common.params.CollectionAdminParams.COLLECTION;import static org.apache.solr.common.params.CommonParams.NAME;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 be23736933f..f0a38f039b3 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@@ -17,7 +17,13 @@package org.apache.solr.cloud.api.collections;-import static org.apache.solr.common.cloud.ZkStateReader.*;+import static org.apache.solr.common.cloud.ZkStateReader.COLLECTION_PROP;+import static org.apache.solr.common.cloud.ZkStateReader.NRT_REPLICAS;+import static org.apache.solr.common.cloud.ZkStateReader.PULL_REPLICAS;+import static org.apache.solr.common.cloud.ZkStateReader.REPLICATION_FACTOR;+import static org.apache.solr.common.cloud.ZkStateReader.REPLICA_TYPE;+import static org.apache.solr.common.cloud.ZkStateReader.SHARD_ID_PROP;+import static org.apache.solr.common.cloud.ZkStateReader.TLOG_REPLICAS;import static org.apache.solr.common.params.CollectionParams.CollectionAction.CREATE;import static org.apache.solr.common.params.CollectionParams.CollectionAction.CREATESHARD;import static org.apache.solr.common.params.CommonAdminParams.ASYNC;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 9471565920c..89386e0ca99 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@@ -18,14 +18,26 @@package org.apache.solr.cloud.api.collections;import static org.apache.solr.client.solrj.impl.SolrClientNodeStateProvider.Variable.CORE_IDX;-import static org.apache.solr.common.cloud.ZkStateReader.*;+import static org.apache.solr.common.cloud.ZkStateReader.COLLECTION_PROP;+import static org.apache.solr.common.cloud.ZkStateReader.REPLICA_TYPE;+import static org.apache.solr.common.cloud.ZkStateReader.SHARD_ID_PROP;import static org.apache.solr.common.params.CollectionAdminParams.FOLLOW_ALIASES;-import static org.apache.solr.common.params.CollectionParams.CollectionAction.*;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.ADDREPLICA;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.CREATESHARD;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.DELETESHARD;import static org.apache.solr.common.params.CommonAdminParams.ASYNC;import static org.apache.solr.common.params.CommonAdminParams.NUM_SUB_SHARDS;import java.lang.invoke.MethodHandles;-import java.util.*;+import java.util.ArrayList;+import java.util.Collection;+import java.util.Collections;+import java.util.HashMap;+import java.util.HashSet;+import java.util.List;+import java.util.Map;+import java.util.NoSuchElementException;+import java.util.Set;import java.util.concurrent.atomic.AtomicInteger;import java.util.concurrent.atomic.AtomicReference;import org.apache.solr.client.solrj.cloud.DistribStateManager;@@ -39,7 +51,16 @@ import org.apache.solr.cloud.api.collections.CollectionHandlingUtils.ShardRequesimport org.apache.solr.cloud.overseer.OverseerAction;import org.apache.solr.common.SolrException;import org.apache.solr.common.SolrException.ErrorCode;-import org.apache.solr.common.cloud.*;+import org.apache.solr.common.cloud.ClusterState;+import org.apache.solr.common.cloud.CompositeIdRouter;+import org.apache.solr.common.cloud.DocCollection;+import org.apache.solr.common.cloud.DocRouter;+import org.apache.solr.common.cloud.PlainIdRouter;+import org.apache.solr.common.cloud.Replica;+import org.apache.solr.common.cloud.ReplicaPosition;+import org.apache.solr.common.cloud.Slice;+import org.apache.solr.common.cloud.ZkNodeProps;+import org.apache.solr.common.cloud.ZkStateReader;import org.apache.solr.common.cloud.rule.ImplicitSnitch;import org.apache.solr.common.params.CollectionAdminParams;import org.apache.solr.common.params.CommonAdminParams;diff --git a/solr/core/src/java/org/apache/solr/cloud/overseer/CollectionMutator.java b/solr/core/src/java/org/apache/solr/cloud/overseer/CollectionMutator.javaindex 44bc9d83b81..7bb5168f32b 100644--- a/solr/core/src/java/org/apache/solr/cloud/overseer/CollectionMutator.java+++ b/solr/core/src/java/org/apache/solr/cloud/overseer/CollectionMutator.java@@ -30,7 +30,15 @@ import java.util.Map;import org.apache.solr.client.solrj.cloud.DistribStateManager;import org.apache.solr.client.solrj.cloud.SolrCloudManager;import org.apache.solr.client.solrj.request.CollectionAdminRequest;-import org.apache.solr.common.cloud.*;+import org.apache.solr.common.cloud.ClusterState;+import org.apache.solr.common.cloud.DocCollection;+import org.apache.solr.common.cloud.PerReplicaStates;+import org.apache.solr.common.cloud.PerReplicaStatesOps;+import org.apache.solr.common.cloud.Replica;+import org.apache.solr.common.cloud.Slice;+import org.apache.solr.common.cloud.SolrZkClient;+import org.apache.solr.common.cloud.ZkNodeProps;+import org.apache.solr.common.cloud.ZkStateReader;import org.slf4j.Logger;import org.slf4j.LoggerFactory;diff --git a/solr/core/src/java/org/apache/solr/cluster/placement/PlacementRequest.java b/solr/core/src/java/org/apache/solr/cluster/placement/PlacementRequest.javaindex 7878feb8450..cd70d7601ba 100644--- a/solr/core/src/java/org/apache/solr/cluster/placement/PlacementRequest.java+++ b/solr/core/src/java/org/apache/solr/cluster/placement/PlacementRequest.java@@ -18,7 +18,11 @@package org.apache.solr.cluster.placement;import java.util.Set;-import org.apache.solr.cluster.*;+import org.apache.solr.cluster.Cluster;+import org.apache.solr.cluster.Node;+import org.apache.solr.cluster.Replica;+import org.apache.solr.cluster.Shard;+import org.apache.solr.cluster.SolrCollection;/*** A cluster related placement request that Solr asks a {@link PlacementPlugin} plugin to resolvediff --git a/solr/core/src/java/org/apache/solr/cluster/placement/impl/AttributeFetcherImpl.java b/solr/core/src/java/org/apache/solr/cluster/placement/impl/AttributeFetcherImpl.javaindex 268446cfc8e..0beba2366dc 100644--- a/solr/core/src/java/org/apache/solr/cluster/placement/impl/AttributeFetcherImpl.java+++ b/solr/core/src/java/org/apache/solr/cluster/placement/impl/AttributeFetcherImpl.java@@ -18,7 +18,12 @@package org.apache.solr.cluster.placement.impl;import java.lang.invoke.MethodHandles;-import java.util.*;+import java.util.Collections;+import java.util.HashMap;+import java.util.HashSet;+import java.util.List;+import java.util.Map;+import java.util.Set;import java.util.function.BiConsumer;import java.util.stream.Collectors;import org.apache.solr.client.solrj.cloud.SolrCloudManager;diff --git a/solr/core/src/java/org/apache/solr/cluster/placement/impl/PlacementPlanFactoryImpl.java b/solr/core/src/java/org/apache/solr/cluster/placement/impl/PlacementPlanFactoryImpl.javaindex 039af6ed7e9..437d406ec7e 100644--- a/solr/core/src/java/org/apache/solr/cluster/placement/impl/PlacementPlanFactoryImpl.java+++ b/solr/core/src/java/org/apache/solr/cluster/placement/impl/PlacementPlanFactoryImpl.java@@ -21,7 +21,10 @@ import java.util.Set;import org.apache.solr.cluster.Node;import org.apache.solr.cluster.Replica;import org.apache.solr.cluster.SolrCollection;-import org.apache.solr.cluster.placement.*;+import org.apache.solr.cluster.placement.PlacementPlan;+import org.apache.solr.cluster.placement.PlacementPlanFactory;+import org.apache.solr.cluster.placement.PlacementRequest;+import org.apache.solr.cluster.placement.ReplicaPlacement;/** Simple implementation of {@link PlacementPlanFactory}. */public class PlacementPlanFactoryImpl implements PlacementPlanFactory {diff --git a/solr/core/src/java/org/apache/solr/cluster/placement/impl/SimpleClusterAbstractionsImpl.java b/solr/core/src/java/org/apache/solr/cluster/placement/impl/SimpleClusterAbstractionsImpl.javaindex 9f85922ea13..9eec9b5f775 100644--- a/solr/core/src/java/org/apache/solr/cluster/placement/impl/SimpleClusterAbstractionsImpl.java+++ b/solr/core/src/java/org/apache/solr/cluster/placement/impl/SimpleClusterAbstractionsImpl.java@@ -19,11 +19,19 @@ package org.apache.solr.cluster.placement.impl;import com.google.common.collect.Maps;import java.io.IOException;-import java.util.*;+import java.util.Collection;+import java.util.Iterator;+import java.util.Map;+import java.util.Objects;+import java.util.Set;import java.util.stream.Collectors;import org.apache.solr.client.solrj.cloud.SolrCloudManager;import org.apache.solr.cloud.api.collections.Assign;-import org.apache.solr.cluster.*;+import org.apache.solr.cluster.Cluster;+import org.apache.solr.cluster.Node;+import org.apache.solr.cluster.Replica;+import org.apache.solr.cluster.Shard;+import org.apache.solr.cluster.SolrCollection;import org.apache.solr.common.cloud.ClusterState;import org.apache.solr.common.cloud.DocCollection;import org.apache.solr.common.cloud.Slice;diff --git a/solr/core/src/java/org/apache/solr/cluster/placement/plugins/AffinityPlacementFactory.java b/solr/core/src/java/org/apache/solr/cluster/placement/plugins/AffinityPlacementFactory.javaindex 82a4ae57b9a..2b8cde15c8a 100644--- a/solr/core/src/java/org/apache/solr/cluster/placement/plugins/AffinityPlacementFactory.java+++ b/solr/core/src/java/org/apache/solr/cluster/placement/plugins/AffinityPlacementFactory.java@@ -21,11 +21,44 @@ import com.google.common.collect.Ordering;import com.google.common.collect.TreeMultimap;import java.io.IOException;import java.lang.invoke.MethodHandles;-import java.util.*;+import java.util.ArrayList;+import java.util.Arrays;+import java.util.Collection;+import java.util.Collections;+import java.util.Comparator;+import java.util.EnumMap;+import java.util.HashMap;+import java.util.HashSet;+import java.util.Iterator;+import java.util.List;+import java.util.Locale;+import java.util.Map;+import java.util.Objects;+import java.util.Optional;+import java.util.Random;+import java.util.Set;import java.util.concurrent.atomic.AtomicInteger;import java.util.stream.Collectors;-import org.apache.solr.cluster.*;-import org.apache.solr.cluster.placement.*;+import org.apache.solr.cluster.Cluster;+import org.apache.solr.cluster.Node;+import org.apache.solr.cluster.Replica;+import org.apache.solr.cluster.Shard;+import org.apache.solr.cluster.SolrCollection;+import org.apache.solr.cluster.placement.AttributeFetcher;+import org.apache.solr.cluster.placement.AttributeValues;+import org.apache.solr.cluster.placement.DeleteCollectionRequest;+import org.apache.solr.cluster.placement.DeleteReplicasRequest;+import org.apache.solr.cluster.placement.DeleteShardsRequest;+import org.apache.solr.cluster.placement.ModificationRequest;+import org.apache.solr.cluster.placement.PlacementContext;+import org.apache.solr.cluster.placement.PlacementException;+import org.apache.solr.cluster.placement.PlacementModificationException;+import org.apache.solr.cluster.placement.PlacementPlan;+import org.apache.solr.cluster.placement.PlacementPlanFactory;+import org.apache.solr.cluster.placement.PlacementPlugin;+import org.apache.solr.cluster.placement.PlacementPluginFactory;+import org.apache.solr.cluster.placement.PlacementRequest;+import org.apache.solr.cluster.placement.ReplicaPlacement;import org.apache.solr.cluster.placement.impl.NodeMetricImpl;import org.apache.solr.common.util.StrUtils;import org.apache.solr.common.util.SuppressForbidden;diff --git a/solr/core/src/java/org/apache/solr/cluster/placement/plugins/MinimizeCoresPlacementFactory.java b/solr/core/src/java/org/apache/solr/cluster/placement/plugins/MinimizeCoresPlacementFactory.javaindex 2fea8b3eb12..61f6305aa75 100644--- a/solr/core/src/java/org/apache/solr/cluster/placement/plugins/MinimizeCoresPlacementFactory.java+++ b/solr/core/src/java/org/apache/solr/cluster/placement/plugins/MinimizeCoresPlacementFactory.java@@ -31,7 +31,16 @@ import java.util.Set;import org.apache.solr.cluster.Node;import org.apache.solr.cluster.Replica;import org.apache.solr.cluster.SolrCollection;-import org.apache.solr.cluster.placement.*;+import org.apache.solr.cluster.placement.AttributeFetcher;+import org.apache.solr.cluster.placement.AttributeValues;+import org.apache.solr.cluster.placement.PlacementContext;+import org.apache.solr.cluster.placement.PlacementException;+import org.apache.solr.cluster.placement.PlacementPlan;+import org.apache.solr.cluster.placement.PlacementPlanFactory;+import org.apache.solr.cluster.placement.PlacementPlugin;+import org.apache.solr.cluster.placement.PlacementPluginFactory;+import org.apache.solr.cluster.placement.PlacementRequest;+import org.apache.solr.cluster.placement.ReplicaPlacement;import org.apache.solr.cluster.placement.impl.NodeMetricImpl;import org.apache.solr.common.util.SuppressForbidden;diff --git a/solr/core/src/java/org/apache/solr/cluster/placement/plugins/RandomPlacementFactory.java b/solr/core/src/java/org/apache/solr/cluster/placement/plugins/RandomPlacementFactory.javaindex eed1dcaf7cb..3c040f58e33 100644--- a/solr/core/src/java/org/apache/solr/cluster/placement/plugins/RandomPlacementFactory.java+++ b/solr/core/src/java/org/apache/solr/cluster/placement/plugins/RandomPlacementFactory.java@@ -27,7 +27,14 @@ import java.util.Set;import org.apache.solr.cluster.Node;import org.apache.solr.cluster.Replica;import org.apache.solr.cluster.SolrCollection;-import org.apache.solr.cluster.placement.*;+import org.apache.solr.cluster.placement.PlacementContext;+import org.apache.solr.cluster.placement.PlacementException;+import org.apache.solr.cluster.placement.PlacementPlan;+import org.apache.solr.cluster.placement.PlacementPlanFactory;+import org.apache.solr.cluster.placement.PlacementPlugin;+import org.apache.solr.cluster.placement.PlacementPluginFactory;+import org.apache.solr.cluster.placement.PlacementRequest;+import org.apache.solr.cluster.placement.ReplicaPlacement;/*** Factory for creating {@link RandomPlacementPlugin}, a placement plugin implementing randomdiff --git a/solr/core/src/java/org/apache/solr/core/CoreContainer.java b/solr/core/src/java/org/apache/solr/core/CoreContainer.javaindex f1423ba7c09..fd9421c6e94 100644--- a/solr/core/src/java/org/apache/solr/core/CoreContainer.java+++ b/solr/core/src/java/org/apache/solr/core/CoreContainer.java@@ -17,7 +17,15 @@package org.apache.solr.core;import static java.util.Objects.requireNonNull;-import static org.apache.solr.common.params.CommonParams.*;+import static org.apache.solr.common.params.CommonParams.AUTHC_PATH;+import static org.apache.solr.common.params.CommonParams.AUTHZ_PATH;+import static org.apache.solr.common.params.CommonParams.COLLECTIONS_HANDLER_PATH;+import static org.apache.solr.common.params.CommonParams.CONFIGSETS_HANDLER_PATH;+import static org.apache.solr.common.params.CommonParams.CORES_HANDLER_PATH;+import static org.apache.solr.common.params.CommonParams.INFO_HANDLER_PATH;+import static org.apache.solr.common.params.CommonParams.METRICS_PATH;+import static org.apache.solr.common.params.CommonParams.ZK_PATH;+import static org.apache.solr.common.params.CommonParams.ZK_STATUS_PATH;import static org.apache.solr.core.CorePropertiesLocator.PROPERTIES_FILENAME;import static org.apache.solr.security.AuthenticationPlugin.AUTHENTICATION_PLUGIN_PROP;diff --git a/solr/core/src/java/org/apache/solr/core/MMapDirectoryFactory.java b/solr/core/src/java/org/apache/solr/core/MMapDirectoryFactory.javaindex ad59c9a90e1..1c0197894dd 100644--- a/solr/core/src/java/org/apache/solr/core/MMapDirectoryFactory.java+++ b/solr/core/src/java/org/apache/solr/core/MMapDirectoryFactory.java@@ -20,7 +20,7 @@ import java.io.IOException;import java.lang.invoke.MethodHandles;import java.nio.file.Path;import org.apache.lucene.store.Directory;-import org.apache.lucene.store.LockFactory; // javadocs+import org.apache.lucene.store.LockFactory;import org.apache.lucene.store.MMapDirectory;import org.apache.solr.common.params.SolrParams;import org.apache.solr.common.util.NamedList;diff --git a/solr/core/src/java/org/apache/solr/core/NodeRoles.java b/solr/core/src/java/org/apache/solr/core/NodeRoles.javaindex 8b51bb94b9e..b36358f37dc 100644--- a/solr/core/src/java/org/apache/solr/core/NodeRoles.java+++ b/solr/core/src/java/org/apache/solr/core/NodeRoles.java@@ -16,7 +16,11 @@*/package org.apache.solr.core;-import java.util.*;+import java.util.Collections;+import java.util.EnumMap;+import java.util.List;+import java.util.Map;+import java.util.Set;import org.apache.solr.common.SolrException;import org.apache.solr.common.StringUtils;import org.apache.solr.common.cloud.ZkStateReader;diff --git a/solr/core/src/java/org/apache/solr/core/SolrCores.java b/solr/core/src/java/org/apache/solr/core/SolrCores.javaindex ded46dd2724..36847bf83db 100644--- a/solr/core/src/java/org/apache/solr/core/SolrCores.java+++ b/solr/core/src/java/org/apache/solr/core/SolrCores.java@@ -17,7 +17,15 @@package org.apache.solr.core;import java.lang.invoke.MethodHandles;-import java.util.*;+import java.util.ArrayList;+import java.util.Collection;+import java.util.Collections;+import java.util.HashSet;+import java.util.LinkedHashMap;+import java.util.List;+import java.util.Map;+import java.util.Set;+import java.util.UUID;import java.util.concurrent.ConcurrentHashMap;import java.util.concurrent.ExecutorService;import java.util.concurrent.TimeUnit;diff --git a/solr/core/src/java/org/apache/solr/handler/AnalyzeEvaluator.java b/solr/core/src/java/org/apache/solr/handler/AnalyzeEvaluator.javaindex 5f252e623d1..d90aef5c9f6 100644--- a/solr/core/src/java/org/apache/solr/handler/AnalyzeEvaluator.java+++ b/solr/core/src/java/org/apache/solr/handler/AnalyzeEvaluator.java@@ -20,7 +20,8 @@ package org.apache.solr.handler;import java.io.IOException;import java.util.ArrayList;import java.util.List;-import org.apache.lucene.analysis.*;+import org.apache.lucene.analysis.Analyzer;+import org.apache.lucene.analysis.TokenStream;import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;import org.apache.solr.client.solrj.io.Tuple;import org.apache.solr.client.solrj.io.eval.SourceEvaluator;diff --git a/solr/core/src/java/org/apache/solr/handler/ClassifyStream.java b/solr/core/src/java/org/apache/solr/handler/ClassifyStream.javaindex 452b74a07b9..c929180baeb 100644--- a/solr/core/src/java/org/apache/solr/handler/ClassifyStream.java+++ b/solr/core/src/java/org/apache/solr/handler/ClassifyStream.java@@ -22,7 +22,8 @@ import java.util.HashMap;import java.util.List;import java.util.Locale;import java.util.Map;-import org.apache.lucene.analysis.*;+import org.apache.lucene.analysis.Analyzer;+import org.apache.lucene.analysis.TokenStream;import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;import org.apache.solr.client.solrj.io.Tuple;import org.apache.solr.client.solrj.io.comp.StreamComparator;diff --git a/solr/core/src/java/org/apache/solr/handler/ClusterAPI.java b/solr/core/src/java/org/apache/solr/handler/ClusterAPI.javaindex a368e23a953..e58ed8c6bd3 100644--- a/solr/core/src/java/org/apache/solr/handler/ClusterAPI.java+++ b/solr/core/src/java/org/apache/solr/handler/ClusterAPI.java@@ -17,13 +17,24 @@package org.apache.solr.handler;-import static org.apache.solr.client.solrj.SolrRequest.METHOD.*;import static org.apache.solr.client.solrj.SolrRequest.METHOD.DELETE;+import static org.apache.solr.client.solrj.SolrRequest.METHOD.GET;+import static org.apache.solr.client.solrj.SolrRequest.METHOD.POST;+import static org.apache.solr.client.solrj.SolrRequest.METHOD.PUT;import static org.apache.solr.cloud.api.collections.CollectionHandlingUtils.REQUESTID;import static org.apache.solr.common.params.CollectionParams.ACTION;-import static org.apache.solr.common.params.CollectionParams.CollectionAction.*;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.ADDROLE;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.CLUSTERPROP;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.DELETESTATUS;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.LIST;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.OVERSEERSTATUS;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.REMOVEROLE;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.REQUESTSTATUS;import static org.apache.solr.core.RateLimiterConfig.RL_CONFIG_KEY;-import static org.apache.solr.security.PermissionNameProvider.Name.*;+import static org.apache.solr.security.PermissionNameProvider.Name.COLL_EDIT_PERM;+import static org.apache.solr.security.PermissionNameProvider.Name.COLL_READ_PERM;+import static org.apache.solr.security.PermissionNameProvider.Name.CONFIG_EDIT_PERM;+import static org.apache.solr.security.PermissionNameProvider.Name.CONFIG_READ_PERM;import com.google.common.collect.Maps;import java.io.IOException;diff --git a/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java b/solr/core/src/java/org/apache/solr/handler/IndexFetcher.javaindex b3b01b583fa..d2a70f68eee 100644--- a/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java+++ b/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java@@ -18,7 +18,29 @@ package org.apache.solr.handler;import static org.apache.solr.common.params.CommonParams.JAVABIN;import static org.apache.solr.common.params.CommonParams.NAME;-import static org.apache.solr.handler.ReplicationHandler.*;+import static org.apache.solr.handler.ReplicationHandler.ALIAS;+import static org.apache.solr.handler.ReplicationHandler.CHECKSUM;+import static org.apache.solr.handler.ReplicationHandler.CMD_DETAILS;+import static org.apache.solr.handler.ReplicationHandler.CMD_GET_FILE;+import static org.apache.solr.handler.ReplicationHandler.CMD_GET_FILE_LIST;+import static org.apache.solr.handler.ReplicationHandler.CMD_INDEX_VERSION;+import static org.apache.solr.handler.ReplicationHandler.COMMAND;+import static org.apache.solr.handler.ReplicationHandler.COMPRESSION;+import static org.apache.solr.handler.ReplicationHandler.CONF_FILES;+import static org.apache.solr.handler.ReplicationHandler.CONF_FILE_SHORT;+import static org.apache.solr.handler.ReplicationHandler.EXTERNAL;+import static org.apache.solr.handler.ReplicationHandler.FETCH_FROM_LEADER;+import static org.apache.solr.handler.ReplicationHandler.FILE;+import static org.apache.solr.handler.ReplicationHandler.FILE_STREAM;+import static org.apache.solr.handler.ReplicationHandler.FileInfo;+import static org.apache.solr.handler.ReplicationHandler.GENERATION;+import static org.apache.solr.handler.ReplicationHandler.INTERNAL;+import static org.apache.solr.handler.ReplicationHandler.LEADER_URL;+import static org.apache.solr.handler.ReplicationHandler.LEGACY_LEADER_URL;+import static org.apache.solr.handler.ReplicationHandler.LEGACY_SKIP_COMMIT_ON_LEADER_VERSION_ZERO;+import static org.apache.solr.handler.ReplicationHandler.OFFSET;+import static org.apache.solr.handler.ReplicationHandler.SIZE;+import static org.apache.solr.handler.ReplicationHandler.SKIP_COMMIT_ON_LEADER_VERSION_ZERO;import com.google.common.base.Strings;import java.io.File;diff --git a/solr/core/src/java/org/apache/solr/handler/RequestHandlerUtils.java b/solr/core/src/java/org/apache/solr/handler/RequestHandlerUtils.javaindex 24fc39d5af7..f97aba0c126 100644--- a/solr/core/src/java/org/apache/solr/handler/RequestHandlerUtils.java+++ b/solr/core/src/java/org/apache/solr/handler/RequestHandlerUtils.java@@ -17,7 +17,12 @@package org.apache.solr.handler;import java.io.IOException;-import java.util.*;+import java.util.Arrays;+import java.util.HashMap;+import java.util.HashSet;+import java.util.Iterator;+import java.util.Map;+import java.util.Set;import org.apache.solr.common.SolrException;import org.apache.solr.common.params.CommonParams;import org.apache.solr.common.params.MapSolrParams;diff --git a/solr/core/src/java/org/apache/solr/handler/StandardRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/StandardRequestHandler.javaindex 512165dbf9e..edf3eeeda7e 100644--- a/solr/core/src/java/org/apache/solr/handler/StandardRequestHandler.java+++ b/solr/core/src/java/org/apache/solr/handler/StandardRequestHandler.java@@ -16,7 +16,7 @@*/package org.apache.solr.handler;-import org.apache.solr.handler.component.*;+import org.apache.solr.handler.component.SearchHandler;@Deprecatedpublic class StandardRequestHandler extends SearchHandler {diff --git a/solr/core/src/java/org/apache/solr/handler/UpdateRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/UpdateRequestHandler.javaindex 4adf9afd8d3..22f97952ef7 100644--- a/solr/core/src/java/org/apache/solr/handler/UpdateRequestHandler.java+++ b/solr/core/src/java/org/apache/solr/handler/UpdateRequestHandler.java@@ -19,7 +19,9 @@ package org.apache.solr.handler;import static org.apache.solr.common.params.CommonParams.PATH;import static org.apache.solr.security.PermissionNameProvider.Name.UPDATE_PERM;-import java.util.*;+import java.util.Collections;+import java.util.HashMap;+import java.util.Map;import org.apache.solr.common.SolrException;import org.apache.solr.common.SolrException.ErrorCode;import org.apache.solr.common.params.CommonParams;diff --git a/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.javaindex dfab883f3d0..72a5751abce 100644--- a/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java+++ b/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java@@ -16,24 +16,109 @@*/package org.apache.solr.handler.admin;-import static org.apache.solr.client.solrj.response.RequestStatusState.*;+import static org.apache.solr.client.solrj.response.RequestStatusState.COMPLETED;+import static org.apache.solr.client.solrj.response.RequestStatusState.FAILED;+import static org.apache.solr.client.solrj.response.RequestStatusState.NOT_FOUND;+import static org.apache.solr.client.solrj.response.RequestStatusState.RUNNING;+import static org.apache.solr.client.solrj.response.RequestStatusState.SUBMITTED;import static org.apache.solr.cloud.Overseer.QUEUE_OPERATION;-import static org.apache.solr.cloud.api.collections.CollectionHandlingUtils.*;+import static org.apache.solr.cloud.api.collections.CollectionHandlingUtils.CREATE_NODE_SET;+import static org.apache.solr.cloud.api.collections.CollectionHandlingUtils.CREATE_NODE_SET_EMPTY;+import static org.apache.solr.cloud.api.collections.CollectionHandlingUtils.CREATE_NODE_SET_SHUFFLE;+import static org.apache.solr.cloud.api.collections.CollectionHandlingUtils.NUM_SLICES;+import static org.apache.solr.cloud.api.collections.CollectionHandlingUtils.ONLY_ACTIVE_NODES;+import static org.apache.solr.cloud.api.collections.CollectionHandlingUtils.ONLY_IF_DOWN;import static org.apache.solr.cloud.api.collections.CollectionHandlingUtils.REQUESTID;+import static org.apache.solr.cloud.api.collections.CollectionHandlingUtils.SHARDS_PROP;+import static org.apache.solr.cloud.api.collections.CollectionHandlingUtils.SHARD_UNIQUE;import static org.apache.solr.cloud.api.collections.RoutedAlias.CREATE_COLLECTION_PREFIX;import static org.apache.solr.common.SolrException.ErrorCode.BAD_REQUEST;import static org.apache.solr.common.cloud.DocCollection.DOC_ROUTER;import static org.apache.solr.common.cloud.DocCollection.PER_REPLICA_STATE;-import static org.apache.solr.common.cloud.ZkStateReader.*;+import static org.apache.solr.common.cloud.ZkStateReader.COLLECTION_PROP;+import static org.apache.solr.common.cloud.ZkStateReader.NRT_REPLICAS;+import static org.apache.solr.common.cloud.ZkStateReader.PROPERTY_PROP;+import static org.apache.solr.common.cloud.ZkStateReader.PROPERTY_VALUE_PROP;+import static org.apache.solr.common.cloud.ZkStateReader.PULL_REPLICAS;+import static org.apache.solr.common.cloud.ZkStateReader.REPLICATION_FACTOR;+import static org.apache.solr.common.cloud.ZkStateReader.REPLICA_PROP;import static org.apache.solr.common.cloud.ZkStateReader.REPLICA_TYPE;-import static org.apache.solr.common.params.CollectionAdminParams.*;+import static org.apache.solr.common.cloud.ZkStateReader.SHARD_ID_PROP;+import static org.apache.solr.common.cloud.ZkStateReader.TLOG_REPLICAS;+import static org.apache.solr.common.params.CollectionAdminParams.ALIAS;import static org.apache.solr.common.params.CollectionAdminParams.COLLECTION;+import static org.apache.solr.common.params.CollectionAdminParams.COLL_CONF;+import static org.apache.solr.common.params.CollectionAdminParams.COUNT_PROP;+import static org.apache.solr.common.params.CollectionAdminParams.FOLLOW_ALIASES;+import static org.apache.solr.common.params.CollectionAdminParams.PROPERTY_NAME;import static org.apache.solr.common.params.CollectionAdminParams.PROPERTY_PREFIX;-import static org.apache.solr.common.params.CollectionParams.CollectionAction.*;-import static org.apache.solr.common.params.CommonAdminParams.*;-import static org.apache.solr.common.params.CommonParams.*;+import static org.apache.solr.common.params.CollectionAdminParams.PROPERTY_VALUE;+import static org.apache.solr.common.params.CollectionAdminParams.SKIP_NODE_ASSIGNMENT;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.ADDREPLICA;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.ADDREPLICAPROP;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.ADDROLE;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.ALIASPROP;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.BACKUP;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.BALANCESHARDUNIQUE;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.CLUSTERPROP;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.CLUSTERSTATUS;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.COLLECTIONPROP;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.COLSTATUS;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.CREATE;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.CREATEALIAS;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.CREATESHARD;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.CREATESNAPSHOT;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.DELETE;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.DELETEALIAS;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.DELETEBACKUP;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.DELETENODE;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.DELETEREPLICA;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.DELETEREPLICAPROP;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.DELETESHARD;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.DELETESNAPSHOT;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.DELETESTATUS;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.DISTRIBUTEDAPIPROCESSING;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.FORCELEADER;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.LIST;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.LISTALIASES;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.LISTBACKUP;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.LISTSNAPSHOTS;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.MIGRATE;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.MOCK_COLL_TASK;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.MODIFYCOLLECTION;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.MOVEREPLICA;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.OVERSEERSTATUS;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.REBALANCELEADERS;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.REINDEXCOLLECTION;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.RELOAD;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.REMOVEROLE;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.RENAME;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.REPLACENODE;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.REQUESTSTATUS;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.RESTORE;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.SPLITSHARD;+import static org.apache.solr.common.params.CollectionParams.CollectionAction.SYNCSHARD;+import static org.apache.solr.common.params.CommonAdminParams.ASYNC;+import static org.apache.solr.common.params.CommonAdminParams.IN_PLACE_MOVE;+import static org.apache.solr.common.params.CommonAdminParams.NUM_SUB_SHARDS;+import static org.apache.solr.common.params.CommonAdminParams.SPLIT_BY_PREFIX;+import static org.apache.solr.common.params.CommonAdminParams.SPLIT_FUZZ;+import static org.apache.solr.common.params.CommonAdminParams.SPLIT_METHOD;+import static org.apache.solr.common.params.CommonAdminParams.WAIT_FOR_FINAL_STATE;import static org.apache.solr.common.params.CommonParams.NAME;-import static org.apache.solr.common.params.CoreAdminParams.*;+import static org.apache.solr.common.params.CommonParams.TIMING;+import static org.apache.solr.common.params.CommonParams.VALUE_LONG;+import static org.apache.solr.common.params.CoreAdminParams.BACKUP_ID;+import static org.apache.solr.common.params.CoreAdminParams.BACKUP_LOCATION;+import static org.apache.solr.common.params.CoreAdminParams.BACKUP_PURGE_UNUSED;+import static org.apache.solr.common.params.CoreAdminParams.BACKUP_REPOSITORY;+import static org.apache.solr.common.params.CoreAdminParams.DATA_DIR;+import static org.apache.solr.common.params.CoreAdminParams.DELETE_DATA_DIR;+import static org.apache.solr.common.params.CoreAdminParams.DELETE_INDEX;+import static org.apache.solr.common.params.CoreAdminParams.DELETE_INSTANCE_DIR;+import static org.apache.solr.common.params.CoreAdminParams.INSTANCE_DIR;+import static org.apache.solr.common.params.CoreAdminParams.MAX_NUM_BACKUP_POINTS;+import static org.apache.solr.common.params.CoreAdminParams.ULOG_DIR;import static org.apache.solr.common.params.ShardParams._ROUTE_;import static org.apache.solr.common.util.StrUtils.formatString;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 61e74eb9080..117334b6d4b 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@@ -21,7 +21,11 @@ import static org.apache.lucene.util.IOUtils.closeWhileHandlingException;import java.io.IOException;import java.lang.invoke.MethodHandles;-import java.util.*;+import java.util.ArrayList;+import java.util.LinkedHashMap;+import java.util.List;+import java.util.Map;+import java.util.Objects;import java.util.function.Function;import java.util.function.Supplier;import org.apache.solr.api.AnnotatedApi;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 230f9a86d5a..fea8f9124f9 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@@ -18,7 +18,28 @@ package org.apache.solr.handler.admin;import static org.apache.solr.common.params.CommonParams.NAME;import static org.apache.solr.common.params.CoreAdminParams.COLLECTION;-import static org.apache.solr.common.params.CoreAdminParams.CoreAdminAction.*;+import static org.apache.solr.common.params.CoreAdminParams.CoreAdminAction.BACKUPCORE;+import static org.apache.solr.common.params.CoreAdminParams.CoreAdminAction.CREATE;+import static org.apache.solr.common.params.CoreAdminParams.CoreAdminAction.CREATESNAPSHOT;+import static org.apache.solr.common.params.CoreAdminParams.CoreAdminAction.DELETESNAPSHOT;+import static org.apache.solr.common.params.CoreAdminParams.CoreAdminAction.INVOKE;+import static org.apache.solr.common.params.CoreAdminParams.CoreAdminAction.LISTSNAPSHOTS;+import static org.apache.solr.common.params.CoreAdminParams.CoreAdminAction.MERGEINDEXES;+import static org.apache.solr.common.params.CoreAdminParams.CoreAdminAction.OVERSEEROP;+import static org.apache.solr.common.params.CoreAdminParams.CoreAdminAction.PREPRECOVERY;+import static org.apache.solr.common.params.CoreAdminParams.CoreAdminAction.REJOINLEADERELECTION;+import static org.apache.solr.common.params.CoreAdminParams.CoreAdminAction.RELOAD;+import static org.apache.solr.common.params.CoreAdminParams.CoreAdminAction.RENAME;+import static org.apache.solr.common.params.CoreAdminParams.CoreAdminAction.REQUESTAPPLYUPDATES;+import static org.apache.solr.common.params.CoreAdminParams.CoreAdminAction.REQUESTBUFFERUPDATES;+import static org.apache.solr.common.params.CoreAdminParams.CoreAdminAction.REQUESTRECOVERY;+import static org.apache.solr.common.params.CoreAdminParams.CoreAdminAction.REQUESTSTATUS;+import static org.apache.solr.common.params.CoreAdminParams.CoreAdminAction.REQUESTSYNCSHARD;+import static org.apache.solr.common.params.CoreAdminParams.CoreAdminAction.RESTORECORE;+import static org.apache.solr.common.params.CoreAdminParams.CoreAdminAction.SPLIT;+import static org.apache.solr.common.params.CoreAdminParams.CoreAdminAction.STATUS;+import static org.apache.solr.common.params.CoreAdminParams.CoreAdminAction.SWAP;+import static org.apache.solr.common.params.CoreAdminParams.CoreAdminAction.UNLOAD;import static org.apache.solr.common.params.CoreAdminParams.REPLICA;import static org.apache.solr.common.params.CoreAdminParams.REPLICA_TYPE;import static org.apache.solr.common.params.CoreAdminParams.SHARD;diff --git a/solr/core/src/java/org/apache/solr/handler/admin/HealthCheckHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/HealthCheckHandler.javaindex ca7aee92c90..3f5c8442b47 100644--- a/solr/core/src/java/org/apache/solr/handler/admin/HealthCheckHandler.java+++ b/solr/core/src/java/org/apache/solr/handler/admin/HealthCheckHandler.java@@ -17,7 +17,9 @@package org.apache.solr.handler.admin;-import static org.apache.solr.common.params.CommonParams.*;+import static org.apache.solr.common.params.CommonParams.FAILURE;+import static org.apache.solr.common.params.CommonParams.OK;+import static org.apache.solr.common.params.CommonParams.STATUS;import static org.apache.solr.handler.ReplicationHandler.GENERATION;import java.lang.invoke.MethodHandles;diff --git a/solr/core/src/java/org/apache/solr/handler/admin/MergeIndexesOp.java b/solr/core/src/java/org/apache/solr/handler/admin/MergeIndexesOp.javaindex ff7c3612197..9df24ff5e20 100644--- a/solr/core/src/java/org/apache/solr/handler/admin/MergeIndexesOp.java+++ b/solr/core/src/java/org/apache/solr/handler/admin/MergeIndexesOp.java@@ -20,7 +20,11 @@ package org.apache.solr.handler.admin;import com.google.common.collect.Lists;import java.lang.invoke.MethodHandles;import java.nio.file.Paths;-import java.util.*;+import java.util.Arrays;+import java.util.HashMap;+import java.util.List;+import java.util.Map;+import java.util.Set;import org.apache.lucene.index.DirectoryReader;import org.apache.lucene.store.Directory;import org.apache.lucene.util.IOUtils;diff --git a/solr/core/src/java/org/apache/solr/handler/admin/SegmentsInfoRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/SegmentsInfoRequestHandler.javaindex b1106046e4b..cd4a325faf8 100644--- a/solr/core/src/java/org/apache/solr/handler/admin/SegmentsInfoRequestHandler.java+++ b/solr/core/src/java/org/apache/solr/handler/admin/SegmentsInfoRequestHandler.java@@ -16,7 +16,9 @@*/package org.apache.solr.handler.admin;-import static org.apache.lucene.index.IndexOptions.*;+import static org.apache.lucene.index.IndexOptions.DOCS;+import static org.apache.lucene.index.IndexOptions.DOCS_AND_FREQS;+import static org.apache.lucene.index.IndexOptions.DOCS_AND_FREQS_AND_POSITIONS_AND_OFFSETS;import static org.apache.solr.common.params.CommonParams.NAME;import java.io.IOException;@@ -26,9 +28,23 @@ import java.util.Arrays;import java.util.Date;import java.util.List;import java.util.stream.Collectors;-import org.apache.lucene.index.*;+import org.apache.lucene.index.DocValuesType;+import org.apache.lucene.index.FieldInfo;+import org.apache.lucene.index.FieldInfos;+import org.apache.lucene.index.FilterLeafReader;+import org.apache.lucene.index.IndexOptions;+import org.apache.lucene.index.IndexWriter;+import org.apache.lucene.index.LeafMetaData;+import org.apache.lucene.index.LeafReader;+import org.apache.lucene.index.LeafReaderContext;+import org.apache.lucene.index.MergePolicy;import org.apache.lucene.index.MergePolicy.MergeSpecification;import org.apache.lucene.index.MergePolicy.OneMerge;+import org.apache.lucene.index.MergeTrigger;+import org.apache.lucene.index.SegmentCommitInfo;+import org.apache.lucene.index.SegmentInfos;+import org.apache.lucene.index.SegmentReader;+import org.apache.lucene.index.Terms;import org.apache.lucene.store.Directory;import org.apache.lucene.util.RamUsageEstimator;import org.apache.lucene.util.Version;diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/AddReplicaAPI.java b/solr/core/src/java/org/apache/solr/handler/admin/api/AddReplicaAPI.javaindex df77b7c1bd7..99b08200c13 100644--- a/solr/core/src/java/org/apache/solr/handler/admin/api/AddReplicaAPI.java+++ b/solr/core/src/java/org/apache/solr/handler/admin/api/AddReplicaAPI.java@@ -18,7 +18,9 @@package org.apache.solr.handler.admin.api;import static org.apache.solr.client.solrj.SolrRequest.METHOD.POST;-import static org.apache.solr.common.params.CollectionAdminParams.*;+import static org.apache.solr.common.params.CollectionAdminParams.COLLECTION;+import static org.apache.solr.common.params.CollectionAdminParams.CREATE_NODE_SET_PARAM;+import static org.apache.solr.common.params.CollectionAdminParams.PROPERTY_PREFIX;import static org.apache.solr.common.params.CommonParams.ACTION;import static org.apache.solr.handler.ClusterAPI.wrapParams;import static org.apache.solr.handler.api.V2ApiUtils.flattenMapWithPrefix;diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/CreateShardAPI.java b/solr/core/src/java/org/apache/solr/handler/admin/api/CreateShardAPI.javaindex a3c60ff622e..b7f3ddaba81 100644--- a/solr/core/src/java/org/apache/solr/handler/admin/api/CreateShardAPI.java+++ b/solr/core/src/java/org/apache/solr/handler/admin/api/CreateShardAPI.java@@ -18,7 +18,9 @@package org.apache.solr.handler.admin.api;import static org.apache.solr.client.solrj.SolrRequest.METHOD.POST;-import static org.apache.solr.common.params.CollectionAdminParams.*;+import static org.apache.solr.common.params.CollectionAdminParams.COLLECTION;+import static org.apache.solr.common.params.CollectionAdminParams.CREATE_NODE_SET_PARAM;+import static org.apache.solr.common.params.CollectionAdminParams.PROPERTY_PREFIX;import static org.apache.solr.common.params.CommonParams.ACTION;import static org.apache.solr.handler.ClusterAPI.wrapParams;import static org.apache.solr.handler.api.V2ApiUtils.flattenMapWithPrefix;diff --git a/solr/core/src/java/org/apache/solr/handler/component/StatsInfo.java b/solr/core/src/java/org/apache/solr/handler/component/StatsInfo.javaindex 7b0f4ab2d54..3157634716c 100644--- a/solr/core/src/java/org/apache/solr/handler/component/StatsInfo.java+++ b/solr/core/src/java/org/apache/solr/handler/component/StatsInfo.java@@ -17,7 +17,11 @@package org.apache.solr.handler.component;-import java.util.*;+import java.util.ArrayList;+import java.util.Collections;+import java.util.LinkedHashMap;+import java.util.List;+import java.util.Map;import org.apache.solr.common.params.SolrParams;import org.apache.solr.common.params.StatsParams;diff --git a/solr/core/src/java/org/apache/solr/handler/component/StatsValuesFactory.java b/solr/core/src/java/org/apache/solr/handler/component/StatsValuesFactory.javaindex 011b4e4843a..9dd3d16c00c 100644--- a/solr/core/src/java/org/apache/solr/handler/component/StatsValuesFactory.java+++ b/solr/core/src/java/org/apache/solr/handler/component/StatsValuesFactory.java@@ -21,7 +21,13 @@ import com.tdunning.math.stats.AVLTreeDigest;import java.io.IOException;import java.nio.ByteBuffer;import java.nio.charset.StandardCharsets;-import java.util.*;+import java.util.Arrays;+import java.util.Collection;+import java.util.Date;+import java.util.HashMap;+import java.util.Map;+import java.util.Set;+import java.util.TreeSet;import org.apache.lucene.index.LeafReaderContext;import org.apache.lucene.queries.function.FunctionValues;import org.apache.lucene.queries.function.ValueSource;@@ -31,7 +37,14 @@ import org.apache.solr.common.SolrException;import org.apache.solr.common.util.NamedList;import org.apache.solr.common.util.SimpleOrderedMap;import org.apache.solr.handler.component.StatsField.Stat;-import org.apache.solr.schema.*;+import org.apache.solr.schema.AbstractEnumField;+import org.apache.solr.schema.DatePointField;+import org.apache.solr.schema.FieldType;+import org.apache.solr.schema.PointField;+import org.apache.solr.schema.SchemaField;+import org.apache.solr.schema.StrField;+import org.apache.solr.schema.TrieDateField;+import org.apache.solr.schema.TrieField;import org.apache.solr.util.hll.HLL;import org.apache.solr.util.hll.HLLType;diff --git a/solr/core/src/java/org/apache/solr/handler/export/MultiFieldWriter.java b/solr/core/src/java/org/apache/solr/handler/export/MultiFieldWriter.javaindex d1fdaed7cde..863451eb217 100644--- a/solr/core/src/java/org/apache/solr/handler/export/MultiFieldWriter.java+++ b/solr/core/src/java/org/apache/solr/handler/export/MultiFieldWriter.java@@ -21,7 +21,11 @@ import com.carrotsearch.hppc.IntObjectHashMap;import java.io.IOException;import java.util.Date;import java.util.function.LongFunction;-import org.apache.lucene.index.*;+import org.apache.lucene.index.DocValues;+import org.apache.lucene.index.IndexableField;+import org.apache.lucene.index.LeafReaderContext;+import org.apache.lucene.index.SortedNumericDocValues;+import org.apache.lucene.index.SortedSetDocValues;import org.apache.lucene.util.BytesRef;import org.apache.lucene.util.CharsRefBuilder;import org.apache.lucene.util.NumericUtils;diff --git a/solr/core/src/java/org/apache/solr/handler/loader/CSVLoader.java b/solr/core/src/java/org/apache/solr/handler/loader/CSVLoader.javaindex 2bbf03732f0..8294cb97fc7 100644--- a/solr/core/src/java/org/apache/solr/handler/loader/CSVLoader.java+++ b/solr/core/src/java/org/apache/solr/handler/loader/CSVLoader.java@@ -16,7 +16,7 @@*/package org.apache.solr.handler.loader;-import java.io.*;+import java.io.IOException;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.common.util.ContentStream;import org.apache.solr.request.SolrQueryRequest;diff --git a/solr/core/src/java/org/apache/solr/handler/loader/CSVLoaderBase.java b/solr/core/src/java/org/apache/solr/handler/loader/CSVLoaderBase.javaindex cf4f0111fd7..a91c65e30c7 100644--- a/solr/core/src/java/org/apache/solr/handler/loader/CSVLoaderBase.java+++ b/solr/core/src/java/org/apache/solr/handler/loader/CSVLoaderBase.java@@ -16,7 +16,10 @@*/package org.apache.solr.handler.loader;-import java.io.*;+import java.io.BufferedReader;+import java.io.IOException;+import java.io.Reader;+import java.io.StringReader;import java.util.HashMap;import java.util.Iterator;import java.util.List;@@ -33,7 +36,7 @@ import org.apache.solr.internal.csv.CSVParser;import org.apache.solr.internal.csv.CSVStrategy;import org.apache.solr.request.SolrQueryRequest;import org.apache.solr.response.SolrQueryResponse;-import org.apache.solr.update.*;+import org.apache.solr.update.AddUpdateCommand;import org.apache.solr.update.processor.UpdateRequestProcessor;public abstract class CSVLoaderBase extends ContentStreamLoader {diff --git a/solr/core/src/java/org/apache/solr/index/SlowCompositeReaderWrapper.java b/solr/core/src/java/org/apache/solr/index/SlowCompositeReaderWrapper.javaindex e19c6a7f0bb..21396549f71 100644--- a/solr/core/src/java/org/apache/solr/index/SlowCompositeReaderWrapper.java+++ b/solr/core/src/java/org/apache/solr/index/SlowCompositeReaderWrapper.java@@ -20,8 +20,32 @@ import java.io.IOException;import java.util.HashMap;import java.util.Map;import java.util.concurrent.ConcurrentHashMap;-import org.apache.lucene.index.*;+import org.apache.lucene.index.BinaryDocValues;+import org.apache.lucene.index.CompositeReader;+import org.apache.lucene.index.DirectoryReader;+import org.apache.lucene.index.DocValues;+import org.apache.lucene.index.DocValuesType;+import org.apache.lucene.index.FieldInfo;+import org.apache.lucene.index.FieldInfos;+import org.apache.lucene.index.Fields;+import org.apache.lucene.index.IndexReader;+import org.apache.lucene.index.LeafMetaData;+import org.apache.lucene.index.LeafReader;+import org.apache.lucene.index.LeafReaderContext;+import org.apache.lucene.index.MultiBits;+import org.apache.lucene.index.MultiDocValues;import org.apache.lucene.index.MultiDocValues.MultiSortedDocValues;+import org.apache.lucene.index.MultiReader;+import org.apache.lucene.index.MultiTerms;+import org.apache.lucene.index.NumericDocValues;+import org.apache.lucene.index.OrdinalMap;+import org.apache.lucene.index.PointValues;+import org.apache.lucene.index.SortedDocValues;+import org.apache.lucene.index.SortedNumericDocValues;+import org.apache.lucene.index.SortedSetDocValues;+import org.apache.lucene.index.StoredFieldVisitor;+import org.apache.lucene.index.Terms;+import org.apache.lucene.index.VectorValues;import org.apache.lucene.search.TopDocs;import org.apache.lucene.util.Bits;import org.apache.lucene.util.Version;diff --git a/solr/core/src/java/org/apache/solr/metrics/MetricSuppliers.java b/solr/core/src/java/org/apache/solr/metrics/MetricSuppliers.javaindex 5d23032d801..f303bef6960 100644--- a/solr/core/src/java/org/apache/solr/metrics/MetricSuppliers.java+++ b/solr/core/src/java/org/apache/solr/metrics/MetricSuppliers.java@@ -16,7 +16,18 @@*/package org.apache.solr.metrics;-import com.codahale.metrics.*;+import com.codahale.metrics.Clock;+import com.codahale.metrics.Counter;+import com.codahale.metrics.ExponentiallyDecayingReservoir;+import com.codahale.metrics.Gauge;+import com.codahale.metrics.Histogram;+import com.codahale.metrics.Meter;+import com.codahale.metrics.MetricRegistry;+import com.codahale.metrics.Reservoir;+import com.codahale.metrics.SlidingTimeWindowReservoir;+import com.codahale.metrics.SlidingWindowReservoir;+import com.codahale.metrics.Timer;+import com.codahale.metrics.UniformReservoir;import java.lang.invoke.MethodHandles;import java.lang.management.ManagementFactory;import java.lang.management.ThreadMXBean;diff --git a/solr/core/src/java/org/apache/solr/parser/QueryParser.java b/solr/core/src/java/org/apache/solr/parser/QueryParser.javaindex 11c59469245..12776d1d38a 100644--- a/solr/core/src/java/org/apache/solr/parser/QueryParser.java+++ b/solr/core/src/java/org/apache/solr/parser/QueryParser.java@@ -2,6 +2,14 @@/* Generated By:JavaCC: Do not edit this line. QueryParser.java */package org.apache.solr.parser;+import org.apache.lucene.analysis.Analyzer;+import org.apache.lucene.queryparser.charstream.CharStream;+import org.apache.lucene.queryparser.charstream.FastCharStream;+import org.apache.lucene.search.BooleanClause;+import org.apache.lucene.search.Query;+import org.apache.solr.search.QParser;+import org.apache.solr.search.SyntaxError;+import java.io.StringReader;import java.util.ArrayList;import java.util.Arrays;@@ -9,15 +17,6 @@ import java.util.HashSet;import java.util.List;import java.util.Set;-import org.apache.lucene.analysis.Analyzer;-import org.apache.lucene.search.BooleanClause;-import org.apache.lucene.search.Query;-import org.apache.solr.search.SyntaxError;-import org.apache.solr.search.QParser;--import org.apache.lucene.queryparser.charstream.CharStream;-import org.apache.lucene.queryparser.charstream.FastCharStream;-public class QueryParser extends SolrQueryParserBase implements QueryParserConstants {/** The default operator for parsing queries.*/diff --git a/solr/core/src/java/org/apache/solr/pkg/PackageListeners.java b/solr/core/src/java/org/apache/solr/pkg/PackageListeners.javaindex c7f6fdbfb2d..43e778d46a2 100644--- a/solr/core/src/java/org/apache/solr/pkg/PackageListeners.java+++ b/solr/core/src/java/org/apache/solr/pkg/PackageListeners.java@@ -20,7 +20,11 @@ package org.apache.solr.pkg;import java.lang.invoke.MethodHandles;import java.lang.ref.Reference;import java.lang.ref.SoftReference;-import java.util.*;+import java.util.ArrayList;+import java.util.Iterator;+import java.util.LinkedHashMap;+import java.util.List;+import java.util.Map;import java.util.concurrent.CopyOnWriteArrayList;import java.util.function.Consumer;import org.apache.solr.common.MapWriter;diff --git a/solr/core/src/java/org/apache/solr/pkg/PackageListeningClassLoader.java b/solr/core/src/java/org/apache/solr/pkg/PackageListeningClassLoader.javaindex 4c734006025..c346e07eda1 100644--- a/solr/core/src/java/org/apache/solr/pkg/PackageListeningClassLoader.java+++ b/solr/core/src/java/org/apache/solr/pkg/PackageListeningClassLoader.java@@ -18,7 +18,9 @@package org.apache.solr.pkg;import java.io.IOException;-import java.util.*;+import java.util.LinkedHashMap;+import java.util.Map;+import java.util.Objects;import java.util.concurrent.ConcurrentHashMap;import java.util.function.Function;import org.apache.lucene.util.ResourceLoaderAware;diff --git a/solr/core/src/java/org/apache/solr/rest/schema/analysis/ManagedSynonymFilterFactory.java b/solr/core/src/java/org/apache/solr/rest/schema/analysis/ManagedSynonymFilterFactory.javaindex 9728b8a2bb5..e8c0075c95a 100644--- a/solr/core/src/java/org/apache/solr/rest/schema/analysis/ManagedSynonymFilterFactory.java+++ b/solr/core/src/java/org/apache/solr/rest/schema/analysis/ManagedSynonymFilterFactory.java@@ -29,7 +29,7 @@ import java.util.TreeMap;import java.util.TreeSet;import org.apache.lucene.analysis.Analyzer;import org.apache.lucene.analysis.TokenStream;-import org.apache.lucene.analysis.core.FlattenGraphFilterFactory; // javadocs+import org.apache.lucene.analysis.core.FlattenGraphFilterFactory;import org.apache.lucene.analysis.synonym.SynonymFilterFactory;import org.apache.lucene.analysis.synonym.SynonymMap;import org.apache.lucene.util.CharsRef;diff --git a/solr/core/src/java/org/apache/solr/schema/RandomSortField.java b/solr/core/src/java/org/apache/solr/schema/RandomSortField.javaindex c50efdb7125..517b34d6744 100644--- a/solr/core/src/java/org/apache/solr/schema/RandomSortField.java+++ b/solr/core/src/java/org/apache/solr/schema/RandomSortField.java@@ -25,7 +25,10 @@ import org.apache.lucene.index.ReaderUtil;import org.apache.lucene.queries.function.FunctionValues;import org.apache.lucene.queries.function.ValueSource;import org.apache.lucene.queries.function.docvalues.IntDocValues;-import org.apache.lucene.search.*;+import org.apache.lucene.search.FieldComparator;+import org.apache.lucene.search.FieldComparatorSource;+import org.apache.lucene.search.SimpleFieldComparator;+import org.apache.lucene.search.SortField;import org.apache.solr.response.TextResponseWriter;import org.apache.solr.search.QParser;import org.apache.solr.uninverting.UninvertingReader.Type;diff --git a/solr/core/src/java/org/apache/solr/schema/SortableTextField.java b/solr/core/src/java/org/apache/solr/schema/SortableTextField.javaindex f02eb521286..a124872030d 100644--- a/solr/core/src/java/org/apache/solr/schema/SortableTextField.java+++ b/solr/core/src/java/org/apache/solr/schema/SortableTextField.java@@ -25,7 +25,8 @@ import org.apache.lucene.document.SortedSetDocValuesField;import org.apache.lucene.index.IndexableField;import org.apache.lucene.queries.function.ValueSource;import org.apache.lucene.queries.function.valuesource.SortedSetFieldSource;-import org.apache.lucene.search.*;+import org.apache.lucene.search.SortField;+import org.apache.lucene.search.SortedSetSelector;import org.apache.lucene.util.BytesRef;import org.apache.solr.common.SolrException;import org.apache.solr.common.util.ByteArrayUtf8CharSequence;diff --git a/solr/core/src/java/org/apache/solr/schema/TextField.java b/solr/core/src/java/org/apache/solr/schema/TextField.javaindex 86a7b541ca7..549b10c4cdf 100644--- a/solr/core/src/java/org/apache/solr/schema/TextField.java+++ b/solr/core/src/java/org/apache/solr/schema/TextField.java@@ -26,7 +26,10 @@ import org.apache.lucene.index.IndexableField;import org.apache.lucene.index.Term;import org.apache.lucene.queries.function.ValueSource;import org.apache.lucene.queries.function.valuesource.SortedSetFieldSource;-import org.apache.lucene.search.*;+import org.apache.lucene.search.Query;+import org.apache.lucene.search.SortField;+import org.apache.lucene.search.SortedSetSelector;+import org.apache.lucene.search.TermQuery;import org.apache.lucene.util.BytesRef;import org.apache.lucene.util.BytesRefBuilder;import org.apache.lucene.util.QueryBuilder;diff --git a/solr/core/src/java/org/apache/solr/schema/UUIDField.java b/solr/core/src/java/org/apache/solr/schema/UUIDField.javaindex 4e80f719c32..94b72306622 100644--- a/solr/core/src/java/org/apache/solr/schema/UUIDField.java+++ b/solr/core/src/java/org/apache/solr/schema/UUIDField.java@@ -24,7 +24,7 @@ import org.apache.lucene.index.IndexableField;import org.apache.lucene.search.SortField;import org.apache.solr.common.SolrException;import org.apache.solr.response.TextResponseWriter;-import org.apache.solr.update.processor.UUIDUpdateProcessorFactory; // jdoc+import org.apache.solr.update.processor.UUIDUpdateProcessorFactory;/*** This FieldType accepts UUID string values, as well as the special value of "NEW" which triggersdiff --git a/solr/core/src/java/org/apache/solr/search/CursorMark.java b/solr/core/src/java/org/apache/solr/search/CursorMark.javaindex 687f2ccb9d9..02a539260f2 100644--- a/solr/core/src/java/org/apache/solr/search/CursorMark.java+++ b/solr/core/src/java/org/apache/solr/search/CursorMark.java@@ -16,7 +16,9 @@*/package org.apache.solr.search;-import static org.apache.solr.common.params.CursorMarkParams.*;+import static org.apache.solr.common.params.CursorMarkParams.CURSOR_MARK_NEXT;+import static org.apache.solr.common.params.CursorMarkParams.CURSOR_MARK_PARAM;+import static org.apache.solr.common.params.CursorMarkParams.CURSOR_MARK_START;import java.io.ByteArrayInputStream;import java.io.ByteArrayOutputStream;diff --git a/solr/core/src/java/org/apache/solr/search/FunctionRangeQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/FunctionRangeQParserPlugin.javaindex 202946f233d..ad7fee8a556 100644--- a/solr/core/src/java/org/apache/solr/search/FunctionRangeQParserPlugin.java+++ b/solr/core/src/java/org/apache/solr/search/FunctionRangeQParserPlugin.java@@ -19,10 +19,10 @@ package org.apache.solr.search;import org.apache.lucene.queries.function.FunctionQuery;import org.apache.lucene.queries.function.ValueSource;import org.apache.lucene.queries.function.valuesource.QueryValueSource;-import org.apache.lucene.search.*;+import org.apache.lucene.search.Query;import org.apache.solr.common.params.SolrParams;import org.apache.solr.request.SolrQueryRequest;-import org.apache.solr.search.function.*;+import org.apache.solr.search.function.ValueSourceRangeFilter;/*** Create a range query over a function. <br>diff --git a/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java b/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.javaindex 8b11ff396d4..219384d4ea6 100644--- a/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java+++ b/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java@@ -50,9 +50,35 @@ import org.apache.lucene.index.StoredFieldVisitor;import org.apache.lucene.index.Term;import org.apache.lucene.index.Terms;import org.apache.lucene.index.TermsEnum;-import org.apache.lucene.search.*;import org.apache.lucene.search.BooleanClause.Occur;+import org.apache.lucene.search.BooleanQuery;+import org.apache.lucene.search.CollectionStatistics;+import org.apache.lucene.search.Collector;+import org.apache.lucene.search.DocIdSetIterator;+import org.apache.lucene.search.Explanation;+import org.apache.lucene.search.FieldDoc;+import org.apache.lucene.search.IndexSearcher;+import org.apache.lucene.search.LeafCollector;+import org.apache.lucene.search.MatchAllDocsQuery;+import org.apache.lucene.search.MultiCollector;+import org.apache.lucene.search.Query;+import org.apache.lucene.search.Scorable;+import org.apache.lucene.search.ScoreDoc;+import org.apache.lucene.search.ScoreMode;+import org.apache.lucene.search.SimpleCollector;+import org.apache.lucene.search.Sort;+import org.apache.lucene.search.SortField;import org.apache.lucene.search.SortField.Type;+import org.apache.lucene.search.TermQuery;+import org.apache.lucene.search.TermStatistics;+import org.apache.lucene.search.TimeLimitingCollector;+import org.apache.lucene.search.TopDocs;+import org.apache.lucene.search.TopDocsCollector;+import org.apache.lucene.search.TopFieldCollector;+import org.apache.lucene.search.TopFieldDocs;+import org.apache.lucene.search.TopScoreDocCollector;+import org.apache.lucene.search.TotalHitCountCollector;+import org.apache.lucene.search.TotalHits;import org.apache.lucene.search.TotalHits.Relation;import org.apache.lucene.store.AlreadyClosedException;import org.apache.lucene.store.Directory;diff --git a/solr/core/src/java/org/apache/solr/search/SurroundQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/SurroundQParserPlugin.javaindex 31dcbeb32f9..204477353e0 100644--- a/solr/core/src/java/org/apache/solr/search/SurroundQParserPlugin.java+++ b/solr/core/src/java/org/apache/solr/search/SurroundQParserPlugin.java@@ -17,8 +17,9 @@package org.apache.solr.search;import java.lang.invoke.MethodHandles;-import org.apache.lucene.queryparser.surround.parser.*;-import org.apache.lucene.queryparser.surround.query.*;+import org.apache.lucene.queryparser.surround.parser.QueryParser;+import org.apache.lucene.queryparser.surround.query.BasicQueryFactory;+import org.apache.lucene.queryparser.surround.query.SrndQuery;import org.apache.lucene.search.Query;import org.apache.solr.common.params.CommonParams;import org.apache.solr.common.params.SolrParams;diff --git a/solr/core/src/java/org/apache/solr/search/SwitchQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/SwitchQParserPlugin.javaindex 5ff286e0efe..a70d7cf4823 100644--- a/solr/core/src/java/org/apache/solr/search/SwitchQParserPlugin.java+++ b/solr/core/src/java/org/apache/solr/search/SwitchQParserPlugin.java@@ -20,7 +20,7 @@ import org.apache.commons.lang3.StringUtils;import org.apache.lucene.search.Query;import org.apache.solr.common.params.SolrParams;import org.apache.solr.common.util.NamedList;-import org.apache.solr.handler.component.SearchHandler; // jdoc+import org.apache.solr.handler.component.SearchHandler;import org.apache.solr.request.SolrQueryRequest;/**diff --git a/solr/core/src/java/org/apache/solr/search/TermsQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/TermsQParserPlugin.javaindex a36acce3155..503c5fc21b0 100644--- a/solr/core/src/java/org/apache/solr/search/TermsQParserPlugin.java+++ b/solr/core/src/java/org/apache/solr/search/TermsQParserPlugin.java@@ -27,7 +27,21 @@ import org.apache.lucene.index.PrefixCodedTerms;import org.apache.lucene.index.SortedSetDocValues;import org.apache.lucene.index.Term;import org.apache.lucene.sandbox.search.DocValuesTermsQuery;-import org.apache.lucene.search.*;+import org.apache.lucene.search.AutomatonQuery;+import org.apache.lucene.search.BooleanClause;+import org.apache.lucene.search.BooleanQuery;+import org.apache.lucene.search.ConstantScoreQuery;+import org.apache.lucene.search.ConstantScoreScorer;+import org.apache.lucene.search.ConstantScoreWeight;+import org.apache.lucene.search.IndexSearcher;+import org.apache.lucene.search.MatchNoDocsQuery;+import org.apache.lucene.search.Query;+import org.apache.lucene.search.ScoreMode;+import org.apache.lucene.search.Scorer;+import org.apache.lucene.search.TermInSetQuery;+import org.apache.lucene.search.TermQuery;+import org.apache.lucene.search.TwoPhaseIterator;+import org.apache.lucene.search.Weight;import org.apache.lucene.util.ArrayUtil;import org.apache.lucene.util.BytesRef;import org.apache.lucene.util.BytesRefBuilder;diff --git a/solr/core/src/java/org/apache/solr/search/ValueSourceParser.java b/solr/core/src/java/org/apache/solr/search/ValueSourceParser.javaindex cd86b3acadd..90bfeed9fb2 100644--- a/solr/core/src/java/org/apache/solr/search/ValueSourceParser.java+++ b/solr/core/src/java/org/apache/solr/search/ValueSourceParser.java@@ -32,7 +32,39 @@ import org.apache.lucene.queries.function.ValueSource;import org.apache.lucene.queries.function.docvalues.BoolDocValues;import org.apache.lucene.queries.function.docvalues.DoubleDocValues;import org.apache.lucene.queries.function.docvalues.LongDocValues;-import org.apache.lucene.queries.function.valuesource.*;+import org.apache.lucene.queries.function.valuesource.ConstNumberSource;+import org.apache.lucene.queries.function.valuesource.ConstValueSource;+import org.apache.lucene.queries.function.valuesource.DefFunction;+import org.apache.lucene.queries.function.valuesource.DivFloatFunction;+import org.apache.lucene.queries.function.valuesource.DocFreqValueSource;+import org.apache.lucene.queries.function.valuesource.DoubleConstValueSource;+import org.apache.lucene.queries.function.valuesource.DualFloatFunction;+import org.apache.lucene.queries.function.valuesource.IDFValueSource;+import org.apache.lucene.queries.function.valuesource.IfFunction;+import org.apache.lucene.queries.function.valuesource.JoinDocFreqValueSource;+import org.apache.lucene.queries.function.valuesource.LinearFloatFunction;+import org.apache.lucene.queries.function.valuesource.LiteralValueSource;+import org.apache.lucene.queries.function.valuesource.MaxDocValueSource;+import org.apache.lucene.queries.function.valuesource.MaxFloatFunction;+import org.apache.lucene.queries.function.valuesource.MinFloatFunction;+import org.apache.lucene.queries.function.valuesource.MultiBoolFunction;+import org.apache.lucene.queries.function.valuesource.MultiValueSource;+import org.apache.lucene.queries.function.valuesource.NormValueSource;+import org.apache.lucene.queries.function.valuesource.NumDocsValueSource;+import org.apache.lucene.queries.function.valuesource.ProductFloatFunction;+import org.apache.lucene.queries.function.valuesource.QueryValueSource;+import org.apache.lucene.queries.function.valuesource.RangeMapFloatFunction;+import org.apache.lucene.queries.function.valuesource.ReciprocalFloatFunction;+import org.apache.lucene.queries.function.valuesource.ScaleFloatFunction;+import org.apache.lucene.queries.function.valuesource.SimpleBoolFunction;+import org.apache.lucene.queries.function.valuesource.SimpleFloatFunction;+import org.apache.lucene.queries.function.valuesource.SingleFunction;+import org.apache.lucene.queries.function.valuesource.SumFloatFunction;+import org.apache.lucene.queries.function.valuesource.SumTotalTermFreqValueSource;+import org.apache.lucene.queries.function.valuesource.TFValueSource;+import org.apache.lucene.queries.function.valuesource.TermFreqValueSource;+import org.apache.lucene.queries.function.valuesource.TotalTermFreqValueSource;+import org.apache.lucene.queries.function.valuesource.VectorValueSource;import org.apache.lucene.queries.payloads.PayloadDecoder;import org.apache.lucene.queries.payloads.PayloadFunction;import org.apache.lucene.search.IndexSearcher;diff --git a/solr/core/src/java/org/apache/solr/search/facet/FacetRangeProcessor.java b/solr/core/src/java/org/apache/solr/search/facet/FacetRangeProcessor.javaindex 477a15109c4..7a2f5f7155c 100644--- a/solr/core/src/java/org/apache/solr/search/facet/FacetRangeProcessor.java+++ b/solr/core/src/java/org/apache/solr/search/facet/FacetRangeProcessor.java@@ -20,15 +20,27 @@ package org.apache.solr.search.facet;import static org.apache.solr.search.facet.FacetContext.SKIP_FACET;import java.io.IOException;-import java.util.*;+import java.util.ArrayList;+import java.util.Date;+import java.util.EnumSet;+import java.util.List;+import java.util.Map;import org.apache.lucene.search.Query;import org.apache.lucene.util.NumericUtils;import org.apache.solr.common.EnumFieldValue;import org.apache.solr.common.SolrException;import org.apache.solr.common.params.FacetParams;import org.apache.solr.common.util.SimpleOrderedMap;-import org.apache.solr.schema.*;+import org.apache.solr.schema.AbstractEnumField;import org.apache.solr.schema.AbstractEnumField.EnumMapping;+import org.apache.solr.schema.CurrencyFieldType;+import org.apache.solr.schema.CurrencyValue;+import org.apache.solr.schema.DateRangeField;+import org.apache.solr.schema.ExchangeRateProvider;+import org.apache.solr.schema.FieldType;+import org.apache.solr.schema.SchemaField;+import org.apache.solr.schema.TrieDateField;+import org.apache.solr.schema.TrieField;import org.apache.solr.search.DocSet;import org.apache.solr.search.ExtendedQuery;import org.apache.solr.search.SyntaxError;diff --git a/solr/core/src/java/org/apache/solr/search/grouping/distributed/requestfactory/StoredFieldsShardRequestFactory.java b/solr/core/src/java/org/apache/solr/search/grouping/distributed/requestfactory/StoredFieldsShardRequestFactory.javaindex 53dee410edb..d9307a4befa 100644--- a/solr/core/src/java/org/apache/solr/search/grouping/distributed/requestfactory/StoredFieldsShardRequestFactory.java+++ b/solr/core/src/java/org/apache/solr/search/grouping/distributed/requestfactory/StoredFieldsShardRequestFactory.java@@ -16,7 +16,12 @@*/package org.apache.solr.search.grouping.distributed.requestfactory;-import java.util.*;+import java.util.ArrayList;+import java.util.Collection;+import java.util.HashMap;+import java.util.HashSet;+import java.util.List;+import java.util.Set;import org.apache.lucene.search.ScoreDoc;import org.apache.lucene.search.grouping.GroupDocs;import org.apache.lucene.search.grouping.TopGroups;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 8da9fe07b57..4304a5dba99 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@@ -17,7 +17,11 @@package org.apache.solr.search.grouping.distributed.shardresultserializer;import java.io.IOException;-import java.util.*;+import java.util.ArrayList;+import java.util.Collection;+import java.util.HashMap;+import java.util.List;+import java.util.Map;import org.apache.lucene.search.Sort;import org.apache.lucene.search.SortField;import org.apache.lucene.search.grouping.SearchGroup;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 64e3adef3bc..13c1fb3333a 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@@ -17,7 +17,12 @@package org.apache.solr.search.join;-import java.util.*;+import java.util.Collection;+import java.util.Collections;+import java.util.HashSet;+import java.util.IdentityHashMap;+import java.util.Map;+import java.util.Set;import org.apache.lucene.search.BooleanClause;import org.apache.lucene.search.BooleanClause.Occur;import org.apache.lucene.search.BooleanQuery;diff --git a/solr/core/src/java/org/apache/solr/search/join/HashRangeQuery.java b/solr/core/src/java/org/apache/solr/search/join/HashRangeQuery.javaindex e3be43ace0b..cd9d052d445 100644--- a/solr/core/src/java/org/apache/solr/search/join/HashRangeQuery.java+++ b/solr/core/src/java/org/apache/solr/search/join/HashRangeQuery.java@@ -24,7 +24,16 @@ import org.apache.lucene.index.DocValues;import org.apache.lucene.index.IndexReader;import org.apache.lucene.index.LeafReaderContext;import org.apache.lucene.index.SortedDocValues;-import org.apache.lucene.search.*;+import org.apache.lucene.search.ConstantScoreScorer;+import org.apache.lucene.search.ConstantScoreWeight;+import org.apache.lucene.search.DocIdSetIterator;+import org.apache.lucene.search.IndexSearcher;+import org.apache.lucene.search.Query;+import org.apache.lucene.search.QueryVisitor;+import org.apache.lucene.search.ScoreMode;+import org.apache.lucene.search.Scorer;+import org.apache.lucene.search.TwoPhaseIterator;+import org.apache.lucene.search.Weight;import org.apache.lucene.util.BytesRef;import org.apache.solr.common.util.Hash;import org.apache.solr.search.SolrCache;diff --git a/solr/core/src/java/org/apache/solr/search/similarities/ClassicSimilarityFactory.java b/solr/core/src/java/org/apache/solr/search/similarities/ClassicSimilarityFactory.javaindex 00c9224e454..250ca045acf 100644--- a/solr/core/src/java/org/apache/solr/search/similarities/ClassicSimilarityFactory.java+++ b/solr/core/src/java/org/apache/solr/search/similarities/ClassicSimilarityFactory.java@@ -18,7 +18,7 @@ package org.apache.solr.search.similarities;import org.apache.lucene.search.similarities.ClassicSimilarity;import org.apache.lucene.search.similarities.Similarity;-import org.apache.lucene.search.similarities.TFIDFSimilarity; // javadoc+import org.apache.lucene.search.similarities.TFIDFSimilarity;import org.apache.solr.common.params.SolrParams;import org.apache.solr.schema.SimilarityFactory;diff --git a/solr/core/src/java/org/apache/solr/search/similarities/DFRSimilarityFactory.java b/solr/core/src/java/org/apache/solr/search/similarities/DFRSimilarityFactory.javaindex 5e08d9779a8..61b972f604b 100644--- a/solr/core/src/java/org/apache/solr/search/similarities/DFRSimilarityFactory.java+++ b/solr/core/src/java/org/apache/solr/search/similarities/DFRSimilarityFactory.java@@ -26,7 +26,7 @@ import org.apache.lucene.search.similarities.BasicModelIn;import org.apache.lucene.search.similarities.BasicModelIne;import org.apache.lucene.search.similarities.DFRSimilarity;import org.apache.lucene.search.similarities.Normalization;-import org.apache.lucene.search.similarities.Normalization.NoNormalization; // javadoc+import org.apache.lucene.search.similarities.Normalization.NoNormalization;import org.apache.lucene.search.similarities.NormalizationH1;import org.apache.lucene.search.similarities.NormalizationH2;import org.apache.lucene.search.similarities.NormalizationH3;diff --git a/solr/core/src/java/org/apache/solr/search/similarities/SweetSpotSimilarityFactory.java b/solr/core/src/java/org/apache/solr/search/similarities/SweetSpotSimilarityFactory.javaindex d1c40e7912b..8dfc886dcc7 100644--- a/solr/core/src/java/org/apache/solr/search/similarities/SweetSpotSimilarityFactory.java+++ b/solr/core/src/java/org/apache/solr/search/similarities/SweetSpotSimilarityFactory.java@@ -16,10 +16,10 @@*/package org.apache.solr.search.similarities;-import static org.apache.solr.common.SolrException.ErrorCode.*;+import static org.apache.solr.common.SolrException.ErrorCode.SERVER_ERROR;import org.apache.lucene.misc.SweetSpotSimilarity;-import org.apache.lucene.search.similarities.ClassicSimilarity; // jdoc+import org.apache.lucene.search.similarities.ClassicSimilarity;import org.apache.lucene.search.similarities.Similarity;import org.apache.solr.common.SolrException;import org.apache.solr.common.params.SolrParams;diff --git a/solr/core/src/java/org/apache/solr/spelling/suggest/fst/WFSTLookupFactory.java b/solr/core/src/java/org/apache/solr/spelling/suggest/fst/WFSTLookupFactory.javaindex e612565739b..dd1b897973b 100644--- a/solr/core/src/java/org/apache/solr/spelling/suggest/fst/WFSTLookupFactory.java+++ b/solr/core/src/java/org/apache/solr/spelling/suggest/fst/WFSTLookupFactory.java@@ -17,7 +17,7 @@package org.apache.solr.spelling.suggest.fst;import org.apache.lucene.search.suggest.Lookup;-import org.apache.lucene.search.suggest.fst.*;+import org.apache.lucene.search.suggest.fst.WFSTCompletionLookup;import org.apache.solr.common.util.NamedList;import org.apache.solr.core.SolrCore;import org.apache.solr.spelling.suggest.LookupFactory;diff --git a/solr/core/src/java/org/apache/solr/uninverting/FieldCache.java b/solr/core/src/java/org/apache/solr/uninverting/FieldCache.javaindex c34b1d2aa8f..fc64f880012 100644--- a/solr/core/src/java/org/apache/solr/uninverting/FieldCache.java+++ b/solr/core/src/java/org/apache/solr/uninverting/FieldCache.java@@ -19,7 +19,7 @@ package org.apache.solr.uninverting;import java.io.IOException;import org.apache.lucene.document.NumericDocValuesField;import org.apache.lucene.index.BinaryDocValues;-import org.apache.lucene.index.IndexReader; // javadocs+import org.apache.lucene.index.IndexReader;import org.apache.lucene.index.LeafReader;import org.apache.lucene.index.NumericDocValues;import org.apache.lucene.index.SortedDocValues;diff --git a/solr/core/src/java/org/apache/solr/update/UpdateHandler.java b/solr/core/src/java/org/apache/solr/update/UpdateHandler.javaindex f186997a721..b2a9a683092 100644--- a/solr/core/src/java/org/apache/solr/update/UpdateHandler.java+++ b/solr/core/src/java/org/apache/solr/update/UpdateHandler.java@@ -19,7 +19,11 @@ package org.apache.solr.update;import java.io.IOException;import java.lang.invoke.MethodHandles;import java.util.Vector;-import org.apache.solr.core.*;+import org.apache.solr.core.DirectoryFactory;+import org.apache.solr.core.PluginInfo;+import org.apache.solr.core.SolrCore;+import org.apache.solr.core.SolrEventListener;+import org.apache.solr.core.SolrInfoBean;import org.apache.solr.metrics.SolrMetricsContext;import org.apache.solr.schema.FieldType;import org.apache.solr.schema.SchemaField;diff --git a/solr/core/src/java/org/apache/solr/update/processor/AbstractDefaultValueUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/AbstractDefaultValueUpdateProcessorFactory.javaindex 9fc4f94aa98..daa5b589dd7 100644--- a/solr/core/src/java/org/apache/solr/update/processor/AbstractDefaultValueUpdateProcessorFactory.java+++ b/solr/core/src/java/org/apache/solr/update/processor/AbstractDefaultValueUpdateProcessorFactory.java@@ -16,7 +16,7 @@*/package org.apache.solr.update.processor;-import static org.apache.solr.common.SolrException.ErrorCode.*;+import static org.apache.solr.common.SolrException.ErrorCode.SERVER_ERROR;import java.io.IOException;import org.apache.solr.common.SolrException;diff --git a/solr/core/src/java/org/apache/solr/update/processor/DefaultValueUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/DefaultValueUpdateProcessorFactory.javaindex 16581799822..907d0a45a23 100644--- a/solr/core/src/java/org/apache/solr/update/processor/DefaultValueUpdateProcessorFactory.java+++ b/solr/core/src/java/org/apache/solr/update/processor/DefaultValueUpdateProcessorFactory.java@@ -16,7 +16,7 @@*/package org.apache.solr.update.processor;-import static org.apache.solr.common.SolrException.ErrorCode.*;+import static org.apache.solr.common.SolrException.ErrorCode.SERVER_ERROR;import org.apache.solr.common.SolrException;import org.apache.solr.common.util.NamedList;diff --git a/solr/core/src/java/org/apache/solr/update/processor/RunUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/RunUpdateProcessorFactory.javaindex d136bbb64bb..48a6c6b5baa 100644--- a/solr/core/src/java/org/apache/solr/update/processor/RunUpdateProcessorFactory.java+++ b/solr/core/src/java/org/apache/solr/update/processor/RunUpdateProcessorFactory.java@@ -20,7 +20,12 @@ import java.io.IOException;import org.apache.solr.common.SolrException;import org.apache.solr.request.SolrQueryRequest;import org.apache.solr.response.SolrQueryResponse;-import org.apache.solr.update.*;+import org.apache.solr.update.AddUpdateCommand;+import org.apache.solr.update.CommitUpdateCommand;+import org.apache.solr.update.DeleteUpdateCommand;+import org.apache.solr.update.MergeIndexesCommand;+import org.apache.solr.update.RollbackUpdateCommand;+import org.apache.solr.update.UpdateHandler;/*** Executes the update commands using the underlying UpdateHandler. Almost all processor chainsdiff --git a/solr/core/src/java/org/apache/solr/update/processor/TimestampUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/TimestampUpdateProcessorFactory.javaindex 9f53bb86a8d..1cf2511302c 100644--- a/solr/core/src/java/org/apache/solr/update/processor/TimestampUpdateProcessorFactory.java+++ b/solr/core/src/java/org/apache/solr/update/processor/TimestampUpdateProcessorFactory.java@@ -17,7 +17,7 @@package org.apache.solr.update.processor;import java.util.Date;-import org.apache.solr.common.params.CommonParams; // javadoc+import org.apache.solr.common.params.CommonParams;import org.apache.solr.request.SolrQueryRequest;import org.apache.solr.request.SolrRequestInfo;import org.apache.solr.response.SolrQueryResponse;diff --git a/solr/core/src/java/org/apache/solr/util/BoundedTreeSet.java b/solr/core/src/java/org/apache/solr/util/BoundedTreeSet.javaindex 554fb14f821..3975901461b 100644--- a/solr/core/src/java/org/apache/solr/util/BoundedTreeSet.java+++ b/solr/core/src/java/org/apache/solr/util/BoundedTreeSet.java@@ -16,7 +16,10 @@*/package org.apache.solr.util;-import java.util.*;+import java.util.Collection;+import java.util.Comparator;+import java.util.SortedSet;+import java.util.TreeSet;/*** A TreeSet that ensures it never grows beyond a max size. <code>last()</code> is removed if thediff --git a/solr/core/src/java/org/apache/solr/util/ConcurrentLRUCache.java b/solr/core/src/java/org/apache/solr/util/ConcurrentLRUCache.javaindex c6a8bf0d555..258d307c780 100644--- a/solr/core/src/java/org/apache/solr/util/ConcurrentLRUCache.java+++ b/solr/core/src/java/org/apache/solr/util/ConcurrentLRUCache.java@@ -32,7 +32,6 @@ import java.util.Map;import java.util.TreeSet;import java.util.concurrent.ConcurrentHashMap;import java.util.concurrent.TimeUnit;-// import java.util.concurrent.atomic.AtomicInteger;import java.util.concurrent.atomic.AtomicBoolean;import java.util.concurrent.atomic.AtomicLong;import java.util.concurrent.atomic.LongAdder;diff --git a/solr/core/src/java/org/apache/solr/util/RegexFileFilter.java b/solr/core/src/java/org/apache/solr/util/RegexFileFilter.javaindex 15abc6ed65f..3ed84d93c20 100644--- a/solr/core/src/java/org/apache/solr/util/RegexFileFilter.java+++ b/solr/core/src/java/org/apache/solr/util/RegexFileFilter.java@@ -18,7 +18,7 @@ package org.apache.solr.util;import java.io.File;import java.io.FileFilter;-import java.util.regex.*;+import java.util.regex.Pattern;/** Accepts any file whose name matches the pattern */public final class RegexFileFilter implements FileFilter {diff --git a/solr/core/src/test/org/apache/solr/ConvertedLegacyTest.java b/solr/core/src/test/org/apache/solr/ConvertedLegacyTest.javaindex 19e63e8bb17..fdbc3c7ec14 100644--- a/solr/core/src/test/org/apache/solr/ConvertedLegacyTest.java+++ b/solr/core/src/test/org/apache/solr/ConvertedLegacyTest.java@@ -16,9 +16,11 @@*/package org.apache.solr;-import java.util.*;+import java.util.HashMap;+import java.util.Map;import org.apache.solr.common.params.CommonParams;-import org.apache.solr.request.*;+import org.apache.solr.request.LocalSolrQueryRequest;+import org.apache.solr.request.SolrQueryRequest;import org.apache.solr.util.ErrorLogMuter;import org.junit.BeforeClass;import org.junit.Test;diff --git a/solr/core/src/test/org/apache/solr/SampleTest.java b/solr/core/src/test/org/apache/solr/SampleTest.javaindex f643834ead7..3914fc2f401 100644--- a/solr/core/src/test/org/apache/solr/SampleTest.java+++ b/solr/core/src/test/org/apache/solr/SampleTest.java@@ -17,8 +17,8 @@package org.apache.solr;import org.apache.solr.common.params.CommonParams;-import org.apache.solr.request.*;-import org.apache.solr.util.*;+import org.apache.solr.request.SolrQueryRequest;+import org.apache.solr.util.TestHarness;import org.junit.BeforeClass;import org.junit.Test;diff --git a/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudDistribCmdsTest.java b/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudDistribCmdsTest.javaindex 7802f580c9f..20fc04b8442 100644--- a/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudDistribCmdsTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudDistribCmdsTest.java@@ -43,7 +43,11 @@ import org.apache.solr.client.solrj.response.UpdateResponse;import org.apache.solr.common.SolrDocumentList;import org.apache.solr.common.SolrException;import org.apache.solr.common.SolrInputDocument;-import org.apache.solr.common.cloud.*;+import org.apache.solr.common.cloud.CollectionStatePredicate;+import org.apache.solr.common.cloud.DocCollection;+import org.apache.solr.common.cloud.Replica;+import org.apache.solr.common.cloud.Slice;+import org.apache.solr.common.cloud.ZkStateReader;import org.apache.solr.common.params.SolrParams;import org.apache.solr.common.util.ExecutorUtil;import org.junit.After;diff --git a/solr/core/src/test/org/apache/solr/cloud/RouteFieldTest.java b/solr/core/src/test/org/apache/solr/cloud/RouteFieldTest.javaindex f30dd3ab357..7a469aaefb9 100644--- a/solr/core/src/test/org/apache/solr/cloud/RouteFieldTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/RouteFieldTest.java@@ -17,7 +17,7 @@package org.apache.solr.cloud;-import static org.apache.solr.client.solrj.response.schema.SchemaResponse.*;+import static org.apache.solr.client.solrj.response.schema.SchemaResponse.UpdateResponse;import java.io.IOException;import java.lang.invoke.MethodHandles;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestCloudSearcherWarming.java b/solr/core/src/test/org/apache/solr/cloud/TestCloudSearcherWarming.javaindex c21fd2ffa02..b9a52eef896 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestCloudSearcherWarming.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestCloudSearcherWarming.java@@ -27,7 +27,11 @@ import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.common.SolrInputDocument;-import org.apache.solr.common.cloud.*;+import org.apache.solr.common.cloud.CollectionStatePredicate;+import org.apache.solr.common.cloud.CollectionStateWatcher;+import org.apache.solr.common.cloud.DocCollection;+import org.apache.solr.common.cloud.Replica;+import org.apache.solr.common.cloud.ZkStateReader;import org.apache.solr.core.SolrCore;import org.apache.solr.core.SolrEventListener;import org.apache.solr.search.SolrIndexSearcher;diff --git a/solr/core/src/test/org/apache/solr/cloud/TestRandomFlRTGCloud.java b/solr/core/src/test/org/apache/solr/cloud/TestRandomFlRTGCloud.javaindex f76fc4af732..2501af1a388 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestRandomFlRTGCloud.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestRandomFlRTGCloud.java@@ -40,7 +40,10 @@ import org.apache.solr.client.solrj.ResponseParser;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.embedded.JettySolrRunner;-import org.apache.solr.client.solrj.impl.*;+import org.apache.solr.client.solrj.impl.CloudSolrClient;+import org.apache.solr.client.solrj.impl.HttpSolrClient;+import org.apache.solr.client.solrj.impl.NoOpResponseParser;+import org.apache.solr.client.solrj.impl.XMLResponseParser;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.QueryRequest;import org.apache.solr.client.solrj.response.QueryResponse;diff --git a/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java b/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.javaindex ddaddaf9a10..2eaf6f7ef1c 100644--- a/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java@@ -37,7 +37,11 @@ import org.apache.solr.common.cloud.ZkNodeProps;import org.apache.solr.common.cloud.ZkStateReader;import org.apache.solr.common.params.CollectionParams;import org.apache.solr.common.util.Utils;-import org.apache.solr.core.*;+import org.apache.solr.core.CloudConfig;+import org.apache.solr.core.CoreContainer;+import org.apache.solr.core.CoreDescriptor;+import org.apache.solr.core.PluginInfo;+import org.apache.solr.core.SolrXmlConfig;import org.apache.solr.handler.admin.CoreAdminHandler;import org.apache.solr.handler.component.HttpShardHandlerFactory;import org.apache.solr.metrics.SolrMetricManager;diff --git a/solr/core/src/test/org/apache/solr/cloud/api/collections/PurgeGraphTest.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/PurgeGraphTest.javaindex b4b510fe8ca..4504dcbd2a3 100644--- a/solr/core/src/test/org/apache/solr/cloud/api/collections/PurgeGraphTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/PurgeGraphTest.java@@ -28,7 +28,12 @@ import java.util.Map;import java.util.UUID;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.cloud.api.collections.DeleteBackupCmd.PurgeGraph;-import org.apache.solr.core.backup.*;+import org.apache.solr.core.backup.BackupFilePaths;+import org.apache.solr.core.backup.BackupId;+import org.apache.solr.core.backup.BackupProperties;+import org.apache.solr.core.backup.Checksum;+import org.apache.solr.core.backup.ShardBackupId;+import org.apache.solr.core.backup.ShardBackupMetadata;import org.apache.solr.core.backup.repository.BackupRepository;import org.apache.solr.core.backup.repository.LocalFileSystemRepository;import org.junit.Before;diff --git a/solr/core/src/test/org/apache/solr/cloud/api/collections/ReplicaPropertiesBase.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/ReplicaPropertiesBase.javaindex 9d5a5837e43..0bc08628eb8 100644--- a/solr/core/src/test/org/apache/solr/cloud/api/collections/ReplicaPropertiesBase.java+++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/ReplicaPropertiesBase.java@@ -26,7 +26,10 @@ import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.QueryRequest;import org.apache.solr.cloud.AbstractFullDistribZkTestBase;-import org.apache.solr.common.cloud.*;+import org.apache.solr.common.cloud.ClusterState;+import org.apache.solr.common.cloud.DocCollection;+import org.apache.solr.common.cloud.Replica;+import org.apache.solr.common.cloud.Slice;import org.apache.solr.common.params.ModifiableSolrParams;import org.apache.solr.common.util.NamedList;diff --git a/solr/core/src/test/org/apache/solr/cloud/api/collections/SplitByPrefixTest.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/SplitByPrefixTest.javaindex 311d3934227..3c228f3841e 100644--- a/solr/core/src/test/org/apache/solr/cloud/api/collections/SplitByPrefixTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/SplitByPrefixTest.java@@ -28,7 +28,10 @@ import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.cloud.SolrCloudTestCase;import org.apache.solr.common.SolrInputDocument;-import org.apache.solr.common.cloud.*;+import org.apache.solr.common.cloud.CompositeIdRouter;+import org.apache.solr.common.cloud.DocCollection;+import org.apache.solr.common.cloud.DocRouter;+import org.apache.solr.common.cloud.Slice;import org.junit.After;import org.junit.Before;import org.junit.BeforeClass;diff --git a/solr/core/src/test/org/apache/solr/cloud/overseer/TestClusterStateMutator.java b/solr/core/src/test/org/apache/solr/cloud/overseer/TestClusterStateMutator.javaindex 65b2298491e..18090517636 100644--- a/solr/core/src/test/org/apache/solr/cloud/overseer/TestClusterStateMutator.java+++ b/solr/core/src/test/org/apache/solr/cloud/overseer/TestClusterStateMutator.java@@ -16,7 +16,8 @@*/package org.apache.solr.cloud.overseer;-import static org.mockito.Mockito.*;+import static org.mockito.Mockito.mock;+import static org.mockito.Mockito.when;import java.util.Collections;import java.util.Map;diff --git a/solr/core/src/test/org/apache/solr/cluster/placement/Builders.java b/solr/core/src/test/org/apache/solr/cluster/placement/Builders.javaindex 764957703dc..a6ecb88c3ed 100644--- a/solr/core/src/test/org/apache/solr/cluster/placement/Builders.java+++ b/solr/core/src/test/org/apache/solr/cluster/placement/Builders.java@@ -17,8 +17,18 @@package org.apache.solr.cluster.placement;-import java.util.*;-import org.apache.solr.cluster.*;+import java.util.HashMap;+import java.util.HashSet;+import java.util.Iterator;+import java.util.LinkedHashMap;+import java.util.LinkedList;+import java.util.List;+import java.util.Map;+import org.apache.solr.cluster.Cluster;+import org.apache.solr.cluster.Node;+import org.apache.solr.cluster.Replica;+import org.apache.solr.cluster.Shard;+import org.apache.solr.cluster.SolrCollection;import org.apache.solr.cluster.placement.impl.AttributeFetcherImpl;import org.apache.solr.cluster.placement.impl.AttributeValuesImpl;import org.apache.solr.cluster.placement.impl.CollectionMetricsBuilder;diff --git a/solr/core/src/test/org/apache/solr/cluster/placement/BuildersTest.java b/solr/core/src/test/org/apache/solr/cluster/placement/BuildersTest.javaindex bad348e9622..c012c8e6454 100644--- a/solr/core/src/test/org/apache/solr/cluster/placement/BuildersTest.java+++ b/solr/core/src/test/org/apache/solr/cluster/placement/BuildersTest.java@@ -16,7 +16,10 @@*/package org.apache.solr.cluster.placement;-import static org.apache.solr.cluster.placement.Builders.*;+import static org.apache.solr.cluster.placement.Builders.ClusterBuilder;+import static org.apache.solr.cluster.placement.Builders.CollectionBuilder;+import static org.apache.solr.cluster.placement.Builders.newClusterBuilder;+import static org.apache.solr.cluster.placement.Builders.newCollectionBuilder;import java.util.List;import java.util.Optional;diff --git a/solr/core/src/test/org/apache/solr/cluster/placement/ClusterAbstractionsForTest.java b/solr/core/src/test/org/apache/solr/cluster/placement/ClusterAbstractionsForTest.javaindex 9d909bab461..f771927cdb5 100644--- a/solr/core/src/test/org/apache/solr/cluster/placement/ClusterAbstractionsForTest.java+++ b/solr/core/src/test/org/apache/solr/cluster/placement/ClusterAbstractionsForTest.java@@ -17,8 +17,17 @@package org.apache.solr.cluster.placement;-import java.util.*;-import org.apache.solr.cluster.*;+import java.util.HashMap;+import java.util.HashSet;+import java.util.Iterator;+import java.util.Map;+import java.util.Objects;+import java.util.Set;+import org.apache.solr.cluster.Cluster;+import org.apache.solr.cluster.Node;+import org.apache.solr.cluster.Replica;+import org.apache.solr.cluster.Shard;+import org.apache.solr.cluster.SolrCollection;/*** Cluster abstractions independent of any internal SolrCloud abstractions to use in tests (ofdiff --git a/solr/core/src/test/org/apache/solr/cluster/placement/plugins/AffinityPlacementFactoryTest.java b/solr/core/src/test/org/apache/solr/cluster/placement/plugins/AffinityPlacementFactoryTest.javaindex 7f34ca53ed4..73a81c41c99 100644--- a/solr/core/src/test/org/apache/solr/cluster/placement/plugins/AffinityPlacementFactoryTest.java+++ b/solr/core/src/test/org/apache/solr/cluster/placement/plugins/AffinityPlacementFactoryTest.java@@ -18,7 +18,14 @@package org.apache.solr.cluster.placement.plugins;import java.lang.invoke.MethodHandles;-import java.util.*;+import java.util.HashMap;+import java.util.HashSet;+import java.util.Iterator;+import java.util.LinkedList;+import java.util.List;+import java.util.Map;+import java.util.Optional;+import java.util.Set;import java.util.concurrent.TimeUnit;import java.util.concurrent.atomic.AtomicInteger;import java.util.stream.Collectors;@@ -29,8 +36,14 @@ import org.apache.solr.cluster.Node;import org.apache.solr.cluster.Replica;import org.apache.solr.cluster.Shard;import org.apache.solr.cluster.SolrCollection;-import org.apache.solr.cluster.placement.*;+import org.apache.solr.cluster.placement.AttributeValues;import org.apache.solr.cluster.placement.Builders;+import org.apache.solr.cluster.placement.DeleteReplicasRequest;+import org.apache.solr.cluster.placement.PlacementContext;+import org.apache.solr.cluster.placement.PlacementException;+import org.apache.solr.cluster.placement.PlacementPlan;+import org.apache.solr.cluster.placement.PlacementPlugin;+import org.apache.solr.cluster.placement.ReplicaPlacement;import org.apache.solr.cluster.placement.impl.ModificationRequestImpl;import org.apache.solr.cluster.placement.impl.PlacementRequestImpl;import org.apache.solr.common.util.Pair;diff --git a/solr/core/src/test/org/apache/solr/core/ResourceLoaderTest.java b/solr/core/src/test/org/apache/solr/core/ResourceLoaderTest.javaindex c6b520cd851..6b29c5df3ee 100644--- a/solr/core/src/test/org/apache/solr/core/ResourceLoaderTest.java+++ b/solr/core/src/test/org/apache/solr/core/ResourceLoaderTest.java@@ -16,7 +16,9 @@*/package org.apache.solr.core;-import static org.apache.solr.core.SolrResourceLoader.*;+import static org.apache.solr.core.SolrResourceLoader.SOLR_ALLOW_UNSAFE_RESOURCELOADING_PARAM;+import static org.apache.solr.core.SolrResourceLoader.assertAwareCompatibility;+import static org.apache.solr.core.SolrResourceLoader.clearCache;import static org.hamcrest.core.Is.is;import java.io.IOException;diff --git a/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java b/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.javaindex 7b1a40b55ed..6c42c5b702b 100644--- a/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java+++ b/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java@@ -20,7 +20,11 @@ import static java.util.Arrays.asList;import static org.apache.solr.common.util.Utils.getObjectByPath;import com.google.common.collect.ImmutableList;-import java.io.*;+import java.io.File;+import java.io.FileInputStream;+import java.io.FileOutputStream;+import java.io.IOException;+import java.io.StringReader;import java.lang.invoke.MethodHandles;import java.nio.ByteBuffer;import java.util.HashMap;diff --git a/solr/core/src/test/org/apache/solr/core/backup/BackupFilePathsTest.java b/solr/core/src/test/org/apache/solr/core/backup/BackupFilePathsTest.javaindex 0b342e3ce76..06dde0c0eb9 100644--- a/solr/core/src/test/org/apache/solr/core/backup/BackupFilePathsTest.java+++ b/solr/core/src/test/org/apache/solr/core/backup/BackupFilePathsTest.java@@ -16,7 +16,9 @@*/package org.apache.solr.core.backup;-import static org.junit.Assert.*;+import static org.junit.Assert.assertEquals;+import static org.junit.Assert.assertFalse;+import static org.junit.Assert.assertTrue;import java.util.List;import java.util.Optional;diff --git a/solr/core/src/test/org/apache/solr/handler/MoreLikeThisHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/MoreLikeThisHandlerTest.javaindex bd96f10a258..2f33c4658c7 100644--- a/solr/core/src/test/org/apache/solr/handler/MoreLikeThisHandlerTest.java+++ b/solr/core/src/test/org/apache/solr/handler/MoreLikeThisHandlerTest.java@@ -19,7 +19,9 @@ package org.apache.solr.handler;import java.util.ArrayList;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.common.SolrException;-import org.apache.solr.common.params.*;+import org.apache.solr.common.params.CommonParams;+import org.apache.solr.common.params.ModifiableSolrParams;+import org.apache.solr.common.params.MoreLikeThisParams;import org.apache.solr.common.util.ContentStream;import org.apache.solr.common.util.ContentStreamBase;import org.apache.solr.core.SolrCore;diff --git a/solr/core/src/test/org/apache/solr/handler/ReplicationTestHelper.java b/solr/core/src/test/org/apache/solr/handler/ReplicationTestHelper.javaindex 973a96ce22c..6390348802a 100644--- a/solr/core/src/test/org/apache/solr/handler/ReplicationTestHelper.java+++ b/solr/core/src/test/org/apache/solr/handler/ReplicationTestHelper.java@@ -19,7 +19,15 @@ package org.apache.solr.handler;import static org.junit.Assert.assertEquals;import static org.junit.Assert.assertNotNull;-import java.io.*;+import java.io.BufferedReader;+import java.io.File;+import java.io.FileInputStream;+import java.io.FileOutputStream;+import java.io.IOException;+import java.io.InputStream;+import java.io.InputStreamReader;+import java.io.OutputStreamWriter;+import java.io.Writer;import java.lang.invoke.MethodHandles;import java.net.URL;import java.nio.charset.StandardCharsets;diff --git a/solr/core/src/test/org/apache/solr/handler/TestHealthCheckHandlerLegacyMode.java b/solr/core/src/test/org/apache/solr/handler/TestHealthCheckHandlerLegacyMode.javaindex aec31b231c2..2c2fd87e209 100644--- a/solr/core/src/test/org/apache/solr/handler/TestHealthCheckHandlerLegacyMode.java+++ b/solr/core/src/test/org/apache/solr/handler/TestHealthCheckHandlerLegacyMode.java@@ -16,7 +16,13 @@*/package org.apache.solr.handler;-import static org.apache.solr.handler.ReplicationTestHelper.*;+import static org.apache.solr.handler.ReplicationTestHelper.SolrInstance;+import static org.apache.solr.handler.ReplicationTestHelper.assertVersions;+import static org.apache.solr.handler.ReplicationTestHelper.createAndStartJetty;+import static org.apache.solr.handler.ReplicationTestHelper.index;+import static org.apache.solr.handler.ReplicationTestHelper.invokeReplicationCommand;+import static org.apache.solr.handler.ReplicationTestHelper.numFound;+import static org.apache.solr.handler.ReplicationTestHelper.rQuery;import java.io.IOException;import org.apache.lucene.tests.util.LuceneTestCase.Slow;diff --git a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.javaindex 68b6d10c245..ff08ae8812d 100644--- a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java+++ b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java@@ -16,7 +16,11 @@*/package org.apache.solr.handler;-import static org.apache.solr.handler.ReplicationTestHelper.*;+import static org.apache.solr.handler.ReplicationTestHelper.CONF_DIR;+import static org.apache.solr.handler.ReplicationTestHelper.SolrInstance;+import static org.apache.solr.handler.ReplicationTestHelper.assertVersions;+import static org.apache.solr.handler.ReplicationTestHelper.createNewSolrClient;+import static org.apache.solr.handler.ReplicationTestHelper.invokeReplicationCommand;import static org.junit.matchers.JUnitMatchers.containsString;import java.io.File;@@ -26,7 +30,12 @@ import java.io.InputStream;import java.lang.invoke.MethodHandles;import java.net.URL;import java.nio.file.Paths;-import java.util.*;+import java.util.Arrays;+import java.util.Collection;+import java.util.Date;+import java.util.List;+import java.util.Properties;+import java.util.Set;import java.util.concurrent.TimeUnit;import org.apache.lucene.index.DirectoryReader;import org.apache.lucene.index.IndexReader;diff --git a/solr/core/src/test/org/apache/solr/handler/V2ApiIntegrationTest.java b/solr/core/src/test/org/apache/solr/handler/V2ApiIntegrationTest.javaindex baf59fe9f9c..893125713f1 100644--- a/solr/core/src/test/org/apache/solr/handler/V2ApiIntegrationTest.java+++ b/solr/core/src/test/org/apache/solr/handler/V2ApiIntegrationTest.java@@ -25,7 +25,11 @@ import java.util.Map;import org.apache.solr.client.solrj.ResponseParser;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrServerException;-import org.apache.solr.client.solrj.impl.*;+import org.apache.solr.client.solrj.impl.BaseHttpSolrClient;+import org.apache.solr.client.solrj.impl.BinaryResponseParser;+import org.apache.solr.client.solrj.impl.CloudSolrClient;+import org.apache.solr.client.solrj.impl.NoOpResponseParser;+import org.apache.solr.client.solrj.impl.XMLResponseParser;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.V2Request;import org.apache.solr.client.solrj.response.DelegationTokenResponse;diff --git a/solr/core/src/test/org/apache/solr/handler/V2ClusterAPIMappingTest.java b/solr/core/src/test/org/apache/solr/handler/V2ClusterAPIMappingTest.javaindex 7db47485103..96364f6c9fa 100644--- a/solr/core/src/test/org/apache/solr/handler/V2ClusterAPIMappingTest.java+++ b/solr/core/src/test/org/apache/solr/handler/V2ClusterAPIMappingTest.java@@ -23,7 +23,8 @@ import static org.apache.solr.common.params.CommonParams.ACTION;import static org.apache.solr.common.params.CommonParams.NAME;import static org.junit.Assert.assertEquals;import static org.mockito.ArgumentMatchers.any;-import static org.mockito.Mockito.*;+import static org.mockito.Mockito.mock;+import static org.mockito.Mockito.verify;import com.google.common.collect.Maps;import java.util.Collections;diff --git a/solr/core/src/test/org/apache/solr/handler/admin/SolrEnvironmentTest.java b/solr/core/src/test/org/apache/solr/handler/admin/SolrEnvironmentTest.javaindex 042660368d1..a5668bb4518 100644--- a/solr/core/src/test/org/apache/solr/handler/admin/SolrEnvironmentTest.java+++ b/solr/core/src/test/org/apache/solr/handler/admin/SolrEnvironmentTest.java@@ -17,7 +17,8 @@package org.apache.solr.handler.admin;-import static org.junit.Assert.*;+import static org.junit.Assert.assertEquals;+import static org.junit.Assert.assertNull;import org.apache.solr.common.SolrException;import org.junit.Test;diff --git a/solr/core/src/test/org/apache/solr/handler/admin/TestCoreAdminApis.java b/solr/core/src/test/org/apache/solr/handler/admin/TestCoreAdminApis.javaindex ddf8639da76..1e3ff94b749 100644--- a/solr/core/src/test/org/apache/solr/handler/admin/TestCoreAdminApis.java+++ b/solr/core/src/test/org/apache/solr/handler/admin/TestCoreAdminApis.java@@ -18,7 +18,11 @@package org.apache.solr.handler.admin;import static org.apache.solr.common.util.Utils.fromJSONString;-import static org.mockito.Mockito.*;+import static org.mockito.Mockito.any;+import static org.mockito.Mockito.anyBoolean;+import static org.mockito.Mockito.doAnswer;+import static org.mockito.Mockito.mock;+import static org.mockito.Mockito.when;import java.nio.file.Path;import java.nio.file.Paths;diff --git a/solr/core/src/test/org/apache/solr/handler/admin/api/V2NodeAPIMappingTest.java b/solr/core/src/test/org/apache/solr/handler/admin/api/V2NodeAPIMappingTest.javaindex 6a49040ab9d..caa3882302f 100644--- a/solr/core/src/test/org/apache/solr/handler/admin/api/V2NodeAPIMappingTest.java+++ b/solr/core/src/test/org/apache/solr/handler/admin/api/V2NodeAPIMappingTest.java@@ -22,7 +22,9 @@ import static org.apache.solr.common.params.CommonParams.ACTION;import static org.junit.Assert.assertEquals;import static org.junit.Assert.assertTrue;import static org.mockito.ArgumentMatchers.any;-import static org.mockito.Mockito.*;+import static org.mockito.Mockito.mock;+import static org.mockito.Mockito.verify;+import static org.mockito.Mockito.when;import com.google.common.collect.Maps;import java.util.Arrays;diff --git a/solr/core/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.javaindex 44b8d9ad9c1..7ae66153096 100644--- a/solr/core/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java+++ b/solr/core/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java@@ -17,7 +17,8 @@package org.apache.solr.handler.component;import java.io.File;-import java.util.*;+import java.util.ArrayList;+import java.util.List;import org.apache.lucene.tests.util.LuceneTestCase.Slow;import org.apache.lucene.tests.util.LuceneTestCase.SuppressTempFileChecks;import org.apache.solr.SolrTestCaseJ4;diff --git a/solr/core/src/test/org/apache/solr/pkg/TestPackages.java b/solr/core/src/test/org/apache/solr/pkg/TestPackages.javaindex 1d0ab3bd984..6830e456d30 100644--- a/solr/core/src/test/org/apache/solr/pkg/TestPackages.java+++ b/solr/core/src/test/org/apache/solr/pkg/TestPackages.java@@ -21,7 +21,9 @@ import static org.apache.solr.common.cloud.ZkStateReader.SOLR_PKGS_PATH;import static org.apache.solr.common.params.CommonParams.JAVABIN;import static org.apache.solr.common.params.CommonParams.WT;import static org.apache.solr.core.TestSolrConfigHandler.getFileContent;-import static org.apache.solr.filestore.TestDistribPackageStore.*;+import static org.apache.solr.filestore.TestDistribPackageStore.checkAllNodesForFile;+import static org.apache.solr.filestore.TestDistribPackageStore.readFile;+import static org.apache.solr.filestore.TestDistribPackageStore.uploadKey;import java.io.FileOutputStream;import java.io.IOException;@@ -46,7 +48,11 @@ import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.BaseHttpSolrClient;import org.apache.solr.client.solrj.impl.HttpSolrClient;-import org.apache.solr.client.solrj.request.*;+import org.apache.solr.client.solrj.request.CollectionAdminRequest;+import org.apache.solr.client.solrj.request.GenericSolrRequest;+import org.apache.solr.client.solrj.request.RequestWriter;+import org.apache.solr.client.solrj.request.UpdateRequest;+import org.apache.solr.client.solrj.request.V2Request;import org.apache.solr.client.solrj.request.beans.Package;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.client.solrj.util.ClientUtils;diff --git a/solr/core/src/test/org/apache/solr/search/ReturnFieldsTest.java b/solr/core/src/test/org/apache/solr/search/ReturnFieldsTest.javaindex c13d86aae7f..67c42a7e4c2 100644--- a/solr/core/src/test/org/apache/solr/search/ReturnFieldsTest.java+++ b/solr/core/src/test/org/apache/solr/search/ReturnFieldsTest.java@@ -31,7 +31,8 @@ import org.apache.lucene.document.StringField;import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.common.SolrDocument;-import org.apache.solr.response.transform.*;+import org.apache.solr.response.transform.DocTransformers;+import org.apache.solr.response.transform.ScoreAugmenter;import org.apache.solr.schema.IndexSchema;import org.junit.BeforeClass;import org.junit.Test;diff --git a/solr/core/src/test/org/apache/solr/search/TestOverriddenPrefixQueryForCustomFieldType.java b/solr/core/src/test/org/apache/solr/search/TestOverriddenPrefixQueryForCustomFieldType.javaindex 6f3db9c365f..083d9aeb999 100644--- a/solr/core/src/test/org/apache/solr/search/TestOverriddenPrefixQueryForCustomFieldType.java+++ b/solr/core/src/test/org/apache/solr/search/TestOverriddenPrefixQueryForCustomFieldType.java@@ -17,7 +17,7 @@package org.apache.solr.search;import java.util.Random;-import org.apache.lucene.search.*;+import org.apache.lucene.search.Query;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.request.SolrQueryRequest;diff --git a/solr/core/src/test/org/apache/solr/search/TestSearchPerf.java b/solr/core/src/test/org/apache/solr/search/TestSearchPerf.javaindex e5fbcb4e81f..9bf1da52dc0 100644--- a/solr/core/src/test/org/apache/solr/search/TestSearchPerf.java+++ b/solr/core/src/test/org/apache/solr/search/TestSearchPerf.java@@ -17,9 +17,19 @@package org.apache.solr.search;import java.io.IOException;-import java.util.*;+import java.util.ArrayList;+import java.util.Arrays;+import java.util.HashSet;+import java.util.List;+import java.util.Locale;+import java.util.Random;+import java.util.Set;import org.apache.lucene.index.Term;-import org.apache.lucene.search.*;+import org.apache.lucene.search.BooleanClause;+import org.apache.lucene.search.BooleanQuery;+import org.apache.lucene.search.Query;+import org.apache.lucene.search.Sort;+import org.apache.lucene.search.TermQuery;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.request.SolrQueryRequest;diff --git a/solr/core/src/test/org/apache/solr/security/BaseTestRuleBasedAuthorizationPlugin.java b/solr/core/src/test/org/apache/solr/security/BaseTestRuleBasedAuthorizationPlugin.javaindex 86c76f6fc6e..ef52229219d 100644--- a/solr/core/src/test/org/apache/solr/security/BaseTestRuleBasedAuthorizationPlugin.java+++ b/solr/core/src/test/org/apache/solr/security/BaseTestRuleBasedAuthorizationPlugin.java@@ -16,7 +16,10 @@*/package org.apache.solr.security;-import static java.util.Collections.*;+import static java.util.Collections.emptyMap;+import static java.util.Collections.emptySet;+import static java.util.Collections.singletonList;+import static java.util.Collections.singletonMap;import static org.apache.solr.common.util.CommandOperation.captureErrors;import static org.apache.solr.common.util.Utils.getObjectByPath;import static org.hamcrest.CoreMatchers.instanceOf;diff --git a/solr/core/src/test/org/apache/solr/update/DeleteByIdWithRouterFieldTest.java b/solr/core/src/test/org/apache/solr/update/DeleteByIdWithRouterFieldTest.javaindex f9d88dbeb31..e4047c93a84 100644--- a/solr/core/src/test/org/apache/solr/update/DeleteByIdWithRouterFieldTest.java+++ b/solr/core/src/test/org/apache/solr/update/DeleteByIdWithRouterFieldTest.java@@ -33,7 +33,10 @@ import org.apache.solr.cloud.CloudInspectUtil;import org.apache.solr.cloud.SolrCloudTestCase;import org.apache.solr.common.SolrDocumentList;import org.apache.solr.common.SolrInputDocument;-import org.apache.solr.common.cloud.*;+import org.apache.solr.common.cloud.ClusterState;+import org.apache.solr.common.cloud.DocCollection;+import org.apache.solr.common.cloud.Replica;+import org.apache.solr.common.cloud.Slice;import org.apache.solr.common.params.ShardParams;import org.apache.solr.common.params.SolrParams;import org.junit.After;diff --git a/solr/core/src/test/org/apache/solr/util/hll/BigEndianAscendingWordDeserializerTest.java b/solr/core/src/test/org/apache/solr/util/hll/BigEndianAscendingWordDeserializerTest.javaindex 21782a9f132..3f1552292cd 100644--- a/solr/core/src/test/org/apache/solr/util/hll/BigEndianAscendingWordDeserializerTest.java+++ b/solr/core/src/test/org/apache/solr/util/hll/BigEndianAscendingWordDeserializerTest.java@@ -16,8 +16,7 @@*/package org.apache.solr.util.hll;-import static com.carrotsearch.randomizedtesting.RandomizedTest.*;-+import com.carrotsearch.randomizedtesting.RandomizedTest;import java.util.Random;import org.apache.solr.SolrTestCase;import org.junit.Test;@@ -120,7 +119,7 @@ public class BigEndianAscendingWordDeserializerTest extends SolrTestCase {*/private static void runRandomTest(final int wordLength, final int bytePadding, final int wordCount) {- final long seed = randomLong();+ final long seed = RandomizedTest.randomLong();final Random random = new Random(seed);final Random verificationRandom = new Random(seed);diff --git a/solr/core/src/test/org/apache/solr/util/hll/ExplicitHLLTest.java b/solr/core/src/test/org/apache/solr/util/hll/ExplicitHLLTest.javaindex 0cf00379f47..c7995fe4a66 100644--- a/solr/core/src/test/org/apache/solr/util/hll/ExplicitHLLTest.java+++ b/solr/core/src/test/org/apache/solr/util/hll/ExplicitHLLTest.java@@ -16,7 +16,7 @@*/package org.apache.solr.util.hll;-import static com.carrotsearch.randomizedtesting.RandomizedTest.*;+import static com.carrotsearch.randomizedtesting.RandomizedTest.randomLong;import com.carrotsearch.hppc.LongHashSet;import java.util.HashSet;diff --git a/solr/core/src/test/org/apache/solr/util/hll/HLLSerializationTest.java b/solr/core/src/test/org/apache/solr/util/hll/HLLSerializationTest.javaindex ca4124a0ae8..e96ff666b60 100644--- a/solr/core/src/test/org/apache/solr/util/hll/HLLSerializationTest.java+++ b/solr/core/src/test/org/apache/solr/util/hll/HLLSerializationTest.java@@ -16,8 +16,13 @@*/package org.apache.solr.util.hll;-import static com.carrotsearch.randomizedtesting.RandomizedTest.*;-import static org.apache.solr.util.hll.HLL.*;+import static com.carrotsearch.randomizedtesting.RandomizedTest.randomLong;+import static org.apache.solr.util.hll.HLL.MAXIMUM_EXPTHRESH_PARAM;+import static org.apache.solr.util.hll.HLL.MAXIMUM_LOG2M_PARAM;+import static org.apache.solr.util.hll.HLL.MAXIMUM_REGWIDTH_PARAM;+import static org.apache.solr.util.hll.HLL.MINIMUM_EXPTHRESH_PARAM;+import static org.apache.solr.util.hll.HLL.MINIMUM_LOG2M_PARAM;+import static org.apache.solr.util.hll.HLL.MINIMUM_REGWIDTH_PARAM;import java.util.ArrayList;import java.util.Arrays;diff --git a/solr/core/src/test/org/apache/solr/util/hll/IntegrationTestGenerator.java b/solr/core/src/test/org/apache/solr/util/hll/IntegrationTestGenerator.javaindex cf2fb90a4fa..8444b0f0cf6 100644--- a/solr/core/src/test/org/apache/solr/util/hll/IntegrationTestGenerator.java+++ b/solr/core/src/test/org/apache/solr/util/hll/IntegrationTestGenerator.java@@ -16,8 +16,10 @@*/package org.apache.solr.util.hll;-import static com.carrotsearch.randomizedtesting.RandomizedTest.*;-import static org.apache.solr.util.hll.ProbabilisticTestUtil.*;+import static com.carrotsearch.randomizedtesting.RandomizedTest.randomInt;+import static com.carrotsearch.randomizedtesting.RandomizedTest.randomIntBetween;+import static com.carrotsearch.randomizedtesting.RandomizedTest.randomLong;+import static org.apache.solr.util.hll.ProbabilisticTestUtil.constructHLLValue;import java.io.IOException;import java.io.Writer;diff --git a/solr/core/src/test/org/apache/solr/util/hll/NumberUtilTest.java b/solr/core/src/test/org/apache/solr/util/hll/NumberUtilTest.javaindex 7707857209c..3a0c4ae2c5b 100644--- a/solr/core/src/test/org/apache/solr/util/hll/NumberUtilTest.java+++ b/solr/core/src/test/org/apache/solr/util/hll/NumberUtilTest.java@@ -16,7 +16,7 @@*/package org.apache.solr.util.hll;-import static org.junit.Assert.*;+import static org.junit.Assert.assertTrue;import java.util.Arrays;import org.junit.Test;