Skip to content

Commit 945ae4a

Browse files
committed
Remove suppression and replace with Booleans.parseBoolean
1 parent 5196d60 commit 945ae4a

File tree

2 files changed

+4
-11
lines changed

2 files changed

+4
-11
lines changed

server/src/main/java/org/elasticsearch/index/IndexSettings.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import org.elasticsearch.common.unit.ByteSizeUnit;
2626
import org.elasticsearch.common.unit.ByteSizeValue;
2727
import org.elasticsearch.common.util.FeatureFlag;
28-
import org.elasticsearch.core.SuppressForbidden;
28+
import org.elasticsearch.core.Booleans;
2929
import org.elasticsearch.core.TimeValue;
3030
import org.elasticsearch.index.mapper.IgnoredSourceFieldMapper;
3131
import org.elasticsearch.index.mapper.Mapper;
@@ -303,13 +303,10 @@ public final class IndexSettings {
303303
return DEFAULT_REFRESH_INTERVAL;
304304
}, new RefreshIntervalValidator(), Property.Dynamic, Property.IndexScope, Property.ServerlessPublic);
305305

306-
@SuppressForbidden(
307-
reason = "TODO Deprecate any lenient usage of Boolean#parseBoolean https://github.com/elastic/elasticsearch/issues/128993"
308-
)
309306
static class RefreshIntervalValidator implements Setting.Validator<TimeValue> {
310307

311308
static final String STATELESS_ALLOW_INDEX_REFRESH_INTERVAL_OVERRIDE = "es.stateless.allow.index.refresh_interval.override";
312-
private static final boolean IS_OVERRIDE_ALLOWED = Boolean.parseBoolean(
309+
private static final boolean IS_OVERRIDE_ALLOWED = Booleans.parseBoolean(
313310
System.getProperty(STATELESS_ALLOW_INDEX_REFRESH_INTERVAL_OVERRIDE, "false")
314311
);
315312

x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/esnative/tool/SetupPasswordTool.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import org.elasticsearch.common.util.Maps;
2727
import org.elasticsearch.core.Booleans;
2828
import org.elasticsearch.core.CheckedFunction;
29-
import org.elasticsearch.core.SuppressForbidden;
3029
import org.elasticsearch.env.Environment;
3130
import org.elasticsearch.xcontent.XContentBuilder;
3231
import org.elasticsearch.xcontent.json.JsonXContent;
@@ -417,9 +416,6 @@ void checkElasticKeystorePasswordValid(Terminal terminal, Environment env) throw
417416
}
418417

419418
@SuppressWarnings("unchecked")
420-
@SuppressForbidden(
421-
reason = "TODO Deprecate any lenient usage of Boolean#parseBoolean https://github.com/elastic/elasticsearch/issues/128993"
422-
)
423419
private XPackSecurityFeatureConfig getXPackSecurityConfig(Terminal terminal) throws Exception {
424420
// Get x-pack security info.
425421
URL route = createURL(url, "/_xpack", "?categories=features&human=false&pretty");
@@ -457,8 +453,8 @@ private XPackSecurityFeatureConfig getXPackSecurityConfig(Terminal terminal) thr
457453
Map<String, Object> featureInfo = (Map<String, Object>) features.get("security");
458454
if (featureInfo != null) {
459455
xPackSecurityFeatureConfig = new XPackSecurityFeatureConfig(
460-
Boolean.parseBoolean(featureInfo.get("available").toString()),
461-
Boolean.parseBoolean(featureInfo.get("enabled").toString())
456+
Booleans.parseBoolean(featureInfo.get("available").toString()),
457+
Booleans.parseBoolean(featureInfo.get("enabled").toString())
462458
);
463459
return xPackSecurityFeatureConfig;
464460
}

0 commit comments

Comments
 (0)