Skip to content

Commit ad10cb4

Browse files
output only old fields in get config API (opensearch-project#2892) (opensearch-project#2895)
Signed-off-by: Bhavana Ramaram <rbhavna@amazon.com> (cherry picked from commit 5f61df1) Co-authored-by: Bhavana Ramaram <rbhavna@amazon.com>
1 parent 224f8fc commit ad10cb4

File tree

1 file changed

+6
-15
lines changed

1 file changed

+6
-15
lines changed

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

+6-15
Original file line numberDiff line numberDiff line change
@@ -121,26 +121,17 @@ public void writeTo(StreamOutput out) throws IOException {
121121
@Override
122122
public XContentBuilder toXContent(XContentBuilder xContentBuilder, Params params) throws IOException {
123123
XContentBuilder builder = xContentBuilder.startObject();
124-
if (type != null) {
125-
builder.field(TYPE_FIELD, type);
124+
if (configType != null || type != null) {
125+
builder.field(TYPE_FIELD, configType == null ? type : configType);
126126
}
127-
if (configType != null) {
128-
builder.field(CONFIG_TYPE_FIELD, configType);
129-
}
130-
if (configuration != null) {
131-
builder.field(CONFIGURATION_FIELD, configuration);
132-
}
133-
if (mlConfiguration != null) {
134-
builder.field(ML_CONFIGURATION_FIELD, mlConfiguration);
127+
if (configuration != null || mlConfiguration != null) {
128+
builder.field(CONFIGURATION_FIELD, mlConfiguration == null ? configuration : mlConfiguration);
135129
}
136130
if (createTime != null) {
137131
builder.field(CREATE_TIME_FIELD, createTime.toEpochMilli());
138132
}
139-
if (lastUpdateTime != null) {
140-
builder.field(LAST_UPDATE_TIME_FIELD, lastUpdateTime.toEpochMilli());
141-
}
142-
if (lastUpdatedTime != null) {
143-
builder.field(LAST_UPDATED_TIME_FIELD, lastUpdatedTime.toEpochMilli());
133+
if (lastUpdateTime != null || lastUpdatedTime != null) {
134+
builder.field(LAST_UPDATE_TIME_FIELD, lastUpdatedTime == null ? lastUpdateTime.toEpochMilli() : lastUpdatedTime.toEpochMilli());
144135
}
145136
return builder.endObject();
146137
}

0 commit comments

Comments
 (0)