github-mirrors/elasticsearch
1
0
Fork 0
mirror of https://github.com/elastic/elasticsearch.git synced 2025-04-24 15:17:30 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream-main/main' into merge-main-22-01-25T12

Browse source
This commit is contained in:
Simon Cooper 2025-01-22 12:20:31 +00:00
commit 569c1fc1cd
260 changed files with 399 additions and 2274 deletions
Download patch file Download diff file Expand all files Collapse all files

9
x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/EnterpriseSearchUsageTransportAction.java
View file

@ -72,14 +72,7 @@ public class EnterpriseSearchUsageTransportAction extends XPackUsageFeatureTrans
XPackLicenseState licenseState,
Client client
) {
super(
XPackUsageFeatureAction.ENTERPRISE_SEARCH.name(),
transportService,
clusterService,
threadPool,
actionFilters,
indexNameExpressionResolver
);
super(XPackUsageFeatureAction.ENTERPRISE_SEARCH.name(), transportService, clusterService, threadPool, actionFilters);
this.licenseState = licenseState;
this.clientWithOrigin = new OriginSettingClient(client, ENT_SEARCH_ORIGIN);
this.indicesAdminClient = clientWithOrigin.admin().indices();

1
x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/analytics/action/TransportDeleteAnalyticsCollectionAction.java
View file

@ -44,7 +44,6 @@ public class TransportDeleteAnalyticsCollectionAction extends AcknowledgedTransp
threadPool,
actionFilters,
DeleteAnalyticsCollectionAction.Request::new,
indexNameExpressionResolver,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);
this.analyticsCollectionService = analyticsCollectionService;

1
x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/analytics/action/TransportGetAnalyticsCollectionAction.java
View file

@ -43,7 +43,6 @@ public class TransportGetAnalyticsCollectionAction extends TransportMasterNodeRe
threadPool,
actionFilters,
GetAnalyticsCollectionAction.Request::new,
indexNameExpressionResolver,
GetAnalyticsCollectionAction.Response::new,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);

1
x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/analytics/action/TransportPutAnalyticsCollectionAction.java
View file

@ -44,7 +44,6 @@ public class TransportPutAnalyticsCollectionAction extends TransportMasterNodeAc
threadPool,
actionFilters,
PutAnalyticsCollectionAction.Request::new,
indexNameExpressionResolver,
PutAnalyticsCollectionAction.Response::new,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);