Fix other uses of immmutableopenmap

Signed-off-by: Stephen Crawford <[email protected]>
opensearch-project · Apr 24, 2023 · 93ef49d · 93ef49d
1 parent 3575d98
commit 93ef49d
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 12 deletions.
diff --git a/src/integrationTest/java/org/opensearch/test/framework/matcher/AliasExistsMatcher.java b/src/integrationTest/java/org/opensearch/test/framework/matcher/AliasExistsMatcher.java
@@ -11,7 +11,6 @@
 
 import java.util.Collection;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ExecutionException;
 import java.util.stream.Collectors;
@@ -24,6 +23,7 @@
 import org.opensearch.action.admin.indices.alias.get.GetAliasesResponse;
 import org.opensearch.client.Client;
 import org.opensearch.cluster.metadata.AliasMetadata;
+import org.opensearch.common.collect.ImmutableOpenMap;
 
 import static java.util.Objects.requireNonNull;
 import static java.util.Spliterator.IMMUTABLE;
@@ -41,8 +41,8 @@ public AliasExistsMatcher(String aliasName) {
 	protected boolean matchesSafely(Client client, Description mismatchDescription) {
 		try {
 			GetAliasesResponse response = client.admin().indices().getAliases(new GetAliasesRequest(aliasName)).get();
-			Map<String, List<AliasMetadata>> aliases = response.getAliases();
-			Set<String> actualAliasNames = StreamSupport.stream(spliteratorUnknownSize(aliases.values().iterator(), IMMUTABLE), false)
+			ImmutableOpenMap<String, List<AliasMetadata>> aliases = response.getAliases();
+			Set<String> actualAliasNames = StreamSupport.stream(spliteratorUnknownSize(aliases.valuesIt(), IMMUTABLE), false)
 					.flatMap(Collection::stream)
 					.map(AliasMetadata::getAlias)
 					.collect(Collectors.toSet());

diff --git a/...st/java/org/opensearch/test/framework/matcher/ClusterContainTemplateWithAliasMatcher.java b/...st/java/org/opensearch/test/framework/matcher/ClusterContainTemplateWithAliasMatcher.java
@@ -9,7 +9,6 @@
 */
 package org.opensearch.test.framework.matcher;
 
-import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -22,6 +21,7 @@
 import org.opensearch.action.admin.indices.template.get.GetIndexTemplatesResponse;
 import org.opensearch.client.Client;
 import org.opensearch.cluster.metadata.AliasMetadata;
+import org.opensearch.common.collect.ImmutableOpenMap;
 
 import static java.util.Objects.requireNonNull;
 
@@ -60,11 +60,10 @@ private Set<String> getAliases(GetIndexTemplatesResponse response) {
 				.collect(Collectors.toSet());
 	}
 
-	private Stream<String> aliasNames(Map<String, AliasMetadata> aliasMap) {
-		return aliasMap.keySet().stream().map(key -> aliasMap.get(key).getAlias());
+	private Stream<String> aliasNames(ImmutableOpenMap<String, AliasMetadata> aliasMap) {
+		return StreamSupport.stream(aliasMap.keys().spliterator(), false).map(objectCursor -> objectCursor.value);
 	}
 
-
 	@Override
 	public void describeTo(Description description) {
 		description.appendText("template ").appendValue(templateName).appendText(" exists and ");

diff --git a/...java/org/opensearch/test/framework/matcher/GetSettingsResponseContainsIndicesMatcher.java b/...java/org/opensearch/test/framework/matcher/GetSettingsResponseContainsIndicesMatcher.java
@@ -9,11 +9,11 @@
 */
 package org.opensearch.test.framework.matcher;
 
-import java.util.Map;
 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;
@@ -31,12 +31,12 @@ class GetSettingsResponseContainsIndicesMatcher extends TypeSafeDiagnosingMatche
 
 	@Override
 	protected boolean matchesSafely(GetSettingsResponse response, Description mismatchDescription) {
-		Map<String, Settings> indexToSettings = response.getIndexToSettings();
+		ImmutableOpenMap<String, Settings> 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/...ntegrationTest/java/org/opensearch/test/framework/matcher/IndexStateIsEqualToMatcher.java b/...ntegrationTest/java/org/opensearch/test/framework/matcher/IndexStateIsEqualToMatcher.java
@@ -10,6 +10,7 @@
 package org.opensearch.test.framework.matcher;
 
 import java.util.Map;
+
 import org.hamcrest.Description;
 import org.hamcrest.TypeSafeDiagnosingMatcher;
 

diff --git a/src/main/java/org/opensearch/security/privileges/PrivilegesEvaluator.java b/src/main/java/org/opensearch/security/privileges/PrivilegesEvaluator.java
@@ -78,6 +78,7 @@
 import org.opensearch.cluster.metadata.IndexNameExpressionResolver;
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.Strings;
+import org.opensearch.common.collect.ImmutableOpenMap;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.transport.TransportAddress;
 import org.opensearch.common.util.concurrent.ThreadContext;
@@ -674,14 +675,14 @@ public Iterator<IndexMetadata> iterator() {
 
             final List<AliasMetadata> filteredAliases = new ArrayList<AliasMetadata>();
 
-            final Map<String, AliasMetadata> aliases = indexMetaData.getAliases();
+            final ImmutableOpenMap<String, AliasMetadata> aliases = indexMetaData.getAliases();
 
             if(aliases != null && aliases.size() > 0) {
                 if (isDebugEnabled) {
                     log.debug("Aliases for {}: {}", indexMetaData.getIndex().getName(), aliases);
                 }
 
-                final Iterator<String> it = aliases.keySet().iterator();
+                final Iterator<String> it = aliases.keysIt();
                 while(it.hasNext()) {
                     final String alias = it.next();
                     final AliasMetadata aliasMetadata = aliases.get(alias);