This is an automated email from the ASF dual-hosted git repository.
epugh pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/main by this push:
new 37a08691581 SOLR-18137: Prevent use of Fully Qualified Name in classes
(#4165)
37a08691581 is described below
commit 37a0869158168938e3d828b86bbce8b2ebde5bf1
Author: Eric Pugh <[email protected]>
AuthorDate: Fri Feb 27 22:24:48 2026 -0500
SOLR-18137: Prevent use of Fully Qualified Name in classes (#4165)
---
gradle/validation/error-prone.gradle | 19 +++++++++++++++++++
.../src/java/org/apache/solr/cli/RunExampleTool.java | 3 ++-
solr/core/src/java/org/apache/solr/cli/SolrCLI.java | 12 ++++++------
.../src/java/org/apache/solr/cli/ToolRuntime.java | 2 +-
.../core/src/java/org/apache/solr/cloud/Overseer.java | 3 ++-
.../solr/cloud/api/collections/RoutedAlias.java | 2 +-
.../placement/impl/PlacementPluginAssignStrategy.java | 4 ++--
.../placement/impl/SimpleClusterAbstractionsImpl.java | 3 ++-
.../src/java/org/apache/solr/core/SolrConfig.java | 3 ++-
.../solr/handler/admin/ZookeeperInfoHandler.java | 3 ++-
.../handler/component/HttpShardHandlerFactory.java | 3 ++-
.../solr/handler/component/RangeFacetRequest.java | 11 ++++++-----
.../designer/DefaultSampleDocumentsLoader.java | 3 ++-
.../org/apache/solr/handler/export/ExportWriter.java | 3 ++-
.../apache/solr/highlight/DefaultSolrHighlighter.java | 3 ++-
.../jersey/container/JettyBridgeResponseWriter.java | 3 ++-
.../org/apache/solr/logging/jul/RecordHandler.java | 3 ++-
.../otel/instruments/AttributedLongCounter.java | 2 +-
.../otel/instruments/AttributedLongHistogram.java | 3 +--
.../org/apache/solr/packagemanager/PackageUtils.java | 3 ++-
.../apache/solr/request/SubstringBytesRefFilter.java | 3 ++-
.../java/org/apache/solr/response/DocsStreamer.java | 2 +-
.../src/java/org/apache/solr/schema/BinaryField.java | 3 ++-
.../java/org/apache/solr/schema/DenseVectorField.java | 6 +++---
.../src/java/org/apache/solr/schema/FieldType.java | 4 ++--
.../src/java/org/apache/solr/schema/IndexSchema.java | 5 +++--
.../java/org/apache/solr/schema/LongPointField.java | 4 ++--
.../src/java/org/apache/solr/schema/TrieField.java | 5 +++--
.../solr/search/ComplexPhraseQParserPlugin.java | 14 ++++++--------
.../java/org/apache/solr/search/CpuAllowedLimit.java | 2 +-
.../java/org/apache/solr/search/DisMaxQParser.java | 3 +--
.../solr/search/ExpressionValueSourceParser.java | 8 +++++---
.../org/apache/solr/search/SolrDocumentFetcher.java | 3 ++-
.../org/apache/solr/search/SurroundQParserPlugin.java | 5 +++--
.../org/apache/solr/search/facet/FacetProcessor.java | 3 ++-
.../apache/solr/search/facet/FacetRangeProcessor.java | 16 ++++++++--------
.../solr/spelling/AbstractLuceneSpellChecker.java | 2 +-
.../java/org/apache/solr/update/DocumentBuilder.java | 3 +--
.../src/java/org/apache/solr/util/CryptoKeys.java | 3 ++-
.../src/java/org/apache/solr/util/TestInjection.java | 2 +-
.../solr/util/circuitbreaker/CPUCircuitBreaker.java | 3 ++-
.../org/apache/solr/cli/TestSolrCLIRunExample.java | 11 +++++------
.../src/test/org/apache/solr/cloud/NodeRolesTest.java | 5 +++--
.../apache/solr/cloud/TestBaseStatsCacheCloud.java | 6 ++++--
.../test/org/apache/solr/cloud/TestPullReplica.java | 5 +++--
.../apache/solr/cloud/TestPullReplicaWithAuth.java | 4 ++--
.../apache/solr/cloud/TrollingIndexReaderFactory.java | 2 +-
.../test/org/apache/solr/core/TestXIncludeConfig.java | 2 +-
.../handler/admin/UpgradeCoreIndexActionTest.java | 3 ++-
.../component/DistributedFacetPivotLongTailTest.java | 3 ++-
.../test/org/apache/solr/logging/TestLogWatcher.java | 3 ++-
.../org/apache/solr/response/SmileWriterTest.java | 4 ++--
.../org/apache/solr/response/TestRawTransformer.java | 3 ++-
.../transform/TestSubQueryTransformerDistrib.java | 3 ++-
.../org/apache/solr/search/TestCaffeineCache.java | 9 +++------
.../apache/solr/search/TestFoldingMultitermQuery.java | 3 ++-
.../apache/solr/search/mlt/CloudMLTQParserTest.java | 5 +++--
.../test/org/apache/solr/servlet/CacheHeaderTest.java | 4 ++--
.../org/apache/solr/servlet/SecurityHeadersTest.java | 4 ++--
.../processor/RoutedAliasUpdateProcessorTest.java | 4 ++--
.../handler/extraction/ExtractingDocumentLoader.java | 14 ++++++++------
.../solr/handler/extraction/ExtractionRequest.java | 4 ++--
.../extraction/TikaServerExtractionBackend.java | 7 +++++--
.../solr/handler/extraction/TikaServerParser.java | 4 ++--
.../extraction/TikaServerExtractionBackendTest.java | 14 ++++++++------
.../solr/client/solrj/io/stream/TimeSeriesStream.java | 3 ++-
.../solr/client/solrj/beans/DocumentObjectBinder.java | 3 ++-
.../solr/client/solrj/impl/HttpSolrClientBase.java | 3 ++-
.../apache/solr/client/solrj/request/SolrQuery.java | 3 ++-
.../src/java/org/apache/solr/common/SolrDocument.java | 4 ++--
.../apache/solr/client/solrj/SolrExampleTests.java | 9 +++++----
.../client/solrj/impl/HttpSolrClientTestBase.java | 3 ++-
.../solr/client/solrj/impl/MockTrustManager.java | 6 +++---
.../src/java/org/apache/solr/SolrTestCaseJ4.java | 7 ++++---
.../solrj/apache/ConcurrentUpdateSolrClient.java | 3 ++-
.../solr/client/solrj/apache/HttpClientUtil.java | 3 ++-
.../solr/client/solrj/apache/HttpSolrClient.java | 7 ++++---
.../src/java/org/apache/solr/cloud/ChaosMonkey.java | 3 ++-
.../org/apache/solr/cloud/SolrCloudAuthTestCase.java | 3 ++-
.../AbstractCloudBackupRestoreTestCase.java | 3 ++-
.../collections/AbstractIncrementalBackupTest.java | 3 ++-
.../api/collections/AbstractInstallShardTest.java | 2 +-
.../src/java/org/apache/solr/util/ErrorLogMuter.java | 1 +
.../src/java/org/apache/solr/util/LogListener.java | 1 +
.../org/apache/solr/util/SolrMetricTestUtils.java | 5 +++--
.../client/solrj/apache/BasicHttpSolrClientTest.java | 3 ++-
.../solr/client/solrj/apache/HttpClientUtilTest.java | 4 ++--
87 files changed, 234 insertions(+), 164 deletions(-)
diff --git a/gradle/validation/error-prone.gradle
b/gradle/validation/error-prone.gradle
index c36d03bf6c7..3ca5341ef0f 100644
--- a/gradle/validation/error-prone.gradle
+++ b/gradle/validation/error-prone.gradle
@@ -540,6 +540,7 @@ allprojects {prj ->
'-Xep:UnescapedEntity:WARN',
// '-Xep:UnicodeEscape:OFF', // can't enable since Lucene/Solr
tests use unicode a bunch
// '-Xep:UnnecessaryAssignment:OFF', // we don't use these
annotations
+ '-Xep:UnnecessarilyFullyQualified:WARN',
'-Xep:UnnecessaryAsync:WARN',
// '-Xep:UnnecessaryBreakInSwitch:WARN', // todo check if useful
or comment why not
// '-Xep:UnnecessaryCopy:OFF', // proto-specific, not widely used
@@ -587,3 +588,21 @@ allprojects {prj ->
}
}
}
+
+// Exclude generated OpenAPI sources in solrj from Error Prone checks.
+configure(project(":solr:solrj")) {
+ plugins.withId(libs.plugins.ltgt.errorprone.get().pluginId) {
+ tasks.withType(JavaCompile) {
+ options.errorprone.excludedPaths = ".*/build/generated/.*"
+ }
+ }
+}
+
+// Exclude JavaCC-generated parser sources in solr:core from Error Prone
checks.
+configure(project(":solr:core")) {
+ plugins.withId(libs.plugins.ltgt.errorprone.get().pluginId) {
+ tasks.withType(JavaCompile) {
+ options.errorprone.excludedPaths = ".*/org/apache/solr/parser/.*"
+ }
+ }
+}
diff --git a/solr/core/src/java/org/apache/solr/cli/RunExampleTool.java
b/solr/core/src/java/org/apache/solr/cli/RunExampleTool.java
index b0f5959902f..e1d002cf21e 100644
--- a/solr/core/src/java/org/apache/solr/cli/RunExampleTool.java
+++ b/solr/core/src/java/org/apache/solr/cli/RunExampleTool.java
@@ -17,6 +17,7 @@
package org.apache.solr.cli;
+import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.net.Socket;
@@ -560,7 +561,7 @@ public class RunExampleTool extends ToolBase {
// Create a scanner from the provided prompts
String promptsValue = cli.getOptionValue(PROMPT_INPUTS_OPTION);
InputStream promptsStream =
- new
java.io.ByteArrayInputStream(promptsValue.getBytes(StandardCharsets.UTF_8));
+ new
ByteArrayInputStream(promptsValue.getBytes(StandardCharsets.UTF_8));
readInput = new Scanner(promptsStream, StandardCharsets.UTF_8);
readInput.useDelimiter(",");
prompt = true; // Enable prompting code path, but reading from prompts
instead of user
diff --git a/solr/core/src/java/org/apache/solr/cli/SolrCLI.java
b/solr/core/src/java/org/apache/solr/cli/SolrCLI.java
index 4a2fba89a86..80c7c1a0289 100755
--- a/solr/core/src/java/org/apache/solr/cli/SolrCLI.java
+++ b/solr/core/src/java/org/apache/solr/cli/SolrCLI.java
@@ -25,6 +25,7 @@ import java.nio.file.Files;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collections;
import java.util.Enumeration;
import java.util.List;
import java.util.Locale;
@@ -39,6 +40,7 @@ import org.apache.commons.cli.Option;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
import org.apache.commons.cli.help.HelpFormatter;
+import org.apache.commons.cli.help.TableDefinition;
import org.apache.commons.cli.help.TextHelpAppendable;
import org.apache.solr.client.solrj.SolrClient;
import org.apache.solr.client.solrj.request.ContentStreamUpdateRequest;
@@ -316,16 +318,14 @@ public class SolrCLI implements CLIO {
TextHelpAppendable helpAppendable =
new TextHelpAppendable(System.out) {
@Override
- public void appendTable(org.apache.commons.cli.help.TableDefinition
table)
- throws IOException {
+ public void appendTable(TableDefinition table) throws IOException {
if (table == null) {
return;
}
// Create a new TableDefinition with empty headers to suppress the
header row
- java.util.List<String> emptyHeaders =
- java.util.Collections.nCopies(table.headers().size(), "");
- org.apache.commons.cli.help.TableDefinition noHeaderTable =
- org.apache.commons.cli.help.TableDefinition.from(
+ List<String> emptyHeaders =
Collections.nCopies(table.headers().size(), "");
+ TableDefinition noHeaderTable =
+ TableDefinition.from(
table.caption(), table.columnTextStyles(), emptyHeaders,
table.rows());
super.appendTable(noHeaderTable);
}
diff --git a/solr/core/src/java/org/apache/solr/cli/ToolRuntime.java
b/solr/core/src/java/org/apache/solr/cli/ToolRuntime.java
index 5b5e0b9306c..b23bc105a93 100644
--- a/solr/core/src/java/org/apache/solr/cli/ToolRuntime.java
+++ b/solr/core/src/java/org/apache/solr/cli/ToolRuntime.java
@@ -35,7 +35,7 @@ public abstract class ToolRuntime {
public void exit(int status) {
try {
System.exit(status);
- } catch (java.lang.SecurityException secExc) {
+ } catch (SecurityException secExc) {
if (status != 0) throw new RuntimeException("SolrCLI failed to exit with
status " + status);
}
}
diff --git a/solr/core/src/java/org/apache/solr/cloud/Overseer.java
b/solr/core/src/java/org/apache/solr/cloud/Overseer.java
index f0bb938a220..f44480b55ed 100644
--- a/solr/core/src/java/org/apache/solr/cloud/Overseer.java
+++ b/solr/core/src/java/org/apache/solr/cloud/Overseer.java
@@ -68,6 +68,7 @@ import org.apache.solr.metrics.SolrMetricsContext;
import org.apache.solr.update.UpdateShardHandler;
import org.apache.zookeeper.CreateMode;
import org.apache.zookeeper.KeeperException;
+import org.apache.zookeeper.data.Stat;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -461,7 +462,7 @@ public class Overseer implements SolrCloseable {
&& (zkController.getCoreContainer().isShutDown() ||
zkController.isClosed())) {
return; // shutting down no need to go further
}
- org.apache.zookeeper.data.Stat stat = new
org.apache.zookeeper.data.Stat();
+ Stat stat = new Stat();
final String path = OVERSEER_ELECT + "/leader";
byte[] data;
try {
diff --git
a/solr/core/src/java/org/apache/solr/cloud/api/collections/RoutedAlias.java
b/solr/core/src/java/org/apache/solr/cloud/api/collections/RoutedAlias.java
index de37b58eee6..4e2ab6f591b 100644
--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/RoutedAlias.java
+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/RoutedAlias.java
@@ -103,7 +103,7 @@ public abstract class RoutedAlias {
// multi-dimensional routed alias
typeStr = typeStr.substring(DIMENSIONAL.length(), typeStr.length() - 1);
String[] types = typeStr.split(",");
- java.util.List<String> fields = new ArrayList<>();
+ List<String> fields = new ArrayList<>();
if (types.length > 2) {
throw new SolrException(
BAD_REQUEST,
diff --git
a/solr/core/src/java/org/apache/solr/cluster/placement/impl/PlacementPluginAssignStrategy.java
b/solr/core/src/java/org/apache/solr/cluster/placement/impl/PlacementPluginAssignStrategy.java
index 3b933400c65..f005dc24641 100644
---
a/solr/core/src/java/org/apache/solr/cluster/placement/impl/PlacementPluginAssignStrategy.java
+++
b/solr/core/src/java/org/apache/solr/cluster/placement/impl/PlacementPluginAssignStrategy.java
@@ -27,6 +27,7 @@ import java.util.Set;
import org.apache.solr.client.solrj.cloud.SolrCloudManager;
import org.apache.solr.cloud.api.collections.Assign;
import org.apache.solr.cluster.Node;
+import org.apache.solr.cluster.Replica.ReplicaType;
import org.apache.solr.cluster.placement.BalanceRequest;
import org.apache.solr.cluster.placement.DeleteCollectionRequest;
import org.apache.solr.cluster.placement.DeleteReplicasRequest;
@@ -198,8 +199,7 @@ public class PlacementPluginAssignStrategy implements
Assign.AssignStrategy {
ArrayList<Node> nodeList = new ArrayList<>(request.getTargetNodes());
for (String shard : request.getShardNames()) {
int replicaNumOfShard = 0;
- for (org.apache.solr.cluster.Replica.ReplicaType replicaType :
- org.apache.solr.cluster.Replica.ReplicaType.values()) {
+ for (ReplicaType replicaType : ReplicaType.values()) {
for (int i = 0; i < request.getCountReplicasToCreate(replicaType);
i++) {
Node assignedNode = nodeList.get(replicaNumOfShard++ %
nodeList.size());
replicaPositions.add(
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.java
index b518c37c5a3..d1b92ba2a4b 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
@@ -34,6 +34,7 @@ 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.Replica.State;
import org.apache.solr.common.cloud.Slice;
import org.apache.solr.common.params.CollectionAdminParams;
import org.apache.solr.common.util.Pair;
@@ -396,7 +397,7 @@ class SimpleClusterAbstractionsImpl {
}
}
- private Replica.ReplicaState
translateState(org.apache.solr.common.cloud.Replica.State state) {
+ private Replica.ReplicaState translateState(State state) {
switch (state) {
case ACTIVE:
return Replica.ReplicaState.ACTIVE;
diff --git a/solr/core/src/java/org/apache/solr/core/SolrConfig.java
b/solr/core/src/java/org/apache/solr/core/SolrConfig.java
index 0bea68e114e..797276d862a 100644
--- a/solr/core/src/java/org/apache/solr/core/SolrConfig.java
+++ b/solr/core/src/java/org/apache/solr/core/SolrConfig.java
@@ -77,6 +77,7 @@ import org.apache.solr.search.CacheConfig;
import org.apache.solr.search.CaffeineCache;
import org.apache.solr.search.QParserPlugin;
import org.apache.solr.search.SolrCache;
+import org.apache.solr.search.SolrIndexSearcher;
import org.apache.solr.search.ValueSourceParser;
import org.apache.solr.search.stats.StatsCache;
import org.apache.solr.servlet.SolrRequestParsers;
@@ -320,7 +321,7 @@ public class SolrConfig implements MapSerializable {
dataDir = get("dataDir").txt();
if (dataDir != null && dataDir.length() == 0) dataDir = null;
- org.apache.solr.search.SolrIndexSearcher.initRegenerators(this);
+ SolrIndexSearcher.initRegenerators(this);
if (get("jmx").exists()) {
log.warn(
diff --git
a/solr/core/src/java/org/apache/solr/handler/admin/ZookeeperInfoHandler.java
b/solr/core/src/java/org/apache/solr/handler/admin/ZookeeperInfoHandler.java
index f52a548a0ff..c2e6d29ac5c 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/ZookeeperInfoHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/ZookeeperInfoHandler.java
@@ -24,6 +24,7 @@ import java.lang.invoke.MethodHandles;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
import java.util.LinkedHashMap;
@@ -648,7 +649,7 @@ public final class ZookeeperInfoHandler extends
RequestHandlerBase {
try {
List<String> children = zkClient.getChildren(path, null);
- java.util.Collections.sort(children);
+ Collections.sort(children);
for (String child : children) {
String childPath = path + (path.endsWith("/") ? "" : "/") + child;
diff --git
a/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java
b/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java
index 737fd5385de..a8e9513e587 100644
---
a/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java
+++
b/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java
@@ -61,13 +61,14 @@ import org.apache.solr.metrics.SolrMetricsContext;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.security.HttpClientBuilderPlugin;
import org.apache.solr.update.UpdateShardHandlerConfig;
+import org.apache.solr.util.plugin.PluginInfoInitialized;
import org.apache.solr.util.stats.InstrumentedHttpListenerFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/** Creates {@link HttpShardHandler} instances */
public class HttpShardHandlerFactory extends ShardHandlerFactory
- implements org.apache.solr.util.plugin.PluginInfoInitialized,
SolrMetricProducer {
+ implements PluginInfoInitialized, SolrMetricProducer {
private static final Logger log =
LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static final String DEFAULT_SCHEME = "http";
diff --git
a/solr/core/src/java/org/apache/solr/handler/component/RangeFacetRequest.java
b/solr/core/src/java/org/apache/solr/handler/component/RangeFacetRequest.java
index 6756397cd4e..e75cd8b249f 100644
---
a/solr/core/src/java/org/apache/solr/handler/component/RangeFacetRequest.java
+++
b/solr/core/src/java/org/apache/solr/handler/component/RangeFacetRequest.java
@@ -17,6 +17,7 @@
package org.apache.solr.handler.component;
import java.lang.invoke.MethodHandles;
+import java.text.ParseException;
import java.util.ArrayList;
import java.util.Date;
import java.util.EnumSet;
@@ -522,7 +523,7 @@ public class RangeFacetRequest extends
FacetComponent.FacetBase {
* Parses a String param into an Range endpoint. Can throw a low level
format exception as
* needed.
*/
- protected abstract T parseVal(final String rawval) throws
java.text.ParseException;
+ protected abstract T parseVal(final String rawval) throws ParseException;
/**
* Parses a String param into a value that represents the gap and can be
included in the
@@ -548,7 +549,7 @@ public class RangeFacetRequest extends
FacetComponent.FacetBase {
*
* <p>Default Impl calls parseVal
*/
- protected Object parseGap(final String rawval) throws
java.text.ParseException {
+ protected Object parseGap(final String rawval) throws ParseException {
return parseVal(rawval);
}
@@ -571,7 +572,7 @@ public class RangeFacetRequest extends
FacetComponent.FacetBase {
* Adds the String gap param to a low Range endpoint value to determine
the corrisponding high
* Range endpoint value. Can throw a low level format exception as needed.
*/
- protected abstract T parseAndAddGap(T value, String gap) throws
java.text.ParseException;
+ protected abstract T parseAndAddGap(T value, String gap) throws
ParseException;
public List<FacetRange> computeRanges() {
List<FacetRange> ranges = new ArrayList<>();
@@ -789,7 +790,7 @@ public class RangeFacetRequest extends
FacetComponent.FacetBase {
}
@Override
- public Date parseAndAddGap(Date value, String gap) throws
java.text.ParseException {
+ public Date parseAndAddGap(Date value, String gap) throws ParseException {
final DateMathParser dmp = new DateMathParser();
dmp.setNow(value);
return dmp.parseMath(gap);
@@ -813,7 +814,7 @@ public class RangeFacetRequest extends
FacetComponent.FacetBase {
}
@Override
- protected Object parseGap(String rawval) throws java.text.ParseException {
+ protected Object parseGap(String rawval) throws ParseException {
return parseVal(rawval).strValue();
}
diff --git
a/solr/core/src/java/org/apache/solr/handler/designer/DefaultSampleDocumentsLoader.java
b/solr/core/src/java/org/apache/solr/handler/designer/DefaultSampleDocumentsLoader.java
index 921c72bfcdc..4dff58a7ba2 100644
---
a/solr/core/src/java/org/apache/solr/handler/designer/DefaultSampleDocumentsLoader.java
+++
b/solr/core/src/java/org/apache/solr/handler/designer/DefaultSampleDocumentsLoader.java
@@ -31,6 +31,7 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Map;
+import java.util.NoSuchElementException;
import java.util.stream.Collectors;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamConstants;
@@ -270,7 +271,7 @@ public class DefaultSampleDocumentsLoader implements
SampleDocumentsLoader {
final int event;
try {
event = parser.next();
- } catch (java.util.NoSuchElementException noSuchElementException) {
+ } catch (NoSuchElementException noSuchElementException) {
return docs;
}
switch (event) {
diff --git
a/solr/core/src/java/org/apache/solr/handler/export/ExportWriter.java
b/solr/core/src/java/org/apache/solr/handler/export/ExportWriter.java
index 998730a953f..142c6617632 100644
--- a/solr/core/src/java/org/apache/solr/handler/export/ExportWriter.java
+++ b/solr/core/src/java/org/apache/solr/handler/export/ExportWriter.java
@@ -21,6 +21,7 @@ import static java.util.Collections.singletonList;
import static java.util.Collections.singletonMap;
import java.io.Closeable;
+import java.io.EOFException;
import java.io.IOException;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
@@ -347,7 +348,7 @@ public class ExportWriter implements SolrCore.RawWriter,
Closeable {
mw.put("docs", (IteratorWriter) iw -> writeDocs(req, os,
iw, sort));
});
});
- } catch (java.io.EOFException e) {
+ } catch (EOFException e) {
log.info("Caught Eof likely caused by early client disconnect");
}
diff --git
a/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java
b/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java
index ba22b2e317c..d77d4b35f36 100644
--- a/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java
+++ b/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java
@@ -75,6 +75,7 @@ import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.schema.FieldType;
import org.apache.solr.schema.IndexSchema;
import org.apache.solr.schema.SchemaField;
+import org.apache.solr.schema.TrieField;
import org.apache.solr.search.DocIterator;
import org.apache.solr.search.DocList;
import org.apache.solr.search.SolrDocumentFetcher;
@@ -531,7 +532,7 @@ public class DefaultSolrHighlighter extends SolrHighlighter
implements PluginInf
Object fieldHighlights;
if (schemaField == null) {
fieldHighlights = null;
- } else if (schemaField.getType() instanceof
org.apache.solr.schema.TrieField) {
+ } else if (schemaField.getType() instanceof TrieField) {
// TODO: highlighting numeric fields is broken (Lucene) - so we disable
them until fixed (see
// LUCENE-3080)!
fieldHighlights = null;
diff --git
a/solr/core/src/java/org/apache/solr/jersey/container/JettyBridgeResponseWriter.java
b/solr/core/src/java/org/apache/solr/jersey/container/JettyBridgeResponseWriter.java
index 2a69acfafed..ce9de4560c0 100644
---
a/solr/core/src/java/org/apache/solr/jersey/container/JettyBridgeResponseWriter.java
+++
b/solr/core/src/java/org/apache/solr/jersey/container/JettyBridgeResponseWriter.java
@@ -18,6 +18,7 @@
package org.apache.solr.jersey.container;
import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.core.Response.StatusType;
import java.io.IOException;
import java.io.OutputStream;
import java.lang.invoke.MethodHandles;
@@ -54,7 +55,7 @@ public class JettyBridgeResponseWriter implements
ContainerResponseWriter {
@Override
public OutputStream writeResponseStatusAndHeaders(
final long contentLength, final ContainerResponse context) throws
ContainerException {
- final jakarta.ws.rs.core.Response.StatusType statusInfo =
context.getStatusInfo();
+ final StatusType statusInfo = context.getStatusInfo();
httpServletResponse.setStatus(statusInfo.getStatusCode());
if (contentLength != -1 && contentLength < Integer.MAX_VALUE) {
diff --git a/solr/core/src/java/org/apache/solr/logging/jul/RecordHandler.java
b/solr/core/src/java/org/apache/solr/logging/jul/RecordHandler.java
index 94143e6ee5b..518861e983c 100644
--- a/solr/core/src/java/org/apache/solr/logging/jul/RecordHandler.java
+++ b/solr/core/src/java/org/apache/solr/logging/jul/RecordHandler.java
@@ -16,12 +16,13 @@
*/
package org.apache.solr.logging.jul;
+import java.util.logging.Handler;
import java.util.logging.LogRecord;
import org.apache.solr.common.util.SuppressForbidden;
import org.apache.solr.logging.LogWatcher;
@SuppressForbidden(reason = "class is specific to java.util.logging")
-public final class RecordHandler extends java.util.logging.Handler {
+public final class RecordHandler extends Handler {
final LogWatcher<LogRecord> framework;
public RecordHandler(LogWatcher<LogRecord> framework) {
diff --git
a/solr/core/src/java/org/apache/solr/metrics/otel/instruments/AttributedLongCounter.java
b/solr/core/src/java/org/apache/solr/metrics/otel/instruments/AttributedLongCounter.java
index e2a477eac35..fb43c8efa13 100644
---
a/solr/core/src/java/org/apache/solr/metrics/otel/instruments/AttributedLongCounter.java
+++
b/solr/core/src/java/org/apache/solr/metrics/otel/instruments/AttributedLongCounter.java
@@ -22,7 +22,7 @@ import io.opentelemetry.api.metrics.LongCounter;
public class AttributedLongCounter {
private final LongCounter baseCounter;
- private final io.opentelemetry.api.common.Attributes attributes;
+ private final Attributes attributes;
public AttributedLongCounter(LongCounter baseCounter, Attributes attributes)
{
this.baseCounter = baseCounter;
diff --git
a/solr/core/src/java/org/apache/solr/metrics/otel/instruments/AttributedLongHistogram.java
b/solr/core/src/java/org/apache/solr/metrics/otel/instruments/AttributedLongHistogram.java
index 6984fadbfa5..6a9af1bd80d 100644
---
a/solr/core/src/java/org/apache/solr/metrics/otel/instruments/AttributedLongHistogram.java
+++
b/solr/core/src/java/org/apache/solr/metrics/otel/instruments/AttributedLongHistogram.java
@@ -24,8 +24,7 @@ public class AttributedLongHistogram {
protected final LongHistogram histogram;
protected final Attributes attributes;
- public AttributedLongHistogram(
- LongHistogram histogram, io.opentelemetry.api.common.Attributes
attributes) {
+ public AttributedLongHistogram(LongHistogram histogram, Attributes
attributes) {
this.histogram = histogram;
this.attributes = attributes;
}
diff --git
a/solr/core/src/java/org/apache/solr/packagemanager/PackageUtils.java
b/solr/core/src/java/org/apache/solr/packagemanager/PackageUtils.java
index e08cc7775d1..7e6c918af5a 100644
--- a/solr/core/src/java/org/apache/solr/packagemanager/PackageUtils.java
+++ b/solr/core/src/java/org/apache/solr/packagemanager/PackageUtils.java
@@ -20,6 +20,7 @@ import static
org.apache.solr.client.solrj.util.SolrIdentifierValidator.validate
import com.fasterxml.jackson.databind.ObjectMapper;
import com.jayway.jsonpath.Configuration;
+import com.jayway.jsonpath.Option;
import com.jayway.jsonpath.spi.json.JacksonJsonProvider;
import com.jayway.jsonpath.spi.json.JsonProvider;
import com.jayway.jsonpath.spi.mapper.JacksonMappingProvider;
@@ -72,7 +73,7 @@ public class PackageUtils {
Configuration.builder()
.jsonProvider(jsonProvider)
.mappingProvider(provider)
- .options(com.jayway.jsonpath.Option.REQUIRE_PROPERTIES)
+ .options(Option.REQUIRE_PROPERTIES)
.build();
return c;
}
diff --git
a/solr/core/src/java/org/apache/solr/request/SubstringBytesRefFilter.java
b/solr/core/src/java/org/apache/solr/request/SubstringBytesRefFilter.java
index a8d2a158def..38de2bef915 100644
--- a/solr/core/src/java/org/apache/solr/request/SubstringBytesRefFilter.java
+++ b/solr/core/src/java/org/apache/solr/request/SubstringBytesRefFilter.java
@@ -17,6 +17,7 @@
package org.apache.solr.request;
import java.util.function.Predicate;
+import org.apache.commons.lang3.StringUtils;
import org.apache.lucene.util.BytesRef;
import org.apache.solr.common.util.SuppressForbidden;
@@ -52,6 +53,6 @@ public class SubstringBytesRefFilter implements
Predicate<BytesRef> {
@SuppressForbidden(reason = "Uses Stringutils.containsIgnoreCase")
private boolean containsIgnoreCase(final CharSequence str, final
CharSequence searchStr) {
- return org.apache.commons.lang3.StringUtils.containsIgnoreCase(str,
searchStr);
+ return StringUtils.containsIgnoreCase(str, searchStr);
}
}
diff --git a/solr/core/src/java/org/apache/solr/response/DocsStreamer.java
b/solr/core/src/java/org/apache/solr/response/DocsStreamer.java
index 850781c079d..ab317e883e1 100644
--- a/solr/core/src/java/org/apache/solr/response/DocsStreamer.java
+++ b/solr/core/src/java/org/apache/solr/response/DocsStreamer.java
@@ -74,7 +74,7 @@ public class DocsStreamer implements Iterator<SolrDocument> {
*/
@Deprecated public static final Set<Class<? extends FieldType>> KNOWN_TYPES
= new HashSet<>();
- private final org.apache.solr.response.ResultContext rctx;
+ private final ResultContext rctx;
private final SolrDocumentFetcher docFetcher; // a collaborator of
SolrIndexSearcher
private final DocList docs;
diff --git a/solr/core/src/java/org/apache/solr/schema/BinaryField.java
b/solr/core/src/java/org/apache/solr/schema/BinaryField.java
index db05597d75f..6738f448086 100644
--- a/solr/core/src/java/org/apache/solr/schema/BinaryField.java
+++ b/solr/core/src/java/org/apache/solr/schema/BinaryField.java
@@ -25,6 +25,7 @@ import java.util.Base64;
import java.util.Collections;
import java.util.List;
import org.apache.lucene.document.BinaryDocValuesField;
+import org.apache.lucene.document.StoredField;
import org.apache.lucene.index.IndexableField;
import org.apache.lucene.search.SortField;
import org.apache.lucene.util.BytesRef;
@@ -108,7 +109,7 @@ public class BinaryField extends FieldType {
log.trace("Ignoring unstored binary field: {}", field);
return null;
}
- return new org.apache.lucene.document.StoredField(field.getName(),
getBytesRef(val));
+ return new StoredField(field.getName(), getBytesRef(val));
}
private static BytesRef getBytesRef(Object val) {
diff --git a/solr/core/src/java/org/apache/solr/schema/DenseVectorField.java
b/solr/core/src/java/org/apache/solr/schema/DenseVectorField.java
index 247b389904b..f29714d5b1e 100644
--- a/solr/core/src/java/org/apache/solr/schema/DenseVectorField.java
+++ b/solr/core/src/java/org/apache/solr/schema/DenseVectorField.java
@@ -41,6 +41,7 @@ import org.apache.lucene.search.PatienceKnnVectorQuery;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.SeededKnnVectorQuery;
import org.apache.lucene.search.SortField;
+import org.apache.lucene.search.knn.KnnSearchStrategy;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.hnsw.HnswGraph;
import org.apache.solr.common.SolrException;
@@ -506,10 +507,9 @@ public class DenseVectorField extends FloatPointField {
getVectorBuilder(vectorToSearch, DenseVectorParser.BuilderPhase.QUERY);
// Create KnnSearchStrategy if filteredSearchThreshold is provided
- org.apache.lucene.search.knn.KnnSearchStrategy searchStrategy = null;
+ KnnSearchStrategy searchStrategy = null;
if (filteredSearchThreshold != null) {
- searchStrategy =
- new
org.apache.lucene.search.knn.KnnSearchStrategy.Hnsw(filteredSearchThreshold);
+ searchStrategy = new KnnSearchStrategy.Hnsw(filteredSearchThreshold);
}
Query baseQuery;
diff --git a/solr/core/src/java/org/apache/solr/schema/FieldType.java
b/solr/core/src/java/org/apache/solr/schema/FieldType.java
index 15387038bba..6b1404c5706 100644
--- a/solr/core/src/java/org/apache/solr/schema/FieldType.java
+++ b/solr/core/src/java/org/apache/solr/schema/FieldType.java
@@ -43,6 +43,7 @@ import
org.apache.lucene.analysis.tokenattributes.OffsetAttribute;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.SortedSetDocValuesField;
import org.apache.lucene.index.IndexableField;
+import org.apache.lucene.index.IndexableFieldType;
import org.apache.lucene.index.Term;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.search.BooleanClause;
@@ -324,8 +325,7 @@ public abstract class FieldType extends FieldProperties {
* @param type {@link org.apache.lucene.document.FieldType}
* @return the {@link org.apache.lucene.index.IndexableField}.
*/
- protected IndexableField createField(
- String name, String val, org.apache.lucene.index.IndexableFieldType
type) {
+ protected IndexableField createField(String name, String val,
IndexableFieldType type) {
return new Field(name, val, type);
}
diff --git a/solr/core/src/java/org/apache/solr/schema/IndexSchema.java
b/solr/core/src/java/org/apache/solr/schema/IndexSchema.java
index 1c2d3ad3d20..e350b6233b5 100644
--- a/solr/core/src/java/org/apache/solr/schema/IndexSchema.java
+++ b/solr/core/src/java/org/apache/solr/schema/IndexSchema.java
@@ -49,6 +49,7 @@ import org.apache.lucene.analysis.CharFilterFactory;
import org.apache.lucene.analysis.DelegatingAnalyzerWrapper;
import org.apache.lucene.analysis.TokenFilterFactory;
import org.apache.lucene.analysis.TokenizerFactory;
+import org.apache.lucene.document.Document;
import org.apache.lucene.index.IndexableField;
import org.apache.lucene.queries.payloads.PayloadDecoder;
import org.apache.lucene.search.similarities.Similarity;
@@ -348,7 +349,7 @@ public class IndexSchema {
* @return null if this schema has no unique key field
* @see #printableUniqueKey
*/
- public IndexableField getUniqueKeyField(org.apache.lucene.document.Document
doc) {
+ public IndexableField getUniqueKeyField(Document doc) {
return doc.getField(uniqueKeyFieldName); // this should return null if
name is null
}
@@ -357,7 +358,7 @@ public class IndexSchema {
*
* @return null if this schema has no unique key field
*/
- public String printableUniqueKey(org.apache.lucene.document.Document doc) {
+ public String printableUniqueKey(Document doc) {
IndexableField f = doc.getField(uniqueKeyFieldName);
return f == null ? null : uniqueKeyFieldType.toExternal(f);
}
diff --git a/solr/core/src/java/org/apache/solr/schema/LongPointField.java
b/solr/core/src/java/org/apache/solr/schema/LongPointField.java
index 05a014ae4e3..8aa32e77cfe 100644
--- a/solr/core/src/java/org/apache/solr/schema/LongPointField.java
+++ b/solr/core/src/java/org/apache/solr/schema/LongPointField.java
@@ -27,6 +27,7 @@ import
org.apache.lucene.queries.function.valuesource.LongFieldSource;
import
org.apache.lucene.queries.function.valuesource.MultiValuedLongFieldSource;
import org.apache.lucene.search.MatchNoDocsQuery;
import org.apache.lucene.search.Query;
+import org.apache.lucene.search.SortedNumericSelector;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.BytesRefBuilder;
import org.apache.solr.search.QParser;
@@ -155,8 +156,7 @@ public class LongPointField extends PointField implements
LongValueFieldType {
}
@Override
- protected ValueSource getSingleValueSource(
- org.apache.lucene.search.SortedNumericSelector.Type choice, SchemaField
field) {
+ protected ValueSource getSingleValueSource(SortedNumericSelector.Type
choice, SchemaField field) {
return new MultiValuedLongFieldSource(field.getName(), choice);
}
diff --git a/solr/core/src/java/org/apache/solr/schema/TrieField.java
b/solr/core/src/java/org/apache/solr/schema/TrieField.java
index f15d6354403..5b8980d0a12 100644
--- a/solr/core/src/java/org/apache/solr/schema/TrieField.java
+++ b/solr/core/src/java/org/apache/solr/schema/TrieField.java
@@ -25,6 +25,7 @@ import java.util.Date;
import java.util.List;
import java.util.Locale;
import java.util.Map;
+import org.apache.lucene.document.Field;
import org.apache.lucene.document.NumericDocValuesField;
import org.apache.lucene.document.SortedSetDocValuesField;
import org.apache.lucene.index.DocValuesType;
@@ -617,7 +618,7 @@ public class TrieField extends NumericFieldType {
}
ft.setNumericPrecisionStep(precisionStep);
- final org.apache.lucene.document.Field f;
+ final Field f;
switch (type) {
case INTEGER:
@@ -700,7 +701,7 @@ public class TrieField extends NumericFieldType {
* expert internal use, subject to change. Returns null if no prefix or
prefix not needed, or the
* prefix of the main value of a trie field that indexes multiple precisions
per value.
*/
- public static String getMainValuePrefix(org.apache.solr.schema.FieldType ft)
{
+ public static String getMainValuePrefix(FieldType ft) {
if (ft instanceof TrieField trie) {
if (trie.precisionStep == Integer.MAX_VALUE) return null;
switch (trie.type) {
diff --git
a/solr/core/src/java/org/apache/solr/search/ComplexPhraseQParserPlugin.java
b/solr/core/src/java/org/apache/solr/search/ComplexPhraseQParserPlugin.java
index 34b3002d8ba..884b4a39d28 100644
--- a/solr/core/src/java/org/apache/solr/search/ComplexPhraseQParserPlugin.java
+++ b/solr/core/src/java/org/apache/solr/search/ComplexPhraseQParserPlugin.java
@@ -18,6 +18,7 @@ package org.apache.solr.search;
import org.apache.lucene.index.Term;
import org.apache.lucene.queryparser.classic.ParseException;
+import org.apache.lucene.queryparser.classic.QueryParser.Operator;
import org.apache.lucene.queryparser.complexPhrase.ComplexPhraseQueryParser;
import org.apache.lucene.search.AutomatonQuery;
import org.apache.lucene.search.MultiTermQuery;
@@ -75,8 +76,7 @@ public class ComplexPhraseQParserPlugin extends QParserPlugin
{
}
@Override
- protected org.apache.lucene.search.Query getWildcardQuery(String field,
String termStr)
- throws SyntaxError {
+ protected Query getWildcardQuery(String field, String termStr) throws
SyntaxError {
Query q = super.getWildcardQuery(field, termStr);
// For complex phrase queries, we need to ensure wildcard queries and
automaton queries
@@ -148,11 +148,10 @@ public class ComplexPhraseQParserPlugin extends
QParserPlugin {
lparser =
new ComplexPhraseQueryParser(defaultField,
getReq().getSchema().getQueryAnalyzer()) {
@Override
- protected Query newWildcardQuery(org.apache.lucene.index.Term t) {
+ protected Query newWildcardQuery(Term t) {
try {
// Get the wildcard query from the reverse-aware parser
- org.apache.lucene.search.Query wildcardQuery =
- reverseAwareParser.getWildcardQuery(t.field(), t.text());
+ Query wildcardQuery =
reverseAwareParser.getWildcardQuery(t.field(), t.text());
// In Lucene 10, we need to ensure wildcard queries use
SCORING_BOOLEAN_REWRITE
// for complex phrase queries to work properly
@@ -215,9 +214,8 @@ public class ComplexPhraseQParserPlugin extends
QParserPlugin {
QueryParser.Operator defaultOperator =
QueryParsing.parseOP(getParam(QueryParsing.OP));
if (QueryParser.Operator.AND.equals(defaultOperator))
-
lparser.setDefaultOperator(org.apache.lucene.queryparser.classic.QueryParser.Operator.AND);
- else
-
lparser.setDefaultOperator(org.apache.lucene.queryparser.classic.QueryParser.Operator.OR);
+ lparser.setDefaultOperator(Operator.AND);
+ else lparser.setDefaultOperator(Operator.OR);
try {
return lparser.parse(qstr);
diff --git a/solr/core/src/java/org/apache/solr/search/CpuAllowedLimit.java
b/solr/core/src/java/org/apache/solr/search/CpuAllowedLimit.java
index 72362159f0b..b80ed4e28b1 100644
--- a/solr/core/src/java/org/apache/solr/search/CpuAllowedLimit.java
+++ b/solr/core/src/java/org/apache/solr/search/CpuAllowedLimit.java
@@ -107,7 +107,7 @@ public class CpuAllowedLimit implements QueryLimit {
return false;
} finally {
if (log.isTraceEnabled()) {
- java.text.DecimalFormatSymbols symbols = new
DecimalFormatSymbols(Locale.US);
+ DecimalFormatSymbols symbols = new DecimalFormatSymbols(Locale.US);
DecimalFormat formatter = new DecimalFormat("#,###", symbols);
String threadName = Thread.currentThread().getName();
String deltaFmt = formatter.format(delta);
diff --git a/solr/core/src/java/org/apache/solr/search/DisMaxQParser.java
b/solr/core/src/java/org/apache/solr/search/DisMaxQParser.java
index 9f90831e820..79756bc1090 100644
--- a/solr/core/src/java/org/apache/solr/search/DisMaxQParser.java
+++ b/solr/core/src/java/org/apache/solr/search/DisMaxQParser.java
@@ -55,8 +55,7 @@ public class DisMaxQParser extends QParser {
* @see DisMaxParams#MM
*/
public static String parseMinShouldMatch(final IndexSchema schema, final
SolrParams params) {
- org.apache.solr.parser.QueryParser.Operator op =
- QueryParsing.parseOP(params.get(QueryParsing.OP));
+ QueryParser.Operator op =
QueryParsing.parseOP(params.get(QueryParsing.OP));
return params.get(DisMaxParams.MM, op.equals(QueryParser.Operator.AND) ?
"100%" : "0%");
}
diff --git
a/solr/core/src/java/org/apache/solr/search/ExpressionValueSourceParser.java
b/solr/core/src/java/org/apache/solr/search/ExpressionValueSourceParser.java
index 67b2ebe75e2..51014707184 100644
--- a/solr/core/src/java/org/apache/solr/search/ExpressionValueSourceParser.java
+++ b/solr/core/src/java/org/apache/solr/search/ExpressionValueSourceParser.java
@@ -21,7 +21,9 @@ import static
org.apache.solr.common.SolrException.ErrorCode.SERVER_ERROR;
import java.io.IOException;
import java.text.ParseException;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.regex.Matcher;
@@ -143,8 +145,8 @@ public class ExpressionValueSourceParser extends
ValueSourceParser {
}
@Override
- public FunctionValues getValues(
- java.util.Map<Object, Object> context, LeafReaderContext
readerContext) throws IOException {
+ public FunctionValues getValues(Map<Object, Object> context,
LeafReaderContext readerContext)
+ throws IOException {
// Get scorer from context (may be null during setup)
Scorable scorer = (Scorable) context.get("scorer");
DoubleValues scores = scorer == null ? null :
DoubleValuesSource.fromScorer(scorer);
@@ -221,7 +223,7 @@ public class ExpressionValueSourceParser extends
ValueSourceParser {
@Override
public void doSetNextReader(LeafReaderContext context) throws
IOException {
// Create initial FunctionValues (may have null scorer)
- functionValues = (ScoreAwareFunctionValues) getValues(new
java.util.HashMap<>(), context);
+ functionValues = (ScoreAwareFunctionValues) getValues(new HashMap<>(),
context);
}
@Override
diff --git a/solr/core/src/java/org/apache/solr/search/SolrDocumentFetcher.java
b/solr/core/src/java/org/apache/solr/search/SolrDocumentFetcher.java
index 6c31193014b..3366d5241ef 100644
--- a/solr/core/src/java/org/apache/solr/search/SolrDocumentFetcher.java
+++ b/solr/core/src/java/org/apache/solr/search/SolrDocumentFetcher.java
@@ -72,6 +72,7 @@ import org.apache.solr.schema.EnumFieldType;
import org.apache.solr.schema.LatLonPointSpatialField;
import org.apache.solr.schema.NumberType;
import org.apache.solr.schema.SchemaField;
+import org.apache.solr.schema.StrField;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -245,7 +246,7 @@ public class SolrDocumentFetcher {
SchemaField field = searcher.getSchema().getField(fieldName);
if (field.stored()
&& ((field.getType() instanceof
org.apache.solr.schema.TextField)
- || (field.getType() instanceof
org.apache.solr.schema.StrField))) {
+ || (field.getType() instanceof StrField))) {
storedHighlightFieldNames.add(fieldName);
}
} catch (RuntimeException e) {
diff --git
a/solr/core/src/java/org/apache/solr/search/SurroundQParserPlugin.java
b/solr/core/src/java/org/apache/solr/search/SurroundQParserPlugin.java
index 204477353e0..8f646319fe6 100644
--- a/solr/core/src/java/org/apache/solr/search/SurroundQParserPlugin.java
+++ b/solr/core/src/java/org/apache/solr/search/SurroundQParserPlugin.java
@@ -17,6 +17,7 @@
package org.apache.solr.search;
import java.lang.invoke.MethodHandles;
+import org.apache.lucene.queryparser.surround.parser.ParseException;
import org.apache.lucene.queryparser.surround.parser.QueryParser;
import org.apache.lucene.queryparser.surround.query.BasicQueryFactory;
import org.apache.lucene.queryparser.surround.query.SrndQuery;
@@ -79,8 +80,8 @@ public class SurroundQParserPlugin extends QParserPlugin {
}
// ugh .. colliding ParseExceptions
try {
- sq =
org.apache.lucene.queryparser.surround.parser.QueryParser.parse(qstr);
- } catch (org.apache.lucene.queryparser.surround.parser.ParseException
pe) {
+ sq = QueryParser.parse(qstr);
+ } catch (ParseException pe) {
throw new SyntaxError(pe);
}
diff --git
a/solr/core/src/java/org/apache/solr/search/facet/FacetProcessor.java
b/solr/core/src/java/org/apache/solr/search/facet/FacetProcessor.java
index 357e1be356b..e64679e798d 100644
--- a/solr/core/src/java/org/apache/solr/search/facet/FacetProcessor.java
+++ b/solr/core/src/java/org/apache/solr/search/facet/FacetProcessor.java
@@ -28,6 +28,7 @@ import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.search.BooleanClause;
import org.apache.lucene.search.BooleanQuery;
import org.apache.lucene.search.Query;
+import org.apache.solr.common.MapWriter;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.util.SimpleOrderedMap;
import org.apache.solr.handler.component.ResponseBuilder;
@@ -63,7 +64,7 @@ public abstract class FacetProcessor<T extends FacetRequest> {
fcontext.processor = this;
}
- public org.apache.solr.common.MapWriter getResponse() {
+ public MapWriter getResponse() {
return response;
}
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.java
index a3d7165ea46..97f3439d8a9 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,6 +20,7 @@ package org.apache.solr.search.facet;
import static org.apache.solr.search.facet.FacetContext.SKIP_FACET;
import java.io.IOException;
+import java.text.ParseException;
import java.util.ArrayList;
import java.util.Date;
import java.util.EnumSet;
@@ -680,7 +681,7 @@ class FacetRangeProcessor extends
FacetProcessor<FacetRange> {
/** Parses a String param into a value. Can throw a low level format
exception as needed. */
@SuppressWarnings({"rawtypes"})
- protected abstract Comparable parseStr(final String rawval) throws
java.text.ParseException;
+ protected abstract Comparable parseStr(final String rawval) throws
ParseException;
/**
* Parses a String param into a value that represents the gap and can be
included in the
@@ -706,7 +707,7 @@ class FacetRangeProcessor extends
FacetProcessor<FacetRange> {
*
* <p>Default Impl calls parseVal
*/
- protected Object parseGap(final String rawval) throws
java.text.ParseException {
+ protected Object parseGap(final String rawval) throws ParseException {
return parseStr(rawval);
}
@@ -732,7 +733,7 @@ class FacetRangeProcessor extends
FacetProcessor<FacetRange> {
*/
@SuppressWarnings({"rawtypes"})
protected abstract Comparable parseAndAddGap(Comparable value, String gap)
- throws java.text.ParseException;
+ throws ParseException;
}
private static class FloatCalc extends Calc {
@@ -904,7 +905,7 @@ class FacetRangeProcessor extends
FacetProcessor<FacetRange> {
@Override
public Date parseAndAddGap(@SuppressWarnings("rawtypes") Comparable value,
String gap)
- throws java.text.ParseException {
+ throws ParseException {
final DateMathParser dmp = new DateMathParser();
dmp.setNow((Date) value);
return dmp.parseMath(gap);
@@ -966,19 +967,18 @@ class FacetRangeProcessor extends
FacetProcessor<FacetRange> {
@Override
@SuppressWarnings({"rawtypes"})
- protected Comparable parseStr(final String rawval) throws
java.text.ParseException {
+ protected Comparable parseStr(final String rawval) throws ParseException {
return CurrencyValue.parse(rawval, defaultCurrencyCode);
}
@Override
- protected Object parseGap(final String rawval) throws
java.text.ParseException {
+ protected Object parseGap(final String rawval) throws ParseException {
return parseStr(rawval);
}
@Override
@SuppressWarnings({"rawtypes"})
- protected Comparable parseAndAddGap(Comparable value, String gap)
- throws java.text.ParseException {
+ protected Comparable parseAndAddGap(Comparable value, String gap) throws
ParseException {
if (value == null) {
throw new NullPointerException("Cannot perform range faceting on null
CurrencyValue");
}
diff --git
a/solr/core/src/java/org/apache/solr/spelling/AbstractLuceneSpellChecker.java
b/solr/core/src/java/org/apache/solr/spelling/AbstractLuceneSpellChecker.java
index 61f99a84a61..1e8d280abcb 100644
---
a/solr/core/src/java/org/apache/solr/spelling/AbstractLuceneSpellChecker.java
+++
b/solr/core/src/java/org/apache/solr/spelling/AbstractLuceneSpellChecker.java
@@ -60,7 +60,7 @@ public abstract class AbstractLuceneSpellChecker extends
SolrSpellChecker {
public static final String SCORE_COMP = "score";
public static final String FREQ_COMP = "freq";
- protected org.apache.lucene.search.spell.SpellChecker spellChecker;
+ protected SpellChecker spellChecker;
protected String sourceLocation;
/*
diff --git a/solr/core/src/java/org/apache/solr/update/DocumentBuilder.java
b/solr/core/src/java/org/apache/solr/update/DocumentBuilder.java
index b43c4cfb81c..0a13b967989 100644
--- a/solr/core/src/java/org/apache/solr/update/DocumentBuilder.java
+++ b/solr/core/src/java/org/apache/solr/update/DocumentBuilder.java
@@ -437,8 +437,7 @@ public class DocumentBuilder {
}
/** Convert a lucene Document to a SolrInputDocument */
- public static SolrInputDocument toSolrInputDocument(
- org.apache.lucene.document.Document doc, IndexSchema schema) {
+ public static SolrInputDocument toSolrInputDocument(Document doc,
IndexSchema schema) {
SolrInputDocument out = new SolrInputDocument();
for (IndexableField f : doc.getFields()) {
String fname = f.name();
diff --git a/solr/core/src/java/org/apache/solr/util/CryptoKeys.java
b/solr/core/src/java/org/apache/solr/util/CryptoKeys.java
index ea6cc20bc4f..11177b371c0 100644
--- a/solr/core/src/java/org/apache/solr/util/CryptoKeys.java
+++ b/solr/core/src/java/org/apache/solr/util/CryptoKeys.java
@@ -24,6 +24,7 @@ import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
import java.security.InvalidKeyException;
import java.security.KeyFactory;
+import java.security.KeyPair;
import java.security.KeyPairGenerator;
import java.security.NoSuchAlgorithmException;
import java.security.PrivateKey;
@@ -256,7 +257,7 @@ public final class CryptoKeys {
throw new AssertionError("JVM spec is required to support RSA", e);
}
keyGen.initialize(DEFAULT_KEYPAIR_LENGTH);
- java.security.KeyPair keyPair = keyGen.genKeyPair();
+ KeyPair keyPair = keyGen.genKeyPair();
privateKey = keyPair.getPrivate();
keySizeInBytes = determineKeySizeInBytes(privateKey);
publicKey = keyPair.getPublic();
diff --git a/solr/core/src/java/org/apache/solr/util/TestInjection.java
b/solr/core/src/java/org/apache/solr/util/TestInjection.java
index 8168f7beafe..3ca9e5d78a6 100644
--- a/solr/core/src/java/org/apache/solr/util/TestInjection.java
+++ b/solr/core/src/java/org/apache/solr/util/TestInjection.java
@@ -583,7 +583,7 @@ public class TestInjection {
double wasteMe = nanos;
double loadPerKey = cpuLoadPerKey.get();
if (loadPerKey > nanos) {
- java.text.DecimalFormatSymbols symbols = new
DecimalFormatSymbols(Locale.US);
+ DecimalFormatSymbols symbols = new DecimalFormatSymbols(Locale.US);
DecimalFormat formatter = new DecimalFormat("#,###.00", symbols);
// yes this is still wasting formatting when not warn, but not important
here.
diff --git
a/solr/core/src/java/org/apache/solr/util/circuitbreaker/CPUCircuitBreaker.java
b/solr/core/src/java/org/apache/solr/util/circuitbreaker/CPUCircuitBreaker.java
index b91906167bb..09248363bcd 100644
---
a/solr/core/src/java/org/apache/solr/util/circuitbreaker/CPUCircuitBreaker.java
+++
b/solr/core/src/java/org/apache/solr/util/circuitbreaker/CPUCircuitBreaker.java
@@ -19,6 +19,7 @@ package org.apache.solr.util.circuitbreaker;
import io.prometheus.metrics.model.snapshots.GaugeSnapshot;
import java.lang.invoke.MethodHandles;
+import java.util.Collection;
import java.util.Locale;
import org.apache.solr.core.CoreContainer;
import org.apache.solr.core.SolrCore;
@@ -116,7 +117,7 @@ public class CPUCircuitBreaker extends CircuitBreaker
implements SolrCoreAware {
.filter(GaugeSnapshot.class::isInstance)
.map(GaugeSnapshot.class::cast)
.map(GaugeSnapshot::getDataPoints)
- .flatMap(java.util.Collection::stream)
+ .flatMap(Collection::stream)
.findFirst()
.map(dp -> dp.getValue() * 100)
.orElse(-1.0); // Unable to unpack metric
diff --git a/solr/core/src/test/org/apache/solr/cli/TestSolrCLIRunExample.java
b/solr/core/src/test/org/apache/solr/cli/TestSolrCLIRunExample.java
index 4e6c0fecf4c..59bde025506 100644
--- a/solr/core/src/test/org/apache/solr/cli/TestSolrCLIRunExample.java
+++ b/solr/core/src/test/org/apache/solr/cli/TestSolrCLIRunExample.java
@@ -84,8 +84,7 @@ public class TestSolrCLIRunExample extends SolrTestCaseJ4 {
* test.
*/
@Override
- public void execute(
- org.apache.commons.exec.CommandLine cmd, Map<String, String> env,
ExecuteResultHandler erh)
+ public void execute(CommandLine cmd, Map<String, String> env,
ExecuteResultHandler erh)
throws IOException {
int code = execute(cmd);
if (code != 0)
@@ -93,7 +92,7 @@ public class TestSolrCLIRunExample extends SolrTestCaseJ4 {
}
@Override
- public int execute(org.apache.commons.exec.CommandLine cmd) throws
IOException {
+ public int execute(CommandLine cmd) throws IOException {
String exe = cmd.getExecutable();
assert (exe.endsWith("solr") || exe.endsWith("solr.cmd"));
@@ -402,7 +401,7 @@ public class TestSolrCLIRunExample extends SolrTestCaseJ4 {
}
// stop the test instance
- executor.execute(org.apache.commons.exec.CommandLine.parse("bin/solr
stop -p " + bindPort));
+ executor.execute(CommandLine.parse("bin/solr stop -p " + bindPort));
}
}
@@ -518,7 +517,7 @@ public class TestSolrCLIRunExample extends SolrTestCaseJ4 {
// System.out.println(toolOutput);
// stop the test instance
- executor.execute(org.apache.commons.exec.CommandLine.parse("bin/solr stop
-p " + bindPort));
+ executor.execute(CommandLine.parse("bin/solr stop -p " + bindPort));
}
/**
@@ -628,7 +627,7 @@ public class TestSolrCLIRunExample extends SolrTestCaseJ4 {
deleteTool.runTool(SolrCLI.processCommandLineArgs(deleteTool, deleteArgs));
// stop the test instance
- executor.execute(org.apache.commons.exec.CommandLine.parse("bin/solr stop
-p " + bindPort));
+ executor.execute(CommandLine.parse("bin/solr stop -p " + bindPort));
}
@Test
diff --git a/solr/core/src/test/org/apache/solr/cloud/NodeRolesTest.java
b/solr/core/src/test/org/apache/solr/cloud/NodeRolesTest.java
index 463b81a2ecd..8d1a9858181 100644
--- a/solr/core/src/test/org/apache/solr/cloud/NodeRolesTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/NodeRolesTest.java
@@ -17,10 +17,12 @@
package org.apache.solr.cloud;
+import java.io.IOException;
import java.util.Collection;
import java.util.Collections;
import java.util.Map;
import java.util.Objects;
+import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.client.solrj.request.CollectionAdminRequest;
import org.apache.solr.client.solrj.request.V2Request;
import org.apache.solr.client.solrj.response.V2Response;
@@ -96,8 +98,7 @@ public class NodeRolesTest extends SolrCloudTestCase {
}
@SuppressWarnings("rawtypes")
- private void validateNodeRoles(String... nodenamePaths)
- throws org.apache.solr.client.solrj.SolrServerException,
java.io.IOException {
+ private void validateNodeRoles(String... nodenamePaths) throws
SolrServerException, IOException {
V2Response rsp =
new
V2Request.Builder("/cluster/node-roles").GET().build().process(cluster.getSolrClient());
for (int i = 0; i < nodenamePaths.length; i += 2) {
diff --git
a/solr/core/src/test/org/apache/solr/cloud/TestBaseStatsCacheCloud.java
b/solr/core/src/test/org/apache/solr/cloud/TestBaseStatsCacheCloud.java
index a85bc5ab9cf..a7dc3f8d12f 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestBaseStatsCacheCloud.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestBaseStatsCacheCloud.java
@@ -21,6 +21,8 @@ import java.nio.charset.StandardCharsets;
import java.util.HashMap;
import java.util.Map;
import java.util.function.Function;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import org.apache.solr.client.solrj.SolrClient;
import org.apache.solr.client.solrj.embedded.EmbeddedSolrServer;
import org.apache.solr.client.solrj.impl.CloudSolrClient;
@@ -229,8 +231,8 @@ public abstract class TestBaseStatsCacheCloud extends
SolrCloudTestCase {
* "solr_core_indexsearcher_termstats_cache{...type="lookups",...}" ->
"lookups"
*/
private String extractTypeAttribute(String line) {
- java.util.regex.Pattern pattern =
java.util.regex.Pattern.compile("\\btype=\"([^\"]+)\"");
- java.util.regex.Matcher matcher = pattern.matcher(line);
+ Pattern pattern = Pattern.compile("\\btype=\"([^\"]+)\"");
+ Matcher matcher = pattern.matcher(line);
if (matcher.find()) {
return matcher.group(1);
}
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestPullReplica.java
b/solr/core/src/test/org/apache/solr/cloud/TestPullReplica.java
index d0c1e2d6fe3..e7b0ffaa144 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestPullReplica.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestPullReplica.java
@@ -60,6 +60,7 @@ import org.apache.solr.core.SolrCore;
import org.apache.solr.embedded.JettySolrRunner;
import org.apache.solr.update.UpdateLog;
import org.apache.solr.util.LogLevel;
+import org.apache.solr.util.SolrMetricTestUtils;
import org.apache.solr.util.TestInjection;
import org.apache.solr.util.TimeOut;
import org.apache.zookeeper.KeeperException;
@@ -310,10 +311,10 @@ public class TestPullReplica extends SolrCloudTestCase {
for (String coreName : cc.getAllCoreNames()) {
try (SolrCore core = cc.getCore(coreName)) {
var addOpsDatapoint =
- org.apache.solr.util.SolrMetricTestUtils.getCounterDatapoint(
+ SolrMetricTestUtils.getCounterDatapoint(
core,
"solr_core_update_committed_ops",
-
org.apache.solr.util.SolrMetricTestUtils.newCloudLabelsBuilder(core)
+ SolrMetricTestUtils.newCloudLabelsBuilder(core)
.label("category", "UPDATE")
.label("ops", "adds")
.build());
diff --git
a/solr/core/src/test/org/apache/solr/cloud/TestPullReplicaWithAuth.java
b/solr/core/src/test/org/apache/solr/cloud/TestPullReplicaWithAuth.java
index 2006b16005b..4439f8fbf35 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestPullReplicaWithAuth.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestPullReplicaWithAuth.java
@@ -108,10 +108,10 @@ public class TestPullReplicaWithAuth extends
SolrCloudTestCase {
for (String coreName : cc.getAllCoreNames()) {
try (SolrCore core = cc.getCore(coreName)) {
var addOpsDatapoint =
- org.apache.solr.util.SolrMetricTestUtils.getCounterDatapoint(
+ SolrMetricTestUtils.getCounterDatapoint(
core,
"solr_core_update_committed_ops",
-
org.apache.solr.util.SolrMetricTestUtils.newCloudLabelsBuilder(core)
+ SolrMetricTestUtils.newCloudLabelsBuilder(core)
.label("category", "UPDATE")
.label("ops", "adds")
.build());
diff --git
a/solr/core/src/test/org/apache/solr/cloud/TrollingIndexReaderFactory.java
b/solr/core/src/test/org/apache/solr/cloud/TrollingIndexReaderFactory.java
index d457bb6a2c9..978f25be219 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TrollingIndexReaderFactory.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TrollingIndexReaderFactory.java
@@ -67,7 +67,7 @@ public class TrollingIndexReaderFactory extends
StandardIndexReaderFactory {
@Override
public abstract String toString();
- public static void dumpLastStackTraces(org.slf4j.Logger log) {
+ public static void dumpLastStackTraces(Logger log) {
ArrayList<List<Object>> stacks = new ArrayList<>();
lastStacktraces.drainTo(stacks);
StringBuilder out = new StringBuilder("the last caught stacktraces: \n");
diff --git a/solr/core/src/test/org/apache/solr/core/TestXIncludeConfig.java
b/solr/core/src/test/org/apache/solr/core/TestXIncludeConfig.java
index 6c9002fd534..64cd4145a45 100644
--- a/solr/core/src/test/org/apache/solr/core/TestXIncludeConfig.java
+++ b/solr/core/src/test/org/apache/solr/core/TestXIncludeConfig.java
@@ -34,7 +34,7 @@ public class TestXIncludeConfig extends SolrTestCaseJ4 {
@Override
public void setUp() throws Exception {
- javax.xml.parsers.DocumentBuilderFactory dbf =
DocumentBuilderFactory.newInstance();
+ DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
try {
// see whether it even makes sense to run this test
dbf.setXIncludeAware(true);
diff --git
a/solr/core/src/test/org/apache/solr/handler/admin/UpgradeCoreIndexActionTest.java
b/solr/core/src/test/org/apache/solr/handler/admin/UpgradeCoreIndexActionTest.java
index d3c79fc7868..14bfe1ad7fe 100644
---
a/solr/core/src/test/org/apache/solr/handler/admin/UpgradeCoreIndexActionTest.java
+++
b/solr/core/src/test/org/apache/solr/handler/admin/UpgradeCoreIndexActionTest.java
@@ -38,6 +38,7 @@ import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.core.SolrCore;
import org.apache.solr.request.SolrQueryRequestBase;
import org.apache.solr.response.SolrQueryResponse;
+import org.apache.solr.search.SolrIndexSearcher;
import org.apache.solr.update.AddUpdateCommand;
import org.apache.solr.util.RefCounted;
import org.junit.Before;
@@ -303,7 +304,7 @@ public class UpgradeCoreIndexActionTest extends
SolrTestCaseJ4 {
}
private void setMinVersionForSegments(SolrCore core, Set<String> segments,
Version minVersion) {
- RefCounted<org.apache.solr.search.SolrIndexSearcher> searcherRef =
core.getSearcher();
+ RefCounted<SolrIndexSearcher> searcherRef = core.getSearcher();
try {
final List<LeafReaderContext> leaves =
searcherRef.get().getTopReaderContext().leaves();
for (LeafReaderContext ctx : leaves) {
diff --git
a/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotLongTailTest.java
b/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotLongTailTest.java
index 1ccf53c04ce..1295965742b 100644
---
a/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotLongTailTest.java
+++
b/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotLongTailTest.java
@@ -19,6 +19,7 @@ package org.apache.solr.handler.component;
import java.util.ArrayList;
import java.util.List;
import org.apache.solr.BaseDistributedSearchTestCase;
+import org.apache.solr.client.solrj.SolrClient;
import org.apache.solr.client.solrj.response.FieldStatsInfo;
import org.apache.solr.client.solrj.response.PivotField;
import org.apache.solr.common.params.FacetParams;
@@ -82,7 +83,7 @@ public class DistributedFacetPivotLongTailTest extends
BaseDistributedSearchTest
List<PivotField> pivots = null;
List<List<PivotField>> shardPivots = new ArrayList<>(clients.size());
- for (org.apache.solr.client.solrj.SolrClient client : clients) {
+ for (SolrClient client : clients) {
shardPivots.add(client.query(req).getFacetPivot().get("foo_s,bar_s"));
}
diff --git a/solr/core/src/test/org/apache/solr/logging/TestLogWatcher.java
b/solr/core/src/test/org/apache/solr/logging/TestLogWatcher.java
index c688956a08c..b2d23d64a4e 100644
--- a/solr/core/src/test/org/apache/solr/logging/TestLogWatcher.java
+++ b/solr/core/src/test/org/apache/solr/logging/TestLogWatcher.java
@@ -37,6 +37,7 @@ import org.apache.solr.util.TimeOut;
import org.junit.Before;
import org.junit.Test;
import org.noggit.CharArr;
+import org.noggit.JSONWriter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -136,7 +137,7 @@ public class TestLogWatcher extends SolrTestCaseJ4 {
private static void validateWrite(SolrDocumentList docs, String expectMsg)
throws IOException {
CharArr arr = new CharArr();
- org.noggit.JSONWriter w = new org.noggit.JSONWriter(arr, 2);
+ JSONWriter w = new JSONWriter(arr, 2);
docs.writeMap(
new MapWriter.EntryWriter() {
boolean first = true;
diff --git a/solr/core/src/test/org/apache/solr/response/SmileWriterTest.java
b/solr/core/src/test/org/apache/solr/response/SmileWriterTest.java
index 4b12fe7a09d..c429e56b5a4 100644
--- a/solr/core/src/test/org/apache/solr/response/SmileWriterTest.java
+++ b/solr/core/src/test/org/apache/solr/response/SmileWriterTest.java
@@ -17,6 +17,7 @@
package org.apache.solr.response;
import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.BinaryNode;
import com.fasterxml.jackson.databind.node.BooleanNode;
@@ -220,8 +221,7 @@ public class SmileWriterTest extends SolrTestCaseJ4 {
public static Object decodeSmile(InputStream is) throws IOException {
final SmileFactory smileFactory = new SmileFactory();
- com.fasterxml.jackson.databind.ObjectMapper mapper =
- new com.fasterxml.jackson.databind.ObjectMapper(smileFactory);
+ ObjectMapper mapper = new ObjectMapper(smileFactory);
JsonNode jsonNode = mapper.readTree(is);
return getVal(jsonNode);
}
diff --git
a/solr/core/src/test/org/apache/solr/response/TestRawTransformer.java
b/solr/core/src/test/org/apache/solr/response/TestRawTransformer.java
index ba58f58cc23..37f8cd31f3e 100644
--- a/solr/core/src/test/org/apache/solr/response/TestRawTransformer.java
+++ b/solr/core/src/test/org/apache/solr/response/TestRawTransformer.java
@@ -33,6 +33,7 @@ import org.apache.solr.cloud.MiniSolrCloudCluster;
import org.apache.solr.cloud.SolrCloudTestCase;
import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.common.params.ModifiableSolrParams;
+import org.apache.solr.common.util.IOUtils;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.embedded.JettyConfig;
import org.apache.solr.embedded.JettySolrRunner;
@@ -121,7 +122,7 @@ public class TestRawTransformer extends SolrCloudTestCase {
@AfterClass
public static void afterClass() throws Exception {
if (CLIENT != null) {
- org.apache.solr.common.util.IOUtils.closeQuietly(CLIENT);
+ IOUtils.closeQuietly(CLIENT);
CLIENT = null;
}
if (JSR != null) {
diff --git
a/solr/core/src/test/org/apache/solr/response/transform/TestSubQueryTransformerDistrib.java
b/solr/core/src/test/org/apache/solr/response/transform/TestSubQueryTransformerDistrib.java
index 565c73dceec..e2fd0110d4d 100644
---
a/solr/core/src/test/org/apache/solr/response/transform/TestSubQueryTransformerDistrib.java
+++
b/solr/core/src/test/org/apache/solr/response/transform/TestSubQueryTransformerDistrib.java
@@ -35,6 +35,7 @@ import java.util.List;
import java.util.Map;
import java.util.Random;
import org.apache.solr.JSONTestUtil;
+import org.apache.solr.SolrTestCaseJ4.SuppressSSL;
import org.apache.solr.client.solrj.SolrRequest;
import org.apache.solr.client.solrj.SolrResponse;
import org.apache.solr.client.solrj.SolrServerException;
@@ -56,7 +57,7 @@ import org.apache.solr.security.RuleBasedAuthorizationPlugin;
import org.junit.BeforeClass;
import org.junit.Test;
[email protected]()
+@SuppressSSL()
public class TestSubQueryTransformerDistrib extends SolrCloudTestCase {
private static final String support = "These guys help customers";
diff --git a/solr/core/src/test/org/apache/solr/search/TestCaffeineCache.java
b/solr/core/src/test/org/apache/solr/search/TestCaffeineCache.java
index f458f06717a..738f153bfaa 100644
--- a/solr/core/src/test/org/apache/solr/search/TestCaffeineCache.java
+++ b/solr/core/src/test/org/apache/solr/search/TestCaffeineCache.java
@@ -39,6 +39,7 @@ import org.apache.lucene.util.Accountable;
import org.apache.solr.SolrTestCase;
import org.apache.solr.metrics.SolrMetricManager;
import org.apache.solr.metrics.SolrMetricsContext;
+import org.apache.solr.metrics.otel.FilterablePrometheusMetricReader;
import org.apache.solr.util.SolrMetricTestUtils;
import org.junit.Test;
@@ -384,9 +385,7 @@ public class TestCaffeineCache extends SolrTestCase {
}
private CounterSnapshot.CounterDataPointSnapshot getCacheOperation(
- org.apache.solr.metrics.otel.FilterablePrometheusMetricReader
prometheusReader,
- String cacheName,
- String operation) {
+ FilterablePrometheusMetricReader prometheusReader, String cacheName,
String operation) {
return SolrMetricTestUtils.getCounterDatapoint(
prometheusReader,
"solr_cache_ops",
@@ -399,9 +398,7 @@ public class TestCaffeineCache extends SolrTestCase {
}
private CounterSnapshot.CounterDataPointSnapshot getCacheLookup(
- org.apache.solr.metrics.otel.FilterablePrometheusMetricReader
prometheusReader,
- String cacheName,
- String result) {
+ FilterablePrometheusMetricReader prometheusReader, String cacheName,
String result) {
var builder =
Labels.builder()
.label("category", "CACHE")
diff --git
a/solr/core/src/test/org/apache/solr/search/TestFoldingMultitermQuery.java
b/solr/core/src/test/org/apache/solr/search/TestFoldingMultitermQuery.java
index e25ad83b9d9..d8edc3af40f 100644
--- a/solr/core/src/test/org/apache/solr/search/TestFoldingMultitermQuery.java
+++ b/solr/core/src/test/org/apache/solr/search/TestFoldingMultitermQuery.java
@@ -17,6 +17,7 @@
package org.apache.solr.search;
import org.apache.solr.SolrTestCaseJ4;
+import org.apache.solr.common.SolrException;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -327,7 +328,7 @@ public class TestFoldingMultitermQuery extends
SolrTestCaseJ4 {
Exception.class,
"Should throw exception when token evaluates to more than one
term",
() -> assertQ(req("q", "content_multi_bad:" + "abCD*")));
- assertTrue(expected.getCause() instanceof
org.apache.solr.common.SolrException);
+ assertTrue(expected.getCause() instanceof SolrException);
} finally {
resetExceptionIgnores();
}
diff --git
a/solr/core/src/test/org/apache/solr/search/mlt/CloudMLTQParserTest.java
b/solr/core/src/test/org/apache/solr/search/mlt/CloudMLTQParserTest.java
index fa587fc93e2..b72eacb7d26 100644
--- a/solr/core/src/test/org/apache/solr/search/mlt/CloudMLTQParserTest.java
+++ b/solr/core/src/test/org/apache/solr/search/mlt/CloudMLTQParserTest.java
@@ -16,8 +16,10 @@
*/
package org.apache.solr.search.mlt;
+import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
+import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.client.solrj.impl.CloudSolrClient;
import org.apache.solr.client.solrj.request.CollectionAdminRequest;
import org.apache.solr.client.solrj.request.SolrQuery;
@@ -41,8 +43,7 @@ public class CloudMLTQParserTest extends SolrCloudTestCase {
indexDocs();
}
- static void indexDocs()
- throws org.apache.solr.client.solrj.SolrServerException,
java.io.IOException {
+ static void indexDocs() throws SolrServerException, IOException {
final CloudSolrClient client = cluster.getSolrClient();
CollectionAdminRequest.createCollection(COLLECTION, "conf", 2,
1).process(client);
diff --git a/solr/core/src/test/org/apache/solr/servlet/CacheHeaderTest.java
b/solr/core/src/test/org/apache/solr/servlet/CacheHeaderTest.java
index 9e905c04bab..57045b49a9a 100644
--- a/solr/core/src/test/org/apache/solr/servlet/CacheHeaderTest.java
+++ b/solr/core/src/test/org/apache/solr/servlet/CacheHeaderTest.java
@@ -24,6 +24,7 @@ import org.apache.http.HttpResponse;
import org.apache.http.client.methods.HttpRequestBase;
import org.apache.http.client.utils.DateUtils;
import org.apache.solr.common.util.SuppressForbidden;
+import org.apache.solr.embedded.JettyConfig;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -51,8 +52,7 @@ public class CacheHeaderTest extends CacheHeaderTestBase {
nodeProps.setProperty("coreRootDirectory", coresDir.toString());
nodeProps.setProperty("configSetBaseDir", solrHomeDirectory.toString());
- solrTestRule.startSolr(
- solrHomeDirectory, nodeProps,
org.apache.solr.embedded.JettyConfig.builder().build());
+ solrTestRule.startSolr(solrHomeDirectory, nodeProps,
JettyConfig.builder().build());
}
@Test
diff --git
a/solr/core/src/test/org/apache/solr/servlet/SecurityHeadersTest.java
b/solr/core/src/test/org/apache/solr/servlet/SecurityHeadersTest.java
index b097febe41f..b426717505d 100644
--- a/solr/core/src/test/org/apache/solr/servlet/SecurityHeadersTest.java
+++ b/solr/core/src/test/org/apache/solr/servlet/SecurityHeadersTest.java
@@ -22,6 +22,7 @@ import java.util.Map;
import org.apache.http.HttpResponse;
import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpGet;
+import org.apache.lucene.tests.util.LuceneTestCase.AwaitsFix;
import org.apache.solr.client.solrj.SolrClient;
import org.apache.solr.client.solrj.apache.HttpSolrClient;
import org.apache.solr.client.solrj.request.CollectionAdminRequest;
@@ -35,8 +36,7 @@ import org.junit.Test;
* Confirm that the expected security headers are returned when making
requests to solr, regardless
* of whether the request is internally forwarded to another node.
*/
[email protected](
- bugUrl = "https://issues.apache.org/jira/browse/SOLR-14903";)
+@AwaitsFix(bugUrl = "https://issues.apache.org/jira/browse/SOLR-14903";)
public class SecurityHeadersTest extends SolrCloudTestCase {
private static final String COLLECTION = "xxx";
diff --git
a/solr/core/src/test/org/apache/solr/update/processor/RoutedAliasUpdateProcessorTest.java
b/solr/core/src/test/org/apache/solr/update/processor/RoutedAliasUpdateProcessorTest.java
index 67234ac7412..96d5cfe4c5a 100644
---
a/solr/core/src/test/org/apache/solr/update/processor/RoutedAliasUpdateProcessorTest.java
+++
b/solr/core/src/test/org/apache/solr/update/processor/RoutedAliasUpdateProcessorTest.java
@@ -32,6 +32,7 @@ import java.util.TreeSet;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future;
import java.util.stream.Collectors;
+import org.apache.lucene.tests.util.LuceneTestCase.AwaitsFix;
import org.apache.solr.client.solrj.SolrRequest;
import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.client.solrj.impl.CloudSolrClient;
@@ -63,8 +64,7 @@ import org.junit.Ignore;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
[email protected](
- bugUrl = "https://issues.apache.org/jira/browse/SOLR-13696";)
+@AwaitsFix(bugUrl = "https://issues.apache.org/jira/browse/SOLR-13696";)
@Ignore // don't try to run abstract base class
public abstract class RoutedAliasUpdateProcessorTest extends SolrCloudTestCase
{
private static final Logger log =
LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
diff --git
a/solr/modules/extraction/src/java/org/apache/solr/handler/extraction/ExtractingDocumentLoader.java
b/solr/modules/extraction/src/java/org/apache/solr/handler/extraction/ExtractingDocumentLoader.java
index ba9b72b1863..64a34cdd13f 100644
---
a/solr/modules/extraction/src/java/org/apache/solr/handler/extraction/ExtractingDocumentLoader.java
+++
b/solr/modules/extraction/src/java/org/apache/solr/handler/extraction/ExtractingDocumentLoader.java
@@ -36,6 +36,10 @@ import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.response.SolrQueryResponse;
import org.apache.solr.update.AddUpdateCommand;
import org.apache.solr.update.processor.UpdateRequestProcessor;
+import org.apache.tika.sax.XHTMLContentHandler;
+import org.apache.tika.sax.xpath.Matcher;
+import org.apache.tika.sax.xpath.MatchingContentHandler;
+import org.apache.tika.sax.xpath.XPathParser;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.xml.sax.helpers.DefaultHandler;
@@ -118,7 +122,7 @@ public class ExtractingDocumentLoader extends
ContentStreamLoader {
LinkedHashMap<Pattern, String> pwMap = null;
String passwordsFile = params.get(ExtractingParams.PASSWORD_MAP_FILE);
if (passwordsFile != null) {
- try (java.io.InputStream is =
core.getResourceLoader().openResource(passwordsFile)) {
+ try (InputStream is =
core.getResourceLoader().openResource(passwordsFile)) {
pwMap = RegexRulesPasswordProvider.parseRulesFile(is);
}
}
@@ -240,11 +244,9 @@ public class ExtractingDocumentLoader extends
ContentStreamLoader {
DefaultHandler ch)
throws Exception {
if (xpathExpr != null) {
- org.apache.tika.sax.xpath.XPathParser xparser =
- new org.apache.tika.sax.xpath.XPathParser(
- "xhtml", org.apache.tika.sax.XHTMLContentHandler.XHTML);
- org.apache.tika.sax.xpath.Matcher matcher = xparser.parse(xpathExpr);
- ch = new org.apache.tika.sax.xpath.MatchingContentHandler(ch, matcher);
+ XPathParser xparser = new XPathParser("xhtml",
XHTMLContentHandler.XHTML);
+ Matcher matcher = xparser.parse(xpathExpr);
+ ch = new MatchingContentHandler(ch, matcher);
}
backend.extractWithSaxHandler(inputStream, extractionRequest, md, ch);
return ch.toString();
diff --git
a/solr/modules/extraction/src/java/org/apache/solr/handler/extraction/ExtractionRequest.java
b/solr/modules/extraction/src/java/org/apache/solr/handler/extraction/ExtractionRequest.java
index 50c6f0c7b7b..79068816271 100644
---
a/solr/modules/extraction/src/java/org/apache/solr/handler/extraction/ExtractionRequest.java
+++
b/solr/modules/extraction/src/java/org/apache/solr/handler/extraction/ExtractionRequest.java
@@ -31,7 +31,7 @@ public class ExtractionRequest {
public final String streamSourceInfo;
public final Long streamSize;
public final String resourcePassword;
- public final java.util.LinkedHashMap<java.util.regex.Pattern, String>
passwordsMap;
+ public final LinkedHashMap<Pattern, String> passwordsMap;
public final String extractFormat;
// Below variables are only used by TikaServerExtractionBackend
@@ -69,7 +69,7 @@ public class ExtractionRequest {
String streamSourceInfo,
Long streamSize,
String resourcePassword,
- java.util.LinkedHashMap<java.util.regex.Pattern, String> passwordsMap,
+ LinkedHashMap<Pattern, String> passwordsMap,
String extractFormat,
boolean tikaServerRecursive,
Integer tikaServerTimeoutSeconds,
diff --git
a/solr/modules/extraction/src/java/org/apache/solr/handler/extraction/TikaServerExtractionBackend.java
b/solr/modules/extraction/src/java/org/apache/solr/handler/extraction/TikaServerExtractionBackend.java
index c21a0c01e09..283d186fe71 100644
---
a/solr/modules/extraction/src/java/org/apache/solr/handler/extraction/TikaServerExtractionBackend.java
+++
b/solr/modules/extraction/src/java/org/apache/solr/handler/extraction/TikaServerExtractionBackend.java
@@ -19,7 +19,10 @@ package org.apache.solr.handler.extraction;
import java.io.IOException;
import java.io.InputStream;
import java.net.ConnectException;
+import java.net.MalformedURLException;
import java.net.SocketTimeoutException;
+import java.net.URI;
+import java.net.URISyntaxException;
import java.nio.channels.ClosedChannelException;
import java.time.Duration;
import java.util.HashMap;
@@ -82,7 +85,7 @@ public class TikaServerExtractionBackend implements
ExtractionBackend {
}
// Validate URL format and scheme
try {
- java.net.URI uri = new java.net.URI(baseUrl);
+ URI uri = new URI(baseUrl);
String scheme = uri.getScheme();
if (scheme == null
|| (!scheme.equalsIgnoreCase("http") &&
!scheme.equalsIgnoreCase("https"))) {
@@ -90,7 +93,7 @@ public class TikaServerExtractionBackend implements
ExtractionBackend {
"baseUrl must use http or https scheme, got: " + baseUrl);
}
uri.toURL(); // Additional validation that it's a valid URL
- } catch (java.net.URISyntaxException | java.net.MalformedURLException e) {
+ } catch (URISyntaxException | MalformedURLException e) {
throw new IllegalArgumentException("Invalid baseUrl: " + baseUrl, e);
}
diff --git
a/solr/modules/extraction/src/java/org/apache/solr/handler/extraction/TikaServerParser.java
b/solr/modules/extraction/src/java/org/apache/solr/handler/extraction/TikaServerParser.java
index 38f0afec3d1..e34514040b6 100644
---
a/solr/modules/extraction/src/java/org/apache/solr/handler/extraction/TikaServerParser.java
+++
b/solr/modules/extraction/src/java/org/apache/solr/handler/extraction/TikaServerParser.java
@@ -28,6 +28,7 @@ import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.util.Utils;
+import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
@@ -139,8 +140,7 @@ public class TikaServerParser {
}
@Override
- public void startElement(
- String uri, String localName, String qName, org.xml.sax.Attributes
attributes)
+ public void startElement(String uri, String localName, String qName,
Attributes attributes)
throws SAXException {
String ln = localName != null && !localName.isEmpty() ? localName :
qName;
if ("head".equalsIgnoreCase(ln)) {
diff --git
a/solr/modules/extraction/src/test/org/apache/solr/handler/extraction/TikaServerExtractionBackendTest.java
b/solr/modules/extraction/src/test/org/apache/solr/handler/extraction/TikaServerExtractionBackendTest.java
index 2bc12f838f8..5fc5dd2c169 100644
---
a/solr/modules/extraction/src/test/org/apache/solr/handler/extraction/TikaServerExtractionBackendTest.java
+++
b/solr/modules/extraction/src/test/org/apache/solr/handler/extraction/TikaServerExtractionBackendTest.java
@@ -19,9 +19,11 @@ package org.apache.solr.handler.extraction;
import com.carrotsearch.randomizedtesting.ThreadFilter;
import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;
import java.io.ByteArrayInputStream;
+import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.util.Collections;
import java.util.List;
+import java.util.Locale;
import java.util.Map;
import org.apache.lucene.tests.util.QuickPatchThreadsFilter;
import org.apache.solr.SolrIgnoredThreadsFilter;
@@ -107,7 +109,7 @@ public class TikaServerExtractionBackendTest extends
SolrTestCaseJ4 {
public void testExtractTextAndMetadata() throws Exception {
Assume.assumeTrue("Tika server container not started", tika != null);
try (TikaServerExtractionBackend backend = new
TikaServerExtractionBackend(baseUrl)) {
- byte[] data = "Hello
TestContainers".getBytes(java.nio.charset.StandardCharsets.UTF_8);
+ byte[] data = "Hello TestContainers".getBytes(StandardCharsets.UTF_8);
try (ByteArrayInputStream in = new ByteArrayInputStream(data)) {
ExtractionResult res = backend.extract(in, newRequest("test.txt",
"text/plain", "text"));
assertNotNull(res);
@@ -127,7 +129,7 @@ public class TikaServerExtractionBackendTest extends
SolrTestCaseJ4 {
public void testExtractWithSaxHandlerXml() throws Exception {
Assume.assumeTrue("Tika server container not started", tika != null);
try (TikaServerExtractionBackend backend = new
TikaServerExtractionBackend(baseUrl)) {
- byte[] data = "Hello
XML".getBytes(java.nio.charset.StandardCharsets.UTF_8);
+ byte[] data = "Hello XML".getBytes(StandardCharsets.UTF_8);
ExtractionRequest request = newRequest("test.txt", "text/plain", "xml");
try (ByteArrayInputStream in = new ByteArrayInputStream(data)) {
ToXMLContentHandler xmlHandler = new ToXMLContentHandler();
@@ -138,8 +140,8 @@ public class TikaServerExtractionBackendTest extends
SolrTestCaseJ4 {
// Tika Server may return XHTML without XML declaration; be flexible
assertTrue(
c.contains("<?xml")
- || c.toLowerCase(java.util.Locale.ROOT).contains("<html")
- || c.toLowerCase(java.util.Locale.ROOT).contains("<xhtml"));
+ || c.toLowerCase(Locale.ROOT).contains("<html")
+ || c.toLowerCase(Locale.ROOT).contains("<xhtml"));
assertTrue(c.contains("Hello XML"));
}
}
@@ -185,7 +187,7 @@ public class TikaServerExtractionBackendTest extends
SolrTestCaseJ4 {
new TikaServerExtractionBackend(baseUrl, 180, null, maxChars)) {
byte[] data =
("This content is definitely longer than ten characters.")
- .getBytes(java.nio.charset.StandardCharsets.UTF_8);
+ .getBytes(StandardCharsets.UTF_8);
try (ByteArrayInputStream in = new ByteArrayInputStream(data)) {
SolrException e =
expectThrows(
@@ -207,7 +209,7 @@ public class TikaServerExtractionBackendTest extends
SolrTestCaseJ4 {
new TikaServerExtractionBackend(baseUrl, 180, null, maxChars)) {
byte[] data =
("This content is definitely longer than ten characters.")
- .getBytes(java.nio.charset.StandardCharsets.UTF_8);
+ .getBytes(StandardCharsets.UTF_8);
ExtractionRequest request = newRequest("test.txt", "text/plain", "xml");
try (ByteArrayInputStream in = new ByteArrayInputStream(data)) {
ToXMLContentHandler xmlHandler = new ToXMLContentHandler();
diff --git
a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/TimeSeriesStream.java
b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/TimeSeriesStream.java
index ccfeb68e3c0..2218e4577aa 100644
---
a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/TimeSeriesStream.java
+++
b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/TimeSeriesStream.java
@@ -22,6 +22,7 @@ import java.time.ZoneOffset;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Date;
import java.util.List;
import java.util.Locale;
import java.util.Map.Entry;
@@ -528,7 +529,7 @@ public class TimeSeriesStream extends TupleStream
implements Expressible {
if (formatter != null) {
LocalDateTime localDateTime =
- LocalDateTime.ofInstant(((java.util.Date) val).toInstant(),
ZoneOffset.UTC);
+ LocalDateTime.ofInstant(((Date) val).toInstant(), ZoneOffset.UTC);
val = localDateTime.format(formatter);
}
diff --git
a/solr/solrj/src/java/org/apache/solr/client/solrj/beans/DocumentObjectBinder.java
b/solr/solrj/src/java/org/apache/solr/client/solrj/beans/DocumentObjectBinder.java
index 3b0e022832f..86ecd6590d1 100644
---
a/solr/solrj/src/java/org/apache/solr/client/solrj/beans/DocumentObjectBinder.java
+++
b/solr/solrj/src/java/org/apache/solr/client/solrj/beans/DocumentObjectBinder.java
@@ -35,6 +35,7 @@ import java.util.Locale;
import java.util.Map;
import java.util.ServiceLoader;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Predicate;
import java.util.regex.Pattern;
import org.apache.solr.common.SolrDocument;
import org.apache.solr.common.SolrDocumentList;
@@ -197,7 +198,7 @@ public class DocumentObjectBinder {
* is set to <code>TRUE</code> as well as <code>isList</code> is set to
<code>TRUE</code>
*/
private boolean isContainedInMap;
- private java.util.function.Predicate<String>
dynamicFieldNamePatternMatcher;
+ private Predicate<String> dynamicFieldNamePatternMatcher;
public DocField(AccessibleObject member) {
if (member instanceof java.lang.reflect.Field) {
diff --git
a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClientBase.java
b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClientBase.java
index 84e329f25a4..4133b824690 100644
---
a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClientBase.java
+++
b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClientBase.java
@@ -21,6 +21,7 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.net.MalformedURLException;
+import java.net.URLDecoder;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
@@ -235,7 +236,7 @@ public abstract class HttpSolrClientBase extends SolrClient
{
.append("\n")
.append("request: ")
.append(responseMethod);
- String reason = java.net.URLDecoder.decode(msg.toString(),
FALLBACK_CHARSET);
+ String reason = URLDecoder.decode(msg.toString(), FALLBACK_CHARSET);
throw new RemoteSolrException(urlExceptionMessage, httpStatus,
reason, null);
} else {
throw new RemoteSolrException(urlExceptionMessage, httpStatus,
error);
diff --git
a/solr/solrj/src/java/org/apache/solr/client/solrj/request/SolrQuery.java
b/solr/solrj/src/java/org/apache/solr/client/solrj/request/SolrQuery.java
index ea8b2bb37e1..6146dbe0d6e 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/request/SolrQuery.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/request/SolrQuery.java
@@ -16,6 +16,7 @@
*/
package org.apache.solr.client.solrj.request;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
@@ -1280,7 +1281,7 @@ public class SolrQuery extends ModifiableSolrParams {
* SortClause.desc("product");
* </code></PRE>
*/
- public static class SortClause implements java.io.Serializable {
+ public static class SortClause implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/solr/solrj/src/java/org/apache/solr/common/SolrDocument.java
b/solr/solrj/src/java/org/apache/solr/common/SolrDocument.java
index 16ba4ee00db..53a152cfcd5 100644
--- a/solr/solrj/src/java/org/apache/solr/common/SolrDocument.java
+++ b/solr/solrj/src/java/org/apache/solr/common/SolrDocument.java
@@ -293,7 +293,7 @@ public class SolrDocument extends SolrDocumentBase<Object,
SolrDocument>
}
@Override
- public Set<java.util.Map.Entry<String, Collection<Object>>> entrySet() {
+ public Set<Entry<String, Collection<Object>>> entrySet() {
throw new UnsupportedOperationException();
}
@@ -366,7 +366,7 @@ public class SolrDocument extends SolrDocumentBase<Object,
SolrDocument>
}
@Override
- public Set<java.util.Map.Entry<String, Object>> entrySet() {
+ public Set<Entry<String, Object>> entrySet() {
throw new UnsupportedOperationException();
}
diff --git
a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java
b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java
index b1b37ffea99..4f7c4029e12 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java
@@ -35,6 +35,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
+import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
@@ -344,25 +345,25 @@ public abstract class SolrExampleTests extends
SolrExampleTestsBase {
doc2.addField("id", "2");
doc2.addField("inStock", true);
doc2.addField("price", 2);
- doc2.addField("timestamp_dt", new java.util.Date());
+ doc2.addField("timestamp_dt", new Date());
docs.add(doc2);
SolrInputDocument doc3 = new SolrInputDocument();
doc3.addField("id", "3");
doc3.addField("inStock", false);
doc3.addField("price", 3);
- doc3.addField("timestamp_dt", new java.util.Date());
+ doc3.addField("timestamp_dt", new Date());
docs.add(doc3);
SolrInputDocument doc4 = new SolrInputDocument();
doc4.addField("id", "4");
doc4.addField("inStock", true);
doc4.addField("price", 4);
- doc4.addField("timestamp_dt", new java.util.Date());
+ doc4.addField("timestamp_dt", new Date());
docs.add(doc4);
SolrInputDocument doc5 = new SolrInputDocument();
doc5.addField("id", "5");
doc5.addField("inStock", false);
doc5.addField("price", 5);
- doc5.addField("timestamp_dt", new java.util.Date());
+ doc5.addField("timestamp_dt", new Date());
docs.add(doc5);
upres = client.add(docs);
diff --git
a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientTestBase.java
b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientTestBase.java
index 5efd56e69c1..73d6d19ccfe 100644
---
a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientTestBase.java
+++
b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientTestBase.java
@@ -54,6 +54,7 @@ import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.params.MapSolrParams;
import org.apache.solr.common.util.EnvUtils;
+import org.apache.solr.common.util.IOUtils;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.embedded.JettyConfig;
import org.apache.solr.util.ExternalPaths;
@@ -469,7 +470,7 @@ public abstract class HttpSolrClientTestBase extends
SolrTestCaseJ4 {
assertThat(stream, instanceOf(InputStream.class));
InputStream is = (InputStream) stream;
assertNotNull(is.readAllBytes()); // throws IOException if closed
- org.apache.solr.common.util.IOUtils.closeQuietly((InputStream) stream);
+ IOUtils.closeQuietly((InputStream) stream);
}
protected void testSetCredentialsExplicitly(HttpSolrClientBase client) {
diff --git
a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/MockTrustManager.java
b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/MockTrustManager.java
index c7e1351d01d..5c6cae77c79 100644
---
a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/MockTrustManager.java
+++
b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/MockTrustManager.java
@@ -82,8 +82,8 @@ public class MockTrustManager extends
X509ExtendedTrustManager {
}
@Override
- public java.security.cert.X509Certificate[] getAcceptedIssuers() {
- return new java.security.cert.X509Certificate[0];
+ public X509Certificate[] getAcceptedIssuers() {
+ return new X509Certificate[0];
}
@Override
@@ -93,7 +93,7 @@ public class MockTrustManager extends
X509ExtendedTrustManager {
}
@Override
- public void checkServerTrusted(java.security.cert.X509Certificate[] chain,
String authType)
+ public void checkServerTrusted(X509Certificate[] chain, String authType)
throws CertificateException {
// no-op
}
diff --git a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
index fb1ce4bd3b7..3a4cbe2532a 100644
--- a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
@@ -121,6 +121,7 @@ import org.apache.solr.request.SolrRequestHandler;
import org.apache.solr.request.SolrRequestInfo;
import org.apache.solr.response.SolrQueryResponse;
import org.apache.solr.schema.IndexSchema;
+import org.apache.solr.schema.PointField;
import org.apache.solr.schema.SchemaField;
import org.apache.solr.search.SolrIndexSearcher;
import org.apache.solr.security.AllowListUrlChecker;
@@ -2802,7 +2803,7 @@ public abstract class SolrTestCaseJ4 extends SolrTestCase
{
log.info(
"Using TrieFields (NUMERIC_POINTS_SYSPROP=false)
w/NUMERIC_DOCVALUES_SYSPROP={}", useDV);
-
org.apache.solr.schema.PointField.TEST_HACK_IGNORE_USELESS_TRIEFIELD_ARGS =
false;
+ PointField.TEST_HACK_IGNORE_USELESS_TRIEFIELD_ARGS = false;
private_RANDOMIZED_NUMERIC_FIELDTYPES.put(Integer.class,
"solr.TrieIntField");
private_RANDOMIZED_NUMERIC_FIELDTYPES.put(Float.class,
"solr.TrieFloatField");
private_RANDOMIZED_NUMERIC_FIELDTYPES.put(Long.class,
"solr.TrieLongField");
@@ -2814,7 +2815,7 @@ public abstract class SolrTestCaseJ4 extends SolrTestCase
{
log.info(
"Using PointFields (NUMERIC_POINTS_SYSPROP=true)
w/NUMERIC_DOCVALUES_SYSPROP={}", useDV);
-
org.apache.solr.schema.PointField.TEST_HACK_IGNORE_USELESS_TRIEFIELD_ARGS =
true;
+ PointField.TEST_HACK_IGNORE_USELESS_TRIEFIELD_ARGS = true;
private_RANDOMIZED_NUMERIC_FIELDTYPES.put(Integer.class,
"solr.IntPointField");
private_RANDOMIZED_NUMERIC_FIELDTYPES.put(Float.class,
"solr.FloatPointField");
private_RANDOMIZED_NUMERIC_FIELDTYPES.put(Long.class,
"solr.LongPointField");
@@ -2846,7 +2847,7 @@ public abstract class SolrTestCaseJ4 extends SolrTestCase
{
* @lucene.internal
*/
private static void clearNumericTypesProperties() {
- org.apache.solr.schema.PointField.TEST_HACK_IGNORE_USELESS_TRIEFIELD_ARGS
= false;
+ PointField.TEST_HACK_IGNORE_USELESS_TRIEFIELD_ARGS = false;
private_RANDOMIZED_NUMERIC_FIELDTYPES.clear();
}
diff --git
a/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/ConcurrentUpdateSolrClient.java
b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/ConcurrentUpdateSolrClient.java
index 1882dcbcc2f..a042bdae536 100644
---
a/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/ConcurrentUpdateSolrClient.java
+++
b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/ConcurrentUpdateSolrClient.java
@@ -35,6 +35,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.apache.http.HttpResponse;
import org.apache.http.HttpStatus;
import org.apache.http.NameValuePair;
+import org.apache.http.client.config.RequestConfig;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.entity.ContentProducer;
import org.apache.http.entity.EntityTemplate;
@@ -336,7 +337,7 @@ public class ConcurrentUpdateSolrClient extends SolrClient {
method = new HttpPost(basePath + "/update" +
requestParams.toQueryString());
- org.apache.http.client.config.RequestConfig.Builder
requestConfigBuilder =
+ RequestConfig.Builder requestConfigBuilder =
HttpClientUtil.createDefaultRequestConfigBuilder();
requestConfigBuilder.setSocketTimeout(soTimeout);
requestConfigBuilder.setConnectTimeout(connectionTimeout);
diff --git
a/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/HttpClientUtil.java
b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/HttpClientUtil.java
index 1b567b74bbe..59eea17c280 100644
---
a/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/HttpClientUtil.java
+++
b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/HttpClientUtil.java
@@ -65,6 +65,7 @@ import org.apache.solr.client.solrj.impl.SolrHttpConstants;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.common.params.SolrParams;
+import org.apache.solr.common.util.IOUtils;
import org.apache.solr.common.util.ObjectReleaseTracker;
import org.apache.solr.common.util.Utils;
import org.slf4j.Logger;
@@ -452,7 +453,7 @@ public class HttpClientUtil implements SolrHttpConstants {
public static void close(HttpClient httpClient) {
- org.apache.solr.common.util.IOUtils.closeQuietly((CloseableHttpClient)
httpClient);
+ IOUtils.closeQuietly((CloseableHttpClient) httpClient);
assert ObjectReleaseTracker.release(httpClient);
}
diff --git
a/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/HttpSolrClient.java
b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/HttpSolrClient.java
index 7f11c01e774..3e184f5ef3f 100644
---
a/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/HttpSolrClient.java
+++
b/solr/test-framework/src/java/org/apache/solr/client/solrj/apache/HttpSolrClient.java
@@ -25,6 +25,7 @@ import java.io.UnsupportedEncodingException;
import java.lang.invoke.MethodHandles;
import java.net.ConnectException;
import java.net.SocketTimeoutException;
+import java.net.URLDecoder;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.security.Principal;
@@ -49,6 +50,7 @@ import org.apache.http.HttpResponse;
import org.apache.http.HttpStatus;
import org.apache.http.NameValuePair;
import org.apache.http.client.HttpClient;
+import org.apache.http.client.config.RequestConfig;
import org.apache.http.client.entity.UrlEncodedFormEntity;
import org.apache.http.client.methods.HttpDelete;
import org.apache.http.client.methods.HttpEntityEnclosingRequestBase;
@@ -542,8 +544,7 @@ public class HttpSolrClient extends SolrClient {
throws SolrServerException {
method.addHeader("User-Agent", USER_AGENT);
- org.apache.http.client.config.RequestConfig.Builder requestConfigBuilder =
- HttpClientUtil.createDefaultRequestConfigBuilder();
+ RequestConfig.Builder requestConfigBuilder =
HttpClientUtil.createDefaultRequestConfigBuilder();
requestConfigBuilder.setSocketTimeout(soTimeout);
requestConfigBuilder.setConnectTimeout(connectionTimeout);
@@ -679,7 +680,7 @@ public class HttpSolrClient extends SolrClient {
.append("\n\n")
.append("request: ")
.append(method.getURI());
- String reason = java.net.URLDecoder.decode(msg.toString(),
FALLBACK_CHARSET);
+ String reason = URLDecoder.decode(msg.toString(), FALLBACK_CHARSET);
throw new RemoteSolrException(baseUrl, httpStatus, reason, null);
} else {
throw new RemoteSolrException(baseUrl, httpStatus, error);
diff --git
a/solr/test-framework/src/java/org/apache/solr/cloud/ChaosMonkey.java
b/solr/test-framework/src/java/org/apache/solr/cloud/ChaosMonkey.java
index 5d0a6c5e260..b1f56c27438 100644
--- a/solr/test-framework/src/java/org/apache/solr/cloud/ChaosMonkey.java
+++ b/solr/test-framework/src/java/org/apache/solr/cloud/ChaosMonkey.java
@@ -27,6 +27,7 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.SynchronousQueue;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
+import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.curator.test.KillSession;
import org.apache.lucene.tests.util.LuceneTestCase;
@@ -705,7 +706,7 @@ public class ChaosMonkey {
builder.append(slice.getName()).append(": {");
for (Replica replica : slice.getReplicas()) {
log.info("{}", replica);
- java.util.regex.Matcher m = portPattern.matcher(replica.getBaseUrl());
+ Matcher m = portPattern.matcher(replica.getBaseUrl());
m.find();
String jettyPort = m.group(1);
builder.append(
diff --git
a/solr/test-framework/src/java/org/apache/solr/cloud/SolrCloudAuthTestCase.java
b/solr/test-framework/src/java/org/apache/solr/cloud/SolrCloudAuthTestCase.java
index 97b39eec05c..2555bdf3102 100644
---
a/solr/test-framework/src/java/org/apache/solr/cloud/SolrCloudAuthTestCase.java
+++
b/solr/test-framework/src/java/org/apache/solr/cloud/SolrCloudAuthTestCase.java
@@ -47,6 +47,7 @@ import org.apache.solr.common.util.Utils;
import org.apache.solr.core.CoreContainer;
import org.apache.solr.embedded.JettySolrRunner;
import org.apache.solr.security.AuthenticationPlugin;
+import org.apache.solr.security.PKIAuthenticationPlugin;
import org.apache.solr.util.SolrMetricTestUtils;
import org.apache.solr.util.TimeOut;
import org.junit.BeforeClass;
@@ -101,7 +102,7 @@ public class SolrCloudAuthTestCase extends
SolrCloudTestCase {
"handler",
handler,
"plugin_name",
-
org.apache.solr.security.PKIAuthenticationPlugin.class.getSimpleName());
+ PKIAuthenticationPlugin.class.getSimpleName());
assertAuthMetricsMinimumsPrometheus(
handler,
registryName,
diff --git
a/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractCloudBackupRestoreTestCase.java
b/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractCloudBackupRestoreTestCase.java
index 29b00ffd4e4..8acdf9ad983 100644
---
a/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractCloudBackupRestoreTestCase.java
+++
b/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractCloudBackupRestoreTestCase.java
@@ -28,6 +28,7 @@ import java.util.Map;
import java.util.Properties;
import java.util.Random;
import java.util.TreeMap;
+import java.util.UUID;
import org.apache.lucene.tests.util.TestUtil;
import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.client.solrj.apache.CloudLegacySolrClient;
@@ -285,7 +286,7 @@ public abstract class AbstractCloudBackupRestoreTestCase
extends SolrCloudTestCa
List<SolrInputDocument> docs = new ArrayList<>(numDocs);
for (int i = 0; i < numDocs; i++) {
SolrInputDocument doc = new SolrInputDocument();
- doc.addField("id", ((useUUID == true) ?
java.util.UUID.randomUUID().toString() : i));
+ doc.addField("id", ((useUUID == true) ? UUID.randomUUID().toString() :
i));
doc.addField("shard_s", "shard" + (1 + random.nextInt(NUM_SHARDS))); //
for implicit router
docs.add(doc);
}
diff --git
a/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractIncrementalBackupTest.java
b/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractIncrementalBackupTest.java
index 0df483d8b35..5f62d6669f5 100644
---
a/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractIncrementalBackupTest.java
+++
b/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractIncrementalBackupTest.java
@@ -38,6 +38,7 @@ import java.util.Map;
import java.util.Optional;
import java.util.Random;
import java.util.Set;
+import java.util.UUID;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -572,7 +573,7 @@ public abstract class AbstractIncrementalBackupTest extends
SolrCloudTestCase {
List<SolrInputDocument> docs = new ArrayList<>(numDocs);
for (int i = 0; i < numDocs; i++) {
SolrInputDocument doc = new SolrInputDocument();
- doc.addField("id", (useUUID ? java.util.UUID.randomUUID().toString() :
i));
+ doc.addField("id", (useUUID ? UUID.randomUUID().toString() : i));
doc.addField("shard_s", "shard" + (1 + random.nextInt(NUM_SHARDS))); //
for implicit router
docs.add(doc);
}
diff --git
a/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractInstallShardTest.java
b/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractInstallShardTest.java
index d0dce8e9b6d..ac1cc7b2b44 100644
---
a/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractInstallShardTest.java
+++
b/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractInstallShardTest.java
@@ -352,7 +352,7 @@ public abstract class AbstractInstallShardTest extends
SolrCloudTestCase {
List<SolrInputDocument> docs = new ArrayList<>(numDocs);
for (int i = 0; i < numDocs; i++) {
SolrInputDocument doc = new SolrInputDocument();
- doc.addField("id", (useUUID ? java.util.UUID.randomUUID().toString() :
i));
+ doc.addField("id", (useUUID ? UUID.randomUUID().toString() : i));
doc.addField("val_s", "some value");
docs.add(doc);
}
diff --git
a/solr/test-framework/src/java/org/apache/solr/util/ErrorLogMuter.java
b/solr/test-framework/src/java/org/apache/solr/util/ErrorLogMuter.java
index e02fadd460f..8743a2ddc6e 100644
--- a/solr/test-framework/src/java/org/apache/solr/util/ErrorLogMuter.java
+++ b/solr/test-framework/src/java/org/apache/solr/util/ErrorLogMuter.java
@@ -59,6 +59,7 @@ public final class ErrorLogMuter implements Closeable,
AutoCloseable {
// far easier to use FQN for our (one) slf4j Logger then to use a FQN every
time we refer to
// log4j2
// Logger
+ @SuppressWarnings("UnnecessarilyFullyQualified") // disambiguates from
log4j2 Logger
private static final org.slf4j.Logger log =
org.slf4j.LoggerFactory.getLogger(
MethodHandles.lookup().lookupClass()); // nowarn_valid_logger
diff --git a/solr/test-framework/src/java/org/apache/solr/util/LogListener.java
b/solr/test-framework/src/java/org/apache/solr/util/LogListener.java
index 0646d103f0d..5de956d6b43 100644
--- a/solr/test-framework/src/java/org/apache/solr/util/LogListener.java
+++ b/solr/test-framework/src/java/org/apache/solr/util/LogListener.java
@@ -100,6 +100,7 @@ public final class LogListener implements Closeable,
AutoCloseable {
// far easier to use FQN for our (one) slf4j Logger then to use a FQN every
time we refer to
// log4j2
// Logger
+ @SuppressWarnings("UnnecessarilyFullyQualified") // disambiguates from
log4j2 Logger
private static final org.slf4j.Logger log =
org.slf4j.LoggerFactory.getLogger(
MethodHandles.lookup().lookupClass()); // nowarn_valid_logger
diff --git
a/solr/test-framework/src/java/org/apache/solr/util/SolrMetricTestUtils.java
b/solr/test-framework/src/java/org/apache/solr/util/SolrMetricTestUtils.java
index 5b4afc579a2..409aae86c37 100644
--- a/solr/test-framework/src/java/org/apache/solr/util/SolrMetricTestUtils.java
+++ b/solr/test-framework/src/java/org/apache/solr/util/SolrMetricTestUtils.java
@@ -18,6 +18,7 @@ package org.apache.solr.util;
import io.opentelemetry.api.common.AttributeKey;
import io.opentelemetry.api.common.Attributes;
+import io.opentelemetry.api.metrics.LongCounter;
import io.opentelemetry.exporter.prometheus.PrometheusMetricReader;
import io.prometheus.metrics.model.snapshots.CounterSnapshot;
import io.prometheus.metrics.model.snapshots.DataPointSnapshot;
@@ -261,7 +262,7 @@ public final class SolrMetricTestUtils {
public static class TestSolrMetricProducer implements SolrMetricProducer {
SolrMetricsContext solrMetricsContext;
- private final Map<String, io.opentelemetry.api.metrics.LongCounter>
counters = new HashMap<>();
+ private final Map<String, LongCounter> counters = new HashMap<>();
private final String coreName;
private final Map<String, Long> metrics;
@@ -287,7 +288,7 @@ public final class SolrMetricTestUtils {
return solrMetricsContext;
}
- public Map<String, io.opentelemetry.api.metrics.LongCounter> getCounters()
{
+ public Map<String, LongCounter> getCounters() {
return counters;
}
}
diff --git
a/solr/test-framework/src/test/org/apache/solr/client/solrj/apache/BasicHttpSolrClientTest.java
b/solr/test-framework/src/test/org/apache/solr/client/solrj/apache/BasicHttpSolrClientTest.java
index 77b8174c456..6e5320ae7ae 100644
---
a/solr/test-framework/src/test/org/apache/solr/client/solrj/apache/BasicHttpSolrClientTest.java
+++
b/solr/test-framework/src/test/org/apache/solr/client/solrj/apache/BasicHttpSolrClientTest.java
@@ -18,6 +18,7 @@ package org.apache.solr.client.solrj.apache;
import static org.apache.solr.core.CoreContainer.ALLOW_PATHS_SYSPROP;
+import jakarta.servlet.http.Cookie;
import java.io.IOException;
import java.io.InputStream;
import java.lang.invoke.MethodHandles;
@@ -639,7 +640,7 @@ public class BasicHttpSolrClientTest extends SolrTestCaseJ4
{
// Assert cookies from UseContextCallback
assertNotNull(DebugServlet.cookies);
boolean foundCookie = false;
- for (jakarta.servlet.http.Cookie cookie : DebugServlet.cookies) {
+ for (Cookie cookie : DebugServlet.cookies) {
if (cookieName.equals(cookie.getName()) &&
cookieValue.equals(cookie.getValue())) {
foundCookie = true;
break;
diff --git
a/solr/test-framework/src/test/org/apache/solr/client/solrj/apache/HttpClientUtilTest.java
b/solr/test-framework/src/test/org/apache/solr/client/solrj/apache/HttpClientUtilTest.java
index 193ac9e6de1..ce9242d0367 100644
---
a/solr/test-framework/src/test/org/apache/solr/client/solrj/apache/HttpClientUtilTest.java
+++
b/solr/test-framework/src/test/org/apache/solr/client/solrj/apache/HttpClientUtilTest.java
@@ -24,6 +24,7 @@ import java.nio.charset.StandardCharsets;
import java.util.zip.GZIPOutputStream;
import java.util.zip.ZipException;
import javax.net.ssl.HostnameVerifier;
+import org.apache.commons.lang3.reflect.FieldUtils;
import org.apache.http.HttpEntity;
import org.apache.http.conn.socket.ConnectionSocketFactory;
import org.apache.http.conn.ssl.DefaultHostnameVerifier;
@@ -99,8 +100,7 @@ public class HttpClientUtilTest extends SolrTestCase {
@SuppressForbidden(reason = "Uses commons-lang3 FieldUtils.readField to get
hostnameVerifier")
private Object getHostnameVerifier(SSLConnectionSocketFactory
sslSocketFactory) {
try {
- return org.apache.commons.lang3.reflect.FieldUtils.readField(
- sslSocketFactory, "hostnameVerifier", true);
+ return FieldUtils.readField(sslSocketFactory, "hostnameVerifier", true);
} catch (IllegalAccessException e) {
throw new AssertionError("Unexpected access error reading
hostnameVerifier field", e);
}
