add assertion DefaultIndicesAndAliasesResolver that PutMapping special case holds

Original commit: elastic/x-pack-elasticsearch@417123150a
This commit is contained in:
Simon Willnauer 2016-03-14 20:51:29 +01:00
parent 7d377a5b7f
commit 67efe608d1

View File

@ -5,6 +5,7 @@
*/
package org.elasticsearch.shield.authz.indicesresolver;
import org.apache.lucene.util.ArrayUtil;
import org.elasticsearch.action.AliasesRequest;
import org.elasticsearch.action.CompositeIndicesRequest;
import org.elasticsearch.action.IndicesRequest;
@ -78,6 +79,8 @@ public class DefaultIndicesAndAliasesResolver implements IndicesAndAliasesResolv
* the list of indices in there, if we do so it will result in an invalid request and the update will fail.
*/
indices = Collections.singleton(((PutMappingRequest) indicesRequest).getConcreteIndex().getName());
assert indicesRequest.indices() == null || indicesRequest.indices().length == 0
: "indices are: " + Arrays.toString(indicesRequest.indices()); // Arrays.toString() can handle null values - all good
} else {
if (indicesRequest.indicesOptions().expandWildcardsOpen() || indicesRequest.indicesOptions().expandWildcardsClosed()) {
if (indicesRequest instanceof IndicesRequest.Replaceable) {