Added constructor for empty rawResponse

Signed-off-by: Guian Gumpac <guian.gumpac@improving.com>
Bit-Quill · Mar 13, 2023 · 5b6f36e · 5b6f36e
1 parent 682110f
commit 5b6f36e
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 6 deletions.
diff --git a/core/src/main/java/org/opensearch/sql/executor/ExecutionEngine.java b/core/src/main/java/org/opensearch/sql/executor/ExecutionEngine.java
@@ -54,6 +54,31 @@ class QueryResponse {
     private final Schema schema;
     private final List<ExprValue> results;
     private final String rawResponse;
+
+    /**
+     * Constructor for Query Response.
+     *
+     * @param schema  schema of the query
+     * @param results list of expressions
+     * @param rawResponse raw response from OpenSearch server
+     */
+    public QueryResponse(Schema schema, List<ExprValue> results, String rawResponse) {
+      this.schema = schema;
+      this.results = results;
+      this.rawResponse = rawResponse;
+    }
+
+    /**
+     * Constructor for Query Response.
+     *
+     * @param schema  schema of the query
+     * @param results list of expressions
+     */
+    public QueryResponse(Schema schema, List<ExprValue> results) {
+      this.schema = schema;
+      this.results = results;
+      this.rawResponse = "";
+    }
   }
 
   @Data

diff --git a/core/src/testFixtures/java/org/opensearch/sql/executor/DefaultExecutionEngine.java b/core/src/testFixtures/java/org/opensearch/sql/executor/DefaultExecutionEngine.java
@@ -32,7 +32,7 @@ public void execute(
       while (plan.hasNext()) {
         result.add(plan.next());
       }
-      QueryResponse response = new QueryResponse(new Schema(new ArrayList<>()), new ArrayList<>(), "");
+      QueryResponse response = new QueryResponse(new Schema(new ArrayList<>()), new ArrayList<>());
       listener.onResponse(response);
     } catch (Exception e) {
       listener.onFailure(e);

diff --git a/ppl/src/test/java/org/opensearch/sql/ppl/PPLServiceTest.java b/ppl/src/test/java/org/opensearch/sql/ppl/PPLServiceTest.java
@@ -65,7 +65,7 @@ public void cleanup() throws InterruptedException {
   public void testExecuteShouldPass() {
     doAnswer(invocation -> {
       ResponseListener<QueryResponse> listener = invocation.getArgument(1);
-      listener.onResponse(new QueryResponse(schema, Collections.emptyList(), ""));
+      listener.onResponse(new QueryResponse(schema, Collections.emptyList()));
       return null;
     }).when(queryService).execute(any(), any());
 
@@ -87,7 +87,7 @@ public void onFailure(Exception e) {
   public void testExecuteCsvFormatShouldPass() {
     doAnswer(invocation -> {
       ResponseListener<QueryResponse> listener = invocation.getArgument(1);
-      listener.onResponse(new QueryResponse(schema, Collections.emptyList(), ""));
+      listener.onResponse(new QueryResponse(schema, Collections.emptyList()));
       return null;
     }).when(queryService).execute(any(), any());
 
@@ -161,7 +161,7 @@ public void onFailure(Exception e) {
   public void testPrometheusQuery() {
     doAnswer(invocation -> {
       ResponseListener<QueryResponse> listener = invocation.getArgument(1);
-      listener.onResponse(new QueryResponse(schema, Collections.emptyList(), ""));
+      listener.onResponse(new QueryResponse(schema, Collections.emptyList()));
       return null;
     }).when(queryService).execute(any(), any());
 

diff --git a/sql/src/test/java/org/opensearch/sql/sql/SQLServiceTest.java b/sql/src/test/java/org/opensearch/sql/sql/SQLServiceTest.java
@@ -64,7 +64,7 @@ public void cleanup() throws InterruptedException {
   public void canExecuteSqlQuery() {
     doAnswer(invocation -> {
       ResponseListener<QueryResponse> listener = invocation.getArgument(1);
-      listener.onResponse(new QueryResponse(schema, Collections.emptyList(), ""));
+      listener.onResponse(new QueryResponse(schema, Collections.emptyList()));
       return null;
     }).when(queryService).execute(any(), any());
 
@@ -87,7 +87,7 @@ public void onFailure(Exception e) {
   public void canExecuteCsvFormatRequest() {
     doAnswer(invocation -> {
       ResponseListener<QueryResponse> listener = invocation.getArgument(1);
-      listener.onResponse(new QueryResponse(schema, Collections.emptyList(), ""));
+      listener.onResponse(new QueryResponse(schema, Collections.emptyList()));
       return null;
     }).when(queryService).execute(any(), any());