Address review comments

- renamed listener;
- minor test refactorings.

Author: bpintea

x-pack/plugin/sql/qa/server/src/main/java/org/elasticsearch/xpack/sql/qa/rest/RestSqlTestCase.java

@@ -1273,7 +1273,7 @@ public void testAsyncTextPaginated() throws IOException, InterruptedException {
             Character csvDelimiter = ',';
 
             assertEquals(200, response.getStatusLine().getStatusCode());
-            assertEquals(response.getHeader(HEADER_NAME_ASYNC_PARTIAL), response.getHeader(HEADER_NAME_ASYNC_RUNNING));
+            assertTrue(response.getHeader(HEADER_NAME_ASYNC_PARTIAL).equals(response.getHeader(HEADER_NAME_ASYNC_RUNNING)));
             String asyncId = response.getHeader(HEADER_NAME_ASYNC_ID);
             assertTrue(hasText(asyncId));
 

x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/plugin/RestSqlAsyncGetResultsAction.java

@@ -42,7 +42,7 @@ protected RestChannelConsumer prepareRequest(RestRequest request, NodeClient cli
         if (request.hasParam(KEEP_ALIVE_NAME)) {
             get.setKeepAlive(request.paramAsTime(KEEP_ALIVE_NAME, get.getKeepAlive()));
         }
-        return channel -> client.execute(SqlAsyncGetResultsAction.INSTANCE, get, new SqlResponseFormatter(channel, request));
+        return channel -> client.execute(SqlAsyncGetResultsAction.INSTANCE, get, new SqlResponseListener(channel, request));
     }
 
     @Override

x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/plugin/RestSqlQueryAction.java

@@ -50,7 +50,7 @@ protected RestChannelConsumer prepareRequest(RestRequest request, NodeClient cli
 
         return channel -> {
             RestCancellableNodeClient cancellableClient = new RestCancellableNodeClient(client, request.getHttpChannel());
-            cancellableClient.execute(SqlQueryAction.INSTANCE, sqlRequest, new SqlResponseFormatter(channel, request, sqlRequest));
+            cancellableClient.execute(SqlQueryAction.INSTANCE, sqlRequest, new SqlResponseListener(channel, request, sqlRequest));
         };
     }
 

x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/plugin/SqlResponseFormatter.java renamed to x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/plugin/SqlResponseListener.java

@@ -29,14 +29,14 @@
 import static org.elasticsearch.xpack.sql.proto.Protocol.HEADER_NAME_TOOK_NANOS;
 import static org.elasticsearch.xpack.sql.proto.Protocol.URL_PARAM_DELIMITER;
 
-class SqlResponseFormatter extends RestResponseListener<SqlQueryResponse> {
+class SqlResponseListener extends RestResponseListener<SqlQueryResponse> {
 
     private final long startNanos = System.nanoTime();
     private final MediaType mediaType;
     private final RestRequest request;
 
 
-    SqlResponseFormatter(RestChannel channel, RestRequest request, SqlQueryRequest sqlRequest) {
+    SqlResponseListener(RestChannel channel, RestRequest request, SqlQueryRequest sqlRequest) {
         super(channel);
         this.request = request;
 
@@ -55,7 +55,7 @@ class SqlResponseFormatter extends RestResponseListener<SqlQueryResponse> {
         }
     }
 
-    SqlResponseFormatter(RestChannel channel, RestRequest request) {
+    SqlResponseListener(RestChannel channel, RestRequest request) {
         super(channel);
         this.request = request;
         this.mediaType = SqlMediaTypeParser.getResponseMediaType(request);