honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Followup API change for elastic/elasticsearchelastic/elasticsearch#21089 

Original commit: elastic/x-pack-elasticsearch@5d9b2fe0c8
This commit is contained in:
Simon Willnauer 2016-10-24 14:06:13 +02:00
parent 47079cf5d1
commit 51b871f344
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
elasticsearch/src/main/java/org/elasticsearch/xpack/security/Security.java
View File

@ -684,10 +684,10 @@ public class Security implements ActionPlugin, IngestPlugin, NetworkPlugin {
}
return Collections.singletonList(new TransportInterceptor() {
@Override
public <T extends TransportRequest> TransportRequestHandler<T> interceptHandler(String action,
public <T extends TransportRequest> TransportRequestHandler<T> interceptHandler(String action, String executor,
TransportRequestHandler<T> actualHandler) {
assert securityIntercepter.get() != null;
return securityIntercepter.get().interceptHandler(action, actualHandler);
return securityIntercepter.get().interceptHandler(action, executor, actualHandler);
}
@Override

2
elasticsearch/src/main/java/org/elasticsearch/xpack/security/transport/SecurityServerTransportInterceptor.java
View File

@ -98,7 +98,7 @@ public class SecurityServerTransportInterceptor implements TransportInterceptor
}
@Override
public <T extends TransportRequest> TransportRequestHandler<T> interceptHandler(String action,
public <T extends TransportRequest> TransportRequestHandler<T> interceptHandler(String action, String executor,
TransportRequestHandler<T> actualHandler) {
return new ProfileSecuredRequestHandler<>(action, actualHandler, profileFilters,
licenseState, threadPool.getThreadContext());

4
elasticsearch/src/test/java/org/elasticsearch/xpack/security/transport/TransportFilterTests.java
View File

@ -308,9 +308,9 @@ public class TransportFilterTests extends ESIntegTestCase {
public List<TransportInterceptor> getTransportInterceptors(NamedWriteableRegistry namedWriteableRegistry) {
return Collections.singletonList(new TransportInterceptor() {
@Override
public <T extends TransportRequest> TransportRequestHandler<T> interceptHandler(String action,
public <T extends TransportRequest> TransportRequestHandler<T> interceptHandler(String action, String executor,
TransportRequestHandler<T> actualHandler) {
return interceptor.interceptHandler(action, actualHandler);
return interceptor.interceptHandler(action, executor, actualHandler);
}
@Override