Skip to content

simplify UserAttributes#findUnresolvedAttributes #6122

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 1 commit into from
Apr 30, 2026
Merged

simplify UserAttributes#findUnresolvedAttributes #6122

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 9 deletions src/main/java/org/opensearch/security/privileges/UserAttributes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,9 @@
*/
package org.opensearch.security.privileges;

import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

import com.google.common.base.Joiner;
Expand All @@ -41,12 +38,7 @@ public static boolean needsAttributeSubstitution(String patternString) {
* in {@code s} after substitution has been performed.
*/
public static List<String> findUnresolvedAttributes(String s) {
List<String> result = new ArrayList<>();
Matcher matcher = UNRESOLVED_ATTRIBUTE_PATTERN.matcher(s);
while (matcher.find()) {
result.add(matcher.group(1));
}
return Collections.unmodifiableList(result);
return UNRESOLVED_ATTRIBUTE_PATTERN.matcher(s).results().map(m -> m.group(1)).toList();
Comment thread
cwperks marked this conversation as resolved.
}

public static String replaceProperties(String orig, PrivilegesEvaluationContext context) {
Expand Down
Loading