From 37de0fee558f052fcb13d5096014934970dab6b6 Mon Sep 17 00:00:00 2001 From: Przemyslaw Gomulka Date: Wed, 16 Jan 2019 11:31:05 +0100 Subject: [PATCH 1/2] Remove the AbstracLifecycleComponent constructor with Settings Adding the migration guide and removing the deprecated in 6.x constructor --- docs/reference/migration/migrate_7_0/java.asciidoc | 8 +++++++- .../common/component/AbstractLifecycleComponent.java | 5 ----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/docs/reference/migration/migrate_7_0/java.asciidoc b/docs/reference/migration/migrate_7_0/java.asciidoc index e48a4cf1b45c3..f34b1c6ca9906 100644 --- a/docs/reference/migration/migrate_7_0/java.asciidoc +++ b/docs/reference/migration/migrate_7_0/java.asciidoc @@ -38,4 +38,10 @@ because `Settings` is no longer needed. ==== Deprecated method `Client#termVector` removed The client method `termVector`, deprecated in 2.0, has been removed. The method -`termVectors` (plural) should be used instead. \ No newline at end of file +`termVectors` (plural) should be used instead. + +[float] +==== Deprecated constructor `AbstractLifecycleComponent(Settings settings)` removed + +The constructor `AbstractLifecycleComponent(Settings settings)`, deprecated in 6.7 +has been removed. The parameterless constructor should be used instead. diff --git a/server/src/main/java/org/elasticsearch/common/component/AbstractLifecycleComponent.java b/server/src/main/java/org/elasticsearch/common/component/AbstractLifecycleComponent.java index 2caaa43fbcd05..aef408b67ecc0 100644 --- a/server/src/main/java/org/elasticsearch/common/component/AbstractLifecycleComponent.java +++ b/server/src/main/java/org/elasticsearch/common/component/AbstractLifecycleComponent.java @@ -36,11 +36,6 @@ public abstract class AbstractLifecycleComponent implements LifecycleComponent { protected AbstractLifecycleComponent() {} - @Deprecated - protected AbstractLifecycleComponent(Settings settings) { - // TODO drop settings from ctor - } - @Override public Lifecycle.State lifecycleState() { return this.lifecycle.state(); From fc3f8463bb45b7f1613df5decbe15b3e16c80aad Mon Sep 17 00:00:00 2001 From: Przemyslaw Gomulka Date: Wed, 16 Jan 2019 14:00:17 +0100 Subject: [PATCH 2/2] removing unused import --- .../common/component/AbstractLifecycleComponent.java | 1 - 1 file changed, 1 deletion(-) diff --git a/server/src/main/java/org/elasticsearch/common/component/AbstractLifecycleComponent.java b/server/src/main/java/org/elasticsearch/common/component/AbstractLifecycleComponent.java index aef408b67ecc0..772d2d89cf5be 100644 --- a/server/src/main/java/org/elasticsearch/common/component/AbstractLifecycleComponent.java +++ b/server/src/main/java/org/elasticsearch/common/component/AbstractLifecycleComponent.java @@ -21,7 +21,6 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.elasticsearch.common.settings.Settings; import java.io.IOException; import java.util.List;