From 51b871f344d865a294967b85a0fb3cdff1a261f5 Mon Sep 17 00:00:00 2001 From: Simon Willnauer Date: Mon, 24 Oct 2016 14:06:13 +0200 Subject: [PATCH] Followup API change for elastic/elasticsearchelastic/elasticsearch#21089 Original commit: elastic/x-pack-elasticsearch@5d9b2fe0c8f297c5c94643bafae216966bd9a977 --- .../main/java/org/elasticsearch/xpack/security/Security.java | 4 ++-- .../transport/SecurityServerTransportInterceptor.java | 2 +- .../xpack/security/transport/TransportFilterTests.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/Security.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/Security.java index eb5ed354ec8..c36cc323c7d 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/Security.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/Security.java @@ -684,10 +684,10 @@ public class Security implements ActionPlugin, IngestPlugin, NetworkPlugin { } return Collections.singletonList(new TransportInterceptor() { @Override - public TransportRequestHandler interceptHandler(String action, + public TransportRequestHandler interceptHandler(String action, String executor, TransportRequestHandler actualHandler) { assert securityIntercepter.get() != null; - return securityIntercepter.get().interceptHandler(action, actualHandler); + return securityIntercepter.get().interceptHandler(action, executor, actualHandler); } @Override diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/transport/SecurityServerTransportInterceptor.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/transport/SecurityServerTransportInterceptor.java index 983086ec76a..bd22dc413dd 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/transport/SecurityServerTransportInterceptor.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/transport/SecurityServerTransportInterceptor.java @@ -98,7 +98,7 @@ public class SecurityServerTransportInterceptor implements TransportInterceptor } @Override - public TransportRequestHandler interceptHandler(String action, + public TransportRequestHandler interceptHandler(String action, String executor, TransportRequestHandler actualHandler) { return new ProfileSecuredRequestHandler<>(action, actualHandler, profileFilters, licenseState, threadPool.getThreadContext()); diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/security/transport/TransportFilterTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/security/transport/TransportFilterTests.java index 90c593f83e7..24cd9d22901 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/security/transport/TransportFilterTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/security/transport/TransportFilterTests.java @@ -308,9 +308,9 @@ public class TransportFilterTests extends ESIntegTestCase { public List getTransportInterceptors(NamedWriteableRegistry namedWriteableRegistry) { return Collections.singletonList(new TransportInterceptor() { @Override - public TransportRequestHandler interceptHandler(String action, + public TransportRequestHandler interceptHandler(String action, String executor, TransportRequestHandler actualHandler) { - return interceptor.interceptHandler(action, actualHandler); + return interceptor.interceptHandler(action, executor, actualHandler); } @Override