Skip to content

Commit 23ece92

Browse files
authored
Core: Remove two methods from AbstractComponent (elastic#34336)
This removes another two methods from `AbstractComponent`. One isn't used at all and another is only used in a single class in watcher. I've moved the method that watcher uses into the single class that uses it.
1 parent 0cd03d3 commit 23ece92

File tree

2 files changed

+0
-26
lines changed

2 files changed

+0
-26
lines changed

server/src/main/java/org/elasticsearch/common/component/AbstractComponent.java

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

2222
import org.apache.logging.log4j.LogManager;
2323
import org.apache.logging.log4j.Logger;
24-
import org.elasticsearch.common.Strings;
2524
import org.elasticsearch.common.logging.DeprecationLogger;
2625
import org.elasticsearch.common.settings.Settings;
2726
import org.elasticsearch.node.Node;
@@ -44,23 +43,4 @@ public AbstractComponent(Settings settings) {
4443
public final String nodeName() {
4544
return Node.NODE_NAME_SETTING.get(settings);
4645
}
47-
48-
/**
49-
* Checks for a deprecated setting and logs the correct alternative
50-
*/
51-
protected void logDeprecatedSetting(String settingName, String alternativeName) {
52-
if (!Strings.isNullOrEmpty(settings.get(settingName))) {
53-
deprecationLogger.deprecated("Setting [{}] is deprecated, use [{}] instead", settingName, alternativeName);
54-
}
55-
}
56-
57-
/**
58-
* Checks for a removed setting and logs the correct alternative
59-
*/
60-
protected void logRemovedSetting(String settingName, String alternativeName) {
61-
if (!Strings.isNullOrEmpty(settings.get(settingName))) {
62-
deprecationLogger.deprecated("Setting [{}] has been removed, use [{}] instead", settingName, alternativeName);
63-
}
64-
}
65-
6646
}

server/src/main/java/org/elasticsearch/watcher/ResourceWatcherService.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,12 +97,6 @@ public ResourceWatcherService(Settings settings, ThreadPool threadPool) {
9797
mediumMonitor = new ResourceMonitor(interval, Frequency.MEDIUM);
9898
interval = RELOAD_INTERVAL_HIGH.get(settings);
9999
highMonitor = new ResourceMonitor(interval, Frequency.HIGH);
100-
101-
logRemovedSetting("watcher.enabled", "resource.reload.enabled");
102-
logRemovedSetting("watcher.interval", "resource.reload.interval");
103-
logRemovedSetting("watcher.interval.low", "resource.reload.interval.low");
104-
logRemovedSetting("watcher.interval.medium", "resource.reload.interval.medium");
105-
logRemovedSetting("watcher.interval.high", "resource.reload.interval.high");
106100
}
107101

108102
@Override

0 commit comments

Comments
 (0)