Skip to content

Commit 686cf8e

Browse files
committed
Update delete calls to directly use delete response without parsing
Signed-off-by: Daniel Widdis <[email protected]>
1 parent 6a0cb5e commit 686cf8e

File tree

5 files changed

+8
-13
lines changed

5 files changed

+8
-13
lines changed

plugin/src/main/java/org/opensearch/ml/action/agents/DeleteAgentTransportAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ private void handleDeleteResponse(
186186
actionListener.onFailure(cause);
187187
} else {
188188
try {
189-
DeleteResponse deleteResponse = DeleteResponse.fromXContent(response.parser());
189+
DeleteResponse deleteResponse = response.deleteResponse();
190190
log.info("Agent deletion result: {}, agent id: {}", deleteResponse.getResult(), response.id());
191191
actionListener.onResponse(deleteResponse);
192192
} catch (Exception e) {

plugin/src/main/java/org/opensearch/ml/action/connector/DeleteConnectorTransportAction.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import static org.opensearch.ml.common.CommonValue.ML_CONNECTOR_INDEX;
99
import static org.opensearch.ml.common.CommonValue.ML_MODEL_INDEX;
1010

11-
import java.io.IOException;
1211
import java.util.ArrayList;
1312
import java.util.Arrays;
1413
import java.util.List;
@@ -221,10 +220,10 @@ private void handleDeleteResponse(
221220
actionListener.onFailure(cause);
222221
} else {
223222
try {
224-
DeleteResponse deleteResponse = DeleteResponse.fromXContent(response.parser());
223+
DeleteResponse deleteResponse = response.deleteResponse();
225224
log.info("Connector deletion result: {}, connector id: {}", deleteResponse.getResult(), response.id());
226225
actionListener.onResponse(deleteResponse);
227-
} catch (IOException e) {
226+
} catch (Exception e) {
228227
actionListener.onFailure(e);
229228
}
230229
}

plugin/src/main/java/org/opensearch/ml/action/model_group/DeleteModelGroupTransportAction.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
import static org.opensearch.ml.common.CommonValue.ML_MODEL_INDEX;
1010
import static org.opensearch.ml.utils.RestActionUtils.PARAMETER_MODEL_GROUP_ID;
1111

12-
import java.io.IOException;
13-
1412
import org.opensearch.ExceptionsHelper;
1513
import org.opensearch.OpenSearchStatusException;
1614
import org.opensearch.action.ActionRequest;
@@ -211,10 +209,10 @@ private void handleDeleteResponse(
211209
actionListener.onFailure(cause);
212210
} else {
213211
try {
214-
DeleteResponse deleteResponse = DeleteResponse.fromXContent(response.parser());
212+
DeleteResponse deleteResponse = response.deleteResponse();
215213
log.debug("Completed Delete Model Group Request, model group id:{} deleted", response.id());
216214
actionListener.onResponse(deleteResponse);
217-
} catch (IOException e) {
215+
} catch (Exception e) {
218216
actionListener.onFailure(e);
219217
}
220218
}

plugin/src/main/java/org/opensearch/ml/action/models/DeleteModelTransportAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ private void deleteModel(
332332
sdkClient.deleteDataObjectAsync(deleteDataObjectRequest).whenComplete((r, throwable) -> {
333333
if (throwable == null) {
334334
try {
335-
DeleteResponse deleteResponse = DeleteResponse.fromXContent(r.parser());
335+
DeleteResponse deleteResponse = r.deleteResponse();
336336
deleteModelChunksAndController(actionListener, modelId, functionName, isHidden, deleteResponse);
337337
} catch (Exception e) {
338338
actionListener.onFailure(e);

plugin/src/main/java/org/opensearch/ml/action/tasks/DeleteTaskTransportAction.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
import static org.opensearch.core.xcontent.XContentParserUtils.ensureExpectedToken;
1010
import static org.opensearch.ml.common.CommonValue.ML_TASK_INDEX;
1111

12-
import java.io.IOException;
13-
1412
import org.opensearch.ExceptionsHelper;
1513
import org.opensearch.OpenSearchStatusException;
1614
import org.opensearch.action.ActionRequest;
@@ -192,10 +190,10 @@ private void handleDeleteError(Throwable throwable, String taskId, ActionListene
192190

193191
private void processDeleteResponse(DeleteDataObjectResponse deleteDataObjectResponse, ActionListener<DeleteResponse> actionListener) {
194192
try {
195-
DeleteResponse deleteResponse = DeleteResponse.fromXContent(deleteDataObjectResponse.parser());
193+
DeleteResponse deleteResponse = deleteDataObjectResponse.deleteResponse();
196194
log.info("Task deletion result: {}, task id: {}", deleteResponse.getResult(), deleteResponse.getId());
197195
actionListener.onResponse(deleteResponse);
198-
} catch (IOException e) {
196+
} catch (Exception e) {
199197
actionListener.onFailure(e);
200198
}
201199
}

0 commit comments

Comments
 (0)