Less copying

n1v0lg · Sep 30, 2024 · c8842fe · c8842fe
1 parent f6fb4fc
commit c8842fe
Showing 1 changed file with 13 additions and 10 deletions.
diff --git a/...main/java/org/elasticsearch/xpack/security/authc/support/mapper/ReservedRoleMappings.java b/...main/java/org/elasticsearch/xpack/security/authc/support/mapper/ReservedRoleMappings.java
@@ -9,10 +9,10 @@
 
 import org.elasticsearch.xpack.core.security.authc.support.mapper.ExpressionRoleMapping;
 
-import java.util.ArrayList;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 public class ReservedRoleMappings {
     private final ClusterStateRoleMapper clusterStateRoleMapper;
@@ -26,14 +26,17 @@ public List<ExpressionRoleMapping> combineWithReserved(List<ExpressionRoleMappin
         if (reservedRoleMappings.isEmpty()) {
             return roleMappings;
         }
-        final Set<String> reservedNames = reservedRoleMappings.stream().map(ExpressionRoleMapping::getName).collect(Collectors.toSet());
-        final List<ExpressionRoleMapping> filteredNativeRoleMappings = roleMappings.stream()
-            .filter(roleMapping -> false == reservedNames.contains(roleMapping.getName()))
-            .toList();
-        // TODO optimize
-        final List<ExpressionRoleMapping> combined = new ArrayList<>(reservedRoleMappings);
-        combined.addAll(filteredNativeRoleMappings);
-        return List.copyOf(combined);
+        if (roleMappings.isEmpty()) {
+            return List.copyOf(reservedRoleMappings);
+        }
+        final Map<String, ExpressionRoleMapping> combinedMappings = new LinkedHashMap<>();
+        for (ExpressionRoleMapping mapping : reservedRoleMappings) {
+            combinedMappings.put(mapping.getName(), mapping);
+        }
+        for (ExpressionRoleMapping mapping : roleMappings) {
+            combinedMappings.putIfAbsent(mapping.getName(), mapping);
+        }
+        return List.copyOf(combinedMappings.values());
     }
 
     public boolean isReserved(String roleMappingName) {