Apache Solr open-source search software
SOLR-16427: Evaluate and fix errorprone rules - JdkObsolete
Kevin Risdene82f479056a5
diff --git a/gradle/validation/error-prone.gradle b/gradle/validation/error-prone.gradleindex 55120ab2d0c..dcf170a2b6b 100644--- a/gradle/validation/error-prone.gradle+++ b/gradle/validation/error-prone.gradle@@ -99,7 +99,6 @@ allprojects { prj ->'-Xep:IntLongMath:OFF','-Xep:InvalidBlockTag:OFF', // this is needed for tags like lucene.internal'-Xep:JavaUtilDate:OFF',- '-Xep:JdkObsolete:OFF','-Xep:LogicalAssignment:OFF','-Xep:MissingOverride:OFF','-Xep:MissingSummary:OFF',diff --git a/solr/core/src/java/org/apache/solr/api/V2HttpCall.java b/solr/core/src/java/org/apache/solr/api/V2HttpCall.javaindex 6cc0080bacd..6d0b81dfaaf 100644--- a/solr/core/src/java/org/apache/solr/api/V2HttpCall.java+++ b/solr/core/src/java/org/apache/solr/api/V2HttpCall.java@@ -27,11 +27,11 @@ import io.opentracing.Span;import io.opentracing.tag.Tags;import java.io.IOException;import java.lang.invoke.MethodHandles;+import java.util.ArrayList;import java.util.Collections;import java.util.HashMap;import java.util.HashSet;import java.util.LinkedHashMap;-import java.util.LinkedList;import java.util.List;import java.util.Locale;import java.util.Map;@@ -313,7 +313,7 @@ public class V2HttpCall extends HttpSolrCall {}public static class CompositeApi extends Api {- private LinkedList<Api> apis = new LinkedList<>();+ private final List<Api> apis = new ArrayList<>();public CompositeApi(Api api) {super(ApiBag.EMPTY_SPEC);diff --git a/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java b/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.javaindex 14ee90e3e24..0971655bbd0 100644--- a/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java+++ b/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java@@ -32,7 +32,6 @@ import java.nio.file.Path;import java.util.ArrayList;import java.util.EnumSet;import java.util.LinkedHashMap;-import java.util.LinkedList;import java.util.List;import java.util.Locale;import java.util.Map;@@ -129,7 +128,7 @@ public class JettySolrRunner {private volatile boolean startedBefore = false;- private LinkedList<FilterHolder> extraFilters;+ private List<FilterHolder> extraFilters;private static final String excludePatterns ="/partials/.+,/libs/.+,/css/.+,/js/.+,/img/.+,/templates/.+";@@ -404,7 +403,7 @@ public class JettySolrRunner {debugFilter =root.addFilter(DebugFilter.class, "/*", EnumSet.of(DispatcherType.REQUEST));- extraFilters = new LinkedList<>();+ extraFilters = new ArrayList<>();for (Map.Entry<Class<? extends Filter>, String> entry :config.extraFilters.entrySet()) {extraFilters.add(diff --git a/solr/core/src/java/org/apache/solr/cloud/DistributedClusterStateUpdater.java b/solr/core/src/java/org/apache/solr/cloud/DistributedClusterStateUpdater.javaindex ca745b55ff6..fd349c8eabb 100644--- a/solr/core/src/java/org/apache/solr/cloud/DistributedClusterStateUpdater.java+++ b/solr/core/src/java/org/apache/solr/cloud/DistributedClusterStateUpdater.java@@ -31,9 +31,9 @@ import static org.apache.solr.common.params.CollectionParams.CollectionAction.DEimport static org.apache.solr.common.params.CollectionParams.CollectionAction.MODIFYCOLLECTION;import java.lang.invoke.MethodHandles;+import java.util.ArrayList;import java.util.Collections;import java.util.EnumMap;-import java.util.LinkedList;import java.util.List;import java.util.Optional;import java.util.Set;@@ -684,7 +684,7 @@ public class DistributedClusterStateUpdater {log.error(err);throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, err);}- mutations = new LinkedList<>();+ mutations = new ArrayList<>();this.collectionName = collectionName;this.isCollectionCreation = isCollectionCreation;}@@ -807,7 +807,7 @@ public class DistributedClusterStateUpdater {@Overridepublic void computeUpdates(ClusterState clusterState, SolrZkClient client) {boolean hasJsonUpdates = false;- List<PerReplicaStatesOps> perReplicaStateOps = new LinkedList<>();+ List<PerReplicaStatesOps> perReplicaStateOps = new ArrayList<>();for (Pair<MutatingCommand, ZkNodeProps> mutation : mutations) {MutatingCommand mutatingCommand = mutation.first();ZkNodeProps message = mutation.second();diff --git a/solr/core/src/java/org/apache/solr/cloud/LockTree.java b/solr/core/src/java/org/apache/solr/cloud/LockTree.javaindex bff760b3bf6..e8d96d4f2cd 100644--- a/solr/core/src/java/org/apache/solr/cloud/LockTree.java+++ b/solr/core/src/java/org/apache/solr/cloud/LockTree.java@@ -18,8 +18,8 @@package org.apache.solr.cloud;import java.lang.invoke.MethodHandles;+import java.util.ArrayDeque;import java.util.HashMap;-import java.util.LinkedList;import java.util.List;import java.util.Map;import org.apache.solr.cloud.OverseerMessageHandler.Lock;@@ -54,7 +54,7 @@ public class LockTree {@Overridepublic String toString() {- return StrUtils.join(node.constructPath(new LinkedList<>()), '/');+ return StrUtils.join(node.constructPath(new ArrayDeque<>()), '/');}}@@ -175,7 +175,7 @@ public class LockTree {}}- LinkedList<String> constructPath(LinkedList<String> collect) {+ ArrayDeque<String> constructPath(ArrayDeque<String> collect) {if (name != null) collect.addFirst(name);if (mom != null) mom.constructPath(collect);return collect;diff --git a/solr/core/src/java/org/apache/solr/cloud/Overseer.java b/solr/core/src/java/org/apache/solr/cloud/Overseer.javaindex 2d4d0d7cf7a..53b9f9cbfde 100644--- a/solr/core/src/java/org/apache/solr/cloud/Overseer.java+++ b/solr/core/src/java/org/apache/solr/cloud/Overseer.java@@ -22,10 +22,10 @@ import com.codahale.metrics.Timer;import java.io.Closeable;import java.io.IOException;import java.lang.invoke.MethodHandles;+import java.util.ArrayDeque;import java.util.Collection;import java.util.Collections;import java.util.HashSet;-import java.util.LinkedList;import java.util.List;import java.util.Map;import java.util.Optional;@@ -314,11 +314,11 @@ public class Overseer implements SolrCloseable {}}- LinkedList<Pair<String, byte[]>> queue = null;+ ArrayDeque<Pair<String, byte[]>> queue = null;try {// We do not need to filter any nodes here cause all processed nodes are removed once we// flush clusterstate- queue = new LinkedList<>(stateUpdateQueue.peekElements(1000, 3000L, (x) -> true));+ queue = new ArrayDeque<>(stateUpdateQueue.peekElements(1000, 3000L, (x) -> true));} catch (KeeperException.SessionExpiredException e) {log.warn("Solr cannot talk to ZK, exiting Overseer main queue loop", e);return;@@ -368,7 +368,7 @@ public class Overseer implements SolrCloseable {if (isClosed) break;// if an event comes in the next 100ms batch it togetherqueue =- new LinkedList<>(+ new ArrayDeque<>(stateUpdateQueue.peekElements(1000, 100, node -> !processedNodes.contains(node)));}diff --git a/solr/core/src/java/org/apache/solr/cloud/Stats.java b/solr/core/src/java/org/apache/solr/cloud/Stats.javaindex 7bfc282db7e..f1fbe1abb97 100644--- a/solr/core/src/java/org/apache/solr/cloud/Stats.java+++ b/solr/core/src/java/org/apache/solr/cloud/Stats.java@@ -17,8 +17,8 @@package org.apache.solr.cloud;import com.codahale.metrics.Timer;+import java.util.ArrayDeque;import java.util.ArrayList;-import java.util.LinkedList;import java.util.List;import java.util.Locale;import java.util.Map;@@ -89,7 +89,7 @@ public class Stats {stat = new Stat();stats.put(op, stat);}- LinkedList<FailedOp> failedOps = stat.failureDetails;+ ArrayDeque<FailedOp> failedOps = stat.failureDetails;synchronized (failedOps) {if (failedOps.size() >= MAX_STORED_FAILURES) {failedOps.removeFirst();@@ -101,7 +101,7 @@ public class Stats {public List<FailedOp> getFailureDetails(String operation) {Stat stat = stats.get(operation.toLowerCase(Locale.ROOT));if (stat == null || stat.failureDetails.isEmpty()) return null;- LinkedList<FailedOp> failedOps = stat.failureDetails;+ ArrayDeque<FailedOp> failedOps = stat.failureDetails;synchronized (failedOps) {ArrayList<FailedOp> ret = new ArrayList<>(failedOps);return ret;@@ -124,13 +124,13 @@ public class Stats {public final AtomicInteger success;public final AtomicInteger errors;public final Timer requestTime;- public final LinkedList<FailedOp> failureDetails;+ public final ArrayDeque<FailedOp> failureDetails;public Stat() {this.success = new AtomicInteger();this.errors = new AtomicInteger();this.requestTime = new Timer();- this.failureDetails = new LinkedList<>();+ this.failureDetails = new ArrayDeque<>();}}diff --git a/solr/core/src/java/org/apache/solr/core/ConfigOverlay.java b/solr/core/src/java/org/apache/solr/core/ConfigOverlay.javaindex 3f2261d2542..acfa64941e1 100644--- a/solr/core/src/java/org/apache/solr/core/ConfigOverlay.java+++ b/solr/core/src/java/org/apache/solr/core/ConfigOverlay.java@@ -21,7 +21,6 @@ import static org.apache.solr.common.util.Utils.toJSONString;import java.util.ArrayList;import java.util.Collections;import java.util.LinkedHashMap;-import java.util.LinkedList;import java.util.List;import java.util.Map;import org.apache.solr.common.MapSerializable;@@ -110,7 +109,7 @@ public class ConfigOverlay implements MapSerializable {public static final String NOT_EDITABLE = "''{0}'' is not an editable property";private List<String> checkEditable(String propName, boolean isXPath, boolean failOnError) {- LinkedList<String> hierarchy = new LinkedList<>();+ List<String> hierarchy = new ArrayList<>();if (!isEditableProp(propName, isXPath, hierarchy)) {if (failOnError)throw new SolrException(diff --git a/solr/core/src/java/org/apache/solr/core/SolrCore.java b/solr/core/src/java/org/apache/solr/core/SolrCore.javaindex ed2cdd55ab5..b8894648262 100644--- a/solr/core/src/java/org/apache/solr/core/SolrCore.java+++ b/solr/core/src/java/org/apache/solr/core/SolrCore.java@@ -37,6 +37,7 @@ import java.nio.charset.StandardCharsets;import java.nio.file.NoSuchFileException;import java.nio.file.Path;import java.nio.file.Paths;+import java.util.ArrayDeque;import java.util.ArrayList;import java.util.Arrays;import java.util.Collection;@@ -46,7 +47,6 @@ import java.util.HashMap;import java.util.HashSet;import java.util.Iterator;import java.util.LinkedHashMap;-import java.util.LinkedList;import java.util.List;import java.util.Map;import java.util.Objects;@@ -2044,8 +2044,8 @@ public class SolrCore implements SolrInfoBean, Closeable {// All of the normal open searchers. Don't access this directly.// protected by synchronizing on searcherLock.- private final LinkedList<RefCounted<SolrIndexSearcher>> _searchers = new LinkedList<>();- private final LinkedList<RefCounted<SolrIndexSearcher>> _realtimeSearchers = new LinkedList<>();+ private final ArrayDeque<RefCounted<SolrIndexSearcher>> _searchers = new ArrayDeque<>();+ private final ArrayDeque<RefCounted<SolrIndexSearcher>> _realtimeSearchers = new ArrayDeque<>();final ExecutorService searcherExecutor =ExecutorUtil.newMDCAwareSingleThreadExecutor(new SolrNamedThreadFactory("searcherExecutor"));@@ -2402,7 +2402,8 @@ public class SolrCore implements SolrInfoBean, Closeable {}}- List<RefCounted<SolrIndexSearcher>> searcherList = realtime ? _realtimeSearchers : _searchers;+ ArrayDeque<RefCounted<SolrIndexSearcher>> searcherList =+ realtime ? _realtimeSearchers : _searchers;RefCounted<SolrIndexSearcher> newSearcher = newHolder(tmp, searcherList); // refcount now at 1// Increment reference again for "realtimeSearcher" variable. It should be at 2 after.@@ -2733,7 +2734,7 @@ public class SolrCore implements SolrInfoBean, Closeable {}private RefCounted<SolrIndexSearcher> newHolder(- SolrIndexSearcher newSearcher, final List<RefCounted<SolrIndexSearcher>> searcherList) {+ SolrIndexSearcher newSearcher, final ArrayDeque<RefCounted<SolrIndexSearcher>> searcherList) {RefCounted<SolrIndexSearcher> holder =new RefCounted<SolrIndexSearcher>(newSearcher) {@Overridediff --git a/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.javaindex 868ce764377..d2b3eac9a2f 100644--- a/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java+++ b/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java@@ -30,7 +30,6 @@ import java.util.Arrays;import java.util.Base64;import java.util.Date;import java.util.HashMap;-import java.util.LinkedList;import java.util.List;import java.util.Map;import java.util.Set;@@ -811,7 +810,7 @@ public class LukeRequestHandler extends RequestHandlerBase {/** This is a destructive call... the queue is empty at the end */public NamedList<Integer> toNamedList(IndexSchema schema) {// reverse the list..- List<TermInfo> aslist = new LinkedList<>();+ List<TermInfo> aslist = new ArrayList<>();while (size() > 0) {aslist.add(0, pop());}diff --git a/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.javaindex 0c4eec5e971..927cfe593d0 100644--- a/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java+++ b/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java@@ -28,9 +28,9 @@ import java.lang.management.RuntimeMXBean;import java.net.InetAddress;import java.text.DecimalFormat;import java.text.DecimalFormatSymbols;+import java.util.ArrayList;import java.util.Collection;import java.util.Date;-import java.util.LinkedList;import java.util.List;import java.util.Locale;import java.util.Set;@@ -402,7 +402,7 @@ public class SystemInfoHandler extends RequestHandlerBase {}private static List<String> getInputArgumentsRedacted(RuntimeMXBean mx) {- List<String> list = new LinkedList<>();+ List<String> list = new ArrayList<>();for (String arg : mx.getInputArguments()) {if (arg.startsWith("-D")&& arg.contains("=")diff --git a/solr/core/src/java/org/apache/solr/handler/component/PhrasesIdentificationComponent.java b/solr/core/src/java/org/apache/solr/handler/component/PhrasesIdentificationComponent.javaindex 72779b35c36..8f3cdb81f6b 100644--- a/solr/core/src/java/org/apache/solr/handler/component/PhrasesIdentificationComponent.java+++ b/solr/core/src/java/org/apache/solr/handler/component/PhrasesIdentificationComponent.java@@ -491,7 +491,7 @@ public class PhrasesIdentificationComponent extends SearchComponent {* @return the original user input, decorated to indicate the identified phrases*/public String summarize(final List<Phrase> results) {- final StringBuffer out = new StringBuffer(rawInput);+ final StringBuilder out = new StringBuilder(rawInput);// sort by *reverse* position so we can go back to frontfinal List<Phrase> reversed =diff --git a/solr/core/src/java/org/apache/solr/handler/component/PivotFacetField.java b/solr/core/src/java/org/apache/solr/handler/component/PivotFacetField.javaindex a5ab17281c4..abf944fc197 100644--- a/solr/core/src/java/org/apache/solr/handler/component/PivotFacetField.java+++ b/solr/core/src/java/org/apache/solr/handler/component/PivotFacetField.java@@ -18,7 +18,6 @@ package org.apache.solr.handler.component;import java.util.ArrayList;import java.util.HashMap;-import java.util.LinkedList;import java.util.List;import java.util.Locale;import java.util.Map;@@ -182,7 +181,7 @@ public class PivotFacetField {List<NamedList<Object>> convertedPivotList = null;if (valueCollection.size() > 0) {- convertedPivotList = new LinkedList<>();+ convertedPivotList = new ArrayList<>();for (PivotFacetValue pivot : valueCollection)convertedPivotList.add(pivot.convertToNamedList());}diff --git a/solr/core/src/java/org/apache/solr/handler/component/PivotFacetProcessor.java b/solr/core/src/java/org/apache/solr/handler/component/PivotFacetProcessor.javaindex e42694c5397..83c54db956d 100644--- a/solr/core/src/java/org/apache/solr/handler/component/PivotFacetProcessor.java+++ b/solr/core/src/java/org/apache/solr/handler/component/PivotFacetProcessor.java@@ -190,6 +190,7 @@ public class PivotFacetProcessor extends SimpleFacets {* @param facetQueries the list of facet queries hung under this pivot* @param facetRanges the list of facet ranges hung under this pivot*/+ @SuppressWarnings("JdkObsolete")private SimpleOrderedMap<List<NamedList<Object>>> processSingle(List<String> pivotFields,String refinements,diff --git a/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java b/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.javaindex 015c19dba60..d670ed954ad 100644--- a/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java+++ b/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java@@ -28,7 +28,6 @@ import java.lang.invoke.MethodHandles;import java.util.ArrayList;import java.util.Collections;import java.util.HashSet;-import java.util.LinkedList;import java.util.List;import java.util.Map;import java.util.Set;@@ -462,7 +461,7 @@ public class SearchHandler extends RequestHandlerBase// a distributed requestif (rb.outgoing == null) {- rb.outgoing = new LinkedList<>();+ rb.outgoing = new ArrayList<>();}rb.finished = new ArrayList<>();diff --git a/solr/core/src/java/org/apache/solr/handler/component/SuggestComponent.java b/solr/core/src/java/org/apache/solr/handler/component/SuggestComponent.javaindex 608d15bdc17..49bee061259 100644--- a/solr/core/src/java/org/apache/solr/handler/component/SuggestComponent.java+++ b/solr/core/src/java/org/apache/solr/handler/component/SuggestComponent.java@@ -25,7 +25,6 @@ import java.util.Collection;import java.util.Collections;import java.util.HashSet;import java.util.Iterator;-import java.util.LinkedList;import java.util.List;import java.util.Map;import java.util.Set;@@ -350,7 +349,7 @@ public class SuggestComponent extends SearchComponentresultQueue.insertWithOverflow(res);}}- List<LookupResult> sortedSuggests = new LinkedList<>();+ List<LookupResult> sortedSuggests = new ArrayList<>();Collections.addAll(sortedSuggests, resultQueue.getResults());result.add(suggesterName, token, sortedSuggests);}diff --git a/solr/core/src/java/org/apache/solr/handler/designer/DefaultSampleDocumentsLoader.java b/solr/core/src/java/org/apache/solr/handler/designer/DefaultSampleDocumentsLoader.javaindex 0aaf8664d40..17909b5771f 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,7 +31,6 @@ import java.nio.charset.StandardCharsets;import java.util.ArrayList;import java.util.Arrays;import java.util.Collections;-import java.util.LinkedList;import java.util.List;import java.util.Map;import java.util.stream.Collectors;@@ -165,7 +164,7 @@ public class DefaultSampleDocumentsLoader implements SampleDocumentsLoader {protected List<SolrInputDocument> loadJsonLines(SolrParams params, ContentStreamBase.ByteArrayStream stream, final int maxDocsToLoad)throws IOException {- List<Map<String, Object>> docs = new LinkedList<>();+ List<Map<String, Object>> docs = new ArrayList<>();try (Reader r = stream.getReader()) {BufferedReader br = new BufferedReader(r);String line;@@ -277,7 +276,7 @@ public class DefaultSampleDocumentsLoader implements SampleDocumentsLoader {protected List<SolrInputDocument> parseXmlDocs(XMLStreamReader parser, final int maxDocsToLoad)throws XMLStreamException {- List<SolrInputDocument> docs = new LinkedList<>();+ List<SolrInputDocument> docs = new ArrayList<>();XMLLoader loader = new XMLLoader().init(null);while (true) {final int event;@@ -358,7 +357,7 @@ public class DefaultSampleDocumentsLoader implements SampleDocumentsLoader {}private static class SampleCSVLoader extends CSVLoaderBase {- List<SolrInputDocument> docs = new LinkedList<>();+ List<SolrInputDocument> docs = new ArrayList<>();CSVRequest req;int maxDocsToLoad;String multiValueDelimiter;diff --git a/solr/core/src/java/org/apache/solr/handler/designer/DefaultSchemaSuggester.java b/solr/core/src/java/org/apache/solr/handler/designer/DefaultSchemaSuggester.javaindex d7c720a47da..d6deeb5f901 100644--- a/solr/core/src/java/org/apache/solr/handler/designer/DefaultSchemaSuggester.java+++ b/solr/core/src/java/org/apache/solr/handler/designer/DefaultSchemaSuggester.java@@ -30,11 +30,10 @@ import java.time.ZoneOffset;import java.time.format.DateTimeFormatter;import java.time.format.DateTimeFormatterBuilder;import java.time.format.ResolverStyle;+import java.util.ArrayList;import java.util.Arrays;import java.util.Collection;import java.util.HashMap;-import java.util.HashSet;-import java.util.LinkedList;import java.util.List;import java.util.Locale;import java.util.Map;@@ -83,9 +82,9 @@ public class DefaultSchemaSuggester implements SchemaSuggester {"Failed to parse all sample values as %s for changing type for field %s to %s";// boolean parsing- private final Set<String> trueValues = new HashSet<>(Arrays.asList("true"));- private final Set<String> falseValues = new HashSet<>(Arrays.asList("false"));- private final List<DateTimeFormatter> dateTimeFormatters = new LinkedList<>();+ private final Set<String> trueValues = Set.of("true");+ private final Set<String> falseValues = Set.of("false");+ private final List<DateTimeFormatter> dateTimeFormatters = new ArrayList<>();private boolean caseSensitive = false;@Override@@ -208,8 +207,7 @@ public class DefaultSchemaSuggester implements SchemaSuggester {f -> {// skip the version field on incoming docsif (!VERSION_FIELD.equals(f)) {- List<Object> values =- mapByField.computeIfAbsent(f, k -> new LinkedList<>());+ List<Object> values = mapByField.computeIfAbsent(f, k -> new ArrayList<>());Collection<Object> fieldValues = doc.getFieldValues(f);if (fieldValues != null && !fieldValues.isEmpty()) {if (fieldValues.size() == 1) {diff --git a/solr/core/src/java/org/apache/solr/handler/designer/SampleDocuments.java b/solr/core/src/java/org/apache/solr/handler/designer/SampleDocuments.javaindex faa3348ba9d..e1794913beb 100644--- a/solr/core/src/java/org/apache/solr/handler/designer/SampleDocuments.java+++ b/solr/core/src/java/org/apache/solr/handler/designer/SampleDocuments.java@@ -19,7 +19,7 @@ package org.apache.solr.handler.designer;import static org.apache.solr.common.params.CommonParams.JSON_MIME;-import java.util.LinkedList;+import java.util.ArrayList;import java.util.List;import java.util.Objects;import java.util.Set;@@ -33,7 +33,7 @@ public class SampleDocuments {public List<SolrInputDocument> parsed;public SampleDocuments(List<SolrInputDocument> parsed, String contentType, String fileSource) {- this.parsed = parsed != null ? parsed : new LinkedList<>(); // needs to be mutable+ this.parsed = parsed != null ? parsed : new ArrayList<>(); // needs to be mutablethis.contentType = contentType;this.fileSource = fileSource;}diff --git a/solr/core/src/java/org/apache/solr/handler/designer/SchemaDesignerAPI.java b/solr/core/src/java/org/apache/solr/handler/designer/SchemaDesignerAPI.javaindex 1f228459edb..41413bcd95a 100644--- a/solr/core/src/java/org/apache/solr/handler/designer/SchemaDesignerAPI.java+++ b/solr/core/src/java/org/apache/solr/handler/designer/SchemaDesignerAPI.java@@ -41,7 +41,6 @@ import java.util.HashMap;import java.util.HashSet;import java.util.Iterator;import java.util.LinkedHashMap;-import java.util.LinkedList;import java.util.List;import java.util.Locale;import java.util.Map;@@ -874,7 +873,7 @@ public class SchemaDesignerAPI implements SchemaDesignerConstants {protected ManagedIndexSchema analyzeInputDocs(final Map<String, List<Object>> docs, ManagedIndexSchema schema, List<String> langs) {// collect the fields to add ... adding all fields at once is faster than one-at-a-time- List<SchemaField> fieldsToAdd = new LinkedList<>();+ List<SchemaField> fieldsToAdd = new ArrayList<>();for (String field : docs.keySet()) {List<Object> sampleValues = docs.getOrDefault(field, Collections.emptyList());diff --git a/solr/core/src/java/org/apache/solr/handler/designer/SchemaDesignerConfigSetHelper.java b/solr/core/src/java/org/apache/solr/handler/designer/SchemaDesignerConfigSetHelper.javaindex 879ed52c0d2..35fdae660f1 100644--- a/solr/core/src/java/org/apache/solr/handler/designer/SchemaDesignerConfigSetHelper.java+++ b/solr/core/src/java/org/apache/solr/handler/designer/SchemaDesignerConfigSetHelper.java@@ -46,7 +46,6 @@ import java.util.Collection;import java.util.Collections;import java.util.HashMap;import java.util.HashSet;-import java.util.LinkedList;import java.util.List;import java.util.Map;import java.util.Objects;@@ -169,7 +168,7 @@ class SchemaDesignerConfigSetHelper implements SchemaDesignerConstants {}List<String> listCollectionsForConfig(String configSet) {- final List<String> collections = new LinkedList<>();+ final List<String> collections = new ArrayList<>();Map<String, ClusterState.CollectionRef> states =zkStateReader().getClusterState().getCollectionStates();for (Map.Entry<String, ClusterState.CollectionRef> e : states.entrySet()) {@@ -670,7 +669,7 @@ class SchemaDesignerConfigSetHelper implements SchemaDesignerConstants {}ManagedIndexSchema deleteNestedDocsFieldsIfNeeded(ManagedIndexSchema schema, boolean persist) {- List<String> toDelete = new LinkedList<>();+ List<String> toDelete = new ArrayList<>();if (schema.hasExplicitField(ROOT_FIELD_NAME)) {toDelete.add(ROOT_FIELD_NAME);}diff --git a/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java b/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.javaindex 57172d53823..8edb9b13006 100644--- a/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java+++ b/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java@@ -948,8 +948,11 @@ public class DefaultSolrHighlighter extends SolrHighlighter implements PluginInf*/static final class TokenOrderingFilter extends TokenFilter {private final int windowSize;++ @SuppressWarnings("JdkObsolete")private final LinkedList<OrderedToken> queue =new LinkedList<>(); // TODO replace with Deque, Array impl+private boolean done = false;private final OffsetAttribute offsetAtt = addAttribute(OffsetAttribute.class);diff --git a/solr/core/src/java/org/apache/solr/internal/csv/CharBuffer.java b/solr/core/src/java/org/apache/solr/internal/csv/CharBuffer.javaindex 1b1a6e8f3f4..fac708a7f52 100644--- a/solr/core/src/java/org/apache/solr/internal/csv/CharBuffer.java+++ b/solr/core/src/java/org/apache/solr/internal/csv/CharBuffer.java@@ -99,6 +99,8 @@ public class CharBuffer {** @param sb the StringBuffer to append or null*/+ @Deprecated+ @SuppressWarnings("JdkObsolete")public void append(final StringBuffer sb) {if (sb == null) {return;@@ -108,6 +110,21 @@ public class CharBuffer {length += sb.length();}+ /**+ * Appends <code>sb</code> to the end of this CharBuffer. This method involves copying the new+ * data once!+ *+ * @param sb the StringBuffer to append or null+ */+ public void append(final StringBuilder sb) {+ if (sb == null) {+ return;+ }+ provideCapacity(length + sb.length());+ sb.getChars(0, sb.length(), c, length);+ length += sb.length();+ }+/*** Appends <code>data</code> to the end of this CharBuffer. This method involves copying the new* data once!diff --git a/solr/core/src/java/org/apache/solr/legacy/LegacyNumericRangeQuery.java b/solr/core/src/java/org/apache/solr/legacy/LegacyNumericRangeQuery.javaindex 130a6d4e1ee..063b474eb7c 100644--- a/solr/core/src/java/org/apache/solr/legacy/LegacyNumericRangeQuery.java+++ b/solr/core/src/java/org/apache/solr/legacy/LegacyNumericRangeQuery.java@@ -17,7 +17,7 @@package org.apache.solr.legacy;import java.io.IOException;-import java.util.LinkedList;+import java.util.ArrayDeque;import java.util.Objects;import org.apache.lucene.document.DoublePoint;import org.apache.lucene.document.FloatPoint;@@ -472,7 +472,7 @@ public final class LegacyNumericRangeQuery<T extends Number> extends MultiTermQuprivate BytesRef currentLowerBound, currentUpperBound;- private final LinkedList<BytesRef> rangeBounds = new LinkedList<>();+ private final ArrayDeque<BytesRef> rangeBounds = new ArrayDeque<>();NumericRangeTermsEnum(final TermsEnum tenum) {super(tenum);diff --git a/solr/core/src/java/org/apache/solr/parser/SolrQueryParserBase.java b/solr/core/src/java/org/apache/solr/parser/SolrQueryParserBase.javaindex 96bf3d51064..e8b8478fa8d 100644--- a/solr/core/src/java/org/apache/solr/parser/SolrQueryParserBase.java+++ b/solr/core/src/java/org/apache/solr/parser/SolrQueryParserBase.java@@ -25,7 +25,6 @@ import java.util.Collections;import java.util.EnumSet;import java.util.HashMap;import java.util.Iterator;-import java.util.LinkedList;import java.util.List;import java.util.Map;import java.util.stream.Collectors;@@ -608,7 +607,7 @@ public abstract class SolrQueryParserBase extends QueryBuilder {switch (synonymQueryStyle) {case PICK_BEST:{- List<Query> sidePathSynonymQueries = new LinkedList<>();+ List<Query> sidePathSynonymQueries = new ArrayList<>();sidePathQueriesIterator.forEachRemaining(sidePathSynonymQueries::add);return new DisjunctionMaxQuery(sidePathSynonymQueries, 0.0f);}diff --git a/solr/core/src/java/org/apache/solr/request/PerSegmentSingleValuedFaceting.java b/solr/core/src/java/org/apache/solr/request/PerSegmentSingleValuedFaceting.javaindex ab602124137..e6abb3cba7c 100644--- a/solr/core/src/java/org/apache/solr/request/PerSegmentSingleValuedFaceting.java+++ b/solr/core/src/java/org/apache/solr/request/PerSegmentSingleValuedFaceting.java@@ -17,7 +17,8 @@package org.apache.solr.request;import java.io.IOException;-import java.util.LinkedList;+import java.util.ArrayDeque;+import java.util.Deque;import java.util.List;import java.util.concurrent.Callable;import java.util.concurrent.CompletionService;@@ -122,7 +123,7 @@ class PerSegmentSingleValuedFaceting {// The list of pending tasks that aren't immediately submitted// TODO: Is there a completion service, or a delegating executor that can// limit the number of concurrent tasks submitted to a bigger executor?- LinkedList<Callable<SegFacet>> pending = new LinkedList<>();+ Deque<Callable<SegFacet>> pending = new ArrayDeque<>();int threads = nThreads <= 0 ? Integer.MAX_VALUE : nThreads;diff --git a/solr/core/src/java/org/apache/solr/request/SolrRequestInfo.java b/solr/core/src/java/org/apache/solr/request/SolrRequestInfo.javaindex e218f99d552..c4ba7dcfe7f 100644--- a/solr/core/src/java/org/apache/solr/request/SolrRequestInfo.java+++ b/solr/core/src/java/org/apache/solr/request/SolrRequestInfo.java@@ -19,9 +19,10 @@ package org.apache.solr.request;import java.io.Closeable;import java.lang.invoke.MethodHandles;import java.security.Principal;+import java.util.ArrayDeque;+import java.util.ArrayList;import java.util.Date;import java.util.Deque;-import java.util.LinkedList;import java.util.List;import java.util.TimeZone;import java.util.concurrent.atomic.AtomicReference;@@ -42,7 +43,7 @@ public class SolrRequestInfo {private static final int MAX_STACK_SIZE = 10;private static final ThreadLocal<Deque<SolrRequestInfo>> threadLocal =- ThreadLocal.withInitial(LinkedList::new);+ ThreadLocal.withInitial(ArrayDeque::new);private int refCount = 1; // prevent closing when still used@@ -204,7 +205,7 @@ public class SolrRequestInfo {throw new IllegalStateException("Already closed!");}if (closeHooks == null) {- closeHooks = new LinkedList<>();+ closeHooks = new ArrayList<>();}closeHooks.add(hook);}diff --git a/solr/core/src/java/org/apache/solr/schema/JsonPreAnalyzedParser.java b/solr/core/src/java/org/apache/solr/schema/JsonPreAnalyzedParser.javaindex 49c2d6ce5ed..1a9e9328625 100644--- a/solr/core/src/java/org/apache/solr/schema/JsonPreAnalyzedParser.java+++ b/solr/core/src/java/org/apache/solr/schema/JsonPreAnalyzedParser.java@@ -21,10 +21,10 @@ import java.io.Reader;import java.lang.invoke.MethodHandles;import java.nio.ByteBuffer;import java.nio.charset.StandardCharsets;+import java.util.ArrayList;import java.util.Base64;import java.util.Iterator;import java.util.LinkedHashMap;-import java.util.LinkedList;import java.util.List;import java.util.Map;import java.util.Map.Entry;@@ -228,7 +228,7 @@ public class JsonPreAnalyzedParser implements PreAnalyzedParser {}TokenStream ts = f.tokenStreamValue();if (ts != null) {- List<Map<String, Object>> tokens = new LinkedList<>();+ List<Map<String, Object>> tokens = new ArrayList<>();while (ts.incrementToken()) {Iterator<Class<? extends Attribute>> it = ts.getAttributeClassesIterator();String cTerm = null;diff --git a/solr/core/src/java/org/apache/solr/schema/PreAnalyzedField.java b/solr/core/src/java/org/apache/solr/schema/PreAnalyzedField.javaindex 9f4682cbbbf..9d1779f887f 100644--- a/solr/core/src/java/org/apache/solr/schema/PreAnalyzedField.java+++ b/solr/core/src/java/org/apache/solr/schema/PreAnalyzedField.java@@ -23,8 +23,8 @@ import java.io.Reader;import java.io.StringReader;import java.lang.invoke.MethodHandles;import java.lang.reflect.Constructor;+import java.util.ArrayList;import java.util.Iterator;-import java.util.LinkedList;import java.util.List;import java.util.Map;import org.apache.lucene.analysis.Analyzer;@@ -198,7 +198,7 @@ public class PreAnalyzedField extends TextField implements HasImplicitIndexAnalypublic static class ParseResult {public String str;public byte[] bin;- public List<State> states = new LinkedList<>();+ public List<State> states = new ArrayList<>();}/** Parse the input and return the stored part and the tokens with attributes. */@@ -273,7 +273,7 @@ public class PreAnalyzedField extends TextField implements HasImplicitIndexAnaly/** Token stream that works from a list of saved states. */private static class PreAnalyzedTokenizer extends Tokenizer {- private final List<AttributeSource.State> cachedStates = new LinkedList<>();+ private final List<AttributeSource.State> cachedStates = new ArrayList<>();private Iterator<AttributeSource.State> it = null;private String stringValue = null;private byte[] binaryValue = null;diff --git a/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParser.java b/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParser.javaindex 5e3ba654b25..4dac76caeda 100644--- a/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParser.java+++ b/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParser.java@@ -25,7 +25,6 @@ import java.util.HashMap;import java.util.HashSet;import java.util.Iterator;import java.util.LinkedHashMap;-import java.util.LinkedList;import java.util.List;import java.util.Map;import java.util.Set;@@ -544,7 +543,7 @@ public class ExtendedDismaxQParser extends QParser {/** Parses all function queries */protected List<Query> getBoostFunctions() throws SyntaxError {- List<Query> boostFunctions = new LinkedList<>();+ List<Query> boostFunctions = new ArrayList<>();if (config.hasBoostFunctions()) {for (String boostFunc : config.boostFuncs) {if (null == boostFunc || "".equals(boostFunc)) continue;@@ -564,7 +563,7 @@ public class ExtendedDismaxQParser extends QParser {/** Parses all boost queries */protected List<Query> getBoostQueries() throws SyntaxError {- List<Query> boostQueries = new LinkedList<>();+ List<Query> boostQueries = new ArrayList<>();if (config.hasBoostParams()) {for (String qs : config.boostParams) {if (qs.trim().length() == 0) continue;diff --git a/solr/core/src/java/org/apache/solr/search/SolrDocumentFetcher.java b/solr/core/src/java/org/apache/solr/search/SolrDocumentFetcher.javaindex eab3a837315..6eedcb06160 100644--- a/solr/core/src/java/org/apache/solr/search/SolrDocumentFetcher.java+++ b/solr/core/src/java/org/apache/solr/search/SolrDocumentFetcher.java@@ -27,7 +27,6 @@ import java.util.Collection;import java.util.Collections;import java.util.Date;import java.util.HashSet;-import java.util.LinkedList;import java.util.List;import java.util.Objects;import java.util.Set;@@ -635,7 +634,7 @@ public class SolrDocumentFetcher {case SORTED_SET:final SortedSetDocValues values = leafReader.getSortedSetDocValues(fieldName);if (values != null && values.getValueCount() > 0 && values.advance(localId) == localId) {- final List<Object> outValues = new LinkedList<>();+ final List<Object> outValues = new ArrayList<>();for (long ord = values.nextOrd();ord != SortedSetDocValues.NO_MORE_ORDS;ord = values.nextOrd()) {diff --git a/solr/core/src/java/org/apache/solr/security/AuditEvent.java b/solr/core/src/java/org/apache/solr/security/AuditEvent.javaindex 48905460358..aa4b847807a 100644--- a/solr/core/src/java/org/apache/solr/security/AuditEvent.java+++ b/solr/core/src/java/org/apache/solr/security/AuditEvent.java@@ -401,6 +401,7 @@ public class AuditEvent {*/@Deprecated@JsonIgnore+ @SuppressWarnings("JdkObsolete")public StringBuffer getRequestUrl() {return new StringBuffer(baseUrl);}diff --git a/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java b/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.javaindex b9b1dc6d66c..74d29a84969 100644--- a/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java+++ b/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java@@ -37,7 +37,6 @@ import java.util.Arrays;import java.util.Collection;import java.util.HashMap;import java.util.Iterator;-import java.util.LinkedList;import java.util.List;import java.util.Map;import javax.servlet.MultipartConfigElement;@@ -356,7 +355,7 @@ public class SolrRequestParsers {boolean supportCharsetParam)throws IOException {CharsetDecoder charsetDecoder = supportCharsetParam ? null : getCharsetDecoder(charset);- final LinkedList<Object> buffer = supportCharsetParam ? new LinkedList<>() : null;+ final List<Object> buffer = supportCharsetParam ? new ArrayList<>() : null;long len = 0L, keyPos = 0L, valuePos = 0L;final ByteArrayOutputStream keyStream = new ByteArrayOutputStream(),valueStream = new ByteArrayOutputStream();@@ -476,9 +475,7 @@ public class SolrRequestParsers {}private static void decodeBuffer(- final LinkedList<Object> input,- final Map<String, String[]> map,- CharsetDecoder charsetDecoder) {+ final List<Object> input, final Map<String, String[]> map, CharsetDecoder charsetDecoder) {for (final Iterator<Object> it = input.iterator(); it.hasNext(); ) {final byte[] keyBytes = (byte[]) it.next();it.remove();diff --git a/solr/core/src/java/org/apache/solr/spelling/suggest/jaspell/JaspellTernarySearchTrie.java b/solr/core/src/java/org/apache/solr/spelling/suggest/jaspell/JaspellTernarySearchTrie.javaindex 7e2ee78524c..ef8f9322a71 100644--- a/solr/core/src/java/org/apache/solr/spelling/suggest/jaspell/JaspellTernarySearchTrie.java+++ b/solr/core/src/java/org/apache/solr/spelling/suggest/jaspell/JaspellTernarySearchTrie.java@@ -33,9 +33,9 @@ import java.io.IOException;import java.nio.charset.StandardCharsets;import java.nio.file.Files;import java.nio.file.Path;+import java.util.ArrayList;import java.util.List;import java.util.Locale;-import java.util.Vector;import java.util.zip.GZIPInputStream;import org.apache.lucene.util.Accountable;import org.apache.lucene.util.IOUtils;@@ -540,7 +540,7 @@ public class JaspellTernarySearchTrie implements Accountable {matchAlmostDiff,key,((numReturnValues < 0) ? -1 : numReturnValues),- new Vector<String>(),+ new ArrayList<>(),false);}@@ -636,13 +636,13 @@ public class JaspellTernarySearchTrie implements Accountable {* @return A <code>List</code> with the results*/public List<String> matchPrefix(CharSequence prefix, int numReturnValues) {- Vector<String> sortKeysResult = new Vector<>();+ List<String> sortKeysResult = new ArrayList<>();TSTNode startNode = getNode(prefix);if (startNode == null) {return sortKeysResult;}if (startNode.data != null) {- sortKeysResult.addElement(getKey(startNode));+ sortKeysResult.add(getKey(startNode));}return sortKeysRecursion(startNode.relatives[TSTNode.EQKID],@@ -783,7 +783,7 @@ public class JaspellTernarySearchTrie implements Accountable {*/protected List<String> sortKeys(TSTNode startNode, int numReturnValues) {return sortKeysRecursion(- startNode, ((numReturnValues < 0) ? -1 : numReturnValues), new Vector<String>());+ startNode, ((numReturnValues < 0) ? -1 : numReturnValues), new ArrayList<>());}/**diff --git a/solr/core/src/java/org/apache/solr/update/DocumentBuilder.java b/solr/core/src/java/org/apache/solr/update/DocumentBuilder.javaindex 6455514d6f8..348de18f92c 100644--- a/solr/core/src/java/org/apache/solr/update/DocumentBuilder.java+++ b/solr/core/src/java/org/apache/solr/update/DocumentBuilder.java@@ -17,8 +17,8 @@package org.apache.solr.update;import com.google.common.collect.Sets;+import java.util.ArrayList;import java.util.Iterator;-import java.util.LinkedList;import java.util.List;import java.util.Set;import org.apache.lucene.document.Document;@@ -412,7 +412,7 @@ public class DocumentBuilder {if (!largestIsLast&& largestField != null&& largestFieldLen > MIN_LENGTH_TO_MOVE_LAST) { // only bother if the value isn't tiny- LinkedList<IndexableField> addToEnd = new LinkedList<>();+ List<IndexableField> addToEnd = new ArrayList<>();Iterator<IndexableField> iterator = doc.iterator();while (iterator.hasNext()) {IndexableField field = iterator.next();diff --git a/solr/core/src/java/org/apache/solr/update/MemOutputStream.java b/solr/core/src/java/org/apache/solr/update/MemOutputStream.javaindex bd03acf2a6c..345d35bb193 100644--- a/solr/core/src/java/org/apache/solr/update/MemOutputStream.java+++ b/solr/core/src/java/org/apache/solr/update/MemOutputStream.java@@ -17,7 +17,7 @@package org.apache.solr.update;import java.io.IOException;-import java.util.LinkedList;+import java.util.ArrayList;import java.util.List;import org.apache.solr.common.util.FastOutputStream;@@ -25,7 +25,7 @@ import org.apache.solr.common.util.FastOutputStream;* @lucene.internal*/public class MemOutputStream extends FastOutputStream {- public List<byte[]> buffers = new LinkedList<>();+ public List<byte[]> buffers = new ArrayList<>();public MemOutputStream(byte[] tempBuffer) {super(null, tempBuffer, 0);diff --git a/solr/core/src/java/org/apache/solr/update/UpdateHandler.java b/solr/core/src/java/org/apache/solr/update/UpdateHandler.javaindex b2a9a683092..cfcd32fb4cf 100644--- a/solr/core/src/java/org/apache/solr/update/UpdateHandler.java+++ b/solr/core/src/java/org/apache/solr/update/UpdateHandler.java@@ -18,7 +18,9 @@ package org.apache.solr.update;import java.io.IOException;import java.lang.invoke.MethodHandles;-import java.util.Vector;+import java.util.ArrayList;+import java.util.Collections;+import java.util.List;import org.apache.solr.core.DirectoryFactory;import org.apache.solr.core.PluginInfo;import org.apache.solr.core.SolrCore;@@ -45,9 +47,12 @@ public abstract class UpdateHandler implements SolrInfoBean {protected final SchemaField idField;protected final FieldType idFieldType;- protected Vector<SolrEventListener> commitCallbacks = new Vector<>();- protected Vector<SolrEventListener> softCommitCallbacks = new Vector<>();- protected Vector<SolrEventListener> optimizeCallbacks = new Vector<>();+ protected List<SolrEventListener> commitCallbacks =+ Collections.synchronizedList(new ArrayList<>());+ protected List<SolrEventListener> softCommitCallbacks =+ Collections.synchronizedList(new ArrayList<>());+ protected List<SolrEventListener> optimizeCallbacks =+ Collections.synchronizedList(new ArrayList<>());protected final UpdateLog ulog;diff --git a/solr/core/src/java/org/apache/solr/update/UpdateLog.java b/solr/core/src/java/org/apache/solr/update/UpdateLog.javaindex d2c88ac3832..17a9c62d889 100644--- a/solr/core/src/java/org/apache/solr/update/UpdateLog.java+++ b/solr/core/src/java/org/apache/solr/update/UpdateLog.java@@ -30,6 +30,7 @@ import java.nio.charset.Charset;import java.nio.charset.StandardCharsets;import java.nio.file.Files;import java.nio.file.Path;+import java.util.ArrayDeque;import java.util.ArrayList;import java.util.Arrays;import java.util.Collection;@@ -200,8 +201,8 @@ public class UpdateLog implements PluginInfoInitialized, SolrMetricProducer {protected TransactionLog prevTlog;protected TransactionLog prevTlogOnPrecommit;// list of recent logs, newest first- protected final Deque<TransactionLog> logs = new LinkedList<>();- protected LinkedList<TransactionLog> newestLogsOnStartup = new LinkedList<>();+ protected final Deque<TransactionLog> logs = new ArrayDeque<>();+ protected Deque<TransactionLog> newestLogsOnStartup = new ArrayDeque<>();protected int numOldRecords; // number of records in the recent logsprotected Map<BytesRef, LogPtr> map = new HashMap<>();@@ -242,6 +243,7 @@ public class UpdateLog implements PluginInfoInitialized, SolrMetricProducer {}}+ @SuppressWarnings("JdkObsolete")protected LinkedList<DBQ> deleteByQueries = new LinkedList<>();// Needs to be String because hdfs.Path is incompatible with nio.Path@@ -1700,7 +1702,7 @@ public class UpdateLog implements PluginInfoInitialized, SolrMetricProducer {public RecentUpdates getRecentUpdates() {Deque<TransactionLog> logList;synchronized (this) {- logList = new LinkedList<>(logs);+ logList = new ArrayDeque<>(logs);for (TransactionLog log : logList) {log.incref();}@@ -1845,7 +1847,7 @@ public class UpdateLog implements PluginInfoInitialized, SolrMetricProducer {boolean inSortedOrder;public LogReplayer(List<TransactionLog> translogs, boolean activeLog) {- this.translogs = new LinkedList<>();+ this.translogs = new ArrayDeque<>();this.translogs.addAll(translogs);this.activeLog = activeLog;}diff --git a/solr/core/src/java/org/apache/solr/update/processor/UpdateRequestProcessorChain.java b/solr/core/src/java/org/apache/solr/update/processor/UpdateRequestProcessorChain.javaindex 6abece4b684..1f5476632f8 100644--- a/solr/core/src/java/org/apache/solr/update/processor/UpdateRequestProcessorChain.java+++ b/solr/core/src/java/org/apache/solr/update/processor/UpdateRequestProcessorChain.java@@ -19,7 +19,6 @@ package org.apache.solr.update.processor;import java.lang.invoke.MethodHandles;import java.util.ArrayList;import java.util.Collections;-import java.util.LinkedList;import java.util.List;import java.util.Map;import java.util.Objects;@@ -256,7 +255,7 @@ public final class UpdateRequestProcessorChain implements PluginInfoInitializedpublic static UpdateRequestProcessorChain constructChain(UpdateRequestProcessorChain defaultUrp, ProcessorInfo processorInfo, SolrCore core) {- LinkedList<UpdateRequestProcessorFactory> urps = new LinkedList<>(defaultUrp.chain);+ List<UpdateRequestProcessorFactory> urps = new ArrayList<>(defaultUrp.chain);List<UpdateRequestProcessorFactory> p = getReqProcessors(processorInfo.processor, core);List<UpdateRequestProcessorFactory> post = getReqProcessors(processorInfo.postProcessor, core);// processor are tried to be inserted before LogUpdateprocessor+DistributedUpdateProcessor@@ -275,7 +274,7 @@ public final class UpdateRequestProcessorChain implements PluginInfoInitialized}private static void insertBefore(- LinkedList<UpdateRequestProcessorFactory> urps,+ List<UpdateRequestProcessorFactory> urps,List<UpdateRequestProcessorFactory> newFactories,Class<?> klas,int idx) {diff --git a/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java b/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.javaindex b4bdfb3c733..52cae9cd067 100644--- a/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java+++ b/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java@@ -22,9 +22,9 @@ import java.io.ByteArrayInputStream;import java.io.IOException;import java.io.StringWriter;import java.nio.charset.StandardCharsets;+import java.util.ArrayList;import java.util.Arrays;import java.util.HashMap;-import java.util.LinkedList;import java.util.List;import java.util.Map;import javax.xml.parsers.DocumentBuilder;@@ -295,7 +295,7 @@ public class BasicFunctionalityTest extends SolrTestCaseJ4 {final String BAD_VALUE = "NOT_A_DATE";ignoreException(BAD_VALUE);- final List<String> FIELDS = new LinkedList<>();+ final List<String> FIELDS = new ArrayList<>();for (String type :new String[] {"tdt", "tdt1", "tdtdv", "tdtdv1", "dt_dv", "dt_dvo", "dt", "dt1", "dt_os"}) {FIELDS.add("malformed_" + type);@@ -351,7 +351,7 @@ public class BasicFunctionalityTest extends SolrTestCaseJ4 {final String BAD_VALUE = "NOT_A_NUMBER";ignoreException(BAD_VALUE);- final List<String> FIELDS = new LinkedList<>();+ final List<String> FIELDS = new ArrayList<>();for (String type :new String[] {"ti", "tf", "td", "tl",diff --git a/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPI.java b/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPI.javaindex 4d8b35b5cdb..0785a2a5bad 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPI.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPI.java@@ -35,13 +35,13 @@ import java.nio.ByteBuffer;import java.nio.file.Files;import java.nio.file.Path;import java.security.Principal;+import java.util.ArrayDeque;import java.util.Arrays;import java.util.Collection;import java.util.Collections;import java.util.Deque;import java.util.HashSet;import java.util.LinkedHashMap;-import java.util.LinkedList;import java.util.List;import java.util.Locale;import java.util.Map;@@ -1555,7 +1555,7 @@ public class TestConfigSetsAPI extends SolrCloudTestCase {private static void zip(File directory, File zipfile) throws IOException {URI base = directory.toURI();- Deque<File> queue = new LinkedList<File>();+ Deque<File> queue = new ArrayDeque<>();queue.push(directory);OutputStream out = new FileOutputStream(zipfile);ZipOutputStream zout = new ZipOutputStream(out);diff --git a/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPIExclusivity.java b/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPIExclusivity.javaindex 7a2b59f8c75..680cff48d44 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPIExclusivity.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPIExclusivity.java@@ -18,8 +18,8 @@ package org.apache.solr.cloud;import java.lang.invoke.MethodHandles;import java.nio.charset.StandardCharsets;+import java.util.ArrayList;import java.util.Arrays;-import java.util.LinkedList;import java.util.List;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.SolrClient;@@ -81,7 +81,7 @@ public class TestConfigSetsAPIExclusivity extends SolrTestCaseJ4 {for (ConfigSetsAPIThread thread : threads) {thread.join();}- List<Exception> exceptions = new LinkedList<>();+ List<Exception> exceptions = new ArrayList<>();for (ConfigSetsAPIThread thread : threads) {exceptions.addAll(thread.getUnexpectedExceptions());}@@ -107,7 +107,7 @@ public class TestConfigSetsAPIExclusivity extends SolrTestCaseJ4 {private abstract static class ConfigSetsAPIThread extends Thread {private MiniSolrCloudCluster solrCluster;private int trials;- private List<Exception> unexpectedExceptions = new LinkedList<>();+ private List<Exception> unexpectedExceptions = new ArrayList<>();private List<String> allowedExceptions =Arrays.asList(new String[] {diff --git a/solr/core/src/test/org/apache/solr/cloud/TestSizeLimitedDistributedMap.java b/solr/core/src/test/org/apache/solr/cloud/TestSizeLimitedDistributedMap.javaindex a086656d13c..5f85e316cee 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestSizeLimitedDistributedMap.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestSizeLimitedDistributedMap.java@@ -17,8 +17,8 @@package org.apache.solr.cloud;+import java.util.ArrayList;import java.util.HashSet;-import java.util.LinkedList;import java.util.List;import java.util.Set;import org.apache.solr.common.cloud.SolrZkClient;@@ -26,7 +26,7 @@ import org.apache.solr.common.cloud.SolrZkClient;public class TestSizeLimitedDistributedMap extends TestDistributedMap {public void testCleanup() throws Exception {- final List<String> deletedItems = new LinkedList<>();+ final List<String> deletedItems = new ArrayList<>();final Set<String> expectedKeys = new HashSet<>();int numResponsesToStore = TEST_NIGHTLY ? Overseer.NUM_RESPONSES_TO_STORE : 100;diff --git a/solr/core/src/test/org/apache/solr/cluster/placement/Builders.java b/solr/core/src/test/org/apache/solr/cluster/placement/Builders.javaindex a6ecb88c3ed..776f5ff2dd7 100644--- a/solr/core/src/test/org/apache/solr/cluster/placement/Builders.java+++ b/solr/core/src/test/org/apache/solr/cluster/placement/Builders.java@@ -17,11 +17,11 @@package org.apache.solr.cluster.placement;+import java.util.ArrayList;import java.util.HashMap;import java.util.HashSet;import java.util.Iterator;import java.util.LinkedHashMap;-import java.util.LinkedList;import java.util.List;import java.util.Map;import org.apache.solr.cluster.Cluster;@@ -54,12 +54,12 @@ public class Builders {public static class ClusterBuilder {/** {@link NodeBuilder} for the live nodes of the cluster. */- private LinkedList<NodeBuilder> nodeBuilders = new LinkedList<>();+ private List<NodeBuilder> nodeBuilders = new ArrayList<>();- private LinkedList<CollectionBuilder> collectionBuilders = new LinkedList<>();+ private final List<CollectionBuilder> collectionBuilders = new ArrayList<>();public ClusterBuilder initializeLiveNodes(int countNodes) {- nodeBuilders = new LinkedList<>();+ nodeBuilders = new ArrayList<>();for (int n = 0; n < countNodes; n++) {// Default name, can be changedNodeBuilder nodeBuilder = new NodeBuilder().setNodeName("node_" + n);@@ -71,7 +71,7 @@ public class Builders {return this;}- public LinkedList<NodeBuilder> getLiveNodeBuilders() {+ public List<NodeBuilder> getLiveNodeBuilders() {return nodeBuilders;}@@ -87,7 +87,7 @@ public class Builders {}public List<Node> buildLiveNodes() {- List<Node> liveNodes = new LinkedList<>();+ List<Node> liveNodes = new ArrayList<>();for (NodeBuilder nodeBuilder : nodeBuilders) {liveNodes.add(nodeBuilder.build());}@@ -207,7 +207,7 @@ public class Builders {public static class CollectionBuilder {private final String collectionName;- private LinkedList<ShardBuilder> shardBuilders = new LinkedList<>();+ private List<ShardBuilder> shardBuilders = new ArrayList<>();private Map<String, String> customProperties = new HashMap<>();int replicaNumber = 0; // global replica numbering for the collectionprivate CollectionMetricsBuilder collectionMetricsBuilder = new CollectionMetricsBuilder();@@ -229,7 +229,7 @@ public class Builders {* @return The internal shards data structure to allow test code to modify the replica* distribution to nodes.*/- public LinkedList<ShardBuilder> getShardBuilders() {+ public List<ShardBuilder> getShardBuilders() {return shardBuilders;}@@ -266,11 +266,11 @@ public class Builders {*/public CollectionBuilder customCollectionSetup(List<List<String>> shardsReplicas, List<NodeBuilder> liveNodes) {- shardBuilders = new LinkedList<>();+ shardBuilders = new ArrayList<>();int shardNumber = 1; // Shard numbering starts at 1for (List<String> replicasOnNodes : shardsReplicas) {String shardName = buildShardName(shardNumber++);- LinkedList<ReplicaBuilder> replicas = new LinkedList<>();+ List<ReplicaBuilder> replicas = new ArrayList<>();ReplicaBuilder leader = null;for (String replicaNode : replicasOnNodes) {@@ -361,7 +361,7 @@ public class Builders {List<Integer> initialSizeGBPerShard) {Iterator<NodeBuilder> nodeIterator = nodes.iterator();- shardBuilders = new LinkedList<>();+ shardBuilders = new ArrayList<>();if (initialSizeGBPerShard != null && initialSizeGBPerShard.size() != countShards) {throw new RuntimeException("list of shard sizes must be the same length as the countShards!");@@ -373,7 +373,7 @@ public class Builders {CollectionMetricsBuilder.ShardMetricsBuilder shardMetricsBuilder =new CollectionMetricsBuilder.ShardMetricsBuilder(shardName);- LinkedList<ReplicaBuilder> replicas = new LinkedList<>();+ List<ReplicaBuilder> replicas = new ArrayList<>();ReplicaBuilder leader = null;CollectionMetricsBuilder.ReplicaMetricsBuilder leaderMetrics = null;@@ -466,7 +466,7 @@ public class Builders {public static class ShardBuilder {private String shardName;- private LinkedList<ReplicaBuilder> replicaBuilders = new LinkedList<>();+ private List<ReplicaBuilder> replicaBuilders = new ArrayList<>();private ReplicaBuilder leaderReplicaBuilder;public ShardBuilder setShardName(String shardName) {@@ -478,11 +478,11 @@ public class Builders {return shardName;}- public LinkedList<ReplicaBuilder> getReplicaBuilders() {+ public List<ReplicaBuilder> getReplicaBuilders() {return replicaBuilders;}- public ShardBuilder setReplicaBuilders(LinkedList<ReplicaBuilder> replicaBuilders) {+ public ShardBuilder setReplicaBuilders(List<ReplicaBuilder> replicaBuilders) {this.replicaBuilders = replicaBuilders;return this;}diff --git a/solr/core/src/test/org/apache/solr/cluster/placement/plugins/AffinityPlacementFactoryTest.java b/solr/core/src/test/org/apache/solr/cluster/placement/plugins/AffinityPlacementFactoryTest.javaindex 04c3af33f3b..7f9c48301e9 100644--- a/solr/core/src/test/org/apache/solr/cluster/placement/plugins/AffinityPlacementFactoryTest.java+++ b/solr/core/src/test/org/apache/solr/cluster/placement/plugins/AffinityPlacementFactoryTest.java@@ -21,7 +21,6 @@ import java.lang.invoke.MethodHandles;import java.util.HashMap;import java.util.HashSet;import java.util.Iterator;-import java.util.LinkedList;import java.util.List;import java.util.Map;import java.util.Optional;@@ -100,7 +99,7 @@ public class AffinityPlacementFactoryTest extends SolrTestCaseJ4 {String collectionName = "basicCollection";Builders.ClusterBuilder clusterBuilder = Builders.newClusterBuilder().initializeLiveNodes(2);- LinkedList<Builders.NodeBuilder> nodeBuilders = clusterBuilder.getLiveNodeBuilders();+ List<Builders.NodeBuilder> nodeBuilders = clusterBuilder.getLiveNodeBuilders();nodeBuilders.get(0).setCoreCount(1).setFreeDiskGB((double) (PRIORITIZED_FREE_DISK_GB + 1));nodeBuilders.get(1).setCoreCount(10).setFreeDiskGB((double) (PRIORITIZED_FREE_DISK_GB + 1));@@ -148,7 +147,7 @@ public class AffinityPlacementFactoryTest extends SolrTestCaseJ4 {// Cluster nodes and their attributesBuilders.ClusterBuilder clusterBuilder = Builders.newClusterBuilder().initializeLiveNodes(8);- LinkedList<Builders.NodeBuilder> nodeBuilders = clusterBuilder.getLiveNodeBuilders();+ List<Builders.NodeBuilder> nodeBuilders = clusterBuilder.getLiveNodeBuilders();for (int i = 0; i < nodeBuilders.size(); i++) {if (i == LOW_SPACE_NODE_INDEX) {nodeBuilders@@ -233,7 +232,7 @@ public class AffinityPlacementFactoryTest extends SolrTestCaseJ4 {// Cluster nodes and their attributesBuilders.ClusterBuilder clusterBuilder = Builders.newClusterBuilder().initializeLiveNodes(5);- LinkedList<Builders.NodeBuilder> nodeBuilders = clusterBuilder.getLiveNodeBuilders();+ List<Builders.NodeBuilder> nodeBuilders = clusterBuilder.getLiveNodeBuilders();int coresOnNode = 10;for (Builders.NodeBuilder nodeBuilder : nodeBuilders) {nodeBuilder.setCoreCount(coresOnNode).setFreeDiskGB((double) (PRIORITIZED_FREE_DISK_GB + 1));@@ -308,7 +307,7 @@ public class AffinityPlacementFactoryTest extends SolrTestCaseJ4 {// One of the NRT has fewer cores than the other// The TLOG/PULL replica on AZ1 doesn't have much free disk spaceBuilders.ClusterBuilder clusterBuilder = Builders.newClusterBuilder().initializeLiveNodes(9);- LinkedList<Builders.NodeBuilder> nodeBuilders = clusterBuilder.getLiveNodeBuilders();+ List<Builders.NodeBuilder> nodeBuilders = clusterBuilder.getLiveNodeBuilders();for (int i = 0; i < 9; i++) {final String az;final int numcores;@@ -412,7 +411,7 @@ public class AffinityPlacementFactoryTest extends SolrTestCaseJ4 {// Count cores == node index, and AZ's are: AZ0, AZ0, AZ0, AZ1, AZ1, AZ1, AZ2, AZ2, AZ2.Builders.ClusterBuilder clusterBuilder = Builders.newClusterBuilder().initializeLiveNodes(9);- LinkedList<Builders.NodeBuilder> nodeBuilders = clusterBuilder.getLiveNodeBuilders();+ List<Builders.NodeBuilder> nodeBuilders = clusterBuilder.getLiveNodeBuilders();for (int i = 0; i < 9; i++) {nodeBuilders.get(i)@@ -472,7 +471,7 @@ public class AffinityPlacementFactoryTest extends SolrTestCaseJ4 {// Cluster nodes and their attributesBuilders.ClusterBuilder clusterBuilder = Builders.newClusterBuilder().initializeLiveNodes(3);- LinkedList<Builders.NodeBuilder> nodeBuilders = clusterBuilder.getLiveNodeBuilders();+ List<Builders.NodeBuilder> nodeBuilders = clusterBuilder.getLiveNodeBuilders();int coreCount = 0;for (Builders.NodeBuilder nodeBuilder : nodeBuilders) {nodeBuilder.setCoreCount(coreCount++).setFreeDiskGB((double) (PRIORITIZED_FREE_DISK_GB + 1));@@ -944,7 +943,7 @@ public class AffinityPlacementFactoryTest extends SolrTestCaseJ4 {@Testpublic void testNodeType() throws Exception {Builders.ClusterBuilder clusterBuilder = Builders.newClusterBuilder().initializeLiveNodes(9);- LinkedList<Builders.NodeBuilder> nodeBuilders = clusterBuilder.getLiveNodeBuilders();+ List<Builders.NodeBuilder> nodeBuilders = clusterBuilder.getLiveNodeBuilders();for (int i = 0; i < 9; i++) {nodeBuilders.get(i).setSysprop(AffinityPlacementConfig.NODE_TYPE_SYSPROP, "type_" + (i % 3));}@@ -1108,7 +1107,7 @@ public class AffinityPlacementFactoryTest extends SolrTestCaseJ4 {Builders.ClusterBuilder clusterBuilder =Builders.newClusterBuilder().initializeLiveNodes(numNodes);- LinkedList<Builders.NodeBuilder> nodeBuilders = clusterBuilder.getLiveNodeBuilders();+ List<Builders.NodeBuilder> nodeBuilders = clusterBuilder.getLiveNodeBuilders();for (int i = 0; i < numNodes; i++) {nodeBuilders.get(i).setCoreCount(0).setFreeDiskGB((double) numNodes);}diff --git a/solr/core/src/test/org/apache/solr/handler/TestStressThreadBackup.java b/solr/core/src/test/org/apache/solr/handler/TestStressThreadBackup.javaindex ac560e6863a..f990bcf6c8d 100644--- a/solr/core/src/test/org/apache/solr/handler/TestStressThreadBackup.java+++ b/solr/core/src/test/org/apache/solr/handler/TestStressThreadBackup.java@@ -19,9 +19,9 @@ package org.apache.solr.handler;import java.io.File;import java.io.IOException;import java.lang.invoke.MethodHandles;+import java.util.ArrayDeque;import java.util.Arrays;import java.util.Collections;-import java.util.LinkedList;import java.util.List;import java.util.Queue;import java.util.concurrent.TimeUnit;@@ -204,7 +204,7 @@ public class TestStressThreadBackup extends SolrCloudTestCase {// now have the "main" test thread try to take a series of backups/snapshots// while adding other "real" docs- final Queue<String> namedSnapshots = new LinkedList<>();+ final Queue<String> namedSnapshots = new ArrayDeque<>();// NOTE #1: start at i=1 for 'id' & doc counting purposes...// NOTE #2: abort quickly if the other thread reports a heavyCommitFailure...diff --git a/solr/core/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.javaindex da3adaa75b3..0394018e0bf 100644--- a/solr/core/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java+++ b/solr/core/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java@@ -17,8 +17,8 @@package org.apache.solr.handler;import java.io.StringReader;+import java.util.ArrayDeque;import java.util.Collection;-import java.util.LinkedList;import java.util.Objects;import java.util.Queue;import javax.xml.stream.XMLInputFactory;@@ -213,7 +213,7 @@ public class XmlUpdateRequestHandlerTest extends SolrTestCaseJ4 {private static class MockUpdateRequestProcessor extends UpdateRequestProcessor {- private Queue<DeleteUpdateCommand> deleteCommands = new LinkedList<>();+ private final Queue<DeleteUpdateCommand> deleteCommands = new ArrayDeque<>();public MockUpdateRequestProcessor(UpdateRequestProcessor next) {super(next);diff --git a/solr/core/src/test/org/apache/solr/handler/component/UpdateLogCloudTest.java b/solr/core/src/test/org/apache/solr/handler/component/UpdateLogCloudTest.javaindex 85d9bbe985d..4860c0415bc 100644--- a/solr/core/src/test/org/apache/solr/handler/component/UpdateLogCloudTest.java+++ b/solr/core/src/test/org/apache/solr/handler/component/UpdateLogCloudTest.java@@ -16,10 +16,11 @@*/package org.apache.solr.handler.component;+import java.util.ArrayDeque;import java.util.ArrayList;-import java.util.Collections;-import java.util.LinkedList;+import java.util.Deque;import java.util.List;+import java.util.stream.Collectors;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.request.CollectionAdminRequest;@@ -136,11 +137,8 @@ public class UpdateLogCloudTest extends SolrCloudTestCase {return;}- final LinkedList<Long> absVersions = new LinkedList<>();- for (Long version : versions) {- absVersions.add(Math.abs(version));- }- Collections.sort(absVersions);+ final Deque<Long> absVersions =+ versions.stream().map(Math::abs).sorted().collect(Collectors.toCollection(ArrayDeque::new));final Long minVersion = absVersions.getFirst();final Long maxVersion = absVersions.getLast();diff --git a/solr/core/src/test/org/apache/solr/internal/csv/CharBufferTest.java b/solr/core/src/test/org/apache/solr/internal/csv/CharBufferTest.javaindex d2164e70ad2..b7054660b8d 100644--- a/solr/core/src/test/org/apache/solr/internal/csv/CharBufferTest.java+++ b/solr/core/src/test/org/apache/solr/internal/csv/CharBufferTest.java@@ -62,9 +62,9 @@ public class CharBufferTest extends SolrTestCaseJ4 {}}- public void testAppendStringBuffer() {+ public void testAppendStringBuilder() {CharBuffer cb = new CharBuffer(1);- StringBuffer abcd = new StringBuffer("abcd");+ StringBuilder abcd = new StringBuilder("abcd");String expected = "";for (int i = 0; i < 10; i++) {cb.append(abcd);diff --git a/solr/core/src/test/org/apache/solr/response/SmileWriterTest.java b/solr/core/src/test/org/apache/solr/response/SmileWriterTest.javaindex d2ea23695ad..e224c8661bb 100644--- a/solr/core/src/test/org/apache/solr/response/SmileWriterTest.java+++ b/solr/core/src/test/org/apache/solr/response/SmileWriterTest.java@@ -210,7 +210,7 @@ public class SmileWriterTest extends SolrTestCaseJ4 {}// common-case asciistatic String str(Random r, int sz) {- StringBuffer sb = new StringBuffer(sz);+ StringBuilder sb = new StringBuilder(sz);for (int i = 0; i < sz; i++) {sb.append('\n' + r.nextInt(128 - '\n'));}diff --git a/solr/core/src/test/org/apache/solr/search/TestRecovery.java b/solr/core/src/test/org/apache/solr/search/TestRecovery.javaindex e87a84fb856..c2ffa24dded 100644--- a/solr/core/src/test/org/apache/solr/search/TestRecovery.java+++ b/solr/core/src/test/org/apache/solr/search/TestRecovery.java@@ -1352,6 +1352,7 @@ public class TestRecovery extends SolrTestCaseJ4 {}}+ @SuppressWarnings("JdkObsolete")private void addDocs(int nDocs, int start, LinkedList<Long> versions) throws Exception {for (int i = 0; i < nDocs; i++) {versions.addFirst(addAndGetVersion(sdoc("id", Integer.toString(start + nDocs)), null));@@ -1359,6 +1360,7 @@ public class TestRecovery extends SolrTestCaseJ4 {}@Test+ @SuppressWarnings("JdkObsolete")public void testRemoveOldLogs() throws Exception {try {TestInjection.skipIndexWriterCommitOnClose = true;diff --git a/solr/core/src/test/org/apache/solr/security/AuditLoggerIntegrationTest.java b/solr/core/src/test/org/apache/solr/security/AuditLoggerIntegrationTest.javaindex 90518c9022f..0f0da7d3bcc 100644--- a/solr/core/src/test/org/apache/solr/security/AuditLoggerIntegrationTest.java+++ b/solr/core/src/test/org/apache/solr/security/AuditLoggerIntegrationTest.java@@ -43,7 +43,6 @@ import java.nio.charset.StandardCharsets;import java.util.ArrayList;import java.util.Arrays;import java.util.Collections;-import java.util.LinkedList;import java.util.List;import java.util.concurrent.BlockingQueue;import java.util.concurrent.LinkedBlockingDeque;@@ -392,7 +391,7 @@ public class AuditLoggerIntegrationTest extends SolrCloudAuthTestCase {assertEquals(status.intValue(), e.getStatus());}if (params != null && params.length > 0) {- List<String> p = new LinkedList<>(Arrays.asList(params));+ List<String> p = new ArrayList<>(Arrays.asList(params));while (p.size() >= 2) {String val = e.getSolrParamAsString(p.get(0));assertEquals(p.get(1), val);@@ -592,14 +591,11 @@ public class AuditLoggerIntegrationTest extends SolrCloudAuthTestCase {@Overridepublic void close() throws Exception {serverSocket.close();- assertEquals(- "Unexpected AuditEvents still in the queue",- Collections.emptyList(),- new LinkedList<>(queue));+ assertTrue("Unexpected AuditEvents still in the queue", queue.isEmpty());}public List<AuditEvent> waitForAuditEvents(final int expected) throws InterruptedException {- final LinkedList<AuditEvent> results = new LinkedList<>();+ final List<AuditEvent> results = new ArrayList<>();for (int i = 1; i <= expected; i++) { // NOTE: counting from 1 for error message readabilityfinal AuditEvent e = queue.poll(120, TimeUnit.SECONDS);if (null == e) {diff --git a/solr/core/src/test/org/apache/solr/servlet/SolrRequestParserTest.java b/solr/core/src/test/org/apache/solr/servlet/SolrRequestParserTest.javaindex 4727f23075b..561211e8b7c 100644--- a/solr/core/src/test/org/apache/solr/servlet/SolrRequestParserTest.java+++ b/solr/core/src/test/org/apache/solr/servlet/SolrRequestParserTest.java@@ -397,6 +397,7 @@ public class SolrRequestParserTest extends SolrTestCaseJ4 {}@Test+ @SuppressWarnings("JdkObsolete")public void testAddHttpRequestToContext() throws Exception {HttpServletRequest request = getMock("/solr/select", null, -1);when(request.getMethod()).thenReturn("GET");diff --git a/solr/core/src/test/org/apache/solr/update/MaxSizeAutoCommitTest.java b/solr/core/src/test/org/apache/solr/update/MaxSizeAutoCommitTest.javaindex 08380cf251a..f38da87e46b 100644--- a/solr/core/src/test/org/apache/solr/update/MaxSizeAutoCommitTest.java+++ b/solr/core/src/test/org/apache/solr/update/MaxSizeAutoCommitTest.java@@ -262,7 +262,7 @@ public class MaxSizeAutoCommitTest extends SolrTestCaseJ4 {public final BlockingQueue<Long> hard = new LinkedBlockingQueue<>(1000);// if non enpty, then at least one offer failed (queues full)- private StringBuffer fail = new StringBuffer();+ private final StringBuilder fail = new StringBuilder();@Overridepublic void newSearcher(SolrIndexSearcher newSearcher, SolrIndexSearcher currentSearcher) {@@ -272,7 +272,7 @@ public class MaxSizeAutoCommitTest extends SolrTestCaseJ4 {@Overridepublic void postCommit() {Long now = System.nanoTime();- if (!hard.offer(now)) fail.append(", hardCommit @ " + now);+ if (!hard.offer(now)) fail.append(", hardCommit @ ").append(now);}@Overridediff --git a/solr/core/src/test/org/apache/solr/update/PeerSyncTest.java b/solr/core/src/test/org/apache/solr/update/PeerSyncTest.javaindex fb010f9d3a1..16d3c50aeb9 100644--- a/solr/core/src/test/org/apache/solr/update/PeerSyncTest.java+++ b/solr/core/src/test/org/apache/solr/update/PeerSyncTest.java@@ -46,6 +46,7 @@ import org.hamcrest.MatcherAssert;import org.junit.Test;@SuppressSSL(bugUrl = "https://issues.apache.org/jira/browse/SOLR-5776")+@SuppressWarnings("JdkObsolete")public class PeerSyncTest extends BaseDistributedSearchTestCase {protected static int numVersions = 100; // number of versions to use when syncingprotected static final String FROM_LEADER = DistribPhase.FROMLEADER.toString();diff --git a/solr/core/src/test/org/apache/solr/update/SoftAutoCommitTest.java b/solr/core/src/test/org/apache/solr/update/SoftAutoCommitTest.javaindex 7a329d5c109..592fc824b1f 100644--- a/solr/core/src/test/org/apache/solr/update/SoftAutoCommitTest.java+++ b/solr/core/src/test/org/apache/solr/update/SoftAutoCommitTest.java@@ -604,7 +604,7 @@ class MockEventListener implements SolrEventListener {public final BlockingQueue<Long> searcher = new LinkedBlockingQueue<>(1000);// if non enpty, then at least one offer failed (queues full)- private StringBuffer fail = new StringBuffer();+ private final StringBuilder fail = new StringBuilder();public MockEventListener() {/* NOOP */@@ -613,19 +613,19 @@ class MockEventListener implements SolrEventListener {@Overridepublic void newSearcher(SolrIndexSearcher newSearcher, SolrIndexSearcher currentSearcher) {Long now = System.nanoTime();- if (!searcher.offer(now)) fail.append(", newSearcher @ " + now);+ if (!searcher.offer(now)) fail.append(", newSearcher @ ").append(now);}@Overridepublic void postCommit() {Long now = System.nanoTime();- if (!hard.offer(now)) fail.append(", hardCommit @ " + now);+ if (!hard.offer(now)) fail.append(", hardCommit @ ").append(now);}@Overridepublic void postSoftCommit() {Long now = System.nanoTime();- if (!soft.offer(now)) fail.append(", softCommit @ " + now);+ if (!soft.offer(now)) fail.append(", softCommit @ ").append(now);}public void clear() {diff --git a/solr/modules/analytics/src/java/org/apache/solr/analytics/facet/AnalyticsFacet.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/facet/AnalyticsFacet.javaindex a8c2b11491a..17a96f1d421 100644--- a/solr/modules/analytics/src/java/org/apache/solr/analytics/facet/AnalyticsFacet.java+++ b/solr/modules/analytics/src/java/org/apache/solr/analytics/facet/AnalyticsFacet.java@@ -19,9 +19,10 @@ package org.apache.solr.analytics.facet;import java.io.DataInput;import java.io.DataOutput;import java.io.IOException;+import java.util.ArrayList;import java.util.HashMap;import java.util.LinkedHashMap;-import java.util.LinkedList;+import java.util.List;import java.util.Map;import org.apache.solr.analytics.function.ExpressionCalculator;import org.apache.solr.analytics.function.ReductionCollectionManager;@@ -143,7 +144,7 @@ public abstract class AnalyticsFacet {* @return the response of the facet*/public Iterable<Map<String, Object>> createResponse() {- LinkedList<Map<String, Object>> list = new LinkedList<>();+ List<Map<String, Object>> list = new ArrayList<>();reductionData.forEach((facetVal, dataCol) -> {Map<String, Object> bucket = new HashMap<>();diff --git a/solr/modules/analytics/src/java/org/apache/solr/analytics/facet/PivotNode.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/facet/PivotNode.javaindex e67b8f44754..430ac0ff55f 100644--- a/solr/modules/analytics/src/java/org/apache/solr/analytics/facet/PivotNode.java+++ b/solr/modules/analytics/src/java/org/apache/solr/analytics/facet/PivotNode.java@@ -21,7 +21,6 @@ import java.io.DataOutput;import java.io.IOException;import java.util.ArrayList;import java.util.HashMap;-import java.util.LinkedList;import java.util.List;import java.util.Map;import java.util.function.Consumer;@@ -160,7 +159,7 @@ public abstract class PivotNode<T> extends SortableFacet implements Consumer<Str});Iterable<FacetBucket> facetResultsIter = applyOptions(facetResults);- final LinkedList<Map<String, Object>> results = new LinkedList<>();+ final List<Map<String, Object>> results = new ArrayList<>();// Export each expression in the bucket.for (FacetBucket bucket : facetResultsIter) {Map<String, Object> bucketMap = new HashMap<>();@@ -242,7 +241,7 @@ public abstract class PivotNode<T> extends SortableFacet implements Consumer<Str});Iterable<FacetBucket> facetResultsIter = applyOptions(facetResults);- final LinkedList<Map<String, Object>> results = new LinkedList<>();+ final List<Map<String, Object>> results = new ArrayList<>();// Export each expression in the bucket.for (FacetBucket bucket : facetResultsIter) {Map<String, Object> bucketMap = new HashMap<>();diff --git a/solr/modules/analytics/src/java/org/apache/solr/analytics/facet/SortableFacet.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/facet/SortableFacet.javaindex 86e906705e3..ca78978eb26 100644--- a/solr/modules/analytics/src/java/org/apache/solr/analytics/facet/SortableFacet.java+++ b/solr/modules/analytics/src/java/org/apache/solr/analytics/facet/SortableFacet.java@@ -20,7 +20,6 @@ import com.google.common.collect.Iterables;import java.util.ArrayList;import java.util.Comparator;import java.util.HashMap;-import java.util.LinkedList;import java.util.List;import java.util.Map;import org.apache.solr.analytics.facet.compare.FacetResultsComparator;@@ -47,7 +46,7 @@ public abstract class SortableFacet extends AnalyticsFacet {@Overridepublic Iterable<Map<String, Object>> createResponse() {- final LinkedList<Map<String, Object>> results = new LinkedList<>();+ final List<Map<String, Object>> results = new ArrayList<>();// Export each expression in the bucket.for (FacetBucket bucket : getBuckets()) {Map<String, Object> bucketMap = new HashMap<>();@@ -91,7 +90,7 @@ public abstract class SortableFacet extends AnalyticsFacet {}facetResultsIter = Iterables.limit(facetResultsIter, sort.getLimit());} else if (sort.getLimit() == 0) {- return new LinkedList<FacetBucket>();+ return new ArrayList<>();}return facetResultsIter;}diff --git a/solr/modules/analytics/src/java/org/apache/solr/analytics/function/ReductionCollectionManager.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/function/ReductionCollectionManager.javaindex 9873293c773..37d86a286fb 100644--- a/solr/modules/analytics/src/java/org/apache/solr/analytics/function/ReductionCollectionManager.java+++ b/solr/modules/analytics/src/java/org/apache/solr/analytics/function/ReductionCollectionManager.java@@ -22,7 +22,6 @@ import java.io.IOException;import java.util.ArrayList;import java.util.Arrays;import java.util.HashMap;-import java.util.LinkedList;import java.util.List;import org.apache.lucene.index.LeafReaderContext;import org.apache.solr.analytics.function.field.AnalyticsField;@@ -67,7 +66,7 @@ public class ReductionCollectionManager {Arrays.sort(reductionDataCollectors, (a, b) -> a.getExpressionStr().compareTo(b.getExpressionStr()));- reservations = new LinkedList<>();+ reservations = new ArrayList<>();for (int i = 0; i < reductionDataCollectors.length; i++) {reductionDataCollectors[i].submitReservations(reservation -> reservations.add(reservation));}diff --git a/solr/modules/extraction/src/java/org/apache/solr/handler/extraction/XLSXResponseWriter.java b/solr/modules/extraction/src/java/org/apache/solr/handler/extraction/XLSXResponseWriter.javaindex 21dee630788..d68a86351ab 100644--- a/solr/modules/extraction/src/java/org/apache/solr/handler/extraction/XLSXResponseWriter.java+++ b/solr/modules/extraction/src/java/org/apache/solr/handler/extraction/XLSXResponseWriter.java@@ -282,7 +282,7 @@ class XLSXWriter extends TabularResponseWriter {@Overridepublic void writeArray(String name, Iterator<?> val, boolean raw) throws IOException {assert !raw;- StringBuffer output = new StringBuffer();+ StringBuilder output = new StringBuilder();while (val.hasNext()) {Object v = val.next();if (v instanceof IndexableField) {diff --git a/solr/modules/gcs-repository/src/java/org/apache/solr/gcs/GCSBackupRepository.java b/solr/modules/gcs-repository/src/java/org/apache/solr/gcs/GCSBackupRepository.javaindex 6d110f400c8..74f1f7f403d 100644--- a/solr/modules/gcs-repository/src/java/org/apache/solr/gcs/GCSBackupRepository.java+++ b/solr/modules/gcs-repository/src/java/org/apache/solr/gcs/GCSBackupRepository.java@@ -41,7 +41,6 @@ import java.nio.file.FileAlreadyExistsException;import java.nio.file.NoSuchFileException;import java.util.ArrayList;import java.util.Collection;-import java.util.LinkedList;import java.util.List;import java.util.Objects;import java.util.stream.Collectors;@@ -206,7 +205,7 @@ public class GCSBackupRepository implements BackupRepository {final String blobName = appendTrailingSeparatorIfNecessary(path.toString());final String pathStr = blobName;- final LinkedList<String> result = new LinkedList<>();+ final List<String> result = new ArrayList<>();storage.list(bucketName,diff --git a/solr/modules/hadoop-auth/src/java/org/apache/solr/security/hadoop/DelegationTokenKerberosFilter.java b/solr/modules/hadoop-auth/src/java/org/apache/solr/security/hadoop/DelegationTokenKerberosFilter.javaindex d6f2bf931dc..8983dc0fec5 100644--- a/solr/modules/hadoop-auth/src/java/org/apache/solr/security/hadoop/DelegationTokenKerberosFilter.java+++ b/solr/modules/hadoop-auth/src/java/org/apache/solr/security/hadoop/DelegationTokenKerberosFilter.java@@ -17,8 +17,8 @@package org.apache.solr.security.hadoop;import java.io.IOException;+import java.util.ArrayList;import java.util.Enumeration;-import java.util.LinkedList;import java.util.List;import javax.servlet.FilterChain;import javax.servlet.FilterConfig;@@ -231,7 +231,7 @@ public class DelegationTokenKerberosFilter extends DelegationTokenAuthentication}private List<AuthInfo> createAuthInfo(SolrZkClient zkClient) {- List<AuthInfo> ret = new LinkedList<AuthInfo>();+ List<AuthInfo> ret = new ArrayList<>();// In theory the credentials to add could change here if zookeeper hasn't been initializedZkCredentialsProvider credentialsProvider =diff --git a/solr/modules/hadoop-auth/src/java/org/apache/solr/security/hadoop/HadoopAuthFilter.java b/solr/modules/hadoop-auth/src/java/org/apache/solr/security/hadoop/HadoopAuthFilter.javaindex 74bf5f98c11..b5c74d6dec0 100644--- a/solr/modules/hadoop-auth/src/java/org/apache/solr/security/hadoop/HadoopAuthFilter.java+++ b/solr/modules/hadoop-auth/src/java/org/apache/solr/security/hadoop/HadoopAuthFilter.java@@ -17,7 +17,7 @@package org.apache.solr.security.hadoop;import java.io.IOException;-import java.util.LinkedList;+import java.util.ArrayList;import java.util.List;import javax.servlet.FilterChain;import javax.servlet.FilterConfig;@@ -215,7 +215,7 @@ public class HadoopAuthFilter extends DelegationTokenAuthenticationFilter {}private List<AuthInfo> createAuthInfo(SolrZkClient zkClient) {- List<AuthInfo> ret = new LinkedList<AuthInfo>();+ List<AuthInfo> ret = new ArrayList<>();// In theory the credentials to add could change here if zookeeper hasn't been initializedZkCredentialsProvider credentialsProvider =diff --git a/solr/modules/hadoop-auth/src/test/org/apache/solr/security/hadoop/HttpParamDelegationTokenPlugin.java b/solr/modules/hadoop-auth/src/test/org/apache/solr/security/hadoop/HttpParamDelegationTokenPlugin.javaindex 7de4d18b501..58212f8b8ba 100644--- a/solr/modules/hadoop-auth/src/test/org/apache/solr/security/hadoop/HttpParamDelegationTokenPlugin.java+++ b/solr/modules/hadoop-auth/src/test/org/apache/solr/security/hadoop/HttpParamDelegationTokenPlugin.java@@ -19,8 +19,8 @@ package org.apache.solr.security.hadoop;import java.io.IOException;import java.nio.charset.StandardCharsets;import java.security.Principal;+import java.util.ArrayList;import java.util.Enumeration;-import java.util.LinkedList;import java.util.List;import java.util.Map;import java.util.Optional;@@ -273,7 +273,7 @@ public class HttpParamDelegationTokenPlugin extends KerberosPlugin {throws IOException, ServletException {// remove the filter-specific authentication information, so it doesn't get accidentally// forwarded.- List<NameValuePair> newPairs = new LinkedList<NameValuePair>();+ List<NameValuePair> newPairs = new ArrayList<>();List<NameValuePair> pairs =URLEncodedUtils.parse(request.getQueryString(), StandardCharsets.UTF_8);for (NameValuePair nvp : pairs) {diff --git a/solr/modules/hdfs/src/test/org/apache/hadoop/fs/FileUtil.java b/solr/modules/hdfs/src/test/org/apache/hadoop/fs/FileUtil.javaindex a960b8ed3d1..f8d800dfaf7 100644--- a/solr/modules/hdfs/src/test/org/apache/hadoop/fs/FileUtil.java+++ b/solr/modules/hdfs/src/test/org/apache/hadoop/fs/FileUtil.java@@ -888,7 +888,7 @@ public class FileUtil {private static void unTarUsingTar(File inFile, File untarDir,boolean gzipped) throws IOException {- StringBuffer untarCommand = new StringBuffer();+ StringBuilder untarCommand = new StringBuilder();// not using canonical path here; this postpones relative path// resolution until bash is executed.final String source = "'" + FileUtil.makeSecureShellPath(inFile) + "'";diff --git a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/search/TestRecoveryHdfs.java b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/search/TestRecoveryHdfs.javaindex 5d31edfd7eb..590d484a05f 100644--- a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/search/TestRecoveryHdfs.java+++ b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/search/TestRecoveryHdfs.java@@ -718,6 +718,7 @@ public class TestRecoveryHdfs extends SolrTestCaseJ4 {}@Test+ @SuppressWarnings("JdkObsolete")public void testRemoveOldLogs() throws Exception {try {TestInjection.skipIndexWriterCommitOnClose = true;diff --git a/solr/modules/ltr/src/java/org/apache/solr/ltr/interleaving/algorithms/TeamDraftInterleaving.java b/solr/modules/ltr/src/java/org/apache/solr/ltr/interleaving/algorithms/TeamDraftInterleaving.javaindex eab416087db..ab500be79c2 100644--- a/solr/modules/ltr/src/java/org/apache/solr/ltr/interleaving/algorithms/TeamDraftInterleaving.java+++ b/solr/modules/ltr/src/java/org/apache/solr/ltr/interleaving/algorithms/TeamDraftInterleaving.java@@ -19,7 +19,7 @@ package org.apache.solr.ltr.interleaving.algorithms;import java.util.ArrayList;import java.util.HashSet;-import java.util.LinkedList;+import java.util.List;import java.util.Random;import java.util.Set;import org.apache.lucene.search.ScoreDoc;@@ -79,7 +79,7 @@ public class TeamDraftInterleaving implements Interleaving {* @return the interleaved ranking list*/public InterleavingResult interleave(ScoreDoc[] rerankedA, ScoreDoc[] rerankedB) {- LinkedList<ScoreDoc> interleavedResults = new LinkedList<>();+ List<ScoreDoc> interleavedResults = new ArrayList<>();HashSet<Integer> alreadyAdded = new HashSet<>();ScoreDoc[] interleavedResultArray = new ScoreDoc[rerankedA.length];ArrayList<Set<Integer>> interleavingPicks = new ArrayList<>(2);diff --git a/solr/modules/ltr/src/java/org/apache/solr/ltr/model/MultipleAdditiveTreesModel.java b/solr/modules/ltr/src/java/org/apache/solr/ltr/model/MultipleAdditiveTreesModel.javaindex b66e2ff3b31..4fa4ab77674 100644--- a/solr/modules/ltr/src/java/org/apache/solr/ltr/model/MultipleAdditiveTreesModel.java+++ b/solr/modules/ltr/src/java/org/apache/solr/ltr/model/MultipleAdditiveTreesModel.java@@ -16,11 +16,12 @@*/package org.apache.solr.ltr.model;+import java.util.ArrayDeque;import java.util.ArrayList;+import java.util.Deque;import java.util.HashMap;import java.util.List;import java.util.Map;-import java.util.Stack;import org.apache.lucene.index.LeafReaderContext;import org.apache.lucene.search.Explanation;import org.apache.solr.ltr.feature.Feature;@@ -221,11 +222,7 @@ public class MultipleAdditiveTreesModel extends LTRScoringModel {@Overridepublic String toString() {- final StringBuilder sb = new StringBuilder();- sb.append("(weight=").append(weight);- sb.append(",root=").append(root);- sb.append(")");- return sb.toString();+ return "(weight=" + weight + ",root=" + root + ")";}public RegressionTree() {}@@ -309,10 +306,10 @@ public class MultipleAdditiveTreesModel extends LTRScoringModel {private static void validateNode(RegressionTreeNode regressionTreeNode) throws ModelException {// Create an empty stack and push root to it- Stack<RegressionTreeNode> stack = new Stack<RegressionTreeNode>();+ Deque<RegressionTreeNode> stack = new ArrayDeque<>();stack.push(regressionTreeNode);- while (stack.empty() == false) {+ while (!stack.isEmpty()) {RegressionTreeNode topStackNode = stack.pop();if (topStackNode.isLeaf()) {@@ -345,15 +342,17 @@ public class MultipleAdditiveTreesModel extends LTRScoringModel {final StringBuilder returnValueBuilder = new StringBuilder();while (true) {if (regressionTreeNode.isLeaf()) {- returnValueBuilder.append("val: " + regressionTreeNode.value);+ returnValueBuilder.append("val: ").append(regressionTreeNode.value);return returnValueBuilder.toString();}// unsupported feature (tree is looking for a feature that does not exist)if ((regressionTreeNode.featureIndex < 0)|| (regressionTreeNode.featureIndex >= featureVector.length)) {- returnValueBuilder.append(- "'" + regressionTreeNode.feature + "' does not exist in FV, Return Zero");+ returnValueBuilder+ .append("'")+ .append(regressionTreeNode.feature)+ .append("' does not exist in FV, Return Zero");return returnValueBuilder.toString();}@@ -362,24 +361,24 @@ public class MultipleAdditiveTreesModel extends LTRScoringModel {// that hereif (featureVector[regressionTreeNode.featureIndex] <= regressionTreeNode.threshold) {- returnValueBuilder.append(- "'"- + regressionTreeNode.feature- + "':"- + featureVector[regressionTreeNode.featureIndex]- + " <= "- + regressionTreeNode.threshold- + ", Go Left | ");+ returnValueBuilder+ .append("'")+ .append(regressionTreeNode.feature)+ .append("':")+ .append(featureVector[regressionTreeNode.featureIndex])+ .append(" <= ")+ .append(regressionTreeNode.threshold)+ .append(", Go Left | ");regressionTreeNode = regressionTreeNode.left;} else {- returnValueBuilder.append(- "'"- + regressionTreeNode.feature- + "':"- + featureVector[regressionTreeNode.featureIndex]- + " > "- + regressionTreeNode.threshold- + ", Go Right | ");+ returnValueBuilder+ .append("'")+ .append(regressionTreeNode.feature)+ .append("':")+ .append(featureVector[regressionTreeNode.featureIndex])+ .append(" > ")+ .append(regressionTreeNode.threshold)+ .append(", Go Right | ");regressionTreeNode = regressionTreeNode.right;}}diff --git a/solr/modules/sql/src/test/org/apache/solr/handler/sql/TestSQLHandler.java b/solr/modules/sql/src/test/org/apache/solr/handler/sql/TestSQLHandler.javaindex d468281920d..b587a5c6bbb 100644--- a/solr/modules/sql/src/test/org/apache/solr/handler/sql/TestSQLHandler.java+++ b/solr/modules/sql/src/test/org/apache/solr/handler/sql/TestSQLHandler.java@@ -22,7 +22,6 @@ import java.util.ArrayList;import java.util.Arrays;import java.util.Collections;import java.util.Date;-import java.util.LinkedList;import java.util.List;import java.util.Locale;import java.util.stream.Collectors;@@ -2348,7 +2347,7 @@ public class TestSQLHandler extends SolrCloudTestCase {}protected List<Tuple> getTuples(final SolrParams params, String baseUrl) throws IOException {- List<Tuple> tuples = new LinkedList<>();+ List<Tuple> tuples = new ArrayList<>();try (TupleStream tupleStream = new SolrStream(baseUrl, params)) {tupleStream.open();for (; ; ) {diff --git a/solr/solrj-zookeeper/src/java/org/apache/solr/client/solrj/cloud/DistribStateManager.java b/solr/solrj-zookeeper/src/java/org/apache/solr/client/solrj/cloud/DistribStateManager.javaindex 09be10c73c9..5b7cd20de60 100644--- a/solr/solrj-zookeeper/src/java/org/apache/solr/client/solrj/cloud/DistribStateManager.java+++ b/solr/solrj-zookeeper/src/java/org/apache/solr/client/solrj/cloud/DistribStateManager.java@@ -17,10 +17,10 @@package org.apache.solr.client.solrj.cloud;import java.io.IOException;+import java.util.ArrayDeque;import java.util.ArrayList;import java.util.Collections;import java.util.Deque;-import java.util.LinkedList;import java.util.List;import java.util.Map;import java.util.NoSuchElementException;@@ -96,7 +96,7 @@ public interface DistribStateManager extends SolrCloseable {*/default List<String> listTree(String root)throws NoSuchElementException, IOException, KeeperException, InterruptedException {- Deque<String> queue = new LinkedList<>();+ Deque<String> queue = new ArrayDeque<>();List<String> tree = new ArrayList<>();if (!root.startsWith("/")) {root = "/" + root;diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/SocketProxy.java b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/SocketProxy.javaindex bbab01b835c..6d693bc3d43 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/SocketProxy.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/SocketProxy.java@@ -27,7 +27,6 @@ import java.net.SocketException;import java.net.SocketTimeoutException;import java.net.URI;import java.util.ArrayList;-import java.util.LinkedList;import java.util.List;import java.util.concurrent.CountDownLatch;import java.util.concurrent.TimeUnit;@@ -58,7 +57,7 @@ public class SocketProxy {private CountDownLatch closed = new CountDownLatch(1);- public List<Bridge> connections = new LinkedList<>();+ public List<Bridge> connections = new ArrayList<>();private final int listenPort;diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClient.javaindex aee34a1af6c..b86e75e5134 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClient.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClient.java@@ -20,8 +20,8 @@ package org.apache.solr.client.solrj.impl;import java.io.IOException;import java.io.InputStream;import java.lang.invoke.MethodHandles;+import java.util.ArrayDeque;import java.util.Iterator;-import java.util.LinkedList;import java.util.Queue;import java.util.concurrent.BlockingQueue;import java.util.concurrent.CountDownLatch;@@ -146,7 +146,7 @@ public class ConcurrentUpdateHttp2SolrClient extends SolrClient {this.shutdownClient = builder.closeHttp2Client;this.threadCount = builder.threadCount;this.queue = new CustomBlockingQueue<>(builder.queueSize, threadCount, END_UPDATE);- this.runners = new LinkedList<>();+ this.runners = new ArrayDeque<>();this.streamDeletes = builder.streamDeletes;this.basePath = builder.baseSolrUrl;this.stallTime = Integer.getInteger("solr.cloud.client.stallTime", 15000);diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClient.javaindex 953c5194c36..2c2f74646db 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClient.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClient.java@@ -21,7 +21,7 @@ import java.io.InputStream;import java.io.OutputStream;import java.lang.invoke.MethodHandles;import java.nio.charset.StandardCharsets;-import java.util.LinkedList;+import java.util.ArrayDeque;import java.util.Locale;import java.util.Queue;import java.util.Set;@@ -111,7 +111,7 @@ public class ConcurrentUpdateSolrClient extends SolrClient {this.client.setFollowRedirects(false);this.queue = new LinkedBlockingQueue<>(builder.queueSize);this.threadCount = builder.threadCount;- this.runners = new LinkedList<>();+ this.runners = new ArrayDeque<>();this.streamDeletes = builder.streamDeletes;this.connectionTimeout = builder.connectionTimeoutMillis;this.soTimeout = builder.socketTimeoutMillis;diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.javaindex 92c5e22d52c..76f46c2ceeb 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java@@ -32,12 +32,12 @@ import java.net.URL;import java.nio.ByteBuffer;import java.nio.charset.Charset;import java.nio.charset.StandardCharsets;+import java.util.ArrayList;import java.util.Arrays;import java.util.Base64;import java.util.Collection;import java.util.Collections;import java.util.Iterator;-import java.util.LinkedList;import java.util.List;import java.util.Locale;import java.util.Map;@@ -132,7 +132,7 @@ public class Http2SolrClient extends SolrClient {private ResponseParser parser = new BinaryResponseParser();private volatile RequestWriter requestWriter = new BinaryRequestWriter();- private List<HttpListenerFactory> listenerFactory = new LinkedList<>();+ private List<HttpListenerFactory> listenerFactory = new ArrayList<>();private AsyncTracker asyncTracker = new AsyncTracker();/** The URL of the Solr server. */private String serverBaseUrl;diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClient.javaindex 20adba9ee54..ee2e5da51c7 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClient.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClient.java@@ -31,12 +31,12 @@ import java.net.URL;import java.nio.charset.Charset;import java.nio.charset.StandardCharsets;import java.security.Principal;+import java.util.ArrayList;import java.util.Arrays;import java.util.Base64;import java.util.Collection;import java.util.Collections;import java.util.Iterator;-import java.util.LinkedList;import java.util.List;import java.util.Locale;import java.util.Map;@@ -393,7 +393,7 @@ public class HttpSolrClient extends BaseHttpSolrClient {|| (streams != null && streams.size() > 1))&& !hasNullStreamName;- LinkedList<NameValuePair> postOrPutParams = new LinkedList<>();+ List<NameValuePair> postOrPutParams = new ArrayList<>();if (contentWriter != null) {String fullQueryUrl = url + wparams.toQueryString();@@ -475,7 +475,7 @@ public class HttpSolrClient extends BaseHttpSolrClient {Collection<ContentStream> streams,ModifiableSolrParams wparams,boolean isMultipart,- LinkedList<NameValuePair> postOrPutParams,+ List<NameValuePair> postOrPutParams,String fullQueryUrl)throws IOException {HttpEntityEnclosingRequestBase postOrPut =@@ -487,7 +487,7 @@ public class HttpSolrClient extends BaseHttpSolrClient {postOrPut.addHeader("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8");}- List<FormBodyPart> parts = new LinkedList<>();+ List<FormBodyPart> parts = new ArrayList<>();Iterator<String> iter = wparams.getParameterNamesIterator();while (iter.hasNext()) {String p = iter.next();diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/FindDelayEvaluator.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/FindDelayEvaluator.javaindex 8031ce6e723..a67267268c6 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/FindDelayEvaluator.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/FindDelayEvaluator.java@@ -17,12 +17,12 @@package org.apache.solr.client.solrj.io.eval;import java.io.IOException;-import java.util.LinkedList;+import java.util.ArrayDeque;+import java.util.Deque;import java.util.List;import java.util.Locale;import java.util.Spliterator;import java.util.Spliterators;-import java.util.stream.Collectors;import java.util.stream.StreamSupport;import org.apache.commons.math3.util.MathArrays;import org.apache.solr.client.solrj.io.stream.expr.StreamExpression;@@ -74,10 +74,7 @@ public class FindDelayEvaluator extends RecursiveNumericEvaluator implements Twodouble[] secondArray =StreamSupport.stream(Spliterators.spliteratorUnknownSize(- ((LinkedList<?>)- ((List<?>) second)- .stream().collect(Collectors.toCollection(LinkedList::new)))- .descendingIterator(),+ ((Deque<?>) new ArrayDeque<>(((List<?>) second))).descendingIterator(),Spliterator.ORDERED),false).mapToDouble(value -> ((Number) value).doubleValue())diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/graph/GatherNodesStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/graph/GatherNodesStream.javaindex b6e78b9e37c..e59de3eccf9 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/graph/GatherNodesStream.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/graph/GatherNodesStream.java@@ -556,7 +556,7 @@ public class GatherNodesStream extends TupleStream implements Expressible {joinSParams.set("qt", "/export");joinSParams.set(SORT, gather + " asc," + traverseTo + " asc");- StringBuffer nodeQuery = new StringBuffer();+ StringBuilder nodeQuery = new StringBuilder();boolean comma = false;for (String node : nodes) {diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/graph/ShortestPathStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/graph/ShortestPathStream.javaindex b1bd5632544..44e407f5f05 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/graph/ShortestPathStream.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/graph/ShortestPathStream.java@@ -20,12 +20,13 @@ package org.apache.solr.client.solrj.io.graph;import static org.apache.solr.common.params.CommonParams.SORT;import java.io.IOException;+import java.util.ArrayDeque;import java.util.ArrayList;import java.util.Arrays;+import java.util.Deque;import java.util.HashMap;import java.util.HashSet;import java.util.Iterator;-import java.util.LinkedList;import java.util.List;import java.util.Locale;import java.util.Map;@@ -71,7 +72,7 @@ public class ShortestPathStream extends TupleStream implements Expressible {private int maxDepth;private String zkHost;private String collection;- private LinkedList<Tuple> shortestPaths = new LinkedList<>();+ private final Deque<Tuple> shortestPaths = new ArrayDeque<>();private boolean found;private StreamContext streamContext;private int threads;@@ -424,22 +425,22 @@ public class ShortestPathStream extends TupleStream implements Expressible {Set<String> finalPaths = new HashSet<>();if (targets.size() > 0) {for (Edge edge : targets) {- List<LinkedList<String>> paths = new ArrayList<>();- LinkedList<String> path = new LinkedList<>();+ List<Deque<String>> paths = new ArrayList<>();+ Deque<String> path = new ArrayDeque<>();path.addFirst(edge.to);paths.add(path);// Walk back up the tree a collect the parent nodes.INNER:for (int i = allVisited.size() - 1; i >= 0; --i) {Map<String, List<String>> v = allVisited.get(i);- Iterator<LinkedList<String>> it = paths.iterator();- List<LinkedList<String>> newPaths = new ArrayList<>();+ Iterator<Deque<String>> it = paths.iterator();+ List<Deque<String>> newPaths = new ArrayList<>();while (it.hasNext()) {- LinkedList<String> p = it.next();+ Deque<String> p = it.next();List<String> parents = v.get(p.peekFirst());if (parents != null) {for (String parent : parents) {- LinkedList<String> newPath = new LinkedList<>(p);+ Deque<String> newPath = new ArrayDeque<>(p);newPath.addFirst(parent);newPaths.add(newPath);}@@ -448,7 +449,7 @@ public class ShortestPathStream extends TupleStream implements Expressible {}}- for (List<String> p : paths) {+ for (Deque<String> p : paths) {String s = p.toString();if (!finalPaths.contains(s)) {Tuple shortestPath = new Tuple("path", p);@@ -478,7 +479,7 @@ public class ShortestPathStream extends TupleStream implements Expressible {joinParams.set("qt", "/export");joinParams.set(SORT, toField + " asc," + fromField + " asc");- StringBuffer nodeQuery = new StringBuffer();+ StringBuilder nodeQuery = new StringBuilder();for (String node : nodes) {nodeQuery.append(node).append(" ");diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/ops/GroupOperation.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/ops/GroupOperation.javaindex 576bfaec9f7..7e722b7b058 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/ops/GroupOperation.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/ops/GroupOperation.java@@ -20,9 +20,10 @@ import static org.apache.solr.common.params.CommonParams.SORT;import java.io.IOException;import java.io.Serializable;+import java.util.ArrayDeque;import java.util.ArrayList;import java.util.Comparator;-import java.util.LinkedList;+import java.util.Deque;import java.util.List;import java.util.Locale;import java.util.Map;@@ -116,7 +117,7 @@ public class GroupOperation implements ReduceOperation {}public Tuple reduce() {- LinkedList<Map<String, Object>> ll = new LinkedList<>();+ Deque<Map<String, Object>> ll = new ArrayDeque<>();while (priorityQueue.size() > 0) {ll.addFirst(priorityQueue.poll().getFields());// This will clear priority queue and so it will be ready for the next group.diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/CartesianProductStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/CartesianProductStream.javaindex d5337f1be7f..21558437c67 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/CartesianProductStream.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/CartesianProductStream.java@@ -17,10 +17,11 @@package org.apache.solr.client.solrj.io.stream;import java.io.IOException;+import java.util.ArrayDeque;import java.util.ArrayList;import java.util.Collection;+import java.util.Deque;import java.util.HashMap;-import java.util.LinkedList;import java.util.List;import java.util.Locale;import java.util.Map;@@ -52,7 +53,7 @@ public class CartesianProductStream extends TupleStream implements Expressible {private StreamComparator orderBy;// Used to contain the sorted queue of generated tuples- private LinkedList<Tuple> generatedTuples;+ private Deque<Tuple> generatedTuples;public CartesianProductStream(StreamExpression expression, StreamFactory factory)throws IOException {@@ -238,7 +239,7 @@ public class CartesianProductStream extends TupleStream implements Expressible {return generatedTuples.pop();}- private LinkedList<Tuple> generateTupleList(Tuple original) throws IOException {+ private Deque<Tuple> generateTupleList(Tuple original) throws IOException {Map<String, Object> evaluatedValues = new HashMap<>();for (NamedEvaluator evaluator : evaluators) {@@ -270,7 +271,7 @@ public class CartesianProductStream extends TupleStream implements Expressible {generatedTupleList.sort(orderBy);}- return new LinkedList<>(generatedTupleList);+ return new ArrayDeque<>(generatedTupleList);}private boolean iterate(@@ -319,7 +320,7 @@ public class CartesianProductStream extends TupleStream implements Expressible {public void open() throws IOException {stream.open();- generatedTuples = new LinkedList<>();+ generatedTuples = new ArrayDeque<>();}public void close() throws IOException {diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/DeepRandomStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/DeepRandomStream.javaindex 4b39078dcd8..e97ffb17ec5 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/DeepRandomStream.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/DeepRandomStream.java@@ -21,11 +21,12 @@ import static org.apache.solr.common.params.CommonParams.ROWS;import static org.apache.solr.common.params.CommonParams.SORT;import java.io.IOException;+import java.util.ArrayDeque;import java.util.ArrayList;import java.util.Arrays;import java.util.Collections;+import java.util.Deque;import java.util.HashMap;-import java.util.LinkedList;import java.util.List;import java.util.Locale;import java.util.Map;@@ -72,7 +73,7 @@ public class DeepRandomStream extends TupleStream implements Expressible {protected transient Map<String, Tuple> eofTuples;protected transient CloudSolrClient cloudSolrClient;protected transient List<TupleStream> solrStreams;- protected transient LinkedList<TupleWrapper> tuples;+ protected transient Deque<TupleWrapper> tuples;protected transient StreamContext streamContext;public DeepRandomStream() {@@ -270,7 +271,7 @@ public class DeepRandomStream extends TupleStream implements Expressible {}public void open() throws IOException {- this.tuples = new LinkedList<>();+ this.tuples = new ArrayDeque<>();this.solrStreams = new ArrayList<>();this.eofTuples = Collections.synchronizedMap(new HashMap<>());constructStreams();diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/FetchStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/FetchStream.javaindex 7c08a84b4fe..7afbb5dd6e0 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/FetchStream.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/FetchStream.java@@ -324,7 +324,7 @@ public class FetchStream extends TupleStream implements Expressible {}private String appendFields() {- StringBuffer buf = new StringBuffer();+ StringBuilder buf = new StringBuilder();if (appendKey) {buf.append(",");buf.append(rightKey);diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/InnerJoinStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/InnerJoinStream.javaindex 8d6ec56a5aa..a01ec94cbbb 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/InnerJoinStream.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/InnerJoinStream.java@@ -32,10 +32,14 @@ import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;* @since 6.0.0*/public class InnerJoinStream extends BiJoinStream implements Expressible {+ @SuppressWarnings("JdkObsolete")+ private final LinkedList<Tuple> joinedTuples = new LinkedList<>();- private LinkedList<Tuple> joinedTuples = new LinkedList<>();- private LinkedList<Tuple> leftTupleGroup = new LinkedList<>();- private LinkedList<Tuple> rightTupleGroup = new LinkedList<>();+ @SuppressWarnings("JdkObsolete")+ private final LinkedList<Tuple> leftTupleGroup = new LinkedList<>();++ @SuppressWarnings("JdkObsolete")+ private final LinkedList<Tuple> rightTupleGroup = new LinkedList<>();public InnerJoinStream(TupleStream leftStream, TupleStream rightStream, StreamEqualitor eq)throws IOException {diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/LeftOuterJoinStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/LeftOuterJoinStream.javaindex 1d1ba66366d..8b44fd96be3 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/LeftOuterJoinStream.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/LeftOuterJoinStream.java@@ -33,9 +33,14 @@ import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;*/public class LeftOuterJoinStream extends BiJoinStream implements Expressible {- private LinkedList<Tuple> joinedTuples = new LinkedList<>();- private LinkedList<Tuple> leftTupleGroup = new LinkedList<>();- private LinkedList<Tuple> rightTupleGroup = new LinkedList<>();+ @SuppressWarnings("JdkObsolete")+ private final LinkedList<Tuple> joinedTuples = new LinkedList<>();++ @SuppressWarnings("JdkObsolete")+ private final LinkedList<Tuple> leftTupleGroup = new LinkedList<>();++ @SuppressWarnings("JdkObsolete")+ private final LinkedList<Tuple> rightTupleGroup = new LinkedList<>();public LeftOuterJoinStream(TupleStream leftStream, TupleStream rightStream, StreamEqualitor eq)throws IOException {diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/RankStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/RankStream.javaindex d6284b533dd..e9989cd6b90 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/RankStream.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/RankStream.java@@ -20,9 +20,10 @@ import static org.apache.solr.common.params.CommonParams.SORT;import java.io.IOException;import java.io.Serializable;+import java.util.ArrayDeque;import java.util.ArrayList;import java.util.Comparator;-import java.util.LinkedList;+import java.util.Deque;import java.util.List;import java.util.Locale;import java.util.PriorityQueue;@@ -52,7 +53,7 @@ public class RankStream extends TupleStream implements Expressible {private int size;private transient PriorityQueue<Tuple> top;private transient boolean finished = false;- private transient LinkedList<Tuple> topList;+ private transient Deque<Tuple> topList;public RankStream(TupleStream tupleStream, int size, StreamComparator comp) throws IOException {init(tupleStream, size, comp);@@ -191,7 +192,7 @@ public class RankStream extends TupleStream implements Expressible {public void open() throws IOException {this.top = new PriorityQueue<>(size, new ReverseComp(comp));- this.topList = new LinkedList<>();+ this.topList = new ArrayDeque<>();stream.open();}diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/SortStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/SortStream.javaindex e8ae880bd2e..8bbae8b95a9 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/SortStream.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/SortStream.java@@ -95,7 +95,9 @@ public class SortStream extends TupleStream implements Expressible {worker =new Worker() {- private LinkedList<Tuple> tuples = new LinkedList<>();+ @SuppressWarnings("JdkObsolete")+ private final LinkedList<Tuple> tuples = new LinkedList<>();+private Tuple eofTuple;public void readStream(TupleStream stream) throws IOException {diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/TupleStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/TupleStream.javaindex 1b0495589d6..6d848c24106 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/TupleStream.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/TupleStream.java@@ -21,7 +21,6 @@ import java.io.IOException;import java.io.PrintWriter;import java.io.Serializable;import java.util.ArrayList;-import java.util.LinkedList;import java.util.List;import java.util.Locale;import java.util.Map;@@ -125,7 +124,7 @@ public abstract class TupleStream implements Closeable, Serializable, MapWriterstatic List<Replica> getReplicas(String zkHost, String collection, StreamContext streamContext, SolrParams requestParams)throws IOException {- List<Replica> replicas = new LinkedList<>();+ List<Replica> replicas = new ArrayList<>();// SolrCloud ShardingSolrClientCache solrClientCache =diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/metrics/WeightedSumMetric.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/metrics/WeightedSumMetric.javaindex bcf5a567842..e9fbabcd12d 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/metrics/WeightedSumMetric.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/metrics/WeightedSumMetric.java@@ -17,7 +17,7 @@package org.apache.solr.client.solrj.io.stream.metrics;import java.io.IOException;-import java.util.LinkedList;+import java.util.ArrayList;import java.util.List;import java.util.Locale;import org.apache.solr.client.solrj.io.Tuple;@@ -81,7 +81,7 @@ public class WeightedSumMetric extends Metric {Object o = tuple.get(valueCol);if (c instanceof Number && o instanceof Number) {if (parts == null) {- parts = new LinkedList<>();+ parts = new ArrayList<>();}Number count = (Number) c;Number value = (Number) o;diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/request/FieldAnalysisRequest.java b/solr/solrj/src/java/org/apache/solr/client/solrj/request/FieldAnalysisRequest.javaindex 38cf6e45334..2dcfbca7370 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/request/FieldAnalysisRequest.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/request/FieldAnalysisRequest.java@@ -16,7 +16,7 @@*/package org.apache.solr.client.solrj.request;-import java.util.LinkedList;+import java.util.ArrayList;import java.util.List;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrRequest;@@ -183,7 +183,7 @@ public class FieldAnalysisRequest extends SolrRequest<FieldAnalysisResponse> {*/public FieldAnalysisRequest addFieldName(String fieldName) {if (fieldNames == null) {- fieldNames = new LinkedList<>();+ fieldNames = new ArrayList<>();}fieldNames.add(fieldName);return this;@@ -218,7 +218,7 @@ public class FieldAnalysisRequest extends SolrRequest<FieldAnalysisResponse> {*/public FieldAnalysisRequest addFieldType(String fieldTypeName) {if (fieldTypes == null) {- fieldTypes = new LinkedList<>();+ fieldTypes = new ArrayList<>();}fieldTypes.add(fieldTypeName);return this;diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/request/schema/SchemaRequest.java b/solr/solrj/src/java/org/apache/solr/client/solrj/request/schema/SchemaRequest.javaindex 28dbe340b8e..2005f471d4f 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/request/schema/SchemaRequest.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/request/schema/SchemaRequest.java@@ -18,7 +18,7 @@ package org.apache.solr.client.solrj.request.schema;import java.io.IOException;import java.io.OutputStream;-import java.util.LinkedList;+import java.util.ArrayList;import java.util.List;import java.util.Map;import org.apache.solr.client.solrj.SolrClient;@@ -105,7 +105,7 @@ public class SchemaRequest extends AbstractSchemaRequest<SchemaResponse> {if (analyzerAttributes != null) analyzerNamedList.addAll(analyzerAttributes);List<Map<String, Object>> charFiltersAttributes = analyzerDefinition.getCharFilters();if (charFiltersAttributes != null) {- List<NamedList<Object>> charFiltersList = new LinkedList<>();+ List<NamedList<Object>> charFiltersList = new ArrayList<>();for (Map<String, Object> charFilterAttributes : charFiltersAttributes)charFiltersList.add(new NamedList<>(charFilterAttributes));analyzerNamedList.add("charFilters", charFiltersList);@@ -116,7 +116,7 @@ public class SchemaRequest extends AbstractSchemaRequest<SchemaResponse> {}List<Map<String, Object>> filtersAttributes = analyzerDefinition.getFilters();if (filtersAttributes != null) {- List<NamedList<Object>> filtersList = new LinkedList<>();+ List<NamedList<Object>> filtersList = new ArrayList<>();for (Map<String, Object> filterAttributes : filtersAttributes)filtersList.add(new NamedList<>(filterAttributes));analyzerNamedList.add("filters", filtersList);@@ -758,7 +758,7 @@ public class SchemaRequest extends AbstractSchemaRequest<SchemaResponse> {* call either succeed or fail together.*/public static class MultiUpdate extends Update {- private List<Update> updateSchemaRequests = new LinkedList<>();+ private final List<Update> updateSchemaRequests = new ArrayList<>();public MultiUpdate(List<Update> updateSchemaRequests) {this(updateSchemaRequests, null);diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/response/SuggesterResponse.java b/solr/solrj/src/java/org/apache/solr/client/solrj/response/SuggesterResponse.javaindex a5ba9b926bd..66891128edc 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/response/SuggesterResponse.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/response/SuggesterResponse.java@@ -16,8 +16,8 @@*/package org.apache.solr.client.solrj.response;+import java.util.ArrayList;import java.util.LinkedHashMap;-import java.util.LinkedList;import java.util.List;import java.util.Map;import org.apache.solr.common.util.NamedList;@@ -39,7 +39,7 @@ public class SuggesterResponse {final NamedList<Object> outerValue = suggestInfo.getVal(i);SimpleOrderedMap<?> suggestionsNode = (SimpleOrderedMap<?>) outerValue.getVal(0);- List<Suggestion> suggestionList = new LinkedList<>();+ List<Suggestion> suggestionList = new ArrayList<>();if (suggestionsNode != null) {@SuppressWarnings("unchecked")List<SimpleOrderedMap<?>> suggestionListToParse =@@ -77,7 +77,7 @@ public class SuggesterResponse {Map<String, List<String>> suggestedTermsPerDictionary = new LinkedHashMap<>();for (Map.Entry<String, List<Suggestion>> entry : suggestionsPerDictionary.entrySet()) {List<Suggestion> suggestions = entry.getValue();- List<String> suggestionTerms = new LinkedList<>();+ List<String> suggestionTerms = new ArrayList<>();for (Suggestion s : suggestions) {suggestionTerms.add(s.getTerm());}diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/response/schema/SchemaResponse.java b/solr/solrj/src/java/org/apache/solr/client/solrj/response/schema/SchemaResponse.javaindex 46ea4cce72b..bdd754ef707 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/response/schema/SchemaResponse.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/response/schema/SchemaResponse.java@@ -16,8 +16,8 @@*/package org.apache.solr.client.solrj.response.schema;+import java.util.ArrayList;import java.util.LinkedHashMap;-import java.util.LinkedList;import java.util.List;import java.util.Map;import org.apache.solr.client.solrj.request.schema.AnalyzerDefinition;@@ -57,7 +57,7 @@ public class SchemaResponse extends SolrResponseBase {List<NamedList<Object>> charFiltersList =(List<NamedList<Object>>) analyzerNamedList.get("charFilters");if (charFiltersList != null) {- List<Map<String, Object>> charFiltersAttributesList = new LinkedList<>();+ List<Map<String, Object>> charFiltersAttributesList = new ArrayList<>();for (NamedList<Object> charFilterNamedList : charFiltersList) {Map<String, Object> charFilterAttributes = extractAttributeMap(charFilterNamedList);charFiltersAttributesList.add(charFilterAttributes);@@ -71,7 +71,7 @@ public class SchemaResponse extends SolrResponseBase {}List<NamedList<Object>> filtersList =(List<NamedList<Object>>) analyzerNamedList.get("filters");- List<Map<String, Object>> filtersAttributesList = new LinkedList<>();+ List<Map<String, Object>> filtersAttributesList = new ArrayList<>();if (filtersList != null) {for (NamedList<Object> filterNamedList : filtersList) {Map<String, Object> filterAttributes = extractAttributeMap(filterNamedList);@@ -177,7 +177,7 @@ public class SchemaResponse extends SolrResponseBase {@SuppressWarnings("unchecked")private static List<Map<String, Object>> getFields(@SuppressWarnings({"rawtypes"}) Map schemaNamedList) {- List<Map<String, Object>> fieldsAttributes = new LinkedList<>();+ List<Map<String, Object>> fieldsAttributes = new ArrayList<>();List<NamedList<Object>> fieldsResponse =(List<NamedList<Object>>) schemaNamedList.get("fields");for (NamedList<Object> fieldNamedList : fieldsResponse) {@@ -192,7 +192,7 @@ public class SchemaResponse extends SolrResponseBase {@SuppressWarnings("unchecked")private static List<Map<String, Object>> getDynamicFields(@SuppressWarnings({"rawtypes"}) Map schemaNamedList) {- List<Map<String, Object>> dynamicFieldsAttributes = new LinkedList<>();+ List<Map<String, Object>> dynamicFieldsAttributes = new ArrayList<>();List<NamedList<Object>> dynamicFieldsResponse =(List<NamedList<Object>>) schemaNamedList.get("dynamicFields");for (NamedList<Object> fieldNamedList : dynamicFieldsResponse) {@@ -207,7 +207,7 @@ public class SchemaResponse extends SolrResponseBase {@SuppressWarnings("unchecked")private static List<Map<String, Object>> getCopyFields(@SuppressWarnings({"rawtypes"}) Map schemaNamedList) {- List<Map<String, Object>> copyFieldsAttributes = new LinkedList<>();+ List<Map<String, Object>> copyFieldsAttributes = new ArrayList<>();List<NamedList<Object>> copyFieldsResponse =(List<NamedList<Object>>) schemaNamedList.get("copyFields");for (NamedList<Object> copyFieldNamedList : copyFieldsResponse) {@@ -222,7 +222,7 @@ public class SchemaResponse extends SolrResponseBase {@SuppressWarnings("unchecked")private static List<FieldTypeDefinition> getFieldTypeDefinitions(@SuppressWarnings({"rawtypes"}) Map schemaNamedList) {- List<FieldTypeDefinition> fieldTypeDefinitions = new LinkedList<>();+ List<FieldTypeDefinition> fieldTypeDefinitions = new ArrayList<>();List<NamedList<Object>> fieldsResponse =(List<NamedList<Object>>) schemaNamedList.get("fieldTypes");for (NamedList<Object> fieldNamedList : fieldsResponse) {@@ -236,7 +236,7 @@ public class SchemaResponse extends SolrResponseBase {@SuppressWarnings("unchecked")private static List<FieldTypeRepresentation> getFieldTypeRepresentations(@SuppressWarnings({"rawtypes"}) Map schemaNamedList) {- List<FieldTypeRepresentation> fieldTypeRepresentations = new LinkedList<>();+ List<FieldTypeRepresentation> fieldTypeRepresentations = new ArrayList<>();List<NamedList<Object>> fieldsResponse =(List<NamedList<Object>>) schemaNamedList.get("fieldTypes");for (NamedList<Object> fieldNamedList : fieldsResponse) {diff --git a/solr/solrj/src/java/org/apache/solr/common/util/JsonRecordReader.java b/solr/solrj/src/java/org/apache/solr/common/util/JsonRecordReader.javaindex 851434988f2..c75e84a1d86 100644--- a/solr/solrj/src/java/org/apache/solr/common/util/JsonRecordReader.java+++ b/solr/solrj/src/java/org/apache/solr/common/util/JsonRecordReader.java@@ -30,14 +30,13 @@ import static org.noggit.JSONParser.STRING;import java.io.IOException;import java.io.Reader;+import java.util.ArrayDeque;import java.util.ArrayList;import java.util.HashSet;import java.util.LinkedHashMap;-import java.util.LinkedList;import java.util.List;import java.util.Map;import java.util.Set;-import java.util.Stack;import org.noggit.JSONParser;/** A Streaming parser for json to emit one record at a time. */@@ -285,14 +284,14 @@ public class JsonRecordReader {if (event == EOF) break;if (event == OBJECT_START) {handleObjectStart(- parser, handler, new LinkedHashMap<>(), new Stack<>(), recordStarted, null);+ parser, handler, new LinkedHashMap<>(), new ArrayDeque<>(), recordStarted, null);} else if (event == ARRAY_START) {for (; ; ) {event = parser.nextEvent();if (event == ARRAY_END) break;if (event == OBJECT_START) {handleObjectStart(- parser, handler, new LinkedHashMap<>(), new Stack<>(), recordStarted, null);+ parser, handler, new LinkedHashMap<>(), new ArrayDeque<>(), recordStarted, null);}}}@@ -313,7 +312,7 @@ public class JsonRecordReader {final JSONParser parser,final Handler handler,final Map<String, Object> values,- final Stack<Set<String>> stack,+ final ArrayDeque<Set<String>> stack,boolean recordStarted,MethodFrameWrapper frameWrapper)throws IOException {@@ -369,7 +368,7 @@ public class JsonRecordReader {parser,(record, path) -> addChildDoc2ParentDoc(record, values, getPathSuffix(path)),new LinkedHashMap<>(),- new Stack<>(),+ new ArrayDeque<>(),true,this);} else {@@ -519,7 +518,7 @@ public class JsonRecordReader {* multiple separators appear.*/private static List<String> splitEscapeQuote(String str) {- List<String> result = new LinkedList<>();+ List<String> result = new ArrayList<>();String[] ss = str.split("/");for (int i = 0; i < ss.length; i++) { // i=1: skip separator at start of stringStringBuilder sb = new StringBuilder();diff --git a/solr/solrj/src/java/org/apache/solr/common/util/JsonSchemaValidator.java b/solr/solrj/src/java/org/apache/solr/common/util/JsonSchemaValidator.javaindex af350fffa97..0501d19486f 100644--- a/solr/solrj/src/java/org/apache/solr/common/util/JsonSchemaValidator.java+++ b/solr/solrj/src/java/org/apache/solr/common/util/JsonSchemaValidator.java@@ -17,11 +17,11 @@package org.apache.solr.common.util;+import java.util.ArrayList;import java.util.Arrays;import java.util.Collections;import java.util.HashMap;import java.util.HashSet;-import java.util.LinkedList;import java.util.List;import java.util.Locale;import java.util.Map;@@ -47,7 +47,7 @@ public class JsonSchemaValidator {}public JsonSchemaValidator(Map<?, ?> jsonSchema) {- this.validators = new LinkedList<>();+ this.validators = new ArrayList<>();for (Map.Entry<?, ?> entry : jsonSchema.entrySet()) {Object fname = entry.getKey();if (KNOWN_FNAMES.contains(fname.toString())) continue;@@ -82,7 +82,7 @@ public class JsonSchemaValidator {}public List<String> validateJson(Object data) {- List<String> errs = new LinkedList<>();+ List<String> errs = new ArrayList<>();validate(data, errs);return errs.isEmpty() ? null : errs;}diff --git a/solr/solrj/src/java/org/apache/solr/common/util/PathTrie.java b/solr/solrj/src/java/org/apache/solr/common/util/PathTrie.javaindex d6b905f98e2..21089a9c92a 100644--- a/solr/solrj/src/java/org/apache/solr/common/util/PathTrie.java+++ b/solr/solrj/src/java/org/apache/solr/common/util/PathTrie.java@@ -243,7 +243,7 @@ public class PathTrie<T> {if (n == null) {n = children.get("*");if (n != null) {- StringBuffer sb = new StringBuffer();+ StringBuilder sb = new StringBuilder();for (int i = index; i < pathSegments.size(); i++) {sb.append("/").append(pathSegments.get(i));}diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/graph/GraphExpressionTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/graph/GraphExpressionTest.javaindex 60bc0b274ed..5ef40f57812 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/graph/GraphExpressionTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/graph/GraphExpressionTest.java@@ -150,7 +150,7 @@ public class GraphExpressionTest extends SolrCloudTestCase {assertEquals(2, tuples.size());for (Tuple tuple : tuples) {- paths.add(tuple.getStrings("path").toString());+ paths.add(tuple.get("path").toString());}assertTrue(paths.contains("[jim, dave, alex, steve]"));@@ -177,7 +177,7 @@ public class GraphExpressionTest extends SolrCloudTestCase {assertEquals(2, tuples.size());for (Tuple tuple : tuples) {- paths.add(tuple.getStrings("path").toString());+ paths.add(tuple.get("path").toString());}assertTrue(paths.contains("[jim, dave, alex, steve]"));@@ -241,7 +241,7 @@ public class GraphExpressionTest extends SolrCloudTestCase {assertEquals(1, tuples.size());for (Tuple tuple : tuples) {- paths.add(tuple.getStrings("path").toString());+ paths.add(tuple.get("path").toString());}assertTrue(paths.contains("[jim, stan, mary, steve]"));diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/graph/GraphTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/graph/GraphTest.javaindex 6073c383b32..55dfec4f7a2 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/graph/GraphTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/graph/GraphTest.java@@ -46,8 +46,6 @@ public class GraphTest extends SolrCloudTestCase {private static final String id = "id";- private static final int TIMEOUT = 30;-@BeforeClasspublic static void setupCluster() throws Exception {configureCluster(2)@@ -112,7 +110,7 @@ public class GraphTest extends SolrCloudTestCase {assertEquals(2, tuples.size());for (Tuple tuple : tuples) {- paths.add(tuple.getStrings("path").toString());+ paths.add(tuple.get("path").toString());}assertTrue(paths.contains("[jim, dave, alex, steve]"));@@ -133,7 +131,7 @@ public class GraphTest extends SolrCloudTestCase {assertEquals(2, tuples.size());for (Tuple tuple : tuples) {- paths.add(tuple.getStrings("path").toString());+ paths.add(tuple.get("path").toString());}assertTrue(paths.contains("[jim, dave, alex, steve]"));@@ -178,7 +176,7 @@ public class GraphTest extends SolrCloudTestCase {assertEquals(1, tuples.size());for (Tuple tuple : tuples) {- paths.add(tuple.getStrings("path").toString());+ paths.add(tuple.get("path").toString());}assertTrue(paths.contains("[jim, stan, mary, steve]"));diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/ParallelFacetStreamOverAliasTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/ParallelFacetStreamOverAliasTest.javaindex 67d73f21ce3..d7e90a09c42 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/ParallelFacetStreamOverAliasTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/ParallelFacetStreamOverAliasTest.java@@ -21,7 +21,6 @@ import static org.apache.solr.client.solrj.io.stream.FacetStream.TIERED_PARAM;import java.io.IOException;import java.util.ArrayList;-import java.util.LinkedList;import java.util.List;import java.util.Locale;import java.util.Map;@@ -110,7 +109,7 @@ public class ParallelFacetStreamOverAliasTest extends SolrCloudTestCase {}List<String> collections = new ArrayList<>(NUM_COLLECTIONS);- final List<Exception> errors = new LinkedList<>();+ final List<Exception> errors = new ArrayList<>();Stream.iterate(1, n -> n + 1).limit(NUM_COLLECTIONS).forEach(@@ -166,7 +165,7 @@ public class ParallelFacetStreamOverAliasTest extends SolrCloudTestCase {// cleanup the alias and the collections behind itCollectionAdminRequest.deleteAlias(ALIAS_NAME).process(cluster.getSolrClient());if (listOfCollections != null) {- final List<Exception> errors = new LinkedList<>();+ final List<Exception> errors = new ArrayList<>();listOfCollections.stream().map(CollectionAdminRequest::deleteCollection).forEach(diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamingTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamingTest.javaindex ad5050cfb2c..e64194dc532 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamingTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamingTest.java@@ -24,7 +24,6 @@ import java.util.ArrayList;import java.util.Arrays;import java.util.Date;import java.util.HashSet;-import java.util.LinkedList;import java.util.List;import java.util.Locale;import java.util.Map;@@ -3075,7 +3074,7 @@ public class StreamingTest extends SolrCloudTestCase {t = stream.read();}- List<String> baseUrls = new LinkedList<>();+ List<String> baseUrls = new ArrayList<>();ZkStateReader zkStateReader = cluster.getZkStateReader();List<String> resolved =zkStateReader.aliasesManager.getAliases().resolveAliases(MULTI_REPLICA_COLLECTIONORALIAS);diff --git a/solr/solrj/src/test/org/apache/solr/common/util/TestFastWriter.java b/solr/solrj/src/test/org/apache/solr/common/util/TestFastWriter.javaindex 9c38b3e5289..382c2093c98 100644--- a/solr/solrj/src/test/org/apache/solr/common/util/TestFastWriter.java+++ b/solr/solrj/src/test/org/apache/solr/common/util/TestFastWriter.java@@ -17,13 +17,13 @@package org.apache.solr.common.util;import java.io.IOException;-import java.util.LinkedList;+import java.util.ArrayList;import java.util.List;import java.util.Random;import org.apache.solr.SolrTestCase;class MemWriter extends FastWriter {- public List<char[]> buffers = new LinkedList<>();+ public List<char[]> buffers = new ArrayList<>();Random r;diff --git a/solr/solrj/src/test/org/apache/solr/common/util/TestJavaBinCodec.java b/solr/solrj/src/test/org/apache/solr/common/util/TestJavaBinCodec.javaindex 1a62cafd3ac..545552d40f4 100644--- a/solr/solrj/src/test/org/apache/solr/common/util/TestJavaBinCodec.java+++ b/solr/solrj/src/test/org/apache/solr/common/util/TestJavaBinCodec.java@@ -564,7 +564,7 @@ public class TestJavaBinCodec extends SolrTestCaseJ4 {// common-case asciistatic String str(Random r, int sz) {- StringBuffer sb = new StringBuffer(sz);+ StringBuilder sb = new StringBuilder(sz);for (int i = 0; i < sz; i++) {sb.append('\n' + r.nextInt(128 - '\n'));}diff --git a/solr/solrj/src/test/org/apache/solr/common/util/Utf8CharSequenceTest.java b/solr/solrj/src/test/org/apache/solr/common/util/Utf8CharSequenceTest.javaindex da30d6c17e8..64b976e4a73 100644--- a/solr/solrj/src/test/org/apache/solr/common/util/Utf8CharSequenceTest.java+++ b/solr/solrj/src/test/org/apache/solr/common/util/Utf8CharSequenceTest.java@@ -27,11 +27,7 @@ import org.apache.solr.SolrTestCaseJ4;public class Utf8CharSequenceTest extends SolrTestCaseJ4 {public void testLargeString() throws IOException {- StringBuilder sb = new StringBuilder();- for (int i = 0; i < 100; i++) {- sb.append("Hello World!");- }- ByteArrayUtf8CharSequence utf8 = new ByteArrayUtf8CharSequence(sb.toString());+ ByteArrayUtf8CharSequence utf8 = new ByteArrayUtf8CharSequence("Hello World!".repeat(100));ByteArrayOutputStream baos = new ByteArrayOutputStream();byte[] buf = new byte[256];try (FastOutputStream fos = new FastOutputStream(baos, buf, 0)) {@@ -66,18 +62,12 @@ public class Utf8CharSequenceTest extends SolrTestCaseJ4 {NamedList<String> nl = new NamedList<>();String str = " The value!";for (int i = 0; i < 5; i++) {- StringBuffer sb = new StringBuffer();- sb.append(i);- for (int j = 0; j < i; j++) {- sb.append(str);- }- nl.add("key" + i, sb.toString());+ nl.add("key" + i, i + str.repeat(i));}- StringBuffer sb = new StringBuffer();- for (; ; ) {+ StringBuilder sb = new StringBuilder();+ do {sb.append(str);- if (sb.length() > 1024 * 4) break;- }+ } while (sb.length() <= 1024 * 4);nl.add("key_long", sb.toString());nl.add("key5", "5" + str);ByteArrayOutputStream baos = new ByteArrayOutputStream();diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractCollectionsAPIDistributedZkTestBase.java b/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractCollectionsAPIDistributedZkTestBase.javaindex 8adc026d1d6..0a1a80c271a 100644--- a/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractCollectionsAPIDistributedZkTestBase.java+++ b/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractCollectionsAPIDistributedZkTestBase.java@@ -31,7 +31,6 @@ import java.util.Collection;import java.util.Collections;import java.util.HashMap;import java.util.HashSet;-import java.util.LinkedList;import java.util.List;import java.util.Map;import java.util.Map.Entry;@@ -588,7 +587,7 @@ public abstract class AbstractCollectionsAPIDistributedZkTestBase extends SolrClprivate void checkNoTwoShardsUseTheSameIndexDir() {Map<String, Set<String>> indexDirToShardNamesMap = new HashMap<>();- List<MBeanServer> servers = new LinkedList<>();+ List<MBeanServer> servers = new ArrayList<>();servers.add(ManagementFactory.getPlatformMBeanServer());servers.addAll(MBeanServerFactory.findMBeanServer(null));for (final MBeanServer server : servers) {diff --git a/solr/test-framework/src/java/org/apache/solr/handler/component/TrackingShardHandlerFactory.java b/solr/test-framework/src/java/org/apache/solr/handler/component/TrackingShardHandlerFactory.javaindex 85dfe49bedd..4ae1ba9afdf 100644--- a/solr/test-framework/src/java/org/apache/solr/handler/component/TrackingShardHandlerFactory.java+++ b/solr/test-framework/src/java/org/apache/solr/handler/component/TrackingShardHandlerFactory.java@@ -16,9 +16,9 @@*/package org.apache.solr.handler.component;+import java.util.ArrayDeque;import java.util.ArrayList;import java.util.Collections;-import java.util.LinkedList;import java.util.List;import java.util.Map;import java.util.Queue;@@ -198,7 +198,7 @@ public class TrackingShardHandlerFactory extends HttpShardHandlerFactory {* org.apache.solr.handler.component.TrackingShardHandlerFactory#setTrackingQueue(java.util.List,* java.util.Queue)*/- public static class RequestTrackingQueue extends LinkedList<ShardRequestAndParams> {+ public static class RequestTrackingQueue extends ArrayDeque<ShardRequestAndParams> {private final Map<String, List<ShardRequestAndParams>> requests = new ConcurrentHashMap<>();@Override