Decouple XContentType from StreamInput/Output (#28927)

dakrone · dakrone · commit 137e388548d9 · 2018-03-07T15:15:56.000-07:00
This removes the readFrom and writeTo methods from XContentType, instead using the more generic `readEnum` and `writeEnum` methods. Luckily they are both encoded exactly the same way, so there is no compatibility layer needed for backwards compatibility. Relates to #28504
diff --git a/modules/percolator/src/main/java/org/elasticsearch/percolator/PercolateQueryBuilder.java b/modules/percolator/src/main/java/org/elasticsearch/percolator/PercolateQueryBuilder.java
@@ -274,7 +274,7 @@ public PercolateQueryBuilder(String field, String documentType, String indexedDo
         }
         if (documents.isEmpty() == false) {
             if (in.getVersion().onOrAfter(Version.V_5_3_0)) {
-                documentXContentType = XContentType.readFrom(in);
+                documentXContentType = in.readEnum(XContentType.class);
             } else {
                 documentXContentType = XContentFactory.xContentType(documents.iterator().next());
             }
@@ -331,7 +331,7 @@ protected void doWriteTo(StreamOutput out) throws IOException {
             out.writeOptionalBytesReference(doc);
         }
         if (documents.isEmpty() == false && out.getVersion().onOrAfter(Version.V_5_3_0)) {
-            documentXContentType.writeTo(out);
+            out.writeEnum(documentXContentType);
         }
     }
 
diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/PutStoredScriptRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/PutStoredScriptRequest.java
@@ -123,7 +123,7 @@ public void readFrom(StreamInput in) throws IOException {
         id = in.readOptionalString();
         content = in.readBytesReference();
         if (in.getVersion().onOrAfter(Version.V_5_3_0)) {
-            xContentType = XContentType.readFrom(in);
+            xContentType = in.readEnum(XContentType.class);
         } else {
             xContentType = XContentFactory.xContentType(content);
         }
@@ -145,7 +145,7 @@ public void writeTo(StreamOutput out) throws IOException {
         out.writeOptionalString(id);
         out.writeBytesReference(content);
         if (out.getVersion().onOrAfter(Version.V_5_3_0)) {
-            xContentType.writeTo(out);
+            out.writeEnum(xContentType);
         }
         if (out.getVersion().onOrAfter(Version.V_6_0_0_alpha2)) {
             out.writeOptionalString(context);
diff --git a/server/src/main/java/org/elasticsearch/action/index/IndexRequest.java b/server/src/main/java/org/elasticsearch/action/index/IndexRequest.java
@@ -542,7 +542,11 @@ public void readFrom(StreamInput in) throws IOException {
         pipeline = in.readOptionalString();
         isRetry = in.readBoolean();
         autoGeneratedTimestamp = in.readLong();
-        contentType = in.readOptionalWriteable(XContentType::readFrom);
+        if (in.readBoolean()) {
+            contentType = in.readEnum(XContentType.class);
+        } else {
+            contentType = null;
+        }
     }
 
     @Override
@@ -566,7 +570,12 @@ public void writeTo(StreamOutput out) throws IOException {
         out.writeOptionalString(pipeline);
         out.writeBoolean(isRetry);
         out.writeLong(autoGeneratedTimestamp);
-        out.writeOptionalWriteable(contentType);
+        if (contentType != null) {
+            out.writeBoolean(true);
+            out.writeEnum(contentType);
+        } else {
+            out.writeBoolean(false);
+        }
     }
 
     @Override
diff --git a/server/src/main/java/org/elasticsearch/action/ingest/PutPipelineRequest.java b/server/src/main/java/org/elasticsearch/action/ingest/PutPipelineRequest.java
@@ -81,7 +81,7 @@ public void readFrom(StreamInput in) throws IOException {
         id = in.readString();
         source = in.readBytesReference();
         if (in.getVersion().onOrAfter(Version.V_5_3_0)) {
-            xContentType = XContentType.readFrom(in);
+            xContentType = in.readEnum(XContentType.class);
         } else {
             xContentType = XContentFactory.xContentType(source);
         }
@@ -93,7 +93,7 @@ public void writeTo(StreamOutput out) throws IOException {
         out.writeString(id);
         out.writeBytesReference(source);
         if (out.getVersion().onOrAfter(Version.V_5_3_0)) {
-            xContentType.writeTo(out);
+            out.writeEnum(xContentType);
         }
     }
 }
diff --git a/server/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineRequest.java b/server/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineRequest.java
@@ -105,7 +105,7 @@ public void readFrom(StreamInput in) throws IOException {
         verbose = in.readBoolean();
         source = in.readBytesReference();
         if (in.getVersion().onOrAfter(Version.V_5_3_0)) {
-            xContentType = XContentType.readFrom(in);
+            xContentType = in.readEnum(XContentType.class);
         } else {
             xContentType = XContentFactory.xContentType(source);
         }
@@ -118,7 +118,7 @@ public void writeTo(StreamOutput out) throws IOException {
         out.writeBoolean(verbose);
         out.writeBytesReference(source);
         if (out.getVersion().onOrAfter(Version.V_5_3_0)) {
-            xContentType.writeTo(out);
+            out.writeEnum(xContentType);
         }
     }
 
diff --git a/server/src/main/java/org/elasticsearch/action/termvectors/TermVectorsRequest.java b/server/src/main/java/org/elasticsearch/action/termvectors/TermVectorsRequest.java
@@ -517,7 +517,7 @@ public void readFrom(StreamInput in) throws IOException {
         if (in.readBoolean()) {
             doc = in.readBytesReference();
             if (in.getVersion().onOrAfter(Version.V_5_3_0)) {
-                xContentType = XContentType.readFrom(in);
+                xContentType = in.readEnum(XContentType.class);
             } else {
                 xContentType = XContentFactory.xContentType(doc);
             }
@@ -562,7 +562,7 @@ public void writeTo(StreamOutput out) throws IOException {
         if (doc != null) {
             out.writeBytesReference(doc);
             if (out.getVersion().onOrAfter(Version.V_5_3_0)) {
-                xContentType.writeTo(out);
+                out.writeEnum(xContentType);
             }
         }
         out.writeOptionalString(routing);
diff --git a/server/src/main/java/org/elasticsearch/common/xcontent/XContentParser.java b/server/src/main/java/org/elasticsearch/common/xcontent/XContentParser.java
@@ -19,8 +19,7 @@
 
 package org.elasticsearch.common.xcontent;
 
-import org.elasticsearch.common.lease.Releasable;
-
+import java.io.Closeable;
 import java.io.IOException;
 import java.nio.CharBuffer;
 import java.util.List;
@@ -37,7 +36,7 @@
  *          NamedXContentRegistry.EMPTY, ParserField."{\"key\" : \"value\"}");
  * </pre>
  */
-public interface XContentParser extends Releasable {
+public interface XContentParser extends Closeable {
 
     enum Token {
         START_OBJECT {
diff --git a/server/src/main/java/org/elasticsearch/common/xcontent/XContentType.java b/server/src/main/java/org/elasticsearch/common/xcontent/XContentType.java
@@ -19,22 +19,18 @@
 
 package org.elasticsearch.common.xcontent;
 
-import org.elasticsearch.common.io.stream.StreamInput;
-import org.elasticsearch.common.io.stream.StreamOutput;
-import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.common.xcontent.cbor.CborXContent;
 import org.elasticsearch.common.xcontent.json.JsonXContent;
 import org.elasticsearch.common.xcontent.smile.SmileXContent;
 import org.elasticsearch.common.xcontent.yaml.YamlXContent;
 
-import java.io.IOException;
 import java.util.Locale;
 import java.util.Objects;
 
 /**
  * The content type of {@link org.elasticsearch.common.xcontent.XContent}.
  */
-public enum XContentType implements Writeable {
+public enum XContentType {
 
     /**
      * A JSON based content type.
@@ -183,18 +179,4 @@ public String mediaType() {
 
     public abstract String mediaTypeWithoutParameters();
 
-    public static XContentType readFrom(StreamInput in) throws IOException {
-        int index = in.readVInt();
-        for (XContentType contentType : values()) {
-            if (index == contentType.index) {
-                return contentType;
-            }
-        }
-        throw new IllegalStateException("Unknown XContentType with index [" + index + "]");
-    }
-
-    @Override
-    public void writeTo(StreamOutput out) throws IOException {
-        out.writeVInt(index);
-    }
 }
diff --git a/server/src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryBuilder.java
@@ -222,7 +222,7 @@ public Item(@Nullable String index, @Nullable String type, XContentBuilder doc)
             if (in.readBoolean()) {
                 doc = (BytesReference) in.readGenericValue();
                 if (in.getVersion().onOrAfter(Version.V_5_3_0)) {
-                    xContentType = XContentType.readFrom(in);
+                    xContentType = in.readEnum(XContentType.class);
                 } else {
                     xContentType = XContentFactory.xContentType(doc);
                 }
@@ -244,7 +244,7 @@ public void writeTo(StreamOutput out) throws IOException {
             if (doc != null) {
                 out.writeGenericValue(doc);
                 if (out.getVersion().onOrAfter(Version.V_5_3_0)) {
-                    xContentType.writeTo(out);
+                    out.writeEnum(xContentType);
                 }
             } else {
                 out.writeString(id);
diff --git a/server/src/main/java/org/elasticsearch/ingest/PipelineConfiguration.java b/server/src/main/java/org/elasticsearch/ingest/PipelineConfiguration.java
@@ -120,7 +120,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
 
     public static PipelineConfiguration readFrom(StreamInput in) throws IOException {
         if (in.getVersion().onOrAfter(Version.V_5_3_0)) {
-            return new PipelineConfiguration(in.readString(), in.readBytesReference(), XContentType.readFrom(in));
+            return new PipelineConfiguration(in.readString(), in.readBytesReference(), in.readEnum(XContentType.class));
         } else {
             final String id = in.readString();
             final BytesReference config = in.readBytesReference();
@@ -137,7 +137,7 @@ public void writeTo(StreamOutput out) throws IOException {
         out.writeString(id);
         out.writeBytesReference(config);
         if (out.getVersion().onOrAfter(Version.V_5_3_0)) {
-            xContentType.writeTo(out);
+            out.writeEnum(xContentType);
         }
     }
 
diff --git a/server/src/main/java/org/elasticsearch/script/Script.java b/server/src/main/java/org/elasticsearch/script/Script.java
@@ -507,7 +507,7 @@ public Script(StreamInput in) throws IOException {
 
             if (in.readBoolean()) {
                 this.options = new HashMap<>();
-                XContentType contentType = XContentType.readFrom(in);
+                XContentType contentType = in.readEnum(XContentType.class);
                 this.options.put(CONTENT_TYPE_OPTION, contentType.mediaType());
             } else if (type == ScriptType.INLINE) {
                 options = new HashMap<>();
@@ -571,7 +571,7 @@ public void writeTo(StreamOutput out) throws IOException {
             if (options != null && options.containsKey(CONTENT_TYPE_OPTION)) {
                 XContentType contentType = XContentType.fromMediaTypeOrFormat(options.get(CONTENT_TYPE_OPTION));
                 out.writeBoolean(true);
-                contentType.writeTo(out);
+                out.writeEnum(contentType);
             } else {
                 out.writeBoolean(false);
             }

Original file line number	Diff line number	Diff line change
`@@ -274,7 +274,7 @@ public PercolateQueryBuilder(String field, String documentType, String indexedDo`
`274`	`274`	`}`
`275`	`275`	`if (documents.isEmpty() == false) {`
`276`	`276`	`if (in.getVersion().onOrAfter(Version.V_5_3_0)) {`
`277`		`- documentXContentType = XContentType.readFrom(in);`
	`277`	`+ documentXContentType = in.readEnum(XContentType.class);`
`278`	`278`	`} else {`
`279`	`279`	`documentXContentType = XContentFactory.xContentType(documents.iterator().next());`
`280`	`280`	`}`
`@@ -331,7 +331,7 @@ protected void doWriteTo(StreamOutput out) throws IOException {`
`331`	`331`	`out.writeOptionalBytesReference(doc);`
`332`	`332`	`}`
`333`	`333`	`if (documents.isEmpty() == false && out.getVersion().onOrAfter(Version.V_5_3_0)) {`
`334`		`- documentXContentType.writeTo(out);`
	`334`	`+ out.writeEnum(documentXContentType);`
`335`	`335`	`}`
`336`	`336`	`}`
`337`	`337`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ public void readFrom(StreamInput in) throws IOException {`
`81`	`81`	`id = in.readString();`
`82`	`82`	`source = in.readBytesReference();`
`83`	`83`	`if (in.getVersion().onOrAfter(Version.V_5_3_0)) {`
`84`		`- xContentType = XContentType.readFrom(in);`
	`84`	`+ xContentType = in.readEnum(XContentType.class);`
`85`	`85`	`} else {`
`86`	`86`	`xContentType = XContentFactory.xContentType(source);`
`87`	`87`	`}`
`@@ -93,7 +93,7 @@ public void writeTo(StreamOutput out) throws IOException {`
`93`	`93`	`out.writeString(id);`
`94`	`94`	`out.writeBytesReference(source);`
`95`	`95`	`if (out.getVersion().onOrAfter(Version.V_5_3_0)) {`
`96`		`- xContentType.writeTo(out);`
	`96`	`+ out.writeEnum(xContentType);`
`97`	`97`	`}`
`98`	`98`	`}`
`99`	`99`	`}`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ public void readFrom(StreamInput in) throws IOException {`
`105`	`105`	`verbose = in.readBoolean();`
`106`	`106`	`source = in.readBytesReference();`
`107`	`107`	`if (in.getVersion().onOrAfter(Version.V_5_3_0)) {`
`108`		`- xContentType = XContentType.readFrom(in);`
	`108`	`+ xContentType = in.readEnum(XContentType.class);`
`109`	`109`	`} else {`
`110`	`110`	`xContentType = XContentFactory.xContentType(source);`
`111`	`111`	`}`
`@@ -118,7 +118,7 @@ public void writeTo(StreamOutput out) throws IOException {`
`118`	`118`	`out.writeBoolean(verbose);`
`119`	`119`	`out.writeBytesReference(source);`
`120`	`120`	`if (out.getVersion().onOrAfter(Version.V_5_3_0)) {`
`121`		`- xContentType.writeTo(out);`
	`121`	`+ out.writeEnum(xContentType);`
`122`	`122`	`}`
`123`	`123`	`}`
`124`	`124`
Original file line number	Diff line number	Diff line change
`@@ -517,7 +517,7 @@ public void readFrom(StreamInput in) throws IOException {`
`517`	`517`	`if (in.readBoolean()) {`
`518`	`518`	`doc = in.readBytesReference();`
`519`	`519`	`if (in.getVersion().onOrAfter(Version.V_5_3_0)) {`
`520`		`- xContentType = XContentType.readFrom(in);`
	`520`	`+ xContentType = in.readEnum(XContentType.class);`
`521`	`521`	`} else {`
`522`	`522`	`xContentType = XContentFactory.xContentType(doc);`
`523`	`523`	`}`
`@@ -562,7 +562,7 @@ public void writeTo(StreamOutput out) throws IOException {`
`562`	`562`	`if (doc != null) {`
`563`	`563`	`out.writeBytesReference(doc);`
`564`	`564`	`if (out.getVersion().onOrAfter(Version.V_5_3_0)) {`
`565`		`- xContentType.writeTo(out);`
	`565`	`+ out.writeEnum(xContentType);`
`566`	`566`	`}`
`567`	`567`	`}`
`568`	`568`	`out.writeOptionalString(routing);`