Skip to content

Commit 498de1d

Browse files
committed
Add Boolean.valueOf to forbidden-apis
1 parent 7e5cacb commit 498de1d

File tree

9 files changed

+32
-5
lines changed

9 files changed

+32
-5
lines changed

build-tools-internal/src/main/resources/forbidden/es-all-signatures.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ java.nio.channels.SocketChannel#connect(java.net.SocketAddress)
3636
@defaultMessage use org.elasticsearch.core.Booleans#parseBoolean(java.lang.String)
3737
java.lang.Boolean#getBoolean(java.lang.String)
3838
java.lang.Boolean#parseBoolean(java.lang.String)
39+
java.lang.Boolean#valueOf(java.lang.String)
3940

4041
org.apache.lucene.util.IOUtils @ use @org.elasticsearch.core.internal.io instead
4142

libs/native/src/main/java/org/elasticsearch/nativeaccess/PosixNativeAccess.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,9 @@ static boolean isMacOrLinuxAarch64() {
220220
/** -Dorg.elasticsearch.nativeaccess.enableVectorLibrary=false to disable.*/
221221
static final String ENABLE_JDK_VECTOR_LIBRARY = "org.elasticsearch.nativeaccess.enableVectorLibrary";
222222

223+
@SuppressForbidden(
224+
reason = "TODO Deprecate any lenient usage of Boolean#parseBoolean https://github.com/elastic/elasticsearch/issues/128993"
225+
)
223226
static boolean checkEnableSystemProperty() {
224227
return Optional.ofNullable(System.getProperty(ENABLE_JDK_VECTOR_LIBRARY)).map(Boolean::valueOf).orElse(Boolean.TRUE);
225228
}

modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/MustacheScriptEngine.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import org.elasticsearch.common.text.SizeLimitingStringWriter;
2222
import org.elasticsearch.common.unit.ByteSizeValue;
2323
import org.elasticsearch.common.unit.MemorySizeValue;
24+
import org.elasticsearch.core.SuppressForbidden;
2425
import org.elasticsearch.script.GeneralScriptException;
2526
import org.elasticsearch.script.Script;
2627
import org.elasticsearch.script.ScriptContext;
@@ -96,6 +97,9 @@ public Set<ScriptContext<?>> getSupportedContexts() {
9697
return Set.of(TemplateScript.CONTEXT, TemplateScript.INGEST_CONTEXT);
9798
}
9899

100+
@SuppressForbidden(
101+
reason = "TODO Deprecate any lenient usage of Boolean#parseBoolean https://github.com/elastic/elasticsearch/issues/128993"
102+
)
99103
private static CustomMustacheFactory createMustacheFactory(Map<String, String> options) {
100104
CustomMustacheFactory.Builder builder = CustomMustacheFactory.builder();
101105
if (options == null || options.isEmpty()) {

server/src/main/java/org/elasticsearch/indices/analysis/wrappers/SettingsInvocationHandler.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import org.apache.logging.log4j.LogManager;
1313
import org.apache.logging.log4j.Logger;
1414
import org.elasticsearch.common.settings.Settings;
15+
import org.elasticsearch.core.SuppressForbidden;
1516
import org.elasticsearch.env.Environment;
1617
import org.elasticsearch.plugin.settings.BooleanSetting;
1718
import org.elasticsearch.plugin.settings.IntSetting;
@@ -46,6 +47,9 @@ public static <T> T create(Settings settings, Class<T> parameterType, Environmen
4647
);
4748
}
4849

50+
@SuppressForbidden(
51+
reason = "TODO Deprecate any lenient usage of Boolean#parseBoolean https://github.com/elastic/elasticsearch/issues/128993"
52+
)
4953
@Override
5054
public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
5155
assert method.getAnnotations().length == 1;

server/src/test/java/org/elasticsearch/index/mapper/CompletionFieldMapperTests.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import org.elasticsearch.common.lucene.Lucene;
3333
import org.elasticsearch.common.unit.Fuzziness;
3434
import org.elasticsearch.common.util.BigArrays;
35+
import org.elasticsearch.core.Booleans;
3536
import org.elasticsearch.core.CheckedConsumer;
3637
import org.elasticsearch.index.IndexSettings;
3738
import org.elasticsearch.index.IndexVersions;
@@ -242,8 +243,8 @@ public void testTypeParsing() throws Exception {
242243
Map<String, Object> configMap = (Map<String, Object>) serializedMap.get("field");
243244
assertThat(configMap.get("analyzer").toString(), is("simple"));
244245
assertThat(configMap.get("search_analyzer").toString(), is("standard"));
245-
assertThat(Boolean.valueOf(configMap.get("preserve_separators").toString()), is(false));
246-
assertThat(Boolean.valueOf(configMap.get("preserve_position_increments").toString()), is(true));
246+
assertThat(Booleans.parseBoolean(configMap.get("preserve_separators").toString()), is(false));
247+
assertThat(Booleans.parseBoolean(configMap.get("preserve_position_increments").toString()), is(true));
247248
assertThat(Integer.valueOf(configMap.get("max_input_length").toString()), is(14));
248249
}
249250

x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/EsqlQueryLogIT.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import org.elasticsearch.common.logging.ESLogMessage;
1818
import org.elasticsearch.common.logging.Loggers;
1919
import org.elasticsearch.common.settings.Settings;
20+
import org.elasticsearch.core.Booleans;
2021
import org.elasticsearch.core.TimeValue;
2122
import org.elasticsearch.xpack.esql.MockAppender;
2223
import org.elasticsearch.xpack.esql.VerificationException;
@@ -195,7 +196,7 @@ private static void testAllLevels(
195196
assertThat(msg.get(ELASTICSEARCH_QUERYLOG_QUERY), is(query));
196197
assertThat(appender.getLastEventAndReset().getLevel(), equalTo(logLevel.getKey()));
197198

198-
boolean success = Boolean.valueOf(msg.get(ELASTICSEARCH_QUERYLOG_SUCCESS));
199+
boolean success = Booleans.parseBoolean(msg.get(ELASTICSEARCH_QUERYLOG_SUCCESS));
199200
assertThat(success, is(expectedException == null));
200201
if (expectedErrorMsg == null) {
201202
assertThat(msg.get(ELASTICSEARCH_QUERYLOG_ERROR_MESSAGE), is(nullValue()));

x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/jwt/JwtRealmSettingsTests.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import org.elasticsearch.common.settings.SecureString;
1111
import org.elasticsearch.common.settings.Setting;
1212
import org.elasticsearch.common.settings.Settings;
13+
import org.elasticsearch.core.Booleans;
1314
import org.elasticsearch.core.Strings;
1415
import org.elasticsearch.core.TimeValue;
1516
import org.elasticsearch.xpack.core.security.authc.RealmConfig;
@@ -233,7 +234,7 @@ public void testPopulateUserMetadata() {
233234
final Settings settings = Settings.builder().put(settingKey, acceptedValue).build();
234235
final RealmConfig realmConfig = buildRealmConfig(JwtRealmSettings.TYPE, realmName, settings, 0);
235236
final Boolean actualValue = realmConfig.getSetting(setting);
236-
assertThat(actualValue, equalTo(Boolean.valueOf(acceptedValue)));
237+
assertThat(actualValue, equalTo(Booleans.parseBoolean(acceptedValue)));
237238
}
238239
}
239240

x-pack/plugin/sql/jdbc/src/main/java/org/elasticsearch/xpack/sql/jdbc/TypeConverter.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
*/
77
package org.elasticsearch.xpack.sql.jdbc;
88

9+
import org.elasticsearch.xpack.sql.client.SuppressForbidden;
910
import org.elasticsearch.xpack.sql.proto.StringUtils;
1011

1112
import java.math.BigDecimal;
@@ -310,6 +311,9 @@ private static <T> T failConversion(Object value, EsType columnType, String type
310311
throw e != null ? new SQLException(message, e) : new SQLException(message);
311312
}
312313

314+
@SuppressForbidden(
315+
reason = "TODO Deprecate any lenient usage of Boolean#parseBoolean https://github.com/elastic/elasticsearch/issues/128993"
316+
)
313317
private static Boolean asBoolean(Object val, EsType columnType, String typeString) throws SQLException {
314318
switch (columnType) {
315319
case BOOLEAN:

x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/notification/email/attachment/ReportingAttachmentParser.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import org.elasticsearch.common.util.set.Sets;
1919
import org.elasticsearch.common.xcontent.LoggingDeprecationHandler;
2020
import org.elasticsearch.common.xcontent.XContentHelper;
21+
import org.elasticsearch.core.SuppressForbidden;
2122
import org.elasticsearch.core.TimeValue;
2223
import org.elasticsearch.xcontent.ObjectParser;
2324
import org.elasticsearch.xcontent.ParseField;
@@ -251,7 +252,7 @@ public Attachment toAttachment(WatchExecutionContext context, Payload payload, R
251252
WARNINGS.forEach((warningKey, defaultWarning) -> {
252253
String[] text = response.header(warningKey);
253254
if (text != null && text.length > 0) {
254-
if (Boolean.valueOf(text[0])) {
255+
if (parseBoolean(text[0])) {
255256
String warning = String.format(Locale.ROOT, defaultWarning, attachment.id());
256257
String customWarning = customWarnings.get(warningKey);
257258
if (Strings.isNullOrEmpty(customWarning) == false) {
@@ -296,6 +297,13 @@ public Attachment toAttachment(WatchExecutionContext context, Payload payload, R
296297
);
297298
}
298299

300+
@SuppressForbidden(
301+
reason = "TODO Deprecate any lenient usage of Boolean#parseBoolean https://github.com/elastic/elasticsearch/issues/128993"
302+
)
303+
private static boolean parseBoolean(String s) {
304+
return Boolean.valueOf(s);
305+
}
306+
299307
private static void sleep(long sleepMillis, WatchExecutionContext context, ReportingAttachment attachment) {
300308
try {
301309
Thread.sleep(sleepMillis);

0 commit comments

Comments
 (0)