accidental commit, reverting

Author: ankit--sethi

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/privilege/IndexPrivilege.java

@@ -33,13 +33,8 @@
 import org.elasticsearch.action.search.TransportSearchShardsAction;
 import org.elasticsearch.action.support.IndexComponentSelector;
 import org.elasticsearch.common.Strings;
-import org.elasticsearch.common.cache.Cache;
-import org.elasticsearch.common.cache.CacheBuilder;
-import org.elasticsearch.common.settings.Setting;
-import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.util.set.Sets;
 import org.elasticsearch.core.Nullable;
-import org.elasticsearch.core.TimeValue;
 import org.elasticsearch.index.seqno.RetentionLeaseActions;
 import org.elasticsearch.xpack.core.ccr.action.ForgetFollowerAction;
 import org.elasticsearch.xpack.core.ccr.action.PutFollowAction;
@@ -58,7 +53,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.SortedMap;
-import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -290,21 +285,7 @@ private static Map<String, IndexPrivilege> combineSortedInOrder(
     public static final Predicate<String> ACTION_MATCHER = ALL.predicate();
     public static final Predicate<String> CREATE_INDEX_MATCHER = CREATE_INDEX.predicate();
 
-    static final Setting<Integer> CACHE_SIZE = Setting.intSetting(
-        "xpack.security.privilege.index.cache.size",
-        10_000,
-        Setting.Property.NodeScope
-    );
-    static final Setting<TimeValue> CACHE_TTL = Setting.timeSetting(
-        "xpack.security.privilege.index.cache.ttl",
-        TimeValue.timeValueHours(48),
-        Setting.Property.NodeScope
-    );
-
-    private static final Cache<Set<String>, Set<IndexPrivilege>> CACHE = CacheBuilder.<Set<String>, Set<IndexPrivilege>>builder()
-        .setExpireAfterAccess(CACHE_TTL.get(Settings.EMPTY))
-        .setMaximumWeight(CACHE_SIZE.get(Settings.EMPTY))
-        .build();
+    private static final ConcurrentHashMap<Set<String>, Set<IndexPrivilege>> CACHE = new ConcurrentHashMap<>();
 
     private final IndexComponentSelectorPredicate selectorPredicate;
 
@@ -359,17 +340,13 @@ public static IndexPrivilege get(String actionOrPrivilege) {
      * All raw actions are treated as granting access to the {@link IndexComponentSelector#DATA} selector.
      */
     public static Set<IndexPrivilege> resolveBySelectorAccess(Set<String> names) {
-        try {
-            return CACHE.computeIfAbsent(names, (theName) -> {
-                if (theName.isEmpty()) {
-                    return Set.of(NONE);
-                } else {
-                    return resolve(theName);
-                }
-            });
-        } catch (ExecutionException e) {
-            throw new RuntimeException(e);
-        }
+        return CACHE.computeIfAbsent(names, (theName) -> {
+            if (theName.isEmpty()) {
+                return Set.of(NONE);
+            } else {
+                return resolve(theName);
+            }
+        });
     }
 
     @Nullable