Move logic for parsing GetResult to test module (#124868)

This logic is now test only, no need to have it add to the production
code size.

server/src/main/java/org/elasticsearch/index/get/GetResult.java

@@ -26,7 +26,6 @@ import org.elasticsearch.index.mapper.SourceFieldMapper;
 import org.elasticsearch.search.lookup.Source;
 import org.elasticsearch.xcontent.ToXContentObject;
 import org.elasticsearch.xcontent.XContentBuilder;
-import org.elasticsearch.xcontent.XContentParser;
 
 import java.io.IOException;
 import java.util.Collections;
@@ -36,7 +35,6 @@ import java.util.Map;
 import java.util.Objects;
 
 import static java.util.Collections.emptyMap;
-import static org.elasticsearch.common.xcontent.XContentParserUtils.ensureExpectedToken;
 import static org.elasticsearch.index.seqno.SequenceNumbers.UNASSIGNED_PRIMARY_TERM;
 import static org.elasticsearch.index.seqno.SequenceNumbers.UNASSIGNED_SEQ_NO;
 
@@ -44,11 +42,11 @@ public class GetResult implements Writeable, Iterable<DocumentField>, ToXContent
 
     public static final String _INDEX = "_index";
     public static final String _ID = "_id";
-    private static final String _VERSION = "_version";
-    private static final String _SEQ_NO = "_seq_no";
-    private static final String _PRIMARY_TERM = "_primary_term";
-    private static final String FOUND = "found";
-    private static final String FIELDS = "fields";
+    static final String _VERSION = "_version";
+    static final String _SEQ_NO = "_seq_no";
+    static final String _PRIMARY_TERM = "_primary_term";
+    static final String FOUND = "found";
+    static final String FIELDS = "fields";
 
     private final String index;
     private final String id;
@@ -286,77 +284,6 @@ public class GetResult implements Writeable, Iterable<DocumentField>, ToXContent
         return builder;
     }
 
-    public static GetResult fromXContentEmbedded(XContentParser parser) throws IOException {
-        XContentParser.Token token = parser.nextToken();
-        ensureExpectedToken(XContentParser.Token.FIELD_NAME, token, parser);
-        return fromXContentEmbedded(parser, null, null);
-    }
-
-    public static GetResult fromXContentEmbedded(XContentParser parser, String index, String id) throws IOException {
-        XContentParser.Token token = parser.currentToken();
-        ensureExpectedToken(XContentParser.Token.FIELD_NAME, token, parser);
-
-        String currentFieldName = parser.currentName();
-        long version = -1;
-        long seqNo = UNASSIGNED_SEQ_NO;
-        long primaryTerm = UNASSIGNED_PRIMARY_TERM;
-        Boolean found = null;
-        BytesReference source = null;
-        Map<String, DocumentField> documentFields = new HashMap<>();
-        Map<String, DocumentField> metaFields = new HashMap<>();
-        while ((token = parser.nextToken()) != XContentParser.Token.END_OBJECT) {
-            if (token == XContentParser.Token.FIELD_NAME) {
-                currentFieldName = parser.currentName();
-            } else if (token.isValue()) {
-                if (_INDEX.equals(currentFieldName)) {
-                    index = parser.text();
-                } else if (_ID.equals(currentFieldName)) {
-                    id = parser.text();
-                } else if (_VERSION.equals(currentFieldName)) {
-                    version = parser.longValue();
-                } else if (_SEQ_NO.equals(currentFieldName)) {
-                    seqNo = parser.longValue();
-                } else if (_PRIMARY_TERM.equals(currentFieldName)) {
-                    primaryTerm = parser.longValue();
-                } else if (FOUND.equals(currentFieldName)) {
-                    found = parser.booleanValue();
-                } else {
-                    metaFields.put(currentFieldName, new DocumentField(currentFieldName, Collections.singletonList(parser.objectText())));
-                }
-            } else if (token == XContentParser.Token.START_OBJECT) {
-                if (SourceFieldMapper.NAME.equals(currentFieldName)) {
-                    try (XContentBuilder builder = XContentBuilder.builder(parser.contentType().xContent())) {
-                        // the original document gets slightly modified: whitespaces or pretty printing are not preserved,
-                        // it all depends on the current builder settings
-                        builder.copyCurrentStructure(parser);
-                        source = BytesReference.bytes(builder);
-                    }
-                } else if (FIELDS.equals(currentFieldName)) {
-                    while (parser.nextToken() != XContentParser.Token.END_OBJECT) {
-                        DocumentField getField = DocumentField.fromXContent(parser);
-                        documentFields.put(getField.getName(), getField);
-                    }
-                } else {
-                    parser.skipChildren(); // skip potential inner objects for forward compatibility
-                }
-            } else if (token == XContentParser.Token.START_ARRAY) {
-                if (IgnoredFieldMapper.NAME.equals(currentFieldName) || IgnoredSourceFieldMapper.NAME.equals(currentFieldName)) {
-                    metaFields.put(currentFieldName, new DocumentField(currentFieldName, parser.list()));
-                } else {
-                    parser.skipChildren(); // skip potential inner arrays for forward compatibility
-                }
-            }
-        }
-        return new GetResult(index, id, seqNo, primaryTerm, version, found, source, documentFields, metaFields);
-    }
-
-    public static GetResult fromXContent(XContentParser parser) throws IOException {
-        XContentParser.Token token = parser.nextToken();
-        ensureExpectedToken(XContentParser.Token.START_OBJECT, token, parser);
-
-        return fromXContentEmbedded(parser);
-    }
-
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         out.writeString(index);

server/src/test/java/org/elasticsearch/action/explain/ExplainResponseTests.java

@@ -15,6 +15,7 @@ import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.document.DocumentField;
 import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.index.get.GetResult;
+import org.elasticsearch.index.get.GetResultTests;
 import org.elasticsearch.test.AbstractXContentSerializingTestCase;
 import org.elasticsearch.test.RandomObjects;
 import org.elasticsearch.xcontent.ConstructingObjectParser;
@@ -50,7 +51,7 @@ public class ExplainResponseTests extends AbstractXContentSerializingTestCase<Ex
         PARSER.declareObject(ConstructingObjectParser.optionalConstructorArg(), explanationParser, ExplainResponse.EXPLANATION);
         PARSER.declareObject(
             ConstructingObjectParser.optionalConstructorArg(),
-            (p, c) -> GetResult.fromXContentEmbedded(p),
+            (p, c) -> GetResultTests.parseInstanceFromEmbedded(p),
             ExplainResponse.GET
         );
     }

server/src/test/java/org/elasticsearch/action/get/GetResponseTests.java

@@ -17,6 +17,7 @@ import org.elasticsearch.common.document.DocumentField;
 import org.elasticsearch.common.xcontent.XContentHelper;
 import org.elasticsearch.core.Tuple;
 import org.elasticsearch.index.get.GetResult;
+import org.elasticsearch.index.get.GetResultTests;
 import org.elasticsearch.test.ESTestCase;
 import org.elasticsearch.xcontent.ToXContent;
 import org.elasticsearch.xcontent.XContentParser;
@@ -188,7 +189,7 @@ public class GetResponseTests extends ESTestCase {
     }
 
     private static GetResponse parseInstance(XContentParser parser) throws IOException {
-        GetResult getResult = GetResult.fromXContent(parser);
+        GetResult getResult = GetResultTests.parseInstance(parser);
 
         // At this stage we ensure that we parsed enough information to return
         // a valid GetResponse instance. If it's not the case, we throw an

server/src/test/java/org/elasticsearch/action/get/MultiGetResponseTests.java

@@ -12,6 +12,7 @@ import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.logging.DeprecationLogger;
 import org.elasticsearch.index.get.GetResult;
+import org.elasticsearch.index.get.GetResultTests;
 import org.elasticsearch.rest.action.document.RestMultiGetAction;
 import org.elasticsearch.test.ESTestCase;
 import org.elasticsearch.xcontent.ParseField;
@@ -129,7 +130,7 @@ public class MultiGetResponseTests extends ESTestCase {
                     if (MultiGetResponse.INDEX.match(currentFieldName, parser.getDeprecationHandler()) == false
                         && MultiGetResponse.ID.match(currentFieldName, parser.getDeprecationHandler()) == false
                         && ERROR.match(currentFieldName, parser.getDeprecationHandler()) == false) {
-                        getResult = GetResult.fromXContentEmbedded(parser, index, id);
+                        getResult = GetResultTests.parseInstanceFromEmbedded(parser, index, id);
                     }
                     break;
                 case VALUE_STRING:

server/src/test/java/org/elasticsearch/action/update/UpdateResponseTests.java

@@ -213,7 +213,7 @@ public class UpdateResponseTests extends ESTestCase {
 
         if (UpdateResponse.GET.equals(currentFieldName)) {
             if (token == XContentParser.Token.START_OBJECT) {
-                context.setGetResult(GetResult.fromXContentEmbedded(parser));
+                context.setGetResult(GetResultTests.parseInstanceFromEmbedded(parser));
             }
         } else {
             BulkItemResponseTests.parseInnerToXContent(parser, context);

server/src/test/java/org/elasticsearch/index/get/GetResultTests.java

@@ -18,6 +18,8 @@ import org.elasticsearch.common.util.Maps;
 import org.elasticsearch.common.xcontent.XContentHelper;
 import org.elasticsearch.core.Tuple;
 import org.elasticsearch.index.mapper.IdFieldMapper;
+import org.elasticsearch.index.mapper.IgnoredFieldMapper;
+import org.elasticsearch.index.mapper.IgnoredSourceFieldMapper;
 import org.elasticsearch.index.mapper.IndexFieldMapper;
 import org.elasticsearch.index.mapper.SeqNoFieldMapper;
 import org.elasticsearch.index.mapper.SourceFieldMapper;
@@ -25,6 +27,7 @@ import org.elasticsearch.index.mapper.VersionFieldMapper;
 import org.elasticsearch.test.ESTestCase;
 import org.elasticsearch.test.RandomObjects;
 import org.elasticsearch.xcontent.ToXContent;
+import org.elasticsearch.xcontent.XContentBuilder;
 import org.elasticsearch.xcontent.XContentParser;
 import org.elasticsearch.xcontent.XContentType;
 
@@ -49,6 +52,77 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertToXC
 
 public class GetResultTests extends ESTestCase {
 
+    public static GetResult parseInstance(XContentParser parser) throws IOException {
+        XContentParser.Token token = parser.nextToken();
+        ensureExpectedToken(XContentParser.Token.START_OBJECT, token, parser);
+
+        return parseInstanceFromEmbedded(parser);
+    }
+
+    public static GetResult parseInstanceFromEmbedded(XContentParser parser) throws IOException {
+        XContentParser.Token token = parser.nextToken();
+        ensureExpectedToken(XContentParser.Token.FIELD_NAME, token, parser);
+        return parseInstanceFromEmbedded(parser, null, null);
+    }
+
+    public static GetResult parseInstanceFromEmbedded(XContentParser parser, String index, String id) throws IOException {
+        XContentParser.Token token = parser.currentToken();
+        ensureExpectedToken(XContentParser.Token.FIELD_NAME, token, parser);
+
+        String currentFieldName = parser.currentName();
+        long version = -1;
+        long seqNo = UNASSIGNED_SEQ_NO;
+        long primaryTerm = UNASSIGNED_PRIMARY_TERM;
+        Boolean found = null;
+        BytesReference source = null;
+        Map<String, DocumentField> documentFields = new HashMap<>();
+        Map<String, DocumentField> metaFields = new HashMap<>();
+        while ((token = parser.nextToken()) != XContentParser.Token.END_OBJECT) {
+            if (token == XContentParser.Token.FIELD_NAME) {
+                currentFieldName = parser.currentName();
+            } else if (token.isValue()) {
+                if (GetResult._INDEX.equals(currentFieldName)) {
+                    index = parser.text();
+                } else if (GetResult._ID.equals(currentFieldName)) {
+                    id = parser.text();
+                } else if (GetResult._VERSION.equals(currentFieldName)) {
+                    version = parser.longValue();
+                } else if (GetResult._SEQ_NO.equals(currentFieldName)) {
+                    seqNo = parser.longValue();
+                } else if (GetResult._PRIMARY_TERM.equals(currentFieldName)) {
+                    primaryTerm = parser.longValue();
+                } else if (GetResult.FOUND.equals(currentFieldName)) {
+                    found = parser.booleanValue();
+                } else {
+                    metaFields.put(currentFieldName, new DocumentField(currentFieldName, singletonList(parser.objectText())));
+                }
+            } else if (token == XContentParser.Token.START_OBJECT) {
+                if (SourceFieldMapper.NAME.equals(currentFieldName)) {
+                    try (XContentBuilder builder = XContentBuilder.builder(parser.contentType().xContent())) {
+                        // the original document gets slightly modified: whitespaces or pretty printing are not preserved,
+                        // it all depends on the current builder settings
+                        builder.copyCurrentStructure(parser);
+                        source = BytesReference.bytes(builder);
+                    }
+                } else if (GetResult.FIELDS.equals(currentFieldName)) {
+                    while (parser.nextToken() != XContentParser.Token.END_OBJECT) {
+                        DocumentField getField = DocumentField.fromXContent(parser);
+                        documentFields.put(getField.getName(), getField);
+                    }
+                } else {
+                    parser.skipChildren(); // skip potential inner objects for forward compatibility
+                }
+            } else if (token == XContentParser.Token.START_ARRAY) {
+                if (IgnoredFieldMapper.NAME.equals(currentFieldName) || IgnoredSourceFieldMapper.NAME.equals(currentFieldName)) {
+                    metaFields.put(currentFieldName, new DocumentField(currentFieldName, parser.list()));
+                } else {
+                    parser.skipChildren(); // skip potential inner arrays for forward compatibility
+                }
+            }
+        }
+        return new GetResult(index, id, seqNo, primaryTerm, version, found, source, documentFields, metaFields);
+    }
+
     public void testToAndFromXContent() throws Exception {
         XContentType xContentType = randomFrom(XContentType.values());
         Tuple<GetResult, GetResult> tuple = randomGetResult(xContentType);
@@ -59,7 +133,7 @@ public class GetResultTests extends ESTestCase {
         // test that we can parse what we print out
         GetResult parsedGetResult;
         try (XContentParser parser = createParser(xContentType.xContent(), originalBytes)) {
-            parsedGetResult = GetResult.fromXContent(parser);
+            parsedGetResult = parseInstance(parser);
             assertNull(parser.nextToken());
         }
         assertEquals(expectedGetResult, parsedGetResult);
@@ -136,7 +210,7 @@ public class GetResultTests extends ESTestCase {
         GetResult parsedEmbeddedGetResult;
         try (XContentParser parser = createParser(xContentType.xContent(), originalBytes)) {
             ensureExpectedToken(XContentParser.Token.START_OBJECT, parser.nextToken(), parser);
-            parsedEmbeddedGetResult = GetResult.fromXContentEmbedded(parser);
+            parsedEmbeddedGetResult = parseInstanceFromEmbedded(parser);
             assertNull(parser.nextToken());
         }
         assertEquals(expectedGetResult, parsedEmbeddedGetResult);