From 66f96a46663fd6a5b555a6c7ca74260371a832a0 Mon Sep 17 00:00:00 2001 From: Lee Hinman Date: Tue, 10 Jan 2017 10:39:53 -0700 Subject: [PATCH] Don't add shard-specific versions of index/delete to isComposite Original commit: elastic/x-pack-elasticsearch@3777e9db8b0ed3fa734abb92f34c0ce4013bea07 --- .../xpack/security/authz/AuthorizationService.java | 9 --------- 1 file changed, 9 deletions(-) diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/AuthorizationService.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/AuthorizationService.java index 375018d5fe3..30b0c5cf527 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/AuthorizationService.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/AuthorizationService.java @@ -309,19 +309,10 @@ public class AuthorizationService extends AbstractComponent { } } - private static String IndexActionSubRequestPrimary = IndexAction.NAME + "[p]"; - private static String IndexActionSubRequestReplica = IndexAction.NAME + "[r]"; - private static String DeleteActionSubRequestPrimary = DeleteAction.NAME + "[p]"; - private static String DeleteActionSubRequestReplica = DeleteAction.NAME + "[r]"; - private static boolean isCompositeAction(String action) { return action.equals(BulkAction.NAME) || action.equals(IndexAction.NAME) || action.equals(DeleteAction.NAME) || - action.equals(IndexActionSubRequestPrimary) || - action.equals(IndexActionSubRequestReplica) || - action.equals(DeleteActionSubRequestPrimary) || - action.equals(DeleteActionSubRequestReplica) || action.equals(MultiGetAction.NAME) || action.equals(MultiTermVectorsAction.NAME) || action.equals(MultiSearchAction.NAME) ||