Skip to content

Commit 684d921

Browse files
committed
sync up with elasticsearch 7.7
1 parent 6ea2234 commit 684d921

File tree

1 file changed

+12
-5
lines changed

1 file changed

+12
-5
lines changed

src/main/java/org/codelibs/elasticsearch/df/rest/RestDataAction.java

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package org.codelibs.elasticsearch.df.rest;
22

3+
import static java.util.Arrays.asList;
4+
import static java.util.Collections.unmodifiableList;
35
import static org.elasticsearch.rest.RestRequest.Method.GET;
46
import static org.elasticsearch.rest.RestRequest.Method.POST;
57
import static org.elasticsearch.rest.RestStatus.OK;
@@ -8,6 +10,7 @@
810
import java.io.File;
911
import java.io.FileInputStream;
1012
import java.io.IOException;
13+
import java.util.List;
1114

1215
import org.apache.logging.log4j.LogManager;
1316
import org.apache.logging.log4j.Logger;
@@ -41,17 +44,21 @@ public class RestDataAction extends BaseRestHandler {
4144

4245
public RestDataAction(final Settings settings,
4346
final RestController restController) {
44-
restController.registerHandler(GET, "/_data", this);
45-
restController.registerHandler(POST, "/_data", this);
46-
restController.registerHandler(GET, "/{index}/_data", this);
47-
restController.registerHandler(POST, "/{index}/_data", this);
48-
4947
this.maxMemory = Runtime.getRuntime().maxMemory();
5048
this.defaultLimit = (long) (maxMemory
5149
* (DEFAULT_LIMIT_PERCENTAGE / 100F));
5250
logger.info("Default limit: {}", defaultLimit);
5351
}
5452

53+
@Override
54+
public List<Route> routes() {
55+
return unmodifiableList(asList(
56+
new Route(GET, "/_data"),
57+
new Route(POST, "/_data"),
58+
new Route(GET, "/{index}/_data"),
59+
new Route(POST, "/{index}/_data")));
60+
}
61+
5562
public RestChannelConsumer prepareRequest(final RestRequest request,
5663
final NodeClient client) throws IOException {
5764
SearchRequest searchRequest = new SearchRequest();

0 commit comments

Comments
 (0)