diff --git a/server/src/main/java/org/elasticsearch/rest/DeprecationRestHandler.java b/server/src/main/java/org/elasticsearch/rest/DeprecationRestHandler.java index cb630ca50365e..80891a97130b6 100644 --- a/server/src/main/java/org/elasticsearch/rest/DeprecationRestHandler.java +++ b/server/src/main/java/org/elasticsearch/rest/DeprecationRestHandler.java @@ -20,7 +20,7 @@ * {@code DeprecationRestHandler} provides a proxy for any existing {@link RestHandler} so that usage of the handler can be * logged using the {@link DeprecationLogger}. */ -public class DeprecationRestHandler extends AbstractDelegatingRestHandler implements RestHandler { +public class DeprecationRestHandler extends FilteringRestHandler implements RestHandler { public static final String DEPRECATED_ROUTE_KEY = "deprecated_route"; diff --git a/server/src/main/java/org/elasticsearch/rest/AbstractDelegatingRestHandler.java b/server/src/main/java/org/elasticsearch/rest/FilteringRestHandler.java similarity index 90% rename from server/src/main/java/org/elasticsearch/rest/AbstractDelegatingRestHandler.java rename to server/src/main/java/org/elasticsearch/rest/FilteringRestHandler.java index 769cb6dd97ba8..4407f59f39813 100644 --- a/server/src/main/java/org/elasticsearch/rest/AbstractDelegatingRestHandler.java +++ b/server/src/main/java/org/elasticsearch/rest/FilteringRestHandler.java @@ -11,10 +11,10 @@ import java.util.List; import java.util.Objects; -public abstract class AbstractDelegatingRestHandler implements RestHandler { +public abstract class FilteringRestHandler implements RestHandler { private final RestHandler delegate; - protected AbstractDelegatingRestHandler(RestHandler delegate) { + protected FilteringRestHandler(RestHandler delegate) { this.delegate = Objects.requireNonNull(delegate); } @@ -56,5 +56,4 @@ public boolean supportsContentStream() { public boolean mediaTypesValid(RestRequest request) { return delegate.mediaTypesValid(request); } - } diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/SecurityRestFilter.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/SecurityRestFilter.java index 1ff1b242a6167..0b792eef86152 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/SecurityRestFilter.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/SecurityRestFilter.java @@ -13,7 +13,7 @@ import org.elasticsearch.action.ActionListener; import org.elasticsearch.client.internal.node.NodeClient; import org.elasticsearch.common.util.concurrent.ThreadContext; -import org.elasticsearch.rest.AbstractDelegatingRestHandler; +import org.elasticsearch.rest.FilteringRestHandler; import org.elasticsearch.rest.RestChannel; import org.elasticsearch.rest.RestHandler; import org.elasticsearch.rest.RestRequest; @@ -27,7 +27,7 @@ import static org.elasticsearch.core.Strings.format; -public class SecurityRestFilter extends AbstractDelegatingRestHandler implements RestHandler { +public class SecurityRestFilter extends FilteringRestHandler implements RestHandler { private static final Logger logger = LogManager.getLogger(SecurityRestFilter.class);