From a0c8923cc058879569fff4d74e4a58cb76166452 Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Wed, 26 Apr 2023 10:49:28 -0400 Subject: [PATCH 1/7] Switch from ImmutableOpenMap to Map in AliasExistsMatcher Signed-off-by: Craig Perkins --- .../test/framework/matcher/AliasExistsMatcher.java | 8 ++------ 1 file changed, 2 insertions(+), 6 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 index 4999da8e95..27d9d738ce 100644 --- a/src/integrationTest/java/org/opensearch/test/framework/matcher/AliasExistsMatcher.java +++ b/src/integrationTest/java/org/opensearch/test/framework/matcher/AliasExistsMatcher.java @@ -44,11 +44,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 +57,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; } } From 8d63c0203e99f80784977bbdedb85e41b16dbfbc Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Wed, 26 Apr 2023 10:54:47 -0400 Subject: [PATCH 2/7] Remove unused imports Signed-off-by: Craig Perkins --- .../framework/matcher/AliasExistsMatcher.java | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 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 index 27d9d738ce..b4cf18e391 100644 --- a/src/integrationTest/java/org/opensearch/test/framework/matcher/AliasExistsMatcher.java +++ b/src/integrationTest/java/org/opensearch/test/framework/matcher/AliasExistsMatcher.java @@ -9,8 +9,14 @@ */ package org.opensearch.test.framework.matcher; +import org.hamcrest.Description; +import org.hamcrest.TypeSafeDiagnosingMatcher; +import org.opensearch.action.admin.indices.alias.get.GetAliasesRequest; +import org.opensearch.action.admin.indices.alias.get.GetAliasesResponse; +import org.opensearch.client.Client; +import org.opensearch.cluster.metadata.AliasMetadata; + import java.util.Collection; -import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Set; @@ -18,15 +24,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; - -import org.opensearch.action.admin.indices.alias.get.GetAliasesRequest; -import org.opensearch.action.admin.indices.alias.get.GetAliasesResponse; -import org.opensearch.client.Client; -import org.opensearch.cluster.metadata.AliasMetadata; - import static java.util.Objects.requireNonNull; import static java.util.Spliterator.IMMUTABLE; import static java.util.Spliterators.spliteratorUnknownSize; From 8e05b2c14fee3e9ec6a1c331a55571dc8d285127 Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Wed, 26 Apr 2023 11:03:16 -0400 Subject: [PATCH 3/7] Run spotlessApply Signed-off-by: Craig Perkins --- .../framework/matcher/AliasExistsMatcher.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 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 index b4cf18e391..4d8c81b037 100644 --- a/src/integrationTest/java/org/opensearch/test/framework/matcher/AliasExistsMatcher.java +++ b/src/integrationTest/java/org/opensearch/test/framework/matcher/AliasExistsMatcher.java @@ -9,13 +9,6 @@ */ package org.opensearch.test.framework.matcher; -import org.hamcrest.Description; -import org.hamcrest.TypeSafeDiagnosingMatcher; -import org.opensearch.action.admin.indices.alias.get.GetAliasesRequest; -import org.opensearch.action.admin.indices.alias.get.GetAliasesResponse; -import org.opensearch.client.Client; -import org.opensearch.cluster.metadata.AliasMetadata; - import java.util.Collection; import java.util.List; import java.util.Map; @@ -24,6 +17,14 @@ import java.util.stream.Collectors; import java.util.stream.StreamSupport; +import org.hamcrest.Description; +import org.hamcrest.TypeSafeDiagnosingMatcher; + +import org.opensearch.action.admin.indices.alias.get.GetAliasesRequest; +import org.opensearch.action.admin.indices.alias.get.GetAliasesResponse; +import org.opensearch.client.Client; +import org.opensearch.cluster.metadata.AliasMetadata; + import static java.util.Objects.requireNonNull; import static java.util.Spliterator.IMMUTABLE; import static java.util.Spliterators.spliteratorUnknownSize; From 8c78f4814c49e1f5ffbdaaeb14d0bd056ce95716 Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Wed, 26 Apr 2023 13:04:54 -0400 Subject: [PATCH 4/7] Remove references to ObjectObjectCursor Signed-off-by: Craig Perkins --- ...ClusterContainTemplateWithAliasMatcher.java | 18 ++++-------------- ...SettingsResponseContainsIndicesMatcher.java | 12 +++--------- .../privileges/PrivilegesEvaluator.java | 10 +++------- 3 files changed, 10 insertions(+), 30 deletions(-) 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..13a964f565 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,11 @@ */ 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; @@ -24,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; @@ -57,21 +55,13 @@ 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()); } - private Stream aliasNames(Map aliasMap) { - Iterable> iterable = () -> aliasMap.entrySet().iterator(); - return StreamSupport.stream(iterable.spliterator(), false) - .map(entry -> entry.getValue().getAlias()); + private Stream aliasNames(ImmutableOpenMap aliasMap) { + return StreamSupport.stream(aliasMap.keys().spliterator(), false).map(objectCursor -> objectCursor.value); } 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..bf8f85e513 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.keysIt()); 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..5b53328be0 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; @@ -80,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,17 +673,14 @@ 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 ImmutableOpenMap aliases = indexMetaData.getAliases(); if(aliases != null && aliases.size() > 0) { if (isDebugEnabled) { log.debug("Aliases for {}: {}", indexMetaData.getIndex().getName(), aliases); } - final Iterator it = aliases.keySet().iterator(); + final Iterator it = aliases.keysIt(); while(it.hasNext()) { final String alias = it.next(); final AliasMetadata aliasMetadata = aliases.get(alias); From a7b86f4b1f92e2aefe8d524df2a06075bdd454ec Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Wed, 26 Apr 2023 13:24:19 -0400 Subject: [PATCH 5/7] Remove ImmutableOpenMap in PrivilegesEvaluator Signed-off-by: Craig Perkins --- .../opensearch/security/privileges/PrivilegesEvaluator.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/opensearch/security/privileges/PrivilegesEvaluator.java b/src/main/java/org/opensearch/security/privileges/PrivilegesEvaluator.java index 5b53328be0..8f490d180d 100644 --- a/src/main/java/org/opensearch/security/privileges/PrivilegesEvaluator.java +++ b/src/main/java/org/opensearch/security/privileges/PrivilegesEvaluator.java @@ -78,7 +78,6 @@ 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; @@ -673,14 +672,14 @@ public Iterator iterator() { final List filteredAliases = new ArrayList(); - final ImmutableOpenMap aliases = indexMetaData.getAliases(); + final Map aliases = indexMetaData.getAliases(); if(aliases != null && aliases.size() > 0) { if (isDebugEnabled) { log.debug("Aliases for {}: {}", indexMetaData.getIndex().getName(), aliases); } - final Iterator it = aliases.keysIt(); + final Iterator it = aliases.keySet().iterator(); while(it.hasNext()) { final String alias = it.next(); final AliasMetadata aliasMetadata = aliases.get(alias); From 9dbf7406530d0c4e7880275fc341ba4f0284e386 Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Wed, 26 Apr 2023 13:32:01 -0400 Subject: [PATCH 6/7] Remove ImmutableOpenMap in ClusterContainTemplateWithAliasMatche Signed-off-by: Craig Perkins --- .../matcher/ClusterContainTemplateWithAliasMatcher.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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 13a964f565..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,6 +9,7 @@ */ package org.opensearch.test.framework.matcher; +import java.util.Map; import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -21,7 +22,6 @@ 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,8 +60,10 @@ private Set getAliases(GetIndexTemplatesResponse response) { .collect(Collectors.toSet()); } - private Stream aliasNames(ImmutableOpenMap aliasMap) { - return StreamSupport.stream(aliasMap.keys().spliterator(), false).map(objectCursor -> objectCursor.value); + private Stream aliasNames(Map aliasMap) { + Iterable> iterable = () -> aliasMap.entrySet().iterator(); + return StreamSupport.stream(iterable.spliterator(), false) + .map(entry -> entry.getValue().getAlias()); } From 2dcdc1252452551aaeddcc5b159e41cc1ec2cb22 Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Wed, 26 Apr 2023 14:44:13 -0400 Subject: [PATCH 7/7] Switch from keysIt to keys Signed-off-by: Craig Perkins --- .../matcher/GetSettingsResponseContainsIndicesMatcher.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 bf8f85e513..01f14dd044 100644 --- a/src/integrationTest/java/org/opensearch/test/framework/matcher/GetSettingsResponseContainsIndicesMatcher.java +++ b/src/integrationTest/java/org/opensearch/test/framework/matcher/GetSettingsResponseContainsIndicesMatcher.java @@ -37,7 +37,7 @@ protected boolean matchesSafely(GetSettingsResponse response, Description mismat if (!indexToSettings.containsKey(index)) { mismatchDescription .appendText("Response contains settings of indices: ") - .appendValue(indexToSettings.keysIt()); + .appendValue(indexToSettings.keys()); return false; } }