Merge revision 7fb6ca447a into multi-project

This commit is contained in:
Tim Vernum 2024-12-31 15:41:02 +11:00
commit 4ff691f066
794 changed files with 21606 additions and 4238 deletions

View file

@ -3,9 +3,9 @@ apply plugin: 'elasticsearch.internal-cluster-test'
apply plugin: 'elasticsearch.legacy-java-rest-test'
esplugin {
name 'x-pack-ent-search'
description 'Elasticsearch Expanded Pack Plugin - Enterprise Search'
classname 'org.elasticsearch.xpack.application.EnterpriseSearch'
name = 'x-pack-ent-search'
description = 'Elasticsearch Expanded Pack Plugin - Enterprise Search'
classname = 'org.elasticsearch.xpack.application.EnterpriseSearch'
extendedPlugins = ['x-pack-core']
}

View file

@ -34,7 +34,7 @@ public class DeleteAnalyticsCollectionAction {
public static class Request extends MasterNodeRequest<Request> implements ToXContentObject {
private final String collectionName;
public static ParseField COLLECTION_NAME_FIELD = new ParseField("collection_name");
public static final ParseField COLLECTION_NAME_FIELD = new ParseField("collection_name");
public Request(StreamInput in) throws IOException {
super(in);

View file

@ -35,7 +35,7 @@ public class GetAnalyticsCollectionAction {
public static class Request extends MasterNodeReadRequest<Request> implements ToXContentObject {
private final String[] names;
public static ParseField NAMES_FIELD = new ParseField("names");
public static final ParseField NAMES_FIELD = new ParseField("names");
public Request(TimeValue masterNodeTimeout, String[] names) {
super(masterNodeTimeout);

View file

@ -311,7 +311,7 @@ public class PostAnalyticsEventAction {
}
public static class Response extends ActionResponse implements ToXContentObject {
public static Response ACCEPTED = new Response(true);
public static final Response ACCEPTED = new Response(true);
public static Response readFromStreamInput(StreamInput in) throws IOException {
boolean accepted = in.readBoolean();

View file

@ -20,11 +20,11 @@ import static org.elasticsearch.common.Strings.requireNonBlank;
public class DocumentAnalyticsEventField {
public static ParseField DOCUMENT_FIELD = new ParseField("document");
public static final ParseField DOCUMENT_FIELD = new ParseField("document");
public static ParseField DOCUMENT_ID_FIELD = new ParseField("id");
public static final ParseField DOCUMENT_ID_FIELD = new ParseField("id");
public static ParseField DOCUMENT_INDEX_FIELD = new ParseField("index");
public static final ParseField DOCUMENT_INDEX_FIELD = new ParseField("index");
private static final ObjectParser<Map<String, String>, AnalyticsEvent.Context> PARSER = new ObjectParser<>(
DOCUMENT_FIELD.getPreferredName(),

View file

@ -17,13 +17,13 @@ import java.util.HashMap;
import java.util.Map;
public class PageAnalyticsEventField {
public static ParseField PAGE_FIELD = new ParseField("page");
public static final ParseField PAGE_FIELD = new ParseField("page");
public static ParseField PAGE_URL_FIELD = new ParseField("url");
public static final ParseField PAGE_URL_FIELD = new ParseField("url");
public static ParseField PAGE_TITLE_FIELD = new ParseField("title");
public static final ParseField PAGE_TITLE_FIELD = new ParseField("title");
public static ParseField PAGE_REFERRER_FIELD = new ParseField("referrer");
public static final ParseField PAGE_REFERRER_FIELD = new ParseField("referrer");
private static final ObjectParser<Map<String, String>, AnalyticsEvent.Context> PARSER = new ObjectParser<>(
PAGE_FIELD.getPreferredName(),

View file

@ -19,11 +19,11 @@ import java.util.Map;
public class PaginationAnalyticsEventField {
public static ParseField PAGINATION_FIELD = new ParseField("page");
public static final ParseField PAGINATION_FIELD = new ParseField("page");
public static ParseField CURRENT_PAGE_FIELD = new ParseField("current");
public static final ParseField CURRENT_PAGE_FIELD = new ParseField("current");
public static ParseField PAGE_SIZE_FIELD = new ParseField("size");
public static final ParseField PAGE_SIZE_FIELD = new ParseField("size");
private static final ObjectParser<Map<String, Integer>, AnalyticsEvent.Context> PARSER = new ObjectParser<>(
PAGINATION_FIELD.getPreferredName(),

View file

@ -21,13 +21,13 @@ import static org.elasticsearch.xpack.application.analytics.event.parser.field.S
import static org.elasticsearch.xpack.application.analytics.event.parser.field.SortOrderAnalyticsEventField.SORT_FIELD;
public class SearchAnalyticsEventField {
public static ParseField SEARCH_FIELD = new ParseField("search");
public static final ParseField SEARCH_FIELD = new ParseField("search");
public static ParseField SEARCH_QUERY_FIELD = new ParseField("query");
public static final ParseField SEARCH_QUERY_FIELD = new ParseField("query");
public static ParseField SEARCH_APPLICATION_FIELD = new ParseField("search_application");
public static final ParseField SEARCH_APPLICATION_FIELD = new ParseField("search_application");
public static ParseField SEARCH_RESULTS_FIELD = new ParseField("results");
public static final ParseField SEARCH_RESULTS_FIELD = new ParseField("results");
private static final ObjectParser<Map<String, Object>, AnalyticsEvent.Context> PARSER = new ObjectParser<>(
SEARCH_FIELD.getPreferredName(),

View file

@ -19,7 +19,7 @@ import java.util.List;
import java.util.Map;
public class SearchFiltersAnalyticsEventField {
public static ParseField SEARCH_FILTERS_FIELD = new ParseField("filters");
public static final ParseField SEARCH_FILTERS_FIELD = new ParseField("filters");
private static final ObjectParser<Map<String, List<String>>, AnalyticsEvent.Context> PARSER = new ObjectParser<>(
SEARCH_FILTERS_FIELD.getPreferredName(),

View file

@ -20,9 +20,9 @@ import static org.elasticsearch.xpack.application.analytics.event.parser.field.D
import static org.elasticsearch.xpack.application.analytics.event.parser.field.PageAnalyticsEventField.PAGE_FIELD;
public class SearchResultAnalyticsEventField {
public static ParseField SEARCH_RESULTS_TOTAL_FIELD = new ParseField("total_results");
public static final ParseField SEARCH_RESULTS_TOTAL_FIELD = new ParseField("total_results");
public static ParseField SEARCH_RESULT_ITEMS_FIELD = new ParseField("items");
public static final ParseField SEARCH_RESULT_ITEMS_FIELD = new ParseField("items");
private static final ObjectParser<Map<String, Object>, AnalyticsEvent.Context> PARSER = new ObjectParser<>(
"search_results",

View file

@ -21,9 +21,9 @@ import java.util.Map;
import static org.elasticsearch.common.Strings.requireNonBlank;
public class SessionAnalyticsEventField {
public static ParseField SESSION_FIELD = new ParseField("session");
public static final ParseField SESSION_FIELD = new ParseField("session");
public static ParseField SESSION_ID_FIELD = new ParseField("id");
public static final ParseField SESSION_ID_FIELD = new ParseField("id");
public static final ParseField CLIENT_ADDRESS_FIELD = new ParseField("ip");

View file

@ -20,11 +20,11 @@ import static org.elasticsearch.common.Strings.requireNonBlank;
public class SortOrderAnalyticsEventField {
public static ParseField SORT_FIELD = new ParseField("sort");
public static final ParseField SORT_FIELD = new ParseField("sort");
public static ParseField SORT_ORDER_NAME_FIELD = new ParseField("name");
public static final ParseField SORT_ORDER_NAME_FIELD = new ParseField("name");
public static ParseField SORT_ORDER_DIRECTION_FIELD = new ParseField("direction");
public static final ParseField SORT_ORDER_DIRECTION_FIELD = new ParseField("direction");
private static final ObjectParser<Map<String, String>, AnalyticsEvent.Context> PARSER = new ObjectParser<>(
SORT_FIELD.getPreferredName(),

View file

@ -20,9 +20,9 @@ import java.util.Map;
import static org.elasticsearch.common.Strings.requireNonBlank;
public class UserAnalyticsEventField {
public static ParseField USER_FIELD = new ParseField("user");
public static final ParseField USER_FIELD = new ParseField("user");
public static ParseField USER_ID_FIELD = new ParseField("id");
public static final ParseField USER_ID_FIELD = new ParseField("id");
private static final ObjectParser<Map<String, String>, AnalyticsEvent.Context> PARSER = new ObjectParser<>(
USER_FIELD.getPreferredName(),

View file

@ -35,7 +35,7 @@ public class DeleteSearchApplicationAction {
public static class Request extends ActionRequest implements ToXContentObject {
private final String name;
public static ParseField NAME_FIELD = new ParseField("name");
public static final ParseField NAME_FIELD = new ParseField("name");
public Request(StreamInput in) throws IOException {
super(in);

View file

@ -101,8 +101,8 @@ public class PutSearchApplicationAction {
return Objects.hash(searchApp, create);
}
public static ParseField SEARCH_APPLICATION = new ParseField("searchApp");
public static ParseField CREATE = new ParseField("create");
public static final ParseField SEARCH_APPLICATION = new ParseField("searchApp");
public static final ParseField CREATE = new ParseField("create");
@SuppressWarnings("unchecked")
private static final ConstructingObjectParser<Request, String> PARSER = new ConstructingObjectParser<>(