Followup for elastic/elasticsearch#25885
Original commit: elastic/x-pack-elasticsearch@0397e68efd
This commit is contained in:
parent
be109b1538
commit
3914d66cea
|
@ -530,7 +530,7 @@ public class Security implements ActionPlugin, IngestPlugin, NetworkPlugin {
|
||||||
() -> {
|
() -> {
|
||||||
throw new IllegalArgumentException("permission filters are not allowed to use the current timestamp");
|
throw new IllegalArgumentException("permission filters are not allowed to use the current timestamp");
|
||||||
|
|
||||||
}),
|
}, null),
|
||||||
indexService.cache().bitsetFilterCache(),
|
indexService.cache().bitsetFilterCache(),
|
||||||
indexService.getThreadPool().getThreadContext(), licenseState,
|
indexService.getThreadPool().getThreadContext(), licenseState,
|
||||||
indexService.getScriptService()));
|
indexService.getScriptService()));
|
||||||
|
|
|
@ -72,7 +72,7 @@ public class SecurityIndexSearcherWrapperIntegrationTests extends ESTestCase {
|
||||||
when(client.settings()).thenReturn(Settings.EMPTY);
|
when(client.settings()).thenReturn(Settings.EMPTY);
|
||||||
final long nowInMillis = randomNonNegativeLong();
|
final long nowInMillis = randomNonNegativeLong();
|
||||||
QueryShardContext realQueryShardContext = new QueryShardContext(shardId.id(), indexSettings, null, null, mapperService, null,
|
QueryShardContext realQueryShardContext = new QueryShardContext(shardId.id(), indexSettings, null, null, mapperService, null,
|
||||||
null, xContentRegistry(), client, null, () -> nowInMillis);
|
null, xContentRegistry(), client, null, () -> nowInMillis, null);
|
||||||
QueryShardContext queryShardContext = spy(realQueryShardContext);
|
QueryShardContext queryShardContext = spy(realQueryShardContext);
|
||||||
IndexSettings settings = IndexSettingsModule.newIndexSettings("_index", Settings.EMPTY);
|
IndexSettings settings = IndexSettingsModule.newIndexSettings("_index", Settings.EMPTY);
|
||||||
BitsetFilterCache bitsetFilterCache = new BitsetFilterCache(settings, new BitsetFilterCache.Listener() {
|
BitsetFilterCache bitsetFilterCache = new BitsetFilterCache(settings, new BitsetFilterCache.Listener() {
|
||||||
|
|
Loading…
Reference in New Issue