Skip to content

Commit 3147645

Browse files
committed
Add Boolean#parseBoolean to forbidden-apis
1 parent 92b32b5 commit 3147645

File tree

57 files changed

+154
-57
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+154
-57
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
@@ -35,6 +35,7 @@ java.nio.channels.SocketChannel#connect(java.net.SocketAddress)
3535
# org.elasticsearch.core.Booleans#parseBoolean(java.lang.String) directly on the string.
3636
@defaultMessage use org.elasticsearch.core.Booleans#parseBoolean(java.lang.String)
3737
java.lang.Boolean#getBoolean(java.lang.String)
38+
java.lang.Boolean#parseBoolean(java.lang.String)
3839

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

libs/core/src/main/java/org/elasticsearch/core/internal/provider/EmbeddedImplClassLoader.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99

1010
package org.elasticsearch.core.internal.provider;
1111

12+
import org.elasticsearch.core.SuppressForbidden;
13+
1214
import java.io.BufferedReader;
1315
import java.io.IOException;
1416
import java.io.InputStream;
@@ -465,6 +467,9 @@ private static CodeSource codeSource(URL baseURL, String jarName) throws Malform
465467
return new CodeSource(new URL(baseURL, jarName), (CodeSigner[]) null /*signers*/);
466468
}
467469

470+
@SuppressForbidden(
471+
reason = "TODO Deprecate any lenient usage of Boolean#parseBoolean https://github.com/elastic/elasticsearch/issues/128993"
472+
)
468473
private static boolean isMultiRelease(ClassLoader parent, String jarPrefix) throws IOException {
469474
try (InputStream is = parent.getResourceAsStream(jarPrefix + "/META-INF/MANIFEST.MF")) {
470475
if (is != null) {

libs/entitlement/tools/public-callers-finder/src/main/java/org/elasticsearch/entitlement/tools/publiccallersfinder/Main.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,9 @@ private static void parseCsv(Path csvPath, MethodDescriptorConsumer methodConsum
189189
}
190190
}
191191

192+
@SuppressForbidden(
193+
reason = "TODO Deprecate any lenient usage of Boolean#parseBoolean https://github.com/elastic/elasticsearch/issues/128993"
194+
)
192195
public static void main(String[] args) throws IOException {
193196
var csvFilePath = Path.of(args[0]);
194197
boolean bubbleUpFromPublic = args.length >= 2 && Boolean.parseBoolean(args[1]);

modules/aggregations/src/yamlRestTest/java/org/elasticsearch/aggregations/AggregationsClientYamlTestSuiteIT.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import com.carrotsearch.randomizedtesting.annotations.Name;
1212
import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
1313

14+
import org.elasticsearch.core.Booleans;
1415
import org.elasticsearch.test.cluster.ElasticsearchCluster;
1516
import org.elasticsearch.test.cluster.FeatureFlag;
1617
import org.elasticsearch.test.rest.yaml.ClientYamlTestCandidate;
@@ -26,8 +27,8 @@ private static ElasticsearchCluster makeCluster() {
2627

2728
// On Serverless, we want to disallow scripted metrics aggs per default.
2829
// The following override allows us to still run the scripted metrics agg tests without breaking bwc.
29-
boolean disableAllowListPerDefault = Boolean.parseBoolean(
30-
System.getProperty("tests.disable_scripted_metric_allow_list_per_default")
30+
boolean disableAllowListPerDefault = Booleans.parseBoolean(
31+
System.getProperty("tests.disable_scripted_metric_allow_list_per_default", "false")
3132
);
3233
if (disableAllowListPerDefault) {
3334
return cluster.setting("search.aggs.only_allowed_metric_scripts", "false").build();

modules/data-streams/src/yamlRestTest/java/org/elasticsearch/datastreams/DataStreamsClientYamlTestSuiteIT.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import org.elasticsearch.common.settings.SecureString;
1414
import org.elasticsearch.common.settings.Settings;
1515
import org.elasticsearch.common.util.concurrent.ThreadContext;
16+
import org.elasticsearch.core.Booleans;
1617
import org.elasticsearch.test.cluster.ElasticsearchCluster;
1718
import org.elasticsearch.test.cluster.local.LocalClusterSpecBuilder;
1819
import org.elasticsearch.test.cluster.local.distribution.DistributionType;
@@ -51,7 +52,7 @@ private static ElasticsearchCluster createCluster() {
5152
if (initTestSeed().nextBoolean()) {
5253
clusterBuilder.setting("xpack.license.self_generated.type", "trial");
5354
}
54-
boolean setNodes = Boolean.parseBoolean(System.getProperty("yaml.rest.tests.set_num_nodes", "true"));
55+
boolean setNodes = Booleans.parseBoolean(System.getProperty("yaml.rest.tests.set_num_nodes", "true"));
5556
if (setNodes) {
5657
clusterBuilder.nodes(2);
5758
}

modules/dot-prefix-validation/src/yamlRestTest/java/org/elasticsearch/validation/DotPrefixClientYamlTestSuiteIT.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import org.elasticsearch.common.settings.SecureString;
1515
import org.elasticsearch.common.settings.Settings;
1616
import org.elasticsearch.common.util.concurrent.ThreadContext;
17+
import org.elasticsearch.core.Booleans;
1718
import org.elasticsearch.test.cluster.ElasticsearchCluster;
1819
import org.elasticsearch.test.cluster.local.LocalClusterSpecBuilder;
1920
import org.elasticsearch.test.cluster.local.distribution.DistributionType;
@@ -50,7 +51,7 @@ private static ElasticsearchCluster createCluster() {
5051
.setting("xpack.security.enabled", "true")
5152
.keystore("bootstrap.password", "x-pack-test-password")
5253
.user("x_pack_rest_user", "x-pack-test-password");
53-
boolean setNodes = Boolean.parseBoolean(System.getProperty("yaml.rest.tests.set_num_nodes", "true"));
54+
boolean setNodes = Booleans.parseBoolean(System.getProperty("yaml.rest.tests.set_num_nodes", "true"));
5455
if (setNodes) {
5556
clusterBuilder.nodes(2);
5657
}

modules/ingest-common/src/yamlRestTest/java/org/elasticsearch/ingest/common/IngestCommonClientYamlTestSuiteIT.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import org.elasticsearch.common.settings.SecureString;
1616
import org.elasticsearch.common.settings.Settings;
1717
import org.elasticsearch.common.util.concurrent.ThreadContext;
18+
import org.elasticsearch.core.Booleans;
1819
import org.elasticsearch.test.cluster.ElasticsearchCluster;
1920
import org.elasticsearch.test.cluster.local.LocalClusterSpecBuilder;
2021
import org.elasticsearch.test.cluster.local.distribution.DistributionType;
@@ -48,7 +49,7 @@ private static ElasticsearchCluster createCluster() {
4849
.distribution(DistributionType.DEFAULT)
4950
.setting("xpack.security.enabled", "true")
5051
.user("x_pack_rest_user", "x-pack-test-password");
51-
boolean setNodes = Boolean.parseBoolean(System.getProperty("yaml.rest.tests.set_num_nodes", "true"));
52+
boolean setNodes = Booleans.parseBoolean(System.getProperty("yaml.rest.tests.set_num_nodes", "true"));
5253
if (setNodes) {
5354
clusterBuilder.nodes(2);
5455
}

modules/ingest-geoip/qa/geoip-reindexed/src/javaRestTest/java/org/elasticsearch/ingest/geoip/GeoIpReindexedIT.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import org.elasticsearch.common.settings.Settings;
2121
import org.elasticsearch.common.util.CollectionUtils;
2222
import org.elasticsearch.common.util.concurrent.ThreadContext;
23+
import org.elasticsearch.core.Booleans;
2324
import org.elasticsearch.core.Nullable;
2425
import org.elasticsearch.rest.RestStatus;
2526
import org.elasticsearch.test.cluster.ElasticsearchCluster;
@@ -52,7 +53,7 @@ public class GeoIpReindexedIT extends ParameterizedFullClusterRestartTestCase {
5253

5354
// e.g. use ./gradlew -Dtests.jvm.argline="-Dgeoip_test_with_security=false" ":modules:ingest-geoip:qa:full-cluster-restart:check"
5455
// to set this to false, if you so desire
55-
private static final boolean useSecurity = Boolean.parseBoolean(System.getProperty("geoip_test_with_security", "true"));
56+
private static final boolean useSecurity = Booleans.parseBoolean(System.getProperty("geoip_test_with_security", "true"));
5657

5758
private static final ElasticsearchCluster cluster = ElasticsearchCluster.local()
5859
.distribution(DistributionType.DEFAULT)

modules/lang-painless/src/main/java/org/elasticsearch/painless/PainlessScriptEngine.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
import org.elasticsearch.SpecialPermission;
1313
import org.elasticsearch.common.settings.Settings;
14+
import org.elasticsearch.core.Booleans;
1415
import org.elasticsearch.painless.Compiler.Loader;
1516
import org.elasticsearch.painless.lookup.PainlessLookup;
1617
import org.elasticsearch.painless.lookup.PainlessLookupBuilder;
@@ -414,7 +415,7 @@ private CompilerSettings buildCompilerSettings(Map<String, String> params) {
414415

415416
value = copy.remove(CompilerSettings.PICKY);
416417
if (value != null) {
417-
compilerSettings.setPicky(Boolean.parseBoolean(value));
418+
compilerSettings.setPicky(Booleans.parseBoolean(value));
418419
}
419420

420421
value = copy.remove(CompilerSettings.INITIAL_CALL_SITE_DEPTH);

modules/transport-netty4/src/main/java/org/elasticsearch/transport/netty4/NettyAllocator.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,15 @@
2626
import org.elasticsearch.common.util.PageCacheRecycler;
2727
import org.elasticsearch.core.Assertions;
2828
import org.elasticsearch.core.Booleans;
29+
import org.elasticsearch.core.SuppressForbidden;
2930
import org.elasticsearch.monitor.jvm.JvmInfo;
3031

3132
import java.util.Arrays;
3233
import java.util.concurrent.atomic.AtomicBoolean;
3334

35+
@SuppressForbidden(
36+
reason = "TODO Deprecate any lenient usage of Boolean#parseBoolean https://github.com/elastic/elasticsearch/issues/128993"
37+
)
3438
public class NettyAllocator {
3539

3640
private static final Logger logger = LogManager.getLogger(NettyAllocator.class);

0 commit comments

Comments
 (0)