diff --git a/src/integrationTest/java/org/opensearch/test/framework/matcher/AliasExistsMatcher.java b/src/integrationTest/java/org/opensearch/test/framework/matcher/AliasExistsMatcher.java index 4999da8e95..4d8c81b037 100644 --- a/src/integrationTest/java/org/opensearch/test/framework/matcher/AliasExistsMatcher.java +++ b/src/integrationTest/java/org/opensearch/test/framework/matcher/AliasExistsMatcher.java @@ -10,7 +10,6 @@ package org.opensearch.test.framework.matcher; import java.util.Collection; -import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Set; @@ -18,7 +17,6 @@ import java.util.stream.Collectors; import java.util.stream.StreamSupport; -import com.carrotsearch.hppc.cursors.ObjectObjectCursor; import org.hamcrest.Description; import org.hamcrest.TypeSafeDiagnosingMatcher; @@ -44,11 +42,7 @@ protected boolean matchesSafely(Client client, Description mismatchDescription) try { GetAliasesResponse response = client.admin().indices().getAliases(new GetAliasesRequest(aliasName)).get(); - final Map> aliases = new HashMap<>(); - for (ObjectObjectCursor> cursor : response.getAliases()) { - aliases.put(cursor.key, cursor.value); - } - + Map> aliases = response.getAliases(); Set actualAliasNames = StreamSupport.stream(spliteratorUnknownSize(aliases.values().iterator(), IMMUTABLE), false) .flatMap(Collection::stream) .map(AliasMetadata::getAlias) @@ -61,7 +55,7 @@ protected boolean matchesSafely(Client client, Description mismatchDescription) return true; } catch (InterruptedException | ExecutionException e) { mismatchDescription.appendText("Error occurred during checking if cluster contains alias ") - .appendValue(e); + .appendValue(e); return false; } } diff --git a/src/integrationTest/java/org/opensearch/test/framework/matcher/ClusterContainTemplateWithAliasMatcher.java b/src/integrationTest/java/org/opensearch/test/framework/matcher/ClusterContainTemplateWithAliasMatcher.java index d59792e715..861aaa72e7 100644 --- a/src/integrationTest/java/org/opensearch/test/framework/matcher/ClusterContainTemplateWithAliasMatcher.java +++ b/src/integrationTest/java/org/opensearch/test/framework/matcher/ClusterContainTemplateWithAliasMatcher.java @@ -9,14 +9,12 @@ */ package org.opensearch.test.framework.matcher; -import java.util.HashMap; import java.util.Map; import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; import java.util.stream.StreamSupport; -import com.carrotsearch.hppc.cursors.ObjectObjectCursor; import org.hamcrest.Description; import org.hamcrest.TypeSafeDiagnosingMatcher; @@ -57,13 +55,7 @@ protected boolean matchesSafely(Client client, Description mismatchDescription) private Set getAliases(GetIndexTemplatesResponse response) { return response.getIndexTemplates() .stream() - .map(metadata -> { - Map aliases = new HashMap<>(); - for (ObjectObjectCursor cursor : metadata.getAliases()) { - aliases.put(cursor.key, cursor.value); - } - return aliases; - }) + .map(metadata -> metadata.getAliases()) .flatMap(aliasMap -> aliasNames(aliasMap)) .collect(Collectors.toSet()); } diff --git a/src/integrationTest/java/org/opensearch/test/framework/matcher/GetSettingsResponseContainsIndicesMatcher.java b/src/integrationTest/java/org/opensearch/test/framework/matcher/GetSettingsResponseContainsIndicesMatcher.java index 79ac1c64ac..01f14dd044 100644 --- a/src/integrationTest/java/org/opensearch/test/framework/matcher/GetSettingsResponseContainsIndicesMatcher.java +++ b/src/integrationTest/java/org/opensearch/test/framework/matcher/GetSettingsResponseContainsIndicesMatcher.java @@ -9,14 +9,11 @@ */ package org.opensearch.test.framework.matcher; -import java.util.HashMap; -import java.util.Map; - -import com.carrotsearch.hppc.cursors.ObjectObjectCursor; import org.hamcrest.Description; import org.hamcrest.TypeSafeDiagnosingMatcher; import org.opensearch.action.admin.indices.settings.get.GetSettingsResponse; +import org.opensearch.common.collect.ImmutableOpenMap; import org.opensearch.common.settings.Settings; import static java.util.Objects.isNull; @@ -35,15 +32,12 @@ class GetSettingsResponseContainsIndicesMatcher extends TypeSafeDiagnosingMatche @Override protected boolean matchesSafely(GetSettingsResponse response, Description mismatchDescription) { - final Map indexToSettings = new HashMap<>(); - for (ObjectObjectCursor cursor : response.getIndexToSettings()) { - indexToSettings.put(cursor.key, cursor.value); - } + final ImmutableOpenMap indexToSettings = response.getIndexToSettings(); for (String index : expectedIndices) { if (!indexToSettings.containsKey(index)) { mismatchDescription .appendText("Response contains settings of indices: ") - .appendValue(indexToSettings.keySet()); + .appendValue(indexToSettings.keys()); return false; } } diff --git a/src/main/java/org/opensearch/security/privileges/PrivilegesEvaluator.java b/src/main/java/org/opensearch/security/privileges/PrivilegesEvaluator.java index b77b7a000f..8f490d180d 100644 --- a/src/main/java/org/opensearch/security/privileges/PrivilegesEvaluator.java +++ b/src/main/java/org/opensearch/security/privileges/PrivilegesEvaluator.java @@ -29,7 +29,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; import java.util.List; @@ -38,7 +37,6 @@ import java.util.StringJoiner; import java.util.regex.Pattern; -import com.carrotsearch.hppc.cursors.ObjectObjectCursor; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; import org.apache.logging.log4j.LogManager; @@ -674,10 +672,7 @@ public Iterator iterator() { final List filteredAliases = new ArrayList(); - final Map aliases = new HashMap<>(); - for (ObjectObjectCursor cursor : indexMetaData.getAliases()) { - aliases.put(cursor.key, cursor.value); - } + final Map aliases = indexMetaData.getAliases(); if(aliases != null && aliases.size() > 0) { if (isDebugEnabled) {