Skip to content

Commit 2b50552

Browse files
nknizenknize
committed
update bwc
Signed-off-by: Nicholas Walter Knize <[email protected]>
1 parent 1df5fc9 commit 2b50552

File tree

10 files changed

+112
-20
lines changed

10 files changed

+112
-20
lines changed

‎server/src/main/java/org/opensearch/action/admin/cluster/storedscripts/PutStoredScriptRequest.java‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232

3333
package org.opensearch.action.admin.cluster.storedscripts;
3434

35+
import org.opensearch.Version;
3536
import org.opensearch.action.ActionRequestValidationException;
3637
import org.opensearch.action.support.master.AcknowledgedRequest;
3738
import org.opensearch.common.bytes.BytesReference;
@@ -67,7 +68,11 @@ public PutStoredScriptRequest(StreamInput in) throws IOException {
6768
super(in);
6869
id = in.readOptionalString();
6970
content = in.readBytesReference();
70-
mediaType = in.readMediaType();
71+
if (in.getVersion().onOrAfter(Version.V_3_0_0)) {
72+
mediaType = in.readMediaType();
73+
} else {
74+
mediaType = in.readEnum(XContentType.class);
75+
}
7176
context = in.readOptionalString();
7277
source = new StoredScriptSource(in);
7378
}
@@ -147,7 +152,11 @@ public void writeTo(StreamOutput out) throws IOException {
147152
super.writeTo(out);
148153
out.writeOptionalString(id);
149154
out.writeBytesReference(content);
150-
mediaType.writeTo(out);
155+
if (out.getVersion().onOrAfter(Version.V_3_0_0)) {
156+
mediaType.writeTo(out);
157+
} else {
158+
out.writeEnum((XContentType) mediaType);
159+
}
151160
out.writeOptionalString(context);
152161
source.writeTo(out);
153162
}

‎server/src/main/java/org/opensearch/action/index/IndexRequest.java‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
import org.opensearch.common.unit.ByteSizeValue;
5757
import org.opensearch.common.xcontent.XContentFactory;
5858
import org.opensearch.common.xcontent.XContentHelper;
59+
import org.opensearch.common.xcontent.XContentType;
5960
import org.opensearch.core.common.Strings;
6061
import org.opensearch.core.xcontent.MediaType;
6162
import org.opensearch.core.xcontent.XContentBuilder;
@@ -158,7 +159,11 @@ public IndexRequest(@Nullable ShardId shardId, StreamInput in) throws IOExceptio
158159
isRetry = in.readBoolean();
159160
autoGeneratedTimestamp = in.readLong();
160161
if (in.readBoolean()) {
161-
contentType = in.readMediaType();
162+
if (in.getVersion().onOrAfter(Version.V_3_0_0)) {
163+
contentType = in.readMediaType();
164+
} else {
165+
contentType = in.readEnum(XContentType.class);
166+
}
162167
} else {
163168
contentType = null;
164169
}
@@ -665,7 +670,11 @@ private void writeBody(StreamOutput out) throws IOException {
665670
out.writeLong(autoGeneratedTimestamp);
666671
if (contentType != null) {
667672
out.writeBoolean(true);
668-
contentType.writeTo(out);
673+
if (out.getVersion().onOrAfter(Version.V_3_0_0)) {
674+
contentType.writeTo(out);
675+
} else {
676+
out.writeEnum((XContentType) contentType);
677+
}
669678
} else {
670679
out.writeBoolean(false);
671680
}

‎server/src/main/java/org/opensearch/action/ingest/PutPipelineRequest.java‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,13 @@
3232

3333
package org.opensearch.action.ingest;
3434

35+
import org.opensearch.Version;
3536
import org.opensearch.action.ActionRequestValidationException;
3637
import org.opensearch.action.support.master.AcknowledgedRequest;
3738
import org.opensearch.common.bytes.BytesReference;
3839
import org.opensearch.common.io.stream.StreamInput;
3940
import org.opensearch.common.io.stream.StreamOutput;
41+
import org.opensearch.common.xcontent.XContentType;
4042
import org.opensearch.core.xcontent.MediaType;
4143
import org.opensearch.core.xcontent.ToXContentObject;
4244
import org.opensearch.core.xcontent.XContentBuilder;
@@ -68,7 +70,11 @@ public PutPipelineRequest(StreamInput in) throws IOException {
6870
super(in);
6971
id = in.readString();
7072
source = in.readBytesReference();
71-
mediaType = in.readMediaType();
73+
if (in.getVersion().onOrAfter(Version.V_3_0_0)) {
74+
mediaType = in.readMediaType();
75+
} else {
76+
mediaType = in.readEnum(XContentType.class);
77+
}
7278
}
7379

7480
PutPipelineRequest() {}
@@ -95,7 +101,11 @@ public void writeTo(StreamOutput out) throws IOException {
95101
super.writeTo(out);
96102
out.writeString(id);
97103
out.writeBytesReference(source);
98-
mediaType.writeTo(out);
104+
if (out.getVersion().onOrAfter(Version.V_3_0_0)) {
105+
mediaType.writeTo(out);
106+
} else {
107+
out.writeEnum((XContentType) mediaType);
108+
}
99109
}
100110

101111
@Override

‎server/src/main/java/org/opensearch/action/ingest/SimulatePipelineRequest.java‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,14 @@
3232

3333
package org.opensearch.action.ingest;
3434

35+
import org.opensearch.Version;
3536
import org.opensearch.action.ActionRequest;
3637
import org.opensearch.action.ActionRequestValidationException;
3738
import org.opensearch.common.bytes.BytesReference;
3839
import org.opensearch.common.io.stream.StreamInput;
3940
import org.opensearch.common.io.stream.StreamOutput;
4041
import org.opensearch.common.logging.DeprecationLogger;
42+
import org.opensearch.common.xcontent.XContentType;
4143
import org.opensearch.core.xcontent.MediaType;
4244
import org.opensearch.core.xcontent.ToXContentObject;
4345
import org.opensearch.core.xcontent.XContentBuilder;
@@ -83,7 +85,11 @@ public SimulatePipelineRequest(BytesReference source, MediaType mediaType) {
8385
id = in.readOptionalString();
8486
verbose = in.readBoolean();
8587
source = in.readBytesReference();
86-
mediaType = in.readMediaType();
88+
if (in.getVersion().onOrAfter(Version.V_3_0_0)) {
89+
mediaType = in.readMediaType();
90+
} else {
91+
mediaType = in.readEnum(XContentType.class);
92+
}
8793
}
8894

8995
@Override
@@ -121,7 +127,11 @@ public void writeTo(StreamOutput out) throws IOException {
121127
out.writeOptionalString(id);
122128
out.writeBoolean(verbose);
123129
out.writeBytesReference(source);
124-
mediaType.writeTo(out);
130+
if (out.getVersion().onOrAfter(Version.V_3_0_0)) {
131+
mediaType.writeTo(out);
132+
} else {
133+
out.writeEnum((XContentType) mediaType);
134+
}
125135
}
126136

127137
@Override

‎server/src/main/java/org/opensearch/action/search/PutSearchPipelineRequest.java‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
package org.opensearch.action.search;
1010

11+
import org.opensearch.Version;
1112
import org.opensearch.action.ActionRequestValidationException;
1213
import org.opensearch.action.support.master.AcknowledgedRequest;
1314
import org.opensearch.common.bytes.BytesReference;
@@ -46,7 +47,11 @@ public PutSearchPipelineRequest(StreamInput in) throws IOException {
4647
super(in);
4748
id = in.readString();
4849
source = in.readBytesReference();
49-
mediaType = in.readMediaType();
50+
if (in.getVersion().onOrAfter(Version.V_3_0_0)) {
51+
mediaType = in.readMediaType();
52+
} else {
53+
mediaType = in.readEnum(XContentType.class);
54+
}
5055
}
5156

5257
@Override
@@ -71,7 +76,11 @@ public void writeTo(StreamOutput out) throws IOException {
7176
super.writeTo(out);
7277
out.writeString(id);
7378
out.writeBytesReference(source);
74-
mediaType.writeTo(out);
79+
if (out.getVersion().onOrAfter(Version.V_3_0_0)) {
80+
mediaType.writeTo(out);
81+
} else {
82+
out.writeEnum((XContentType) mediaType);
83+
}
7584
}
7685

7786
@Override

‎server/src/main/java/org/opensearch/action/termvectors/TermVectorsRequest.java‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
import org.opensearch.action.get.MultiGetRequest;
4141
import org.opensearch.action.support.single.shard.SingleShardRequest;
4242
import org.opensearch.common.Nullable;
43+
import org.opensearch.common.xcontent.XContentType;
4344
import org.opensearch.core.ParseField;
4445
import org.opensearch.common.bytes.BytesArray;
4546
import org.opensearch.common.bytes.BytesReference;
@@ -185,7 +186,11 @@ public TermVectorsRequest() {}
185186

186187
if (in.readBoolean()) {
187188
doc = in.readBytesReference();
188-
mediaType = in.readMediaType();
189+
if (in.getVersion().onOrAfter(Version.V_3_0_0)) {
190+
mediaType = in.readMediaType();
191+
} else {
192+
mediaType = in.readEnum(XContentType.class);
193+
}
189194
}
190195
routing = in.readOptionalString();
191196
preference = in.readOptionalString();
@@ -533,7 +538,11 @@ public void writeTo(StreamOutput out) throws IOException {
533538
out.writeBoolean(doc != null);
534539
if (doc != null) {
535540
out.writeBytesReference(doc);
536-
mediaType.writeTo(out);
541+
if (out.getVersion().onOrAfter(Version.V_3_0_0)) {
542+
mediaType.writeTo(out);
543+
} else {
544+
out.writeEnum((XContentType) mediaType);
545+
}
537546
}
538547
out.writeOptionalString(routing);
539548
out.writeOptionalString(preference);

‎server/src/main/java/org/opensearch/extensions/rest/ExtensionRestRequest.java‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,12 @@
99
package org.opensearch.extensions.rest;
1010

1111
import org.opensearch.OpenSearchParseException;
12+
import org.opensearch.Version;
1213
import org.opensearch.common.bytes.BytesReference;
1314
import org.opensearch.common.io.stream.StreamInput;
1415
import org.opensearch.common.io.stream.StreamOutput;
1516
import org.opensearch.common.xcontent.LoggingDeprecationHandler;
17+
import org.opensearch.common.xcontent.XContentType;
1618
import org.opensearch.core.xcontent.MediaType;
1719
import org.opensearch.core.xcontent.NamedXContentRegistry;
1820
import org.opensearch.core.xcontent.XContentParser;
@@ -102,7 +104,11 @@ public ExtensionRestRequest(StreamInput in) throws IOException {
102104
params = in.readMap(StreamInput::readString, StreamInput::readString);
103105
headers = in.readMap(StreamInput::readString, StreamInput::readStringList);
104106
if (in.readBoolean()) {
105-
mediaType = in.readMediaType();
107+
if (in.getVersion().onOrAfter(Version.V_3_0_0)) {
108+
mediaType = in.readMediaType();
109+
} else {
110+
mediaType = in.readEnum(XContentType.class);
111+
}
106112
}
107113
content = in.readBytesReference();
108114
principalIdentifierToken = in.readString();
@@ -119,7 +125,11 @@ public void writeTo(StreamOutput out) throws IOException {
119125
out.writeMap(headers, StreamOutput::writeString, StreamOutput::writeStringCollection);
120126
out.writeBoolean(mediaType != null);
121127
if (mediaType != null) {
122-
mediaType.writeTo(out);
128+
if (out.getVersion().onOrAfter(Version.V_3_0_0)) {
129+
mediaType.writeTo(out);
130+
} else {
131+
out.writeEnum((XContentType) mediaType);
132+
}
123133
}
124134
out.writeBytesReference(content);
125135
out.writeString(principalIdentifierToken);

‎server/src/main/java/org/opensearch/index/query/MoreLikeThisQueryBuilder.java‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,11 @@ public Item(@Nullable String index, XContentBuilder doc) {
235235
}
236236
if (in.readBoolean()) {
237237
doc = (BytesReference) in.readGenericValue();
238-
mediaType = in.readMediaType();
238+
if (in.getVersion().onOrAfter(Version.V_3_0_0)) {
239+
mediaType = in.readMediaType();
240+
} else {
241+
mediaType = in.readEnum(XContentType.class);
242+
}
239243
} else {
240244
id = in.readString();
241245
}
@@ -256,7 +260,11 @@ public void writeTo(StreamOutput out) throws IOException {
256260
out.writeBoolean(doc != null);
257261
if (doc != null) {
258262
out.writeGenericValue(doc);
259-
mediaType.writeTo(out);
263+
if (out.getVersion().onOrAfter(Version.V_3_0_0)) {
264+
mediaType.writeTo(out);
265+
} else {
266+
out.writeEnum((XContentType) mediaType);
267+
}
260268
} else {
261269
out.writeString(id);
262270
}

‎server/src/main/java/org/opensearch/ingest/PipelineConfiguration.java‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232

3333
package org.opensearch.ingest;
3434

35+
import org.opensearch.Version;
3536
import org.opensearch.cluster.AbstractDiffable;
3637
import org.opensearch.cluster.Diff;
3738
import org.opensearch.core.ParseField;
@@ -137,7 +138,11 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
137138
}
138139

139140
public static PipelineConfiguration readFrom(StreamInput in) throws IOException {
140-
return new PipelineConfiguration(in.readString(), in.readBytesReference(), in.readMediaType());
141+
return new PipelineConfiguration(
142+
in.readString(),
143+
in.readBytesReference(),
144+
in.getVersion().onOrAfter(Version.V_3_0_0) ? in.readMediaType() : in.readEnum(XContentType.class)
145+
);
141146
}
142147

143148
public static Diff<PipelineConfiguration> readDiffFrom(StreamInput in) throws IOException {
@@ -153,7 +158,11 @@ public String toString() {
153158
public void writeTo(StreamOutput out) throws IOException {
154159
out.writeString(id);
155160
out.writeBytesReference(config);
156-
mediaType.writeTo(out);
161+
if (out.getVersion().onOrAfter(Version.V_3_0_0)) {
162+
mediaType.writeTo(out);
163+
} else {
164+
out.writeEnum((XContentType) mediaType);
165+
}
157166
}
158167

159168
@Override

‎server/src/main/java/org/opensearch/search/pipeline/PipelineConfiguration.java‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
package org.opensearch.search.pipeline;
1010

11+
import org.opensearch.Version;
1112
import org.opensearch.cluster.AbstractDiffable;
1213
import org.opensearch.cluster.Diff;
1314
import org.opensearch.common.Strings;
@@ -116,7 +117,11 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
116117
}
117118

118119
public static PipelineConfiguration readFrom(StreamInput in) throws IOException {
119-
return new PipelineConfiguration(in.readString(), in.readBytesReference(), in.readMediaType());
120+
return new PipelineConfiguration(
121+
in.readString(),
122+
in.readBytesReference(),
123+
in.getVersion().onOrAfter(Version.V_3_0_0) ? in.readMediaType() : in.readEnum(XContentType.class)
124+
);
120125
}
121126

122127
public static Diff<PipelineConfiguration> readDiffFrom(StreamInput in) throws IOException {
@@ -132,7 +137,11 @@ public String toString() {
132137
public void writeTo(StreamOutput out) throws IOException {
133138
out.writeString(id);
134139
out.writeBytesReference(config);
135-
mediaType.writeTo(out);
140+
if (out.getVersion().onOrAfter(Version.V_3_0_0)) {
141+
mediaType.writeTo(out);
142+
} else {
143+
out.writeEnum((XContentType) mediaType);
144+
}
136145
}
137146

138147
@Override

0 commit comments

Comments
 (0)