honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-08 22:14:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not create two loggers for DeprecationLogger backport(#58435) (#61530)

Browse Source 
DeprecationLogger's constructor should not create two loggers. It was
taking parent logger instance, changing its name with a .deprecation
prefix and creating a new logger.
Most of the time parent logger was not needed. It was causing Log4j to
unnecessarily cache the unused parent logger instance.

depends on #61515
backports #58435
This commit is contained in:
Przemyslaw Gomulka 2020-08-26 16:04:02 +02:00 committed by GitHub
parent 3a8cfdc1f5
commit 9f566644af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
162 changed files with 199 additions and 420 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/rest-high-level/src/test/java/org/elasticsearch/client/RequestConvertersTests.java
View File

@ -27,7 +27,6 @@ import org.apache.http.client.methods.HttpPost;
import org.apache.http.client.methods.HttpPut; import org.apache.http.client.methods.HttpPut;
import org.apache.http.nio.entity.NByteArrayEntity; import org.apache.http.nio.entity.NByteArrayEntity;
import org.apache.http.util.EntityUtils; import org.apache.http.util.EntityUtils;
import org.apache.logging.log4j.LogManager;
import org.elasticsearch.action.DocWriteRequest; import org.elasticsearch.action.DocWriteRequest;
import org.elasticsearch.action.admin.cluster.storedscripts.DeleteStoredScriptRequest; import org.elasticsearch.action.admin.cluster.storedscripts.DeleteStoredScriptRequest;
import org.elasticsearch.action.admin.cluster.storedscripts.GetStoredScriptRequest; import org.elasticsearch.action.admin.cluster.storedscripts.GetStoredScriptRequest;
@ -138,8 +137,7 @@ import static org.hamcrest.Matchers.nullValue;
public class RequestConvertersTests extends ESTestCase { public class RequestConvertersTests extends ESTestCase {
private static final DeprecationLogger deprecationLogger = new DeprecationLogger( private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(RequestConvertersTests.class);
LogManager.getLogger(RequestConvertersTests.class));
public void testPing() { public void testPing() {
Request request = RequestConverters.ping(); Request request = RequestConverters.ping();

4
modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/CJKBigramFilterFactory.java
View File

@ -19,7 +19,6 @@
package org.elasticsearch.analysis.common; package org.elasticsearch.analysis.common;
import org.apache.logging.log4j.LogManager;
import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.cjk.CJKBigramFilter; import org.apache.lucene.analysis.cjk.CJKBigramFilter;
import org.apache.lucene.analysis.miscellaneous.DisableGraphAttribute; import org.apache.lucene.analysis.miscellaneous.DisableGraphAttribute;
@ -52,8 +51,7 @@ import java.util.Set;
*/ */
public final class CJKBigramFilterFactory extends AbstractTokenFilterFactory { public final class CJKBigramFilterFactory extends AbstractTokenFilterFactory {
private static final DeprecationLogger DEPRECATION_LOGGER private static final DeprecationLogger DEPRECATION_LOGGER = DeprecationLogger.getLogger(CJKBigramFilterFactory.class);
= new DeprecationLogger(LogManager.getLogger(CJKBigramFilterFactory.class));
private final int flags; private final int flags;
private final boolean outputUnigrams; private final boolean outputUnigrams;

3
modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/CommonAnalysisPlugin.java
View File

@ -19,7 +19,6 @@
package org.elasticsearch.analysis.common; package org.elasticsearch.analysis.common;
import org.apache.logging.log4j.LogManager;
import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.CharArraySet;
import org.apache.lucene.analysis.StopFilter; import org.apache.lucene.analysis.StopFilter;
@ -157,7 +156,7 @@ import static org.elasticsearch.plugins.AnalysisPlugin.requiresAnalysisSettings;
public class CommonAnalysisPlugin extends Plugin implements AnalysisPlugin, ScriptPlugin { public class CommonAnalysisPlugin extends Plugin implements AnalysisPlugin, ScriptPlugin {
private static final DeprecationLogger deprecationLogger = new DeprecationLogger(LogManager.getLogger(CommonAnalysisPlugin.class)); private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(CommonAnalysisPlugin.class);
private final SetOnce<ScriptService> scriptService = new SetOnce<>(); private final SetOnce<ScriptService> scriptService = new SetOnce<>();

4
modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/CommonGramsTokenFilterFactory.java
View File

@ -19,7 +19,6 @@
package org.elasticsearch.analysis.common; package org.elasticsearch.analysis.common;
import org.apache.logging.log4j.LogManager;
import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.CharArraySet;
import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.commongrams.CommonGramsFilter; import org.apache.lucene.analysis.commongrams.CommonGramsFilter;
@ -35,8 +34,7 @@ import org.elasticsearch.index.analysis.TokenFilterFactory;
public class CommonGramsTokenFilterFactory extends AbstractTokenFilterFactory { public class CommonGramsTokenFilterFactory extends AbstractTokenFilterFactory {
private static final DeprecationLogger DEPRECATION_LOGGER private static final DeprecationLogger DEPRECATION_LOGGER = DeprecationLogger.getLogger(CommonGramsTokenFilterFactory.class);
= new DeprecationLogger(LogManager.getLogger(CommonGramsTokenFilterFactory.class));
private final CharArraySet words; private final CharArraySet words;

4
modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/EdgeNGramTokenFilterFactory.java
View File

@ -19,7 +19,6 @@
package org.elasticsearch.analysis.common; package org.elasticsearch.analysis.common;
import org.apache.logging.log4j.LogManager;
import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.ngram.EdgeNGramTokenFilter; import org.apache.lucene.analysis.ngram.EdgeNGramTokenFilter;
import org.apache.lucene.analysis.reverse.ReverseStringFilter; import org.apache.lucene.analysis.reverse.ReverseStringFilter;
@ -34,8 +33,7 @@ import org.elasticsearch.index.analysis.TokenFilterFactory;
public class EdgeNGramTokenFilterFactory extends AbstractTokenFilterFactory { public class EdgeNGramTokenFilterFactory extends AbstractTokenFilterFactory {
private static final DeprecationLogger DEPRECATION_LOGGER private static final DeprecationLogger DEPRECATION_LOGGER = DeprecationLogger.getLogger(EdgeNGramTokenFilterFactory.class);
= new DeprecationLogger(LogManager.getLogger(EdgeNGramTokenFilterFactory.class));
private final int minGram; private final int minGram;

4
modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/FingerprintTokenFilterFactory.java
View File

@ -19,7 +19,6 @@
package org.elasticsearch.analysis.common; package org.elasticsearch.analysis.common;
import org.apache.logging.log4j.LogManager;
import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.miscellaneous.FingerprintFilter; import org.apache.lucene.analysis.miscellaneous.FingerprintFilter;
import org.elasticsearch.Version; import org.elasticsearch.Version;
@ -35,8 +34,7 @@ import static org.elasticsearch.analysis.common.FingerprintAnalyzerProvider.MAX_
public class FingerprintTokenFilterFactory extends AbstractTokenFilterFactory { public class FingerprintTokenFilterFactory extends AbstractTokenFilterFactory {
private static final DeprecationLogger DEPRECATION_LOGGER private static final DeprecationLogger DEPRECATION_LOGGER = DeprecationLogger.getLogger(FingerprintTokenFilterFactory.class);
= new DeprecationLogger(LogManager.getLogger(FingerprintTokenFilterFactory.class));
private final char separator; private final char separator;
private final int maxOutputSize; private final int maxOutputSize;

3
modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/LegacyDelimitedPayloadTokenFilterFactory.java
View File

@ -19,7 +19,6 @@
package org.elasticsearch.analysis.common; package org.elasticsearch.analysis.common;
import org.apache.logging.log4j.LogManager;
import org.elasticsearch.Version; import org.elasticsearch.Version;
import org.elasticsearch.common.logging.DeprecationLogger; import org.elasticsearch.common.logging.DeprecationLogger;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
@ -29,7 +28,7 @@ import org.elasticsearch.index.IndexSettings;
public class LegacyDelimitedPayloadTokenFilterFactory extends DelimitedPayloadTokenFilterFactory { public class LegacyDelimitedPayloadTokenFilterFactory extends DelimitedPayloadTokenFilterFactory {
private static final DeprecationLogger deprecationLogger = private static final DeprecationLogger deprecationLogger =
new DeprecationLogger(LogManager.getLogger(LegacyDelimitedPayloadTokenFilterFactory.class)); DeprecationLogger.getLogger(LegacyDelimitedPayloadTokenFilterFactory.class);
LegacyDelimitedPayloadTokenFilterFactory(IndexSettings indexSettings, Environment env, String name, Settings settings) { LegacyDelimitedPayloadTokenFilterFactory(IndexSettings indexSettings, Environment env, String name, Settings settings) {
super(indexSettings, env, name, settings); super(indexSettings, env, name, settings);

4
modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/MultiplexerTokenFilterFactory.java
View File

@ -19,7 +19,6 @@
package org.elasticsearch.analysis.common; package org.elasticsearch.analysis.common;
import org.apache.logging.log4j.LogManager;
import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenFilter;
import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.miscellaneous.ConditionalTokenFilter; import org.apache.lucene.analysis.miscellaneous.ConditionalTokenFilter;
@ -44,8 +43,7 @@ import java.util.function.Function;
public class MultiplexerTokenFilterFactory extends AbstractTokenFilterFactory { public class MultiplexerTokenFilterFactory extends AbstractTokenFilterFactory {
private static final DeprecationLogger DEPRECATION_LOGGER private static final DeprecationLogger DEPRECATION_LOGGER = DeprecationLogger.getLogger(MultiplexerTokenFilterFactory.class);
= new DeprecationLogger(LogManager.getLogger(MultiplexerTokenFilterFactory.class));
private List<String> filterNames; private List<String> filterNames;
private final boolean preserveOriginal; private final boolean preserveOriginal;

6
modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/NGramTokenFilterFactory.java
View File

@ -19,22 +19,20 @@
package org.elasticsearch.analysis.common; package org.elasticsearch.analysis.common;
import org.apache.logging.log4j.LogManager;
import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.ngram.NGramTokenFilter; import org.apache.lucene.analysis.ngram.NGramTokenFilter;
import org.elasticsearch.Version;
import org.elasticsearch.common.logging.DeprecationLogger; import org.elasticsearch.common.logging.DeprecationLogger;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.env.Environment; import org.elasticsearch.env.Environment;
import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.IndexSettings;
import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; import org.elasticsearch.index.analysis.AbstractTokenFilterFactory;
import org.elasticsearch.Version;
import org.elasticsearch.index.analysis.TokenFilterFactory; import org.elasticsearch.index.analysis.TokenFilterFactory;
public class NGramTokenFilterFactory extends AbstractTokenFilterFactory { public class NGramTokenFilterFactory extends AbstractTokenFilterFactory {
private static final DeprecationLogger DEPRECATION_LOGGER private static final DeprecationLogger DEPRECATION_LOGGER = DeprecationLogger.getLogger(NGramTokenFilterFactory.class);
= new DeprecationLogger(LogManager.getLogger(NGramTokenFilterFactory.class));
private final int minGram; private final int minGram;
private final int maxGram; private final int maxGram;

3
modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/StandardHtmlStripAnalyzerProvider.java
View File

@ -19,7 +19,6 @@
package org.elasticsearch.analysis.common; package org.elasticsearch.analysis.common;
import org.apache.logging.log4j.LogManager;
import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.CharArraySet;
import org.elasticsearch.Version; import org.elasticsearch.Version;
import org.elasticsearch.common.logging.DeprecationLogger; import org.elasticsearch.common.logging.DeprecationLogger;
@ -32,7 +31,7 @@ import org.elasticsearch.index.analysis.Analysis;
public class StandardHtmlStripAnalyzerProvider extends AbstractIndexAnalyzerProvider<StandardHtmlStripAnalyzer> { public class StandardHtmlStripAnalyzerProvider extends AbstractIndexAnalyzerProvider<StandardHtmlStripAnalyzer> {
private static final DeprecationLogger DEPRECATION_LOGGER = private static final DeprecationLogger DEPRECATION_LOGGER =
new DeprecationLogger(LogManager.getLogger(StandardHtmlStripAnalyzerProvider.class)); DeprecationLogger.getLogger(StandardHtmlStripAnalyzerProvider.class);
private final StandardHtmlStripAnalyzer analyzer; private final StandardHtmlStripAnalyzer analyzer;

4
modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/SynonymTokenFilterFactory.java
View File

@ -19,7 +19,6 @@
package org.elasticsearch.analysis.common; package org.elasticsearch.analysis.common;
import org.apache.logging.log4j.LogManager;
import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.synonym.SynonymFilter; import org.apache.lucene.analysis.synonym.SynonymFilter;
@ -43,8 +42,7 @@ import java.util.function.Function;
public class SynonymTokenFilterFactory extends AbstractTokenFilterFactory { public class SynonymTokenFilterFactory extends AbstractTokenFilterFactory {
private static final DeprecationLogger DEPRECATION_LOGGER private static final DeprecationLogger DEPRECATION_LOGGER = DeprecationLogger.getLogger(SynonymTokenFilterFactory.class);
= new DeprecationLogger(LogManager.getLogger(SynonymTokenFilterFactory.class));
private final String format; private final String format;
private final boolean expand; private final boolean expand;

3
modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/WordDelimiterGraphTokenFilterFactory.java
View File

@ -19,7 +19,6 @@
package org.elasticsearch.analysis.common; package org.elasticsearch.analysis.common;
import org.apache.logging.log4j.LogManager;
import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.CharArraySet;
import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.miscellaneous.WordDelimiterGraphFilter; import org.apache.lucene.analysis.miscellaneous.WordDelimiterGraphFilter;
@ -51,7 +50,7 @@ import static org.elasticsearch.analysis.common.WordDelimiterTokenFilterFactory.
public class WordDelimiterGraphTokenFilterFactory extends AbstractTokenFilterFactory { public class WordDelimiterGraphTokenFilterFactory extends AbstractTokenFilterFactory {
private static final DeprecationLogger DEPRECATION_LOGGER = private static final DeprecationLogger DEPRECATION_LOGGER =
new DeprecationLogger(LogManager.getLogger(WordDelimiterGraphTokenFilterFactory.class)); DeprecationLogger.getLogger(WordDelimiterGraphTokenFilterFactory.class);
private final byte[] charTypeTable; private final byte[] charTypeTable;
private final int flags; private final int flags;

3
modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/WordDelimiterTokenFilterFactory.java
View File

@ -19,7 +19,6 @@
package org.elasticsearch.analysis.common; package org.elasticsearch.analysis.common;
import org.apache.logging.log4j.LogManager;
import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.CharArraySet;
import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.miscellaneous.WordDelimiterFilter; import org.apache.lucene.analysis.miscellaneous.WordDelimiterFilter;
@ -55,7 +54,7 @@ import static org.apache.lucene.analysis.miscellaneous.WordDelimiterFilter.STEM_
public class WordDelimiterTokenFilterFactory extends AbstractTokenFilterFactory { public class WordDelimiterTokenFilterFactory extends AbstractTokenFilterFactory {
private static final DeprecationLogger DEPRECATION_LOGGER = private static final DeprecationLogger DEPRECATION_LOGGER =
new DeprecationLogger(LogManager.getLogger(WordDelimiterTokenFilterFactory.class)); DeprecationLogger.getLogger(WordDelimiterTokenFilterFactory.class);
private final byte[] charTypeTable; private final byte[] charTypeTable;
private final int flags; private final int flags;

3
modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/ScriptProcessor.java
View File

@ -19,7 +19,6 @@
package org.elasticsearch.ingest.common; package org.elasticsearch.ingest.common;
import org.apache.logging.log4j.LogManager;
import org.elasticsearch.common.Nullable; import org.elasticsearch.common.Nullable;
import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.bytes.BytesReference;
import org.elasticsearch.common.logging.DeprecationLogger; import org.elasticsearch.common.logging.DeprecationLogger;
@ -53,7 +52,7 @@ import static org.elasticsearch.ingest.ConfigurationUtils.newConfigurationExcept
public final class ScriptProcessor extends AbstractProcessor { public final class ScriptProcessor extends AbstractProcessor {
private static final DeprecationLogger deprecationLogger = private static final DeprecationLogger deprecationLogger =
new DeprecationLogger(LogManager.getLogger(DynamicMap.class)); DeprecationLogger.getLogger(DynamicMap.class);
private static final Map<String, Function<Object, Object>> PARAMS_FUNCTIONS = org.elasticsearch.common.collect.Map.of( private static final Map<String, Function<Object, Object>> PARAMS_FUNCTIONS = org.elasticsearch.common.collect.Map.of(
"_type", value -> { "_type", value -> {
deprecationLogger.deprecate("script_processor", deprecationLogger.deprecate("script_processor",

3
modules/ingest-user-agent/src/main/java/org/elasticsearch/ingest/useragent/UserAgentProcessor.java
View File

@ -19,7 +19,6 @@
package org.elasticsearch.ingest.useragent; package org.elasticsearch.ingest.useragent;
import org.apache.logging.log4j.LogManager;
import org.elasticsearch.common.logging.DeprecationLogger; import org.elasticsearch.common.logging.DeprecationLogger;
import org.elasticsearch.ingest.AbstractProcessor; import org.elasticsearch.ingest.AbstractProcessor;
import org.elasticsearch.ingest.IngestDocument; import org.elasticsearch.ingest.IngestDocument;
@ -44,7 +43,7 @@ import static org.elasticsearch.ingest.ConfigurationUtils.readStringProperty;
public class UserAgentProcessor extends AbstractProcessor { public class UserAgentProcessor extends AbstractProcessor {
private static final DeprecationLogger deprecationLogger = new DeprecationLogger(LogManager.getLogger(UserAgentProcessor.class)); private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(UserAgentProcessor.class);
public static final String TYPE = "user_agent"; public static final String TYPE = "user_agent";

4
modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/RestMultiSearchTemplateAction.java
View File

@ -19,7 +19,6 @@
package org.elasticsearch.script.mustache; package org.elasticsearch.script.mustache;
import org.apache.logging.log4j.LogManager;
import org.elasticsearch.client.node.NodeClient; import org.elasticsearch.client.node.NodeClient;
import org.elasticsearch.common.logging.DeprecationLogger; import org.elasticsearch.common.logging.DeprecationLogger;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
@ -41,8 +40,7 @@ import static org.elasticsearch.rest.RestRequest.Method.GET;
import static org.elasticsearch.rest.RestRequest.Method.POST; import static org.elasticsearch.rest.RestRequest.Method.POST;
public class RestMultiSearchTemplateAction extends BaseRestHandler { public class RestMultiSearchTemplateAction extends BaseRestHandler {
private static final DeprecationLogger deprecationLogger = new DeprecationLogger( private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(RestMultiSearchTemplateAction.class);
LogManager.getLogger(RestMultiSearchTemplateAction.class));
static final String TYPES_DEPRECATION_MESSAGE = "[types removal]" + static final String TYPES_DEPRECATION_MESSAGE = "[types removal]" +
" Specifying types in multi search template requests is deprecated."; " Specifying types in multi search template requests is deprecated.";

6
modules/parent-join/src/main/java/org/elasticsearch/join/query/HasChildQueryBuilder.java
View File

@ -32,9 +32,8 @@ import org.elasticsearch.common.ParseField;
import org.elasticsearch.common.ParsingException; import org.elasticsearch.common.ParsingException;
import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.common.lucene.search.Queries;
import org.elasticsearch.common.logging.DeprecationLogger; import org.elasticsearch.common.logging.DeprecationLogger;
import org.apache.logging.log4j.LogManager; import org.elasticsearch.common.lucene.search.Queries;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentParser;
import org.elasticsearch.index.fielddata.IndexOrdinalsFieldData; import org.elasticsearch.index.fielddata.IndexOrdinalsFieldData;
@ -86,8 +85,7 @@ public class HasChildQueryBuilder extends AbstractQueryBuilder<HasChildQueryBuil
private static final ParseField SCORE_MODE_FIELD = new ParseField("score_mode"); private static final ParseField SCORE_MODE_FIELD = new ParseField("score_mode");
private static final ParseField INNER_HITS_FIELD = new ParseField("inner_hits"); private static final ParseField INNER_HITS_FIELD = new ParseField("inner_hits");
private static final ParseField IGNORE_UNMAPPED_FIELD = new ParseField("ignore_unmapped"); private static final ParseField IGNORE_UNMAPPED_FIELD = new ParseField("ignore_unmapped");
private static final DeprecationLogger deprecationLogger = new DeprecationLogger( private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(HasChildQueryBuilder.class);
LogManager.getLogger(HasChildQueryBuilder.class));
private final QueryBuilder query; private final QueryBuilder query;
private final String type; private final String type;
private final ScoreMode scoreMode; private final ScoreMode scoreMode;

3
modules/percolator/src/main/java/org/elasticsearch/percolator/PercolateQueryBuilder.java
View File

@ -19,7 +19,6 @@
package org.elasticsearch.percolator; package org.elasticsearch.percolator;
import org.apache.logging.log4j.LogManager;
import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.DelegatingAnalyzerWrapper; import org.apache.lucene.analysis.DelegatingAnalyzerWrapper;
import org.apache.lucene.index.BinaryDocValues; import org.apache.lucene.index.BinaryDocValues;
@ -100,7 +99,7 @@ import static org.elasticsearch.search.SearchService.ALLOW_EXPENSIVE_QUERIES;
public class PercolateQueryBuilder extends AbstractQueryBuilder<PercolateQueryBuilder> { public class PercolateQueryBuilder extends AbstractQueryBuilder<PercolateQueryBuilder> {
public static final String NAME = "percolate"; public static final String NAME = "percolate";
private static final DeprecationLogger deprecationLogger = new DeprecationLogger(LogManager.getLogger(ParseField.class)); private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(ParseField.class);
static final String DOCUMENT_TYPE_DEPRECATION_MESSAGE = "[types removal] Types are deprecated in [percolate] queries. " + static final String DOCUMENT_TYPE_DEPRECATION_MESSAGE = "[types removal] Types are deprecated in [percolate] queries. " +
"The [document_type] should no longer be specified."; "The [document_type] should no longer be specified.";
static final String TYPE_DEPRECATION_MESSAGE = "[types removal] Types are deprecated in [percolate] queries. " + static final String TYPE_DEPRECATION_MESSAGE = "[types removal] Types are deprecated in [percolate] queries. " +

5
modules/reindex/src/main/java/org/elasticsearch/index/reindex/ReindexValidator.java
View File

@ -19,8 +19,6 @@
package org.elasticsearch.index.reindex; package org.elasticsearch.index.reindex;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.lucene.util.automaton.Automata; import org.apache.lucene.util.automaton.Automata;
import org.apache.lucene.util.automaton.Automaton; import org.apache.lucene.util.automaton.Automaton;
import org.apache.lucene.util.automaton.CharacterRunAutomaton; import org.apache.lucene.util.automaton.CharacterRunAutomaton;
@ -44,8 +42,7 @@ import org.elasticsearch.search.builder.SearchSourceBuilder;
import java.util.List; import java.util.List;
class ReindexValidator { class ReindexValidator {
private static final Logger logger = LogManager.getLogger(ReindexValidator.class); private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(ReindexValidator.class);
private static final DeprecationLogger deprecationLogger = new DeprecationLogger(logger);
static final String SORT_DEPRECATED_MESSAGE = "The sort option in reindex is deprecated. " + static final String SORT_DEPRECATED_MESSAGE = "The sort option in reindex is deprecated. " +
"Instead consider using query filtering to find the desired subset of data."; "Instead consider using query filtering to find the desired subset of data.";

4
modules/reindex/src/main/java/org/elasticsearch/index/reindex/remote/RemoteRequestBuilders.java
View File

@ -21,7 +21,6 @@ package org.elasticsearch.index.reindex.remote;
import org.apache.http.entity.ContentType; import org.apache.http.entity.ContentType;
import org.apache.http.nio.entity.NStringEntity; import org.apache.http.nio.entity.NStringEntity;
import org.apache.logging.log4j.LogManager;
import org.elasticsearch.ElasticsearchException; import org.elasticsearch.ElasticsearchException;
import org.elasticsearch.Version; import org.elasticsearch.Version;
import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.action.search.SearchRequest;
@ -55,8 +54,7 @@ import static org.elasticsearch.common.unit.TimeValue.timeValueMillis;
* because the version constants have been removed. * because the version constants have been removed.
*/ */
final class RemoteRequestBuilders { final class RemoteRequestBuilders {
private static final DeprecationLogger DEPRECATION_LOGGER private static final DeprecationLogger DEPRECATION_LOGGER = DeprecationLogger.getLogger(RemoteRequestBuilders.class);
= new DeprecationLogger(LogManager.getLogger(RemoteRequestBuilders.class));
static final String DEPRECATED_URL_ENCODED_INDEX_WARNING = static final String DEPRECATED_URL_ENCODED_INDEX_WARNING =
"Specifying index name using URL escaped index names for reindex from remote is deprecated. " + "Specifying index name using URL escaped index names for reindex from remote is deprecated. " +

4
plugins/analysis-icu/src/main/java/org/elasticsearch/index/analysis/IcuNormalizerTokenFilterFactory.java
View File

@ -22,8 +22,6 @@ package org.elasticsearch.index.analysis;
import com.ibm.icu.text.FilteredNormalizer2; import com.ibm.icu.text.FilteredNormalizer2;
import com.ibm.icu.text.Normalizer2; import com.ibm.icu.text.Normalizer2;
import com.ibm.icu.text.UnicodeSet; import com.ibm.icu.text.UnicodeSet;
import org.apache.logging.log4j.LogManager;
import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.TokenStream;
import org.elasticsearch.Version; import org.elasticsearch.Version;
import org.elasticsearch.common.logging.DeprecationLogger; import org.elasticsearch.common.logging.DeprecationLogger;
@ -40,7 +38,7 @@ import org.elasticsearch.index.IndexSettings;
public class IcuNormalizerTokenFilterFactory extends AbstractTokenFilterFactory implements NormalizingTokenFilterFactory { public class IcuNormalizerTokenFilterFactory extends AbstractTokenFilterFactory implements NormalizingTokenFilterFactory {
private static final DeprecationLogger deprecationLogger = private static final DeprecationLogger deprecationLogger =
new DeprecationLogger(LogManager.getLogger(IcuNormalizerTokenFilterFactory.class)); DeprecationLogger.getLogger(IcuNormalizerTokenFilterFactory.class);
private final Normalizer2 normalizer; private final Normalizer2 normalizer;

4
plugins/analysis-phonetic/src/main/java/org/elasticsearch/index/analysis/PhoneticTokenFilterFactory.java
View File

@ -30,7 +30,6 @@ import org.apache.commons.codec.language.bm.Languages.LanguageSet;
import org.apache.commons.codec.language.bm.NameType; import org.apache.commons.codec.language.bm.NameType;
import org.apache.commons.codec.language.bm.PhoneticEngine; import org.apache.commons.codec.language.bm.PhoneticEngine;
import org.apache.commons.codec.language.bm.RuleType; import org.apache.commons.codec.language.bm.RuleType;
import org.apache.logging.log4j.LogManager;
import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.phonetic.BeiderMorseFilter; import org.apache.lucene.analysis.phonetic.BeiderMorseFilter;
import org.apache.lucene.analysis.phonetic.DaitchMokotoffSoundexFilter; import org.apache.lucene.analysis.phonetic.DaitchMokotoffSoundexFilter;
@ -51,8 +50,7 @@ import java.util.List;
public class PhoneticTokenFilterFactory extends AbstractTokenFilterFactory { public class PhoneticTokenFilterFactory extends AbstractTokenFilterFactory {
private static final DeprecationLogger DEPRECATION_LOGGER private static final DeprecationLogger DEPRECATION_LOGGER = DeprecationLogger.getLogger(PhoneticTokenFilterFactory.class);
= new DeprecationLogger(LogManager.getLogger(PhoneticTokenFilterFactory.class));
private final Encoder encoder; private final Encoder encoder;
private final boolean replace; private final boolean replace;

2
plugins/discovery-azure-classic/src/main/java/org/elasticsearch/plugin/discovery/azure/classic/AzureDiscoveryPlugin.java
View File

@ -44,7 +44,7 @@ public class AzureDiscoveryPlugin extends Plugin implements DiscoveryPlugin {
public static final String AZURE = "azure"; public static final String AZURE = "azure";
protected final Settings settings; protected final Settings settings;
private static final Logger logger = LogManager.getLogger(AzureDiscoveryPlugin.class); private static final Logger logger = LogManager.getLogger(AzureDiscoveryPlugin.class);
private static final DeprecationLogger deprecationLogger = new DeprecationLogger(logger); private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(AzureDiscoveryPlugin.class);
public AzureDiscoveryPlugin(Settings settings) { public AzureDiscoveryPlugin(Settings settings) {
this.settings = settings; this.settings = settings;

2
plugins/discovery-ec2/src/main/java/org/elasticsearch/discovery/ec2/Ec2ClientSettings.java
View File

@ -77,7 +77,7 @@ final class Ec2ClientSettings {
private static final Logger logger = LogManager.getLogger(Ec2ClientSettings.class); private static final Logger logger = LogManager.getLogger(Ec2ClientSettings.class);
private static final DeprecationLogger deprecationLogger = new DeprecationLogger(logger); private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(Ec2ClientSettings.class);
/** Credentials to authenticate with ec2. */ /** Credentials to authenticate with ec2. */
final AWSCredentials credentials; final AWSCredentials credentials;

2
plugins/repository-s3/src/main/java/org/elasticsearch/repositories/s3/S3Repository.java
View File

@ -71,7 +71,7 @@ import java.util.function.Function;
*/ */
class S3Repository extends BlobStoreRepository { class S3Repository extends BlobStoreRepository {
private static final Logger logger = LogManager.getLogger(S3Repository.class); private static final Logger logger = LogManager.getLogger(S3Repository.class);
private static final DeprecationLogger deprecationLogger = new DeprecationLogger(logger); private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(logger.getName());
static final String TYPE = "s3"; static final String TYPE = "s3";

4
qa/evil-tests/src/test/java/org/elasticsearch/common/logging/EvilLoggerTests.java
View File

@ -108,7 +108,7 @@ public class EvilLoggerTests extends ESTestCase {
public void testConcurrentDeprecationLogger() throws IOException, UserException, BrokenBarrierException, InterruptedException { public void testConcurrentDeprecationLogger() throws IOException, UserException, BrokenBarrierException, InterruptedException {
setupLogging("deprecation"); setupLogging("deprecation");
final DeprecationLogger deprecationLogger = new DeprecationLogger(LogManager.getLogger("deprecation")); final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger("deprecation");
final int numberOfThreads = randomIntBetween(2, 4); final int numberOfThreads = randomIntBetween(2, 4);
final CyclicBarrier barrier = new CyclicBarrier(1 + numberOfThreads); final CyclicBarrier barrier = new CyclicBarrier(1 + numberOfThreads);
@ -188,7 +188,7 @@ public class EvilLoggerTests extends ESTestCase {
public void testDeprecationLoggerMaybeLog() throws IOException, UserException { public void testDeprecationLoggerMaybeLog() throws IOException, UserException {
setupLogging("deprecation"); setupLogging("deprecation");
final DeprecationLogger deprecationLogger = new DeprecationLogger(LogManager.getLogger("deprecation")); final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger("deprecation");
final int iterations = randomIntBetween(1, 16); final int iterations = randomIntBetween(1, 16);

2
qa/logging-config/src/test/java/org/elasticsearch/common/logging/JsonLoggerTests.java
View File

@ -270,7 +270,7 @@ public class JsonLoggerTests extends ESTestCase {
public void testDuplicateLogMessages() throws IOException { public void testDuplicateLogMessages() throws IOException {
final DeprecationLogger deprecationLogger = new DeprecationLogger(LogManager.getLogger("test")); final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger("test");
// For the same key and X-Opaque-ID deprecation should be once // For the same key and X-Opaque-ID deprecation should be once
ThreadContext threadContext = new ThreadContext(Settings.EMPTY); ThreadContext threadContext = new ThreadContext(Settings.EMPTY);

6
server/src/main/java/org/elasticsearch/action/admin/cluster/configuration/AddVotingConfigExclusionsRequest.java
View File

@ -18,7 +18,6 @@
*/ */
package org.elasticsearch.action.admin.cluster.configuration; package org.elasticsearch.action.admin.cluster.configuration;
import org.apache.logging.log4j.LogManager;
import org.elasticsearch.Version; import org.elasticsearch.Version;
import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionRequestValidationException;
import org.elasticsearch.action.support.master.MasterNodeRequest; import org.elasticsearch.action.support.master.MasterNodeRequest;
@ -29,8 +28,8 @@ import org.elasticsearch.cluster.node.DiscoveryNodes;
import org.elasticsearch.common.Strings; import org.elasticsearch.common.Strings;
import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.common.logging.DeprecationLogger; import org.elasticsearch.common.logging.DeprecationLogger;
import org.elasticsearch.common.unit.TimeValue;
import java.io.IOException; import java.io.IOException;
import java.util.Arrays; import java.util.Arrays;
@ -47,8 +46,7 @@ import java.util.stream.StreamSupport;
*/ */
public class AddVotingConfigExclusionsRequest extends MasterNodeRequest<AddVotingConfigExclusionsRequest> { public class AddVotingConfigExclusionsRequest extends MasterNodeRequest<AddVotingConfigExclusionsRequest> {
public static final String DEPRECATION_MESSAGE = "nodeDescription is deprecated and will be removed, use nodeIds or nodeNames instead"; public static final String DEPRECATION_MESSAGE = "nodeDescription is deprecated and will be removed, use nodeIds or nodeNames instead";
private static final DeprecationLogger deprecationLogger = new DeprecationLogger( private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(AddVotingConfigExclusionsRequest.class);
LogManager.getLogger(AddVotingConfigExclusionsRequest.class));
private final String[] nodeDescriptions; private final String[] nodeDescriptions;
private final String[] nodeIds; private final String[] nodeIds;
private final String[] nodeNames; private final String[] nodeNames;

3
server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequest.java
View File

@ -19,7 +19,6 @@
package org.elasticsearch.action.admin.cluster.snapshots.restore; package org.elasticsearch.action.admin.cluster.snapshots.restore;
import org.apache.logging.log4j.LogManager;
import org.elasticsearch.ElasticsearchGenerationException; import org.elasticsearch.ElasticsearchGenerationException;
import org.elasticsearch.Version; import org.elasticsearch.Version;
import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionRequestValidationException;
@ -54,7 +53,7 @@ import static org.elasticsearch.common.xcontent.support.XContentMapValues.nodeBo
*/ */
public class RestoreSnapshotRequest extends MasterNodeRequest<RestoreSnapshotRequest> implements ToXContentObject { public class RestoreSnapshotRequest extends MasterNodeRequest<RestoreSnapshotRequest> implements ToXContentObject {
private static final DeprecationLogger DEPRECATION_LOGGER = new DeprecationLogger(LogManager.getLogger(RestoreSnapshotRequest.class)); private static final DeprecationLogger DEPRECATION_LOGGER = DeprecationLogger.getLogger(RestoreSnapshotRequest.class);
private String snapshot; private String snapshot;
private String repository; private String repository;

5
server/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateRequest.java
View File

@ -18,7 +18,6 @@
*/ */
package org.elasticsearch.action.admin.indices.template.put; package org.elasticsearch.action.admin.indices.template.put;
import org.apache.logging.log4j.LogManager;
import org.elasticsearch.ElasticsearchGenerationException; import org.elasticsearch.ElasticsearchGenerationException;
import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.ElasticsearchParseException;
import org.elasticsearch.Version; import org.elasticsearch.Version;
@ -59,16 +58,16 @@ import java.util.Set;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static org.elasticsearch.action.ValidateActions.addValidationError; import static org.elasticsearch.action.ValidateActions.addValidationError;
import static org.elasticsearch.common.settings.Settings.Builder.EMPTY_SETTINGS;
import static org.elasticsearch.common.settings.Settings.readSettingsFromStream; import static org.elasticsearch.common.settings.Settings.readSettingsFromStream;
import static org.elasticsearch.common.settings.Settings.writeSettingsToStream; import static org.elasticsearch.common.settings.Settings.writeSettingsToStream;
import static org.elasticsearch.common.settings.Settings.Builder.EMPTY_SETTINGS;
/** /**
* A request to create an index template. * A request to create an index template.
*/ */
public class PutIndexTemplateRequest extends MasterNodeRequest<PutIndexTemplateRequest> implements IndicesRequest, ToXContentObject { public class PutIndexTemplateRequest extends MasterNodeRequest<PutIndexTemplateRequest> implements IndicesRequest, ToXContentObject {
private static final DeprecationLogger deprecationLogger = new DeprecationLogger(LogManager.getLogger(PutIndexTemplateRequest.class)); private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(PutIndexTemplateRequest.class);
private String name; private String name;

3
server/src/main/java/org/elasticsearch/action/bulk/BulkRequestParser.java
View File

@ -19,7 +19,6 @@
package org.elasticsearch.action.bulk; package org.elasticsearch.action.bulk;
import org.apache.logging.log4j.LogManager;
import org.elasticsearch.action.DocWriteRequest; import org.elasticsearch.action.DocWriteRequest;
import org.elasticsearch.action.delete.DeleteRequest; import org.elasticsearch.action.delete.DeleteRequest;
import org.elasticsearch.action.index.IndexRequest; import org.elasticsearch.action.index.IndexRequest;
@ -53,7 +52,7 @@ import static org.elasticsearch.index.seqno.SequenceNumbers.UNASSIGNED_PRIMARY_T
*/ */
public final class BulkRequestParser { public final class BulkRequestParser {
private static final DeprecationLogger deprecationLogger = new DeprecationLogger(LogManager.getLogger(BulkRequestParser.class)); private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(BulkRequestParser.class);
private static final ParseField INDEX = new ParseField("_index"); private static final ParseField INDEX = new ParseField("_index");
private static final ParseField TYPE = new ParseField("_type"); private static final ParseField TYPE = new ParseField("_type");

6
server/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineRequest.java
View File

@ -19,8 +19,6 @@
package org.elasticsearch.action.ingest; package org.elasticsearch.action.ingest;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequest;
import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionRequestValidationException;
import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.bytes.BytesReference;
@ -46,9 +44,7 @@ import java.util.Objects;
public class SimulatePipelineRequest extends ActionRequest implements ToXContentObject { public class SimulatePipelineRequest extends ActionRequest implements ToXContentObject {
private static final Logger logger = LogManager.getLogger(SimulatePipelineRequest.class); private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(SimulatePipelineRequest.class);
private static final DeprecationLogger deprecationLogger = new DeprecationLogger(logger);
private String id; private String id;
private boolean verbose; private boolean verbose;
private BytesReference source; private BytesReference source;

4
server/src/main/java/org/elasticsearch/action/termvectors/TermVectorsRequest.java
View File

@ -19,7 +19,6 @@
package org.elasticsearch.action.termvectors; package org.elasticsearch.action.termvectors;
import org.apache.logging.log4j.LogManager;
import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.ElasticsearchParseException;
import org.elasticsearch.Version; import org.elasticsearch.Version;
import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionRequestValidationException;
@ -63,8 +62,7 @@ import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
* required. * required.
*/ */
public class TermVectorsRequest extends SingleShardRequest<TermVectorsRequest> implements RealtimeRequest { public class TermVectorsRequest extends SingleShardRequest<TermVectorsRequest> implements RealtimeRequest {
private static final DeprecationLogger deprecationLogger = new DeprecationLogger( private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(TermVectorsRequest.class);
LogManager.getLogger(TermVectorsRequest.class));
private static final ParseField INDEX = new ParseField("_index"); private static final ParseField INDEX = new ParseField("_index");
private static final ParseField TYPE = new ParseField("_type"); private static final ParseField TYPE = new ParseField("_type");

12
server/src/main/java/org/elasticsearch/bootstrap/Bootstrap.java
View File

@ -19,20 +19,18 @@
package org.elasticsearch.bootstrap; package org.elasticsearch.bootstrap;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.Appender; import org.apache.logging.log4j.core.Appender;
import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.LoggerContext;
import org.apache.logging.log4j.core.appender.ConsoleAppender; import org.apache.logging.log4j.core.appender.ConsoleAppender;
import org.apache.logging.log4j.core.config.Configurator; import org.apache.logging.log4j.core.config.Configurator;
import org.apache.lucene.util.Constants; import org.apache.lucene.util.Constants;
import org.elasticsearch.cli.KeyStoreAwareCommand;
import org.elasticsearch.cli.Terminal;
import org.elasticsearch.common.settings.SecureString;
import org.elasticsearch.core.internal.io.IOUtils;
import org.apache.lucene.util.StringHelper; import org.apache.lucene.util.StringHelper;
import org.elasticsearch.ElasticsearchException; import org.elasticsearch.ElasticsearchException;
import org.elasticsearch.Version; import org.elasticsearch.Version;
import org.elasticsearch.cli.KeyStoreAwareCommand;
import org.elasticsearch.cli.Terminal;
import org.elasticsearch.cli.UserException; import org.elasticsearch.cli.UserException;
import org.elasticsearch.common.PidFile; import org.elasticsearch.common.PidFile;
import org.elasticsearch.common.SuppressForbidden; import org.elasticsearch.common.SuppressForbidden;
@ -43,8 +41,10 @@ import org.elasticsearch.common.logging.Loggers;
import org.elasticsearch.common.network.IfConfig; import org.elasticsearch.common.network.IfConfig;
import org.elasticsearch.common.settings.KeyStoreWrapper; import org.elasticsearch.common.settings.KeyStoreWrapper;
import org.elasticsearch.common.settings.SecureSettings; import org.elasticsearch.common.settings.SecureSettings;
import org.elasticsearch.common.settings.SecureString;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.transport.BoundTransportAddress; import org.elasticsearch.common.transport.BoundTransportAddress;
import org.elasticsearch.core.internal.io.IOUtils;
import org.elasticsearch.env.Environment; import org.elasticsearch.env.Environment;
import org.elasticsearch.monitor.jvm.JvmInfo; import org.elasticsearch.monitor.jvm.JvmInfo;
import org.elasticsearch.monitor.os.OsProbe; import org.elasticsearch.monitor.os.OsProbe;
@ -361,7 +361,7 @@ final class Bootstrap {
"future versions of Elasticsearch will require Java 11; " + "future versions of Elasticsearch will require Java 11; " +
"your Java version from [%s] does not meet this requirement", "your Java version from [%s] does not meet this requirement",
System.getProperty("java.home")); System.getProperty("java.home"));
new DeprecationLogger(LogManager.getLogger(Bootstrap.class)).deprecate("java_version_11_required", message); DeprecationLogger.getLogger(Bootstrap.class).deprecate("java_version_11_required", message);
} }
if (environment.pidFile() != null) { if (environment.pidFile() != null) {
try { try {

3
server/src/main/java/org/elasticsearch/cluster/metadata/IndexTemplateMetadata.java
View File

@ -20,7 +20,6 @@ package org.elasticsearch.cluster.metadata;
import com.carrotsearch.hppc.cursors.ObjectCursor; import com.carrotsearch.hppc.cursors.ObjectCursor;
import com.carrotsearch.hppc.cursors.ObjectObjectCursor; import com.carrotsearch.hppc.cursors.ObjectObjectCursor;
import org.apache.logging.log4j.LogManager;
import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.ElasticsearchParseException;
import org.elasticsearch.Version; import org.elasticsearch.Version;
import org.elasticsearch.cluster.AbstractDiffable; import org.elasticsearch.cluster.AbstractDiffable;
@ -54,7 +53,7 @@ import static org.elasticsearch.cluster.metadata.Metadata.CONTEXT_MODE_PARAM;
public class IndexTemplateMetadata extends AbstractDiffable<IndexTemplateMetadata> { public class IndexTemplateMetadata extends AbstractDiffable<IndexTemplateMetadata> {
private static final DeprecationLogger deprecationLogger = new DeprecationLogger(LogManager.getLogger(IndexTemplateMetadata.class)); private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(IndexTemplateMetadata.class);
private final String name; private final String name;

2
server/src/main/java/org/elasticsearch/cluster/metadata/MetadataCreateIndexService.java
View File

@ -114,7 +114,7 @@ import static org.elasticsearch.cluster.metadata.MetadataCreateDataStreamService
*/ */
public class MetadataCreateIndexService { public class MetadataCreateIndexService {
private static final Logger logger = LogManager.getLogger(MetadataCreateIndexService.class); private static final Logger logger = LogManager.getLogger(MetadataCreateIndexService.class);
private static final DeprecationLogger DEPRECATION_LOGGER = new DeprecationLogger(logger); private static final DeprecationLogger DEPRECATION_LOGGER = DeprecationLogger.getLogger(MetadataCreateIndexService.class);
public static final int MAX_INDEX_NAME_BYTES = 255; public static final int MAX_INDEX_NAME_BYTES = 255;

3
server/src/main/java/org/elasticsearch/cluster/routing/OperationRouting.java
View File

@ -19,7 +19,6 @@
package org.elasticsearch.cluster.routing; package org.elasticsearch.cluster.routing;
import org.apache.logging.log4j.LogManager;
import org.elasticsearch.Version; import org.elasticsearch.Version;
import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.ClusterState;
import org.elasticsearch.cluster.metadata.IndexMetadata; import org.elasticsearch.cluster.metadata.IndexMetadata;
@ -52,7 +51,7 @@ public class OperationRouting {
Setting.boolSetting("cluster.routing.use_adaptive_replica_selection", true, Setting.boolSetting("cluster.routing.use_adaptive_replica_selection", true,
Setting.Property.Dynamic, Setting.Property.NodeScope); Setting.Property.Dynamic, Setting.Property.NodeScope);
private static final DeprecationLogger deprecationLogger = new DeprecationLogger(LogManager.getLogger(OperationRouting.class)); private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(OperationRouting.class);
private static final String IGNORE_AWARENESS_ATTRIBUTES_PROPERTY = "es.search.ignore_awareness_attributes"; private static final String IGNORE_AWARENESS_ATTRIBUTES_PROPERTY = "es.search.ignore_awareness_attributes";
static final String IGNORE_AWARENESS_ATTRIBUTES_DEPRECATION_MESSAGE = static final String IGNORE_AWARENESS_ATTRIBUTES_DEPRECATION_MESSAGE =
"searches will not be routed based on awareness attributes starting in version 8.0.0; " + "searches will not be routed based on awareness attributes starting in version 8.0.0; " +

2
server/src/main/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdMonitor.java
View File

@ -73,7 +73,7 @@ public class DiskThresholdMonitor {
private final RerouteService rerouteService; private final RerouteService rerouteService;
private final AtomicLong lastRunTimeMillis = new AtomicLong(Long.MIN_VALUE); private final AtomicLong lastRunTimeMillis = new AtomicLong(Long.MIN_VALUE);
private final AtomicBoolean checkInProgress = new AtomicBoolean(); private final AtomicBoolean checkInProgress = new AtomicBoolean();
private final DeprecationLogger deprecationLogger = new DeprecationLogger(logger); private final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(logger.getName());
/** /**
* The IDs of the nodes that were over the low threshold in the last check (and maybe over another threshold too). Tracked so that we * The IDs of the nodes that were over the low threshold in the last check (and maybe over another threshold too). Tracked so that we

4
server/src/main/java/org/elasticsearch/common/joda/Joda.java
View File

@ -19,14 +19,12 @@
package org.elasticsearch.common.joda; package org.elasticsearch.common.joda;
import org.apache.logging.log4j.LogManager;
import org.elasticsearch.Version; import org.elasticsearch.Version;
import org.elasticsearch.common.Strings; import org.elasticsearch.common.Strings;
import org.elasticsearch.common.logging.DeprecationLogger; import org.elasticsearch.common.logging.DeprecationLogger;
import org.elasticsearch.common.time.DateFormatter; import org.elasticsearch.common.time.DateFormatter;
import org.elasticsearch.common.time.FormatNames; import org.elasticsearch.common.time.FormatNames;
import org.elasticsearch.common.util.LazyInitializable; import org.elasticsearch.common.util.LazyInitializable;
import org.elasticsearch.common.time.FormatNames;
import org.joda.time.Chronology; import org.joda.time.Chronology;
import org.joda.time.DateTime; import org.joda.time.DateTime;
import org.joda.time.DateTimeField; import org.joda.time.DateTimeField;
@ -60,7 +58,7 @@ public class Joda {
// it results in errors sent to status logger and startup to fail. // it results in errors sent to status logger and startup to fail.
// Hence a lazy initialization. // Hence a lazy initialization.
private static final LazyInitializable<DeprecationLogger, RuntimeException> deprecationLogger private static final LazyInitializable<DeprecationLogger, RuntimeException> deprecationLogger
= new LazyInitializable(() -> new DeprecationLogger(LogManager.getLogger(FormatNames.class))); = new LazyInitializable(() -> DeprecationLogger.getLogger(Joda.class));
/** /**
* Parses a joda based pattern, including some named ones (similar to the built in Joda ISO ones). * Parses a joda based pattern, including some named ones (similar to the built in Joda ISO ones).
*/ */

20
server/src/main/java/org/elasticsearch/common/logging/DeprecationLogger.java
View File

@ -46,12 +46,19 @@ public class DeprecationLogger {
* it replaces "org.elasticsearch" with "org.elasticsearch.deprecation" to maintain * it replaces "org.elasticsearch" with "org.elasticsearch.deprecation" to maintain
* the "org.elasticsearch" namespace. * the "org.elasticsearch" namespace.
*/ */
public DeprecationLogger(Logger parentLogger) { private DeprecationLogger(Logger parentLogger) {
deprecationLogger = new ThrottlingAndHeaderWarningLogger(deprecatedLoggerName(parentLogger)); deprecationLogger = new ThrottlingAndHeaderWarningLogger(parentLogger);
} }
private static Logger deprecatedLoggerName(Logger parentLogger) { public static DeprecationLogger getLogger(Class<?> aClass) {
String name = parentLogger.getName(); return getLogger(toLoggerName(aClass));
}
public static DeprecationLogger getLogger(String name) {
return new DeprecationLogger(deprecatedLoggerName(name));
}
private static Logger deprecatedLoggerName(String name) {
if (name.startsWith("org.elasticsearch")) { if (name.startsWith("org.elasticsearch")) {
name = name.replace("org.elasticsearch.", "org.elasticsearch.deprecation."); name = name.replace("org.elasticsearch.", "org.elasticsearch.deprecation.");
} else { } else {
@ -60,6 +67,11 @@ public class DeprecationLogger {
return LogManager.getLogger(name); return LogManager.getLogger(name);
} }
private static String toLoggerName(final Class<?> cls) {
String canonicalName = cls.getCanonicalName();
return canonicalName != null ? canonicalName : cls.getName();
}
public static void setThreadContext(ThreadContext threadContext) { public static void setThreadContext(ThreadContext threadContext) {
HeaderWarning.setThreadContext(threadContext); HeaderWarning.setThreadContext(threadContext);
} }

3
server/src/main/java/org/elasticsearch/common/settings/Settings.java
View File

@ -20,7 +20,6 @@
package org.elasticsearch.common.settings; package org.elasticsearch.common.settings;
import org.apache.logging.log4j.Level; import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.LogManager;
import org.apache.lucene.util.SetOnce; import org.apache.lucene.util.SetOnce;
import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.ElasticsearchParseException;
import org.elasticsearch.Version; import org.elasticsearch.Version;
@ -320,7 +319,7 @@ public final class Settings implements ToXContentFragment {
* {@link Setting} object constructed in, for example, {@link org.elasticsearch.env.Environment}. * {@link Setting} object constructed in, for example, {@link org.elasticsearch.env.Environment}.
*/ */
static class DeprecationLoggerHolder { static class DeprecationLoggerHolder {
static DeprecationLogger deprecationLogger = new DeprecationLogger(LogManager.getLogger(Settings.class)); static DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(Settings.class);
} }
/** /**

5
server/src/main/java/org/elasticsearch/common/time/DateFormatters.java
View File

@ -19,7 +19,6 @@
package org.elasticsearch.common.time; package org.elasticsearch.common.time;
import org.apache.logging.log4j.LogManager;
import org.elasticsearch.common.Strings; import org.elasticsearch.common.Strings;
import org.elasticsearch.common.SuppressForbidden; import org.elasticsearch.common.SuppressForbidden;
import org.elasticsearch.common.logging.DeprecationLogger; import org.elasticsearch.common.logging.DeprecationLogger;
@ -62,8 +61,8 @@ public class DateFormatters {
// If LogManager.getLogger is called before logging config is loaded // If LogManager.getLogger is called before logging config is loaded
// it results in errors sent to status logger and startup to fail. // it results in errors sent to status logger and startup to fail.
// Hence a lazy initialization. // Hence a lazy initialization.
private static final LazyInitializable<DeprecationLogger, RuntimeException> deprecationLogger private static final LazyInitializable<DeprecationLogger, RuntimeException> deprecationLogger =
= new LazyInitializable(() -> new DeprecationLogger(LogManager.getLogger(FormatNames.class))); new LazyInitializable(() -> DeprecationLogger.getLogger(FormatNames.class));
private static final DateTimeFormatter TIME_ZONE_FORMATTER_NO_COLON = new DateTimeFormatterBuilder() private static final DateTimeFormatter TIME_ZONE_FORMATTER_NO_COLON = new DateTimeFormatterBuilder()
.appendOffset("+HHmm", "Z") .appendOffset("+HHmm", "Z")

3
server/src/main/java/org/elasticsearch/common/time/DateUtils.java
View File

@ -19,7 +19,6 @@
package org.elasticsearch.common.time; package org.elasticsearch.common.time;
import org.apache.logging.log4j.LogManager;
import org.elasticsearch.common.logging.DeprecationLogger; import org.elasticsearch.common.logging.DeprecationLogger;
import org.joda.time.DateTimeZone; import org.joda.time.DateTimeZone;
@ -51,7 +50,7 @@ public class DateUtils {
return DateTimeZone.forID(zoneId.getId()); return DateTimeZone.forID(zoneId.getId());
} }
private static final DeprecationLogger deprecationLogger = new DeprecationLogger(LogManager.getLogger(DateFormatters.class)); private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(DateUtils.class);
// pkg private for tests // pkg private for tests
static final Map<String, String> DEPRECATED_SHORT_TIMEZONES; static final Map<String, String> DEPRECATED_SHORT_TIMEZONES;
public static final Set<String> DEPRECATED_SHORT_TZ_IDS; public static final Set<String> DEPRECATED_SHORT_TZ_IDS;

3
server/src/main/java/org/elasticsearch/common/unit/ByteSizeValue.java
View File

@ -19,7 +19,6 @@
package org.elasticsearch.common.unit; package org.elasticsearch.common.unit;
import org.apache.logging.log4j.LogManager;
import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.ElasticsearchParseException;
import org.elasticsearch.Version; import org.elasticsearch.Version;
import org.elasticsearch.common.Strings; import org.elasticsearch.common.Strings;
@ -43,7 +42,7 @@ public class ByteSizeValue implements Writeable, Comparable<ByteSizeValue>, ToXC
* {@link ByteSizeValue} object constructed in, for example, settings in {@link org.elasticsearch.common.network.NetworkService}. * {@link ByteSizeValue} object constructed in, for example, settings in {@link org.elasticsearch.common.network.NetworkService}.
*/ */
static class DeprecationLoggerHolder { static class DeprecationLoggerHolder {
static DeprecationLogger deprecationLogger = new DeprecationLogger(LogManager.getLogger(ByteSizeValue.class)); static DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(ByteSizeValue.class);
} }
public static final ByteSizeValue ZERO = new ByteSizeValue(0, ByteSizeUnit.BYTES); public static final ByteSizeValue ZERO = new ByteSizeValue(0, ByteSizeUnit.BYTES);

3
server/src/main/java/org/elasticsearch/common/util/concurrent/EsExecutors.java
View File

@ -19,7 +19,6 @@
package org.elasticsearch.common.util.concurrent; package org.elasticsearch.common.util.concurrent;
import org.apache.logging.log4j.LogManager;
import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.ExceptionsHelper;
import org.elasticsearch.common.SuppressForbidden; import org.elasticsearch.common.SuppressForbidden;
import org.elasticsearch.common.logging.DeprecationLogger; import org.elasticsearch.common.logging.DeprecationLogger;
@ -49,7 +48,7 @@ import java.util.stream.Collectors;
public class EsExecutors { public class EsExecutors {
private static final DeprecationLogger deprecationLogger = new DeprecationLogger(LogManager.getLogger(EsExecutors.class)); private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(EsExecutors.class);
/** /**
* Setting to manually set the number of available processors. This setting is used to adjust thread pool sizes per node. * Setting to manually set the number of available processors. This setting is used to adjust thread pool sizes per node.

3
server/src/main/java/org/elasticsearch/common/xcontent/LoggingDeprecationHandler.java
View File

@ -19,7 +19,6 @@
package org.elasticsearch.common.xcontent; package org.elasticsearch.common.xcontent;
import org.apache.logging.log4j.LogManager;
import org.elasticsearch.common.ParseField; import org.elasticsearch.common.ParseField;
import org.elasticsearch.common.logging.DeprecationLogger; import org.elasticsearch.common.logging.DeprecationLogger;
@ -44,7 +43,7 @@ public class LoggingDeprecationHandler implements DeprecationHandler {
* Changing that will require some research to make super duper * Changing that will require some research to make super duper
* sure it is safe. * sure it is safe.
*/ */
private static final DeprecationLogger deprecationLogger = new DeprecationLogger(LogManager.getLogger(ParseField.class)); private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(ParseField.class);
private LoggingDeprecationHandler() { private LoggingDeprecationHandler() {
// Singleton // Singleton

3
server/src/main/java/org/elasticsearch/http/HttpInfo.java
View File

@ -19,7 +19,6 @@
package org.elasticsearch.http; package org.elasticsearch.http;
import org.apache.logging.log4j.LogManager;
import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.common.logging.DeprecationLogger; import org.elasticsearch.common.logging.DeprecationLogger;
@ -34,7 +33,7 @@ import java.io.IOException;
public class HttpInfo implements ReportingService.Info { public class HttpInfo implements ReportingService.Info {
private static final DeprecationLogger deprecationLogger = new DeprecationLogger(LogManager.getLogger(HttpInfo.class)); private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(HttpInfo.class);
/** Deprecated property, just here for deprecation logging in 7.x. */ /** Deprecated property, just here for deprecation logging in 7.x. */
private static final boolean CNAME_IN_PUBLISH_HOST = System.getProperty("es.http.cname_in_publish_address") != null; private static final boolean CNAME_IN_PUBLISH_HOST = System.getProperty("es.http.cname_in_publish_address") != null;

2
server/src/main/java/org/elasticsearch/index/AbstractIndexComponent.java
View File

@ -34,7 +34,7 @@ public abstract class AbstractIndexComponent implements IndexComponent {
*/ */
protected AbstractIndexComponent(IndexSettings indexSettings) { protected AbstractIndexComponent(IndexSettings indexSettings) {
this.logger = Loggers.getLogger(getClass(), indexSettings.getIndex()); this.logger = Loggers.getLogger(getClass(), indexSettings.getIndex());
this.deprecationLogger = new DeprecationLogger(logger); this.deprecationLogger = DeprecationLogger.getLogger(getClass());
this.indexSettings = indexSettings; this.indexSettings = indexSettings;
} }

4
server/src/main/java/org/elasticsearch/index/analysis/PreConfiguredTokenFilter.java
View File

@ -19,7 +19,6 @@
package org.elasticsearch.index.analysis; package org.elasticsearch.index.analysis;
import org.apache.logging.log4j.LogManager;
import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenFilter;
import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.TokenStream;
import org.elasticsearch.Version; import org.elasticsearch.Version;
@ -35,8 +34,7 @@ import java.util.function.Function;
*/ */
public final class PreConfiguredTokenFilter extends PreConfiguredAnalysisComponent<TokenFilterFactory> { public final class PreConfiguredTokenFilter extends PreConfiguredAnalysisComponent<TokenFilterFactory> {
private static final DeprecationLogger DEPRECATION_LOGGER private static final DeprecationLogger DEPRECATION_LOGGER = DeprecationLogger.getLogger(PreConfiguredTokenFilter.class);
= new DeprecationLogger(LogManager.getLogger(PreConfiguredTokenFilter.class));
/** /**
* Create a pre-configured token filter that may not vary at all. * Create a pre-configured token filter that may not vary at all.

4
server/src/main/java/org/elasticsearch/index/analysis/ShingleTokenFilterFactory.java
View File

@ -19,7 +19,6 @@
package org.elasticsearch.index.analysis; package org.elasticsearch.index.analysis;
import org.apache.logging.log4j.LogManager;
import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.miscellaneous.DisableGraphAttribute; import org.apache.lucene.analysis.miscellaneous.DisableGraphAttribute;
import org.apache.lucene.analysis.shingle.ShingleFilter; import org.apache.lucene.analysis.shingle.ShingleFilter;
@ -31,8 +30,7 @@ import org.elasticsearch.index.IndexSettings;
public class ShingleTokenFilterFactory extends AbstractTokenFilterFactory { public class ShingleTokenFilterFactory extends AbstractTokenFilterFactory {
private static final DeprecationLogger DEPRECATION_LOGGER = private static final DeprecationLogger DEPRECATION_LOGGER = DeprecationLogger.getLogger(ShingleTokenFilterFactory.class);
new DeprecationLogger(LogManager.getLogger(ShingleTokenFilterFactory.class));
private final Factory factory; private final Factory factory;

3
server/src/main/java/org/elasticsearch/index/mapper/CompletionFieldMapper.java
View File

@ -18,7 +18,6 @@
*/ */
package org.elasticsearch.index.mapper; package org.elasticsearch.index.mapper;
import org.apache.logging.log4j.LogManager;
import org.apache.lucene.codecs.PostingsFormat; import org.apache.lucene.codecs.PostingsFormat;
import org.apache.lucene.document.FieldType; import org.apache.lucene.document.FieldType;
import org.apache.lucene.index.IndexOptions; import org.apache.lucene.index.IndexOptions;
@ -150,7 +149,7 @@ public class CompletionFieldMapper extends ParametrizedFieldMapper {
private final NamedAnalyzer defaultAnalyzer; private final NamedAnalyzer defaultAnalyzer;
private final Version indexVersionCreated; private final Version indexVersionCreated;
private static final DeprecationLogger deprecationLogger = new DeprecationLogger(LogManager.getLogger(Builder.class)); private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(Builder.class);
/** /**
* @param name of the completion field to build * @param name of the completion field to build

3
server/src/main/java/org/elasticsearch/index/mapper/DynamicTemplate.java
View File

@ -19,7 +19,6 @@
package org.elasticsearch.index.mapper; package org.elasticsearch.index.mapper;
import org.apache.logging.log4j.LogManager;
import org.elasticsearch.Version; import org.elasticsearch.Version;
import org.elasticsearch.common.logging.DeprecationLogger; import org.elasticsearch.common.logging.DeprecationLogger;
import org.elasticsearch.common.regex.Regex; import org.elasticsearch.common.regex.Regex;
@ -36,7 +35,7 @@ import java.util.TreeMap;
public class DynamicTemplate implements ToXContentObject { public class DynamicTemplate implements ToXContentObject {
private static final DeprecationLogger deprecationLogger = new DeprecationLogger(LogManager.getLogger(DynamicTemplate.class)); private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(DynamicTemplate.class);
public enum MatchType { public enum MatchType {
SIMPLE { SIMPLE {

5
server/src/main/java/org/elasticsearch/index/mapper/FieldNamesFieldMapper.java
View File

@ -19,7 +19,6 @@
package org.elasticsearch.index.mapper; package org.elasticsearch.index.mapper;
import org.apache.logging.log4j.LogManager;
import org.apache.lucene.document.Field; import org.apache.lucene.document.Field;
import org.apache.lucene.document.FieldType; import org.apache.lucene.document.FieldType;
import org.apache.lucene.index.IndexOptions; import org.apache.lucene.index.IndexOptions;
@ -44,8 +43,8 @@ import java.util.List;
*/ */
public class FieldNamesFieldMapper extends MetadataFieldMapper { public class FieldNamesFieldMapper extends MetadataFieldMapper {
private static final DeprecationLogger deprecationLogger = new DeprecationLogger( private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(FieldNamesFieldMapper.class);
LogManager.getLogger(FieldNamesFieldMapper.class));
public static final String NAME = "_field_names"; public static final String NAME = "_field_names";

3
server/src/main/java/org/elasticsearch/index/mapper/IdFieldMapper.java
View File

@ -19,7 +19,6 @@
package org.elasticsearch.index.mapper; package org.elasticsearch.index.mapper;
import org.apache.logging.log4j.LogManager;
import org.apache.lucene.document.Field; import org.apache.lucene.document.Field;
import org.apache.lucene.document.FieldType; import org.apache.lucene.document.FieldType;
import org.apache.lucene.index.IndexOptions; import org.apache.lucene.index.IndexOptions;
@ -61,7 +60,7 @@ import java.util.List;
* queries. * queries.
*/ */
public class IdFieldMapper extends MetadataFieldMapper { public class IdFieldMapper extends MetadataFieldMapper {
private static final DeprecationLogger deprecationLogger = new DeprecationLogger(LogManager.getLogger(IdFieldMapper.class)); private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(IdFieldMapper.class);
static final String ID_FIELD_DATA_DEPRECATION_MESSAGE = static final String ID_FIELD_DATA_DEPRECATION_MESSAGE =
"Loading the fielddata on the _id field is deprecated and will be removed in future versions. " "Loading the fielddata on the _id field is deprecated and will be removed in future versions. "
+ "If you require sorting or aggregating on this field you should also include the id in the " + "If you require sorting or aggregating on this field you should also include the id in the "

5
server/src/main/java/org/elasticsearch/index/mapper/LegacyGeoShapeFieldMapper.java
View File

@ -18,8 +18,6 @@
*/ */
package org.elasticsearch.index.mapper; package org.elasticsearch.index.mapper;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.lucene.document.FieldType; import org.apache.lucene.document.FieldType;
import org.apache.lucene.index.IndexableField; import org.apache.lucene.index.IndexableField;
import org.apache.lucene.spatial.prefix.PrefixTreeStrategy; import org.apache.lucene.spatial.prefix.PrefixTreeStrategy;
@ -181,8 +179,7 @@ public class LegacyGeoShapeFieldMapper extends AbstractShapeGeometryFieldMapper<
} }
} }
private static final Logger logger = LogManager.getLogger(LegacyGeoShapeFieldMapper.class); private static final DeprecationLogger DEPRECATION_LOGGER = DeprecationLogger.getLogger(LegacyGeoShapeFieldMapper.class);
private static final DeprecationLogger DEPRECATION_LOGGER = new DeprecationLogger(logger);
public static class Builder extends AbstractShapeGeometryFieldMapper.Builder<Builder, public static class Builder extends AbstractShapeGeometryFieldMapper.Builder<Builder,
LegacyGeoShapeFieldMapper.GeoShapeFieldType> { LegacyGeoShapeFieldMapper.GeoShapeFieldType> {

3
server/src/main/java/org/elasticsearch/index/mapper/MapperService.java
View File

@ -20,7 +20,6 @@
package org.elasticsearch.index.mapper; package org.elasticsearch.index.mapper;
import com.carrotsearch.hppc.cursors.ObjectCursor; import com.carrotsearch.hppc.cursors.ObjectCursor;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.message.ParameterizedMessage; import org.apache.logging.log4j.message.ParameterizedMessage;
import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.DelegatingAnalyzerWrapper; import org.apache.lucene.analysis.DelegatingAnalyzerWrapper;
@ -125,7 +124,7 @@ public class MapperService extends AbstractIndexComponent implements Closeable {
Collections.unmodifiableSet(new HashSet<>(Arrays.asList( Collections.unmodifiableSet(new HashSet<>(Arrays.asList(
"_id", IgnoredFieldMapper.NAME, "_index", "_routing", "_size", "_timestamp", "_ttl", "_type"))); "_id", IgnoredFieldMapper.NAME, "_index", "_routing", "_size", "_timestamp", "_ttl", "_type")));
private static final DeprecationLogger deprecationLogger = new DeprecationLogger(LogManager.getLogger(MapperService.class)); private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(MapperService.class);
static final String DEFAULT_MAPPING_ERROR_MESSAGE = "[_default_] mappings are not allowed on new indices and should no " + static final String DEFAULT_MAPPING_ERROR_MESSAGE = "[_default_] mappings are not allowed on new indices and should no " +
"longer be used. See [https://www.elastic.co/guide/en/elasticsearch/reference/current/breaking-changes-7.0.html" + "longer be used. See [https://www.elastic.co/guide/en/elasticsearch/reference/current/breaking-changes-7.0.html" +
"#default-mapping-not-allowed] for more information."; "#default-mapping-not-allowed] for more information.";

3
server/src/main/java/org/elasticsearch/index/mapper/ObjectMapper.java
View File

@ -19,7 +19,6 @@
package org.elasticsearch.index.mapper; package org.elasticsearch.index.mapper;
import org.apache.logging.log4j.LogManager;
import org.apache.lucene.index.Term; import org.apache.lucene.index.Term;
import org.apache.lucene.search.Query; import org.apache.lucene.search.Query;
import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TermQuery;
@ -47,7 +46,7 @@ import java.util.Locale;
import java.util.Map; import java.util.Map;
public class ObjectMapper extends Mapper implements Cloneable { public class ObjectMapper extends Mapper implements Cloneable {
private static final DeprecationLogger deprecationLogger = new DeprecationLogger(LogManager.getLogger(ObjectMapper.class)); private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(ObjectMapper.class);
public static final String CONTENT_TYPE = "object"; public static final String CONTENT_TYPE = "object";
public static final String NESTED_CONTENT_TYPE = "nested"; public static final String NESTED_CONTENT_TYPE = "nested";

4
server/src/main/java/org/elasticsearch/index/mapper/ParametrizedFieldMapper.java
View File

@ -19,7 +19,6 @@
package org.elasticsearch.index.mapper; package org.elasticsearch.index.mapper;
import org.apache.logging.log4j.LogManager;
import org.apache.lucene.document.FieldType; import org.apache.lucene.document.FieldType;
import org.elasticsearch.Version; import org.elasticsearch.Version;
import org.elasticsearch.common.Explicit; import org.elasticsearch.common.Explicit;
@ -60,8 +59,7 @@ import java.util.function.Supplier;
*/ */
public abstract class ParametrizedFieldMapper extends FieldMapper { public abstract class ParametrizedFieldMapper extends FieldMapper {
private static final DeprecationLogger deprecationLogger private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(ParametrizedFieldMapper.class);
= new DeprecationLogger(LogManager.getLogger(ParametrizedFieldMapper.class));
/** /**
* Creates a new ParametrizedFieldMapper * Creates a new ParametrizedFieldMapper

6
server/src/main/java/org/elasticsearch/index/mapper/RootObjectMapper.java
View File

@ -19,8 +19,6 @@
package org.elasticsearch.index.mapper; package org.elasticsearch.index.mapper;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.elasticsearch.Version; import org.elasticsearch.Version;
import org.elasticsearch.common.Explicit; import org.elasticsearch.common.Explicit;
import org.elasticsearch.common.Nullable; import org.elasticsearch.common.Nullable;
@ -47,9 +45,7 @@ import static org.elasticsearch.common.xcontent.support.XContentMapValues.nodeBo
import static org.elasticsearch.index.mapper.TypeParsers.parseDateTimeFormatter; import static org.elasticsearch.index.mapper.TypeParsers.parseDateTimeFormatter;
public class RootObjectMapper extends ObjectMapper { public class RootObjectMapper extends ObjectMapper {
private static final DeprecationLogger DEPRECATION_LOGGER = DeprecationLogger.getLogger(RootObjectMapper.class);
private static final Logger LOGGER = LogManager.getLogger(RootObjectMapper.class);
private static final DeprecationLogger DEPRECATION_LOGGER = new DeprecationLogger(LOGGER);
public static class Defaults { public static class Defaults {
public static final DateFormatter[] DYNAMIC_DATE_TIME_FORMATTERS = public static final DateFormatter[] DYNAMIC_DATE_TIME_FORMATTERS =

3
server/src/main/java/org/elasticsearch/index/mapper/TypeParsers.java
View File

@ -19,7 +19,6 @@
package org.elasticsearch.index.mapper; package org.elasticsearch.index.mapper;
import org.apache.logging.log4j.LogManager;
import org.apache.lucene.index.IndexOptions; import org.apache.lucene.index.IndexOptions;
import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.ElasticsearchParseException;
import org.elasticsearch.common.logging.DeprecationLogger; import org.elasticsearch.common.logging.DeprecationLogger;
@ -42,7 +41,7 @@ import static org.elasticsearch.common.xcontent.support.XContentMapValues.nodeFl
import static org.elasticsearch.common.xcontent.support.XContentMapValues.nodeStringValue; import static org.elasticsearch.common.xcontent.support.XContentMapValues.nodeStringValue;
public class TypeParsers { public class TypeParsers {
private static final DeprecationLogger deprecationLogger = new DeprecationLogger(LogManager.getLogger(TypeParsers.class)); private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(TypeParsers.class);
public static final String DOC_VALUES = "doc_values"; public static final String DOC_VALUES = "doc_values";
public static final String INDEX_OPTIONS_DOCS = "docs"; public static final String INDEX_OPTIONS_DOCS = "docs";

4
server/src/main/java/org/elasticsearch/index/query/GeoShapeQueryBuilder.java
View File

@ -19,7 +19,6 @@
package org.elasticsearch.index.query; package org.elasticsearch.index.query;
import org.apache.logging.log4j.LogManager;
import org.apache.lucene.search.ConstantScoreQuery; import org.apache.lucene.search.ConstantScoreQuery;
import org.apache.lucene.search.Query; import org.apache.lucene.search.Query;
import org.elasticsearch.common.Nullable; import org.elasticsearch.common.Nullable;
@ -52,8 +51,7 @@ import java.util.function.Supplier;
*/ */
public class GeoShapeQueryBuilder extends AbstractGeometryQueryBuilder<GeoShapeQueryBuilder> { public class GeoShapeQueryBuilder extends AbstractGeometryQueryBuilder<GeoShapeQueryBuilder> {
public static final String NAME = "geo_shape"; public static final String NAME = "geo_shape";
private static final DeprecationLogger deprecationLogger = new DeprecationLogger( private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(GeoShapeQueryBuilder.class);
LogManager.getLogger(GeoShapeQueryBuilder.class));
protected static final ParseField STRATEGY_FIELD = new ParseField("strategy"); protected static final ParseField STRATEGY_FIELD = new ParseField("strategy");

4
server/src/main/java/org/elasticsearch/index/query/IdsQueryBuilder.java
View File

@ -19,7 +19,6 @@
package org.elasticsearch.index.query; package org.elasticsearch.index.query;
import org.apache.logging.log4j.LogManager;
import org.apache.lucene.search.MatchNoDocsQuery; import org.apache.lucene.search.MatchNoDocsQuery;
import org.apache.lucene.search.Query; import org.apache.lucene.search.Query;
import org.elasticsearch.cluster.metadata.Metadata; import org.elasticsearch.cluster.metadata.Metadata;
@ -52,8 +51,7 @@ import static org.elasticsearch.common.xcontent.ObjectParser.fromList;
*/ */
public class IdsQueryBuilder extends AbstractQueryBuilder<IdsQueryBuilder> { public class IdsQueryBuilder extends AbstractQueryBuilder<IdsQueryBuilder> {
public static final String NAME = "ids"; public static final String NAME = "ids";
private static final DeprecationLogger deprecationLogger = new DeprecationLogger( private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(IdsQueryBuilder.class);
LogManager.getLogger(IdsQueryBuilder.class));
static final String TYPES_DEPRECATION_MESSAGE = "[types removal] Types are deprecated in [ids] queries."; static final String TYPES_DEPRECATION_MESSAGE = "[types removal] Types are deprecated in [ids] queries.";
private static final ParseField TYPE_FIELD = new ParseField("type"); private static final ParseField TYPE_FIELD = new ParseField("type");

4
server/src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryBuilder.java
View File

@ -19,7 +19,6 @@
package org.elasticsearch.index.query; package org.elasticsearch.index.query;
import org.apache.logging.log4j.LogManager;
import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.index.Fields; import org.apache.lucene.index.Fields;
import org.apache.lucene.search.BooleanClause; import org.apache.lucene.search.BooleanClause;
@ -80,8 +79,7 @@ import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
*/ */
public class MoreLikeThisQueryBuilder extends AbstractQueryBuilder<MoreLikeThisQueryBuilder> { public class MoreLikeThisQueryBuilder extends AbstractQueryBuilder<MoreLikeThisQueryBuilder> {
public static final String NAME = "more_like_this"; public static final String NAME = "more_like_this";
private static final DeprecationLogger deprecationLogger = new DeprecationLogger( private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(MoreLikeThisQueryBuilder.class);
LogManager.getLogger(MoreLikeThisQueryBuilder.class));
static final String TYPES_DEPRECATION_MESSAGE = "[types removal] Types are deprecated in [more_like_this] " + static final String TYPES_DEPRECATION_MESSAGE = "[types removal] Types are deprecated in [more_like_this] " +
"queries. The type should no longer be specified in the [like] and [unlike] sections."; "queries. The type should no longer be specified in the [like] and [unlike] sections.";

4
server/src/main/java/org/elasticsearch/index/query/QueryShardContext.java
View File

@ -19,7 +19,6 @@
package org.elasticsearch.index.query; package org.elasticsearch.index.query;
import org.apache.logging.log4j.LogManager;
import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexReader;
import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.IndexSearcher;
@ -84,8 +83,7 @@ import static java.util.Collections.unmodifiableMap;
* Context object used to create lucene queries on the shard level. * Context object used to create lucene queries on the shard level.
*/ */
public class QueryShardContext extends QueryRewriteContext { public class QueryShardContext extends QueryRewriteContext {
private static final DeprecationLogger deprecationLogger = new DeprecationLogger( private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(QueryShardContext.class);
LogManager.getLogger(QueryShardContext.class));
public static final String TYPES_DEPRECATION_MESSAGE = "[types removal] Using the _type field " + public static final String TYPES_DEPRECATION_MESSAGE = "[types removal] Using the _type field " +
"in queries and aggregations is deprecated, prefer to use a field instead."; "in queries and aggregations is deprecated, prefer to use a field instead.";

4
server/src/main/java/org/elasticsearch/index/query/TypeQueryBuilder.java
View File

@ -19,7 +19,6 @@
package org.elasticsearch.index.query; package org.elasticsearch.index.query;
import org.apache.logging.log4j.LogManager;
import org.apache.lucene.search.MatchNoDocsQuery; import org.apache.lucene.search.MatchNoDocsQuery;
import org.apache.lucene.search.Query; import org.apache.lucene.search.Query;
import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRef;
@ -40,8 +39,7 @@ public class TypeQueryBuilder extends AbstractQueryBuilder<TypeQueryBuilder> {
public static final String NAME = "type"; public static final String NAME = "type";
private static final ParseField VALUE_FIELD = new ParseField("value"); private static final ParseField VALUE_FIELD = new ParseField("value");
private static final DeprecationLogger deprecationLogger = new DeprecationLogger( private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(TypeQueryBuilder.class);
LogManager.getLogger(TypeQueryBuilder.class));
static final String TYPES_DEPRECATION_MESSAGE = "[types removal] Type queries are deprecated, " + static final String TYPES_DEPRECATION_MESSAGE = "[types removal] Type queries are deprecated, " +
"prefer to filter on a field instead."; "prefer to filter on a field instead.";

5
server/src/main/java/org/elasticsearch/index/query/functionscore/RandomScoreFunctionBuilder.java
View File

@ -18,7 +18,6 @@
*/ */
package org.elasticsearch.index.query.functionscore; package org.elasticsearch.index.query.functionscore;
import org.apache.logging.log4j.LogManager;
import org.elasticsearch.Version; import org.elasticsearch.Version;
import org.elasticsearch.common.ParsingException; import org.elasticsearch.common.ParsingException;
import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamInput;
@ -39,9 +38,7 @@ import java.util.Objects;
* A function that computes a random score for the matched documents * A function that computes a random score for the matched documents
*/ */
public class RandomScoreFunctionBuilder extends ScoreFunctionBuilder<RandomScoreFunctionBuilder> { public class RandomScoreFunctionBuilder extends ScoreFunctionBuilder<RandomScoreFunctionBuilder> {
private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(RandomScoreFunctionBuilder.class);
private static final DeprecationLogger deprecationLogger = new DeprecationLogger(
LogManager.getLogger(RandomScoreFunctionBuilder.class));
public static final String NAME = "random_score"; public static final String NAME = "random_score";
private String field; private String field;

3
server/src/main/java/org/elasticsearch/index/reindex/ReindexRequest.java
View File

@ -19,7 +19,6 @@
package org.elasticsearch.index.reindex; package org.elasticsearch.index.reindex;
import org.apache.logging.log4j.LogManager;
import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionRequestValidationException;
import org.elasticsearch.action.CompositeIndicesRequest; import org.elasticsearch.action.CompositeIndicesRequest;
import org.elasticsearch.action.index.IndexRequest; import org.elasticsearch.action.index.IndexRequest;
@ -362,7 +361,7 @@ public class ReindexRequest extends AbstractBulkIndexByScrollRequest<ReindexRequ
static final ObjectParser<ReindexRequest, Void> PARSER = new ObjectParser<>("reindex"); static final ObjectParser<ReindexRequest, Void> PARSER = new ObjectParser<>("reindex");
static final String TYPES_DEPRECATION_MESSAGE = "[types removal] Specifying types in reindex requests is deprecated."; static final String TYPES_DEPRECATION_MESSAGE = "[types removal] Specifying types in reindex requests is deprecated.";
private static final DeprecationLogger deprecationLogger = new DeprecationLogger(LogManager.getLogger(ReindexRequest.class)); private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(ReindexRequest.class);
static { static {
ObjectParser.Parser<ReindexRequest, Void> sourceParser = (parser, request, context) -> { ObjectParser.Parser<ReindexRequest, Void> sourceParser = (parser, request, context) -> {

3
server/src/main/java/org/elasticsearch/index/similarity/SimilarityProviders.java
View File

@ -19,7 +19,6 @@
package org.elasticsearch.index.similarity; package org.elasticsearch.index.similarity;
import org.apache.logging.log4j.LogManager;
import org.apache.lucene.search.similarities.AfterEffect; import org.apache.lucene.search.similarities.AfterEffect;
import org.apache.lucene.search.similarities.AfterEffectB; import org.apache.lucene.search.similarities.AfterEffectB;
import org.apache.lucene.search.similarities.AfterEffectL; import org.apache.lucene.search.similarities.AfterEffectL;
@ -67,7 +66,7 @@ final class SimilarityProviders {
private SimilarityProviders() {} // no instantiation private SimilarityProviders() {} // no instantiation
private static final DeprecationLogger deprecationLogger = new DeprecationLogger(LogManager.getLogger(SimilarityProviders.class)); private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(SimilarityProviders.class);
static final String DISCOUNT_OVERLAPS = "discount_overlaps"; static final String DISCOUNT_OVERLAPS = "discount_overlaps";
private static final Map<String, BasicModel> BASIC_MODELS; private static final Map<String, BasicModel> BASIC_MODELS;

4
server/src/main/java/org/elasticsearch/index/similarity/SimilarityService.java
View File

@ -19,7 +19,6 @@
package org.elasticsearch.index.similarity; package org.elasticsearch.index.similarity;
import org.apache.logging.log4j.LogManager;
import org.apache.lucene.index.FieldInvertState; import org.apache.lucene.index.FieldInvertState;
import org.apache.lucene.index.IndexOptions; import org.apache.lucene.index.IndexOptions;
import org.apache.lucene.search.CollectionStatistics; import org.apache.lucene.search.CollectionStatistics;
@ -50,8 +49,7 @@ import java.util.function.Function;
import java.util.function.Supplier; import java.util.function.Supplier;
public final class SimilarityService extends AbstractIndexComponent { public final class SimilarityService extends AbstractIndexComponent {
private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(SimilarityService.class);
private static final DeprecationLogger deprecationLogger = new DeprecationLogger(LogManager.getLogger(SimilarityService.class));
public static final String DEFAULT_SIMILARITY = "BM25"; public static final String DEFAULT_SIMILARITY = "BM25";
private static final String CLASSIC_SIMILARITY = "classic"; private static final String CLASSIC_SIMILARITY = "classic";
private static final Map<String, Function<Version, Supplier<Similarity>>> DEFAULTS; private static final Map<String, Function<Version, Supplier<Similarity>>> DEFAULTS;

4
server/src/main/java/org/elasticsearch/indices/analysis/AnalysisModule.java
View File

@ -19,7 +19,6 @@
package org.elasticsearch.indices.analysis; package org.elasticsearch.indices.analysis;
import org.apache.logging.log4j.LogManager;
import org.apache.lucene.analysis.LowerCaseFilter; import org.apache.lucene.analysis.LowerCaseFilter;
import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.TokenStream;
import org.elasticsearch.Version; import org.elasticsearch.Version;
@ -71,8 +70,7 @@ public final class AnalysisModule {
} }
private static final IndexSettings NA_INDEX_SETTINGS; private static final IndexSettings NA_INDEX_SETTINGS;
private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(AnalysisModule.class);
private static final DeprecationLogger deprecationLogger = new DeprecationLogger(LogManager.getLogger(AnalysisModule.class));
private final HunspellService hunspellService; private final HunspellService hunspellService;
private final AnalysisRegistry analysisRegistry; private final AnalysisRegistry analysisRegistry;

2
server/src/main/java/org/elasticsearch/indices/flush/SyncedFlushService.java
View File

@ -79,7 +79,7 @@ public class SyncedFlushService implements IndexEventListener {
private static final Logger logger = LogManager.getLogger(SyncedFlushService.class); private static final Logger logger = LogManager.getLogger(SyncedFlushService.class);
private static final DeprecationLogger DEPRECATION_LOGGER = new DeprecationLogger(logger); private static final DeprecationLogger DEPRECATION_LOGGER = DeprecationLogger.getLogger(logger.getName());
public static final String SYNCED_FLUSH_DEPRECATION_MESSAGE = public static final String SYNCED_FLUSH_DEPRECATION_MESSAGE =
"Synced flush is deprecated and will be removed in 8.0. Use flush at _/flush or /{index}/_flush instead."; "Synced flush is deprecated and will be removed in 8.0. Use flush at _/flush or /{index}/_flush instead.";

4
server/src/main/java/org/elasticsearch/ingest/ConditionalProcessor.java
View File

@ -19,7 +19,6 @@
package org.elasticsearch.ingest; package org.elasticsearch.ingest;
import org.apache.logging.log4j.LogManager;
import org.elasticsearch.common.logging.DeprecationLogger; import org.elasticsearch.common.logging.DeprecationLogger;
import org.elasticsearch.script.DynamicMap; import org.elasticsearch.script.DynamicMap;
import org.elasticsearch.script.IngestConditionalScript; import org.elasticsearch.script.IngestConditionalScript;
@ -47,8 +46,7 @@ import static org.elasticsearch.ingest.ConfigurationUtils.newConfigurationExcept
public class ConditionalProcessor extends AbstractProcessor implements WrappingProcessor { public class ConditionalProcessor extends AbstractProcessor implements WrappingProcessor {
private static final DeprecationLogger deprecationLogger = private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(DynamicMap.class);
new DeprecationLogger(LogManager.getLogger(DynamicMap.class));
private static final Map<String, Function<Object, Object>> FUNCTIONS = org.elasticsearch.common.collect.Map.of( private static final Map<String, Function<Object, Object>> FUNCTIONS = org.elasticsearch.common.collect.Map.of(
"_type", value -> { "_type", value -> {
deprecationLogger.deprecate("conditional-processor__type", deprecationLogger.deprecate("conditional-processor__type",

2
server/src/main/java/org/elasticsearch/rest/RestController.java
View File

@ -64,7 +64,7 @@ import static org.elasticsearch.rest.RestStatus.OK;
public class RestController implements HttpServerTransport.Dispatcher { public class RestController implements HttpServerTransport.Dispatcher {
private static final Logger logger = LogManager.getLogger(RestController.class); private static final Logger logger = LogManager.getLogger(RestController.class);
private static final DeprecationLogger deprecationLogger = new DeprecationLogger(logger); private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(RestController.class);
private static final BytesReference FAVICON_RESPONSE; private static final BytesReference FAVICON_RESPONSE;

4
server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestCreateIndexAction.java
View File

@ -19,7 +19,6 @@
package org.elasticsearch.rest.action.admin.indices; package org.elasticsearch.rest.action.admin.indices;
import org.apache.logging.log4j.LogManager;
import org.elasticsearch.action.admin.indices.create.CreateIndexRequest; import org.elasticsearch.action.admin.indices.create.CreateIndexRequest;
import org.elasticsearch.action.support.ActiveShardCount; import org.elasticsearch.action.support.ActiveShardCount;
import org.elasticsearch.client.node.NodeClient; import org.elasticsearch.client.node.NodeClient;
@ -41,8 +40,7 @@ import static java.util.Collections.singletonMap;
import static org.elasticsearch.rest.RestRequest.Method.PUT; import static org.elasticsearch.rest.RestRequest.Method.PUT;
public class RestCreateIndexAction extends BaseRestHandler { public class RestCreateIndexAction extends BaseRestHandler {
private static final DeprecationLogger deprecationLogger = new DeprecationLogger( private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(RestCreateIndexAction.class);
LogManager.getLogger(RestCreateIndexAction.class));
public static final String TYPES_DEPRECATION_MESSAGE = "[types removal] Using include_type_name in create " + public static final String TYPES_DEPRECATION_MESSAGE = "[types removal] Using include_type_name in create " +
"index requests is deprecated. The parameter will be removed in the next major version."; "index requests is deprecated. The parameter will be removed in the next major version.";

3
server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestForceMergeAction.java
View File

@ -19,7 +19,6 @@
package org.elasticsearch.rest.action.admin.indices; package org.elasticsearch.rest.action.admin.indices;
import org.apache.logging.log4j.LogManager;
import org.elasticsearch.action.admin.indices.forcemerge.ForceMergeRequest; import org.elasticsearch.action.admin.indices.forcemerge.ForceMergeRequest;
import org.elasticsearch.action.support.IndicesOptions; import org.elasticsearch.action.support.IndicesOptions;
import org.elasticsearch.client.node.NodeClient; import org.elasticsearch.client.node.NodeClient;
@ -38,7 +37,7 @@ import static org.elasticsearch.rest.RestRequest.Method.POST;
public class RestForceMergeAction extends BaseRestHandler { public class RestForceMergeAction extends BaseRestHandler {
private static final DeprecationLogger deprecationLogger = new DeprecationLogger(LogManager.getLogger(RestForceMergeAction.class)); private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(RestForceMergeAction.class);
@Override @Override
public List<Route> routes() { public List<Route> routes() {

2
server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetFieldMappingAction.java
View File

@ -49,7 +49,7 @@ import static org.elasticsearch.rest.RestStatus.OK;
public class RestGetFieldMappingAction extends BaseRestHandler { public class RestGetFieldMappingAction extends BaseRestHandler {
private static final Logger logger = LogManager.getLogger(RestGetFieldMappingAction.class); private static final Logger logger = LogManager.getLogger(RestGetFieldMappingAction.class);
private static final DeprecationLogger deprecationLogger = new DeprecationLogger(logger); private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(logger.getName());
public static final String TYPES_DEPRECATION_MESSAGE = "[types removal] Using include_type_name in get " + public static final String TYPES_DEPRECATION_MESSAGE = "[types removal] Using include_type_name in get " +
"field mapping requests is deprecated. The parameter will be removed in the next major version."; "field mapping requests is deprecated. The parameter will be removed in the next major version.";

4
server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetIndexTemplateAction.java
View File

@ -19,7 +19,6 @@
package org.elasticsearch.rest.action.admin.indices; package org.elasticsearch.rest.action.admin.indices;
import org.apache.logging.log4j.LogManager;
import org.elasticsearch.action.admin.indices.template.get.GetIndexTemplatesRequest; import org.elasticsearch.action.admin.indices.template.get.GetIndexTemplatesRequest;
import org.elasticsearch.action.admin.indices.template.get.GetIndexTemplatesResponse; import org.elasticsearch.action.admin.indices.template.get.GetIndexTemplatesResponse;
import org.elasticsearch.client.node.NodeClient; import org.elasticsearch.client.node.NodeClient;
@ -51,8 +50,7 @@ public class RestGetIndexTemplateAction extends BaseRestHandler {
private static final Set<String> RESPONSE_PARAMETERS = Collections.unmodifiableSet(Sets.union( private static final Set<String> RESPONSE_PARAMETERS = Collections.unmodifiableSet(Sets.union(
Collections.singleton(INCLUDE_TYPE_NAME_PARAMETER), Settings.FORMAT_PARAMS)); Collections.singleton(INCLUDE_TYPE_NAME_PARAMETER), Settings.FORMAT_PARAMS));
private static final DeprecationLogger deprecationLogger = new DeprecationLogger( private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(RestGetIndexTemplateAction.class);
LogManager.getLogger(RestGetIndexTemplateAction.class));
public static final String TYPES_DEPRECATION_MESSAGE = "[types removal]" + public static final String TYPES_DEPRECATION_MESSAGE = "[types removal]" +
" Specifying include_type_name in get index template requests is deprecated."; " Specifying include_type_name in get index template requests is deprecated.";

3
server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetIndicesAction.java
View File

@ -20,7 +20,6 @@
package org.elasticsearch.rest.action.admin.indices; package org.elasticsearch.rest.action.admin.indices;
import org.apache.logging.log4j.LogManager;
import org.elasticsearch.action.admin.indices.get.GetIndexRequest; import org.elasticsearch.action.admin.indices.get.GetIndexRequest;
import org.elasticsearch.action.support.IndicesOptions; import org.elasticsearch.action.support.IndicesOptions;
import org.elasticsearch.client.node.NodeClient; import org.elasticsearch.client.node.NodeClient;
@ -48,7 +47,7 @@ import static org.elasticsearch.rest.RestRequest.Method.HEAD;
*/ */
public class RestGetIndicesAction extends BaseRestHandler { public class RestGetIndicesAction extends BaseRestHandler {
private static final DeprecationLogger deprecationLogger = new DeprecationLogger(LogManager.getLogger(RestGetIndicesAction.class)); private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(RestGetIndicesAction.class);
public static final String TYPES_DEPRECATION_MESSAGE = "[types removal] Using `include_type_name` in get indices requests" public static final String TYPES_DEPRECATION_MESSAGE = "[types removal] Using `include_type_name` in get indices requests"
+ " is deprecated. The parameter will be removed in the next major version."; + " is deprecated. The parameter will be removed in the next major version.";

2
server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetMappingAction.java
View File

@ -64,7 +64,7 @@ import static org.elasticsearch.rest.RestRequest.Method.HEAD;
public class RestGetMappingAction extends BaseRestHandler { public class RestGetMappingAction extends BaseRestHandler {
private static final Logger logger = LogManager.getLogger(RestGetMappingAction.class); private static final Logger logger = LogManager.getLogger(RestGetMappingAction.class);
private static final DeprecationLogger deprecationLogger = new DeprecationLogger(logger); private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(logger.getName());
public static final String TYPES_DEPRECATION_MESSAGE = "[types removal] Using include_type_name in get" + public static final String TYPES_DEPRECATION_MESSAGE = "[types removal] Using include_type_name in get" +
" mapping requests is deprecated. The parameter will be removed in the next major version."; " mapping requests is deprecated. The parameter will be removed in the next major version.";

4
server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestPutIndexTemplateAction.java
View File

@ -19,7 +19,6 @@
package org.elasticsearch.rest.action.admin.indices; package org.elasticsearch.rest.action.admin.indices;
import org.apache.logging.log4j.LogManager;
import org.elasticsearch.action.admin.indices.template.put.PutIndexTemplateRequest; import org.elasticsearch.action.admin.indices.template.put.PutIndexTemplateRequest;
import org.elasticsearch.client.node.NodeClient; import org.elasticsearch.client.node.NodeClient;
import org.elasticsearch.common.Strings; import org.elasticsearch.common.Strings;
@ -42,8 +41,7 @@ import static org.elasticsearch.rest.RestRequest.Method.PUT;
public class RestPutIndexTemplateAction extends BaseRestHandler { public class RestPutIndexTemplateAction extends BaseRestHandler {
private static final DeprecationLogger deprecationLogger = new DeprecationLogger( private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(RestPutIndexTemplateAction.class);
LogManager.getLogger(RestPutIndexTemplateAction.class));
public static final String TYPES_DEPRECATION_MESSAGE = "[types removal]" + public static final String TYPES_DEPRECATION_MESSAGE = "[types removal]" +
" Specifying include_type_name in put index template requests is deprecated."+ " Specifying include_type_name in put index template requests is deprecated."+
" The parameter will be removed in the next major version."; " The parameter will be removed in the next major version.";

4
server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestPutMappingAction.java
View File

@ -19,7 +19,6 @@
package org.elasticsearch.rest.action.admin.indices; package org.elasticsearch.rest.action.admin.indices;
import org.apache.logging.log4j.LogManager;
import org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest; import org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest;
import org.elasticsearch.action.support.IndicesOptions; import org.elasticsearch.action.support.IndicesOptions;
import org.elasticsearch.client.node.NodeClient; import org.elasticsearch.client.node.NodeClient;
@ -43,8 +42,7 @@ import static org.elasticsearch.rest.RestRequest.Method.POST;
import static org.elasticsearch.rest.RestRequest.Method.PUT; import static org.elasticsearch.rest.RestRequest.Method.PUT;
public class RestPutMappingAction extends BaseRestHandler { public class RestPutMappingAction extends BaseRestHandler {
private static final DeprecationLogger deprecationLogger = new DeprecationLogger( private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(RestPutMappingAction.class);
LogManager.getLogger(RestPutMappingAction.class));
public static final String TYPES_DEPRECATION_MESSAGE = "[types removal] Using include_type_name in put " + public static final String TYPES_DEPRECATION_MESSAGE = "[types removal] Using include_type_name in put " +
"mapping requests is deprecated. The parameter will be removed in the next major version."; "mapping requests is deprecated. The parameter will be removed in the next major version.";

2
server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestResizeHandler.java
View File

@ -42,7 +42,7 @@ import static org.elasticsearch.rest.RestRequest.Method.PUT;
public abstract class RestResizeHandler extends BaseRestHandler { public abstract class RestResizeHandler extends BaseRestHandler {
private static final Logger logger = LogManager.getLogger(RestResizeHandler.class); private static final Logger logger = LogManager.getLogger(RestResizeHandler.class);
private static final DeprecationLogger deprecationLogger = new DeprecationLogger(logger); private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(logger.getName());
RestResizeHandler() { RestResizeHandler() {
} }

4
server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestRolloverIndexAction.java
View File

@ -19,7 +19,6 @@
package org.elasticsearch.rest.action.admin.indices; package org.elasticsearch.rest.action.admin.indices;
import org.apache.logging.log4j.LogManager;
import org.elasticsearch.action.admin.indices.rollover.RolloverRequest; import org.elasticsearch.action.admin.indices.rollover.RolloverRequest;
import org.elasticsearch.action.support.ActiveShardCount; import org.elasticsearch.action.support.ActiveShardCount;
import org.elasticsearch.client.node.NodeClient; import org.elasticsearch.client.node.NodeClient;
@ -37,8 +36,7 @@ import static org.elasticsearch.rest.RestRequest.Method.POST;
public class RestRolloverIndexAction extends BaseRestHandler { public class RestRolloverIndexAction extends BaseRestHandler {
private static final DeprecationLogger deprecationLogger = new DeprecationLogger( private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(RestRolloverIndexAction.class);
LogManager.getLogger(RestRolloverIndexAction.class));
public static final String TYPES_DEPRECATION_MESSAGE = "[types removal] Using include_type_name in rollover " + public static final String TYPES_DEPRECATION_MESSAGE = "[types removal] Using include_type_name in rollover " +
"index requests is deprecated. The parameter will be removed in the next major version."; "index requests is deprecated. The parameter will be removed in the next major version.";

4
server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestValidateQueryAction.java
View File

@ -19,7 +19,6 @@
package org.elasticsearch.rest.action.admin.indices; package org.elasticsearch.rest.action.admin.indices;
import org.apache.logging.log4j.LogManager;
import org.elasticsearch.action.admin.indices.validate.query.QueryExplanation; import org.elasticsearch.action.admin.indices.validate.query.QueryExplanation;
import org.elasticsearch.action.admin.indices.validate.query.ValidateQueryRequest; import org.elasticsearch.action.admin.indices.validate.query.ValidateQueryRequest;
import org.elasticsearch.action.admin.indices.validate.query.ValidateQueryResponse; import org.elasticsearch.action.admin.indices.validate.query.ValidateQueryResponse;
@ -46,8 +45,7 @@ import static org.elasticsearch.rest.RestRequest.Method.POST;
import static org.elasticsearch.rest.RestStatus.OK; import static org.elasticsearch.rest.RestStatus.OK;
public class RestValidateQueryAction extends BaseRestHandler { public class RestValidateQueryAction extends BaseRestHandler {
private static final DeprecationLogger deprecationLogger = new DeprecationLogger( private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(RestValidateQueryAction.class);
LogManager.getLogger(RestValidateQueryAction.class));
static final String TYPES_DEPRECATION_MESSAGE = "[types removal]" + static final String TYPES_DEPRECATION_MESSAGE = "[types removal]" +
" Specifying types in validate query requests is deprecated."; " Specifying types in validate query requests is deprecated.";

4
server/src/main/java/org/elasticsearch/rest/action/cat/RestNodesAction.java
View File

@ -19,7 +19,6 @@
package org.elasticsearch.rest.action.cat; package org.elasticsearch.rest.action.cat;
import org.apache.logging.log4j.LogManager;
import org.elasticsearch.action.admin.cluster.node.info.NodeInfo; import org.elasticsearch.action.admin.cluster.node.info.NodeInfo;
import org.elasticsearch.action.admin.cluster.node.info.NodesInfoRequest; import org.elasticsearch.action.admin.cluster.node.info.NodesInfoRequest;
import org.elasticsearch.action.admin.cluster.node.info.NodesInfoResponse; import org.elasticsearch.action.admin.cluster.node.info.NodesInfoResponse;
@ -71,8 +70,7 @@ import static java.util.Collections.singletonList;
import static org.elasticsearch.rest.RestRequest.Method.GET; import static org.elasticsearch.rest.RestRequest.Method.GET;
public class RestNodesAction extends AbstractCatAction { public class RestNodesAction extends AbstractCatAction {
private static final DeprecationLogger deprecationLogger = new DeprecationLogger( private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(RestNodesAction.class);
LogManager.getLogger(RestNodesAction.class));
static final String LOCAL_DEPRECATED_MESSAGE = "Deprecated parameter [local] used. This parameter does not cause this API to act " + static final String LOCAL_DEPRECATED_MESSAGE = "Deprecated parameter [local] used. This parameter does not cause this API to act " +
"locally, and should not be used. It will be unsupported in version 8.0."; "locally, and should not be used. It will be unsupported in version 8.0.";

3
server/src/main/java/org/elasticsearch/rest/action/document/RestBulkAction.java
View File

@ -19,7 +19,6 @@
package org.elasticsearch.rest.action.document; package org.elasticsearch.rest.action.document;
import org.apache.logging.log4j.LogManager;
import org.elasticsearch.action.DocWriteRequest; import org.elasticsearch.action.DocWriteRequest;
import org.elasticsearch.action.bulk.BulkRequest; import org.elasticsearch.action.bulk.BulkRequest;
import org.elasticsearch.action.bulk.BulkShardRequest; import org.elasticsearch.action.bulk.BulkShardRequest;
@ -55,7 +54,7 @@ import static org.elasticsearch.rest.RestRequest.Method.PUT;
public class RestBulkAction extends BaseRestHandler { public class RestBulkAction extends BaseRestHandler {
private final boolean allowExplicitIndex; private final boolean allowExplicitIndex;
private static final DeprecationLogger deprecationLogger = new DeprecationLogger(LogManager.getLogger(RestSearchAction.class)); private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(RestSearchAction.class);
public static final String TYPES_DEPRECATION_MESSAGE = "[types removal]" + public static final String TYPES_DEPRECATION_MESSAGE = "[types removal]" +
" Specifying types in bulk requests is deprecated."; " Specifying types in bulk requests is deprecated.";

4
server/src/main/java/org/elasticsearch/rest/action/document/RestDeleteAction.java
View File

@ -19,7 +19,6 @@
package org.elasticsearch.rest.action.document; package org.elasticsearch.rest.action.document;
import org.apache.logging.log4j.LogManager;
import org.elasticsearch.action.delete.DeleteRequest; import org.elasticsearch.action.delete.DeleteRequest;
import org.elasticsearch.action.support.ActiveShardCount; import org.elasticsearch.action.support.ActiveShardCount;
import org.elasticsearch.client.node.NodeClient; import org.elasticsearch.client.node.NodeClient;
@ -38,8 +37,7 @@ import static java.util.Collections.unmodifiableList;
import static org.elasticsearch.rest.RestRequest.Method.DELETE; import static org.elasticsearch.rest.RestRequest.Method.DELETE;
public class RestDeleteAction extends BaseRestHandler { public class RestDeleteAction extends BaseRestHandler {
private static final DeprecationLogger deprecationLogger = new DeprecationLogger( private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(RestDeleteAction.class);
LogManager.getLogger(RestDeleteAction.class));
public static final String TYPES_DEPRECATION_MESSAGE = "[types removal] Specifying types in " + public static final String TYPES_DEPRECATION_MESSAGE = "[types removal] Specifying types in " +
"document index requests is deprecated, use the /{index}/_doc/{id} endpoint instead."; "document index requests is deprecated, use the /{index}/_doc/{id} endpoint instead.";

4
server/src/main/java/org/elasticsearch/rest/action/document/RestGetAction.java
View File

@ -19,7 +19,6 @@
package org.elasticsearch.rest.action.document; package org.elasticsearch.rest.action.document;
import org.apache.logging.log4j.LogManager;
import org.elasticsearch.action.get.GetRequest; import org.elasticsearch.action.get.GetRequest;
import org.elasticsearch.action.get.GetResponse; import org.elasticsearch.action.get.GetResponse;
import org.elasticsearch.client.node.NodeClient; import org.elasticsearch.client.node.NodeClient;
@ -44,8 +43,7 @@ import static org.elasticsearch.rest.RestStatus.NOT_FOUND;
import static org.elasticsearch.rest.RestStatus.OK; import static org.elasticsearch.rest.RestStatus.OK;
public class RestGetAction extends BaseRestHandler { public class RestGetAction extends BaseRestHandler {
private static final DeprecationLogger deprecationLogger = new DeprecationLogger( private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(RestGetAction.class);
LogManager.getLogger(RestGetAction.class));
public static final String TYPES_DEPRECATION_MESSAGE = "[types removal] Specifying types in " + public static final String TYPES_DEPRECATION_MESSAGE = "[types removal] Specifying types in " +
"document get requests is deprecated, use the /{index}/_doc/{id} endpoint instead."; "document get requests is deprecated, use the /{index}/_doc/{id} endpoint instead.";

3
server/src/main/java/org/elasticsearch/rest/action/document/RestGetSourceAction.java
View File

@ -19,7 +19,6 @@
package org.elasticsearch.rest.action.document; package org.elasticsearch.rest.action.document;
import org.apache.logging.log4j.LogManager;
import org.elasticsearch.ResourceNotFoundException; import org.elasticsearch.ResourceNotFoundException;
import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionRequestValidationException;
import org.elasticsearch.action.get.GetRequest; import org.elasticsearch.action.get.GetRequest;
@ -52,7 +51,7 @@ import static org.elasticsearch.rest.RestStatus.OK;
*/ */
public class RestGetSourceAction extends BaseRestHandler { public class RestGetSourceAction extends BaseRestHandler {
private static final DeprecationLogger deprecationLogger = new DeprecationLogger(LogManager.getLogger(RestGetSourceAction.class)); private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(RestGetSourceAction.class);
static final String TYPES_DEPRECATION_MESSAGE = "[types removal] Specifying types in get_source and exist_source" static final String TYPES_DEPRECATION_MESSAGE = "[types removal] Specifying types in get_source and exist_source"
+ "requests is deprecated."; + "requests is deprecated.";

4
server/src/main/java/org/elasticsearch/rest/action/document/RestIndexAction.java
View File

@ -19,7 +19,6 @@
package org.elasticsearch.rest.action.document; package org.elasticsearch.rest.action.document;
import org.apache.logging.log4j.LogManager;
import org.elasticsearch.Version; import org.elasticsearch.Version;
import org.elasticsearch.action.DocWriteRequest; import org.elasticsearch.action.DocWriteRequest;
import org.elasticsearch.action.index.IndexRequest; import org.elasticsearch.action.index.IndexRequest;
@ -45,8 +44,7 @@ import static org.elasticsearch.rest.RestRequest.Method.POST;
import static org.elasticsearch.rest.RestRequest.Method.PUT; import static org.elasticsearch.rest.RestRequest.Method.PUT;
public class RestIndexAction extends BaseRestHandler { public class RestIndexAction extends BaseRestHandler {
private static final DeprecationLogger deprecationLogger = new DeprecationLogger( private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(RestDeleteAction.class);
LogManager.getLogger(RestDeleteAction.class));
public static final String TYPES_DEPRECATION_MESSAGE = "[types removal] Specifying types in document " + public static final String TYPES_DEPRECATION_MESSAGE = "[types removal] Specifying types in document " +
"index requests is deprecated, use the typeless endpoints instead (/{index}/_doc/{id}, /{index}/_doc, " + "index requests is deprecated, use the typeless endpoints instead (/{index}/_doc/{id}, /{index}/_doc, " +
"or /{index}/_create/{id})."; "or /{index}/_create/{id}).";

4
server/src/main/java/org/elasticsearch/rest/action/document/RestMultiGetAction.java
View File

@ -19,7 +19,6 @@
package org.elasticsearch.rest.action.document; package org.elasticsearch.rest.action.document;
import org.apache.logging.log4j.LogManager;
import org.elasticsearch.action.get.MultiGetRequest; import org.elasticsearch.action.get.MultiGetRequest;
import org.elasticsearch.client.node.NodeClient; import org.elasticsearch.client.node.NodeClient;
import org.elasticsearch.common.Strings; import org.elasticsearch.common.Strings;
@ -40,8 +39,7 @@ import static org.elasticsearch.rest.RestRequest.Method.GET;
import static org.elasticsearch.rest.RestRequest.Method.POST; import static org.elasticsearch.rest.RestRequest.Method.POST;
public class RestMultiGetAction extends BaseRestHandler { public class RestMultiGetAction extends BaseRestHandler {
private static final DeprecationLogger deprecationLogger = new DeprecationLogger( private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(RestMultiGetAction.class);
LogManager.getLogger(RestMultiGetAction.class));
public static final String TYPES_DEPRECATION_MESSAGE = "[types removal]" + public static final String TYPES_DEPRECATION_MESSAGE = "[types removal]" +
" Specifying types in multi get requests is deprecated."; " Specifying types in multi get requests is deprecated.";

4
server/src/main/java/org/elasticsearch/rest/action/document/RestMultiTermVectorsAction.java
View File

@ -19,7 +19,6 @@
package org.elasticsearch.rest.action.document; package org.elasticsearch.rest.action.document;
import org.apache.logging.log4j.LogManager;
import org.elasticsearch.action.termvectors.MultiTermVectorsRequest; import org.elasticsearch.action.termvectors.MultiTermVectorsRequest;
import org.elasticsearch.action.termvectors.TermVectorsRequest; import org.elasticsearch.action.termvectors.TermVectorsRequest;
import org.elasticsearch.client.node.NodeClient; import org.elasticsearch.client.node.NodeClient;
@ -39,8 +38,7 @@ import static org.elasticsearch.rest.RestRequest.Method.GET;
import static org.elasticsearch.rest.RestRequest.Method.POST; import static org.elasticsearch.rest.RestRequest.Method.POST;
public class RestMultiTermVectorsAction extends BaseRestHandler { public class RestMultiTermVectorsAction extends BaseRestHandler {
private static final DeprecationLogger deprecationLogger = new DeprecationLogger( private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(RestTermVectorsAction.class);
LogManager.getLogger(RestTermVectorsAction.class));
static final String TYPES_DEPRECATION_MESSAGE = "[types removal] " + static final String TYPES_DEPRECATION_MESSAGE = "[types removal] " +
"Specifying types in multi term vector requests is deprecated."; "Specifying types in multi term vector requests is deprecated.";

4
server/src/main/java/org/elasticsearch/rest/action/document/RestTermVectorsAction.java
View File

@ -19,7 +19,6 @@
package org.elasticsearch.rest.action.document; package org.elasticsearch.rest.action.document;
import org.apache.logging.log4j.LogManager;
import org.elasticsearch.action.termvectors.TermVectorsRequest; import org.elasticsearch.action.termvectors.TermVectorsRequest;
import org.elasticsearch.client.node.NodeClient; import org.elasticsearch.client.node.NodeClient;
import org.elasticsearch.common.Strings; import org.elasticsearch.common.Strings;
@ -47,8 +46,7 @@ import static org.elasticsearch.rest.RestRequest.Method.POST;
* TermVectorsRequest. * TermVectorsRequest.
*/ */
public class RestTermVectorsAction extends BaseRestHandler { public class RestTermVectorsAction extends BaseRestHandler {
private static final DeprecationLogger deprecationLogger = new DeprecationLogger( private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(RestTermVectorsAction.class);
LogManager.getLogger(RestTermVectorsAction.class));
public static final String TYPES_DEPRECATION_MESSAGE = "[types removal] " + public static final String TYPES_DEPRECATION_MESSAGE = "[types removal] " +
"Specifying types in term vector requests is deprecated."; "Specifying types in term vector requests is deprecated.";

3
server/src/main/java/org/elasticsearch/rest/action/document/RestUpdateAction.java
View File

@ -19,7 +19,6 @@
package org.elasticsearch.rest.action.document; package org.elasticsearch.rest.action.document;
import org.apache.logging.log4j.LogManager;
import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionRequestValidationException;
import org.elasticsearch.action.DocWriteRequest; import org.elasticsearch.action.DocWriteRequest;
import org.elasticsearch.action.index.IndexRequest; import org.elasticsearch.action.index.IndexRequest;
@ -43,7 +42,7 @@ import static org.elasticsearch.rest.RestRequest.Method.POST;
public class RestUpdateAction extends BaseRestHandler { public class RestUpdateAction extends BaseRestHandler {
private static final DeprecationLogger deprecationLogger = private static final DeprecationLogger deprecationLogger =
new DeprecationLogger(LogManager.getLogger(RestUpdateAction.class)); DeprecationLogger.getLogger(RestUpdateAction.class);
public static final String TYPES_DEPRECATION_MESSAGE = "[types removal] Specifying types in " + public static final String TYPES_DEPRECATION_MESSAGE = "[types removal] Specifying types in " +
"document update requests is deprecated, use the endpoint /{index}/_update/{id} instead."; "document update requests is deprecated, use the endpoint /{index}/_update/{id} instead.";

4
server/src/main/java/org/elasticsearch/rest/action/search/RestCountAction.java
View File

@ -19,7 +19,6 @@
package org.elasticsearch.rest.action.search; package org.elasticsearch.rest.action.search;
import org.apache.logging.log4j.LogManager;
import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.action.search.SearchRequest;
import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.action.support.IndicesOptions; import org.elasticsearch.action.support.IndicesOptions;
@ -47,8 +46,7 @@ import static org.elasticsearch.rest.action.RestActions.buildBroadcastShardsHead
import static org.elasticsearch.search.internal.SearchContext.DEFAULT_TERMINATE_AFTER; import static org.elasticsearch.search.internal.SearchContext.DEFAULT_TERMINATE_AFTER;
public class RestCountAction extends BaseRestHandler { public class RestCountAction extends BaseRestHandler {
private static final DeprecationLogger deprecationLogger = new DeprecationLogger( private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(RestCountAction.class);
LogManager.getLogger(RestCountAction.class));
static final String TYPES_DEPRECATION_MESSAGE = "[types removal]" + static final String TYPES_DEPRECATION_MESSAGE = "[types removal]" +
" Specifying types in count requests is deprecated."; " Specifying types in count requests is deprecated.";

4
server/src/main/java/org/elasticsearch/rest/action/search/RestExplainAction.java
View File

@ -19,7 +19,6 @@
package org.elasticsearch.rest.action.search; package org.elasticsearch.rest.action.search;
import org.apache.logging.log4j.LogManager;
import org.elasticsearch.action.explain.ExplainRequest; import org.elasticsearch.action.explain.ExplainRequest;
import org.elasticsearch.client.node.NodeClient; import org.elasticsearch.client.node.NodeClient;
import org.elasticsearch.common.Strings; import org.elasticsearch.common.Strings;
@ -43,8 +42,7 @@ import static org.elasticsearch.rest.RestRequest.Method.POST;
* Rest action for computing a score explanation for specific documents. * Rest action for computing a score explanation for specific documents.
*/ */
public class RestExplainAction extends BaseRestHandler { public class RestExplainAction extends BaseRestHandler {
private static final DeprecationLogger deprecationLogger = new DeprecationLogger( private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(RestExplainAction.class);
LogManager.getLogger(RestExplainAction.class));
public static final String TYPES_DEPRECATION_MESSAGE = "[types removal] " + public static final String TYPES_DEPRECATION_MESSAGE = "[types removal] " +
"Specifying a type in explain requests is deprecated."; "Specifying a type in explain requests is deprecated.";

4
server/src/main/java/org/elasticsearch/rest/action/search/RestMultiSearchAction.java
View File

@ -19,7 +19,6 @@
package org.elasticsearch.rest.action.search; package org.elasticsearch.rest.action.search;
import org.apache.logging.log4j.LogManager;
import org.elasticsearch.action.search.MultiSearchAction; import org.elasticsearch.action.search.MultiSearchAction;
import org.elasticsearch.action.search.MultiSearchRequest; import org.elasticsearch.action.search.MultiSearchRequest;
import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.action.search.SearchRequest;
@ -53,8 +52,7 @@ import static org.elasticsearch.rest.RestRequest.Method.GET;
import static org.elasticsearch.rest.RestRequest.Method.POST; import static org.elasticsearch.rest.RestRequest.Method.POST;
public class RestMultiSearchAction extends BaseRestHandler { public class RestMultiSearchAction extends BaseRestHandler {
private static final DeprecationLogger deprecationLogger = new DeprecationLogger( private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(RestMultiSearchAction.class);
LogManager.getLogger(RestMultiSearchAction.class));
static final String TYPES_DEPRECATION_MESSAGE = "[types removal]" + static final String TYPES_DEPRECATION_MESSAGE = "[types removal]" +
" Specifying types in multi search requests is deprecated."; " Specifying types in multi search requests is deprecated.";

3
server/src/main/java/org/elasticsearch/rest/action/search/RestSearchAction.java
View File

@ -19,7 +19,6 @@
package org.elasticsearch.rest.action.search; package org.elasticsearch.rest.action.search;
import org.apache.logging.log4j.LogManager;
import org.elasticsearch.action.search.SearchAction; import org.elasticsearch.action.search.SearchAction;
import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.action.search.SearchRequest;
import org.elasticsearch.action.support.IndicesOptions; import org.elasticsearch.action.support.IndicesOptions;
@ -72,7 +71,7 @@ public class RestSearchAction extends BaseRestHandler {
RESPONSE_PARAMS = Collections.unmodifiableSet(responseParams); RESPONSE_PARAMS = Collections.unmodifiableSet(responseParams);
} }
private static final DeprecationLogger deprecationLogger = new DeprecationLogger(LogManager.getLogger(RestSearchAction.class)); private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(RestSearchAction.class);
public static final String TYPES_DEPRECATION_MESSAGE = "[types removal]" + public static final String TYPES_DEPRECATION_MESSAGE = "[types removal]" +
" Specifying types in search requests is deprecated."; " Specifying types in search requests is deprecated.";

4
server/src/main/java/org/elasticsearch/script/AbstractSortScript.java
View File

@ -18,7 +18,6 @@
*/ */
package org.elasticsearch.script; package org.elasticsearch.script;
import org.apache.logging.log4j.LogManager;
import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.search.Scorable; import org.apache.lucene.search.Scorable;
import org.elasticsearch.ElasticsearchException; import org.elasticsearch.ElasticsearchException;
@ -36,8 +35,7 @@ import java.util.function.Function;
abstract class AbstractSortScript implements ScorerAware { abstract class AbstractSortScript implements ScorerAware {
private static final DeprecationLogger deprecationLogger = private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(DynamicMap.class);
new DeprecationLogger(LogManager.getLogger(DynamicMap.class));
private static final Map<String, Function<Object, Object>> PARAMS_FUNCTIONS = org.elasticsearch.common.collect.Map.of( private static final Map<String, Function<Object, Object>> PARAMS_FUNCTIONS = org.elasticsearch.common.collect.Map.of(
"doc", value -> { "doc", value -> {
deprecationLogger.deprecate("sort-script_doc", deprecationLogger.deprecate("sort-script_doc",

4
server/src/main/java/org/elasticsearch/script/AggregationScript.java
View File

@ -18,7 +18,6 @@
*/ */
package org.elasticsearch.script; package org.elasticsearch.script;
import org.apache.logging.log4j.LogManager;
import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.search.Scorable; import org.apache.lucene.search.Scorable;
import org.elasticsearch.ElasticsearchException; import org.elasticsearch.ElasticsearchException;
@ -40,8 +39,7 @@ public abstract class AggregationScript implements ScorerAware {
public static final ScriptContext<Factory> CONTEXT = new ScriptContext<>("aggs", Factory.class); public static final ScriptContext<Factory> CONTEXT = new ScriptContext<>("aggs", Factory.class);
private static final DeprecationLogger deprecationLogger = private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(DynamicMap.class);
new DeprecationLogger(LogManager.getLogger(DynamicMap.class));
private static final Map<String, Function<Object, Object>> PARAMS_FUNCTIONS = org.elasticsearch.common.collect.Map.of( private static final Map<String, Function<Object, Object>> PARAMS_FUNCTIONS = org.elasticsearch.common.collect.Map.of(
"doc", value -> { "doc", value -> {
deprecationLogger.deprecate("aggregation-script_doc", deprecationLogger.deprecate("aggregation-script_doc",

Some files were not shown because too many files have changed in this diff Show More