Skip to content
This repository was archived by the owner on Sep 4, 2019. It is now read-only.

Commit 8f84339

Browse files
author
iamazy
committed
remove export
1 parent eece02a commit 8f84339

File tree

4 files changed

+9
-86
lines changed

4 files changed

+9
-86
lines changed

pom.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@
1010
<url>https://github.com./iamazy/elasticsearch-sql</url>
1111

1212
<properties>
13-
<elasticsearch.version>7.0.1</elasticsearch.version>
13+
<elasticsearch.version>7.0.0</elasticsearch.version>
1414
<java.version>1.8</java.version>
15+
<maven.compiler.target>${java.version}</maven.compiler.target>
1516
<elasticsearch.plugin.name>isql</elasticsearch.plugin.name>
1617
<elasticsearch.plugin.classname>io.github.iamazy.elasticsearch.dsl.plugin.SqlPlugin</elasticsearch.plugin.classname>
1718
<elasticsearch.plugin.jvm>true</elasticsearch.plugin.jvm>

src/main/java/io/github/iamazy/elasticsearch/dsl/plugin/RestSqlAction.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package io.github.iamazy.elasticsearch.dsl.plugin;
22

33
import com.carrotsearch.hppc.cursors.ObjectObjectCursor;
4+
import com.google.common.util.concurrent.ThreadFactoryBuilder;
45
import io.github.iamazy.elasticsearch.dsl.sql.exception.ElasticSql2DslException;
56
import io.github.iamazy.elasticsearch.dsl.sql.model.ElasticSqlParseResult;
67
import io.github.iamazy.elasticsearch.dsl.sql.parser.ElasticSql2DslParser;
@@ -13,6 +14,7 @@
1314
import org.elasticsearch.rest.*;
1415

1516
import java.io.IOException;
17+
import java.util.concurrent.*;
1618

1719

1820
/**
@@ -30,14 +32,13 @@ public class RestSqlAction extends BaseRestHandler {
3032
restController.registerHandler(RestRequest.Method.GET, "/_isql", this);
3133
}
3234

33-
3435
@Override
3536
public String getName() {
3637
return "isql";
3738
}
3839

3940
@Override
40-
protected RestChannelConsumer prepareRequest(RestRequest restRequest, NodeClient nodeClient) throws IOException {
41+
protected RestChannelConsumer prepareRequest(RestRequest restRequest, NodeClient nodeClient) {
4142
try (XContentParser parser = restRequest.contentOrSourceParamParser()) {
4243
parser.mapStrings().forEach((k, v) -> restRequest.params().putIfAbsent(k, v));
4344
} catch (IOException e) {
@@ -54,9 +55,6 @@ protected RestChannelConsumer prepareRequest(RestRequest restRequest, NodeClient
5455
if (restRequest.path().endsWith("/_explain")) {
5556
return channel -> channel.sendResponse(new BytesRestResponse(RestStatus.OK, builder.value(parseResult.toRequest().source())));
5657
}
57-
else if(restRequest.path().endsWith("/_export")){
58-
return null;
59-
}
6058
else {
6159
if (parseResult.toFieldMapping() != null) {
6260
return channel -> channel.sendResponse(new BytesRestResponse(RestStatus.OK, builder.value(nodeClient.admin().indices().getFieldMappings(parseResult.toFieldMapping()).actionGet())));
@@ -70,8 +68,10 @@ else if(restRequest.path().endsWith("/_export")){
7068
return channel -> channel.sendResponse(new BytesRestResponse(RestStatus.OK, builder.value(nodeClient.search(parseResult.toRequest()).actionGet())));
7169
}
7270
}
73-
} catch (ElasticSql2DslException e) {
71+
} catch (Exception e) {
7472
return channel -> channel.sendResponse(new BytesRestResponse(RestStatus.INTERNAL_SERVER_ERROR, XContentType.JSON.mediaType(), "{\"error\":\"" + e.getMessage() + "\"}"));
7573
}
7674
}
75+
76+
7777
}

src/main/java/io/github/iamazy/elasticsearch/dsl/plugin/export/ExportAction.java

-78
This file was deleted.
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
grant {
22
// needed because of the hot reload functionality
3-
permission java.lang.RuntimePermission "accessDeclaredMembers";
3+
permission java.net.SocketPermission "*", "connect,resolve";
44
};

0 commit comments

Comments
 (0)