es 6.4.2 support

Author: shi-yuan

.travis.yml

@@ -17,7 +17,7 @@ before_install:
   # update to java 8
   - sudo update-java-alternatives -s java-8-oracle
   - export JAVA_HOME=/usr/lib/jvm/java-8-oracle
-  - wget https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.4.1.deb && sudo dpkg -i --force-confnew elasticsearch-6.4.1.deb
+  - wget https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.4.2.deb && sudo dpkg -i --force-confnew elasticsearch-6.4.2.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>6.4.1.1</version>
+	<version>6.4.2.0</version>
 	<packaging>jar</packaging>
 	<description>Query elasticsearch using SQL</description>
 	<name>elasticsearch-sql</name>
@@ -45,7 +45,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<runSuite>**/MainTestSuite.class</runSuite>
 		<elasticsearch.plugin.name>sql</elasticsearch.plugin.name>
-		<elasticsearch.version>6.4.1</elasticsearch.version>
+		<elasticsearch.version>6.4.2</elasticsearch.version>
 		<elasticsearch.plugin.classname>org.elasticsearch.plugin.nlpcn.SqlPlug</elasticsearch.plugin.classname>
 	</properties>
 

src/main/java/org/nlpcn/es4sql/parse/CaseWhenParser.java

@@ -4,8 +4,6 @@
 import com.alibaba.druid.sql.ast.expr.SQLCaseExpr;
 import com.alibaba.druid.sql.ast.expr.SQLNullExpr;
 import com.google.common.base.Joiner;
-import org.elasticsearch.common.inject.internal.Join;
-import org.nlpcn.es4sql.SQLFunctions;
 import org.nlpcn.es4sql.Util;
 import org.nlpcn.es4sql.domain.Condition;
 import org.nlpcn.es4sql.domain.Condition.OPEAR;
@@ -75,7 +73,7 @@ private void explainWhere(List<String> codes, Where where) throws SqlParseExcept
             Condition condition = (Condition) where;
 
             if (condition.getValue() instanceof ScriptFilter) {
-                codes.add("(" + ((ScriptFilter) condition.getValue()).getScript() + ")");
+                codes.add(String.format("Function.identity().compose((o)->{%s}).apply(null)", ((ScriptFilter) condition.getValue()).getScript()));
             } else if (condition.getOpear() == OPEAR.BETWEEN) {
                 Object[] objs = (Object[]) condition.getValue();
                 codes.add("(" + "doc['" + condition.getName() + "'].value >= " + objs[0] + " && doc['"