iter

Author: piergm

server/src/main/java/org/elasticsearch/action/search/RestOpenPointInTimeAction.java

@@ -32,11 +32,9 @@
 @ServerlessScope(Scope.PUBLIC)
 public class RestOpenPointInTimeAction extends BaseRestHandler {
 
-    private final Settings settings;
     private final CrossProjectModeDecider crossProjectModeDecider;
 
     public RestOpenPointInTimeAction(Settings settings) {
-        this.settings = settings;
         this.crossProjectModeDecider = new CrossProjectModeDecider(settings);
     }
 

server/src/main/java/org/elasticsearch/action/search/TransportOpenPointInTimeAction.java

@@ -129,10 +129,6 @@ public TransportOpenPointInTimeAction(
         );
     }
 
-    private static String[] validateResponseAndGetIndicesArray(ResolveIndexAction.Response r) {
-        return new String[] {};
-    }
-
     @Override
     protected void doExecute(Task task, OpenPointInTimeRequest request, ActionListener<OpenPointInTimeResponse> listener) {
         final ClusterState clusterState = clusterService.state();
@@ -194,9 +190,10 @@ protected void doExecute(Task task, OpenPointInTimeRequest request, ActionListen
                             }
                             Set<String> collectedIndices = new HashSet<>(indices.length);
 
-                            for (String remoteAlias : resolvedRemoteExpressions.keySet()) {
-                                ResolvedIndexExpressions remoteExpressions = resolvedRemoteExpressions.get(remoteAlias);
-                                for (ResolvedIndexExpression expression : remoteExpressions.expressions()) {
+                            for (Map.Entry<String, ResolvedIndexExpressions> resolvedRemoteExpressionEntry : resolvedRemoteExpressions
+                                .entrySet()) {
+                                String remoteAlias = resolvedRemoteExpressionEntry.getKey();
+                                for (ResolvedIndexExpression expression : resolvedRemoteExpressionEntry.getValue().expressions()) {
                                     ResolvedIndexExpression.LocalExpressions oneRemoteExpression = expression.localExpressions();
                                     if (false == oneRemoteExpression.indices().isEmpty()
                                         && oneRemoteExpression