From fedfdde2163c8934c3939f45d674856922eba693 Mon Sep 17 00:00:00 2001 From: Adrien Grand Date: Tue, 19 Jan 2016 09:32:52 +0100 Subject: [PATCH] Fix compilation after elastic/elasticsearchelastic/elasticsearch#16059. Original commit: elastic/x-pack-elasticsearch@60e083a739ccf23091a040fca5ea06959bdf37ac --- .../ShieldIndexSearcherWrapperUnitTests.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/elasticsearch/x-pack/shield/src/test/java/org/elasticsearch/shield/authz/accesscontrol/ShieldIndexSearcherWrapperUnitTests.java b/elasticsearch/x-pack/shield/src/test/java/org/elasticsearch/shield/authz/accesscontrol/ShieldIndexSearcherWrapperUnitTests.java index 90d9e4ff6c8..9d5bdc8dec3 100644 --- a/elasticsearch/x-pack/shield/src/test/java/org/elasticsearch/shield/authz/accesscontrol/ShieldIndexSearcherWrapperUnitTests.java +++ b/elasticsearch/x-pack/shield/src/test/java/org/elasticsearch/shield/authz/accesscontrol/ShieldIndexSearcherWrapperUnitTests.java @@ -121,7 +121,7 @@ public class ShieldIndexSearcherWrapperUnitTests extends ESTestCase { .startObject("properties") .endObject() .endObject().endObject(); - mapperService.merge("type", new CompressedXContent(mappingSource.string()), false, false); + mapperService.merge("type", new CompressedXContent(mappingSource.string()), MapperService.MergeReason.MAPPING_UPDATE, false); IndicesAccessControl.IndexAccessControl indexAccessControl = new IndicesAccessControl.IndexAccessControl(true, emptySet(), null); request.putInContext(InternalAuthorizationService.INDICES_PERMISSIONS_KEY, new IndicesAccessControl(true, singletonMap("_index", indexAccessControl))); @@ -164,7 +164,7 @@ public class ShieldIndexSearcherWrapperUnitTests extends ESTestCase { .startObject("field2_b").field("type", "string").endObject() .startObject("field2_c").field("type", "string").endObject() .endObject().endObject().endObject(); - mapperService.merge("type", new CompressedXContent(mappingSource.string()), false, false); + mapperService.merge("type", new CompressedXContent(mappingSource.string()), MapperService.MergeReason.MAPPING_UPDATE, false); assertResolvedFields("field1*", "field1_a", "field1_b", "field1_c"); assertResolvedFields("field2*", "field2_a", "field2_b", "field2_c"); @@ -194,7 +194,7 @@ public class ShieldIndexSearcherWrapperUnitTests extends ESTestCase { .endObject() .endObject() .endObject().endObject().endObject(); - mapperService.merge("type", new CompressedXContent(mappingSource.string()), false, false); + mapperService.merge("type", new CompressedXContent(mappingSource.string()), MapperService.MergeReason.MAPPING_UPDATE, false); assertResolvedFields("foo.bar", "foo.bar"); assertResolvedFields("bar.baz", "bar.baz"); @@ -208,7 +208,7 @@ public class ShieldIndexSearcherWrapperUnitTests extends ESTestCase { .startObject("field").field("type", "string").endObject() .endObject() .endObject().endObject(); - mapperService.merge("parent1", new CompressedXContent(mappingSource.string()), false, false); + mapperService.merge("parent1", new CompressedXContent(mappingSource.string()), MapperService.MergeReason.MAPPING_UPDATE, false); mappingSource = jsonBuilder().startObject().startObject("child1") .startObject("properties") .startObject("field").field("type", "string").endObject() @@ -217,7 +217,7 @@ public class ShieldIndexSearcherWrapperUnitTests extends ESTestCase { .field("type", "parent1") .endObject() .endObject().endObject(); - mapperService.merge("child1", new CompressedXContent(mappingSource.string()), false, false); + mapperService.merge("child1", new CompressedXContent(mappingSource.string()), MapperService.MergeReason.MAPPING_UPDATE, false); mappingSource = jsonBuilder().startObject().startObject("child2") .startObject("properties") .startObject("field").field("type", "string").endObject() @@ -226,13 +226,13 @@ public class ShieldIndexSearcherWrapperUnitTests extends ESTestCase { .field("type", "parent1") .endObject() .endObject().endObject(); - mapperService.merge("child2", new CompressedXContent(mappingSource.string()), false, false); + mapperService.merge("child2", new CompressedXContent(mappingSource.string()), MapperService.MergeReason.MAPPING_UPDATE, false); mappingSource = jsonBuilder().startObject().startObject("parent2") .startObject("properties") .startObject("field").field("type", "string").endObject() .endObject() .endObject().endObject(); - mapperService.merge("parent2", new CompressedXContent(mappingSource.string()), false, false); + mapperService.merge("parent2", new CompressedXContent(mappingSource.string()), MapperService.MergeReason.MAPPING_UPDATE, false); mappingSource = jsonBuilder().startObject().startObject("child3") .startObject("properties") .startObject("field").field("type", "string").endObject() @@ -241,7 +241,7 @@ public class ShieldIndexSearcherWrapperUnitTests extends ESTestCase { .field("type", "parent2") .endObject() .endObject().endObject(); - mapperService.merge("child3", new CompressedXContent(mappingSource.string()), false, false); + mapperService.merge("child3", new CompressedXContent(mappingSource.string()), MapperService.MergeReason.MAPPING_UPDATE, false); assertResolvedFields("field1", "field1", ParentFieldMapper.joinField("parent1"), ParentFieldMapper.joinField("parent2")); }