Merge branch '2.x'

README.md

@@ -2,13 +2,13 @@ elasticsearch-query-tookit
 ====================================
 
 版本
--------------
+------------
 
-toolkit version | ES version
------------|-----------
-master | 2.4.4
-2.4.4.2 | 2.4.4
-1.x    | 1.4.5
+| toolkit version | ES version |
+| --------------- | ---------- |
+| master          | 2.4.4      |
+| 2.4.4.2         | 2.4.4      |
+| 1.x             | 1.4.5      |
 
 介绍
 -------------
@@ -75,8 +75,8 @@ SearchResponse response = searchReq.execute().actionGet();
 2. 指定连接ES的连接串：jdbc:elastic:192.168.0.109:9300/product_cluster
 3. 创建一个SqlMapClient对象，并指定sqlMapConfig.xml路径
 ```bash
-<bean id="elasticDataSource" class="org.elasticsearch.api.ElasticSingleConnectionDataSource" destroy-method="destroy">
-    <property name="driverClassName" value="org.elasticsearch.api.ElasticDriver" />
+<bean id="elasticDataSource" class="org.es.jdbc.api.ElasticSingleConnectionDataSource" destroy-method="destroy">
+    <property name="driverClassName" value="org.es.jdbc.api.ElasticDriver" />
     <property name="url" value="jdbc:elastic:192.168.0.109:9300/lu-search-cluster" />
     <property name="suppressClose" value="true" />
 </bean>
@@ -86,7 +86,7 @@ SearchResponse response = searchReq.execute().actionGet();
     <property name="configLocation" value="classpath:sqlMapConfig.xml"/>
 </bean>
 
-<bean id="sqlMapClientTemplate" class="org.elasticsearch.ElasticSqlMapClientTemplate">
+<bean id="sqlMapClientTemplate" class="org.es.spring.ElasticSqlMapClientTemplate">
     <property name="sqlMapClient" ref="sqlMapClient"/>
 </bean>
 ```

elasticsearch-query-core/src/main/java/org/elasticsearch/druid/ElasticSqlExprParser.java

@@ -1,4 +1,4 @@
-package org.elasticsearch.druid;
+package org.es.sql.druid;
 
 import com.alibaba.druid.sql.ast.SQLExpr;
 import com.alibaba.druid.sql.parser.Lexer;

elasticsearch-query-core/src/main/java/org/elasticsearch/druid/ElasticSqlLexer.java

@@ -1,4 +1,4 @@
-package org.elasticsearch.druid;
+package org.es.sql.druid;
 
 import com.alibaba.druid.sql.parser.Keywords;
 import com.alibaba.druid.sql.parser.Lexer;

elasticsearch-query-core/src/main/java/org/elasticsearch/druid/ElasticSqlSelectParser.java

@@ -1,4 +1,4 @@
-package org.elasticsearch.druid;
+package org.es.sql.druid;
 
 import com.alibaba.druid.sql.ast.SQLExpr;
 import com.alibaba.druid.sql.ast.SQLSetQuantifier;

elasticsearch-query-core/src/main/java/org/elasticsearch/druid/ElasticSqlSelectQueryBlock.java

@@ -1,4 +1,4 @@
-package org.elasticsearch.druid;
+package org.es.sql.druid;
 
 import com.alibaba.druid.sql.ast.SQLExpr;
 import com.alibaba.druid.sql.ast.SQLObject;

elasticsearch-query-core/src/main/java/org/elasticsearch/dsl/bean/AtomQuery.java

@@ -1,4 +1,4 @@
-package org.elasticsearch.dsl.bean;
+package org.es.sql.dsl.bean;
 
 import org.elasticsearch.index.query.QueryBuilder;
 

elasticsearch-query-core/src/main/java/org/elasticsearch/dsl/bean/ElasticDslContext.java

@@ -1,4 +1,4 @@
-package org.elasticsearch.dsl.bean;
+package org.es.sql.dsl.bean;
 
 import com.alibaba.druid.sql.ast.expr.SQLQueryExpr;
 

elasticsearch-query-core/src/main/java/org/elasticsearch/dsl/bean/ElasticSqlParseResult.java

@@ -1,4 +1,4 @@
-package org.elasticsearch.dsl.bean;
+package org.es.sql.dsl.bean;
 
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
@@ -10,7 +10,7 @@ import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.search.aggregations.AbstractAggregationBuilder;
 import org.elasticsearch.search.aggregations.AggregationBuilder;
 import org.elasticsearch.search.sort.SortBuilder;
-import org.elasticsearch.utils.ElasticMockClient;
+import org.es.sql.utils.ElasticMockClient;
 
 import java.util.List;
 

elasticsearch-query-core/src/main/java/org/elasticsearch/dsl/bean/ElasticSqlQueryField.java

@@ -1,6 +1,6 @@
-package org.elasticsearch.dsl.bean;
+package org.es.sql.dsl.bean;
 
-import org.elasticsearch.dsl.enums.QueryFieldType;
+import org.es.sql.dsl.enums.QueryFieldType;
 
 public class ElasticSqlQueryField {
     /*[内嵌文档]的上下文路径*/

elasticsearch-query-core/src/main/java/org/elasticsearch/dsl/bean/ElasticSqlQueryFields.java

@@ -1,6 +1,6 @@
-package org.elasticsearch.dsl.bean;
+package org.es.sql.dsl.bean;
 
-import org.elasticsearch.dsl.enums.QueryFieldType;
+import org.es.sql.dsl.enums.QueryFieldType;
 
 public class ElasticSqlQueryFields {
     private ElasticSqlQueryFields() {

elasticsearch-query-core/src/main/java/org/elasticsearch/dsl/bean/QueryFieldReferenceNode.java

@@ -1,4 +1,4 @@
-package org.elasticsearch.dsl.bean;
+package org.es.sql.dsl.bean;
 
 public class QueryFieldReferenceNode {
 

elasticsearch-query-core/src/main/java/org/elasticsearch/dsl/bean/QueryFieldReferencePath.java

@@ -1,4 +1,4 @@
-package org.elasticsearch.dsl.bean;
+package org.es.sql.dsl.bean;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;

elasticsearch-query-core/src/main/java/org/elasticsearch/dsl/bean/RangeSegment.java

@@ -1,4 +1,4 @@
-package org.elasticsearch.dsl.bean;
+package org.es.sql.dsl.bean;
 
 public class RangeSegment {
     private Object from;

elasticsearch-query-core/src/main/java/org/elasticsearch/dsl/bean/SQLCondition.java

@@ -1,8 +1,8 @@
-package org.elasticsearch.dsl.bean;
+package org.es.sql.dsl.bean;
 
 import com.google.common.collect.Lists;
-import org.elasticsearch.dsl.enums.SQLBoolOperator;
-import org.elasticsearch.dsl.enums.SQLConditionType;
+import org.es.sql.dsl.enums.SQLBoolOperator;
+import org.es.sql.dsl.enums.SQLConditionType;
 
 import java.util.List;
 

elasticsearch-query-core/src/main/java/org/elasticsearch/dsl/enums/QueryFieldType.java

@@ -1,4 +1,4 @@
-package org.elasticsearch.dsl.enums;
+package org.es.sql.dsl.enums;
 
 public enum QueryFieldType {
     MatchAllField,

elasticsearch-query-core/src/main/java/org/elasticsearch/dsl/enums/SQLBoolOperator.java

@@ -1,4 +1,4 @@
-package org.elasticsearch.dsl.enums;
+package org.es.sql.dsl.enums;
 
 public enum SQLBoolOperator {
     AND, OR

elasticsearch-query-core/src/main/java/org/elasticsearch/dsl/enums/SQLConditionOperator.java

@@ -1,4 +1,4 @@
-package org.elasticsearch.dsl.enums;
+package org.es.sql.dsl.enums;
 
 public enum SQLConditionOperator {
     Equality,

elasticsearch-query-core/src/main/java/org/elasticsearch/dsl/enums/SQLConditionType.java

@@ -1,4 +1,4 @@
-package org.elasticsearch.dsl.enums;
+package org.es.sql.dsl.enums;
 
 
 public enum SQLConditionType {

elasticsearch-query-core/src/main/java/org/elasticsearch/dsl/enums/SortOption.java

@@ -1,4 +1,4 @@
-package org.elasticsearch.dsl.enums;
+package org.es.sql.dsl.enums;
 
 public enum SortOption {
     SUM {

elasticsearch-query-core/src/main/java/org/elasticsearch/dsl/exception/ElasticSql2DslException.java

@@ -1,4 +1,4 @@
-package org.elasticsearch.dsl.exception;
+package org.es.sql.dsl.exception;
 
 import com.alibaba.druid.sql.parser.ParserException;
 

elasticsearch-query-core/src/main/java/org/elasticsearch/dsl/helper/ElasticSqlArgTransferHelper.java

@@ -1,8 +1,8 @@
-package org.elasticsearch.dsl.helper;
+package org.es.sql.dsl.helper;
 
 import com.alibaba.druid.sql.ast.SQLExpr;
 import com.alibaba.druid.sql.ast.expr.*;
-import org.elasticsearch.dsl.exception.ElasticSql2DslException;
+import org.es.sql.dsl.exception.ElasticSql2DslException;
 
 import java.util.List;
 

elasticsearch-query-core/src/main/java/org/elasticsearch/dsl/helper/ElasticSqlDateParseHelper.java

@@ -1,8 +1,8 @@
-package org.elasticsearch.dsl.helper;
+package org.es.sql.dsl.helper;
 
 import com.alibaba.druid.sql.ast.expr.SQLMethodInvokeExpr;
-import org.elasticsearch.dsl.exception.ElasticSql2DslException;
-import org.elasticsearch.utils.Constants;
+import org.es.sql.dsl.exception.ElasticSql2DslException;
+import org.es.sql.utils.Constants;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;

elasticsearch-query-core/src/main/java/org/elasticsearch/dsl/helper/ElasticSqlMethodInvokeHelper.java

@@ -1,12 +1,12 @@
-package org.elasticsearch.dsl.helper;
+package org.es.sql.dsl.helper;
 
 import com.alibaba.druid.sql.ast.SQLExpr;
 import com.alibaba.druid.sql.ast.expr.*;
 import com.google.common.collect.ImmutableList;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
-import org.elasticsearch.dsl.enums.SortOption;
-import org.elasticsearch.dsl.exception.ElasticSql2DslException;
+import org.es.sql.dsl.enums.SortOption;
+import org.es.sql.dsl.exception.ElasticSql2DslException;
 
 import java.util.List;
 

elasticsearch-query-core/src/main/java/org/elasticsearch/dsl/listener/ParseActionListener.java

@@ -1,7 +1,7 @@
-package org.elasticsearch.dsl.listener;
+package org.es.sql.dsl.listener;
 
-import org.elasticsearch.dsl.bean.ElasticSqlQueryField;
-import org.elasticsearch.dsl.enums.SQLConditionOperator;
+import org.es.sql.dsl.bean.ElasticSqlQueryField;
+import org.es.sql.dsl.enums.SQLConditionOperator;
 
 public interface ParseActionListener {
 

elasticsearch-query-core/src/main/java/org/elasticsearch/dsl/listener/ParseActionListenerAdapter.java

@@ -1,7 +1,7 @@
-package org.elasticsearch.dsl.listener;
+package org.es.sql.dsl.listener;
 
-import org.elasticsearch.dsl.bean.ElasticSqlQueryField;
-import org.elasticsearch.dsl.enums.SQLConditionOperator;
+import org.es.sql.dsl.bean.ElasticSqlQueryField;
+import org.es.sql.dsl.enums.SQLConditionOperator;
 
 public class ParseActionListenerAdapter implements ParseActionListener {
 

elasticsearch-query-core/src/main/java/org/elasticsearch/dsl/parser/ElasticSql2DslParser.java

@@ -1,18 +1,18 @@
-package org.elasticsearch.dsl.parser;
+package org.es.sql.dsl.parser;
 
 import com.alibaba.druid.sql.ast.SQLExpr;
 import com.alibaba.druid.sql.ast.expr.SQLQueryExpr;
 import com.alibaba.druid.sql.parser.ParserException;
 import com.alibaba.druid.sql.parser.Token;
 import com.google.common.collect.ImmutableList;
-import org.elasticsearch.druid.ElasticSqlExprParser;
-import org.elasticsearch.druid.ElasticSqlSelectQueryBlock;
-import org.elasticsearch.dsl.bean.ElasticDslContext;
-import org.elasticsearch.dsl.bean.ElasticSqlParseResult;
-import org.elasticsearch.dsl.exception.ElasticSql2DslException;
-import org.elasticsearch.dsl.listener.ParseActionListener;
-import org.elasticsearch.dsl.listener.ParseActionListenerAdapter;
-import org.elasticsearch.dsl.parser.sql.*;
+import org.es.sql.druid.ElasticSqlExprParser;
+import org.es.sql.druid.ElasticSqlSelectQueryBlock;
+import org.es.sql.dsl.bean.ElasticDslContext;
+import org.es.sql.dsl.bean.ElasticSqlParseResult;
+import org.es.sql.dsl.exception.ElasticSql2DslException;
+import org.es.sql.dsl.listener.ParseActionListener;
+import org.es.sql.dsl.listener.ParseActionListenerAdapter;
+import org.es.sql.dsl.parser.sql.*;
 
 import java.lang.reflect.Array;
 import java.util.Collection;

elasticsearch-query-core/src/main/java/org/elasticsearch/dsl/parser/query/exact/AbstractAtomExactQueryParser.java

@@ -1,13 +1,13 @@
-package org.elasticsearch.dsl.parser.query.exact;
+package org.es.sql.dsl.parser.query.exact;
 
 import com.alibaba.druid.sql.ast.SQLExpr;
-import org.elasticsearch.dsl.bean.AtomQuery;
-import org.elasticsearch.dsl.bean.ElasticSqlQueryField;
-import org.elasticsearch.dsl.enums.QueryFieldType;
-import org.elasticsearch.dsl.enums.SQLConditionOperator;
-import org.elasticsearch.dsl.exception.ElasticSql2DslException;
-import org.elasticsearch.dsl.listener.ParseActionListener;
-import org.elasticsearch.dsl.parser.sql.QueryFieldParser;
+import org.es.sql.dsl.bean.AtomQuery;
+import org.es.sql.dsl.bean.ElasticSqlQueryField;
+import org.es.sql.dsl.enums.QueryFieldType;
+import org.es.sql.dsl.enums.SQLConditionOperator;
+import org.es.sql.dsl.exception.ElasticSql2DslException;
+import org.es.sql.dsl.listener.ParseActionListener;
+import org.es.sql.dsl.parser.sql.QueryFieldParser;
 import org.elasticsearch.index.query.QueryBuilder;
 
 public abstract class AbstractAtomExactQueryParser {

elasticsearch-query-core/src/main/java/org/elasticsearch/dsl/parser/query/exact/BetweenAndAtomQueryParser.java

@@ -1,11 +1,11 @@
-package org.elasticsearch.dsl.parser.query.exact;
+package org.es.sql.dsl.parser.query.exact;
 
 import com.alibaba.druid.sql.ast.expr.SQLBetweenExpr;
-import org.elasticsearch.dsl.bean.AtomQuery;
-import org.elasticsearch.dsl.enums.SQLConditionOperator;
-import org.elasticsearch.dsl.exception.ElasticSql2DslException;
-import org.elasticsearch.dsl.helper.ElasticSqlArgTransferHelper;
-import org.elasticsearch.dsl.listener.ParseActionListener;
+import org.es.sql.dsl.bean.AtomQuery;
+import org.es.sql.dsl.enums.SQLConditionOperator;
+import org.es.sql.dsl.exception.ElasticSql2DslException;
+import org.es.sql.dsl.helper.ElasticSqlArgTransferHelper;
+import org.es.sql.dsl.listener.ParseActionListener;
 import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
 

elasticsearch-query-core/src/main/java/org/elasticsearch/dsl/parser/query/exact/BinaryAtomQueryParser.java

@@ -1,13 +1,13 @@
-package org.elasticsearch.dsl.parser.query.exact;
+package org.es.sql.dsl.parser.query.exact;
 
 import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr;
 import com.alibaba.druid.sql.ast.expr.SQLBinaryOperator;
 import com.alibaba.druid.sql.ast.expr.SQLNullExpr;
-import org.elasticsearch.dsl.bean.AtomQuery;
-import org.elasticsearch.dsl.enums.SQLConditionOperator;
-import org.elasticsearch.dsl.exception.ElasticSql2DslException;
-import org.elasticsearch.dsl.helper.ElasticSqlArgTransferHelper;
-import org.elasticsearch.dsl.listener.ParseActionListener;
+import org.es.sql.dsl.bean.AtomQuery;
+import org.es.sql.dsl.enums.SQLConditionOperator;
+import org.es.sql.dsl.exception.ElasticSql2DslException;
+import org.es.sql.dsl.helper.ElasticSqlArgTransferHelper;
+import org.es.sql.dsl.listener.ParseActionListener;
 import org.elasticsearch.index.query.ExistsQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;

elasticsearch-query-core/src/main/java/org/elasticsearch/dsl/parser/query/exact/IConditionExactQueryBuilder.java

@@ -1,6 +1,6 @@
-package org.elasticsearch.dsl.parser.query.exact;
+package org.es.sql.dsl.parser.query.exact;
 
-import org.elasticsearch.dsl.enums.SQLConditionOperator;
+import org.es.sql.dsl.enums.SQLConditionOperator;
 import org.elasticsearch.index.query.QueryBuilder;
 
 @FunctionalInterface

elasticsearch-query-core/src/main/java/org/elasticsearch/dsl/parser/query/exact/InListAtomQueryParser.java

@@ -1,12 +1,12 @@
-package org.elasticsearch.dsl.parser.query.exact;
+package org.es.sql.dsl.parser.query.exact;
 
 import com.alibaba.druid.sql.ast.expr.SQLInListExpr;
 import org.apache.commons.collections.CollectionUtils;
-import org.elasticsearch.dsl.bean.AtomQuery;
-import org.elasticsearch.dsl.enums.SQLConditionOperator;
-import org.elasticsearch.dsl.exception.ElasticSql2DslException;
-import org.elasticsearch.dsl.helper.ElasticSqlArgTransferHelper;
-import org.elasticsearch.dsl.listener.ParseActionListener;
+import org.es.sql.dsl.bean.AtomQuery;
+import org.es.sql.dsl.enums.SQLConditionOperator;
+import org.es.sql.dsl.exception.ElasticSql2DslException;
+import org.es.sql.dsl.helper.ElasticSqlArgTransferHelper;
+import org.es.sql.dsl.listener.ParseActionListener;
 import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
 

elasticsearch-query-core/src/main/java/org/elasticsearch/dsl/parser/query/method/AbstractFieldSpecificMethodQueryParser.java

@@ -1,12 +1,12 @@
-package org.elasticsearch.dsl.parser.query.method;
+package org.es.sql.dsl.parser.query.method;
 
 import com.alibaba.druid.sql.ast.SQLExpr;
-import org.elasticsearch.dsl.bean.AtomQuery;
-import org.elasticsearch.dsl.bean.ElasticSqlQueryField;
-import org.elasticsearch.dsl.enums.QueryFieldType;
-import org.elasticsearch.dsl.exception.ElasticSql2DslException;
-import org.elasticsearch.dsl.listener.ParseActionListener;
-import org.elasticsearch.dsl.parser.sql.QueryFieldParser;
+import org.es.sql.dsl.bean.AtomQuery;
+import org.es.sql.dsl.bean.ElasticSqlQueryField;
+import org.es.sql.dsl.enums.QueryFieldType;
+import org.es.sql.dsl.exception.ElasticSql2DslException;
+import org.es.sql.dsl.listener.ParseActionListener;
+import org.es.sql.dsl.parser.sql.QueryFieldParser;
 import org.elasticsearch.index.query.QueryBuilder;
 
 import java.util.Map;

elasticsearch-query-core/src/main/java/org/elasticsearch/dsl/parser/query/method/CheckableMethodQueryParser.java

@@ -1,8 +1,8 @@
-package org.elasticsearch.dsl.parser.query.method;
+package org.es.sql.dsl.parser.query.method;
 
-import org.elasticsearch.dsl.bean.AtomQuery;
-import org.elasticsearch.dsl.exception.ElasticSql2DslException;
-import org.elasticsearch.dsl.helper.ElasticSqlMethodInvokeHelper;
+import org.es.sql.dsl.bean.AtomQuery;
+import org.es.sql.dsl.exception.ElasticSql2DslException;
+import org.es.sql.dsl.helper.ElasticSqlMethodInvokeHelper;
 
 public abstract class CheckableMethodQueryParser implements MethodQueryParser {
 

elasticsearch-query-core/src/main/java/org/elasticsearch/dsl/parser/query/method/MethodInvocation.java

@@ -1,8 +1,8 @@
-package org.elasticsearch.dsl.parser.query.method;
+package org.es.sql.dsl.parser.query.method;
 
 import com.alibaba.druid.sql.ast.SQLExpr;
 import com.alibaba.druid.sql.ast.expr.SQLMethodInvokeExpr;
-import org.elasticsearch.dsl.helper.ElasticSqlArgTransferHelper;
+import org.es.sql.dsl.helper.ElasticSqlArgTransferHelper;
 
 import java.util.List;
 

elasticsearch-query-core/src/main/java/org/elasticsearch/dsl/parser/query/method/MethodQueryParser.java

@@ -1,7 +1,7 @@
-package org.elasticsearch.dsl.parser.query.method;
+package org.es.sql.dsl.parser.query.method;
 
-import org.elasticsearch.dsl.bean.AtomQuery;
-import org.elasticsearch.dsl.exception.ElasticSql2DslException;
+import org.es.sql.dsl.bean.AtomQuery;
+import org.es.sql.dsl.exception.ElasticSql2DslException;
 
 import java.util.List;
 

elasticsearch-query-core/src/main/java/org/elasticsearch/dsl/parser/query/method/ParameterizedMethodQueryParser.java

@@ -1,9 +1,9 @@
-package org.elasticsearch.dsl.parser.query.method;
+package org.es.sql.dsl.parser.query.method;
 
 import com.google.common.collect.Maps;
 import org.apache.commons.lang.StringUtils;
-import org.elasticsearch.dsl.bean.AtomQuery;
-import org.elasticsearch.dsl.exception.ElasticSql2DslException;
+import org.es.sql.dsl.bean.AtomQuery;
+import org.es.sql.dsl.exception.ElasticSql2DslException;
 
 import java.util.Collections;
 import java.util.Map;

elasticsearch-query-core/src/main/java/org/elasticsearch/dsl/parser/query/method/fulltext/FullTextAtomQueryParser.java

@@ -1,12 +1,12 @@
-package org.elasticsearch.dsl.parser.query.method.fulltext;
+package org.es.sql.dsl.parser.query.method.fulltext;
 
 import com.alibaba.druid.sql.ast.expr.SQLMethodInvokeExpr;
 import com.google.common.collect.ImmutableList;
-import org.elasticsearch.dsl.bean.AtomQuery;
-import org.elasticsearch.dsl.exception.ElasticSql2DslException;
-import org.elasticsearch.dsl.listener.ParseActionListener;
-import org.elasticsearch.dsl.parser.query.method.MethodInvocation;
-import org.elasticsearch.dsl.parser.query.method.MethodQueryParser;
+import org.es.sql.dsl.bean.AtomQuery;
+import org.es.sql.dsl.exception.ElasticSql2DslException;
+import org.es.sql.dsl.listener.ParseActionListener;
+import org.es.sql.dsl.parser.query.method.MethodInvocation;
+import org.es.sql.dsl.parser.query.method.MethodQueryParser;
 
 import java.util.List;
 import java.util.function.Predicate;

elasticsearch-query-core/src/main/java/org/elasticsearch/dsl/parser/query/method/fulltext/MatchAtomQueryParser.java

@@ -1,14 +1,14 @@
-package org.elasticsearch.dsl.parser.query.method.fulltext;
+package org.es.sql.dsl.parser.query.method.fulltext;
 
 import com.alibaba.druid.sql.ast.SQLExpr;
 import com.google.common.collect.ImmutableList;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang.StringUtils;
 import org.elasticsearch.common.unit.Fuzziness;
-import org.elasticsearch.dsl.exception.ElasticSql2DslException;
-import org.elasticsearch.dsl.listener.ParseActionListener;
-import org.elasticsearch.dsl.parser.query.method.AbstractFieldSpecificMethodQueryParser;
-import org.elasticsearch.dsl.parser.query.method.MethodInvocation;
+import org.es.sql.dsl.exception.ElasticSql2DslException;
+import org.es.sql.dsl.listener.ParseActionListener;
+import org.es.sql.dsl.parser.query.method.AbstractFieldSpecificMethodQueryParser;
+import org.es.sql.dsl.parser.query.method.MethodInvocation;
 import org.elasticsearch.index.query.MatchQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;

elasticsearch-query-core/src/main/java/org/elasticsearch/dsl/parser/query/method/fulltext/MultiMatchAtomQueryParser.java

@@ -1,13 +1,13 @@
-package org.elasticsearch.dsl.parser.query.method.fulltext;
+package org.es.sql.dsl.parser.query.method.fulltext;
 
 import com.google.common.collect.ImmutableList;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang.StringUtils;
 import org.elasticsearch.common.unit.Fuzziness;
-import org.elasticsearch.dsl.bean.AtomQuery;
-import org.elasticsearch.dsl.exception.ElasticSql2DslException;
-import org.elasticsearch.dsl.parser.query.method.MethodInvocation;
-import org.elasticsearch.dsl.parser.query.method.ParameterizedMethodQueryParser;
+import org.es.sql.dsl.bean.AtomQuery;
+import org.es.sql.dsl.exception.ElasticSql2DslException;
+import org.es.sql.dsl.parser.query.method.MethodInvocation;
+import org.es.sql.dsl.parser.query.method.ParameterizedMethodQueryParser;
 import org.elasticsearch.index.query.MatchQueryBuilder;
 import org.elasticsearch.index.query.MultiMatchQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;

elasticsearch-query-core/src/main/java/org/elasticsearch/dsl/parser/query/method/fulltext/QueryStringAtomQueryParser.java

@@ -1,13 +1,13 @@
-package org.elasticsearch.dsl.parser.query.method.fulltext;
+package org.es.sql.dsl.parser.query.method.fulltext;
 
 import com.google.common.collect.ImmutableList;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang.StringUtils;
 import org.elasticsearch.common.unit.Fuzziness;
-import org.elasticsearch.dsl.bean.AtomQuery;
-import org.elasticsearch.dsl.exception.ElasticSql2DslException;
-import org.elasticsearch.dsl.parser.query.method.MethodInvocation;
-import org.elasticsearch.dsl.parser.query.method.ParameterizedMethodQueryParser;
+import org.es.sql.dsl.bean.AtomQuery;
+import org.es.sql.dsl.exception.ElasticSql2DslException;
+import org.es.sql.dsl.parser.query.method.MethodInvocation;
+import org.es.sql.dsl.parser.query.method.ParameterizedMethodQueryParser;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.index.query.QueryStringQueryBuilder;
 

elasticsearch-query-core/src/main/java/org/elasticsearch/dsl/parser/query/method/fulltext/SimpleQueryStringAtomQueryParser.java

@@ -1,13 +1,13 @@
-package org.elasticsearch.dsl.parser.query.method.fulltext;
+package org.es.sql.dsl.parser.query.method.fulltext;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang.StringUtils;
-import org.elasticsearch.dsl.bean.AtomQuery;
-import org.elasticsearch.dsl.exception.ElasticSql2DslException;
-import org.elasticsearch.dsl.parser.query.method.MethodInvocation;
-import org.elasticsearch.dsl.parser.query.method.ParameterizedMethodQueryParser;
+import org.es.sql.dsl.bean.AtomQuery;
+import org.es.sql.dsl.exception.ElasticSql2DslException;
+import org.es.sql.dsl.parser.query.method.MethodInvocation;
+import org.es.sql.dsl.parser.query.method.ParameterizedMethodQueryParser;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.index.query.SimpleQueryStringBuilder;
 import org.elasticsearch.index.query.SimpleQueryStringFlag;

elasticsearch-query-core/src/main/java/org/elasticsearch/dsl/parser/query/method/script/ScriptAtomQueryParser.java

@@ -1,4 +1,4 @@
-package org.elasticsearch.dsl.parser.query.method.script;
+package org.es.sql.dsl.parser.query.method.script;
 
 import com.alibaba.druid.sql.ast.SQLExpr;
 import com.google.common.collect.ImmutableList;
@@ -6,11 +6,11 @@ import com.google.common.collect.Maps;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.math.NumberUtils;
-import org.elasticsearch.dsl.bean.AtomQuery;
-import org.elasticsearch.dsl.exception.ElasticSql2DslException;
-import org.elasticsearch.dsl.helper.ElasticSqlArgTransferHelper;
-import org.elasticsearch.dsl.parser.query.method.MethodInvocation;
-import org.elasticsearch.dsl.parser.query.method.ParameterizedMethodQueryParser;
+import org.es.sql.dsl.bean.AtomQuery;
+import org.es.sql.dsl.exception.ElasticSql2DslException;
+import org.es.sql.dsl.helper.ElasticSqlArgTransferHelper;
+import org.es.sql.dsl.parser.query.method.MethodInvocation;
+import org.es.sql.dsl.parser.query.method.ParameterizedMethodQueryParser;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.script.Script;
 import org.elasticsearch.script.ScriptService;

elasticsearch-query-core/src/main/java/org/elasticsearch/dsl/parser/query/method/term/FuzzyAtomQueryParser.java

@@ -1,14 +1,14 @@
-package org.elasticsearch.dsl.parser.query.method.term;
+package org.es.sql.dsl.parser.query.method.term;
 
 import com.alibaba.druid.sql.ast.SQLExpr;
 import com.google.common.collect.ImmutableList;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang.StringUtils;
 import org.elasticsearch.common.unit.Fuzziness;
-import org.elasticsearch.dsl.exception.ElasticSql2DslException;
-import org.elasticsearch.dsl.listener.ParseActionListener;
-import org.elasticsearch.dsl.parser.query.method.AbstractFieldSpecificMethodQueryParser;
-import org.elasticsearch.dsl.parser.query.method.MethodInvocation;
+import org.es.sql.dsl.exception.ElasticSql2DslException;
+import org.es.sql.dsl.listener.ParseActionListener;
+import org.es.sql.dsl.parser.query.method.AbstractFieldSpecificMethodQueryParser;
+import org.es.sql.dsl.parser.query.method.MethodInvocation;
 import org.elasticsearch.index.query.FuzzyQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;

elasticsearch-query-core/src/main/java/org/elasticsearch/dsl/parser/query/method/term/PrefixAtomQueryParser.java

@@ -1,13 +1,13 @@
-package org.elasticsearch.dsl.parser.query.method.term;
+package org.es.sql.dsl.parser.query.method.term;
 
 import com.alibaba.druid.sql.ast.SQLExpr;
 import com.google.common.collect.ImmutableList;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang.StringUtils;
-import org.elasticsearch.dsl.exception.ElasticSql2DslException;
-import org.elasticsearch.dsl.listener.ParseActionListener;
-import org.elasticsearch.dsl.parser.query.method.AbstractFieldSpecificMethodQueryParser;
-import org.elasticsearch.dsl.parser.query.method.MethodInvocation;
+import org.es.sql.dsl.exception.ElasticSql2DslException;
+import org.es.sql.dsl.listener.ParseActionListener;
+import org.es.sql.dsl.parser.query.method.AbstractFieldSpecificMethodQueryParser;
+import org.es.sql.dsl.parser.query.method.MethodInvocation;
 import org.elasticsearch.index.query.PrefixQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;

elasticsearch-query-core/src/main/java/org/elasticsearch/dsl/parser/query/method/term/RegexpAtomQueryParser.java

@@ -1,14 +1,14 @@
-package org.elasticsearch.dsl.parser.query.method.term;
+package org.es.sql.dsl.parser.query.method.term;
 
 import com.alibaba.druid.sql.ast.SQLExpr;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang.StringUtils;
-import org.elasticsearch.dsl.exception.ElasticSql2DslException;
-import org.elasticsearch.dsl.listener.ParseActionListener;
-import org.elasticsearch.dsl.parser.query.method.AbstractFieldSpecificMethodQueryParser;
-import org.elasticsearch.dsl.parser.query.method.MethodInvocation;
+import org.es.sql.dsl.exception.ElasticSql2DslException;
+import org.es.sql.dsl.listener.ParseActionListener;
+import org.es.sql.dsl.parser.query.method.AbstractFieldSpecificMethodQueryParser;
+import org.es.sql.dsl.parser.query.method.MethodInvocation;
 import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.index.query.RegexpFlag;

elasticsearch-query-core/src/main/java/org/elasticsearch/dsl/parser/query/method/term/TermAtomQueryParser.java

@@ -1,13 +1,13 @@
-package org.elasticsearch.dsl.parser.query.method.term;
+package org.es.sql.dsl.parser.query.method.term;
 
 import com.alibaba.druid.sql.ast.SQLExpr;
 import com.google.common.collect.ImmutableList;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang.StringUtils;
-import org.elasticsearch.dsl.exception.ElasticSql2DslException;
-import org.elasticsearch.dsl.listener.ParseActionListener;
-import org.elasticsearch.dsl.parser.query.method.AbstractFieldSpecificMethodQueryParser;
-import org.elasticsearch.dsl.parser.query.method.MethodInvocation;
+import org.es.sql.dsl.exception.ElasticSql2DslException;
+import org.es.sql.dsl.listener.ParseActionListener;
+import org.es.sql.dsl.parser.query.method.AbstractFieldSpecificMethodQueryParser;
+import org.es.sql.dsl.parser.query.method.MethodInvocation;
 import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.index.query.TermQueryBuilder;

elasticsearch-query-core/src/main/java/org/elasticsearch/dsl/parser/query/method/term/TermLevelAtomQueryParser.java

@@ -1,12 +1,12 @@
-package org.elasticsearch.dsl.parser.query.method.term;
+package org.es.sql.dsl.parser.query.method.term;
 
 import com.alibaba.druid.sql.ast.expr.SQLMethodInvokeExpr;
 import com.google.common.collect.ImmutableList;
-import org.elasticsearch.dsl.bean.AtomQuery;
-import org.elasticsearch.dsl.exception.ElasticSql2DslException;
-import org.elasticsearch.dsl.listener.ParseActionListener;
-import org.elasticsearch.dsl.parser.query.method.MethodInvocation;
-import org.elasticsearch.dsl.parser.query.method.MethodQueryParser;
+import org.es.sql.dsl.bean.AtomQuery;
+import org.es.sql.dsl.exception.ElasticSql2DslException;
+import org.es.sql.dsl.listener.ParseActionListener;
+import org.es.sql.dsl.parser.query.method.MethodInvocation;
+import org.es.sql.dsl.parser.query.method.MethodQueryParser;
 
 import java.util.List;
 

elasticsearch-query-core/src/main/java/org/elasticsearch/dsl/parser/query/method/term/TermsAtomQueryParser.java

@@ -1,14 +1,14 @@
-package org.elasticsearch.dsl.parser.query.method.term;
+package org.es.sql.dsl.parser.query.method.term;
 
 import com.alibaba.druid.sql.ast.SQLExpr;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang.StringUtils;
-import org.elasticsearch.dsl.exception.ElasticSql2DslException;
-import org.elasticsearch.dsl.listener.ParseActionListener;
-import org.elasticsearch.dsl.parser.query.method.AbstractFieldSpecificMethodQueryParser;
-import org.elasticsearch.dsl.parser.query.method.MethodInvocation;
+import org.es.sql.dsl.exception.ElasticSql2DslException;
+import org.es.sql.dsl.listener.ParseActionListener;
+import org.es.sql.dsl.parser.query.method.AbstractFieldSpecificMethodQueryParser;
+import org.es.sql.dsl.parser.query.method.MethodInvocation;
 import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.index.query.TermsQueryBuilder;

elasticsearch-query-core/src/main/java/org/elasticsearch/dsl/parser/query/method/term/WildcardAtomQueryParser.java

@@ -1,13 +1,13 @@
-package org.elasticsearch.dsl.parser.query.method.term;
+package org.es.sql.dsl.parser.query.method.term;
 
 import com.alibaba.druid.sql.ast.SQLExpr;
 import com.google.common.collect.ImmutableList;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang.StringUtils;
-import org.elasticsearch.dsl.exception.ElasticSql2DslException;
-import org.elasticsearch.dsl.listener.ParseActionListener;
-import org.elasticsearch.dsl.parser.query.method.AbstractFieldSpecificMethodQueryParser;
-import org.elasticsearch.dsl.parser.query.method.MethodInvocation;
+import org.es.sql.dsl.exception.ElasticSql2DslException;
+import org.es.sql.dsl.listener.ParseActionListener;
+import org.es.sql.dsl.parser.query.method.AbstractFieldSpecificMethodQueryParser;
+import org.es.sql.dsl.parser.query.method.MethodInvocation;
 import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.index.query.WildcardQueryBuilder;

elasticsearch-query-core/src/main/java/org/elasticsearch/dsl/parser/sql/AbstractQueryConditionParser.java

@@ -1,23 +1,23 @@
-package org.elasticsearch.dsl.parser.sql;
+package org.es.sql.dsl.parser.sql;
 
 import com.alibaba.druid.sql.ast.SQLExpr;
 import com.alibaba.druid.sql.ast.expr.*;
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.ListMultimap;
 import com.google.common.collect.Lists;
-import org.elasticsearch.dsl.bean.AtomQuery;
-import org.elasticsearch.dsl.bean.SQLCondition;
-import org.elasticsearch.dsl.enums.SQLBoolOperator;
-import org.elasticsearch.dsl.enums.SQLConditionType;
-import org.elasticsearch.dsl.exception.ElasticSql2DslException;
-import org.elasticsearch.dsl.listener.ParseActionListener;
-import org.elasticsearch.dsl.parser.query.exact.BetweenAndAtomQueryParser;
-import org.elasticsearch.dsl.parser.query.exact.BinaryAtomQueryParser;
-import org.elasticsearch.dsl.parser.query.exact.InListAtomQueryParser;
-import org.elasticsearch.dsl.parser.query.method.MethodInvocation;
-import org.elasticsearch.dsl.parser.query.method.fulltext.FullTextAtomQueryParser;
-import org.elasticsearch.dsl.parser.query.method.script.ScriptAtomQueryParser;
-import org.elasticsearch.dsl.parser.query.method.term.TermLevelAtomQueryParser;
+import org.es.sql.dsl.bean.AtomQuery;
+import org.es.sql.dsl.bean.SQLCondition;
+import org.es.sql.dsl.enums.SQLBoolOperator;
+import org.es.sql.dsl.enums.SQLConditionType;
+import org.es.sql.dsl.exception.ElasticSql2DslException;
+import org.es.sql.dsl.listener.ParseActionListener;
+import org.es.sql.dsl.parser.query.exact.BetweenAndAtomQueryParser;
+import org.es.sql.dsl.parser.query.exact.BinaryAtomQueryParser;
+import org.es.sql.dsl.parser.query.exact.InListAtomQueryParser;
+import org.es.sql.dsl.parser.query.method.MethodInvocation;
+import org.es.sql.dsl.parser.query.method.fulltext.FullTextAtomQueryParser;
+import org.es.sql.dsl.parser.query.method.script.ScriptAtomQueryParser;
+import org.es.sql.dsl.parser.query.method.term.TermLevelAtomQueryParser;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;

elasticsearch-query-core/src/main/java/org/elasticsearch/dsl/parser/sql/QueryFieldParser.java

@@ -1,4 +1,4 @@
-package org.elasticsearch.dsl.parser.sql;
+package org.es.sql.dsl.parser.sql;
 
 import com.alibaba.druid.sql.ast.SQLExpr;
 import com.alibaba.druid.sql.ast.expr.SQLAllColumnExpr;
@@ -7,11 +7,11 @@ import com.alibaba.druid.sql.ast.expr.SQLPropertyExpr;
 import com.google.common.collect.Lists;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
-import org.elasticsearch.dsl.bean.ElasticSqlQueryField;
-import org.elasticsearch.dsl.bean.ElasticSqlQueryFields;
-import org.elasticsearch.dsl.bean.QueryFieldReferenceNode;
-import org.elasticsearch.dsl.bean.QueryFieldReferencePath;
-import org.elasticsearch.dsl.exception.ElasticSql2DslException;
+import org.es.sql.dsl.bean.ElasticSqlQueryField;
+import org.es.sql.dsl.bean.ElasticSqlQueryFields;
+import org.es.sql.dsl.bean.QueryFieldReferenceNode;
+import org.es.sql.dsl.bean.QueryFieldReferencePath;
+import org.es.sql.dsl.exception.ElasticSql2DslException;
 
 import java.util.Collections;
 import java.util.Iterator;

elasticsearch-query-core/src/main/java/org/elasticsearch/dsl/parser/sql/QueryFromParser.java

@@ -1,13 +1,13 @@
-package org.elasticsearch.dsl.parser.sql;
+package org.es.sql.dsl.parser.sql;
 
 import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr;
 import com.alibaba.druid.sql.ast.expr.SQLPropertyExpr;
 import com.alibaba.druid.sql.ast.statement.SQLExprTableSource;
 import com.google.common.collect.Lists;
-import org.elasticsearch.druid.ElasticSqlSelectQueryBlock;
-import org.elasticsearch.dsl.bean.ElasticDslContext;
-import org.elasticsearch.dsl.exception.ElasticSql2DslException;
-import org.elasticsearch.dsl.listener.ParseActionListener;
+import org.es.sql.druid.ElasticSqlSelectQueryBlock;
+import org.es.sql.dsl.bean.ElasticDslContext;
+import org.es.sql.dsl.exception.ElasticSql2DslException;
+import org.es.sql.dsl.listener.ParseActionListener;
 
 public class QueryFromParser implements QueryParser {
 

elasticsearch-query-core/src/main/java/org/elasticsearch/dsl/parser/sql/QueryGroupByParser.java

@@ -1,19 +1,19 @@
-package org.elasticsearch.dsl.parser.sql;
+package org.es.sql.dsl.parser.sql;
 
 import com.alibaba.druid.sql.ast.SQLExpr;
 import com.alibaba.druid.sql.ast.expr.SQLMethodInvokeExpr;
 import com.alibaba.druid.sql.ast.statement.SQLSelectGroupByClause;
 import com.google.common.collect.Lists;
 import org.apache.commons.collections.CollectionUtils;
-import org.elasticsearch.druid.ElasticSqlSelectQueryBlock;
-import org.elasticsearch.dsl.bean.ElasticDslContext;
-import org.elasticsearch.dsl.bean.ElasticSqlQueryField;
-import org.elasticsearch.dsl.bean.RangeSegment;
-import org.elasticsearch.dsl.enums.QueryFieldType;
-import org.elasticsearch.dsl.exception.ElasticSql2DslException;
-import org.elasticsearch.dsl.helper.ElasticSqlArgTransferHelper;
-import org.elasticsearch.dsl.helper.ElasticSqlMethodInvokeHelper;
-import org.elasticsearch.dsl.listener.ParseActionListener;
+import org.es.sql.druid.ElasticSqlSelectQueryBlock;
+import org.es.sql.dsl.bean.ElasticDslContext;
+import org.es.sql.dsl.bean.ElasticSqlQueryField;
+import org.es.sql.dsl.bean.RangeSegment;
+import org.es.sql.dsl.enums.QueryFieldType;
+import org.es.sql.dsl.exception.ElasticSql2DslException;
+import org.es.sql.dsl.helper.ElasticSqlArgTransferHelper;
+import org.es.sql.dsl.helper.ElasticSqlMethodInvokeHelper;
+import org.es.sql.dsl.listener.ParseActionListener;
 import org.elasticsearch.search.aggregations.AbstractAggregationBuilder;
 import org.elasticsearch.search.aggregations.AggregationBuilder;
 import org.elasticsearch.search.aggregations.AggregationBuilders;

elasticsearch-query-core/src/main/java/org/elasticsearch/dsl/parser/sql/QueryLimitSizeParser.java

@@ -1,13 +1,13 @@
-package org.elasticsearch.dsl.parser.sql;
+package org.es.sql.dsl.parser.sql;
 
 import com.alibaba.druid.sql.ast.SQLExpr;
 import com.alibaba.druid.sql.ast.expr.SQLIntegerExpr;
 import com.alibaba.druid.sql.ast.expr.SQLVariantRefExpr;
-import org.elasticsearch.druid.ElasticSqlSelectQueryBlock;
-import org.elasticsearch.dsl.bean.ElasticDslContext;
-import org.elasticsearch.dsl.exception.ElasticSql2DslException;
-import org.elasticsearch.dsl.helper.ElasticSqlArgTransferHelper;
-import org.elasticsearch.dsl.listener.ParseActionListener;
+import org.es.sql.druid.ElasticSqlSelectQueryBlock;
+import org.es.sql.dsl.bean.ElasticDslContext;
+import org.es.sql.dsl.exception.ElasticSql2DslException;
+import org.es.sql.dsl.helper.ElasticSqlArgTransferHelper;
+import org.es.sql.dsl.listener.ParseActionListener;
 
 public class QueryLimitSizeParser implements QueryParser {
 

elasticsearch-query-core/src/main/java/org/elasticsearch/dsl/parser/sql/QueryMatchConditionParser.java

@@ -1,8 +1,8 @@
-package org.elasticsearch.dsl.parser.sql;
+package org.es.sql.dsl.parser.sql;
 
-import org.elasticsearch.druid.ElasticSqlSelectQueryBlock;
-import org.elasticsearch.dsl.bean.ElasticDslContext;
-import org.elasticsearch.dsl.listener.ParseActionListener;
+import org.es.sql.druid.ElasticSqlSelectQueryBlock;
+import org.es.sql.dsl.bean.ElasticDslContext;
+import org.es.sql.dsl.listener.ParseActionListener;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 
 public class QueryMatchConditionParser extends AbstractQueryConditionParser {

elasticsearch-query-core/src/main/java/org/elasticsearch/dsl/parser/sql/QueryOrderConditionParser.java

@@ -1,4 +1,4 @@
-package org.elasticsearch.dsl.parser.sql;
+package org.es.sql.dsl.parser.sql;
 
 import com.alibaba.druid.sql.ast.SQLExpr;
 import com.alibaba.druid.sql.ast.SQLOrderBy;
@@ -10,15 +10,15 @@ import com.alibaba.druid.sql.ast.expr.SQLPropertyExpr;
 import com.alibaba.druid.sql.ast.statement.SQLSelectOrderByItem;
 import com.google.common.collect.Lists;
 import org.apache.commons.collections.CollectionUtils;
-import org.elasticsearch.druid.ElasticSqlSelectQueryBlock;
-import org.elasticsearch.dsl.bean.ElasticDslContext;
-import org.elasticsearch.dsl.bean.ElasticSqlQueryField;
-import org.elasticsearch.dsl.enums.QueryFieldType;
-import org.elasticsearch.dsl.enums.SortOption;
-import org.elasticsearch.dsl.exception.ElasticSql2DslException;
-import org.elasticsearch.dsl.helper.ElasticSqlArgTransferHelper;
-import org.elasticsearch.dsl.helper.ElasticSqlMethodInvokeHelper;
-import org.elasticsearch.dsl.listener.ParseActionListener;
+import org.es.sql.druid.ElasticSqlSelectQueryBlock;
+import org.es.sql.dsl.bean.ElasticDslContext;
+import org.es.sql.dsl.bean.ElasticSqlQueryField;
+import org.es.sql.dsl.enums.QueryFieldType;
+import org.es.sql.dsl.enums.SortOption;
+import org.es.sql.dsl.exception.ElasticSql2DslException;
+import org.es.sql.dsl.helper.ElasticSqlArgTransferHelper;
+import org.es.sql.dsl.helper.ElasticSqlMethodInvokeHelper;
+import org.es.sql.dsl.listener.ParseActionListener;
 import org.elasticsearch.search.sort.FieldSortBuilder;
 import org.elasticsearch.search.sort.SortBuilder;
 import org.elasticsearch.search.sort.SortBuilders;

elasticsearch-query-core/src/main/java/org/elasticsearch/dsl/parser/sql/QueryParser.java

@@ -1,6 +1,6 @@
-package org.elasticsearch.dsl.parser.sql;
+package org.es.sql.dsl.parser.sql;
 
-import org.elasticsearch.dsl.bean.ElasticDslContext;
+import org.es.sql.dsl.bean.ElasticDslContext;
 
 @FunctionalInterface
 public interface QueryParser {

elasticsearch-query-core/src/main/java/org/elasticsearch/dsl/parser/sql/QueryRoutingValParser.java

@@ -1,15 +1,15 @@
-package org.elasticsearch.dsl.parser.sql;
+package org.es.sql.dsl.parser.sql;
 
 import com.alibaba.druid.sql.ast.SQLExpr;
 import com.alibaba.druid.sql.ast.expr.SQLCharExpr;
 import com.alibaba.druid.sql.ast.expr.SQLVariantRefExpr;
 import com.google.common.collect.Lists;
 import org.apache.commons.collections.CollectionUtils;
-import org.elasticsearch.druid.ElasticSqlSelectQueryBlock;
-import org.elasticsearch.dsl.bean.ElasticDslContext;
-import org.elasticsearch.dsl.exception.ElasticSql2DslException;
-import org.elasticsearch.dsl.helper.ElasticSqlArgTransferHelper;
-import org.elasticsearch.dsl.listener.ParseActionListener;
+import org.es.sql.druid.ElasticSqlSelectQueryBlock;
+import org.es.sql.dsl.bean.ElasticDslContext;
+import org.es.sql.dsl.exception.ElasticSql2DslException;
+import org.es.sql.dsl.helper.ElasticSqlArgTransferHelper;
+import org.es.sql.dsl.listener.ParseActionListener;
 
 import java.util.List;
 

elasticsearch-query-core/src/main/java/org/elasticsearch/dsl/parser/sql/QuerySelectFieldListParser.java

@@ -1,17 +1,17 @@
-package org.elasticsearch.dsl.parser.sql;
+package org.es.sql.dsl.parser.sql;
 
 import com.alibaba.druid.sql.ast.SQLExpr;
 import com.alibaba.druid.sql.ast.expr.SQLAggregateExpr;
 import com.alibaba.druid.sql.ast.statement.SQLSelectItem;
 import com.google.common.collect.Lists;
 import org.apache.commons.collections.CollectionUtils;
-import org.elasticsearch.druid.ElasticSqlSelectQueryBlock;
-import org.elasticsearch.dsl.bean.ElasticDslContext;
-import org.elasticsearch.dsl.bean.ElasticSqlQueryField;
-import org.elasticsearch.dsl.enums.QueryFieldType;
-import org.elasticsearch.dsl.exception.ElasticSql2DslException;
-import org.elasticsearch.dsl.helper.ElasticSqlMethodInvokeHelper;
-import org.elasticsearch.dsl.listener.ParseActionListener;
+import org.es.sql.druid.ElasticSqlSelectQueryBlock;
+import org.es.sql.dsl.bean.ElasticDslContext;
+import org.es.sql.dsl.bean.ElasticSqlQueryField;
+import org.es.sql.dsl.enums.QueryFieldType;
+import org.es.sql.dsl.exception.ElasticSql2DslException;
+import org.es.sql.dsl.helper.ElasticSqlMethodInvokeHelper;
+import org.es.sql.dsl.listener.ParseActionListener;
 import org.elasticsearch.search.aggregations.AbstractAggregationBuilder;
 import org.elasticsearch.search.aggregations.AggregationBuilder;
 import org.elasticsearch.search.aggregations.AggregationBuilders;

elasticsearch-query-core/src/main/java/org/elasticsearch/dsl/parser/sql/QueryWhereConditionParser.java

@@ -1,8 +1,8 @@
-package org.elasticsearch.dsl.parser.sql;
+package org.es.sql.dsl.parser.sql;
 
-import org.elasticsearch.druid.ElasticSqlSelectQueryBlock;
-import org.elasticsearch.dsl.bean.ElasticDslContext;
-import org.elasticsearch.dsl.listener.ParseActionListener;
+import org.es.sql.druid.ElasticSqlSelectQueryBlock;
+import org.es.sql.dsl.bean.ElasticDslContext;
+import org.es.sql.dsl.listener.ParseActionListener;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 
 public class QueryWhereConditionParser extends AbstractQueryConditionParser {

elasticsearch-query-core/src/main/java/org/elasticsearch/utils/Constants.java

@@ -1,4 +1,4 @@
-package org.elasticsearch.utils;
+package org.es.sql.utils;
 
 public class Constants {
     public static final String COMMA = ",";

elasticsearch-query-core/src/main/java/org/elasticsearch/utils/ElasticMockClient.java

@@ -1,4 +1,4 @@
-package org.elasticsearch.utils;
+package org.es.sql.utils;
 
 import org.elasticsearch.action.*;
 import org.elasticsearch.action.bulk.BulkRequest;

elasticsearch-query-core/src/main/java/org/elasticsearch/utils/Logger.java

@@ -1,4 +1,4 @@
-package org.elasticsearch.utils;
+package org.es.sql.utils;
 
 
 import org.slf4j.LoggerFactory;

elasticsearch-query-core/src/test/java/org/elasticsearch/query/SqlParserLimitTest.java

@@ -1,7 +1,7 @@
-package org.elasticsearch.query;
+package org.es.test.query;
 
-import org.elasticsearch.dsl.bean.ElasticSqlParseResult;
-import org.elasticsearch.dsl.parser.ElasticSql2DslParser;
+import org.es.sql.dsl.bean.ElasticSqlParseResult;
+import org.es.sql.dsl.parser.ElasticSql2DslParser;
 import org.junit.Assert;
 import org.junit.Test;
 

elasticsearch-query-core/src/test/java/org/elasticsearch/query/SqlParserListenerTest.java

@@ -1,10 +1,10 @@
-package org.elasticsearch.query;
+package org.es.test.query;
 
-import org.elasticsearch.dsl.bean.ElasticSqlParseResult;
-import org.elasticsearch.dsl.bean.ElasticSqlQueryField;
-import org.elasticsearch.dsl.enums.SQLConditionOperator;
-import org.elasticsearch.dsl.listener.ParseActionListenerAdapter;
-import org.elasticsearch.dsl.parser.ElasticSql2DslParser;
+import org.es.sql.dsl.bean.ElasticSqlParseResult;
+import org.es.sql.dsl.bean.ElasticSqlQueryField;
+import org.es.sql.dsl.enums.SQLConditionOperator;
+import org.es.sql.dsl.listener.ParseActionListenerAdapter;
+import org.es.sql.dsl.parser.ElasticSql2DslParser;
 import org.junit.Assert;
 import org.junit.Test;
 

elasticsearch-query-core/src/test/java/org/elasticsearch/query/SqlParserOrderByTest.java

@@ -1,7 +1,7 @@
-package org.elasticsearch.query;
+package org.es.test.query;
 
-import org.elasticsearch.dsl.bean.ElasticSqlParseResult;
-import org.elasticsearch.dsl.parser.ElasticSql2DslParser;
+import org.es.sql.dsl.bean.ElasticSqlParseResult;
+import org.es.sql.dsl.parser.ElasticSql2DslParser;
 import org.junit.Test;
 
 

elasticsearch-query-core/src/test/java/org/elasticsearch/query/SqlParserQueryTest.java

@@ -1,7 +1,7 @@
-package org.elasticsearch.query;
+package org.es.test.query;
 
-import org.elasticsearch.dsl.bean.ElasticSqlParseResult;
-import org.elasticsearch.dsl.parser.ElasticSql2DslParser;
+import org.es.sql.dsl.bean.ElasticSqlParseResult;
+import org.es.sql.dsl.parser.ElasticSql2DslParser;
 import org.junit.Test;
 
 

elasticsearch-query-core/src/test/java/org/elasticsearch/query/SqlParserRoutingTest.java

@@ -1,7 +1,7 @@
-package org.elasticsearch.query;
+package org.es.test.query;
 
-import org.elasticsearch.dsl.bean.ElasticSqlParseResult;
-import org.elasticsearch.dsl.parser.ElasticSql2DslParser;
+import org.es.sql.dsl.bean.ElasticSqlParseResult;
+import org.es.sql.dsl.parser.ElasticSql2DslParser;
 import org.junit.Assert;
 import org.junit.Test;
 

elasticsearch-query-core/src/test/java/org/elasticsearch/query/SqlParserSelectFieldTest.java

@@ -1,8 +1,8 @@
-package org.elasticsearch.query;
+package org.es.test.query;
 
 import org.apache.commons.collections.CollectionUtils;
-import org.elasticsearch.dsl.bean.ElasticSqlParseResult;
-import org.elasticsearch.dsl.parser.ElasticSql2DslParser;
+import org.es.sql.dsl.bean.ElasticSqlParseResult;
+import org.es.sql.dsl.parser.ElasticSql2DslParser;
 import org.junit.Assert;
 import org.junit.Test;
 

elasticsearch-query-core/src/test/java/org/elasticsearch/query/SqlParserWhereConditionTest.java

@@ -1,24 +1,20 @@
-package org.elasticsearch.query;
+package org.es.test.query;
 
 import org.elasticsearch.action.search.SearchAction;
 import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.dsl.bean.ElasticSqlParseResult;
-import org.elasticsearch.dsl.parser.ElasticSql2DslParser;
 import org.elasticsearch.index.query.NestedQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.search.aggregations.AbstractAggregationBuilder;
 import org.elasticsearch.search.aggregations.AggregationBuilders;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsBuilder;
-import org.elasticsearch.utils.ElasticMockClient;
+import org.es.sql.dsl.bean.ElasticSqlParseResult;
+import org.es.sql.dsl.parser.ElasticSql2DslParser;
+import org.es.sql.utils.ElasticMockClient;
 import org.junit.Assert;
 import org.junit.Ignore;
 import org.junit.Test;
 
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-
 
 public class SqlParserWhereConditionTest {
     @Test

elasticsearch-query-core/target/surefire-reports/TEST-org.elasticsearch.query.SqlParserOrderByTest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite tests="1" failures="0" name="org.elasticsearch.query.SqlParserOrderByTest" time="0.009" errors="0" skipped="0">
+<testsuite tests="3" failures="0" name="org.es.test.query.SqlParserLimitTest" time="1.128" errors="0" skipped="0">
   <properties>
     <property name="java.runtime.name" value="Java(TM) SE Runtime Environment"/>
     <property name="sun.boot.library.path" value="E:\dev\Java\jdk1.8.0_66\jre\bin"/>
@@ -61,5 +61,7 @@
     <property name="sun.desktop" value="windows"/>
     <property name="sun.cpu.isalist" value="amd64"/>
   </properties>
-  <testcase classname="org.elasticsearch.query.SqlParserOrderByTest" name="testParseEqExpr" time="0.008"/>
+  <testcase classname="org.es.test.query.SqlParserLimitTest" name="testParseLimitExprWithArgs" time="0.881"/>
+  <testcase classname="org.es.test.query.SqlParserLimitTest" name="testX" time="0.128"/>
+  <testcase classname="org.es.test.query.SqlParserLimitTest" name="testParseLimitExpr" time="0.001"/>
 </testsuite>

elasticsearch-query-jdbc/target/surefire-reports/TEST-org.elasticsearch.jdbc.ScriptQueryTest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite tests="1" failures="0" name="org.elasticsearch.jdbc.ScriptQueryTest" time="2.103" errors="0" skipped="0">
+<testsuite tests="1" failures="0" name="org.es.test.query.SqlParserOrderByTest" time="0.017" errors="0" skipped="0">
   <properties>
     <property name="java.runtime.name" value="Java(TM) SE Runtime Environment"/>
     <property name="sun.boot.library.path" value="E:\dev\Java\jdk1.8.0_66\jre\bin"/>
@@ -61,5 +61,5 @@
     <property name="sun.desktop" value="windows"/>
     <property name="sun.cpu.isalist" value="amd64"/>
   </properties>
-  <testcase classname="org.elasticsearch.jdbc.ScriptQueryTest" name="testScriptQuery" time="2.102"/>
+  <testcase classname="org.es.test.query.SqlParserOrderByTest" name="testParseEqExpr" time="0.016"/>
 </testsuite>

elasticsearch-query-core/target/surefire-reports/TEST-org.elasticsearch.query.SqlParserListenerTest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite tests="1" failures="0" name="org.elasticsearch.query.SqlParserListenerTest" time="0.015" errors="0" skipped="0">
+<testsuite tests="2" failures="0" name="org.es.test.query.SqlParserRoutingTest" time="0.007" errors="0" skipped="0">
   <properties>
     <property name="java.runtime.name" value="Java(TM) SE Runtime Environment"/>
     <property name="sun.boot.library.path" value="E:\dev\Java\jdk1.8.0_66\jre\bin"/>
@@ -61,5 +61,6 @@
     <property name="sun.desktop" value="windows"/>
     <property name="sun.cpu.isalist" value="amd64"/>
   </properties>
-  <testcase classname="org.elasticsearch.query.SqlParserListenerTest" name="testParseActionListener" time="0.014"/>
+  <testcase classname="org.es.test.query.SqlParserRoutingTest" name="testParseRoutingExprWithArgs" time="0"/>
+  <testcase classname="org.es.test.query.SqlParserRoutingTest" name="testParseRoutingExpr" time="0.006"/>
 </testsuite>

elasticsearch-query-core/target/surefire-reports/TEST-org.elasticsearch.query.SqlParserRoutingTest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite tests="2" failures="0" name="org.elasticsearch.query.SqlParserRoutingTest" time="0.01" errors="0" skipped="0">
+<testsuite tests="6" failures="0" name="org.es.test.query.SqlParserSelectFieldTest" time="0.006" errors="0" skipped="0">
   <properties>
     <property name="java.runtime.name" value="Java(TM) SE Runtime Environment"/>
     <property name="sun.boot.library.path" value="E:\dev\Java\jdk1.8.0_66\jre\bin"/>
@@ -61,6 +61,10 @@
     <property name="sun.desktop" value="windows"/>
     <property name="sun.cpu.isalist" value="amd64"/>
   </properties>
-  <testcase classname="org.elasticsearch.query.SqlParserRoutingTest" name="testParseRoutingExprWithArgs" time="0"/>
-  <testcase classname="org.elasticsearch.query.SqlParserRoutingTest" name="testParseRoutingExpr" time="0.01"/>
+  <testcase classname="org.es.test.query.SqlParserSelectFieldTest" name="testParseDefaultLimit" time="0"/>
+  <testcase classname="org.es.test.query.SqlParserSelectFieldTest" name="testInnerDocField" time="0.002"/>
+  <testcase classname="org.es.test.query.SqlParserSelectFieldTest" name="testParseFromSource" time="0"/>
+  <testcase classname="org.es.test.query.SqlParserSelectFieldTest" name="testParseOriSelectField" time="0"/>
+  <testcase classname="org.es.test.query.SqlParserSelectFieldTest" name="testNestedDocField" time="0.001"/>
+  <testcase classname="org.es.test.query.SqlParserSelectFieldTest" name="testSelectAllField" time="0.001"/>
 </testsuite>

elasticsearch-query-core/target/surefire-reports/org.elasticsearch.query.SqlParserListenerTest.txt

@@ -1,4 +0,0 @@
--------------------------------------------------------------------------------
-Test set: org.elasticsearch.query.SqlParserListenerTest
--------------------------------------------------------------------------------
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.016 sec

elasticsearch-query-core/target/surefire-reports/org.elasticsearch.query.SqlParserOrderByTest.txt

@@ -1,4 +0,0 @@
--------------------------------------------------------------------------------
-Test set: org.elasticsearch.query.SqlParserOrderByTest
--------------------------------------------------------------------------------
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.009 sec

elasticsearch-query-core/target/surefire-reports/org.elasticsearch.query.SqlParserLimitTest.txt

@@ -1,4 +1,4 @@
 -------------------------------------------------------------------------------
-Test set: org.elasticsearch.query.SqlParserLimitTest
+Test set: org.es.test.query.SqlParserLimitTest
 -------------------------------------------------------------------------------
-Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.981 sec
+Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.129 sec

elasticsearch-query-spring/target/surefire-reports/org.elasticsearch.ProductIndexQueryTest.txt

@@ -1,4 +1,4 @@
 -------------------------------------------------------------------------------
-Test set: org.elasticsearch.ProductIndexQueryTest
+Test set: org.es.test.query.SqlParserListenerTest
 -------------------------------------------------------------------------------
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 8.702 sec
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.012 sec

elasticsearch-query-jdbc/target/surefire-reports/org.elasticsearch.jdbc.ScriptQueryTest.txt

@@ -1,4 +1,4 @@
 -------------------------------------------------------------------------------
-Test set: org.elasticsearch.jdbc.ScriptQueryTest
+Test set: org.es.test.query.SqlParserOrderByTest
 -------------------------------------------------------------------------------
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.103 sec
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.017 sec

elasticsearch-query-core/target/surefire-reports/org.elasticsearch.query.SqlParserQueryTest.txt

@@ -1,4 +1,4 @@
 -------------------------------------------------------------------------------
-Test set: org.elasticsearch.query.SqlParserQueryTest
+Test set: org.es.test.query.SqlParserQueryTest
 -------------------------------------------------------------------------------
-Tests run: 10, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.035 sec
+Tests run: 10, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.066 sec

elasticsearch-query-core/target/surefire-reports/org.elasticsearch.query.SqlParserRoutingTest.txt

@@ -1,4 +1,4 @@
 -------------------------------------------------------------------------------
-Test set: org.elasticsearch.query.SqlParserRoutingTest
+Test set: org.es.test.query.SqlParserRoutingTest
 -------------------------------------------------------------------------------
-Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.011 sec
+Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.007 sec

elasticsearch-query-core/target/surefire-reports/org.elasticsearch.query.SqlParserSelectFieldTest.txt

@@ -1,4 +1,4 @@
 -------------------------------------------------------------------------------
-Test set: org.elasticsearch.query.SqlParserSelectFieldTest
+Test set: org.es.test.query.SqlParserSelectFieldTest
 -------------------------------------------------------------------------------
-Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.014 sec
+Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.006 sec

elasticsearch-query-core/target/surefire-reports/org.elasticsearch.query.SqlParserWhereConditionTest.txt

@@ -1,4 +1,4 @@
 -------------------------------------------------------------------------------
-Test set: org.elasticsearch.query.SqlParserWhereConditionTest
+Test set: org.es.test.query.SqlParserWhereConditionTest
 -------------------------------------------------------------------------------
-Tests run: 8, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.043 sec
+Tests run: 8, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.056 sec

elasticsearch-query-jdbc/src/main/java/org/elasticsearch/api/AbstractConnection.java

@@ -1,4 +1,4 @@
-package org.elasticsearch.api;
+package org.es.jdbc.api;
 
 import java.sql.*;
 import java.util.Properties;

elasticsearch-query-jdbc/src/main/java/org/elasticsearch/api/AbstractDataSource.java

@@ -1,4 +1,4 @@
-package org.elasticsearch.api;
+package org.es.jdbc.api;
 
 
 import javax.sql.DataSource;

elasticsearch-query-jdbc/src/main/java/org/elasticsearch/api/AbstractDriverBasedDataSource.java

@@ -1,4 +1,4 @@
-package org.elasticsearch.api;
+package org.es.jdbc.api;
 
 import java.sql.Connection;
 import java.sql.SQLException;

elasticsearch-query-jdbc/src/main/java/org/elasticsearch/api/AbstractFeatureNotSupportedConnection.java

@@ -1,4 +1,4 @@
-package org.elasticsearch.api;
+package org.es.jdbc.api;
 
 
 import java.sql.*;

elasticsearch-query-jdbc/src/main/java/org/elasticsearch/api/AbstractFeatureNotSupportedPreparedStatement.java

@@ -1,4 +1,4 @@
-package org.elasticsearch.api;
+package org.es.jdbc.api;
 
 
 import java.io.InputStream;

elasticsearch-query-jdbc/src/main/java/org/elasticsearch/api/AbstractFeatureNotSupportedResultSet.java

@@ -1,4 +1,4 @@
-package org.elasticsearch.api;
+package org.es.jdbc.api;
 
 
 import java.io.InputStream;

elasticsearch-query-jdbc/src/main/java/org/elasticsearch/api/AbstractFeatureNotSupportedStatement.java

@@ -1,4 +1,4 @@
-package org.elasticsearch.api;
+package org.es.jdbc.api;
 
 
 import java.sql.*;

elasticsearch-query-jdbc/src/main/java/org/elasticsearch/api/AbstractResultSet.java

@@ -1,4 +1,4 @@
-package org.elasticsearch.api;
+package org.es.jdbc.api;
 
 import java.sql.SQLException;
 import java.sql.SQLWarning;

elasticsearch-query-jdbc/src/main/java/org/elasticsearch/api/AbstractStatement.java

@@ -1,4 +1,4 @@
-package org.elasticsearch.api;
+package org.es.jdbc.api;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;

elasticsearch-query-jdbc/src/main/java/org/elasticsearch/api/ConnectionProxy.java

@@ -1,4 +1,4 @@
-package org.elasticsearch.api;
+package org.es.jdbc.api;
 
 import java.sql.Connection;