Apache Lucene open-source search software
Forbid java.util.Hashtable (#15688)
Uwe Schindlerca4903f739d0
diff --git a/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/plugins/ide/EclipseSupportPlugin.java b/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/plugins/ide/EclipseSupportPlugin.javaindex 1a4b1744277..b72f0888ba8 100644--- a/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/plugins/ide/EclipseSupportPlugin.java+++ b/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/plugins/ide/EclipseSupportPlugin.java@@ -27,6 +27,7 @@ import java.util.List;import java.util.Map;import java.util.Set;import java.util.stream.Stream;+import org.apache.lucene.gradle.SuppressForbidden;import org.apache.lucene.gradle.plugins.LuceneGradlePlugin;import org.apache.lucene.gradle.plugins.java.EcjLintPlugin;import org.apache.tools.ant.filters.ReplaceTokens;@@ -74,6 +75,11 @@ public class EclipseSupportPlugin extends LuceneGradlePlugin {}}+ @SuppressForbidden(reason = "Ant's ReplaceTokens filter requires a Hashtable as parameter")+ private static <K, V> Hashtable<K, V> newHashtable(Map<K, V> map) {+ return new Hashtable<>(map);+ }+private void configureEclipseIdeSettings(Project project, String eclipseJavaVersion) {var plugins = project.getPlugins();plugins.apply("java-base");@@ -120,7 +126,7 @@ public class EclipseSupportPlugin extends LuceneGradlePlugin {task.filter(Map.of("tokens",- new Hashtable<>(+ newHashtable(Map.ofEntries(Map.entry("eclipseJavaVersion", eclipseJavaVersion),Map.entry("ecj-lint-config", ecjLintProps)))),diff --git a/gradle/validation/forbidden-apis/all/defaults.txt b/gradle/validation/forbidden-apis/all/defaults.txtindex 6aaad7f2903..fe4ab293e47 100644--- a/gradle/validation/forbidden-apis/all/defaults.txt+++ b/gradle/validation/forbidden-apis/all/defaults.txt@@ -39,11 +39,9 @@ java.lang.Character#codePointAt(char[],int) @ Implicit end offset is error-pronejava.io.File#delete() @ use Files.delete for real exception, IOUtils.deleteFilesIgnoringExceptions if you dont carejava.util.Collections#shuffle(java.util.List) @ Use shuffle(List, Random) instead so that it can be reproduced-java.util.Stack @ Use more modern java.util.ArrayDeque as it is not synchronized-java.util.Vector @ Use more modern java.util.ArrayList as it is not synchronized--# TODO (needs some fix in forbiddenapis): this also hits java.util.Properties:-# java.util.Hashtable @ Use more modern java.util.HashMap as it is not synchronized+java.util.Stack#<init>(**) @ Use more modern java.util.ArrayDeque as it is not synchronized+java.util.Vector#<init>(**) @ Use more modern java.util.ArrayList as it is not synchronized+java.util.Hashtable#<init>(**) @ Use more modern java.util.HashMap as it is not synchronizedjava.util.Locale#forLanguageTag(java.lang.String) @ use new Locale.Builder().setLanguageTag(...).build() which has error handlingjava.util.Locale#toString() @ use Locale#toLanguageTag() for a standardized BCP47 locale name