Nits

Author: n1v0lg

server/src/main/java/org/elasticsearch/search/crossproject/IndexExpressionsRewriter.java

@@ -51,7 +51,7 @@ public class IndexExpressionsRewriter {
      * @throws IllegalArgumentException if exclusions, date math or selectors are present in the index expressions
      * @throws NoMatchingProjectException if a qualified resource cannot be resolved because a project is missing
      */
-    public static Map<String, List<String>> rewriteIndexExpressions(
+    public static Map<String, IndexRewriteResult> rewriteIndexExpressions(
         ProjectRoutingInfo originProject,
         List<ProjectRoutingInfo> linkedProjects,
         final String[] originalIndices
@@ -67,15 +67,12 @@ public static Map<String, List<String>> rewriteIndexExpressions(
 
         final Set<String> allProjectAliases = getAllProjectAliases(originProject, linkedProjects);
         final String originProjectAlias = originProject != null ? originProject.projectAlias() : null;
-        final Map<String, List<String>> canonicalExpressionsMap = new LinkedHashMap<>(indices.length);
+        final Map<String, IndexRewriteResult> canonicalExpressionsMap = new LinkedHashMap<>(indices.length);
         for (String indexExpression : indices) {
             if (canonicalExpressionsMap.containsKey(indexExpression)) {
                 continue;
             }
-            canonicalExpressionsMap.put(
-                indexExpression,
-                resultAsList(rewriteIndexExpression(indexExpression, originProjectAlias, allProjectAliases))
-            );
+            canonicalExpressionsMap.put(indexExpression, rewriteIndexExpression(indexExpression, originProjectAlias, allProjectAliases));
         }
         return canonicalExpressionsMap;
     }
@@ -209,16 +206,6 @@ private static void maybeThrowOnUnsupportedResource(String resource) {
         }
     }
 
-    private static List<String> resultAsList(IndexRewriteResult result) {
-        if (result.localExpression == null) {
-            return result.remoteExpressions;
-        }
-        List<String> all = new ArrayList<>();
-        all.add(result.localExpression);
-        all.addAll(result.remoteExpressions);
-        return List.copyOf(all);
-    }
-
     /**
      * A container for a local expression and a list of remote expressions.
      */