Merge remote-tracking branch 'origin/main' into failure-store-authentication

Author: gwbrown

docs/changelog/118619.yaml

@@ -0,0 +1,5 @@
+pr: 118619
+summary: Optional named arguments for function in map
+area: EQL
+type: enhancement
+issues: []

muted-tests.yml

@@ -244,6 +244,9 @@ tests:
 - class: org.elasticsearch.xpack.test.rest.XPackRestIT
   method: test {p0=snapshot/10_basic/Failed to snapshot indices with synthetic source}
   issue: https://github.com/elastic/elasticsearch/issues/120332
+- class: org.elasticsearch.xpack.ccr.FollowIndexSecurityIT
+  method: testCleanShardFollowTaskAfterDeleteFollower
+  issue: https://github.com/elastic/elasticsearch/issues/120339
 
 # Examples:
 #

server/src/main/java/module-info.java

@@ -394,6 +394,7 @@
     exports org.elasticsearch.action.downsample;
     exports org.elasticsearch.plugins.internal
         to
+            org.elasticsearch.inference,
             org.elasticsearch.metering,
             org.elasticsearch.stateless,
             org.elasticsearch.settings.secure,

server/src/main/java/org/elasticsearch/indices/IndicesServiceBuilder.java

@@ -34,7 +34,7 @@
 import org.elasticsearch.plugins.EnginePlugin;
 import org.elasticsearch.plugins.IndexStorePlugin;
 import org.elasticsearch.plugins.PluginsService;
-import org.elasticsearch.plugins.SearchPlugin;
+import org.elasticsearch.plugins.internal.InternalSearchPlugin;
 import org.elasticsearch.plugins.internal.rewriter.QueryRewriteInterceptor;
 import org.elasticsearch.script.ScriptService;
 import org.elasticsearch.search.aggregations.support.ValuesSourceRegistry;
@@ -266,8 +266,8 @@ public IndicesService build() {
             .flatMap(m -> m.entrySet().stream())
             .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
 
-        var queryRewriteInterceptors = pluginsService.filterPlugins(SearchPlugin.class)
-            .map(SearchPlugin::getQueryRewriteInterceptors)
+        var queryRewriteInterceptors = pluginsService.filterPlugins(InternalSearchPlugin.class)
+            .map(InternalSearchPlugin::getQueryRewriteInterceptors)
             .flatMap(List::stream)
             .collect(Collectors.toMap(QueryRewriteInterceptor::getQueryName, interceptor -> {
                 if (interceptor.getQueryName() == null) {

server/src/main/java/org/elasticsearch/plugins/SearchPlugin.java

@@ -23,7 +23,6 @@
 import org.elasticsearch.index.query.QueryParser;
 import org.elasticsearch.index.query.functionscore.ScoreFunctionBuilder;
 import org.elasticsearch.index.query.functionscore.ScoreFunctionParser;
-import org.elasticsearch.plugins.internal.rewriter.QueryRewriteInterceptor;
 import org.elasticsearch.search.SearchExtBuilder;
 import org.elasticsearch.search.aggregations.Aggregation;
 import org.elasticsearch.search.aggregations.AggregationBuilder;
@@ -129,14 +128,6 @@ default List<QuerySpec<?>> getQueries() {
         return emptyList();
     }
 
-    /**
-     * @return Applicable {@link QueryRewriteInterceptor}s configured for this plugin.
-     * Note: This is internal to Elasticsearch's API and not extensible by external plugins.
-     */
-    default List<QueryRewriteInterceptor> getQueryRewriteInterceptors() {
-        return emptyList();
-    }
-
     /**
      * The new {@link Aggregation}s added by this plugin.
      */

server/src/main/java/org/elasticsearch/plugins/internal/InternalSearchPlugin.java

@@ -0,0 +1,27 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the "Elastic License
+ * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
+ * Public License v 1"; you may not use this file except in compliance with, at
+ * your election, the "Elastic License 2.0", the "GNU Affero General Public
+ * License v3.0 only", or the "Server Side Public License, v 1".
+ */
+
+package org.elasticsearch.plugins.internal;
+
+import org.elasticsearch.plugins.internal.rewriter.QueryRewriteInterceptor;
+
+import java.util.List;
+
+import static java.util.Collections.emptyList;
+
+public interface InternalSearchPlugin {
+
+    /**
+     * @return Applicable {@link QueryRewriteInterceptor}s configured for this plugin.
+     * Note: This is internal to Elasticsearch's API and not extensible by external plugins.
+     */
+    default List<QueryRewriteInterceptor> getQueryRewriteInterceptors() {
+        return emptyList();
+    }
+}

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/enrich/EnrichPolicy.java

@@ -35,7 +35,7 @@
  */
 public final class EnrichPolicy implements Writeable, ToXContentFragment {
 
-    private static final String ELASTICEARCH_VERSION_DEPRECATION_MESSAGE =
+    private static final String ELASTICSEARCH_VERSION_DEPRECATION_MESSAGE =
         "the [elasticsearch_version] field of an enrich policy has no effect and will be removed in a future version of Elasticsearch";
 
     private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(EnrichPolicy.class);
@@ -146,7 +146,7 @@ private EnrichPolicy(
             deprecationLogger.warn(
                 DeprecationCategory.OTHER,
                 "enrich_policy_with_elasticsearch_version",
-                ELASTICEARCH_VERSION_DEPRECATION_MESSAGE
+                ELASTICSEARCH_VERSION_DEPRECATION_MESSAGE
             );
         }
     }

x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/AbstractEnrichProcessor.java

@@ -90,7 +90,7 @@ public void execute(IngestDocument ingestDocument, BiConsumer<IngestDocument, Ex
                 // If the index is empty, return the unchanged document
                 // If the enrich key does not exist in the index, throw an error
                 // If no documents match the key, return the unchanged document
-                if (searchHits.size() < 1) {
+                if (searchHits.isEmpty()) {
                     handler.accept(ingestDocument, null);
                     return;
                 }

x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/EnrichCache.java

@@ -35,12 +35,12 @@
 /**
  * A simple cache for enrich that uses {@link Cache}. There is one instance of this cache and
  * multiple enrich processors with different policies will use this cache.
- *
+ * <p>
  * The key of the cache is based on the search request and the enrich index that will be used.
  * Search requests that enrich generates target the alias for an enrich policy, this class
  * resolves the alias to the actual enrich index and uses that for the cache key. This way
  * no stale entries will be returned if a policy execution happens and a new enrich index is created.
- *
+ * <p>
  * There is no cleanup mechanism of stale entries in case a new enrich index is created
  * as part of a policy execution. This shouldn't be needed as cache entries for prior enrich
  * indices will be eventually evicted, because these entries will not end up being used. The

x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/GeoMatchProcessor.java

@@ -40,7 +40,7 @@ public final class GeoMatchProcessor extends AbstractEnrichProcessor {
     ) {
         super(tag, description, searchRunner, policyName, field, targetField, ignoreMissing, overrideEnabled, matchField, maxMatches);
         this.shapeRelation = shapeRelation;
-        parser = new GeometryParser(orientation.getAsBoolean(), true, true);
+        this.parser = new GeometryParser(orientation.getAsBoolean(), true, true);
     }
 
     @Override
@@ -50,8 +50,4 @@ public QueryBuilder getQueryBuilder(Object fieldValue) {
         shapeQuery.relation(shapeRelation);
         return shapeQuery;
     }
-
-    public ShapeRelation getShapeRelation() {
-        return shapeRelation;
-    }
 }