Skip to content

Commit 75fd06c

Browse files
committed
Reenable Checkstyle's unused import rule (#31270)
1 parent 2ca0181 commit 75fd06c

File tree

91 files changed

+22
-198
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+22
-198
lines changed

buildSrc/src/main/resources/checkstyle.xml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,9 @@
2626
</module>
2727

2828
<module name="AvoidStarImport" />
29-
<!-- Doesn't pass but we could make it pass pretty quick.
30-
<module name="UnusedImports">
31-
The next property is optional. If we remove it then imports that are
32-
only referenced by Javadoc cause the check to fail.
33-
<property name="processJavadoc" value="true" />
34-
</module>
35-
-->
29+
30+
<!-- Unused imports are forbidden -->
31+
<module name="UnusedImports" />
3632

3733
<!-- Non-inner classes must be in files that match their names. -->
3834
<module name="OuterTypeFilename" />

client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/MigrationDocumentationIT.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,6 @@
3030
import org.elasticsearch.client.RequestOptions;
3131
import org.elasticsearch.client.Response;
3232
import org.elasticsearch.client.RestHighLevelClient;
33-
import org.apache.http.HttpEntity;
34-
import org.apache.http.HttpStatus;
35-
import org.apache.http.entity.ContentType;
36-
import org.apache.http.nio.entity.NStringEntity;
3733
import org.elasticsearch.cluster.health.ClusterHealthStatus;
3834
import org.elasticsearch.common.xcontent.XContentHelper;
3935
import org.elasticsearch.common.xcontent.XContentType;

modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/SynonymsAnalysisTests.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,8 @@
2222
import org.apache.lucene.analysis.Analyzer;
2323
import org.apache.lucene.analysis.TokenStream;
2424
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
25-
import org.apache.lucene.queryparser.classic.ParseException;
2625
import org.elasticsearch.Version;
2726
import org.elasticsearch.cluster.metadata.IndexMetaData;
28-
import org.elasticsearch.common.logging.Loggers;
2927
import org.elasticsearch.common.lucene.all.AllTokenStream;
3028
import org.elasticsearch.common.settings.Settings;
3129
import org.elasticsearch.env.Environment;

modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/ScriptProcessorFactoryTests.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
package org.elasticsearch.ingest.common;
2121

2222
import org.elasticsearch.ElasticsearchException;
23-
import org.elasticsearch.common.xcontent.XContentParseException;
2423
import org.elasticsearch.script.Script;
2524
import org.elasticsearch.script.ScriptException;
2625
import org.elasticsearch.script.ScriptService;

modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/RangeFieldQueryStringQueryBuilderTests.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,17 @@
2121

2222
import org.apache.lucene.document.DoubleRange;
2323
import org.apache.lucene.document.FloatRange;
24-
import org.apache.lucene.document.InetAddressPoint;
2524
import org.apache.lucene.document.InetAddressRange;
2625
import org.apache.lucene.document.IntRange;
2726
import org.apache.lucene.document.LongRange;
2827
import org.apache.lucene.queries.BinaryDocValuesRangeQuery;
2928
import org.apache.lucene.search.IndexOrDocValuesQuery;
3029
import org.apache.lucene.search.PointRangeQuery;
3130
import org.apache.lucene.search.Query;
32-
import org.apache.lucene.util.BytesRef;
3331
import org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest;
3432
import org.elasticsearch.common.Strings;
3533
import org.elasticsearch.common.compress.CompressedXContent;
3634
import org.elasticsearch.common.joda.DateMathParser;
37-
import org.elasticsearch.common.joda.Joda;
3835
import org.elasticsearch.common.network.InetAddresses;
3936
import org.elasticsearch.index.query.QueryShardContext;
4037
import org.elasticsearch.index.query.QueryStringQueryBuilder;

modules/parent-join/src/test/java/org/elasticsearch/join/query/LegacyHasChildQueryBuilderTests.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
import org.apache.lucene.util.BytesRef;
3434
import org.elasticsearch.Version;
3535
import org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest;
36-
import org.elasticsearch.cluster.metadata.IndexMetaData;
3736
import org.elasticsearch.common.Strings;
3837
import org.elasticsearch.common.compress.CompressedXContent;
3938
import org.elasticsearch.common.settings.Settings;

modules/percolator/src/main/java/org/elasticsearch/percolator/QueryAnalyzer.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@
5555
import java.util.ArrayList;
5656
import java.util.Arrays;
5757
import java.util.Collections;
58-
import java.util.Comparator;
5958
import java.util.HashMap;
6059
import java.util.HashSet;
6160
import java.util.List;

modules/reindex/src/test/java/org/elasticsearch/client/documentation/ReindexDocumentationIT.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import org.elasticsearch.index.reindex.BulkByScrollTask;
2929
import org.elasticsearch.index.reindex.DeleteByQueryAction;
3030
import org.elasticsearch.index.reindex.ReindexAction;
31-
import org.elasticsearch.index.reindex.ReindexRequestBuilder;
3231
import org.elasticsearch.index.reindex.RethrottleAction;
3332
import org.elasticsearch.index.reindex.UpdateByQueryAction;
3433
import org.elasticsearch.index.reindex.UpdateByQueryRequestBuilder;

modules/transport-netty4/src/main/java/org/elasticsearch/transport/netty4/Netty4Transport.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@
5656
import org.elasticsearch.common.util.concurrent.EsExecutors;
5757
import org.elasticsearch.indices.breaker.CircuitBreakerService;
5858
import org.elasticsearch.threadpool.ThreadPool;
59-
import org.elasticsearch.transport.TcpChannel;
6059
import org.elasticsearch.transport.TcpTransport;
6160
import org.elasticsearch.transport.TransportRequestOptions;
6261

modules/transport-netty4/src/main/java/org/elasticsearch/transport/netty4/NettyTcpChannel.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,14 @@
2020
package org.elasticsearch.transport.netty4;
2121

2222
import io.netty.channel.Channel;
23-
import io.netty.channel.ChannelFuture;
2423
import io.netty.channel.ChannelOption;
2524
import io.netty.channel.ChannelPromise;
26-
import org.apache.logging.log4j.message.ParameterizedMessage;
27-
import org.apache.logging.log4j.util.Supplier;
28-
import org.elasticsearch.ElasticsearchException;
2925
import org.elasticsearch.action.ActionListener;
3026
import org.elasticsearch.common.bytes.BytesReference;
3127
import org.elasticsearch.transport.TcpChannel;
3228
import org.elasticsearch.transport.TransportException;
3329

3430
import java.net.InetSocketAddress;
35-
import java.nio.channels.ClosedSelectorException;
3631
import java.util.concurrent.CompletableFuture;
3732

3833
public class NettyTcpChannel implements TcpChannel {

modules/transport-netty4/src/test/java/org/elasticsearch/http/netty4/Netty4HttpServerPipeliningTests.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import io.netty.handler.codec.http.HttpHeaderNames;
3333
import io.netty.handler.codec.http.HttpResponseStatus;
3434
import io.netty.handler.codec.http.HttpVersion;
35-
import org.elasticsearch.common.network.NetworkModule;
3635
import org.elasticsearch.common.network.NetworkService;
3736
import org.elasticsearch.common.settings.Setting;
3837
import org.elasticsearch.common.settings.Settings;

plugins/discovery-file/src/main/java/org/elasticsearch/discovery/file/FileBasedUnicastHostsProvider.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import org.apache.logging.log4j.util.Supplier;
2424
import org.elasticsearch.cluster.node.DiscoveryNode;
2525
import org.elasticsearch.common.component.AbstractComponent;
26-
import org.elasticsearch.common.settings.Settings;
2726
import org.elasticsearch.common.unit.TimeValue;
2827
import org.elasticsearch.discovery.zen.UnicastHostsProvider;
2928
import org.elasticsearch.env.Environment;

plugins/discovery-gce/src/main/java/org/elasticsearch/plugin/discovery/gce/GceDiscoveryPlugin.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import org.elasticsearch.cloud.gce.GceMetadataService;
3030
import org.elasticsearch.cloud.gce.network.GceNameResolver;
3131
import org.elasticsearch.cloud.gce.util.Access;
32-
import org.elasticsearch.common.logging.DeprecationLogger;
3332
import org.elasticsearch.common.logging.Loggers;
3433
import org.elasticsearch.common.network.NetworkService;
3534
import org.elasticsearch.common.settings.Setting;

plugins/repository-azure/src/main/java/org/elasticsearch/cloud/azure/blobstore/AzureBlobContainer.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import java.io.InputStream;
3333
import java.net.HttpURLConnection;
3434
import java.net.URISyntaxException;
35-
import java.nio.file.FileAlreadyExistsException;
3635
import java.nio.file.NoSuchFileException;
3736
import java.util.Map;
3837

qa/query-builder-bwc/src/test/java/org/elasticsearch/bwc/QueryBuilderBWCIT.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@
1919

2020
package org.elasticsearch.bwc;
2121

22-
import org.apache.http.entity.ContentType;
23-
import org.apache.http.entity.StringEntity;
24-
import org.apache.http.util.EntityUtils;
2522
import org.apache.http.util.EntityUtils;
2623
import org.elasticsearch.Version;
2724
import org.elasticsearch.client.Request;

server/src/main/java/org/elasticsearch/action/bulk/TransportShardBulkAction.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import org.elasticsearch.action.index.IndexRequest;
3030
import org.elasticsearch.action.index.IndexResponse;
3131
import org.elasticsearch.action.support.ActionFilters;
32-
import org.elasticsearch.action.support.TransportActions;
3332
import org.elasticsearch.action.support.replication.ReplicationOperation;
3433
import org.elasticsearch.action.support.replication.ReplicationResponse.ShardInfo;
3534
import org.elasticsearch.action.support.replication.TransportReplicationAction;

server/src/main/java/org/elasticsearch/action/get/TransportGetAction.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import org.elasticsearch.cluster.ClusterState;
2626
import org.elasticsearch.cluster.metadata.IndexMetaData;
2727
import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
28-
import org.elasticsearch.cluster.routing.Preference;
2928
import org.elasticsearch.cluster.routing.ShardIterator;
3029
import org.elasticsearch.cluster.service.ClusterService;
3130
import org.elasticsearch.common.inject.Inject;

server/src/main/java/org/elasticsearch/action/ingest/PutPipelineAction.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
package org.elasticsearch.action.ingest;
2121

2222
import org.elasticsearch.action.Action;
23-
import org.elasticsearch.action.index.IndexResponse;
2423
import org.elasticsearch.client.ElasticsearchClient;
2524

2625
public class PutPipelineAction extends Action<PutPipelineRequest, WritePipelineResponse, PutPipelineRequestBuilder> {

server/src/main/java/org/elasticsearch/action/search/TransportMultiSearchAction.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
import org.elasticsearch.threadpool.ThreadPool;
3535
import org.elasticsearch.transport.TransportService;
3636

37-
import java.util.List;
3837
import java.util.Queue;
3938
import java.util.concurrent.ConcurrentLinkedQueue;
4039
import java.util.concurrent.atomic.AtomicInteger;

server/src/main/java/org/elasticsearch/cluster/ClusterName.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import org.elasticsearch.common.io.stream.StreamInput;
2323
import org.elasticsearch.common.io.stream.StreamOutput;
2424
import org.elasticsearch.common.io.stream.Writeable;
25-
import org.elasticsearch.common.logging.Loggers;
2625
import org.elasticsearch.common.settings.Setting;
2726
import org.elasticsearch.common.settings.Settings;
2827

server/src/main/java/org/elasticsearch/cluster/metadata/MetaDataMappingService.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121

2222
import com.carrotsearch.hppc.cursors.ObjectCursor;
2323
import org.apache.logging.log4j.message.ParameterizedMessage;
24-
import org.apache.logging.log4j.util.Supplier;
2524
import org.elasticsearch.core.internal.io.IOUtils;
2625
import org.elasticsearch.action.ActionListener;
2726
import org.elasticsearch.action.admin.indices.mapping.put.PutMappingClusterStateUpdateRequest;

server/src/main/java/org/elasticsearch/common/CheckedRunnable.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919

2020
package org.elasticsearch.common;
2121

22-
import java.lang.Runnable;
23-
2422
/**
2523
* A {@link Runnable}-like interface which allows throwing checked exceptions.
2624
*/

server/src/main/java/org/elasticsearch/common/geo/builders/ShapeBuilders.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import java.util.List;
2323

2424
import org.locationtech.jts.geom.Coordinate;
25-
import org.elasticsearch.common.io.stream.NamedWriteableRegistry.Entry;
2625

2726
/**
2827
* A collection of static methods for creating ShapeBuilders.

server/src/main/java/org/elasticsearch/common/lucene/search/function/FunctionScoreQuery.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@
3030
import org.apache.lucene.search.ScorerSupplier;
3131
import org.apache.lucene.search.Weight;
3232
import org.apache.lucene.util.Bits;
33-
import org.apache.lucene.search.TopDocsCollector;
34-
import org.apache.lucene.search.TopScoreDocCollector;
3533
import org.elasticsearch.ElasticsearchException;
3634
import org.elasticsearch.common.io.stream.StreamInput;
3735
import org.elasticsearch.common.io.stream.StreamOutput;
@@ -376,9 +374,9 @@ public float score() throws IOException {
376374
double factor = computeScore(docId, subQueryScore);
377375
float finalScore = scoreCombiner.combine(subQueryScore, factor, maxBoost);
378376
if (finalScore == Float.NEGATIVE_INFINITY || Float.isNaN(finalScore)) {
379-
/**
380-
* These scores are invalid for score based {@link TopDocsCollector}s.
381-
* See {@link TopScoreDocCollector} for details.
377+
/*
378+
These scores are invalid for score based {@link org.apache.lucene.search.TopDocsCollector}s.
379+
See {@link org.apache.lucene.search.TopScoreDocCollector} for details.
382380
*/
383381
throw new ElasticsearchException("function score query returned an invalid score: " + finalScore + " for doc: " + docId);
384382
}

server/src/main/java/org/elasticsearch/common/settings/IndexScopedSettings.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
import org.elasticsearch.index.fielddata.IndexFieldDataService;
3737
import org.elasticsearch.index.mapper.FieldMapper;
3838
import org.elasticsearch.index.mapper.MapperService;
39-
import org.elasticsearch.index.seqno.LocalCheckpointTracker;
4039
import org.elasticsearch.index.similarity.SimilarityService;
4140
import org.elasticsearch.index.store.FsDirectoryService;
4241
import org.elasticsearch.index.store.Store;

server/src/main/java/org/elasticsearch/index/analysis/Analysis.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@
5656
import org.apache.lucene.analysis.tr.TurkishAnalyzer;
5757
import org.apache.lucene.util.Version;
5858
import org.elasticsearch.common.Strings;
59-
import org.elasticsearch.common.io.FileSystemUtils;
6059
import org.elasticsearch.common.logging.DeprecationLogger;
6160
import org.elasticsearch.common.logging.ESLoggerFactory;
6261
import org.elasticsearch.common.lucene.Lucene;

server/src/main/java/org/elasticsearch/index/engine/DeleteFailedEngineException.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
package org.elasticsearch.index.engine;
2121

2222
import org.elasticsearch.common.io.stream.StreamInput;
23-
import org.elasticsearch.index.shard.ShardId;
2423

2524
import java.io.IOException;
2625

@@ -34,4 +33,4 @@ public class DeleteFailedEngineException extends EngineException {
3433
public DeleteFailedEngineException(StreamInput in) throws IOException{
3534
super(in);
3635
}
37-
}
36+
}

server/src/main/java/org/elasticsearch/index/engine/IndexFailedEngineException.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,8 @@
2121

2222
import org.elasticsearch.common.io.stream.StreamInput;
2323
import org.elasticsearch.common.io.stream.StreamOutput;
24-
import org.elasticsearch.index.shard.ShardId;
2524

2625
import java.io.IOException;
27-
import java.util.Objects;
2826

2927
/**
3028
* Deprecated as not used in 6.0, should be removed in 7.0
@@ -58,4 +56,4 @@ public String type() {
5856
public String id() {
5957
return this.id;
6058
}
61-
}
59+
}

server/src/main/java/org/elasticsearch/index/mapper/GeoShapeFieldMapper.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import org.apache.lucene.spatial.prefix.tree.PackedQuadPrefixTree;
3131
import org.apache.lucene.spatial.prefix.tree.QuadPrefixTree;
3232
import org.apache.lucene.spatial.prefix.tree.SpatialPrefixTree;
33-
import org.elasticsearch.ElasticsearchException;
3433
import org.elasticsearch.Version;
3534
import org.elasticsearch.common.Explicit;
3635
import org.elasticsearch.common.geo.GeoUtils;

server/src/main/java/org/elasticsearch/index/mapper/MappedFieldType.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import org.apache.lucene.search.BooleanQuery;
3131
import org.apache.lucene.search.BoostQuery;
3232
import org.apache.lucene.search.ConstantScoreQuery;
33-
import org.apache.lucene.search.MatchNoDocsQuery;
3433
import org.apache.lucene.search.MultiTermQuery;
3534
import org.apache.lucene.search.Query;
3635
import org.apache.lucene.search.TermInSetQuery;
@@ -39,8 +38,6 @@
3938
import org.elasticsearch.common.Nullable;
4039
import org.elasticsearch.common.geo.ShapeRelation;
4140
import org.elasticsearch.common.joda.DateMathParser;
42-
import org.elasticsearch.common.logging.DeprecationLogger;
43-
import org.elasticsearch.common.logging.Loggers;
4441
import org.elasticsearch.common.lucene.all.AllTermQuery;
4542
import org.elasticsearch.common.unit.Fuzziness;
4643
import org.elasticsearch.index.analysis.NamedAnalyzer;

server/src/main/java/org/elasticsearch/index/mapper/StringFieldType.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import java.util.List;
2525

2626
import org.apache.lucene.analysis.TokenStream;
27-
import org.apache.lucene.analysis.shingle.FixedShingleFilter;
2827
import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute;
2928
import org.apache.lucene.analysis.tokenattributes.TermToBytesRefAttribute;
3029
import org.apache.lucene.index.Term;

server/src/main/java/org/elasticsearch/index/mapper/TextFieldMapper.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,22 +28,17 @@
2828
import org.apache.lucene.analysis.ngram.EdgeNGramTokenFilter;
2929
import org.apache.lucene.analysis.shingle.FixedShingleFilter;
3030
import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute;
31-
import org.apache.lucene.analysis.tokenattributes.TermToBytesRefAttribute;
3231
import org.apache.lucene.document.Field;
33-
import org.apache.lucene.document.FieldType;
3432
import org.apache.lucene.index.IndexOptions;
3533
import org.apache.lucene.index.IndexableField;
3634
import org.apache.lucene.index.Term;
3735
import org.apache.lucene.search.ConstantScoreQuery;
38-
import org.apache.lucene.search.MultiPhraseQuery;
3936
import org.apache.lucene.search.MultiTermQuery;
4037
import org.apache.lucene.search.NormsFieldExistsQuery;
41-
import org.apache.lucene.search.PhraseQuery;
4238
import org.apache.lucene.search.Query;
4339
import org.apache.lucene.search.TermQuery;
4440
import org.elasticsearch.Version;
4541
import org.elasticsearch.common.collect.Iterators;
46-
import org.elasticsearch.common.logging.DeprecationLogger;
4742
import org.elasticsearch.common.logging.ESLoggerFactory;
4843
import org.elasticsearch.common.settings.Settings;
4944
import org.elasticsearch.common.xcontent.XContentBuilder;

server/src/main/java/org/elasticsearch/index/query/ScriptQueryBuilder.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
import org.elasticsearch.common.xcontent.XContentParser;
3737
import org.elasticsearch.script.FilterScript;
3838
import org.elasticsearch.script.Script;
39-
import org.elasticsearch.script.SearchScript;
4039

4140
import java.io.IOException;
4241
import java.util.Objects;

server/src/main/java/org/elasticsearch/index/query/TypeQueryBuilder.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import org.elasticsearch.common.ParsingException;
2828
import org.elasticsearch.common.io.stream.StreamInput;
2929
import org.elasticsearch.common.io.stream.StreamOutput;
30-
import org.elasticsearch.common.lucene.BytesRefs;
3130
import org.elasticsearch.common.xcontent.XContentBuilder;
3231
import org.elasticsearch.common.xcontent.XContentParser;
3332
import org.elasticsearch.index.mapper.DocumentMapper;

server/src/main/java/org/elasticsearch/index/search/MatchQuery.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@
5454
import org.elasticsearch.common.lucene.search.MultiPhrasePrefixQuery;
5555
import org.elasticsearch.common.lucene.search.Queries;
5656
import org.elasticsearch.common.unit.Fuzziness;
57-
import org.elasticsearch.index.analysis.ShingleTokenFilterFactory;
5857
import org.elasticsearch.index.mapper.KeywordFieldMapper;
5958
import org.elasticsearch.index.mapper.MappedFieldType;
6059
import org.elasticsearch.index.query.QueryShardContext;
@@ -65,7 +64,7 @@
6564
import static org.elasticsearch.common.lucene.search.Queries.newLenientFieldQuery;
6665
import static org.elasticsearch.common.lucene.search.Queries.newUnmappedFieldQuery;
6766

68-
public class MatchQuery {
67+
public class MatchQuery {
6968

7069
private static final DeprecationLogger DEPRECATION_LOGGER = new DeprecationLogger(Loggers.getLogger(MappedFieldType.class));
7170

@@ -418,9 +417,9 @@ protected Query createFieldQuery(Analyzer analyzer, BooleanClause.Occur operator
418417
// query based on the analysis chain.
419418
try (TokenStream source = analyzer.tokenStream(field, queryText)) {
420419
if (source.hasAttribute(DisableGraphAttribute.class)) {
421-
/**
422-
* A {@link TokenFilter} in this {@link TokenStream} disabled the graph analysis to avoid
423-
* paths explosion. See {@link ShingleTokenFilterFactory} for details.
420+
/*
421+
A {@link TokenFilter} in this {@link TokenStream} disabled the graph analysis to avoid
422+
paths explosion. See {@link org.elasticsearch.index.analysis.ShingleTokenFilterFactory} for details.
424423
*/
425424
setEnableGraphQueries(false);
426425
}

0 commit comments

Comments
 (0)