Skip to content

Switch from ImmutableOpenMap to Map in AliasExistsMatcher #2725

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cwperks merged 7 commits into from
Apr 26, 2023
Merged

Switch from ImmutableOpenMap to Map in AliasExistsMatcher #2725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a0c8923
Switch from ImmutableOpenMap to Map in AliasExistsMatcher
cwperks Apr 26, 2023
8d63c02
Remove unused imports
cwperks Apr 26, 2023
8e05b2c
Run spotlessApply
cwperks Apr 26, 2023
8c78f48
Remove references to ObjectObjectCursor
cwperks Apr 26, 2023
a7b86f4
Remove ImmutableOpenMap in PrivilegesEvaluator
cwperks Apr 26, 2023
9dbf740
Remove ImmutableOpenMap in ClusterContainTemplateWithAliasMatche
cwperks Apr 26, 2023
2dcdc12
Switch from keysIt to keys
cwperks Apr 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions src/integrationTest/java/org/opensearch/test/framework/matcher/AliasExistsMatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,13 @@
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;
import java.util.concurrent.ExecutionException;
import java.util.stream.Collectors;
import java.util.stream.StreamSupport;

import com.carrotsearch.hppc.cursors.ObjectObjectCursor;
import org.hamcrest.Description;
import org.hamcrest.TypeSafeDiagnosingMatcher;

Expand All @@ -44,11 +42,7 @@ protected boolean matchesSafely(Client client, Description mismatchDescription)
try {
GetAliasesResponse response = client.admin().indices().getAliases(new GetAliasesRequest(aliasName)).get();

final Map<String, List<AliasMetadata>> aliases = new HashMap<>();
for (ObjectObjectCursor<String, List<AliasMetadata>> cursor : response.getAliases()) {
aliases.put(cursor.key, cursor.value);
}

Map<String, List<AliasMetadata>> aliases = response.getAliases();
Set<String> actualAliasNames = StreamSupport.stream(spliteratorUnknownSize(aliases.values().iterator(), IMMUTABLE), false)
.flatMap(Collection::stream)
.map(AliasMetadata::getAlias)
Expand All @@ -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;
}
}
Expand Down
10 changes: 1 addition & 9 deletions ...st/java/org/opensearch/test/framework/matcher/ClusterContainTemplateWithAliasMatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -57,13 +55,7 @@ protected boolean matchesSafely(Client client, Description mismatchDescription)
private Set<String> getAliases(GetIndexTemplatesResponse response) {
return response.getIndexTemplates()
.stream()
.map(metadata -> {
Map<String, AliasMetadata> aliases = new HashMap<>();
for (ObjectObjectCursor<String, AliasMetadata> cursor : metadata.getAliases()) {
aliases.put(cursor.key, cursor.value);
}
return aliases;
})
.map(metadata -> metadata.getAliases())
.flatMap(aliasMap -> aliasNames(aliasMap))
.collect(Collectors.toSet());
}
Expand Down
12 changes: 3 additions & 9 deletions ...java/org/opensearch/test/framework/matcher/GetSettingsResponseContainsIndicesMatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -35,15 +32,12 @@ class GetSettingsResponseContainsIndicesMatcher extends TypeSafeDiagnosingMatche
@Override
protected boolean matchesSafely(GetSettingsResponse response, Description mismatchDescription) {

final Map<String, Settings> indexToSettings = new HashMap<>();
for (ObjectObjectCursor<String, Settings> cursor : response.getIndexToSettings()) {
indexToSettings.put(cursor.key, cursor.value);
}
final 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());
Copy link
Member Author

@cwperks cwperks Apr 26, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@scrawfor99 Sorry I had to push a small change and now CI is running again. I had this as keysIt when it really should be the key set here.

return false;
}
}
Expand Down
7 changes: 1 addition & 6 deletions src/main/java/org/opensearch/security/privileges/PrivilegesEvaluator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -674,10 +672,7 @@ public Iterator<IndexMetadata> iterator() {

final List<AliasMetadata> filteredAliases = new ArrayList<AliasMetadata>();

final Map<String, AliasMetadata> aliases = new HashMap<>();
for (ObjectObjectCursor<String, AliasMetadata> cursor : indexMetaData.getAliases()) {
aliases.put(cursor.key, cursor.value);
}
final Map<String, AliasMetadata> aliases = indexMetaData.getAliases();

if(aliases != null && aliases.size() > 0) {
if (isDebugEnabled) {
Expand Down