diff --git a/server/src/main/java/org/elasticsearch/action/search/CCSSingleCoordinatorSearchProgressListener.java b/server/src/main/java/org/elasticsearch/action/search/CCSSingleCoordinatorSearchProgressListener.java index 2663b6d9baaa..38f6361f27e4 100644 --- a/server/src/main/java/org/elasticsearch/action/search/CCSSingleCoordinatorSearchProgressListener.java +++ b/server/src/main/java/org/elasticsearch/action/search/CCSSingleCoordinatorSearchProgressListener.java @@ -188,7 +188,7 @@ public class CCSSingleCoordinatorSearchProgressListener extends SearchProgressLi for (Map.Entry entry : totalByClusterAlias.entrySet()) { String clusterAlias = entry.getKey(); - int successfulCount = entry.getValue().intValue(); + int successfulCount = entry.getValue(); clusters.swapCluster(clusterAlias, (k, v) -> { SearchResponse.Cluster.Status status = v.getStatus(); @@ -231,7 +231,7 @@ public class CCSSingleCoordinatorSearchProgressListener extends SearchProgressLi for (Map.Entry entry : totalByClusterAlias.entrySet()) { String clusterAlias = entry.getKey(); - int successfulCount = entry.getValue().intValue(); + int successfulCount = entry.getValue(); clusters.swapCluster(clusterAlias, (k, v) -> { SearchResponse.Cluster.Status status = v.getStatus(); diff --git a/server/src/main/java/org/elasticsearch/action/search/CountOnlyQueryPhaseResultConsumer.java b/server/src/main/java/org/elasticsearch/action/search/CountOnlyQueryPhaseResultConsumer.java index b52d76aac413..a454181bf47a 100644 --- a/server/src/main/java/org/elasticsearch/action/search/CountOnlyQueryPhaseResultConsumer.java +++ b/server/src/main/java/org/elasticsearch/action/search/CountOnlyQueryPhaseResultConsumer.java @@ -27,8 +27,8 @@ import java.util.stream.Stream; * store any other information. */ class CountOnlyQueryPhaseResultConsumer extends SearchPhaseResults { - AtomicReference relationAtomicReference = new AtomicReference<>(TotalHits.Relation.EQUAL_TO); - LongAdder totalHits = new LongAdder(); + final AtomicReference relationAtomicReference = new AtomicReference<>(TotalHits.Relation.EQUAL_TO); + final LongAdder totalHits = new LongAdder(); private final AtomicBoolean terminatedEarly = new AtomicBoolean(false); private final AtomicBoolean timedOut = new AtomicBoolean(false); diff --git a/server/src/main/java/org/elasticsearch/action/search/SearchRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/search/SearchRequestBuilder.java index d309ef3a7498..7b2834b1179a 100644 --- a/server/src/main/java/org/elasticsearch/action/search/SearchRequestBuilder.java +++ b/server/src/main/java/org/elasticsearch/action/search/SearchRequestBuilder.java @@ -121,14 +121,6 @@ public class SearchRequestBuilder extends ActionRequestBuilder diff --git a/server/src/main/java/org/elasticsearch/action/search/SearchResponse.java b/server/src/main/java/org/elasticsearch/action/search/SearchResponse.java index 2a9acd465f72..88967b602215 100644 --- a/server/src/main/java/org/elasticsearch/action/search/SearchResponse.java +++ b/server/src/main/java/org/elasticsearch/action/search/SearchResponse.java @@ -786,7 +786,7 @@ public class SearchResponse extends ActionResponse implements ChunkedToXContentO * for tracking search Cluster details. */ public boolean hasClusterObjects() { - return clusterInfo.keySet().size() > 0; + return clusterInfo.isEmpty() == false; } /** @@ -855,27 +855,6 @@ public class SearchResponse extends ActionResponse implements ChunkedToXContentO this(clusterAlias, indexExpression, skipUnavailable, Status.RUNNING, null, null, null, null, null, null, false); } - /** - * Create a Cluster with a new Status and one or more ShardSearchFailures. This constructor - * should only be used for fatal failures where shard counters (total, successful, skipped, failed) - * are not known (unset). - * @param clusterAlias clusterAlias as defined in the remote cluster settings or RemoteClusterAware.LOCAL_CLUSTER_GROUP_KEY - * for the local cluster - * @param indexExpression the original (not resolved/concrete) indices expression provided for this cluster. - * @param skipUnavailable whether cluster is marked as skip_unavailable in remote cluster settings - * @param status current status of the search on this Cluster - * @param failures list of failures that occurred during the search on this Cluster - */ - public Cluster( - String clusterAlias, - String indexExpression, - boolean skipUnavailable, - Status status, - List failures - ) { - this(clusterAlias, indexExpression, skipUnavailable, status, null, null, null, null, failures, null, false); - } - public Cluster( String clusterAlias, String indexExpression, @@ -1034,7 +1013,7 @@ public class SearchResponse extends ActionResponse implements ChunkedToXContentO @Override public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException { String name = clusterAlias; - if (clusterAlias.equals("")) { + if (clusterAlias.isEmpty()) { name = LOCAL_CLUSTER_NAME_REPRESENTATION; } builder.startObject(name); diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/InternalDateRange.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/InternalDateRange.java index 9994a2bca08b..4ccc133bcf36 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/InternalDateRange.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/InternalDateRange.java @@ -10,7 +10,6 @@ package org.elasticsearch.search.aggregations.bucket.range; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.search.DocValueFormat; -import org.elasticsearch.search.aggregations.InternalAggregation; import org.elasticsearch.search.aggregations.InternalAggregations; import java.io.IOException; @@ -25,10 +24,6 @@ public class InternalDateRange extends InternalRange aggregations, DocValueFormat formatter) { - super(key, from, to, docCount, InternalAggregations.from(aggregations), formatter); - } - public Bucket(String key, double from, double to, long docCount, InternalAggregations aggregations, DocValueFormat formatter) { super(key, from, to, docCount, aggregations, formatter); } diff --git a/server/src/main/java/org/elasticsearch/search/builder/PointInTimeBuilder.java b/server/src/main/java/org/elasticsearch/search/builder/PointInTimeBuilder.java index eecc840e8602..913dec7e56a3 100644 --- a/server/src/main/java/org/elasticsearch/search/builder/PointInTimeBuilder.java +++ b/server/src/main/java/org/elasticsearch/search/builder/PointInTimeBuilder.java @@ -124,14 +124,6 @@ public final class PointInTimeBuilder implements Writeable, ToXContentFragment { return this; } - /** - * If specified, the search layer will keep this point in time around for at least the given keep-alive. - * Otherwise, the point in time will be kept around until the original keep alive elapsed. - */ - public PointInTimeBuilder setKeepAlive(String keepAlive) { - return setKeepAlive(TimeValue.parseTimeValue(keepAlive, "keep_alive")); - } - @Nullable public TimeValue getKeepAlive() { return keepAlive; diff --git a/server/src/main/java/org/elasticsearch/search/fetch/FetchContext.java b/server/src/main/java/org/elasticsearch/search/fetch/FetchContext.java index 2523c6201521..0bbbff3a5d5f 100644 --- a/server/src/main/java/org/elasticsearch/search/fetch/FetchContext.java +++ b/server/src/main/java/org/elasticsearch/search/fetch/FetchContext.java @@ -10,7 +10,6 @@ package org.elasticsearch.search.fetch; import org.apache.lucene.search.Query; -import org.elasticsearch.index.cache.bitset.BitsetFilterCache; import org.elasticsearch.index.mapper.SourceFieldMapper; import org.elasticsearch.index.mapper.SourceLoader; import org.elasticsearch.index.query.ParsedQuery; @@ -88,10 +87,6 @@ public class FetchContext { return sfc; } - public BitsetFilterCache bitsetFilterCache() { - return searchContext.bitsetFilterCache(); - } - /** * The name of the index that documents are being fetched from */ diff --git a/server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightBuilder.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightBuilder.java index 7f591714cba3..1997601e73f6 100644 --- a/server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightBuilder.java +++ b/server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightBuilder.java @@ -327,17 +327,6 @@ public final class HighlightBuilder extends AbstractHighlighterBuilder, public static final ParseField NAME_FIELD = new ParseField("_name"); - protected static void declareBaseParserFields( - String name, - AbstractObjectParser parser - ) { + protected static void declareBaseParserFields(AbstractObjectParser parser) { parser.declareObjectArray( (r, v) -> r.preFilterQueryBuilders = new ArrayList<>(v), (p, c) -> AbstractQueryBuilder.parseTopLevelQuery(p, c::trackQueryUsage), diff --git a/server/src/main/java/org/elasticsearch/search/retriever/StandardRetrieverBuilder.java b/server/src/main/java/org/elasticsearch/search/retriever/StandardRetrieverBuilder.java index 3ca74dc133d4..02d01bb2f45f 100644 --- a/server/src/main/java/org/elasticsearch/search/retriever/StandardRetrieverBuilder.java +++ b/server/src/main/java/org/elasticsearch/search/retriever/StandardRetrieverBuilder.java @@ -74,7 +74,7 @@ public final class StandardRetrieverBuilder extends RetrieverBuilder implements COLLAPSE_FIELD, ObjectParser.ValueType.OBJECT ); - RetrieverBuilder.declareBaseParserFields(NAME, PARSER); + RetrieverBuilder.declareBaseParserFields(PARSER); } public static StandardRetrieverBuilder fromXContent(XContentParser parser, RetrieverParserContext context) throws IOException { diff --git a/server/src/main/java/org/elasticsearch/search/suggest/phrase/WordScorer.java b/server/src/main/java/org/elasticsearch/search/suggest/phrase/WordScorer.java index d3e4792d7da5..4c1fdfeadacf 100644 --- a/server/src/main/java/org/elasticsearch/search/suggest/phrase/WordScorer.java +++ b/server/src/main/java/org/elasticsearch/search/suggest/phrase/WordScorer.java @@ -9,7 +9,6 @@ package org.elasticsearch.search.suggest.phrase; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.MultiTerms; import org.apache.lucene.index.Terms; import org.apache.lucene.index.TermsEnum; import org.apache.lucene.util.BytesRef; @@ -30,10 +29,6 @@ public abstract class WordScorer { private final TermsEnum termsEnum; private final boolean useTotalTermFreq; - public WordScorer(IndexReader reader, String field, double realWordLikelihood, BytesRef separator) throws IOException { - this(reader, MultiTerms.getTerms(reader, field), field, realWordLikelihood, separator); - } - public WordScorer(IndexReader reader, Terms terms, String field, double realWordLikelihood, BytesRef separator) throws IOException { if (terms == null) { throw new IllegalArgumentException("Field: [" + field + "] does not exist"); diff --git a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/retriever/QueryRuleRetrieverBuilder.java b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/retriever/QueryRuleRetrieverBuilder.java index f40227819720..ac359bc4446f 100644 --- a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/retriever/QueryRuleRetrieverBuilder.java +++ b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/retriever/QueryRuleRetrieverBuilder.java @@ -70,7 +70,7 @@ public final class QueryRuleRetrieverBuilder extends CompoundRetrieverBuilder