iter

Author: jpountz

server/src/test/java/org/elasticsearch/index/mapper/DateFieldMapperTests.java

@@ -400,12 +400,12 @@ public void testMergeText() throws Exception {
         String mapping = XContentFactory.jsonBuilder().startObject().startObject("_doc")
                 .startObject("properties").startObject("date").field("type", "date").endObject()
                 .endObject().endObject().endObject().string();
-        DocumentMapper mapper = indexService.mapperService().parse("_doc", new CompressedXContent(mapping), false);
+        DocumentMapper mapper = indexService.mapperService().parse("_doc", new CompressedXContent(mapping));
 
         String mappingUpdate = XContentFactory.jsonBuilder().startObject().startObject("_doc")
                 .startObject("properties").startObject("date").field("type", "text").endObject()
                 .endObject().endObject().endObject().string();
-        DocumentMapper update = indexService.mapperService().parse("_doc", new CompressedXContent(mappingUpdate), false);
+        DocumentMapper update = indexService.mapperService().parse("_doc", new CompressedXContent(mappingUpdate));
 
         IllegalArgumentException e = expectThrows(IllegalArgumentException.class,
                 () -> mapper.merge(update.mapping()));

server/src/test/java/org/elasticsearch/index/mapper/MapperServiceTests.java

@@ -315,14 +315,4 @@ public void testForbidMultipleTypes() throws IOException {
         assertThat(e.getMessage(), Matchers.startsWith("Rejecting mapping update to [test] as the final mapping would have more than 1 type: "));
     }
 
-<<<<<<< 700d9ecc953fa30df0d12d086f0e9d9322446459
-    public void testDefaultMappingIsDeprecated() throws IOException {
-        String mapping = XContentFactory.jsonBuilder().startObject().startObject("_default_").endObject().endObject().string();
-        MapperService mapperService = createIndex("test").mapperService();
-        mapperService.merge("_default_", new CompressedXContent(mapping), MergeReason.MAPPING_UPDATE);
-        assertWarnings("[_default_] mapping is deprecated since it is not useful anymore now that indexes " +
-                "cannot have more than one type");
-    }
-=======
->>>>>>> Remove the `_default_` mapping.
 }

server/src/test/java/org/elasticsearch/index/mapper/MultiFieldCopyToMapperTests.java

@@ -39,7 +39,7 @@ public void testExceptionForCopyToInMultiFields() throws IOException {
         // first check that for newer versions we throw exception if copy_to is found withing multi field
         MapperService mapperService = MapperTestUtils.newMapperService(xContentRegistry(), createTempDir(), Settings.EMPTY, "test");
         try {
-            mapperService.parse("type", new CompressedXContent(mapping.string()), true);
+            mapperService.parse("type", new CompressedXContent(mapping.string()));
             fail("Parsing should throw an exception because the mapping contains a copy_to in a multi field");
         } catch (MapperParsingException e) {
             assertThat(e.getMessage(), equalTo("copy_to in multi fields is not allowed. Found the copy_to in field [c] which is within a multi field."));