Skip to content

Commit 2b5c24a

Browse files
committed
addressed comments
Signed-off-by: seungwon cho <[email protected]>
1 parent 1d14c92 commit 2b5c24a

File tree

2 files changed

+4
-19
lines changed

2 files changed

+4
-19
lines changed

common/src/main/java/org/opensearch/ml/common/MLPrompt.java

+2-8
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,13 @@
77

88
import static org.opensearch.core.xcontent.XContentParserUtils.ensureExpectedToken;
99
import static org.opensearch.ml.common.CommonValue.TENANT_ID_FIELD;
10-
import static org.opensearch.ml.common.CommonValue.VERSION_2_19_0;
1110

1211
import java.io.IOException;
1312
import java.time.Instant;
1413
import java.util.ArrayList;
1514
import java.util.List;
1615
import java.util.Map;
1716

18-
import org.opensearch.Version;
1917
import org.opensearch.core.common.io.stream.StreamInput;
2018
import org.opensearch.core.common.io.stream.StreamOutput;
2119
import org.opensearch.core.common.io.stream.Writeable;
@@ -96,14 +94,13 @@ public MLPrompt(
9694
* @throws IOException if an I/O exception occurred while reading from input stream
9795
*/
9896
public MLPrompt(StreamInput input) throws IOException {
99-
Version streamInputVersion = input.getVersion();
10097
this.promptId = input.readOptionalString();
10198
this.name = input.readOptionalString();
10299
this.description = input.readOptionalString();
103100
this.version = input.readOptionalString();
104101
this.prompt = input.readMap(s -> s.readString(), s -> s.readString());
105102
this.tags = input.readOptionalStringList();
106-
this.tenantId = streamInputVersion.onOrAfter(VERSION_2_19_0) ? input.readOptionalString() : null;
103+
this.tenantId = input.readOptionalString();
107104
this.createTime = input.readInstant();
108105
this.lastUpdateTime = input.readInstant();
109106
}
@@ -116,16 +113,13 @@ public MLPrompt(StreamInput input) throws IOException {
116113
*/
117114
@Override
118115
public void writeTo(StreamOutput out) throws IOException {
119-
Version streamOutputVersion = out.getVersion();
120116
out.writeOptionalString(promptId);
121117
out.writeOptionalString(name);
122118
out.writeOptionalString(description);
123119
out.writeOptionalString(version);
124120
out.writeMap(prompt, StreamOutput::writeString, StreamOutput::writeString);
125121
out.writeCollection(tags, StreamOutput::writeString);
126-
if (streamOutputVersion.onOrAfter(VERSION_2_19_0)) {
127-
out.writeOptionalString(tenantId);
128-
}
122+
out.writeOptionalString(tenantId);
129123
out.writeInstant(createTime);
130124
out.writeInstant(lastUpdateTime);
131125
}

common/src/main/java/org/opensearch/ml/common/transport/prompt/MLCreatePromptInput.java

+2-11
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,19 @@
77

88
import static org.opensearch.core.xcontent.XContentParserUtils.ensureExpectedToken;
99
import static org.opensearch.ml.common.CommonValue.TENANT_ID_FIELD;
10-
import static org.opensearch.ml.common.CommonValue.VERSION_2_19_0;
1110
import static org.opensearch.ml.common.utils.StringUtils.getParameterMap;
1211

1312
import java.io.IOException;
1413
import java.util.ArrayList;
1514
import java.util.List;
1615
import java.util.Map;
1716

18-
import org.opensearch.Version;
1917
import org.opensearch.core.common.io.stream.StreamInput;
2018
import org.opensearch.core.common.io.stream.StreamOutput;
2119
import org.opensearch.core.common.io.stream.Writeable;
2220
import org.opensearch.core.xcontent.ToXContentObject;
2321
import org.opensearch.core.xcontent.XContentBuilder;
2422
import org.opensearch.core.xcontent.XContentParser;
25-
import org.opensearch.ml.common.CommonValue;
2623

2724
import lombok.Builder;
2825
import lombok.Data;
@@ -42,8 +39,6 @@ public class MLCreatePromptInput implements ToXContentObject, Writeable {
4239
public static final String PROMPT_FIELD_USER_PROMPT = "user";
4340
public static final String PROMPT_FIELD_SYSTEM_PROMPT = "system";
4441

45-
private static final Version MINIMAL_SUPPORTED_VERSION_FOR_CLIENT_CONFIG = CommonValue.VERSION_2_13_0;
46-
4742
private String name;
4843
private String description;
4944
private String version;
@@ -105,13 +100,12 @@ public MLCreatePromptInput(
105100
* @throws IOException thrown if an I/O exception occurred while reading the object from StreamInput
106101
*/
107102
public MLCreatePromptInput(StreamInput input) throws IOException {
108-
Version streamInputVersion = input.getVersion();
109103
this.name = input.readOptionalString();
110104
this.description = input.readOptionalString();
111105
this.version = input.readOptionalString();
112106
this.prompt = input.readMap(s -> s.readString(), s -> s.readString());
113107
this.tags = input.readOptionalStringList();
114-
this.tenantId = streamInputVersion.onOrAfter(VERSION_2_19_0) ? input.readOptionalString() : null;
108+
this.tenantId = input.readOptionalString();
115109
}
116110

117111
/**
@@ -122,15 +116,12 @@ public MLCreatePromptInput(StreamInput input) throws IOException {
122116
*/
123117
@Override
124118
public void writeTo(StreamOutput output) throws IOException {
125-
Version streamOutputVersion = output.getVersion();
126119
output.writeOptionalString(name);
127120
output.writeOptionalString(description);
128121
output.writeOptionalString(version);
129122
output.writeMap(prompt, StreamOutput::writeString, StreamOutput::writeString);
130123
output.writeCollection(tags, StreamOutput::writeString);
131-
if (streamOutputVersion.onOrAfter(VERSION_2_19_0)) {
132-
output.writeOptionalString(tenantId);
133-
}
124+
output.writeOptionalString(tenantId);
134125
}
135126

136127
/**

0 commit comments

Comments
 (0)