Undo

Author: n1v0lg

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/role/PutRoleRequestBuilder.java

@@ -14,7 +14,6 @@
 import org.elasticsearch.xpack.core.security.authz.RoleDescriptor;
 
 import java.io.IOException;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -80,19 +79,6 @@ public PutRoleRequestBuilder addIndices(
         return this;
     }
 
-    public PutRoleRequestBuilder addIndices(
-        String[] indices,
-        String[] privileges,
-        String[] grantedFields,
-        String[] deniedFields,
-        @Nullable BytesReference query,
-        boolean allowRestrictedIndices,
-        List<String> selectors
-    ) {
-        request.addIndex(indices, privileges, grantedFields, deniedFields, query, allowRestrictedIndices);
-        return this;
-    }
-
     public PutRoleRequestBuilder metadata(Map<String, Object> metadata) {
         request.metadata(metadata);
         return this;

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/RoleDescriptor.java

@@ -12,7 +12,6 @@
 import org.elasticsearch.ElasticsearchSecurityException;
 import org.elasticsearch.TransportVersion;
 import org.elasticsearch.TransportVersions;
-import org.elasticsearch.action.support.IndexComponentSelector;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.ValidationException;
 import org.elasticsearch.common.bytes.BytesArray;
@@ -1335,7 +1334,6 @@ public RemoteIndicesPrivileges build() {
      */
     public static class IndicesPrivileges implements ToXContentObject, Writeable, Comparable<IndicesPrivileges> {
 
-        private static final List<String> DEFAULT_SELECTORS = List.of(IndexComponentSelector.DATA.getKey());
         private static final IndicesPrivileges[] NONE = new IndicesPrivileges[0];
 
         private String[] indices;
@@ -1430,7 +1428,6 @@ public boolean hasGrantedFields() {
 
         @Override
         public String toString() {
-            // TODO selectors
             StringBuilder sb = new StringBuilder("IndicesPrivileges[");
             sb.append("indices=[").append(Strings.arrayToCommaDelimitedString(indices));
             sb.append("], allowRestrictedIndices=[").append(allowRestrictedIndices);
@@ -1881,7 +1878,6 @@ public interface Fields {
         ParseField APPLICATIONS = new ParseField("applications");
         ParseField RUN_AS = new ParseField("run_as");
         ParseField NAMES = new ParseField("names");
-        ParseField SELECTORS = new ParseField("selectors");
         ParseField ALLOW_RESTRICTED_INDICES = new ParseField("allow_restricted_indices");
         ParseField RESOURCES = new ParseField("resources");
         ParseField QUERY = new ParseField("query");