From 9ad4e02b9a109cc1a104287ea5d485fef5e68553 Mon Sep 17 00:00:00 2001
From: Tomoyuki MORITA <moritato@amazon.com>
Date: Fri, 21 Jun 2024 14:26:31 -0700
Subject: [PATCH] Remove AsyncQueryId (#2754)

Signed-off-by: Tomoyuki Morita <moritato@amazon.com>
---
 .../spark/asyncquery/model/AsyncQueryId.java  | 35 -------------------
 .../execution/statement/StatementTest.java    |  5 ++-
 2 files changed, 2 insertions(+), 38 deletions(-)
 delete mode 100644 async-query-core/src/main/java/org/opensearch/sql/spark/asyncquery/model/AsyncQueryId.java

diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/asyncquery/model/AsyncQueryId.java b/async-query-core/src/main/java/org/opensearch/sql/spark/asyncquery/model/AsyncQueryId.java
deleted file mode 100644
index b99ebe0e8c..0000000000
--- a/async-query-core/src/main/java/org/opensearch/sql/spark/asyncquery/model/AsyncQueryId.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.opensearch.sql.spark.asyncquery.model;
-
-import static org.opensearch.sql.spark.utils.IDUtils.decode;
-import static org.opensearch.sql.spark.utils.IDUtils.encode;
-
-import lombok.Data;
-
-/** Async query id. */
-@Data
-public class AsyncQueryId {
-  private final String id;
-
-  public static AsyncQueryId newAsyncQueryId(String datasourceName) {
-    return new AsyncQueryId(encode(datasourceName));
-  }
-
-  public String getDataSourceName() {
-    return decode(id);
-  }
-
-  /** OpenSearch DocId. */
-  public String docId() {
-    return "qid" + id;
-  }
-
-  @Override
-  public String toString() {
-    return "asyncQueryId=" + id;
-  }
-}
diff --git a/async-query/src/test/java/org/opensearch/sql/spark/execution/statement/StatementTest.java b/async-query/src/test/java/org/opensearch/sql/spark/execution/statement/StatementTest.java
index 3c6517fdb2..d76b419df6 100644
--- a/async-query/src/test/java/org/opensearch/sql/spark/execution/statement/StatementTest.java
+++ b/async-query/src/test/java/org/opensearch/sql/spark/execution/statement/StatementTest.java
@@ -19,7 +19,6 @@
 import org.junit.Test;
 import org.opensearch.action.admin.indices.delete.DeleteIndexRequest;
 import org.opensearch.action.delete.DeleteRequest;
-import org.opensearch.sql.spark.asyncquery.model.AsyncQueryId;
 import org.opensearch.sql.spark.asyncquery.model.AsyncQueryRequestContext;
 import org.opensearch.sql.spark.asyncquery.model.NullAsyncQueryRequestContext;
 import org.opensearch.sql.spark.client.EMRServerlessClientFactory;
@@ -39,6 +38,7 @@
 import org.opensearch.sql.spark.execution.xcontent.SessionModelXContentSerializer;
 import org.opensearch.sql.spark.execution.xcontent.StatementModelXContentSerializer;
 import org.opensearch.sql.spark.rest.model.LangType;
+import org.opensearch.sql.spark.utils.IDUtils;
 import org.opensearch.test.OpenSearchIntegTestCase;
 
 public class StatementTest extends OpenSearchIntegTestCase {
@@ -368,8 +368,7 @@ public TestStatement run() {
   }
 
   private QueryRequest queryRequest() {
-    return new QueryRequest(
-        AsyncQueryId.newAsyncQueryId(TEST_DATASOURCE_NAME).getId(), LangType.SQL, "select 1");
+    return new QueryRequest(IDUtils.encode(TEST_DATASOURCE_NAME), LangType.SQL, "select 1");
   }
 
   private Statement createStatement(StatementId stId) {