Merge remote-tracking branch 'elastic/master' into execute-actions-under-permit-primary-mode-only

* elastic/master:
  Validate non-secure settings are not in keystore (elastic#42209)
  Cleanup Various Uses of ActionListener (elastic#40126)
  Update api links per context (elastic#42033)

Author: jasontedor

docs/painless/painless-contexts/painless-analysis-predicate-context.asciidoc

@@ -40,4 +40,4 @@ analysis chain matches a predicate.
 
 *API*
 
-The standard <<painless-api-reference, Painless API>> is available.
+The standard <<painless-api-reference-shared, Painless API>> is available.

docs/painless/painless-contexts/painless-bucket-script-agg-context.asciidoc

@@ -18,7 +18,7 @@ numeric::
 
 ==== API
 
-The standard <<painless-api-reference, Painless API>> is available.
+The standard <<painless-api-reference-shared, Painless API>> is available.
 
 ==== Example
 

docs/painless/painless-contexts/painless-bucket-selector-agg-context.asciidoc

@@ -19,6 +19,10 @@ boolean::
 
 ==== API
 
+The standard <<painless-api-reference-shared, Painless API>> is available.
+
+==== Example
+
 
 To run this example, first follow the steps in <<painless-context-examples, context examples>>.
 

docs/painless/painless-contexts/painless-field-context.asciidoc

@@ -25,7 +25,8 @@ a customized value for each document in the results of a query.
 
 *API*
 
-The standard <<painless-api-reference, Painless API>> is available.
+Both the standard <<painless-api-reference-shared, Painless API>> and
+<<painless-api-reference-field, Specialized Field API>> are available.
 
 
 *Example*

docs/painless/painless-contexts/painless-filter-context.asciidoc

@@ -23,7 +23,7 @@ query to include and exclude documents.
 
 *API*
 
-The standard <<painless-api-reference, Painless API>> is available.
+The standard <<painless-api-reference-shared, Painless API>> is available.
 
 *Example*
 

docs/painless/painless-contexts/painless-ingest-processor-context.asciidoc

@@ -38,7 +38,8 @@ void::
 
 *API*
 
-The standard <<painless-api-reference, Painless API>> is available.
+Both the standard <<painless-api-reference-shared, Painless API>> and
+<<painless-api-reference-ingest, Specialized Ingest API>> are available.
 
 *Example*
 

docs/painless/painless-contexts/painless-metric-agg-combine-context.asciidoc

@@ -24,4 +24,4 @@ optional as part of a full metric aggregation.
 
 *API*
 
-The standard <<painless-api-reference, Painless API>> is available.
+The standard <<painless-api-reference-shared, Painless API>> is available.

docs/painless/painless-contexts/painless-metric-agg-init-context.asciidoc

@@ -29,4 +29,4 @@ full metric aggregation.
 
 *API*
 
-The standard <<painless-api-reference, Painless API>> is available.
+The standard <<painless-api-reference-shared, Painless API>> is available.

docs/painless/painless-contexts/painless-metric-agg-map-context.asciidoc

@@ -44,4 +44,4 @@ part of a full metric aggregation.
 
 *API*
 
-The standard <<painless-api-reference, Painless API>> is available.
+The standard <<painless-api-reference-shared, Painless API>> is available.

docs/painless/painless-contexts/painless-metric-agg-reduce-context.asciidoc

@@ -25,4 +25,4 @@ specified) and is optional as part of a full metric aggregation.
 
 *API*
 
-The standard <<painless-api-reference, Painless API>> is available.
+The standard <<painless-api-reference-shared, Painless API>> is available.

docs/painless/painless-contexts/painless-min-should-match-context.asciidoc

@@ -25,7 +25,7 @@ results.
 
 *API*
 
-The standard <<painless-api-reference, Painless API>> is available.
+The standard <<painless-api-reference-shared, Painless API>> is available.
 
 *Example*
 

docs/painless/painless-contexts/painless-reindex-context.asciidoc

@@ -65,4 +65,4 @@ reindexed into a target index.
 
 *API*
 
-The standard <<painless-api-reference, Painless API>> is available.
+The standard <<painless-api-reference-shared, Painless API>> is available.

docs/painless/painless-contexts/painless-score-context.asciidoc

@@ -26,7 +26,8 @@ score to documents returned from a query.
 
 *API*
 
-The standard <<painless-api-reference, Painless API>> is available.
+Both the standard <<painless-api-reference-shared, Painless API>> and
+<<painless-api-reference-score, Specialized Score API>> are available.
 
 *Example*
 

docs/painless/painless-contexts/painless-similarity-context.asciidoc

@@ -56,4 +56,4 @@ uses synonyms.
 
 *API*
 
-The standard <<painless-api-reference, Painless API>> is available.
+The standard <<painless-api-reference-shared, Painless API>> is available.

docs/painless/painless-contexts/painless-sort-context.asciidoc

@@ -25,7 +25,7 @@ Use a Painless script to
 
 *API*
 
-The standard <<painless-api-reference, Painless API>> is available.
+The standard <<painless-api-reference-shared, Painless API>> is available.
 
 *Example*
 

docs/painless/painless-contexts/painless-update-by-query-context.asciidoc

@@ -51,7 +51,7 @@ result of query.
 
 *API*
 
-The standard <<painless-api-reference, Painless API>> is available.
+The standard <<painless-api-reference-shared, Painless API>> is available.
 
 *Example*
 

docs/painless/painless-contexts/painless-update-context.asciidoc

@@ -52,7 +52,7 @@ add, modify, or delete fields within a single document.
 
 *API*
 
-The standard <<painless-api-reference, Painless API>> is available.
+The standard <<painless-api-reference-shared, Painless API>> is available.
 
 *Example*
 

docs/painless/painless-contexts/painless-watcher-condition-context.asciidoc

@@ -14,7 +14,7 @@ include::painless-watcher-context-variables.asciidoc[]
 
 *API*
 
-The standard <<painless-api-reference, Painless API>> is available.
+The standard <<painless-api-reference-shared, Painless API>> is available.
 
 *Example*
 

docs/painless/painless-contexts/painless-watcher-context-variables.asciidoc

@@ -33,8 +33,7 @@ The following variables are available in all watcher contexts.
 
 *API*
 
-
-The standard <<painless-api-reference, Painless API>> is available.
+The standard <<painless-api-reference-shared, Painless API>> is available.
 
 To run this example, first follow the steps in
 <<painless-context-examples, context examples>>.

docs/painless/painless-contexts/painless-watcher-transform-context.asciidoc

@@ -14,7 +14,7 @@ include::painless-watcher-context-variables.asciidoc[]
 
 *API*
 
-The standard <<painless-api-reference, Painless API>> is available.
+The standard <<painless-api-reference-shared, Painless API>> is available.
 
 *Example*
 

docs/painless/painless-contexts/painless-weight-context.asciidoc

@@ -39,4 +39,4 @@ Queries that contain multiple terms calculate a separate weight for each term.
 
 *API*
 
-The standard <<painless-api-reference, Painless API>> is available.
+The standard <<painless-api-reference-shared, Painless API>> is available.

server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/get/TransportGetTaskAction.java

@@ -203,27 +203,15 @@ void getFinishedTaskFromIndex(Task thisTask, GetTaskRequest request, ActionListe
                 request.getTaskId().toString());
         get.setParentTask(clusterService.localNode().getId(), thisTask.getId());
 
-        client.get(get, new ActionListener<GetResponse>() {
-            @Override
-            public void onResponse(GetResponse getResponse) {
-                try {
-                    onGetFinishedTaskFromIndex(getResponse, listener);
-                } catch (Exception e) {
-                    listener.onFailure(e);
-                }
-            }
-
-            @Override
-            public void onFailure(Exception e) {
-                if (ExceptionsHelper.unwrap(e, IndexNotFoundException.class) != null) {
-                    // We haven't yet created the index for the task results so it can't be found.
-                    listener.onFailure(new ResourceNotFoundException("task [{}] isn't running and hasn't stored its results", e,
-                        request.getTaskId()));
-                } else {
-                    listener.onFailure(e);
-                }
+        client.get(get, ActionListener.wrap(r -> onGetFinishedTaskFromIndex(r, listener), e -> {
+            if (ExceptionsHelper.unwrap(e, IndexNotFoundException.class) != null) {
+                // We haven't yet created the index for the task results so it can't be found.
+                listener.onFailure(new ResourceNotFoundException("task [{}] isn't running and hasn't stored its results", e,
+                    request.getTaskId()));
+            } else {
+                listener.onFailure(e);
             }
-        });
+        }));
     }
 
     /**

server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportSnapshotsStatusAction.java

@@ -119,23 +119,11 @@ protected void masterOperation(final SnapshotsStatusRequest request,
             TransportNodesSnapshotsStatus.Request nodesRequest =
                 new TransportNodesSnapshotsStatus.Request(nodesIds.toArray(new String[nodesIds.size()]))
                     .snapshots(snapshots).timeout(request.masterNodeTimeout());
-            transportNodesSnapshotsStatus.execute(nodesRequest, new ActionListener<TransportNodesSnapshotsStatus.NodesSnapshotStatus>() {
-                        @Override
-                        public void onResponse(TransportNodesSnapshotsStatus.NodesSnapshotStatus nodeSnapshotStatuses) {
-                            try {
-                                List<SnapshotsInProgress.Entry> currentSnapshots =
-                                        snapshotsService.currentSnapshots(request.repository(), Arrays.asList(request.snapshots()));
-                                listener.onResponse(buildResponse(request, currentSnapshots, nodeSnapshotStatuses));
-                            } catch (Exception e) {
-                                listener.onFailure(e);
-                            }
-                        }
-
-                        @Override
-                        public void onFailure(Exception e) {
-                            listener.onFailure(e);
-                        }
-                    });
+            transportNodesSnapshotsStatus.execute(nodesRequest,
+                ActionListener.map(
+                    listener, nodeSnapshotStatuses ->
+                        buildResponse(request, snapshotsService.currentSnapshots(request.repository(), Arrays.asList(request.snapshots())),
+                            nodeSnapshotStatuses)));
         } else {
             // We don't have any in-progress shards, just return current stats
             listener.onResponse(buildResponse(request, currentSnapshots, null));

server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/TransportUpgradeAction.java

@@ -184,26 +184,13 @@ protected ClusterBlockException checkRequestBlock(ClusterState state, UpgradeReq
 
     @Override
     protected void doExecute(Task task, UpgradeRequest request, final ActionListener<UpgradeResponse> listener) {
-        ActionListener<UpgradeResponse> settingsUpdateListener = new ActionListener<UpgradeResponse>() {
-            @Override
-            public void onResponse(UpgradeResponse upgradeResponse) {
-                try {
-                    if (upgradeResponse.versions().isEmpty()) {
-                        listener.onResponse(upgradeResponse);
-                    } else {
-                        updateSettings(upgradeResponse, listener);
-                    }
-                } catch (Exception e) {
-                    listener.onFailure(e);
-                }
-            }
-
-            @Override
-            public void onFailure(Exception e) {
-                listener.onFailure(e);
+        super.doExecute(task, request, ActionListener.wrap(upgradeResponse -> {
+            if (upgradeResponse.versions().isEmpty()) {
+                listener.onResponse(upgradeResponse);
+            } else {
+                updateSettings(upgradeResponse, listener);
             }
-        };
-        super.doExecute(task, request, settingsUpdateListener);
+        }, listener::onFailure));
     }
 
     private void updateSettings(final UpgradeResponse upgradeResponse, final ActionListener<UpgradeResponse> listener) {

server/src/main/java/org/elasticsearch/action/bulk/BulkRequestHandler.java

@@ -59,27 +59,20 @@ public void execute(BulkRequest bulkRequest, long executionId) {
             semaphore.acquire();
             toRelease = semaphore::release;
             CountDownLatch latch = new CountDownLatch(1);
-            retry.withBackoff(consumer, bulkRequest, new ActionListener<BulkResponse>() {
+            retry.withBackoff(consumer, bulkRequest, ActionListener.runAfter(new ActionListener<BulkResponse>() {
                 @Override
                 public void onResponse(BulkResponse response) {
-                    try {
-                        listener.afterBulk(executionId, bulkRequest, response);
-                    } finally {
-                        semaphore.release();
-                        latch.countDown();
-                    }
+                    listener.afterBulk(executionId, bulkRequest, response);
                 }
 
                 @Override
                 public void onFailure(Exception e) {
-                    try {
-                        listener.afterBulk(executionId, bulkRequest, e);
-                    } finally {
-                        semaphore.release();
-                        latch.countDown();
-                    }
+                    listener.afterBulk(executionId, bulkRequest, e);
                 }
-            });
+            }, () -> {
+                semaphore.release();
+                latch.countDown();
+            }));
             bulkRequestSetupSuccessful = true;
             if (concurrentRequests == 0) {
                 latch.await();

server/src/main/java/org/elasticsearch/action/ingest/PutPipelineTransportAction.java

@@ -22,7 +22,6 @@
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.admin.cluster.node.info.NodeInfo;
 import org.elasticsearch.action.admin.cluster.node.info.NodesInfoRequest;
-import org.elasticsearch.action.admin.cluster.node.info.NodesInfoResponse;
 import org.elasticsearch.action.support.ActionFilters;
 import org.elasticsearch.action.support.master.AcknowledgedResponse;
 import org.elasticsearch.action.support.master.TransportMasterNodeAction;
@@ -74,25 +73,13 @@ protected void masterOperation(PutPipelineRequest request, ClusterState state, A
         NodesInfoRequest nodesInfoRequest = new NodesInfoRequest();
         nodesInfoRequest.clear();
         nodesInfoRequest.ingest(true);
-        client.admin().cluster().nodesInfo(nodesInfoRequest, new ActionListener<NodesInfoResponse>() {
-            @Override
-            public void onResponse(NodesInfoResponse nodeInfos) {
-                try {
-                    Map<DiscoveryNode, IngestInfo> ingestInfos = new HashMap<>();
-                    for (NodeInfo nodeInfo : nodeInfos.getNodes()) {
-                        ingestInfos.put(nodeInfo.getNode(), nodeInfo.getIngest());
-                    }
-                    ingestService.putPipeline(ingestInfos, request, listener);
-                } catch (Exception e) {
-                    onFailure(e);
-                }
+        client.admin().cluster().nodesInfo(nodesInfoRequest, ActionListener.wrap(nodeInfos -> {
+            Map<DiscoveryNode, IngestInfo> ingestInfos = new HashMap<>();
+            for (NodeInfo nodeInfo : nodeInfos.getNodes()) {
+                ingestInfos.put(nodeInfo.getNode(), nodeInfo.getIngest());
             }
-
-            @Override
-            public void onFailure(Exception e) {
-                listener.onFailure(e);
-            }
-        });
+            ingestService.putPipeline(ingestInfos, request, listener);
+        }, listener::onFailure));
     }
 
     @Override

server/src/main/java/org/elasticsearch/action/support/ThreadedActionListener.java

@@ -22,6 +22,7 @@
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.message.ParameterizedMessage;
 import org.elasticsearch.action.ActionListener;
+import org.elasticsearch.action.ActionRunnable;
 import org.elasticsearch.client.Client;
 import org.elasticsearch.client.transport.TransportClient;
 import org.elasticsearch.common.settings.Settings;
@@ -86,21 +87,16 @@ public ThreadedActionListener(Logger logger, ThreadPool threadPool, String execu
 
     @Override
     public void onResponse(final Response response) {
-        threadPool.executor(executor).execute(new AbstractRunnable() {
+        threadPool.executor(executor).execute(new ActionRunnable<>(listener) {
             @Override
             public boolean isForceExecution() {
                 return forceExecution;
             }
 
             @Override
-            protected void doRun() throws Exception {
+            protected void doRun() {
                 listener.onResponse(response);
             }
-
-            @Override
-            public void onFailure(Exception e) {
-                listener.onFailure(e);
-            }
         });
     }