Remove doParse() method

Author: csoulios

modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/RankFeatureMetaFieldMapper.java

@@ -65,11 +65,6 @@ private RankFeatureMetaFieldMapper() {
         super(RankFeatureMetaFieldType.INSTANCE);
     }
 
-    @Override
-    protected void parseCreateField(ParseContext context) {
-        throw new AssertionError("Should never be called");
-    }
-
     @Override
     protected String contentType() {
         return CONTENT_TYPE;

server/src/main/java/org/elasticsearch/index/mapper/MetadataFieldMapper.java

@@ -153,29 +153,12 @@ public final XContentBuilder toXContent(XContentBuilder builder, Params params)
         return builder.endObject();
     }
 
-    /*
-     * By default metadata fields cannot be set through the document source and parse() method
-     * throws an exception. To enable a metadata field to parse the document source, this
-     * method must be overridden and doParse() should be called.
-     */
     @Override
-    public void parse(ParseContext context) throws IOException {
+    protected void parseCreateField(ParseContext context) throws IOException {
         throw new MapperParsingException("Field [" + name() + "] is a metadata field and cannot be added inside"
             + " a document. Use the index API request parameters.");
     }
 
-    /**
-     * Do the actual parsing of the field by calling {@link FieldMapper#parse(ParseContext)}
-     */
-    protected void doParse(ParseContext context) throws IOException {
-        super.parse(context);
-    }
-
-    @Override
-    protected void parseCreateField(ParseContext context) throws IOException {
-        // do nothing
-    }
-
     /**
      * Called before {@link FieldMapper#parse(ParseContext)} on the {@link RootObjectMapper}.
      */

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

@@ -939,8 +939,8 @@ public void testDocumentContainsMetadataField() throws Exception {
         DocumentMapper mapper = createDocumentMapper(mapping(b -> {}));
         MapperParsingException e = expectThrows(MapperParsingException.class, () ->
             mapper.parse(source(b -> b.field("_field_names", 0))));
-        assertTrue(e.getMessage(),
-            e.getMessage().contains("Field [_field_names] is a metadata field and cannot be added inside a document."));
+        assertTrue(e.getCause().getMessage(),
+            e.getCause().getMessage().contains("Field [_field_names] is a metadata field and cannot be added inside a document."));
 
         mapper.parse(source(b -> b.field("foo._field_names", 0))); // parses without error
     }

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

@@ -59,7 +59,8 @@ public void testIncludeInObjectNotAllowed() throws Exception {
                 .startObject().field("_id", "1").endObject()), XContentType.JSON));
             fail("Expected failure to parse metadata field");
         } catch (MapperParsingException e) {
-            assertTrue(e.getMessage(), e.getMessage().contains("Field [_id] is a metadata field and cannot be added inside a document"));
+            assertTrue(e.getCause().getMessage(),
+                e.getCause().getMessage().contains("Field [_id] is a metadata field and cannot be added inside a document"));
         }
     }
 

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

@@ -49,11 +49,6 @@ protected MockMetadataMapper() {
             super(new KeywordFieldMapper.KeywordFieldType(FIELD_NAME));
         }
 
-        @Override
-        public void parse(ParseContext context) throws IOException {
-           doParse(context);
-        }
-
         @Override
         protected void parseCreateField(ParseContext context) throws IOException {
             if (context.parser().currentToken() == XContentParser.Token.VALUE_STRING) {

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

@@ -58,7 +58,7 @@ public void testIncludeInObjectNotAllowed() throws Exception {
                 .startObject().field("_routing", "foo").endObject()),XContentType.JSON));
             fail("Expected failure to parse metadata field");
         } catch (MapperParsingException e) {
-            assertThat(e.getMessage(), e.getMessage(),
+            assertThat(e.getCause().getMessage(), e.getCause().getMessage(),
                 containsString("Field [_routing] is a metadata field and cannot be added inside a document"));
         }
     }

x-pack/plugin/data-streams/src/main/java/org/elasticsearch/xpack/datastreams/mapper/DataStreamTimestampFieldMapper.java

@@ -171,12 +171,6 @@ public void doValidate(MappingLookup lookup) {
         }
     }
 
-    @Override
-    protected void parseCreateField(ParseContext context) throws IOException {
-        // Meta field doesn't create any fields, so this shouldn't happen.
-        throw new IllegalStateException(NAME + " field mapper cannot create fields");
-    }
-
     @Override
     public void postParse(ParseContext context) throws IOException {
         if (enabled == false) {