es 7.4.0 support

Author: shi-yuan

.travis.yml

@@ -4,7 +4,7 @@ jdk:
   - openjdk8
 
 before_install:
-  - wget https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-7.3.2-amd64.deb && sudo dpkg -i --force-confnew elasticsearch-7.3.2-amd64.deb
+  - wget https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-7.4.0-amd64.deb && sudo dpkg -i --force-confnew elasticsearch-7.4.0-amd64.deb
   - sudo cp ./src/test/resources/elasticsearch.yml /etc/elasticsearch/elasticsearch.yml
   - sudo cat /etc/elasticsearch/elasticsearch.yml
   - sudo java -version

pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.nlpcn</groupId>
 	<artifactId>elasticsearch-sql</artifactId>
-	<version>7.3.2.0</version>
+	<version>7.4.0.0</version>
 	<packaging>jar</packaging>
 	<description>Query elasticsearch using SQL</description>
 	<name>elasticsearch-sql</name>
@@ -44,7 +44,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<runSuite>**/MainTestSuite.class</runSuite>
 		<elasticsearch.plugin.name>sql</elasticsearch.plugin.name>
-		<elasticsearch.version>7.3.2</elasticsearch.version>
+		<elasticsearch.version>7.4.0</elasticsearch.version>
 		<elasticsearch.plugin.classname>org.elasticsearch.plugin.nlpcn.SqlPlug</elasticsearch.plugin.classname>
         <druid.version>1.1.16</druid.version>
         <guava.version>15.0</guava.version>

src/main/java/org/elasticsearch/plugin/nlpcn/RestSqlAction.java

@@ -3,32 +3,38 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.elasticsearch.client.node.NodeClient;
-import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.common.xcontent.XContentType;
 import org.elasticsearch.plugin.nlpcn.executors.ActionRequestRestExecuterFactory;
 import org.elasticsearch.plugin.nlpcn.executors.RestExecutor;
-import org.elasticsearch.rest.*;
+import org.elasticsearch.rest.BaseRestHandler;
+import org.elasticsearch.rest.BytesRestResponse;
+import org.elasticsearch.rest.RestController;
+import org.elasticsearch.rest.RestRequest;
+import org.elasticsearch.rest.RestStatus;
 import org.nlpcn.es4sql.SearchDao;
 import org.nlpcn.es4sql.exception.SqlParseException;
 import org.nlpcn.es4sql.query.QueryAction;
 
 import java.io.IOException;
 import java.sql.SQLFeatureNotSupportedException;
-import java.util.*;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
 
 
 public class RestSqlAction extends BaseRestHandler {
 
     private static final Logger LOGGER = LogManager.getLogger();
 
-	public RestSqlAction(Settings settings, RestController restController) {
-        super(settings);
-		restController.registerHandler(RestRequest.Method.POST, "/_sql/_explain", this);
-		restController.registerHandler(RestRequest.Method.GET, "/_sql/_explain", this);
-		restController.registerHandler(RestRequest.Method.POST, "/_sql", this);
-		restController.registerHandler(RestRequest.Method.GET, "/_sql", this);
-	}
+    public RestSqlAction(RestController restController) {
+        restController.registerHandler(RestRequest.Method.POST, "/_sql/_explain", this);
+        restController.registerHandler(RestRequest.Method.GET, "/_sql/_explain", this);
+        restController.registerHandler(RestRequest.Method.POST, "/_sql", this);
+        restController.registerHandler(RestRequest.Method.GET, "/_sql", this);
+    }
 
     @Override
     public String getName() {

src/main/java/org/elasticsearch/plugin/nlpcn/SqlPlug.java

@@ -17,21 +17,21 @@
 
 public class SqlPlug extends Plugin implements ActionPlugin {
 
-	public SqlPlug() {
-	}
+    public SqlPlug() {
+    }
 
 
-	public String name() {
-		return "sql";
-	}
+    public String name() {
+        return "sql";
+    }
 
-	public String description() {
-		return "Use sql to query elasticsearch.";
-	}
+    public String description() {
+        return "Use sql to query elasticsearch.";
+    }
 
 
-	@Override
-	public List<RestHandler> getRestHandlers(Settings settings, RestController restController, ClusterSettings clusterSettings, IndexScopedSettings indexScopedSettings, SettingsFilter settingsFilter, IndexNameExpressionResolver indexNameExpressionResolver, Supplier<DiscoveryNodes> nodesInCluster) {
-		return Collections.singletonList(new RestSqlAction(settings, restController));
-	}
+    @Override
+    public List<RestHandler> getRestHandlers(Settings settings, RestController restController, ClusterSettings clusterSettings, IndexScopedSettings indexScopedSettings, SettingsFilter settingsFilter, IndexNameExpressionResolver indexNameExpressionResolver, Supplier<DiscoveryNodes> nodesInCluster) {
+        return Collections.singletonList(new RestSqlAction(restController));
+    }
 }

src/test/resources/expectedOutput/search_spatial_explain.json

@@ -12,7 +12,6 @@
                                     "place" : {
                                         "shape" : {
                                             "type" : "polygon",
-                                            "orientation" : "right",
                                             "coordinates" : [
                                                 [
                                                     [